76acfa2dd2
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
27 lines
652 B
Diff
27 lines
652 B
Diff
diff --git src/vde_switch/plugins/dump.c src/vde_switch/plugins/dump.c
|
|
index 6132158..e7da1e6 100644
|
|
--- a/src/vde_switch/plugins/dump.c
|
|
+++ b/src/vde_switch/plugins/dump.c
|
|
@@ -2,6 +2,7 @@
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
+#include <unistd.h>
|
|
|
|
#include <config.h>
|
|
#include <vde.h>
|
|
diff --git src/vdetaplib/libvdetap.c src/vdetaplib/libvdetap.c
|
|
index 00cd401..843a14e 100644
|
|
--- a/src/vdetaplib/libvdetap.c
|
|
+++ b/src/vdetaplib/libvdetap.c
|
|
@@ -102,6 +102,10 @@ void libvdetap_fini(void)
|
|
}
|
|
}
|
|
|
|
+/* musl apparently defines open64 as a macro */
|
|
+#ifdef open64
|
|
+#undef open64
|
|
+#endif
|
|
int open(const char *path, int flags, ...)
|
|
{
|
|
va_list ap;
|