diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2018-09-10 11:48:09 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-09-10 12:01:44 +0200 |
commit | 4ec71c5ae6c53d4cf8c9a8f89a4ea19656a56b71 (patch) | |
tree | 303a29cb2d70f90bdb36efe45c1cccc70f95b86a /main/bind | |
parent | 822016ff762fd502e594da3d7aa2756d3ce8cb1e (diff) | |
download | aports-4ec71c5ae6c53d4cf8c9a8f89a4ea19656a56b71.tar.bz2 aports-4ec71c5ae6c53d4cf8c9a8f89a4ea19656a56b71.tar.xz |
main/bind: security upgrade to 9.12.2_p1 (CVE-2018-5740)
fixes #9358
Diffstat (limited to 'main/bind')
-rw-r--r-- | main/bind/APKBUILD | 6 | ||||
-rw-r--r-- | main/bind/libressl-2.7.patch | 52 |
2 files changed, 2 insertions, 56 deletions
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD index c1c7990bd3..5c7e1c7aaa 100644 --- a/main/bind/APKBUILD +++ b/main/bind/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bind -pkgver=9.12.1_p2 +pkgver=9.12.2_p1 _ver=${pkgver%_p*} _p=${pkgver#*_p} _major=${pkgver%%.*} @@ -24,7 +24,6 @@ install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc $pkgname-tools" source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz bind.so_bsdcompat.patch - libressl-2.7.patch named.initd named.confd named.conf.authoritative @@ -139,9 +138,8 @@ tools() { done } -sha512sums="de47eef272c437316444c4f585a2f98ae9169fc118fd057464a5cd064bb9079ffc07145dabf388cd240f56a5ad6d3ad78cf8d98fc37609681eba5d87e18a4f9a bind-9.12.1-P2.tar.gz +sha512sums="22ce084179439518f7d82f0b80544db929bb4ec71d0e7bd7edad9ae915c903300837d6ead698c9fc23741796f0ba9ed3aa384b752ff65c3b9b20c8969d351cba bind-9.12.2-P1.tar.gz 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch -70cc46b8ecc863b8dfb9b36648131963f40377c5586c6e6ea469f0b7a4a7b3f6e78ad4e7cb21fabc9660b2a02ddc0677d33fc32e8b6948b37b74119cc7de68b0 libressl-2.7.patch 196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015 named.initd 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd d2f61d02d7829af51faf14fbe2bafe8bc90087e6b6697c6275a269ebbddcaa14a234fff5c41da793e945e8ff1de3de0858a40334e0d24289eab98df4bb721ac5 named.conf.authoritative diff --git a/main/bind/libressl-2.7.patch b/main/bind/libressl-2.7.patch deleted file mode 100644 index 6f3b331297..0000000000 --- a/main/bind/libressl-2.7.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c -index ab2f68a..727d5dd 100644 ---- a/lib/dns/openssldh_link.c -+++ b/lib/dns/openssldh_link.c -@@ -69,7 +69,7 @@ static isc_result_t openssldh_todns(const dst_key_t *key, isc_buffer_t *data); - - static BIGNUM *bn2, *bn768, *bn1024, *bn1536; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - /* - * DH_get0_key, DH_set0_key, DH_get0_pqg and DH_set0_pqg - * are from OpenSSL 1.1.0. -diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c -index 4c2d3e4..5e8096f 100644 ---- a/lib/dns/openssldsa_link.c -+++ b/lib/dns/openssldsa_link.c -@@ -49,7 +49,7 @@ - - static isc_result_t openssldsa_todns(const dst_key_t *key, isc_buffer_t *data); - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - static void - DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, - const BIGNUM **g) -diff --git a/lib/dns/opensslecdsa_link.c b/lib/dns/opensslecdsa_link.c -index 9168ec2..a39dadf 100644 ---- a/lib/dns/opensslecdsa_link.c -+++ b/lib/dns/opensslecdsa_link.c -@@ -42,7 +42,7 @@ - - #define DST_RET(a) {ret = a; goto err;} - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - /* From OpenSSL 1.1 */ - static void - ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) { -diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c -index 5dddc2e..74e167b 100644 ---- a/lib/dns/opensslrsa_link.c -+++ b/lib/dns/opensslrsa_link.c -@@ -121,7 +121,7 @@ - #endif - #define DST_RET(a) {ret = a; goto err;} - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - /* From OpenSSL 1.1.0 */ - static int - RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) { |