aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-02-05 23:46:18 -0800
committerArmin Kuster <akuster808@gmail.com>2018-02-11 13:30:50 -0800
commit427651e58f470d135207276ab95319bf041d6e83 (patch)
tree27e2bc8f6e31435dea2bdfa1ce0af94c030c2802
parent373744b3fbb37922696620e680cd9836ea0ac7be (diff)
downloadmeta-openembedded-contrib-427651e58f470d135207276ab95319bf041d6e83.tar.gz
meta-openembedded-contrib-427651e58f470d135207276ab95319bf041d6e83.tar.bz2
meta-openembedded-contrib-427651e58f470d135207276ab95319bf041d6e83.zip
samba: Refresh musl pam patch
last update left the musl builds broken since the patch was not forward ported Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/recipes-connectivity/samba/samba/samba-pam.patch (renamed from meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch)21
-rw-r--r--meta-networking/recipes-connectivity/samba/samba_4.7.0.bb2
2 files changed, 12 insertions, 11 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch
index 6b9ade920e..0cbacb6c0e 100644
--- a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch
+++ b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch
@@ -4,12 +4,11 @@ http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: samba-4.4.5/source3/wscript
+Index: samba-4.7.0/source3/wscript
===================================================================
---- samba-4.4.5.orig/source3/wscript
-+++ samba-4.4.5/source3/wscript
-@@ -873,7 +873,7 @@ msg.msg_accrightslen = sizeof(fd);
+--- samba-4.7.0.orig/source3/wscript
++++ samba-4.7.0/source3/wscript
+@@ -875,7 +875,7 @@ msg.msg_accrightslen = sizeof(fd);
if conf.env.with_iconv:
conf.DEFINE('HAVE_ICONV', 1)
@@ -18,10 +17,10 @@ Index: samba-4.4.5/source3/wscript
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'):
-@@ -945,6 +945,15 @@ int i; i = PAM_RADIO_TYPE;
- if use_pam:
- conf.DEFINE('WITH_PAM', 1)
- conf.DEFINE('WITH_PAM_MODULES', 1)
+@@ -952,6 +952,17 @@ int i; i = PAM_RADIO_TYPE;
+ "or headers not found. Use --without-pam to disable "
+ "PAM support.");
+
+ else:
+ Logs.warn("PAM disabled")
+ use_pam=False
@@ -31,6 +30,8 @@ Index: samba-4.4.5/source3/wscript
+ conf.undefine('PAM_RHOST')
+ conf.undefine('PAM_TTY')
+ conf.undefine('HAVE_PAM_PAM_APPL_H')
-
++
++
seteuid = False
+ #
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb b/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb
index 27918d2a0e..a50b24de5e 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb
@@ -26,7 +26,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
file://volatiles.03_samba \
"
SRC_URI_append_libc-musl = " \
- file://samba-4.2.7-pam.patch \
+ file://samba-pam.patch \
file://samba-4.3.9-remove-getpwent_r.patch \
"