main/samba: upgrade to 4.12.0

7 files changed, 65 insertions, 39 deletions

diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 8bd6f599ae..154f6bfda3 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
-pkgver=4.11.6
+pkgver=4.12.0
 pkgrel=0
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="https://www.samba.org/"
@@ -52,6 +52,7 @@ makedepends="
 	docbook-xsl
 	e2fsprogs-dev
 	fuse-dev
+	gnutls-dev
 	iniparser-dev
 	jansson-dev
 	ldb-dev
@@ -63,6 +64,7 @@ makedepends="
 	ncurses-dev
 	openldap-dev
 	perl
+	perl-parse-yapp
 	popt-dev
 	py3-tdb
 	py3-tevent
@@ -72,10 +74,11 @@ makedepends="
 	talloc-dev
 	tdb-dev
 	tevent-dev
+	zlib-dev
 	$_dc_deps
 	"
 source="
-	https://us1.samba.org/samba/ftp/stable/$pkgname-$pkgver.tar.gz
+	https://download.samba.org/pub/samba/stable/samba-$pkgver.tar.gz
 	bind-9.14.patch
 	getpwent_r.patch
 	musl_uintptr.patch
@@ -90,7 +93,6 @@ source="
 	$pkgname.logrotate
 	"
 pkggroups="winbind"
-builddir="$srcdir/$pkgname-$pkgver"
 
 # secfixes:
 #   4.11.5-r0:
