aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2020-11-06 22:03:32 +0100
committerLeo <thinkabit.ukim@gmail.com>2020-11-08 10:53:42 +0000
commitbb04f110705e226ce09826cf32dc94087f63553f (patch)
tree942ec3a242567d25470b74b1597ba29346a94746
parent5b4377145f9c95bc2b2db9b37ea2dc13db5ebb8e (diff)
downloadaports-bb04f110705e226ce09826cf32dc94087f63553f.tar.gz
aports-bb04f110705e226ce09826cf32dc94087f63553f.tar.bz2
aports-bb04f110705e226ce09826cf32dc94087f63553f.tar.xz
main/samba: upgrade to 4.13.2
-rw-r--r--main/samba/APKBUILD6
-rw-r--r--main/samba/bind-9.14.patch90
2 files changed, 2 insertions, 94 deletions
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 4842204a1b..6df548c9d3 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=samba
-pkgver=4.12.9
+pkgver=4.13.2
pkgrel=0
pkgdesc="Tools to access a server's filespace and printers via SMB"
url="https://www.samba.org/"
@@ -79,7 +79,6 @@ makedepends="
"
source="
https://download.samba.org/pub/samba/stable/samba-$pkgver.tar.gz
- bind-9.14.patch
getpwent_r.patch
musl_uintptr.patch
netdb-defines.patch
@@ -602,8 +601,7 @@ libs() {
"$pkgdir"/usr
}
-sha512sums="8bd3122bcaab2f5a16a73902a9b628384063a8116a08f0254541e05c148016839b3215c60ff0d3291a332e7884708950ad64137204b0ac19801012d3b6684fa6 samba-4.12.9.tar.gz
-c3e7f2af16f0ed640ae3c71d1f474f17442c5f75e187d4c037c090646157f698aec7d3621e97f40af564426b5b848994ec916ce63268088509694b342a39665a bind-9.14.patch
+sha512sums="60b8597b7fad13dd55ffec4c750ee4f5f39220d8e8d52232d3a8c4d830a5ff29254716a7230b0182e0717585e5a34b01373527caecd1d32f2170c6063a97d070 samba-4.13.2.tar.gz
58de5e79fdfd06e828d478e112d581d333a8bee88d2602b92204d780f0d707b27dd84f8e2e6b00fca40da81c8fe99aa5bcec70d8b393d3a0a83199c72a4aa48b getpwent_r.patch
b7906d66fe55a980a54161ee3f311b51bcbce76b8d4c8cc1ba6d0c5bdf98232cb192b9d2c1aa7b3e2742f5b9848c6cf429347940eefe66c3e0eda1d5aac1bf93 musl_uintptr.patch
1854577d0e4457e27da367a6c7ec0fb5cfd63cefea0a39181c9d6e78cf8d3eb50878cdddeea3daeec955d00263151c2f86ea754ff4276ef98bc52c0276d9ffe8 netdb-defines.patch
diff --git a/main/samba/bind-9.14.patch b/main/samba/bind-9.14.patch
deleted file mode 100644
index 3f0cfef06d..0000000000
--- a/main/samba/bind-9.14.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- a/source4/dns_server/wscript_build.orig
-+++ b/source4/dns_server/wscript_build
-@@ -68,6 +68,26 @@
- deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
- enabled=bld.AD_DC_BUILD_IS_ENABLED())
-
-+bld.SAMBA_LIBRARY('dlz_bind9_13',
-+ source='dlz_bind9.c',
-+ cflags='-DBIND_VERSION_9_13',
-+ private_library=True,
-+ link_name='modules/bind9/dlz_bind9_13.so',
-+ realname='dlz_bind9_13.so',
-+ install_path='${MODULESDIR}/bind9',
-+ deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
-+ enabled=bld.AD_DC_BUILD_IS_ENABLED())
-+
-+bld.SAMBA_LIBRARY('dlz_bind9_14',
-+ source='dlz_bind9.c',
-+ cflags='-DBIND_VERSION_9_14',
-+ private_library=True,
-+ link_name='modules/bind9/dlz_bind9_14.so',
-+ realname='dlz_bind9_14.so',
-+ install_path='${MODULESDIR}/bind9',
-+ deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
-+ enabled=bld.AD_DC_BUILD_IS_ENABLED())
-+
- bld.SAMBA_LIBRARY('dlz_bind9_for_torture',
- source='dlz_bind9.c',
- cflags='-DBIND_VERSION_9_8',
---- a/source4/dns_server/dlz_minimal.h.orig
-+++ b/source4/dns_server/dlz_minimal.h
-@@ -31,10 +31,7 @@
- #elif defined (BIND_VERSION_9_10)
- # define DLZ_DLOPEN_VERSION 3
- # define DNS_CLIENTINFO_VERSION 1
--#elif defined (BIND_VERSION_9_11)
--# define DLZ_DLOPEN_VERSION 3
--# define DNS_CLIENTINFO_VERSION 2
--#elif defined (BIND_VERSION_9_12)
-+#elif defined (BIND_VERSION_9_11) || defined (BIND_VERSION_9_12) || defined (BIND_VERSION_9_13) || defined (BIND_VERSION_9_14)
- # define DLZ_DLOPEN_VERSION 3
- # define DNS_CLIENTINFO_VERSION 2
- #else
---- a/source4/setup/named.conf.dlz.orig
-+++ b/source4/setup/named.conf.dlz
-@@ -24,5 +24,11 @@
-
- # For BIND 9.12.x
- ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";
-+
-+ # For BIND 9.13.x
-+ ${BIND9_13} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_13.so";
-+
-+ # For BIND 9.14.x
-+ ${BIND9_14} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_14.so";
- };
-
---- a/python/samba/provision/sambadns.py.orig
-+++ b/python/samba/provision/sambadns.py
-@@ -962,6 +962,8 @@
- bind9_10 = '#'
- bind9_11 = '#'
- bind9_12 = '#'
-+ bind9_13 = '#'
-+ bind9_14 = '#'
- if bind_info.upper().find('BIND 9.8') != -1:
- bind9_8 = ''
- elif bind_info.upper().find('BIND 9.9') != -1:
-@@ -972,6 +974,10 @@
- bind9_11 = ''
- elif bind_info.upper().find('BIND 9.12') != -1:
- bind9_12 = ''
-+ elif bind_info.upper().find('BIND 9.13') != -1:
-+ bind9_13 = ''
-+ elif bind_info.upper().find('BIND 9.14') != -1:
-+ bind9_14 = ''
- elif bind_info.upper().find('BIND 9.7') != -1:
- raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
- else:
-@@ -983,7 +989,9 @@
- "BIND9_9": bind9_9,
- "BIND9_10": bind9_10,
- "BIND9_11": bind9_11,
-- "BIND9_12": bind9_12
-+ "BIND9_12": bind9_12,
-+ "BIND9_13": bind9_13,
-+ "BIND9_14": bind9_14
-
- })
-