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
```
52 lines
1.3 KiB
Diff
52 lines
1.3 KiB
Diff
diff --git lib/param/loadparm.h lib/param/loadparm.h
|
|
index b5d79b9..3f4eae0 100644
|
|
--- a/lib/param/loadparm.h
|
|
+++ b/lib/param/loadparm.h
|
|
@@ -31,6 +31,7 @@
|
|
#define _LOADPARM_H
|
|
|
|
#include <talloc.h>
|
|
+#include <time.h>
|
|
|
|
struct parmlist_entry {
|
|
struct parmlist_entry *prev, *next;
|
|
diff --git source3/lib/system_smbd.c source3/lib/system_smbd.c
|
|
index 3b1ac9c..4044d75 100644
|
|
--- a/source3/lib/system_smbd.c
|
|
+++ b/source3/lib/system_smbd.c
|
|
@@ -27,6 +27,8 @@
|
|
#include "system/passwd.h"
|
|
#include "nsswitch/winbind_client.h"
|
|
#include "../lib/util/setid.h"
|
|
+#include <grp.h>
|
|
+#include <uuid/uuid.h>
|
|
|
|
#ifndef HAVE_GETGROUPLIST
|
|
|
|
diff --git source4/torture/local/nss_tests.c source4/torture/local/nss_tests.c
|
|
index 2cd6122..0c84ec2 100644
|
|
--- a/source4/torture/local/nss_tests.c
|
|
+++ b/source4/torture/local/nss_tests.c
|
|
@@ -20,6 +20,8 @@
|
|
*/
|
|
|
|
#include "includes.h"
|
|
+#include <grp.h>
|
|
+#include <uuid/uuid.h>
|
|
|
|
#include "torture/torture.h"
|
|
#include "torture/local/proto.h"
|
|
|
|
diff --git ctdb/tests/src/protocol_util_test.c ctdb/tests/src/protocol_util_test.c
|
|
index edd2a34..48ce96e 100644
|
|
--- a/ctdb/tests/src/protocol_util_test.c
|
|
+++ b/ctdb/tests/src/protocol_util_test.c
|
|
@@ -20,6 +20,7 @@
|
|
#include "replace.h"
|
|
#include "system/network.h"
|
|
|
|
+#include <unistd.h>
|
|
#include <assert.h>
|
|
|
|
#include "protocol/protocol_basic.c"
|
|
|