net-fs/samba: revbump

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

8 files changed, 41 insertions, 103 deletions

diff --git a/net-fs/samba/files/4.3/samba4.confd b/net-fs/samba/files/4.4/samba4.confd
index 58b2c782..58b2c782 100644
--- a/net-fs/samba/files/4.3/samba4.confd
+++ b/net-fs/samba/files/4.4/samba4.confd
diff --git a/net-fs/samba/files/4.3/samba4.initd-r1 b/net-fs/samba/files/4.4/samba4.initd-r1
index bf162ad7..52a9b68b 100644
--- a/net-fs/samba/files/4.3/samba4.initd-r1
+++ b/net-fs/samba/files/4.4/samba4.initd-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
 
 extra_started_commands="reload"
 piddir="/run/samba"
diff --git a/net-fs/samba/files/netdb-defines.patch b/net-fs/samba/files/netdb-defines.patch
new file mode 100644
index 00000000..d7d6446a
--- /dev/null
+++ b/net-fs/samba/files/netdb-defines.patch
@@ -0,0 +1,19 @@
+diff --git a/nsswitch/wins.c b/nsswitch/wins.c
+index dccb6dd..bb24acb 100644
+--- a/nsswitch/wins.c
++++ b/nsswitch/wins.c
+@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER;
+ #define INADDRSZ 4
+ #endif
+ 
++#ifndef NETDB_INTERNAL
++#define NETDB_INTERNAL -1
++#endif
++
++#ifndef NETDB_SUCCESS
++#define NETDB_SUCCESS 0
++#endif
++
+ NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname,
+ 				     struct hostent *he,
+ 				     char *buffer,
diff --git a/net-fs/samba/files/samba-4.2.3-heimdal_compilefix.patch b/net-fs/samba/files/samba-4.2.3-heimdal_compilefix.patch
deleted file mode 100644
index c6f50073..00000000
--- a/net-fs/samba/files/samba-4.2.3-heimdal_compilefix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/542638
-
-From: Stephan Wolf <stephan@letzte-bankreihe.de>
-
-Samba uses the build in implementation of heimdal from year 2011.
-The ebuild uses the portage version of heimdal.
-I got it fixed to patch samba kdc_init function.
-
---- samba-4.2.3/source4/kdc/kdc.c
-+++ samba-4.2.3/source4/kdc/kdc.c
-@@ -967,9 +967,9 @@
- 	 * The old behavior in the _kdc_get_preferred_key()
- 	 * function is use_strongest_server_key=TRUE.
- 	 */
--	kdc->config->as_use_strongest_session_key = false;
-+	kdc->config->tgt_use_strongest_session_key = false;
- 	kdc->config->preauth_use_strongest_session_key = false;
--	kdc->config->tgs_use_strongest_session_key = false;
-+	kdc->config->svc_use_strongest_session_key = false;
- 	kdc->config->use_strongest_server_key = true;
- 
- 	/* Register hdb-samba4 hooks for use as a keytab */
diff --git a/net-fs/samba/files/samba-4.3.9-remove-rep_strtoull.patch b/net-fs/samba/files/samba-4.3.9-remove-rep_strtoull.patch
deleted file mode 100644
index 9c414545..00000000
--- a/net-fs/samba/files/samba-4.3.9-remove-rep_strtoull.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Naur samba-4.3.9.orig/lib/replace/replace.c samba-4.3.9/lib/replace/replace.c
---- samba-4.3.9.orig/lib/replace/replace.c	2015-09-08 13:45:25.000000000 +0000
-+++ samba-4.3.9/lib/replace/replace.c	2016-05-29 06:47:07.529796925 +0000
-@@ -558,43 +558,6 @@
- #endif /* HAVE_STRTOLL */
- 
- 
--#ifndef HAVE_STRTOULL
--unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
--{
--#ifdef HAVE_STRTOUQ
--	return strtouq(str, endptr, base);
--#elif defined(HAVE___STRTOULL) 
--	return __strtoull(str, endptr, base);
--#elif SIZEOF_LONG == SIZEOF_LONG_LONG
--	return (unsigned long long int) strtoul(str, endptr, base);
--#else
--# error "You need a strtoull function"
--#endif
--}
--#else
--#ifdef HAVE_BSD_STRTOLL
--#ifdef HAVE_STRTOUQ
--unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
--{
--	unsigned long long int nb = strtouq(str, endptr, base);
--	/* In linux EINVAL is only returned if base is not ok */
--	if (errno == EINVAL) {
--		if (base == 0 || (base >1 && base <37)) {
--			/* Base was ok so it's because we were not
--			 * able to make the convertion.
--			 * Let's reset errno.
--			 */
--			errno = 0;
--		}
--	}
--	return nb;
--}
--#else
--#error "You need the strtouq function"
--#endif /* HAVE_STRTOUQ */
--#endif /* HAVE_BSD_STRTOLL */
--#endif /* HAVE_STRTOULL */
--
- #ifndef HAVE_SETENV
- int rep_setenv(const char *name, const char *value, int overwrite) 
- {
-diff -Naur samba-4.3.9.orig/lib/replace/replace.h samba-4.3.9/lib/replace/replace.h
---- samba-4.3.9.orig/lib/replace/replace.h	2015-09-08 13:45:25.000000000 +0000
-+++ samba-4.3.9/lib/replace/replace.h	2016-05-29 06:47:28.886795715 +0000
-@@ -371,16 +371,6 @@
- #endif
- #endif
- 
--#ifndef HAVE_STRTOULL
--#define strtoull rep_strtoull
--unsigned long long int rep_strtoull(const char *str, char **endptr, int base);
--#else
--#ifdef HAVE_BSD_STRTOLL /* yes, it's not HAVE_BSD_STRTOULL */
--#define strtoull rep_strtoull
--unsigned long long int rep_strtoull(const char *str, char **endptr, int base);
--#endif
--#endif
--
- #ifndef HAVE_FTRUNCATE
- #define ftruncate rep_ftruncate
- int rep_ftruncate(int,off_t);
diff --git a/net-fs/samba/files/samba-4.2.7-pam.patch b/net-fs/samba/files/samba-4.4.0-pam.patch
index 22b393e7..45160138 100644
--- a/net-fs/samba/files/samba-4.2.7-pam.patch
+++ b/net-fs/samba/files/samba-4.4.0-pam.patch
@@ -1,8 +1,6 @@
---- samba-4.2.7/source3/wscript
-+++ samba-4.2.7/source3/wscript
-@@ -853,11 +853,11 @@
-         if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'):
-             conf.env.with_iconv = False
+--- samba-4.4.0rc2/source3/wscript
++++ samba-4.4.0rc2/source3/wscript
+@@ -870,7 +870,7 @@
          if conf.env.with_iconv:
              conf.DEFINE('HAVE_ICONV', 1)
  
@@ -11,11 +9,7 @@
          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'):
-             Logs.warn("--with-pam=yes but pam_appl.h not found")
-             use_pam=False
-@@ -926,10 +926,20 @@
-             msg="Checking whether PAM_RADIO_TYPE is available");
-         if use_pam:
+@@ -943,6 +943,17 @@
              conf.DEFINE('WITH_PAM', 1)
              conf.DEFINE('WITH_PAM_MODULES', 1)
  
