summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-connectivity/samba
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking/recipes-connectivity/samba')
-rw-r--r--meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch70
-rw-r--r--meta-networking/recipes-connectivity/samba/samba_4.19.8.bb (renamed from meta-networking/recipes-connectivity/samba/samba_4.19.5.bb)29
2 files changed, 88 insertions, 11 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch b/meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch
new file mode 100644
index 0000000000..e07e86e887
--- /dev/null
+++ b/meta-networking/recipes-connectivity/samba/samba/9aa5c43315d83c19514251a11c4fba5a137f2821.patch
@@ -0,0 +1,70 @@
1From 9aa5c43315d83c19514251a11c4fba5a137f2821 Mon Sep 17 00:00:00 2001
2From: Andreas Schneider <asn@samba.org>
3Date: Tue, 21 Jan 2025 17:59:27 +0100
4Subject: [PATCH] lib:replace: Don't use deprecated readline CPPFunction cast
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9HAVE_RL_COMPLETION_FUNC_T was unused and not checking for the right
10function.
11
12libcli/smbreadline/smbreadline.c: In function ‘smb_readline’:
13libcli/smbreadline/smbreadline.c:139:17: warning: ‘CPPFunction’ is deprecated [-Wdeprecated-declarations]
14 139 | rl_attempted_completion_function = RL_COMPLETION_CAST completion_fn;
15 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16libcli/smbreadline/smbreadline.c:139:50: error: assignment to ‘char ** (*)(const char *, int, int)’ from incompatible pointer type ‘char ** (*)(void)’ [-Wincompatible-pointer-types]
17 139 | rl_attempted_completion_function = RL_COMPLETION_CAST completion_fn;
18 | ^
19
20BUG: https://bugzilla.samba.org/show_bug.cgi?id=15788
21
22Signed-off-by: Andreas Schneider <asn@samba.org>
23Reviewed-by: Alexander Bokovoy <ab@samba.org>
24
25Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
26Autobuild-Date(master): Tue Jan 21 19:38:37 UTC 2025 on atb-devel-224
27
28Upstream-Status: Backport [https://github.com/samba-team/samba/commit/9aa5c43315d83c19514251a11c4fba5a137f2821]
29
30Signed-off-by: Markus Volk <f_l_k@t-online.de>
31---
32 lib/replace/system/readline.h | 4 +++-
33 libcli/smbreadline/wscript_configure | 8 +++++---
34 2 files changed, 8 insertions(+), 4 deletions(-)
35
36diff --git a/lib/replace/system/readline.h b/lib/replace/system/readline.h
37index 9a9af266ca6d..ac3604fc12e0 100644
38--- a/lib/replace/system/readline.h
39+++ b/lib/replace/system/readline.h
40@@ -46,7 +46,9 @@
41 #endif
42
43 #ifdef HAVE_NEW_LIBREADLINE
44-#ifdef HAVE_CPPFUNCTION
45+#if defined(HAVE_RL_COMPLETION_FUNC_T)
46+# define RL_COMPLETION_CAST (rl_completion_func_t *)
47+#elif defined(HAVE_CPPFUNCTION)
48 # define RL_COMPLETION_CAST (CPPFunction *)
49 #elif defined(HAVE_RL_COMPLETION_T)
50 # define RL_COMPLETION_CAST (rl_completion_t *)
51diff --git a/libcli/smbreadline/wscript_configure b/libcli/smbreadline/wscript_configure
52index 912ff53a150d..f5a401ebae00 100644
53--- a/libcli/smbreadline/wscript_configure
54+++ b/libcli/smbreadline/wscript_configure
55@@ -51,10 +51,12 @@ conf.CHECK_CODE('''
56 # endif
57 # endif
58 #endif
59-int main(void) {rl_completion_t f; return 0;}
60+int main(void) {rl_completion_func_t f; return 0;}
61 ''',
62-'HAVE_RL_COMPLETION_FUNC_T', execute=False, addmain=False,
63-msg='Checking for rl_completion_t')
64+ 'HAVE_RL_COMPLETION_FUNC_T',
65+ execute=False,
66+ addmain=False,
67+ msg='Checking for rl_completion_func_t')
68
69 conf.CHECK_CODE('''
70 #ifdef HAVE_READLINE_READLINE_H
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.19.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb
index f5ef86dd4b..0213d131e5 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.19.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb
@@ -12,7 +12,7 @@ ${SAMBA_MIRROR} http://mirror.internode.on.net/pub/samba \n \
12${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ 12${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \
13" 13"
14 14
15export PYTHONHASHSEED="1" 15export PYTHONHASHSEED = "1"
16 16
17SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ 17SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
18 file://smb.conf \ 18 file://smb.conf \
@@ -24,6 +24,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
24 file://0005-Fix-pyext_PATTERN-for-cross-compilation.patch \ 24 file://0005-Fix-pyext_PATTERN-for-cross-compilation.patch \
25 file://0006-smbtorture-skip-test-case-tfork_cmd_send.patch \ 25 file://0006-smbtorture-skip-test-case-tfork_cmd_send.patch \
26 file://0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch \ 26 file://0007-Deleted-settiong-of-python-to-fix-the-install-confli.patch \
27 file://9aa5c43315d83c19514251a11c4fba5a137f2821.patch \
27 " 28 "
28 29
29SRC_URI:append:libc-musl = " \ 30SRC_URI:append:libc-musl = " \
@@ -31,7 +32,7 @@ SRC_URI:append:libc-musl = " \
31 file://samba-4.3.9-remove-getpwent_r.patch \ 32 file://samba-4.3.9-remove-getpwent_r.patch \
32 " 33 "
33 34
34SRC_URI[sha256sum] = "0e2405b4cec29d0459621f4340a1a74af771ec7cffedff43250cad7f1f87605e" 35SRC_URI[sha256sum] = "1aeff76c207f383477ce4badebd154691c408d2e15b01b333c85eb775468ddf6"
35 36
36UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" 37UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz"
37 38
@@ -69,7 +70,7 @@ SYSTEMD_AUTO_ENABLE:${PN}-ad-dc = "disable"
69 70
70#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen 71#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen
71#to cross Popen 72#to cross Popen
72export WAF_NO_PREFORK="yes" 73export WAF_NO_PREFORK = "yes"
73 74
74# Use krb5. Build active domain controller. 75# Use krb5. Build active domain controller.
75# 76#
@@ -95,16 +96,16 @@ PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd"
95PACKAGECONFIG[ad-dc] = "--with-experimental-mit-ad-dc,--without-ad-dc,python3-markdown python3-dnspython," 96PACKAGECONFIG[ad-dc] = "--with-experimental-mit-ad-dc,--without-ad-dc,python3-markdown python3-dnspython,"
96PACKAGECONFIG[mitkrb5] = "--with-system-mitkrb5 --with-system-mitkdc=/usr/sbin/krb5kdc,,krb5," 97PACKAGECONFIG[mitkrb5] = "--with-system-mitkrb5 --with-system-mitkdc=/usr/sbin/krb5kdc,,krb5,"
97 98
98SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" 99SAMBA4_IDMAP_MODULES = "idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2"
99SAMBA4_PDB_MODULES="pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4" 100SAMBA4_PDB_MODULES = "pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4"
100SAMBA4_AUTH_MODULES="auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4" 101SAMBA4_AUTH_MODULES = "auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4"
101SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}" 102SAMBA4_MODULES = "${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}"
102 103
103# These libraries are supposed to replace others supplied by packages, but decorate the names of 104# These libraries are supposed to replace others supplied by packages, but decorate the names of
104# .so files so there will not be a conflict. This is not done consistantly, so be very careful 105# .so files so there will not be a conflict. This is not done consistantly, so be very careful
105# when adding to this list. 106# when adding to this list.
106# 107#
107SAMBA4_LIBS="heimdal,NONE" 108SAMBA4_LIBS = "heimdal,NONE"
108 109
109EXTRA_OECONF += "--enable-fhs \ 110EXTRA_OECONF += "--enable-fhs \
110 --with-piddir=/run \ 111 --with-piddir=/run \
@@ -125,7 +126,7 @@ EXTRA_OECONF += "--enable-fhs \
125 --pythondir=${PYTHON_SITEPACKAGES_DIR} \ 126 --pythondir=${PYTHON_SITEPACKAGES_DIR} \
126 " 127 "
127 128
128LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 129LDFLAGS += "-Wl,-z,relro,-z,now"
129 130
130do_configure:append() { 131do_configure:append() {
131 cd ${S}/pidl/ 132 cd ${S}/pidl/
@@ -173,8 +174,8 @@ do_install:append() {
173 174
174 install -d ${D}${sysconfdir}/samba 175 install -d ${D}${sysconfdir}/samba
175 echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts 176 echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts
176 install -m644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf 177 install -m644 ${UNPACKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf
177 install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba 178 install -D -m 644 ${UNPACKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba
178 179
179 install -d ${D}${sysconfdir}/default 180 install -d ${D}${sysconfdir}/default
180 install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba 181 install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba
@@ -353,4 +354,10 @@ RDEPENDS:${PN}-test = "\
353 ${PN}-testsuite \ 354 ${PN}-testsuite \
354 " 355 "
355 356
357pkg_postinst:${PN}-common() {
358 if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
359 ${sysconfdir}/init.d/populate-volatile.sh update
360 fi
361}
362
356ALLOW_EMPTY:${PN}-test = "1" 363ALLOW_EMPTY:${PN}-test = "1"