From: "Christian Ruppert" <idl0r@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/bind-tools/files/, net-dns/bind-tools/
Date: Thu, 12 Jan 2017 16:00:10 +0000 (UTC) [thread overview]
Message-ID: <1484236745.4a1ce23b27f5aec393ea6a1fa6e7bcc80222a0c8.idl0r@gentoo> (raw)
commit: 4a1ce23b27f5aec393ea6a1fa6e7bcc80222a0c8
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 15:58:06 2017 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 15:59:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1ce23b
net-dns/bind-tools: Remove old versions
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-dns/bind-tools/Manifest | 2 -
net-dns/bind-tools/bind-tools-9.10.3_p4.ebuild | 134 -------------------
net-dns/bind-tools/bind-tools-9.10.4_p3.ebuild | 132 -------------------
.../files/bind-tools-9.10.2-openssl.patch | 145 ---------------------
.../files/bind-tools-9.10.3_p2-libressl.patch | 110 ----------------
5 files changed, 523 deletions(-)
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index bf015ed..faff0c0 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,4 +1,2 @@
-DIST bind-9.10.3-P4.tar.gz 8529535 SHA256 2ac044b5fbdf45fb45107af0df961b3b7cb5262a3bf1948ed3fe7a170dd13e3e SHA512 9c7b710054cd1230e7e470541a13850def56b2247c404a1800e0d0dad6aba20b3c3c09b1a17cd6017435525e84fa2f7cde40ae13feeeb7747efb26c66961aadd WHIRLPOOL 9e0384ac8c8b97720c29ed0014613acdde4d7f5a24353dc3f1712d73c37ac8ff00660f80c45c66fab8045afbbf41c7e26b9692b93040fa1db59a2724031ad129
-DIST bind-9.10.4-P3.tar.gz 9299078 SHA256 a075e5ce89fddccb0e64d1777d59161387dd5151cf4e7d1a93875a487812baef SHA512 6ffe0b488a5e5c4547723b1570b5b71287fbcb93b54a89d79c43ddd661bbf5c575edc8b4dae275a34916d3951907c2c6a4e58aee1ee9c87a4c3075de4671c124 WHIRLPOOL 3ec3ff7be4bd9fc8be5c57319b8e510ae8298007256ac149f6eb92901e9fb074eccd7616284c7aa846741fa807971f156f92c254213d0dfbf4f723faf584fd79
DIST bind-9.10.4-P4.tar.gz 9299638 SHA256 a41ce7518e1d0faa40312cc89f4ca42246906b2718099d992e87a5d3ce9a9d86 SHA512 a662053f2052eb2d7ea61b4ecbd4e92980c808080598f7c4590c746e8e5d6545a9f965a8aeece57ce92b17545844cf8565719f697eaef6e2ade8106d810d2799 WHIRLPOOL 31b8e7b7a7c35d9894d91d2caf7428935f28c319c0af5176aaa8bfabac38882c658fa45f5548387295502013b2cba2de624279531d9b79f4c120b4da62c46b1b
DIST bind-9.11.0-P1.tar.gz 9673074 SHA256 094cd3134ba1b44f0910de1334f05a7dca68d583da038de40a8ad7a0cb1592c6 SHA512 1071b7cf2fb66b9e072df9ba8058fc2e4941eb63a8ca3142da4cd256fbdbddcf54b1717e9cd4c933292d6afa5fd37968840cc0cc441b345f4143eecbcebc455f WHIRLPOOL acf25890ae5872c750c48eaf307b7ae1c17da307e0fe3a56769fe002c3d40b7e1b4e739f0191199e7d7b66e5e4c50d30c2bd9f80d602584da9eda1f7e326c31b
diff --git a/net-dns/bind-tools/bind-tools-9.10.3_p4.ebuild b/net-dns/bind-tools/bind-tools-9.10.3_p4.ebuild
deleted file mode 100644
index 05890b0..00000000
--- a/net-dns/bind-tools/bind-tools-9.10.3_p4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils autotools flag-o-matic toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="http://www.isc.org/software/bind"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="gost? ( !libressl ssl )"
-
-CDEPEND="
- ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- )
- gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
- xml? ( dev-libs/libxml2 )
- idn? ( net-dns/idnkit )
- gssapi? ( virtual/krb5 )
- readline? ( sys-libs/readline:0= )
- seccomp? ( sys-libs/libseccomp )"
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- !<net-dns/bind-9.10.2"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch #231247
- epatch "${FILESDIR}"/${PN}-9.10.2-openssl.patch #417129
- epatch "${FILESDIR}"/${PN}-9.10.3_p2-libressl.patch #563648
-
- # Disable tests for now, bug 406399
- sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
- # bug #220361
- rm aclocal.m4
- rm -rf libtool.m4/
-
- mv configure.in configure.ac || die # configure.in is deprecated
- eautoreconf
-}
-
-src_configure() {
- local myconf=
-
- if use urandom; then
- myconf="${myconf} --with-randomdev=/dev/urandom"
- else
- myconf="${myconf} --with-randomdev=/dev/random"
- fi
-
- # bug 344029
- append-cflags "-DDIG_SIGCHASE"
-
- # localstatedir for nsupdate -l, bug 395785
- tc-export BUILD_CC
- econf \
- --localstatedir=/var \
- --without-python \
- --without-libjson \
- --disable-openssl-version-check \
- $(use_enable ipv6) \
- $(use_with idn) \
- $(usex idn --with-idnlib=-lidnkit '') \
- $(use_enable seccomp) \
- $(use_with ssl openssl) \
- $(use_with xml libxml2) \
- $(use_with gssapi) \
- $(use_with readline) \
- $(use_with gost) \
- ${myconf}
-
- # bug #151839
- echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_compile() {
- local AR=$(tc-getAR)
-
- emake AR="${AR}" -C lib/
- emake AR="${AR}" -C bin/delv/
- emake AR="${AR}" -C bin/dig/
- emake AR="${AR}" -C bin/nsupdate/
- emake AR="${AR}" -C bin/dnssec/
-}
-
-src_install() {
- dodoc README CHANGES FAQ
-
- cd "${S}"/bin/delv
- dobin delv
- doman delv.1
-
- cd "${S}"/bin/dig
- dobin dig host nslookup
- doman {dig,host,nslookup}.1
-
- cd "${S}"/bin/nsupdate
- dobin nsupdate
- doman nsupdate.1
- if use doc; then
- dohtml nsupdate.html
- fi
-
- cd "${S}"/bin/dnssec
- for tool in dsfromkey importkey keyfromlabel keygen \
- revoke settime signzone verify; do
- dobin dnssec-"${tool}"
- doman dnssec-"${tool}".8
- if use doc; then
- dohtml dnssec-"${tool}".html
- fi
- done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.10.4_p3.ebuild b/net-dns/bind-tools/bind-tools-9.10.4_p3.ebuild
deleted file mode 100644
index fdcb764..00000000
--- a/net-dns/bind-tools/bind-tools-9.10.4_p3.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils autotools flag-o-matic toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="http://www.isc.org/software/bind"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="gost? ( !libressl ssl )"
-
-CDEPEND="
- ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- )
- gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
- xml? ( dev-libs/libxml2 )
- idn? ( net-dns/idnkit )
- gssapi? ( virtual/krb5 )
- readline? ( sys-libs/readline:0= )
- seccomp? ( sys-libs/libseccomp )"
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- !<net-dns/bind-9.10.2"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch #231247
-
- # Disable tests for now, bug 406399
- sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
- # bug #220361
- rm aclocal.m4
- rm -rf libtool.m4/
-
- mv configure.in configure.ac || die # configure.in is deprecated
- eautoreconf
-}
-
-src_configure() {
- local myconf=
-
- if use urandom; then
- myconf="${myconf} --with-randomdev=/dev/urandom"
- else
- myconf="${myconf} --with-randomdev=/dev/random"
- fi
-
- # bug 344029
- append-cflags "-DDIG_SIGCHASE"
-
- # localstatedir for nsupdate -l, bug 395785
- tc-export BUILD_CC
- econf \
- --localstatedir=/var \
- --without-python \
- --without-libjson \
- --disable-openssl-version-check \
- $(use_enable ipv6) \
- $(use_with idn) \
- $(usex idn --with-idnlib=-lidnkit '') \
- $(use_enable seccomp) \
- $(use_with ssl openssl) \
- $(use_with xml libxml2) \
- $(use_with gssapi) \
- $(use_with readline) \
- $(use_with gost) \
- ${myconf}
-
- # bug #151839
- echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_compile() {
- local AR=$(tc-getAR)
-
- emake AR="${AR}" -C lib/
- emake AR="${AR}" -C bin/delv/
- emake AR="${AR}" -C bin/dig/
- emake AR="${AR}" -C bin/nsupdate/
- emake AR="${AR}" -C bin/dnssec/
-}
-
-src_install() {
- dodoc README CHANGES FAQ
-
- cd "${S}"/bin/delv
- dobin delv
- doman delv.1
-
- cd "${S}"/bin/dig
- dobin dig host nslookup
- doman {dig,host,nslookup}.1
-
- cd "${S}"/bin/nsupdate
- dobin nsupdate
- doman nsupdate.1
- if use doc; then
- dohtml nsupdate.html
- fi
-
- cd "${S}"/bin/dnssec
- for tool in dsfromkey importkey keyfromlabel keygen \
- revoke settime signzone verify; do
- dobin dnssec-"${tool}"
- doman dnssec-"${tool}".8
- if use doc; then
- dohtml dnssec-"${tool}".html
- fi
- done
-}
diff --git a/net-dns/bind-tools/files/bind-tools-9.10.2-openssl.patch b/net-dns/bind-tools/files/bind-tools-9.10.2-openssl.patch
deleted file mode 100644
index deeb109..00000000
--- a/net-dns/bind-tools/files/bind-tools-9.10.2-openssl.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-https://bugs.gentoo.org/417129
-
-fix openssl build logic:
-* do not probe direct filesystem paths (including hardcoding things like /usr)
-* use pkg-config to locate proper openssl libraries
-* turn dsa check into a header one
-* turn ecdsa check into a link one
-* have gost/aes actually default to --with-xxx value when cross-compiling
-
-Patch by Mike Frysinger <vapier@chromium.org>
-
---- a/configure.in
-+++ b/configure.in
-@@ -1442,16 +1442,21 @@ case "$use_openssl" in
- OPENSSLLINKOBJS=""
- OPENSSLLINKSRCS=""
- ;;
-- auto)
-- DST_OPENSSL_INC=""
-- CRYPTO=""
-+ yes|auto)
-+ CRYPTO=""
-+ PKG_CHECK_MODULES([OPENSSL], [libcrypto], [CRYPTO='-DOPENSSL'], [
-+ if test "$use_openssl" = "yes"; then
-+ AC_MSG_ERROR(openssl not found)
-+ fi
-+ use_openssl="no"
-+ ])
-+
-+ DST_OPENSSL_INC=$OPENSSL_CFLAGS
-+ DST_OPENSSL_LIBS=$OPENSSL_LIBS
- OPENSSLGOSTLINKOBJS=""
- OPENSSLGOSTLINKSRS=""
- OPENSSLLINKOBJS=""
- OPENSSLLINKSRCS=""
-- AC_MSG_ERROR(
--[OpenSSL was not found in any of $openssldirs; use --with-openssl=/path
--If you don't want OpenSSL, use --without-openssl])
- ;;
- *)
- if test "$want_native_pkcs11" = "yes"
-@@ -1588,27 +1593,39 @@ no)
- ;;
- esac
-
-+ CC="$saved_cc"
-+ CFLAGS="$saved_cflags"
-+ LIBS="$saved_libs"
-+ OPENSSLLINKOBJS='${OPENSSLLINKOBJS}'
-+ OPENSSLLINKSRCS='${OPENSSLLINKSRCS}'
-+ ;;
-+esac
-+
-+if test "$use_openssl" = "yes"; then
-+ saved_cc="$CC"
-+ saved_cflags="$CFLAGS"
-+ saved_libs="$LIBS"
-+ CFLAGS="$CFLAGS $DST_OPENSSL_INC"
-+ LIBS="$LIBS $DST_OPENSSL_LIBS"
-+
-- AC_MSG_CHECKING(for OpenSSL DSA support)
-- if test -f $use_openssl/include/openssl/dsa.h
-- then
-+ AC_CHECK_HEADERS([openssl/dsa.h])
-+ if test "$ac_cv_header_openssl_dsa_h" = yes; then
- AC_DEFINE(HAVE_OPENSSL_DSA)
-- AC_MSG_RESULT(yes)
-- else
-- AC_MSG_RESULT(no)
- fi
-
- AC_CHECK_FUNCS(EVP_sha256 EVP_sha384 EVP_sha512)
-
- AC_MSG_CHECKING(for OpenSSL ECDSA support)
- have_ecdsa=""
-- AC_TRY_RUN([
-+ AC_TRY_LINK([
- #include <openssl/ecdsa.h>
- #include <openssl/objects.h>
-+],[
- int main() {
- EC_KEY *ec256, *ec384;
-
- #if !defined(HAVE_EVP_SHA256) || !defined(HAVE_EVP_SHA384)
-- return (1);
-+#error choke
- #endif
- ec256 = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
- ec384 = EC_KEY_new_by_curve_name(NID_secp384r1);
-@@ -1637,24 +1654,7 @@ int main() {
- [AC_MSG_RESULT(yes)
- have_ecdsa="yes"],
- [AC_MSG_RESULT(no)
-- have_ecdsa="no"],
-+ have_ecdsa="no"])
-- [AC_MSG_RESULT(using --with-ecdsa)])
-- case "$with_ecdsa" in
-- yes)
-- case "$have_ecdsa" in
-- no) AC_MSG_ERROR([ecdsa not supported]) ;;
-- *) have_ecdsa=yes ;;
-- esac
-- ;;
-- no)
-- have_ecdsa=no ;;
-- *)
-- case "$have_ecdsa" in
-- yes|no) ;;
-- *) AC_MSG_ERROR([need --with-ecdsa=[[yes or no]]]) ;;
-- esac
-- ;;
-- esac
- case $have_ecdsa in
- yes)
- OPENSSL_ECDSA="yes"
-@@ -1702,7 +1702,8 @@ int main() {
- have_gost="yes"],
- [AC_MSG_RESULT(no)
- have_gost="no"],
-- [AC_MSG_RESULT(using --with-gost)])
-+ [AC_MSG_RESULT(using --with-gost)
-+ have_gost=$with_gost])
- case "$with_gost" in
- yes)
- case "$have_gost" in
-@@ -1752,7 +1753,8 @@ int main() {
- [AC_MSG_RESULT(yes)
- have_aes="yes"],
- [AC_MSG_RESULT(no)])],
-- [AC_MSG_RESULT(using --with-aes)])
-+ [AC_MSG_RESULT(using --with-aes)
-+ have_aes=$with_aes])
-
- ISC_OPENSSL_INC=""
- ISC_OPENSSL_LIBS=""
-@@ -1765,8 +1767,7 @@ int main() {
- OPENSSLLINKOBJS='${OPENSSLLINKOBJS}'
- OPENSSLLINKSRCS='${OPENSSLLINKSRCS}'
-
-- ;;
--esac
-+fi
-
- #
- # This would include the system openssl path (and linker options to use
diff --git a/net-dns/bind-tools/files/bind-tools-9.10.3_p2-libressl.patch b/net-dns/bind-tools/files/bind-tools-9.10.3_p2-libressl.patch
deleted file mode 100644
index a38a70d..00000000
--- a/net-dns/bind-tools/files/bind-tools-9.10.3_p2-libressl.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-Fix LibreSSL compatibility, patches from OpenBSD
-
-http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/isc-bind/patches/
-
-http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/isc-bind/patches/patch-lib_dns_dst_openssl_h?rev=1.1&content-type=text/plain
-http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/isc-bind/patches/patch-lib_dns_openssl_link_c?rev=1.1&content-type=text/plain
-http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/isc-bind/patches/patch-lib_dns_openssldh_link_c?rev=1.1&content-type=text/plain
-http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/isc-bind/patches/patch-lib_dns_openssldsa_link_c?rev=1.1&content-type=text/plain
-http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/isc-bind/patches/patch-lib_dns_opensslrsa_link_c?rev=1.1&content-type=text/plain
-
---- lib/dns/dst_openssl.h.orig Wed Sep 16 14:00:47 2015
-+++ lib/dns/dst_openssl.h Wed Sep 16 14:02:42 2015
-@@ -36,7 +36,7 @@
- #define USE_ENGINE 1
- #endif
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- /*
- * These are new in OpenSSL 1.1.0. BN_GENCB _cb needs to be declared in
- * the function like this before the BN_GENCB_new call:
---- lib/dns/openssl_link.c.orig Wed Sep 16 14:01:23 2015
-+++ lib/dns/openssl_link.c Wed Sep 16 14:01:46 2015
-@@ -88,7 +88,7 @@ entropy_getpseudo(unsigned char *buf, int num) {
- return (result == ISC_R_SUCCESS ? 1 : -1);
- }
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- static void
- entropy_add(const void *buf, int num, double entropy) {
- /*
-@@ -121,7 +121,7 @@ lock_callback(int mode, int type, const char *file, in
- UNLOCK(&locks[type]);
- }
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- static unsigned long
- id_callback(void) {
- return ((unsigned long)isc_thread_self());
-@@ -187,7 +187,7 @@ dst__openssl_init(const char *engine) {
- if (result != ISC_R_SUCCESS)
- goto cleanup_mutexalloc;
- CRYPTO_set_locking_callback(lock_callback);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- CRYPTO_set_id_callback(id_callback);
- #endif
-
-@@ -287,7 +287,7 @@ dst__openssl_destroy(void) {
- CRYPTO_cleanup_all_ex_data();
- #endif
- ERR_clear_error();
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- ERR_remove_state(0);
- #endif
- ERR_free_strings();
---- lib/dns/openssldh_link.c.orig Wed Sep 16 14:01:23 2015
-+++ lib/dns/openssldh_link.c Wed Sep 16 14:02:06 2015
-@@ -173,7 +173,7 @@ openssldh_generate(dst_key_t *key, int generator, void
- DH *dh = NULL;
- #if OPENSSL_VERSION_NUMBER > 0x00908000L
- BN_GENCB *cb;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- BN_GENCB _cb;
- #endif
- union {
-@@ -210,7 +210,7 @@ openssldh_generate(dst_key_t *key, int generator, void
- if (dh == NULL)
- return (dst__openssl_toresult(ISC_R_NOMEMORY));
- cb = BN_GENCB_new();
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- if (cb == NULL) {
- DH_free(dh);
- return (dst__openssl_toresult(ISC_R_NOMEMORY));
---- lib/dns/openssldsa_link.c.orig Wed Sep 16 14:01:23 2015
-+++ lib/dns/openssldsa_link.c Wed Sep 16 14:02:22 2015
-@@ -359,7 +359,7 @@ openssldsa_generate(dst_key_t *key, int unused, void (
- isc_result_t result;
- #if OPENSSL_VERSION_NUMBER > 0x00908000L
- BN_GENCB *cb;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- BN_GENCB _cb;
- #endif
- union {
-@@ -383,7 +383,7 @@ openssldsa_generate(dst_key_t *key, int unused, void (
- if (dsa == NULL)
- return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
- cb = BN_GENCB_new();
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- if (cb == NULL) {
- DSA_free(dsa);
- return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));
---- lib/dns/opensslrsa_link.c.orig Wed Sep 16 14:01:23 2015
-+++ lib/dns/opensslrsa_link.c Wed Sep 16 14:02:31 2015
-@@ -771,7 +771,7 @@ opensslrsa_generate(dst_key_t *key, int exp, void (*ca
- } u;
- RSA *rsa = RSA_new();
- BIGNUM *e = BN_new();
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- BN_GENCB _cb;
- #endif
- BN_GENCB *cb = BN_GENCB_new();
next reply other threads:[~2017-01-12 16:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-12 16:00 Christian Ruppert [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-06-03 7:33 [gentoo-commits] repo/gentoo:master commit in: net-dns/bind-tools/files/, net-dns/bind-tools/ Sam James
2018-09-25 14:25 Lars Wendler
2017-06-09 17:39 Christian Ruppert
2015-12-27 19:39 Christian Ruppert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1484236745.4a1ce23b27f5aec393ea6a1fa6e7bcc80222a0c8.idl0r@gentoo \
--to=idl0r@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox