summaryrefslogtreecommitdiff
path: root/net-fs
diff options
context:
space:
mode:
authorMike Frysinger <vapier@chromium.org>2018-01-23 16:34:04 -0500
committerMike Frysinger <vapier@gentoo.org>2018-01-23 16:36:09 -0500
commit1e37ae494f22a9770f779bb6d52da3c098309887 (patch)
tree13b2f2131c3af78311a3c8905294587bb7f050e7 /net-fs
parentdev-java/oracle-jre-bin: Remove vulnerable 1.8.0.152-r1 (diff)
downloadgentoo-1e37ae494f22a9770f779bb6d52da3c098309887.tar.gz
gentoo-1e37ae494f22a9770f779bb6d52da3c098309887.tar.bz2
gentoo-1e37ae494f22a9770f779bb6d52da3c098309887.zip
net-fs/samba: add upstream fix for cross-compiling
Diffstat (limited to 'net-fs')
-rw-r--r--net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch40
-rw-r--r--net-fs/samba/samba-4.7.3.ebuild1
-rw-r--r--net-fs/samba/samba-4.7.4.ebuild1
3 files changed, 42 insertions, 0 deletions
diff --git a/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch b/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch
new file mode 100644
index 00000000000..9fad9fca44f
--- /dev/null
+++ b/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch
@@ -0,0 +1,40 @@
+https://lists.samba.org/archive/samba-technical/2017-December/124344.html
+https://git.samba.org/?p=samba.git;a=commit;h=70f92025ae504cda97ff3a130f19035450967836
+
+From 70f92025ae504cda97ff3a130f19035450967836 Mon Sep 17 00:00:00 2001
+From: Zentaro Kavanagh <zentaro@chromium.org>
+Date: Mon, 11 Dec 2017 12:41:16 -0800
+Subject: [PATCH] Remove unsupported colon from configure msg.
+
+- When cross-compiling an answers file must be supplied via
+ --cross-compile --cross-answers=<path to answers>.
+- The lines in the answer file have the form;
+ Config Msg: Answer
+- The colon is used to delimit the msg and the answer when reading
+ the answers file.
+- WAF doesn't support the message containing a colon.
+- It's not possible to override this variable so cross compile fails.
+
+Signed-off-by: Zentaro Kavanagh <zentaro@google.com>
+Reviewed-by: Uri Simchoni <uri@samba.org>
+Reviewed-by: Andrew Bartlett <abartlet@samba.org>
+---
+ wscript_configure_system_mitkrb5 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
+index 9c351131ad1a..803dad7ab63b 100644
+--- a/wscript_configure_system_mitkrb5
++++ b/wscript_configure_system_mitkrb5
+@@ -282,7 +282,7 @@ conf.CHECK_CODE('''
+ ''',
+ 'HAVE_WRFILE_KEYTAB',
+ headers='krb5.h', lib='krb5', execute=True,
+- msg="Checking whether the WRFILE:-keytab is supported");
++ msg="Checking whether the WRFILE -keytab is supported");
+ # Check for KRB5_DEPRECATED handling
+ conf.CHECK_CODE('''#define KRB5_DEPRECATED 1
+ #include <krb5.h>''',
+--
+2.15.1
+
diff --git a/net-fs/samba/samba-4.7.3.ebuild b/net-fs/samba/samba-4.7.3.ebuild
index 5656d87fe61..96bd7cdf5f9 100644
--- a/net-fs/samba/samba-4.7.3.ebuild
+++ b/net-fs/samba/samba-4.7.3.ebuild
@@ -119,6 +119,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
"${FILESDIR}"/talloc-disable-python.patch
"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
+ "${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.7.4.ebuild b/net-fs/samba/samba-4.7.4.ebuild
index bcab7bd8aec..13fa3acc76c 100644
--- a/net-fs/samba/samba-4.7.4.ebuild
+++ b/net-fs/samba/samba-4.7.4.ebuild
@@ -119,6 +119,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
"${FILESDIR}"/talloc-disable-python.patch
"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
+ "${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
"${FILESDIR}/${P}-no_ads.patch"
)