dd9d4a1979
```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
```
21 lines
1.3 KiB
Diff
21 lines
1.3 KiB
Diff
--- a/request-key.conf.old 2013-05-28 15:34:10.966001242 +0200
|
|
+++ b/request-key.conf 2013-05-28 15:35:34.857969598 +0200
|
|
@@ -31,11 +31,11 @@
|
|
|
|
#OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ...
|
|
#====== ======= =============== =============== ===============================
|
|
-create dns_resolver * * /sbin/key.dns_resolver %k
|
|
-create user debug:* negate /bin/keyctl negate %k 30 %S
|
|
-create user debug:* rejected /bin/keyctl reject %k 30 %c %S
|
|
-create user debug:* expired /bin/keyctl reject %k 30 %c %S
|
|
-create user debug:* revoked /bin/keyctl reject %k 30 %c %S
|
|
-create user debug:loop:* * |/bin/cat
|
|
+create dns_resolver * * /usr/bin/key.dns_resolver %k
|
|
+create user debug:* negate /usr/bin/keyctl negate %k 30 %S
|
|
+create user debug:* rejected /usr/bin/keyctl reject %k 30 %c %S
|
|
+create user debug:* expired /usr/bin/keyctl reject %k 30 %c %S
|
|
+create user debug:* revoked /usr/bin/keyctl reject %k 30 %c %S
|
|
+create user debug:loop:* * |/usr/bin/cat
|
|
create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S
|
|
-negate * * * /bin/keyctl negate %k 30 %S
|
|
+negate * * * /usr/bin/keyctl negate %k 30 %S
|