main/samba: upgrade to 4.10.2 and remove python2

3 files changed, 43 insertions, 26 deletions

diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index cafc1648c6..a38f7203e9 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
-pkgver=4.8.11
-pkgrel=1
+pkgver=4.10.2
+pkgrel=0
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="https://www.samba.org/"
 arch="all"
@@ -31,9 +31,9 @@ subpackages="
 	$pkgname-server
 	$pkgname-server-libs:_server_libs
 	$pkgname-pidl::noarch
-	py-$pkgname:_py
+	py3-$pkgname:_py3
 	$pkgname-test:_test
-	$pkgname-libs-py:_libs_py
+	$pkgname-libs-py3:_libs_py3
 	$pkgname-libs
 	"
 
@@ -47,10 +47,12 @@ depends="
 makedepends="
 	acl-dev
 	cups-dev
+	dbus-dev
 	docbook-xsl
 	e2fsprogs-dev
 	fuse-dev
 	iniparser-dev
+	jansson-dev
 	ldb-dev
 	libarchive-dev
 	libcap-dev
@@ -60,9 +62,9 @@ makedepends="
 	openldap-dev
 	perl
 	popt-dev
-	py2-tdb
-	py2-tevent
-	python2-dev
+	py3-tdb
+	py3-tevent
+	python3-dev
 	rpcgen
 	subunit-dev
 	talloc-dev
@@ -78,6 +80,7 @@ source="
 	netapp.patch
 	bind-9.12.patch
 	missing-headers.patch
+	musl_rm_unistd_incl.patch
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname.logrotate
@@ -113,11 +116,6 @@ builddir="$srcdir/$pkgname-$pkgver"
 #   4.6.1-r0:
 #     - CVE-2017-2619
 
