CVS commit: pkgsrc/sysutils/radmind

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Oct 10 17:33:41 UTC 2024

Modified Files:
        pkgsrc/sysutils/radmind: distinfo
        pkgsrc/sysutils/radmind/patches: patch-configure patch-configure.ac

Log Message:
radmind: Detect OpenSSL using non-deprecated function


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/radmind/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/radmind/patches/patch-configure \
    pkgsrc/sysutils/radmind/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/sysutils/radmind/distinfo
diff -u pkgsrc/sysutils/radmind/distinfo:1.28 pkgsrc/sysutils/radmind/distinfo:1.29
--- pkgsrc/sysutils/radmind/distinfo:1.28       Fri Jul 12 13:26:40 2024
+++ pkgsrc/sysutils/radmind/distinfo    Thu Oct 10 17:33:41 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2024/07/12 13:26:40 hauke Exp $
+$NetBSD: distinfo,v 1.29 2024/10/10 17:33:41 nia Exp $
 
 BLAKE2s (radmind-1.14.1.tar.gz) = ecab16cf79583ade0b5064fb8f61e2882017b696f04184c6825b9e2cf8d1c34e
 SHA512 (radmind-1.14.1.tar.gz) = bccf9681a6899be3b500065237dd1e04cd83ffb6f9be0e355412e7b0c556325f7d13435cec65a8a5e156e4411da915744f01a615472f6361d52c4d54d8be20eb
@@ -8,8 +8,8 @@ SHA1 (patch-cksum.c) = 92cc806e8e79e6d48
 SHA1 (patch-command.c) = 26e93be15a5a1113b8f75eb6eaf1d77892947bc7
 SHA1 (patch-command.h) = 03daa77363c681ef625cf429071f02245689e1e9
 SHA1 (patch-config.h.in) = 89bce7b9d256e81ebb6ce1319183cb346260bcde
-SHA1 (patch-configure) = 8d4c7daab7923da97efe94383278ecd30249e142
-SHA1 (patch-configure.ac) = 12968655962adc00ce095866151d11747ac9b565
+SHA1 (patch-configure) = 8db0105f8d0c06129b798f51a2a17bf39514d5d3
+SHA1 (patch-configure.ac) = 706aba64e3427bda499b9935d8c92922a32d1224
 SHA1 (patch-ktcheck.c) = 83c03e417fc93863a8575b0cb2f93e09cba1d937
 SHA1 (patch-largefile.h) = 806f12878aa628f30355b82ac23a5c92740f42a1
 SHA1 (patch-lcksum.c) = 7b7b4da338bb13f2508c5b22307263eaedb32347

Index: pkgsrc/sysutils/radmind/patches/patch-configure
diff -u pkgsrc/sysutils/radmind/patches/patch-configure:1.2 pkgsrc/sysutils/radmind/patches/patch-configure:1.3
--- pkgsrc/sysutils/radmind/patches/patch-configure:1.2 Tue Dec 18 14:16:18 2018
+++ pkgsrc/sysutils/radmind/patches/patch-configure     Thu Oct 10 17:33:41 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.2 2018/12/18 14:16:18 hauke Exp $
+$NetBSD: patch-configure,v 1.3 2024/10/10 17:33:41 nia Exp $
 
 Fix for Radmind bug #221, accomodating for 64 bit time_t
 
@@ -6,6 +6,8 @@ This patch was generated by downgrading 
 and diffing the autoconf generated 'configure' script
 against the distributed one.
 
+Test for OpenSSL by testing non-deprecated function.
+
 --- configure.orig     2010-12-13 03:49:48.000000000 +0000
 +++ configure
 @@ -4525,6 +4525,411 @@ cat >>confdefs.h <<_ACEOF
@@ -420,3 +422,57 @@ against the distributed one.
  
  # Checks for libraries.
  { echo "$as_me:$LINENO: checking for inet_aton in -lc" >&5
+@@ -5203,9 +5608,9 @@ fi
+ 
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for SSLeay_version in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay_version in -lcrypto... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_crypto_SSLeay_version+set}" = set; then
++{ echo "$as_me:$LINENO: checking for OpenSSL_version in -lcrypto" >&5
++echo $ECHO_N "checking for OpenSSL_version in -lcrypto... $ECHO_C" >&6; }
++if test "${ac_cv_lib_crypto_OpenSSL_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -5223,11 +5628,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSLeay_version ();
++char OpenSSL_version ();
+ int
+ main ()
+ {
+-return SSLeay_version ();
++return OpenSSL_version ();
+   ;
+   return 0;
+ }
+@@ -5250,21 +5655,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+        test ! -s conftest.err
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+-  ac_cv_lib_crypto_SSLeay_version=yes
++  ac_cv_lib_crypto_OpenSSL_version=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-      ac_cv_lib_crypto_SSLeay_version=no
++      ac_cv_lib_crypto_OpenSSL_version=no
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay_version" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay_version" >&6; }
+-if test $ac_cv_lib_crypto_SSLeay_version = yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_OpenSSL_version" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_OpenSSL_version" >&6; }
++if test $ac_cv_lib_crypto_OpenSSL_version = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
Index: pkgsrc/sysutils/radmind/patches/patch-configure.ac
diff -u pkgsrc/sysutils/radmind/patches/patch-configure.ac:1.2 pkgsrc/sysutils/radmind/patches/patch-configure.ac:1.3
--- pkgsrc/sysutils/radmind/patches/patch-configure.ac:1.2      Tue Dec 18 14:16:18 2018
+++ pkgsrc/sysutils/radmind/patches/patch-configure.ac  Thu Oct 10 17:33:41 2024
@@ -1,7 +1,9 @@
-$NetBSD: patch-configure.ac,v 1.2 2018/12/18 14:16:18 hauke Exp $
+$NetBSD: patch-configure.ac,v 1.3 2024/10/10 17:33:41 nia Exp $
 
 Fix for Radmind bug #221, accomodating for 64 bit time_t
 
+Test for OpenSSL by testing non-deprecated function.
+
 --- configure.ac.orig  2010-12-13 03:43:38.000000000 +0000
 +++ configure.ac
 @@ -44,6 +44,7 @@ AC_SYS_LARGEFILE
@@ -12,3 +14,12 @@ Fix for Radmind bug #221, accomodating f
  
  # Checks for libraries.
  AC_CHECK_LIB(c, inet_aton, libc_inet_aton=yes) 
+@@ -57,7 +58,7 @@ AC_CHECK_LIB([socket], [socket])
+ AC_CHECK_LIB([ssl], [SSL_accept], , [CHECK_SSL])
+ AC_CHECK_HEADER([openssl/ssl.h], [], [AC_MSG_ERROR([header file <openssl/ssl.h>
+ is required for this software.  You may be running RedHat 9.  If so, see the FAQ or the README for further instructions.])])
+-AC_CHECK_LIB([crypto], [SSLeay_version], , [CHECK_SSL])
++AC_CHECK_LIB([crypto], [OpenSSL_version], , [CHECK_SSL])
+ AC_CHECK_FUNC([X509_VERIFY_PARAM_set_flags], [AC_DEFINE(HAVE_X509_VERIFY_PARAM)], [])
+ 
+ # PAM