a03d116397
```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
```
13 lines
381 B
Diff
13 lines
381 B
Diff
--- a/src/basic/user-util.h
|
|
+++ b/src/basic/user-util.h
|
|
@@ -70,8 +70,8 @@ int take_etc_passwd_lock(const char *root);
|
|
#define UID_INVALID ((uid_t) -1)
|
|
#define GID_INVALID ((gid_t) -1)
|
|
|
|
-#define UID_NOBODY ((uid_t) 65534U)
|
|
-#define GID_NOBODY ((gid_t) 65534U)
|
|
+#define UID_NOBODY ((uid_t) 99U)
|
|
+#define GID_NOBODY ((gid_t) 99U)
|
|
|
|
#define ETC_PASSWD_LOCK_PATH "/etc/.pwd.lock"
|
|
|