4b97cd2fb4
```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
```
72 lines
2.4 KiB
Diff
72 lines
2.4 KiB
Diff
diff --git source4/torture/local/nss_tests.c source4/torture/local/nss_tests.c
|
|
index 2cd6122..04f13c6 100644
|
|
--- a/source4/torture/local/nss_tests.c
|
|
+++ b/source4/torture/local/nss_tests.c
|
|
@@ -333,6 +333,7 @@ static bool test_enum_passwd(struct torture_context *tctx,
|
|
return true;
|
|
}
|
|
|
|
+#if HAVE_GETPWENT_R
|
|
static bool test_enum_r_passwd(struct torture_context *tctx,
|
|
struct passwd **pwd_array_p,
|
|
size_t *num_pwd_p)
|
|
@@ -383,6 +384,7 @@ static bool test_enum_r_passwd(struct torture_context *tctx,
|
|
|
|
return true;
|
|
}
|
|
+#endif
|
|
|
|
static bool torture_assert_passwd_equal(struct torture_context *tctx,
|
|
const struct passwd *p1,
|
|
@@ -434,7 +436,7 @@ static bool test_passwd_r(struct torture_context *tctx)
|
|
struct passwd *pwd, pwd1, pwd2;
|
|
size_t num_pwd;
|
|
|
|
- torture_assert(tctx, test_enum_r_passwd(tctx, &pwd, &num_pwd),
|
|
+ torture_assert(tctx, test_enum_passwd(tctx, &pwd, &num_pwd),
|
|
"failed to enumerate passwd");
|
|
|
|
for (i=0; i < num_pwd; i++) {
|
|
@@ -462,7 +464,7 @@ static bool test_passwd_r_cross(struct torture_context *tctx)
|
|
struct passwd *pwd, pwd1, pwd2, pwd3, pwd4;
|
|
size_t num_pwd;
|
|
|
|
- torture_assert(tctx, test_enum_r_passwd(tctx, &pwd, &num_pwd),
|
|
+ torture_assert(tctx, test_enum_passwd(tctx, &pwd, &num_pwd),
|
|
"failed to enumerate passwd");
|
|
|
|
for (i=0; i < num_pwd; i++) {
|
|
@@ -533,6 +535,7 @@ static bool test_enum_group(struct torture_context *tctx,
|
|
return true;
|
|
}
|
|
|
|
+#if HAVE_GETGRENT_R
|
|
static bool test_enum_r_group(struct torture_context *tctx,
|
|
struct group **grp_array_p,
|
|
size_t *num_grp_p)
|
|
@@ -583,6 +586,7 @@ static bool test_enum_r_group(struct torture_context *tctx,
|
|
|
|
return true;
|
|
}
|
|
+#endif
|
|
|
|
static bool torture_assert_group_equal(struct torture_context *tctx,
|
|
const struct group *g1,
|
|
@@ -639,7 +643,7 @@ static bool test_group_r(struct torture_context *tctx)
|
|
struct group *grp, grp1, grp2;
|
|
size_t num_grp;
|
|
|
|
- torture_assert(tctx, test_enum_r_group(tctx, &grp, &num_grp),
|
|
+ torture_assert(tctx, test_enum_group(tctx, &grp, &num_grp),
|
|
"failed to enumerate group");
|
|
|
|
for (i=0; i < num_grp; i++) {
|
|
@@ -667,7 +671,7 @@ static bool test_group_r_cross(struct torture_context *tctx)
|
|
struct group *grp, grp1, grp2, grp3, grp4;
|
|
size_t num_grp;
|
|
|
|
- torture_assert(tctx, test_enum_r_group(tctx, &grp, &num_grp),
|
|
+ torture_assert(tctx, test_enum_group(tctx, &grp, &num_grp),
|
|
"failed to enumerate group");
|
|
|
|
for (i=0; i < num_grp; i++) {
|