-prepare() {
-	cd "$builddir"
-	default_prepare
-}
-
 build() {
 	cd "$builddir"
 	local _jobs=$JOBS
@@ -145,7 +143,8 @@ build() {
 		--enable-cups \
 		--without-gettext \
 		--bundled-libraries=NONE,ntdb,roken,wind,hx509,asn1,heimbase,hcrypto,krb5,gssapi,heimntlm,hdb,kdc,cmocka \
-		--disable-rpath-install
+		--disable-rpath-install \
+		--without-gpgme
 	make
 }
 
@@ -193,13 +192,13 @@ common() {
 }
 
 # common-libs is an attempt to avoid libpython dependency for libsmbclient
-_libs_py() {
+_libs_py3() {
 	pkgdesc="Libraries that require libpython"
 	depends=
 	cd "$pkgdir"
 	_mv_files \
-		usr/lib/$pkgname/libsamba-net-samba4.so \
-		usr/lib/$pkgname/libsamba-python-samba4.so
+		usr/lib/$pkgname/libsamba-net*samba4.so \
+		usr/lib/$pkgname/libsamba-python*samba4.so
 	return 0
 }
 
@@ -269,11 +268,13 @@ _client_libs() {
 	_mv_files \
 		usr/lib/libdcerpc.so.* \
 		usr/lib/$pkgname/libcli-ldap-samba4.so \
+		usr/lib/$pkgname/libclidns-samba4.so \
 		usr/lib/$pkgname/libcmdline-contexts-samba4.so \
 		usr/lib/$pkgname/libcmdline-credentials-samba4.so \
 		usr/lib/$pkgname/libdsdb-garbage-collect-tombstones-samba4.so \
 		usr/lib/$pkgname/libevents-samba4.so \
 		usr/lib/$pkgname/libhttp-samba4.so \
+		usr/lib/$pkgname/libmscat-samba4.so \
 		usr/lib/$pkgname/libnetif-samba4.so \
 		usr/lib/$pkgname/libpopt-samba3-cmdline-samba4.so \
 		usr/lib/$pkgname/libregistry-samba4.so \
@@ -286,6 +287,7 @@ client() {
 	cd "$pkgdir"
 	_mv_files \
 		usr/bin/cifsdd \
+		usr/bin/dumpmscat \
 		usr/bin/findsmb \
 		usr/bin/dbwrap_tool \
 		usr/bin/mvxattr \
@@ -386,7 +388,7 @@ dc() {
 	depends="$pkgname-common=$pkgver-r$pkgrel
 		$pkgname-server=$pkgver-r$pkgrel
 		$pkgname-winbind=$pkgver-r$pkgrel
-		py-$pkgname=$pkgver-r$pkgrel tdb"
+		py3-$pkgname=$pkgver-r$pkgrel tdb"
 	cd "$pkgdir"
 	_mv_files \
 		usr/bin/samba-tool \
@@ -405,7 +407,7 @@ _dc_libs() {
 	_mv_files \
 		usr/lib/libdcerpc-samr.so.* \
 		usr/lib/libdcerpc-server.so.* \
-		usr/lib/libsamba-policy.so.* \
+		usr/lib/libsamba-policy.* \
 		usr/lib/$pkgname/bind9 \
 		usr/lib/$pkgname/libHDB-SAMBA4-samba4.so \
 		usr/lib/$pkgname/libLIBWBCLIENT-OLD-samba4.so \
@@ -420,6 +422,7 @@ _dc_libs() {
 		usr/lib/$pkgname/libpac-samba4.so \
 		usr/lib/$pkgname/libposix-eadb-samba4.so \
 		usr/lib/$pkgname/libprocess-model-samba4.so \
+		usr/lib/$pkgname/libscavenge-dns-records-samba4.so \
 		usr/lib/$pkgname/libservice-samba4.so \
 		usr/lib/$pkgname/libshares-samba4.so \
 		usr/lib/$pkgname/process_model \
@@ -450,7 +453,7 @@ server() {
 	_mv_files \
 		usr/sbin/nmbd \
 		usr/sbin/smbd \
-		usr/bin/eventlogadm \
+		usr/sbin/eventlogadm \
 		usr/bin/smbstatus \
 		\
 		usr/lib/$pkgname/auth \
@@ -468,9 +471,9 @@ pidl() {
 		usr/share/perl*
 }
 
-_py() {
+_py3() {
 	pkgdesc="Samba python libraries"
-	depends="py2-tdb"
+	depends="py3-tdb"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
 }
@@ -560,14 +563,15 @@ libs() {
 		"$pkgdir"/usr
 }
 
-sha512sums="65f3791ca3300f0e9760730962978bffc4ae22bf3bb3e58e7f2249bab6db9758dfcde9487ae0c8bc862fe7a507252cad131f8ea5dec826aceac214227d8e75cd  samba-4.8.11.tar.gz
-62d373dbaee75121a1d73f2c09cdca7239705808ff807b171d1d5a28fd4ffc66bdb52494b62786d7aaba8aeece5c08433b532ca96a28d712452fe9daac8d8d2e  domain.patch
+sha512sums="3d146ea12567ebb02a7babcad779b82339ffbfb19f6f2be5cac33eb18af2c9b546dc1cd910072a5c9e152ba9c4a632ed6870c48a8f6ad9d04304b130f240a4bf  samba-4.10.2.tar.gz
+188ed177d593906ac2ee532b40be20169f4379288480d71a79344702636208872fe50d54ec73f7c4477270f36c2c27308d1ae197b153b388ac4f3df9c8593347  domain.patch
 0d4fd9862191554dc9c724cec0b94fd19afbfd0c4ed619e4c620c075e849cb3f3d44db1e5f119d890da23a3dd0068d9873703f3d86c47b91310521f37356208b  getpwent_r.patch
 a99e771f28d787dc22e832b97aa48a1c5e13ddc0c030c501a3c12819ff6e62800ef084b62930abe88c6767d785d5c37e2e9f18a4f9a24f2ee1f5d9650320c556  musl_uintptr.patch
 1854577d0e4457e27da367a6c7ec0fb5cfd63cefea0a39181c9d6e78cf8d3eb50878cdddeea3daeec955d00263151c2f86ea754ff4276ef98bc52c0276d9ffe8  netdb-defines.patch
 202667cb0383414d9289cd67574f5e1140c9a0ff63bb82a746a59b2397a00db15654bfb30cb5ec1cd68a097899be0f849d9aab4c0d210152386c9e66c640f0c0  netapp.patch
 27f12c8395be25d9806d232cc30334f2f7c7d175971d2d1944dd886d699e0381a6f222c17e3d7bc087cf7a29bfb3e98cf25ba98f414c4afe0297b9d134a28bd8  bind-9.12.patch
 c0afe8b1dfddc5290c9aa611163d20adc3a546f54bba0081f739cda4255829f1a72bae422b6cb049aca82e58d4daf63ad5553f4c5c51671019bfbbc2781460f0  missing-headers.patch
+5cda0a07089b99d99f33de74aae89a338954451167f72a9972cc437a7d06d92590c07386fd24e94c72ff34f1dd42494c5d7fcb48ca1823affa8168e83c239067  musl_rm_unistd_incl.patch
 96070e2461370437f48571e7de550c13a332fef869480cfe92e7cac73a998f6c2ee85d2580df58211953bebd0e577691aa710c8edddf3ea0f30e9d47d0a2fd44  samba.initd
 e2b49cb394e758447ca97de155a61b4276499983a0a5c00b44ae621c5559b759a766f8d1c8d3ee98ad5560f4064a847a7a20cfa2e14f85c061bec8b80fd649eb  samba.confd
 3458a4e1f8a8b44c966afb339b2dca51615be049f594c14911fc4d8203623deee416b6fe881436e246fc7d49c97a2b3bf9c5f33ba774302b24190a1103d6b67d  samba.logrotate"
diff --git a/main/samba/domain.patch b/main/samba/domain.patch
index 5941cc06cf..a32e922751 100644
--- a/main/samba/domain.patch
+++ b/main/samba/domain.patch
@@ -1,12 +1,12 @@
 --- ./python/samba/netcmd/domain.py.orig
 +++ ./python/samba/netcmd/domain.py
-@@ -301,8 +301,10 @@
+@@ -388,8 +388,10 @@
              def ask(prompt, default=None):
                  if default is not None:
-                     print "%s [%s]: " % (prompt, default),
+                     print("%s [%s]: " % (prompt, default), end=' ')
 +                    sys.stdout.flush()
                  else:
-                     print "%s: " % (prompt,),
+                     print("%s: " % (prompt,), end=' ')
 +                    sys.stdout.flush()
                  return sys.stdin.readline().rstrip("\n") or default
  
diff --git a/main/samba/musl_rm_unistd_incl.patch b/main/samba/musl_rm_unistd_incl.patch
new file mode 100644
index 0000000000..504bc0b081
--- /dev/null
+++ b/main/samba/musl_rm_unistd_incl.patch
@@ -0,0 +1,13 @@
+--- a/lib/replace/replace.h
++++ b/lib/replace/replace.h
+@@ -162,10 +162,6 @@
+ #include <bsd/unistd.h>
+ #endif
+ 
+-#ifdef HAVE_UNISTD_H
+-#include <unistd.h>
+-#endif
+-
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+ #endif