diff options
Diffstat (limited to 'net/samba4/patches')
14 files changed, 39 insertions, 57 deletions
diff --git a/net/samba4/patches/001-samba-4.4.0-pam.patch b/net/samba4/patches/001-samba-4.4.0-pam.patch index efd81f4d3..f52e2efb2 100644 --- a/net/samba4/patches/001-samba-4.4.0-pam.patch +++ b/net/samba4/patches/001-samba-4.4.0-pam.patch @@ -1,6 +1,6 @@ --- a/source3/wscript +++ b/source3/wscript -@@ -843,7 +843,7 @@ msg.msg_accrightslen = sizeof(fd); +@@ -907,7 +907,7 @@ msg.msg_accrightslen = sizeof(fd); if conf.env.with_iconv: conf.DEFINE('HAVE_ICONV', 1) @@ -9,7 +9,7 @@ use_pam=True conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): -@@ -920,6 +920,17 @@ int i; i = PAM_RADIO_TYPE; +@@ -984,6 +984,17 @@ int i; i = PAM_RADIO_TYPE; "or headers not found. Use --without-pam to disable " "PAM support."); diff --git a/net/samba4/patches/003-getpwent_r.patch b/net/samba4/patches/003-getpwent_r.patch index 0ba5fcc53..4671aeae0 100644 --- a/net/samba4/patches/003-getpwent_r.patch +++ b/net/samba4/patches/003-getpwent_r.patch @@ -1,8 +1,6 @@ -diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c -index 2cd6122..04f13c6 100644 --- a/source4/torture/local/nss_tests.c +++ b/source4/torture/local/nss_tests.c -@@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct torture_context *tctx, +@@ -247,7 +247,6 @@ static bool test_getgrnam_r(struct tortu return true; } @@ -10,7 +8,7 @@ index 2cd6122..04f13c6 100644 static bool test_getgrgid(struct torture_context *tctx, gid_t gid, struct group *grp_p) -@@ -333,6 +332,7 @@ static bool test_enum_passwd(struct torture_context *tctx, +@@ -333,6 +332,7 @@ static bool test_enum_passwd(struct tort return true; } @@ -18,7 +16,7 @@ index 2cd6122..04f13c6 100644 static bool test_enum_r_passwd(struct torture_context *tctx, struct passwd **pwd_array_p, size_t *num_pwd_p) -@@ -383,6 +383,7 @@ static bool test_enum_r_passwd(struct torture_context *tctx, +@@ -383,6 +383,7 @@ static bool test_enum_r_passwd(struct to return true; } @@ -26,7 +24,7 @@ index 2cd6122..04f13c6 100644 static bool torture_assert_passwd_equal(struct torture_context *tctx, const struct passwd *p1, -@@ -434,7 +435,7 @@ static bool test_passwd_r(struct torture_context *tctx) +@@ -434,7 +435,7 @@ static bool test_passwd_r(struct torture struct passwd *pwd, pwd1, pwd2; size_t num_pwd; @@ -35,7 +33,7 @@ index 2cd6122..04f13c6 100644 "failed to enumerate passwd"); for (i=0; i < num_pwd; i++) { -@@ -462,7 +463,7 @@ static bool test_passwd_r_cross(struct torture_context *tctx) +@@ -462,7 +463,7 @@ static bool test_passwd_r_cross(struct t struct passwd *pwd, pwd1, pwd2, pwd3, pwd4; size_t num_pwd; @@ -44,7 +42,7 @@ index 2cd6122..04f13c6 100644 "failed to enumerate passwd"); for (i=0; i < num_pwd; i++) { -@@ -533,6 +534,7 @@ static bool test_enum_group(struct torture_context *tctx, +@@ -533,6 +534,7 @@ static bool test_enum_group(struct tortu return true; } @@ -52,7 +50,7 @@ index 2cd6122..04f13c6 100644 static bool test_enum_r_group(struct torture_context *tctx, struct group **grp_array_p, size_t *num_grp_p) -@@ -583,6 +585,7 @@ static bool test_enum_r_group(struct torture_context *tctx, +@@ -583,6 +585,7 @@ static bool test_enum_r_group(struct tor return true; } @@ -60,7 +58,7 @@ index 2cd6122..04f13c6 100644 static bool torture_assert_group_equal(struct torture_context *tctx, const struct group *g1, -@@ -639,7 +642,7 @@ static bool test_group_r(struct torture_context *tctx) +@@ -639,7 +642,7 @@ static bool test_group_r(struct torture_ struct group *grp, grp1, grp2; size_t num_grp; @@ -69,7 +67,7 @@ index 2cd6122..04f13c6 100644 "failed to enumerate group"); for (i=0; i < num_grp; i++) { -@@ -667,7 +670,7 @@ static bool test_group_r_cross(struct torture_context *tctx) +@@ -667,7 +670,7 @@ static bool test_group_r_cross(struct to struct group *grp, grp1, grp2, grp3, grp4; size_t num_grp; diff --git a/net/samba4/patches/004-missing-headers.patch b/net/samba4/patches/004-missing-headers.patch index 58c26aece..5d294fcb8 100644 --- a/net/samba4/patches/004-missing-headers.patch +++ b/net/samba4/patches/004-missing-headers.patch @@ -1,5 +1,3 @@ -diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h -index b5d79b9..3f4eae0 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -31,6 +31,7 @@ @@ -10,8 +8,6 @@ index b5d79b9..3f4eae0 100644 struct parmlist_entry { struct parmlist_entry *prev, *next; -diff --git a/source3/lib/system_smbd.c b/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 @@ @@ -23,8 +19,6 @@ index 3b1ac9c..4044d75 100644 #ifndef HAVE_GETGROUPLIST -diff --git a/source4/torture/local/nss_tests.c b/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 @@ diff --git a/net/samba4/patches/005-musl_uintptr.patch b/net/samba4/patches/005-musl_uintptr.patch index de7f28572..4437e9fea 100644 --- a/net/samba4/patches/005-musl_uintptr.patch +++ b/net/samba4/patches/005-musl_uintptr.patch @@ -11,11 +11,9 @@ Date: Wed Mar 29 15:22:38 2017 -0300 Signed-off-by: Breno Leitao <breno.leitao@gmail.com> -diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h -index 303d0ae..a2bfc40 100644 --- a/third_party/cmocka/cmocka.h +++ b/third_party/cmocka/cmocka.h -@@ -111,7 +111,7 @@ +@@ -111,7 +111,7 @@ typedef uintmax_t LargestIntegralType; ((LargestIntegralType)(value)) /* Smallest integral type capable of holding a pointer. */ @@ -24,7 +22,7 @@ index 303d0ae..a2bfc40 100644 # if defined(_WIN32) /* WIN32 is an ILP32 platform */ typedef unsigned int uintptr_t; -@@ -137,6 +137,8 @@ +@@ -137,6 +137,8 @@ typedef uintmax_t LargestIntegralType; # define _UINTPTR_T # define _UINTPTR_T_DEFINED diff --git a/net/samba4/patches/006-netdb-defines.patch b/net/samba4/patches/006-netdb-defines.patch index d7d6446ab..7cb073c15 100644 --- a/net/samba4/patches/006-netdb-defines.patch +++ b/net/samba4/patches/006-netdb-defines.patch @@ -1,8 +1,6 @@ -diff --git a/nsswitch/wins.c b/nsswitch/wins.c -index dccb6dd..bb24acb 100644 --- a/nsswitch/wins.c +++ b/nsswitch/wins.c -@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER; +@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = #define INADDRSZ 4 #endif diff --git a/net/samba4/patches/007-libldb-fix-musl-libc-unkown-type-error.patch b/net/samba4/patches/007-libldb-fix-musl-libc-unkown-type-error.patch index c0e7e8907..192cf564d 100644 --- a/net/samba4/patches/007-libldb-fix-musl-libc-unkown-type-error.patch +++ b/net/samba4/patches/007-libldb-fix-musl-libc-unkown-type-error.patch @@ -13,8 +13,6 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> lib/tevent/tevent.h | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h -index aa6fe0d..2572696 100644 --- a/lib/tevent/tevent.h +++ b/lib/tevent/tevent.h @@ -32,6 +32,8 @@ @@ -26,6 +24,3 @@ index aa6fe0d..2572696 100644 struct tevent_context; struct tevent_ops; --- -2.7.4 - diff --git a/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch b/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch index 88c560d1a..507b74c9c 100644 --- a/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch +++ b/net/samba4/patches/009-samba-4-11-fix-host-tools-checks.patch.patch @@ -1,5 +1,5 @@ ---- a/wscript_configure_embedded_heimdal 2019-12-17 -+++ b/wscript_configure_embedded_heimdal 2019-12-17 +--- a/wscript_configure_embedded_heimdal ++++ b/wscript_configure_embedded_heimdal @@ -1 +1,12 @@ conf.RECURSE('source4/heimdal_build') + @@ -13,8 +13,8 @@ + +check_system_heimdal_binary("compile_et") +check_system_heimdal_binary("asn1_compile") ---- a/wscript_configure_system_heimdal 2019-12-17 -+++ b/wscript_configure_system_heimdal 2019-12-17 +--- a/wscript_configure_system_heimdal ++++ b/wscript_configure_system_heimdal @@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, funct conf.define('USING_SYSTEM_%s' % name.upper(), 1) return True diff --git a/net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch b/net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch index 1d19ec73c..bbc66a057 100644 --- a/net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch +++ b/net/samba4/patches/010-samba-4-12-fix-musl_missing__nss_buflen_passwd.patch @@ -1,5 +1,5 @@ ---- a/lib/util/util_paths.c 2020-07-03 -+++ b/lib/util/util_paths.c 2020-07-03 +--- a/lib/util/util_paths.c ++++ b/lib/util/util_paths.c @@ -26,6 +26,9 @@ #include "dynconfig/dynconfig.h" #include "lib/util/util_paths.h" diff --git a/net/samba4/patches/020-source3-msgsock-nvram-fix.patch b/net/samba4/patches/020-source3-msgsock-nvram-fix.patch index dc647a788..351f87bf7 100644 --- a/net/samba4/patches/020-source3-msgsock-nvram-fix.patch +++ b/net/samba4/patches/020-source3-msgsock-nvram-fix.patch @@ -1,5 +1,5 @@ ---- a/source3/lib/messages.c 2020-02-28 09:59:35.000000000 +0100 -+++ b/source3/lib/messages.c 2020-05-19 13:35:11.814566657 +0200 +--- a/source3/lib/messages.c ++++ b/source3/lib/messages.c @@ -507,7 +507,7 @@ static NTSTATUS messaging_init_internal( return NT_STATUS_ACCESS_DENIED; } diff --git a/net/samba4/patches/021-source4-msgsock-nvram-fix.patch b/net/samba4/patches/021-source4-msgsock-nvram-fix.patch index 527174001..d05e7bdcc 100644 --- a/net/samba4/patches/021-source4-msgsock-nvram-fix.patch +++ b/net/samba4/patches/021-source4-msgsock-nvram-fix.patch @@ -1,6 +1,6 @@ --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c -@@ -350,7 +350,7 @@ static struct imessaging_context *imessa +@@ -500,7 +500,7 @@ struct imessaging_context *imessaging_in goto fail; } diff --git a/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch b/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch index 2b5bcdf57..39bbb77b7 100644 --- a/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch +++ b/net/samba4/patches/101-do-not-check-xsltproc-manpages.patch @@ -4,7 +4,7 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> --- a/lib/ldb/wscript +++ b/lib/ldb/wscript -@@ -152,7 +152,7 @@ def configure(conf): +@@ -143,7 +143,7 @@ def configure(conf): conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2])) if conf.env.standalone_ldb: @@ -15,7 +15,7 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): --- a/lib/talloc/wscript +++ b/lib/talloc/wscript -@@ -49,7 +49,7 @@ def configure(conf): +@@ -48,7 +48,7 @@ def configure(conf): conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' conf.env.TALLOC_VERSION = VERSION @@ -26,12 +26,12 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> conf.CHECK_FUNCS('getauxval') --- a/lib/tdb/wscript +++ b/lib/tdb/wscript -@@ -89,7 +89,7 @@ def configure(conf): +@@ -95,7 +95,7 @@ def configure(conf): not conf.env.disable_tdb_mutex_locking): conf.define('USE_TDB_MUTEX_LOCKING', 1) - conf.CHECK_XSLTPROC_MANPAGES() + #conf.CHECK_XSLTPROC_MANPAGES() - if not conf.env.disable_python: - # also disable if we don't have the python libs installed + conf.SAMBA_CHECK_PYTHON() + conf.SAMBA_CHECK_PYTHON_HEADERS() diff --git a/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch b/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch index 1e2e11fcf..8bb80897d 100644 --- a/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch +++ b/net/samba4/patches/102-samba-4.11-unbundle-libbsd.patch @@ -1,6 +1,6 @@ --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -340,22 +340,13 @@ def configure(conf): +@@ -416,22 +416,13 @@ def configure(conf): conf.CHECK_FUNCS('prctl dirname basename') @@ -29,7 +29,7 @@ conf.CHECK_CODE(''' struct ucred cred; -@@ -698,9 +689,6 @@ def configure(conf): +@@ -809,9 +800,6 @@ def configure(conf): # look for a method of finding the list of network interfaces for method in ['HAVE_IFACE_GETIFADDRS', 'HAVE_IFACE_AIX', 'HAVE_IFACE_IFCONF', 'HAVE_IFACE_IFREQ']: @@ -39,8 +39,8 @@ if conf.CHECK_CODE(''' #define %s 1 #define NO_CONFIG_H 1 -@@ -713,7 +701,7 @@ def configure(conf): - #include "test/getifaddrs.c" +@@ -824,7 +812,7 @@ def configure(conf): + #include "tests/getifaddrs.c" ''' % method, method, - lib='nsl socket' + bsd_for_strlcpy, @@ -48,12 +48,11 @@ addmain=False, execute=True): break -@@ -761,7 +749,6 @@ def build(bld): +@@ -872,7 +860,6 @@ def build(bld): break extra_libs = '' - if bld.CONFIG_SET('HAVE_LIBBSD'): extra_libs += ' bsd' if bld.CONFIG_SET('HAVE_LIBRT'): extra_libs += ' rt' - - bld.SAMBA_SUBSYSTEM('LIBREPLACE_HOSTCC', - REPLACE_HOSTCC_SOURCE, + if bld.CONFIG_SET('REPLACE_REQUIRES_LIBSOCKET_LIBNSL'): extra_libs += ' socket nsl' + diff --git a/net/samba4/patches/103-samba-4.12-unbundle-libunwind.patch b/net/samba4/patches/103-samba-4.12-unbundle-libunwind.patch index 043b0a3b0..14a010c42 100644 --- a/net/samba4/patches/103-samba-4.12-unbundle-libunwind.patch +++ b/net/samba4/patches/103-samba-4.12-unbundle-libunwind.patch @@ -1,5 +1,5 @@ ---- a/lib/util/wscript_configure 2020-06-14 -+++ b/lib/util/wscript_configure 2020-06-14 +--- a/lib/util/wscript_configure ++++ b/lib/util/wscript_configure @@ -11,13 +11,13 @@ conf.CHECK_FUNCS_IN('backtrace backtrace conf.CHECK_HEADERS('execinfo.h') diff --git a/net/samba4/patches/104-samba-4.12-unbundle-icu.patch b/net/samba4/patches/104-samba-4.12-unbundle-icu.patch index fcba20609..bceaa1add 100644 --- a/net/samba4/patches/104-samba-4.12-unbundle-icu.patch +++ b/net/samba4/patches/104-samba-4.12-unbundle-icu.patch @@ -1,5 +1,5 @@ ---- a/lib/util/charset/wscript_configure 2020-06-14 -+++ b/lib/util/charset/wscript_configure 2020-06-14 +--- a/lib/util/charset/wscript_configure ++++ b/lib/util/charset/wscript_configure @@ -37,15 +37,15 @@ conf.CHECK_CODE(''' lib='iconv', headers='errno.h iconv.h') |