CVS commit: pkgsrc/security/opendnssec

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon Jun  8 15:07:43 UTC 2020

Modified Files:
        pkgsrc/security/opendnssec: Makefile
Added Files:
        pkgsrc/security/opendnssec/patches: patch-configure
            patch-m4_acx__ssl.m4

Log Message:
Add an m4 + configure patch so that -lcrypto is searched for
EVP_sha1 and EVP_sha256.  Without this, opendnssec would build
but would not recognize any of those algorithms for tsig, and
therefore be pretty useless.  I'll admit that I'm not entirely
certain why this is now suddenly required; those functions are
in the same library in 9.0 as in 8.0.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/security/opendnssec/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/security/opendnssec/patches/patch-configure \
    pkgsrc/security/opendnssec/patches/patch-m4_acx__ssl.m4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/opendnssec/Makefile
diff -u pkgsrc/security/opendnssec/Makefile:1.80 pkgsrc/security/opendnssec/Makefile:1.81
--- pkgsrc/security/opendnssec/Makefile:1.80    Tue Jun  2 08:24:41 2020
+++ pkgsrc/security/opendnssec/Makefile Mon Jun  8 15:07:42 2020
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2020/06/02 08:24:41 adam Exp $
+# $NetBSD: Makefile,v 1.81 2020/06/08 15:07:42 he Exp $
 #
 
 DISTNAME=      opendnssec-1.4.14
-#PKGREVISION=  9
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    security net
 MASTER_SITES=  https://www.opendnssec.org/files/source/
 

Added files:

Index: pkgsrc/security/opendnssec/patches/patch-configure
diff -u /dev/null pkgsrc/security/opendnssec/patches/patch-configure:1.1
--- /dev/null   Mon Jun  8 15:07:43 2020
+++ pkgsrc/security/opendnssec/patches/patch-configure  Mon Jun  8 15:07:43 2020
@@ -0,0 +1,56 @@
+$NetBSD: patch-configure,v 1.1 2020/06/08 15:07:43 he Exp $
+
+--- configure.orig     2020-06-08 14:38:08.801388307 +0000
++++ configure
+@@ -16981,6 +16981,51 @@ fi
+ 
+ fi
+ 
++          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_sha1 in -lcrypto" >&5
++$as_echo_n "checking for EVP_sha1 in -lcrypto... " >&6; }
++if ${ac_cv_lib_crypto_EVP_sha1+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcrypto  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char EVP_sha1 ();
++int
++main ()
++{
++return EVP_sha1 ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_crypto_EVP_sha1=yes
++else
++  ac_cv_lib_crypto_EVP_sha1=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_sha1" >&5
++$as_echo "$ac_cv_lib_crypto_EVP_sha1" >&6; }
++if test "x$ac_cv_lib_crypto_EVP_sha1" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBCRYPTO 1
++_ACEOF
++
++  LIBS="-lcrypto $LIBS"
++
++fi
++
+             for ac_func in EVP_sha1 EVP_sha256
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
Index: pkgsrc/security/opendnssec/patches/patch-m4_acx__ssl.m4
diff -u /dev/null pkgsrc/security/opendnssec/patches/patch-m4_acx__ssl.m4:1.1
--- /dev/null   Mon Jun  8 15:07:43 2020
+++ pkgsrc/security/opendnssec/patches/patch-m4_acx__ssl.m4     Mon Jun  8 15:07:43 2020
@@ -0,0 +1,12 @@
+$NetBSD: patch-m4_acx__ssl.m4,v 1.1 2020/06/08 15:07:43 he Exp $
+
+--- m4/acx_ssl.m4.orig 2017-02-23 09:28:27.000000000 +0000
++++ m4/acx_ssl.m4
+@@ -43,6 +43,7 @@ AC_DEFUN([ACX_SSL], [
+                             AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required])
+                     ])
+             ] )
++          AC_CHECK_LIB(crypto, EVP_sha1)
+             AC_CHECK_FUNCS([EVP_sha1 EVP_sha256])
+         fi
+         AC_SUBST(HAVE_SSL)