Commit 58f60a0b authored by J0WI's avatar J0WI Committed by Milan P. Stanić
Browse files

main/samba: security upgrade to 4.12.14

parent 3fe397e0
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=samba
pkgver=4.12.9
pkgver=4.12.14
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
......@@ -95,6 +94,9 @@ source="
pkggroups="winbind"
# secfixes:
# 4.12.14-r0:
# - CVE-2020-27840
# - CVE-2021-20277
# 4.12.9-r0:
# - CVE-2020-14318
# - CVE-2020-14323
......@@ -260,7 +262,6 @@ _common_server_libs() {
usr/lib/$pkgname/libnpa-tstream-samba4.so \
usr/lib/$pkgname/libprinting-migrate-samba4.so \
usr/lib/$pkgname/libsmbd-base-samba4.so \
usr/lib/$pkgname/libsmbd-conn-samba4.so \
usr/lib/$pkgname/libsmbldaphelper-samba4.so \
usr/lib/$pkgname/pdb
}
......@@ -602,8 +603,7 @@ libs() {
"$pkgdir"/usr
}
sha512sums="8bd3122bcaab2f5a16a73902a9b628384063a8116a08f0254541e05c148016839b3215c60ff0d3291a332e7884708950ad64137204b0ac19801012d3b6684fa6 samba-4.12.9.tar.gz
c3e7f2af16f0ed640ae3c71d1f474f17442c5f75e187d4c037c090646157f698aec7d3621e97f40af564426b5b848994ec916ce63268088509694b342a39665a bind-9.14.patch
sha512sums="40561c5cbf5988c45166e21a1eadf7050026083a0ad7aef8076c9b8a053113bbe9397b1a507abd75b52eb4e69dcdbf8bc2404ac72c515c5ee62c30fba4c768f0 samba-4.12.14.tar.gz
58de5e79fdfd06e828d478e112d581d333a8bee88d2602b92204d780f0d707b27dd84f8e2e6b00fca40da81c8fe99aa5bcec70d8b393d3a0a83199c72a4aa48b getpwent_r.patch
b7906d66fe55a980a54161ee3f311b51bcbce76b8d4c8cc1ba6d0c5bdf98232cb192b9d2c1aa7b3e2742f5b9848c6cf429347940eefe66c3e0eda1d5aac1bf93 musl_uintptr.patch
1854577d0e4457e27da367a6c7ec0fb5cfd63cefea0a39181c9d6e78cf8d3eb50878cdddeea3daeec955d00263151c2f86ea754ff4276ef98bc52c0276d9ffe8 netdb-defines.patch
......
--- 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
})
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment