From 480612aa98a4293031c147c5029d7f40a8691f90 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 27 Jul 2013 23:33:31 +0200 Subject: [PATCH] bind: fix build (patch unneeded now); force ecdsa detection, added new sonames. --- common/shlibs | 4 +-- srcpkgs/bind/patches/cross.patch | 47 -------------------------------- srcpkgs/bind/template | 2 +- 3 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 srcpkgs/bind/patches/cross.patch diff --git a/common/shlibs b/common/shlibs index efc8d1d0e9f..848dbc316c6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -947,10 +947,10 @@ libtirpc.so.1 libtirpc-0.2.2_1 librpcsecgss.so.3 librpcsecgss-0.19_1 libnfsidmap.so.0 libnfsidmap-0.24_1 liblwres.so.90 bind-libs-9.9.0_1 -libdns.so.95 bind-libs-9.9.2_1 +libdns.so.99 bind-libs-9.9.3_1 libbind9.so.90 bind-libs-9.9.0_1 libisccfg.so.90 bind-libs-9.9.0_1 -libisc.so.92 bind-libs-9.9.2_1 +libisc.so.95 bind-libs-9.9.3_1 libisccc.so.90 bind-libs-9.9.0_1 libsystemd-daemon.so.0 systemd-libs-43_1 libsystemd-id128.so.0 systemd-libs-43_1 diff --git a/srcpkgs/bind/patches/cross.patch b/srcpkgs/bind/patches/cross.patch deleted file mode 100644 index 98db94a6284..00000000000 --- a/srcpkgs/bind/patches/cross.patch +++ /dev/null @@ -1,47 +0,0 @@ -Detect ECDSA by checking header existence. - ---- configure.in.orig 2013-04-23 07:13:02.191893497 +0200 -+++ configure.in 2013-04-23 07:27:48.630090319 +0200 -@@ -766,36 +766,13 @@ esac - AC_CHECK_FUNCS(EVP_sha256 EVP_sha384 EVP_sha512) - - AC_MSG_CHECKING(for OpenSSL ECDSA support) -- have_ecdsa="" -- AC_TRY_RUN([ --#include --#include --#include --int main() { -- EC_KEY *ec256, *ec384; -- --#if !defined(HAVE_EVP_SHA256) || !defined(HAVE_EVP_SHA384) -- return (1); --#endif -- ec256 = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); -- ec384 = EC_KEY_new_by_curve_name(NID_secp384r1); -- if (ec256 == NULL || ec384 == NULL) -- return (2); -- return (0); --} --], -- [AC_MSG_RESULT(yes) -- have_ecdsa="yes"], -- [AC_MSG_RESULT(no) -- have_ecdsa="no"]) -- case $have_ecdsa in -- yes) -- OPENSSL_ECDSA="yes" -+ if test -f $use_openssl/include/openssl/ecdsa.h -+ then - AC_DEFINE(HAVE_OPENSSL_ECDSA) -- ;; -- *) -- ;; -- esac -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_RESULT(no) -+ fi - - AC_MSG_CHECKING(for OpenSSL GOST support) - have_gost="" diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template index 33a8929796e..181f7e896af 100644 --- a/srcpkgs/bind/template +++ b/srcpkgs/bind/template @@ -43,7 +43,7 @@ do_configure() { --enable-threads --enable-largefile \ --with-libtool --enable-atomic --sysconfdir=/etc/named \ --enable-epoll --with-gost=no --enable-ipv6 \ - --with-randomdev=/dev/urandom + --with-randomdev=/dev/urandom --with-ecdsa=yes } do_build() {