@@ -29,8 +23,7 @@
 +        conf.undefine('PAM_TTY')
 +        conf.undefine('HAVE_PAM_PAM_APPL_H')
 +
-     if Options.options.with_pam_smbpass:
-         conf.env.with_pam_smbpass = True
- 
++
      seteuid = False
  
+ #
diff --git a/net-fs/samba/files/samba-4.5.1-compile_et_fix.patch b/net-fs/samba/files/samba-4.5.1-compile_et_fix.patch
new file mode 100644
index 00000000..463512f9
--- /dev/null
+++ b/net-fs/samba/files/samba-4.5.1-compile_et_fix.patch
@@ -0,0 +1,16 @@
+--- samba-4.5.1/source4/heimdal_build/wscript_configure
++++ samba-4.5.1/source4/heimdal_build/wscript_configure
+@@ -258,7 +258,11 @@
+ 
+ # With the proper checks in place we should be able to build against the system libtommath.
+ #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'):
+ #    conf.define('USING_SYSTEM_TOMMATH', 1)
+ 
+-check_system_heimdal_binary("compile_et")
+-check_system_heimdal_binary("asn1_compile")
++# comment out next line to stop Gentoo Samba build from using the compile_et in e2fsprogs-libs
++# to compile the error tables. This produces a compile error later on.
++#check_system_heimdal_binary("compile_et")
++#
++# As a precaution do the same for asn1_compile
++#check_system_heimdal_binary("asn1_compile")
diff --git a/net-fs/samba/samba-4.3.9-r99.ebuild b/net-fs/samba/samba-4.5.10-r1.ebuild
index c5a9f1ef..c5a9f1ef 100644
--- a/net-fs/samba/samba-4.3.9-r99.ebuild
+++ b/net-fs/samba/samba-4.5.10-r1.ebuild