diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-02-05 23:46:18 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-03-12 10:02:03 -0700 |
commit | 50d876e9acb279379adf87caa5b7808b909c999c (patch) | |
tree | cf06ca91806af940ee72bc05c6fea0d8c30c6880 /meta-networking | |
parent | 7063991123e7b77ba76ed03b5f13102e94286112 (diff) | |
download | meta-openembedded-50d876e9acb279379adf87caa5b7808b909c999c.tar.gz |
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>
Diffstat (limited to 'meta-networking')
-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.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 index 6b9ade920..0cbacb6c0 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 | |||
4 | 4 | ||
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
6 | 6 | ||
7 | 7 | Index: samba-4.7.0/source3/wscript | |
8 | Index: samba-4.4.5/source3/wscript | ||
9 | =================================================================== | 8 | =================================================================== |
10 | --- samba-4.4.5.orig/source3/wscript | 9 | --- samba-4.7.0.orig/source3/wscript |
11 | +++ samba-4.4.5/source3/wscript | 10 | +++ samba-4.7.0/source3/wscript |
12 | @@ -873,7 +873,7 @@ msg.msg_accrightslen = sizeof(fd); | 11 | @@ -875,7 +875,7 @@ msg.msg_accrightslen = sizeof(fd); |
13 | if conf.env.with_iconv: | 12 | if conf.env.with_iconv: |
14 | conf.DEFINE('HAVE_ICONV', 1) | 13 | conf.DEFINE('HAVE_ICONV', 1) |
15 | 14 | ||
@@ -18,10 +17,10 @@ Index: samba-4.4.5/source3/wscript | |||
18 | use_pam=True | 17 | use_pam=True |
19 | conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') | 18 | conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') |
20 | if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): | 19 | if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): |
21 | @@ -945,6 +945,15 @@ int i; i = PAM_RADIO_TYPE; | 20 | @@ -952,6 +952,17 @@ int i; i = PAM_RADIO_TYPE; |
22 | if use_pam: | 21 | "or headers not found. Use --without-pam to disable " |
23 | conf.DEFINE('WITH_PAM', 1) | 22 | "PAM support."); |
24 | conf.DEFINE('WITH_PAM_MODULES', 1) | 23 | |
25 | + else: | 24 | + else: |
26 | + Logs.warn("PAM disabled") | 25 | + Logs.warn("PAM disabled") |
27 | + use_pam=False | 26 | + use_pam=False |
@@ -31,6 +30,8 @@ Index: samba-4.4.5/source3/wscript | |||
31 | + conf.undefine('PAM_RHOST') | 30 | + conf.undefine('PAM_RHOST') |
32 | + conf.undefine('PAM_TTY') | 31 | + conf.undefine('PAM_TTY') |
33 | + conf.undefine('HAVE_PAM_PAM_APPL_H') | 32 | + conf.undefine('HAVE_PAM_PAM_APPL_H') |
34 | 33 | + | |
34 | + | ||
35 | seteuid = False | 35 | seteuid = False |
36 | 36 | ||
37 | # | ||
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 27918d2a0..a50b24de5 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 \ | |||
26 | file://volatiles.03_samba \ | 26 | file://volatiles.03_samba \ |
27 | " | 27 | " |
28 | SRC_URI_append_libc-musl = " \ | 28 | SRC_URI_append_libc-musl = " \ |
29 | file://samba-4.2.7-pam.patch \ | 29 | file://samba-pam.patch \ |
30 | file://samba-4.3.9-remove-getpwent_r.patch \ | 30 | file://samba-4.3.9-remove-getpwent_r.patch \ |
31 | " | 31 | " |
32 | 32 | ||