From 427651e58f470d135207276ab95319bf041d6e83 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 5 Feb 2018 23:46:18 -0800 Subject: samba: Refresh musl pam patch last update left the musl builds broken since the patch was not forward ported Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- .../samba/samba/samba-4.2.7-pam.patch | 36 --------------------- .../samba/samba/samba-pam.patch | 37 ++++++++++++++++++++++ .../recipes-connectivity/samba/samba_4.7.0.bb | 2 +- 3 files changed, 38 insertions(+), 37 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch create mode 100644 meta-networking/recipes-connectivity/samba/samba/samba-pam.patch diff --git a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch b/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch deleted file mode 100644 index 6b9ade920e..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch +++ /dev/null @@ -1,36 +0,0 @@ -Lifted from gentoo and ported to 4.4.5 - -http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch - -Signed-off-by: Khem Raj - - -Index: samba-4.4.5/source3/wscript -=================================================================== ---- samba-4.4.5.orig/source3/wscript -+++ samba-4.4.5/source3/wscript -@@ -873,7 +873,7 @@ msg.msg_accrightslen = sizeof(fd); - if conf.env.with_iconv: - conf.DEFINE('HAVE_ICONV', 1) - -- if Options.options.with_pam: -+ if Options.options.with_pam != False: - 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) -+ else: -+ Logs.warn("PAM disabled") -+ use_pam=False -+ conf.undefine('WITH_PAM') -+ conf.undefine('WITH_PAM_MODULES') -+ conf.undefine('HAVE_SECURITY_PAM_APPL_H') -+ 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/samba-pam.patch b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch new file mode 100644 index 0000000000..0cbacb6c0e --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch @@ -0,0 +1,37 @@ +Lifted from gentoo and ported to 4.4.5 + +http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch + +Signed-off-by: Khem Raj + +Index: samba-4.7.0/source3/wscript +=================================================================== +--- 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) + +- if Options.options.with_pam: ++ if Options.options.with_pam != False: + 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'): +@@ -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 ++ conf.undefine('WITH_PAM') ++ conf.undefine('WITH_PAM_MODULES') ++ conf.undefine('HAVE_SECURITY_PAM_APPL_H') ++ 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 \ " -- cgit 1.2.3-korg