[gentoo-commits] repo/gentoo:master commit in: net-fs/samba/files/, net-fs/samba/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     948d49c06a25b88eed648e723677e6134d8ba473
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 17 08:09:47 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Apr 17 08:09:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=948d49c0

net-fs/samba: Replaced no_ads patch with official upstream version.

Package-Manager: Portage-2.3.29, Repoman-2.3.9

 net-fs/samba/files/samba-4.6-no_ads.patch   | 37 +++++++++++++++++++++++++++++
 net-fs/samba/files/samba-4.7.4-no_ads.patch | 22 -----------------
 net-fs/samba/samba-4.6.14.ebuild            |  1 +
 net-fs/samba/samba-4.7.6.ebuild             |  2 +-
 net-fs/samba/samba-4.8.0.ebuild             |  2 +-
 5 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/net-fs/samba/files/samba-4.6-no_ads.patch b/net-fs/samba/files/samba-4.6-no_ads.patch
new file mode 100644
index 00000000000..e3f3dfd0305
--- /dev/null
+++ b/net-fs/samba/files/samba-4.6-no_ads.patch
@@ -0,0 +1,37 @@
+From 655504d97a98541bebac812953fd48c49526312d Mon Sep 17 00:00:00 2001
+From: Volker Lendecke <vl@samba.org>
+Date: Sat, 3 Feb 2018 07:07:24 +0100
+Subject: [PATCH] libads: Fix the build --without-ads
+
+Signed-off-by: Volker Lendecke <vl@samba.org>
+Reviewed-by: David Disseldorp <ddiss@samba.org>
+
+Autobuild-User(master): David Disseldorp <ddiss@samba.org>
+Autobuild-Date(master): Tue Feb  6 02:47:44 CET 2018 on sn-devel-144
+
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=13273
+
+(cherry picked from commit 859698d29b547217356851094ed8188236e717b6)
+---
+ source3/libads/kerberos_keytab.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
+index ffd100c..37ac7ba 100644
+--- a/source3/libads/kerberos_keytab.c
++++ b/source3/libads/kerberos_keytab.c
+@@ -640,7 +640,11 @@ int ads_keytab_list(const char *keytab_name)
+ 	}
+ 
+ 	if (keytab_name == NULL) {
++#ifdef HAVE_ADS
+ 		ret = ads_keytab_open(context, &keytab);
++#else
++		ret = ENOENT;
++#endif
+ 	} else {
+ 		ret = smb_krb5_kt_open(context, keytab_name, False, &keytab);
+ 	}
+-- 
+1.9.1
+

diff --git a/net-fs/samba/files/samba-4.7.4-no_ads.patch b/net-fs/samba/files/samba-4.7.4-no_ads.patch
deleted file mode 100644
index d4c26a39a73..00000000000
--- a/net-fs/samba/files/samba-4.7.4-no_ads.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://lists.samba.org/archive/samba-technical/2017-December/124629.html
-
---- a/source3/libads/kerberos_keytab.c
-+++ b/source3/libads/kerberos_keytab.c
-@@ -32,8 +32,6 @@
- 
- #ifdef HAVE_KRB5
- 
--#ifdef HAVE_ADS
--
- /* This MAX_NAME_LEN is a constant defined in krb5.h */
- #ifndef MAX_KEYTAB_NAME_LEN
- #define MAX_KEYTAB_NAME_LEN 1100
-@@ -85,6 +83,8 @@
- 	return ret;
- }
- 
-+#ifdef HAVE_ADS
-+
- /**********************************************************************
-  Adds a single service principal, i.e. 'host' to the system keytab
- ***********************************************************************/

diff --git a/net-fs/samba/samba-4.6.14.ebuild b/net-fs/samba/samba-4.6.14.ebuild
index e12d8c119d6..ac34ac0c5aa 100644
--- a/net-fs/samba/samba-4.6.14.ebuild
+++ b/net-fs/samba/samba-4.6.14.ebuild
@@ -122,6 +122,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
 	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
 	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
+	"${FILESDIR}/${PN}-4.6-no_ads.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"

diff --git a/net-fs/samba/samba-4.7.6.ebuild b/net-fs/samba/samba-4.7.6.ebuild
index 48e53c45e32..5b1399ed756 100644
--- a/net-fs/samba/samba-4.7.6.ebuild
+++ b/net-fs/samba/samba-4.7.6.ebuild
@@ -132,7 +132,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
 	"${FILESDIR}"/talloc-disable-python.patch
 	"${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
-	"${FILESDIR}/${PN}-4.7.4-no_ads.patch"
+	"${FILESDIR}/${PN}-4.6-no_ads.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"

diff --git a/net-fs/samba/samba-4.8.0.ebuild b/net-fs/samba/samba-4.8.0.ebuild
index fe842587774..7a9862d6d28 100644
--- a/net-fs/samba/samba-4.8.0.ebuild
+++ b/net-fs/samba/samba-4.8.0.ebuild
@@ -131,7 +131,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
 	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-	"${FILESDIR}/${PN}-4.7.4-no_ads.patch"
+	"${FILESDIR}/${PN}-4.6-no_ads.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"