[oe-commits] [meta-openembedded] 13/21: samba: Refresh musl pam patch
git at git.openembedded.org
git at git.openembedded.org
Sat Feb 24 04:47:14 UTC 2018
This is an automated email from the git hooks/post-receive script.
armin_kuster pushed a commit to branch master-next
in repository meta-openembedded.
commit 73b3bebc1e22194a37cdf66af2a7291051797abd
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Mon Feb 5 23:46:18 2018 -0800
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 at gmail.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
.../{samba-4.2.7-pam.patch => samba-pam.patch} | 21 +++++++++++----------
.../recipes-connectivity/samba/samba_4.7.0.bb | 2 +-
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
similarity index 73%
rename from meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch
rename to meta-networking/recipes-connectivity/samba/samba/samba-pam.patch
index 6b9ade9..0cbacb6 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 at 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 27918d2..a50b24d 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 \
"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list