b6bcd8cd34
* daemontools and dmraid is kept at -Np0
```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
```
22 lines
542 B
Diff
22 lines
542 B
Diff
--- a/src/cache.c
|
|
+++ b/src/cache.c
|
|
@@ -58,7 +58,7 @@
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
#include <sys/types.h>
|
|
#endif
|
|
-#include <sys/xattr.h>
|
|
+#include <linux/xattr.h>
|
|
|
|
#include <ne_alloc.h>
|
|
#include <ne_string.h>
|
|
--- a/src/webdav.c
|
|
+++ b/src/webdav.c
|
|
@@ -2033,7 +2033,7 @@ ssl_verify(void *userdata, int failures,
|
|
len = getline(&s, &n, stdin);
|
|
if (len < 0)
|
|
abort();
|
|
- if (rpmatch(s) > 0)
|
|
+ if ((s[0]=='y' || s[0]=='Y') > 0)
|
|
ret = 0;
|
|
free(s);
|
|
}
|