@@ -138,7 +140,6 @@ builddir="$srcdir/$pkgname-$pkgver"
 #     - CVE-2017-2619
 
 build() {
-	cd "$builddir"
 	local _jobs=$JOBS
 	local _idmap_modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2
 	local _pdb_modules=pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4
@@ -147,7 +148,8 @@ build() {
 	if [ -z "$_jobs" ]; then
 		_jobs=$(awk '/^core id/ {n++} END{print n}' /proc/cpuinfo)
 	fi
-	./configure --prefix=/usr \
+	./configure \
+		--prefix=/usr \
 		--jobs=${_jobs:-2} \
 		--sysconfdir=/etc/$pkgname \
 		--with-configdir=/etc/$pkgname \
@@ -170,7 +172,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -d "$pkgdir"/var/log/$pkgname \
@@ -310,6 +311,7 @@ client() {
 		usr/bin/dumpmscat \
 		usr/bin/findsmb \
 		usr/bin/dbwrap_tool \
+		usr/bin/mdfind \
 		usr/bin/mvxattr \
 		usr/bin/nmblookup \
 		usr/bin/oLschema2ldif \
@@ -426,6 +428,7 @@ _dc_libs() {
 	_mv_files \
 		usr/lib/libdcerpc-samr.so.* \
 		usr/lib/libdcerpc-server.so.* \
+		usr/lib/libdcerpc-server-core.so.* \
 		usr/lib/libsamba-policy.* \
 		usr/lib/$pkgname/bind9 \
 		usr/lib/$pkgname/libHDB-SAMBA4-samba4.so \
@@ -566,6 +569,7 @@ libs() {
 		usr/lib/$pkgname/libsocket-blocking-samba4.so \
 		usr/lib/$pkgname/libsys-rw-samba4.so \
 		usr/lib/$pkgname/libtalloc-report-samba4.so \
+		usr/lib/$pkgname/libtalloc-report-printf-samba4.so \
 		usr/lib/$pkgname/libtdb-wrap-samba4.so \
 		usr/lib/$pkgname/libtime-basic-samba4.so \
 		usr/lib/$pkgname/libutil-cmdline-samba4.so \
@@ -581,16 +585,16 @@ libs() {
 		"$pkgdir"/usr
 }
 
-sha512sums="3815080a1693c596a126371a5ea4e8534317a7266803c7de13a7e5b3ee9757dfbf13c0de20d498a6683d3aaf56941ed42f289e3c24f88713529a5f047a691af2  samba-4.11.6.tar.gz
-c48f4533a9612c8534ddcf8531a50a31cc39da0b55a42fa5a4e2a36aa964a79a594215cd0edabd0bea837d493eca3f53341987d5aa4f10d370bf10123b957d1e  bind-9.14.patch
-0d4fd9862191554dc9c724cec0b94fd19afbfd0c4ed619e4c620c075e849cb3f3d44db1e5f119d890da23a3dd0068d9873703f3d86c47b91310521f37356208b  getpwent_r.patch
-a99e771f28d787dc22e832b97aa48a1c5e13ddc0c030c501a3c12819ff6e62800ef084b62930abe88c6767d785d5c37e2e9f18a4f9a24f2ee1f5d9650320c556  musl_uintptr.patch
+sha512sums="d50be899675b8e3504311e73bb75fbb8264e918e0d1765239ecb5b14e15c0917565f8a9ce1877fb604151bf4f23dfc4c2f7f30a53c872681e3d2571d3ed5ef82  samba-4.12.0.tar.gz
+c3e7f2af16f0ed640ae3c71d1f474f17442c5f75e187d4c037c090646157f698aec7d3621e97f40af564426b5b848994ec916ce63268088509694b342a39665a  bind-9.14.patch
+58de5e79fdfd06e828d478e112d581d333a8bee88d2602b92204d780f0d707b27dd84f8e2e6b00fca40da81c8fe99aa5bcec70d8b393d3a0a83199c72a4aa48b  getpwent_r.patch
+b7906d66fe55a980a54161ee3f311b51bcbce76b8d4c8cc1ba6d0c5bdf98232cb192b9d2c1aa7b3e2742f5b9848c6cf429347940eefe66c3e0eda1d5aac1bf93  musl_uintptr.patch
 1854577d0e4457e27da367a6c7ec0fb5cfd63cefea0a39181c9d6e78cf8d3eb50878cdddeea3daeec955d00263151c2f86ea754ff4276ef98bc52c0276d9ffe8  netdb-defines.patch
-202667cb0383414d9289cd67574f5e1140c9a0ff63bb82a746a59b2397a00db15654bfb30cb5ec1cd68a097899be0f849d9aab4c0d210152386c9e66c640f0c0  netapp.patch
+3b4759dfcf6ec54f2131390c9eb7fd7dd23071e304905cdeaf7a9828fa888cb3dcb5c5bb6a07a634c51d0392ac47f6e22b937faf4354e3b07cfc0de7fdfa28e9  netapp.patch
 c0afe8b1dfddc5290c9aa611163d20adc3a546f54bba0081f739cda4255829f1a72bae422b6cb049aca82e58d4daf63ad5553f4c5c51671019bfbbc2781460f0  missing-headers.patch
-5cda0a07089b99d99f33de74aae89a338954451167f72a9972cc437a7d06d92590c07386fd24e94c72ff34f1dd42494c5d7fcb48ca1823affa8168e83c239067  musl_rm_unistd_incl.patch
+9bf4bbc8b03d9ea17d2f8ffeaf3a83541b171936a90bb8d75b08cc5afbdbaaec545c1b3782c90ae2ffc4568ab4e6f15fb21899d80c654a796301e16429c93b65  musl_rm_unistd_incl.patch
 bc2df70e327fea5dfbd923600225f1448815d842c37d6937dd74eab7f7699d7f52cd7a8e28a61233974649cf86661a0107dce5019d33b71205e4b41bac73f4e2  add_missing___compar_fn_t.patch
-903d9327369cb1b7207955d317b2bba0cb5c30287d4040d3a235cae581479bc49d277cb18d1686cddd60e4430313712e25e0903e1e311265dea86993a2be6c6e  pidl.patch
+c0bbe1186b150a9bb2a0b741a8cfbd7a5109e5fed1eaa07aaa38cf026ebe054d38cc01e2496f0cab7b40f743e1b7ecfbf8a4d5820810226c4152021df65f36dc  pidl.patch
 96070e2461370437f48571e7de550c13a332fef869480cfe92e7cac73a998f6c2ee85d2580df58211953bebd0e577691aa710c8edddf3ea0f30e9d47d0a2fd44  samba.initd
 e2b49cb394e758447ca97de155a61b4276499983a0a5c00b44ae621c5559b759a766f8d1c8d3ee98ad5560f4064a847a7a20cfa2e14f85c061bec8b80fd649eb  samba.confd
 3458a4e1f8a8b44c966afb339b2dca51615be049f594c14911fc4d8203623deee416b6fe881436e246fc7d49c97a2b3bf9c5f33ba774302b24190a1103d6b67d  samba.logrotate"
diff --git a/main/samba/bind-9.14.patch b/main/samba/bind-9.14.patch
index d368896297..3f0cfef06d 100644
--- a/main/samba/bind-9.14.patch
+++ b/main/samba/bind-9.14.patch
@@ -57,7 +57,7 @@
  
 --- a/python/samba/provision/sambadns.py.orig
 +++ b/python/samba/provision/sambadns.py
-@@ -960,6 +960,8 @@
+@@ -962,6 +962,8 @@
          bind9_10 = '#'
          bind9_11 = '#'
          bind9_12 = '#'
@@ -66,7 +66,7 @@
          if bind_info.upper().find('BIND 9.8') != -1:
              bind9_8 = ''
          elif bind_info.upper().find('BIND 9.9') != -1:
-@@ -970,6 +972,10 @@
+@@ -972,6 +974,10 @@
              bind9_11 = ''
          elif bind_info.upper().find('BIND 9.12') != -1:
              bind9_12 = ''
@@ -77,7 +77,7 @@
          elif bind_info.upper().find('BIND 9.7') != -1:
              raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
          else:
-@@ -981,7 +987,9 @@
+@@ -983,7 +989,9 @@
                      "BIND9_9": bind9_9,
                      "BIND9_10": bind9_10,
                      "BIND9_11": bind9_11,
diff --git a/main/samba/getpwent_r.patch b/main/samba/getpwent_r.patch
index 99ebedacfb..0ba5fcc537 100644
--- a/main/samba/getpwent_r.patch
+++ b/main/samba/getpwent_r.patch
@@ -18,7 +18,7 @@ index 2cd6122..04f13c6 100644
  static bool test_enum_r_passwd(struct torture_context *tctx,
  			       struct passwd **pwd_array_p,
  			       size_t *num_pwd_p)
-@@ -381,6 +381,7 @@ static bool test_enum_r_passwd(struct torture_context *tctx,
+@@ -383,6 +383,7 @@ static bool test_enum_r_passwd(struct torture_context *tctx,
  
  	return true;
  }
@@ -26,7 +26,7 @@ index 2cd6122..04f13c6 100644
  
  static bool torture_assert_passwd_equal(struct torture_context *tctx,
  					const struct passwd *p1,
-@@ -432,7 +433,7 @@ static bool test_passwd_r(struct torture_context *tctx)
+@@ -434,7 +435,7 @@ static bool test_passwd_r(struct torture_context *tctx)
  	struct passwd *pwd, pwd1, pwd2;
  	size_t num_pwd;
  
@@ -35,7 +35,7 @@ index 2cd6122..04f13c6 100644
  						"failed to enumerate passwd");
  
  	for (i=0; i < num_pwd; i++) {
-@@ -460,7 +461,7 @@ static bool test_passwd_r_cross(struct torture_context *tctx)
+@@ -462,7 +463,7 @@ static bool test_passwd_r_cross(struct torture_context *tctx)
  	struct passwd *pwd, pwd1, pwd2, pwd3, pwd4;
  	size_t num_pwd;
  
@@ -44,7 +44,7 @@ index 2cd6122..04f13c6 100644
  						"failed to enumerate passwd");
  
  	for (i=0; i < num_pwd; i++) {
-@@ -531,6 +532,7 @@ static bool test_enum_group(struct torture_context *tctx,
+@@ -533,6 +534,7 @@ static bool test_enum_group(struct torture_context *tctx,
  	return true;
  }
  
@@ -52,7 +52,7 @@ index 2cd6122..04f13c6 100644
  static bool test_enum_r_group(struct torture_context *tctx,
  			      struct group **grp_array_p,
  			      size_t *num_grp_p)
-@@ -579,6 +581,7 @@ static bool test_enum_r_group(struct torture_context *tctx,
+@@ -583,6 +585,7 @@ static bool test_enum_r_group(struct torture_context *tctx,
  
  	return true;
  }
@@ -60,7 +60,7 @@ index 2cd6122..04f13c6 100644
  
  static bool torture_assert_group_equal(struct torture_context *tctx,
  				       const struct group *g1,
-@@ -635,7 +638,7 @@ static bool test_group_r(struct torture_context *tctx)
+@@ -639,7 +642,7 @@ static bool test_group_r(struct torture_context *tctx)
  	struct group *grp, grp1, grp2;
  	size_t num_grp;
  
@@ -69,7 +69,7 @@ index 2cd6122..04f13c6 100644
  					       "failed to enumerate group");
  
  	for (i=0; i < num_grp; i++) {
-@@ -663,7 +666,7 @@ static bool test_group_r_cross(struct torture_context *tctx)
+@@ -667,7 +670,7 @@ static bool test_group_r_cross(struct torture_context *tctx)
  	struct group *grp, grp1, grp2, grp3, grp4;
  	size_t num_grp;
  
diff --git a/main/samba/musl_rm_unistd_incl.patch b/main/samba/musl_rm_unistd_incl.patch
index 504bc0b081..1f4aae2683 100644
--- a/main/samba/musl_rm_unistd_incl.patch
+++ b/main/samba/musl_rm_unistd_incl.patch
@@ -1,6 +1,6 @@
 --- a/lib/replace/replace.h
 +++ b/lib/replace/replace.h
-@@ -162,10 +162,6 @@
+@@ -168,10 +168,6 @@
  #include <bsd/unistd.h>
  #endif
  
@@ -11,3 +11,27 @@
  #ifdef HAVE_STRING_H
  #include <string.h>
  #endif
+--- a/lib/replace/system/network.h
++++ b/lib/replace/system/network.h
+@@ -31,10 +31,6 @@
+ #error "AC_LIBREPLACE_NETWORK_CHECKS missing in configure"
+ #endif
+ 
+-#ifdef HAVE_UNISTD_H
+-#include <unistd.h>
+-#endif
+-
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+--- a/source3/rpc_server/mdssvc/mdssvc.c
++++ b/source3/rpc_server/mdssvc/mdssvc.c
+@@ -18,6 +18,8 @@
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
++#include <unistd.h>
++
+ #include "includes.h"
+ #include "librpc/gen_ndr/auth.h"
+ #include "dbwrap/dbwrap.h"
diff --git a/main/samba/musl_uintptr.patch b/main/samba/musl_uintptr.patch
index c5f36bef25..de7f28572f 100644
--- a/main/samba/musl_uintptr.patch
+++ b/main/samba/musl_uintptr.patch
@@ -15,7 +15,7 @@ diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h
 index 303d0ae..a2bfc40 100644
 --- a/third_party/cmocka/cmocka.h
 +++ b/third_party/cmocka/cmocka.h
-@@ -110,7 +110,7 @@
+@@ -111,7 +111,7 @@
      ((LargestIntegralType)(value))
  
  /* Smallest integral type capable of holding a pointer. */
@@ -24,7 +24,7 @@ index 303d0ae..a2bfc40 100644
  # if defined(_WIN32)
      /* WIN32 is an ILP32 platform */
      typedef unsigned int uintptr_t;
-@@ -136,6 +136,8 @@
+@@ -137,6 +137,8 @@
  
  # define _UINTPTR_T
  # define _UINTPTR_T_DEFINED
diff --git a/main/samba/netapp.patch b/main/samba/netapp.patch
index ba760ef51a..fea413c3b4 100644
--- a/main/samba/netapp.patch
+++ b/main/samba/netapp.patch
@@ -18,7 +18,7 @@ diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
 index bc5c1b1..6d6b725 100644
 --- a/source3/libsmb/clientgen.c
 +++ b/source3/libsmb/clientgen.c
-@@ -112,6 +112,7 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
+@@ -111,6 +111,7 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
  	if (!cli->server_os) {
  		goto error;
  	}
@@ -26,7 +26,7 @@ index bc5c1b1..6d6b725 100644
  	cli->server_type = talloc_strdup(cli, "");
  	if (!cli->server_type) {
  		goto error;
-@@ -430,6 +431,24 @@ time_t cli_state_server_time(struct cli_state *cli)
+@@ -467,6 +468,24 @@ time_t cli_state_server_time(struct cli_state *cli)
  	return t;
  }
  
diff --git a/main/samba/pidl.patch b/main/samba/pidl.patch
index 889aeb0a51..60359e52a4 100644
--- a/main/samba/pidl.patch
+++ b/main/samba/pidl.patch
@@ -22,7 +22,7 @@ new file mode 100644
 index 00000000000..54b3170c4e2
 --- /dev/null
 +++ b/pidl/lib/wscript_build
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,33 @@
 +#!/usr/bin/env python
 +
 +# install the pidl modules
@@ -56,17 +56,13 @@ index 00000000000..54b3170c4e2
 +                  ''',
 +                  flat=False)
 +
-+if not bld.CONFIG_SET('USING_SYSTEM_PARSE_YAPP_DRIVER'):
-+    bld.INSTALL_FILES(bld.env.PERL_LIB_INSTALL_DIR,
-+                      'Parse/Yapp/Driver.pm',
-+                      flat=False)
 diff --git a/pidl/wscript b/pidl/wscript
 index 01b71bd8b27..a2a15d36851 100644
 --- a/pidl/wscript
 +++ b/pidl/wscript
-@@ -32,10 +32,49 @@
-     # Check if perl(Parse::Yapp::Driver) is available.
-     check_system_perl_module(conf, "Parse::Yapp::Driver", 1.05)
+@@ -28,12 +28,51 @@
+                                     1.05):
+         raise Errors.WafError('perl module "Parse::Yapp::Driver" not found')
  
 +    # we need a recent version of MakeMaker to get the right man page names
 +    if conf.CHECK_PERL_MANPAGE():
@@ -75,7 +71,8 @@ index 01b71bd8b27..a2a15d36851 100644
 +        conf.DEFINE('HAVE_PERL_MAKEMAKER', 1)
 +
      # yapp is used for building the parser
-     conf.find_program('yapp', var='YAPP')
+     if not conf.find_program('yapp', var='YAPP'):
+         raise Errors.WafError('yapp not found')
 +    conf.find_program('pod2man', var='POD2MAN')
  
  def build(bld):
@@ -100,7 +97,7 @@ index 01b71bd8b27..a2a15d36851 100644
 +
 +    # use perl to build the manpages
 +    bld.env.pidl_srcdir = os.path.join(bld.srcnode.abspath(), 'pidl')
-+
+ 
 +    bld.SET_BUILD_GROUP('final')
 +    if 'POD2MAN' in bld.env and bld.env['POD2MAN'] != '':
 +        for src in pidl_manpages.keys():
@@ -111,6 +108,7 @@ index 01b71bd8b27..a2a15d36851 100644
 +                source=src,
 +                install_path=os.path.dirname(bld.EXPAND_VARIABLES('${MANDIR}/'+manpage)),
 +                target=os.path.basename(manpage))
- 
++ 
      # we want to prefer the git version of the parsers if we can.
      # Only if the source has changed do we want to re-run yapp
+     # But we force the developer to use the pidl standalone build