From 23f169960d86b2d4fe54ac6529bea9e766c6b1b0 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 17 Apr 2017 12:31:13 +0200 Subject: [PATCH] bind: update to 9.11.3. --- common/shlibs | 14 +-- srcpkgs/bind/patches/libressl.patch | 148 ---------------------------- srcpkgs/bind/template | 6 +- 3 files changed, 10 insertions(+), 158 deletions(-) delete mode 100644 srcpkgs/bind/patches/libressl.patch diff --git a/common/shlibs b/common/shlibs index 5732fad181..5b76470104 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1007,13 +1007,13 @@ libgssglue.so.1 libgssglue-0.3_1 libtirpc.so.3 libtirpc-1.0.2_1 librpcsecgss.so.3 librpcsecgss-0.19_1 libnfsidmap.so.0 libnfsidmap-0.24_1 -liblwres.so.141 bind-libs-9.10.2P3_2 -libdns.so.190 bind-libs-9.10.6_1 -libbind9.so.141 bind-libs-9.10.6_1 -libisccfg.so.144 bind-libs-9.10.5_1 -libisc.so.189 bind-libs-9.10.6_1 -libisccc.so.140 bind-libs-9.10.2P3_2 -libirs.so.141 bind-libs-9.10.2P3_2 +libbind9.so.160 bind-libs-9.11.3_1 +libdns.so.1100 bind-libs-9.11.3_1 +libirs.so.160 bind-libs-9.11.3_1 +libisc.so.169 bind-libs-9.11.3_1 +libisccc.so.160 bind-libs-9.11.3_1 +libisccfg.so.160 bind-libs-9.11.3_1 +liblwres.so.160 bind-libs-9.11.3_1 libplist.so.3 libplist-1.12_1 libplist++.so.3 libplist++-1.12_1 libnsbmp.so.0 libnsbmp-0.0.3_1 diff --git a/srcpkgs/bind/patches/libressl.patch b/srcpkgs/bind/patches/libressl.patch deleted file mode 100644 index 5982ed60af..0000000000 --- a/srcpkgs/bind/patches/libressl.patch +++ /dev/null @@ -1,148 +0,0 @@ ---- lib/isc/sha2.c.orig -+++ lib/isc/sha2.c -@@ -69,7 +69,7 @@ - #endif - - #ifdef ISC_PLATFORM_OPENSSLHASH --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #define EVP_MD_CTX_new() &(context->_ctx) - #define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr) - #define EVP_MD_CTX_reset(c) EVP_MD_CTX_cleanup(c) ---- lib/isc/include/isc/sha2.h.orig -+++ lib/isc/include/isc/sha2.h -@@ -84,7 +84,7 @@ - - typedef struct { - EVP_MD_CTX *ctx; --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - EVP_MD_CTX _ctx; - #endif - } isc_sha2_t; ---- lib/isc/include/isc/hmacmd5.h.orig -+++ lib/isc/include/isc/hmacmd5.h -@@ -42,7 +42,7 @@ - - typedef struct { - HMAC_CTX *ctx; --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - HMAC_CTX _ctx; - #endif - } isc_hmacmd5_t; ---- lib/isc/hmacmd5.c.orig -+++ lib/isc/hmacmd5.c -@@ -43,7 +43,7 @@ - #endif - - #ifdef ISC_PLATFORM_OPENSSLHASH --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #define HMAC_CTX_new() &(ctx->_ctx), HMAC_CTX_init(&(ctx->_ctx)) - #define HMAC_CTX_free(ptr) HMAC_CTX_cleanup(ptr) - #endif ---- lib/isc/md5.c.orig -+++ lib/isc/md5.c -@@ -54,7 +54,7 @@ - #include - - #ifdef ISC_PLATFORM_OPENSSLHASH --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #define EVP_MD_CTX_new() &(ctx->_ctx) - #define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr) - #endif ---- lib/isc/hmacsha.c.orig -+++ lib/isc/hmacsha.c -@@ -40,7 +40,7 @@ - #endif - - #ifdef ISC_PLATFORM_OPENSSLHASH --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #define HMAC_CTX_new() &(ctx->_ctx), HMAC_CTX_init(&(ctx->_ctx)) - #define HMAC_CTX_free(ptr) HMAC_CTX_cleanup(ptr) - #endif ---- lib/isc/include/isc/hmacsha.h.orig -+++ lib/isc/include/isc/hmacsha.h -@@ -42,7 +42,7 @@ - - typedef struct { - HMAC_CTX *ctx; --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - HMAC_CTX _ctx; - #endif - } isc_hmacsha_t; ---- lib/isc/include/isc/sha1.h.orig -+++ lib/isc/include/isc/sha1.h -@@ -41,7 +41,7 @@ - - typedef struct { - EVP_MD_CTX *ctx; --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - EVP_MD_CTX _ctx; - #endif - } isc_sha1_t; ---- lib/isc/include/isc/md5.h.orig -+++ lib/isc/include/isc/md5.h -@@ -60,7 +60,7 @@ - - typedef struct { - EVP_MD_CTX *ctx; --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - EVP_MD_CTX _ctx; - #endif - } isc_md5_t; ---- lib/isc/aes.c.orig -+++ lib/isc/aes.c -@@ -33,7 +33,7 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #define EVP_CIPHER_CTX_new() &(_context), EVP_CIPHER_CTX_init(&_context) - #define EVP_CIPHER_CTX_free(c) RUNTIME_CHECK(EVP_CIPHER_CTX_cleanup(c) == 1) - #endif -@@ -42,7 +42,7 @@ - isc_aes128_crypt(const unsigned char *key, const unsigned char *in, - unsigned char *out) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - EVP_CIPHER_CTX _context; - #endif - EVP_CIPHER_CTX *c; -@@ -62,7 +62,7 @@ - isc_aes192_crypt(const unsigned char *key, const unsigned char *in, - unsigned char *out) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - EVP_CIPHER_CTX _context; - #endif - EVP_CIPHER_CTX *c; -@@ -82,7 +82,7 @@ - isc_aes256_crypt(const unsigned char *key, const unsigned char *in, - unsigned char *out) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - EVP_CIPHER_CTX _context; - #endif - EVP_CIPHER_CTX *c; ---- lib/isc/sha1.c.orig -+++ lib/isc/sha1.c -@@ -50,7 +50,7 @@ - #endif - - #ifdef ISC_PLATFORM_OPENSSLHASH --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #define EVP_MD_CTX_new() &(context->_ctx) - #define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr) - #endif diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template index 886b964fea..541a91a6e6 100644 --- a/srcpkgs/bind/template +++ b/srcpkgs/bind/template @@ -1,8 +1,8 @@ # Template file for 'bind' pkgname=bind -_distver=9.10.6 +_distver=9.11.3 version="${_distver}" -revision=2 +revision=1 _fullver="${_distver}${_patchver:+-${_patchver}}" wrksrc="${pkgname}-${_fullver}" short_desc="Berkeley Internet Name Domain server" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="ISC" homepage="https://www.isc.org/software/bind/" distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.gz" -checksum=17bbcd2bd7b1d32f5ba4b30d5dbe8a39bce200079048073d1e0d050fdf47e69d +checksum=0d9dde14b2ec7f9cdc3b69f19540c7a2e4eee7b6c727965dfae48810965876f5 build_options="geoip seccomp" build_options_default="geoip"