diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2018-04-09 23:08:30 +0200 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:45 -0700 |
commit | 4c1ef296dc8302dcc2ab193a1fa642432b25564e (patch) | |
tree | d29c280d81604539fcf099249a1969b961fd9cf4 /meta-networking/recipes-connectivity | |
parent | 418e53ec5fb1f12c59d426e2b67b9cfb55499778 (diff) | |
download | meta-openembedded-4c1ef296dc8302dcc2ab193a1fa642432b25564e.tar.gz |
samba: refresh patches
For 16-do-not-check-xsltproc-manpages.patch devtool created a heavy monster
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity')
3 files changed, 48 insertions, 32 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch b/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch index 0ab3436fc..0e89a9be0 100644 --- a/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch +++ b/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch | |||
@@ -13,16 +13,17 @@ If no network connection appears within DefaultTimeoutStartSec | |||
13 | therefore get killed. | 13 | therefore get killed. |
14 | 14 | ||
15 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> | 15 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> |
16 | |||
16 | --- | 17 | --- |
17 | packaging/systemd/nmb.service | 1 + | 18 | packaging/systemd/nmb.service | 1 + |
18 | 1 file changed, 1 insertion(+) | 19 | 1 file changed, 1 insertion(+) |
19 | 20 | ||
20 | diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service | 21 | diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service |
21 | index 992c0cd..555c9ab 100644 | 22 | index 71c93d6..f3d2fc2 100644 |
22 | --- a/packaging/systemd/nmb.service | 23 | --- a/packaging/systemd/nmb.service |
23 | +++ b/packaging/systemd/nmb.service | 24 | +++ b/packaging/systemd/nmb.service |
24 | @@ -10,6 +10,7 @@ EnvironmentFile=-/etc/sysconfig/samba | 25 | @@ -10,6 +10,7 @@ EnvironmentFile=-/etc/sysconfig/samba |
25 | ExecStart=/usr/sbin/nmbd $NMBDOPTIONS | 26 | ExecStart=/usr/sbin/nmbd --foreground --no-process-group $NMBDOPTIONS |
26 | ExecReload=/usr/bin/kill -HUP $MAINPID | 27 | ExecReload=/usr/bin/kill -HUP $MAINPID |
27 | LimitCORE=infinity | 28 | LimitCORE=infinity |
28 | +TimeoutStartSec=0 | 29 | +TimeoutStartSec=0 |
diff --git a/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch b/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch index c37cfcde4..8ca7a52ed 100644 --- a/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch +++ b/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch | |||
@@ -1,13 +1,24 @@ | |||
1 | Don't check xsltproc manpages | 1 | From 2214c2d1e455a38c891d17e421b438e3f7c495d8 Mon Sep 17 00:00:00 2001 |
2 | From: Bian Naimeng <biannm@cn.fujitsu.com> | ||
3 | Date: Mon, 18 Apr 2016 17:00:53 -0400 | ||
4 | Subject: [PATCH] Don't check xsltproc manpages | ||
2 | 5 | ||
6 | Upstream-Status: Pending | ||
7 | |||
3 | Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> | 8 | Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> |
4 | 9 | ||
5 | Index: samba-4.4.2/lib/ldb/wscript | 10 | --- |
6 | =================================================================== | 11 | lib/ldb/wscript | 2 +- |
7 | --- samba-4.4.2.orig/lib/ldb/wscript | 12 | lib/talloc/wscript | 2 +- |
8 | +++ samba-4.4.2/lib/ldb/wscript | 13 | lib/tdb/wscript | 2 +- |
9 | @@ -65,7 +65,7 @@ def configure(conf): | 14 | 3 files changed, 3 insertions(+), 3 deletions(-) |
10 | conf.define('USING_SYSTEM_LDB', 1) | 15 | |
16 | diff --git a/lib/ldb/wscript b/lib/ldb/wscript | ||
17 | index 5ea5231..d94086b 100644 | ||
18 | --- a/lib/ldb/wscript | ||
19 | +++ b/lib/ldb/wscript | ||
20 | @@ -98,7 +98,7 @@ def configure(conf): | ||
21 | conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2])) | ||
11 | 22 | ||
12 | if conf.env.standalone_ldb: | 23 | if conf.env.standalone_ldb: |
13 | - conf.CHECK_XSLTPROC_MANPAGES() | 24 | - conf.CHECK_XSLTPROC_MANPAGES() |
@@ -15,24 +26,24 @@ Index: samba-4.4.2/lib/ldb/wscript | |||
15 | 26 | ||
16 | # we need this for the ldap backend | 27 | # we need this for the ldap backend |
17 | if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): | 28 | if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): |
18 | Index: samba-4.4.2/lib/talloc/wscript | 29 | diff --git a/lib/talloc/wscript b/lib/talloc/wscript |
19 | =================================================================== | 30 | index df7e6be..b3305cf 100644 |
20 | --- samba-4.4.2.orig/lib/talloc/wscript | 31 | --- a/lib/talloc/wscript |
21 | +++ samba-4.4.2/lib/talloc/wscript | 32 | +++ b/lib/talloc/wscript |
22 | @@ -56,7 +56,7 @@ def configure(conf): | 33 | @@ -49,7 +49,7 @@ def configure(conf): |
23 | if conf.env.standalone_talloc: | 34 | conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' |
24 | conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 | 35 | conf.env.TALLOC_VERSION = VERSION |
25 | 36 | ||
26 | - conf.CHECK_XSLTPROC_MANPAGES() | 37 | - conf.CHECK_XSLTPROC_MANPAGES() |
27 | + #conf.CHECK_XSLTPROC_MANPAGES() | 38 | + #conf.CHECK_XSLTPROC_MANPAGES() |
28 | 39 | ||
29 | if not conf.env.disable_python: | 40 | conf.CHECK_HEADERS('sys/auxv.h') |
30 | # also disable if we don't have the python libs installed | 41 | conf.CHECK_FUNCS('getauxval') |
31 | Index: samba-4.4.2/lib/tdb/wscript | 42 | diff --git a/lib/tdb/wscript b/lib/tdb/wscript |
32 | =================================================================== | 43 | index 4782550..6bb3fa1 100644 |
33 | --- samba-4.4.2.orig/lib/tdb/wscript | 44 | --- a/lib/tdb/wscript |
34 | +++ samba-4.4.2/lib/tdb/wscript | 45 | +++ b/lib/tdb/wscript |
35 | @@ -92,7 +92,7 @@ def configure(conf): | 46 | @@ -89,7 +89,7 @@ def configure(conf): |
36 | not conf.env.disable_tdb_mutex_locking): | 47 | not conf.env.disable_tdb_mutex_locking): |
37 | conf.define('USE_TDB_MUTEX_LOCKING', 1) | 48 | conf.define('USE_TDB_MUTEX_LOCKING', 1) |
38 | 49 | ||
@@ -41,3 +52,6 @@ Index: samba-4.4.2/lib/tdb/wscript | |||
41 | 52 | ||
42 | if not conf.env.disable_python: | 53 | if not conf.env.disable_python: |
43 | # also disable if we don't have the python libs installed | 54 | # also disable if we don't have the python libs installed |
55 | -- | ||
56 | 2.14.3 | ||
57 | |||
diff --git a/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch b/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch index 025ac2775..6a7f8facc 100644 --- a/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch +++ b/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch | |||
@@ -6,6 +6,7 @@ Subject: [PATCH] Add config option without-valgrind | |||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | 8 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
9 | |||
9 | --- | 10 | --- |
10 | lib/replace/wscript | 4 +++- | 11 | lib/replace/wscript | 4 +++- |
11 | source3/wscript | 5 ++++- | 12 | source3/wscript | 5 ++++- |
@@ -16,9 +17,9 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript | |||
16 | index f0040b1..aca73af 100644 | 17 | index f0040b1..aca73af 100644 |
17 | --- a/lib/replace/wscript | 18 | --- a/lib/replace/wscript |
18 | +++ b/lib/replace/wscript | 19 | +++ b/lib/replace/wscript |
19 | @@ -101,7 +101,9 @@ struct foo bar = { .y = 'X', .x = 1 }; | 20 | @@ -101,7 +101,9 @@ def configure(conf): |
20 | 21 | conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') | |
21 | conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') | 22 | conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') |
22 | 23 | ||
23 | - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') | 24 | - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') |
24 | + if not Options.options.disable_valgrind: | 25 | + if not Options.options.disable_valgrind: |
@@ -26,12 +27,12 @@ index f0040b1..aca73af 100644 | |||
26 | + | 27 | + |
27 | conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') | 28 | conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') |
28 | conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') | 29 | conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') |
29 | conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h malloc.h') | 30 | conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') |
30 | diff --git a/source3/wscript b/source3/wscript | 31 | diff --git a/source3/wscript b/source3/wscript |
31 | index bac3dd5..a5c51ea 100644 | 32 | index bac3dd5..a5c51ea 100644 |
32 | --- a/source3/wscript | 33 | --- a/source3/wscript |
33 | +++ b/source3/wscript | 34 | +++ b/source3/wscript |
34 | @@ -1016,7 +1016,10 @@ syscall(SYS_setgroups32, 0, NULL); | 35 | @@ -1070,7 +1070,10 @@ syscall(SYS_setgroups32, 0, NULL); |
35 | Logs.warn("--with-dnsupdate=yes but gssapi support not sufficient") | 36 | Logs.warn("--with-dnsupdate=yes but gssapi support not sufficient") |
36 | else: | 37 | else: |
37 | conf.DEFINE('WITH_DNS_UPDATES', 1) | 38 | conf.DEFINE('WITH_DNS_UPDATES', 1) |
@@ -44,12 +45,12 @@ index bac3dd5..a5c51ea 100644 | |||
44 | if conf.CONFIG_SET('HAVE_VALGRIND_H') or conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'): | 45 | if conf.CONFIG_SET('HAVE_VALGRIND_H') or conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'): |
45 | conf.DEFINE('VALGRIND', '1') | 46 | conf.DEFINE('VALGRIND', '1') |
46 | diff --git a/wscript b/wscript | 47 | diff --git a/wscript b/wscript |
47 | index 7679c0f..681ac17 100644 | 48 | index 542a60c..22e6116 100644 |
48 | --- a/wscript | 49 | --- a/wscript |
49 | +++ b/wscript | 50 | +++ b/wscript |
50 | @@ -72,6 +72,10 @@ def set_options(opt): | 51 | @@ -86,6 +86,10 @@ def set_options(opt): |
51 | help=("Disable systemd integration"), | 52 | help=("Disable RELRO builds"), |
52 | action='store_false', dest='enable_systemd') | 53 | action="store_false", dest='enable_relro') |
53 | 54 | ||
54 | + opt.add_option('--without-valgrind', | 55 | + opt.add_option('--without-valgrind', |
55 | + help=("Disable use of the valgrind headers"), | 56 | + help=("Disable use of the valgrind headers"), |