summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorkim <kim@pkgsrc.org>2004-05-19 19:26:38 +0000
committerkim <kim@pkgsrc.org>2004-05-19 19:26:38 +0000
commitaecc988438d2e86869a28d4604f0649bf36e0988 (patch)
tree8df7dd7ebec43169058eb98aeaea904bbbdc339b /security
parentff7072f3dfb0156ad38885036b02e2ba2c30a93e (diff)
downloadpkgsrc-aecc988438d2e86869a28d4604f0649bf36e0988.tar.gz
Use -lcrypto with Heimdahl if it exists.
Fixes PR pkg/25623
Diffstat (limited to 'security')
-rw-r--r--security/sudo/distinfo6
-rw-r--r--security/sudo/patches/patch-af34
-rw-r--r--security/sudo/patches/patch-ag85
3 files changed, 100 insertions, 25 deletions
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index 3cccafde972..59c4e944d66 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2004/03/22 08:45:56 jlam Exp $
+$NetBSD: distinfo,v 1.20 2004/05/19 19:26:38 kim Exp $
SHA1 (sudo-1.6.7p5.tar.gz) = 6814bd874c5d42781757b5cbab1961c05cc26c8f
Size (sudo-1.6.7p5.tar.gz) = 349785 bytes
SHA1 (patch-aa) = 23c35edd2aad78cc94881a8b03e2ade66dc7c993
SHA1 (patch-ab) = f2c3a6a10568a6bd394504360a1f53f2fcfc5123
-SHA1 (patch-af) = 33ed24f6c812f3a2fc5fead32352d0dbf199b248
-SHA1 (patch-ag) = 40b6a5a97f6bed16248cb2c1d94ce7f42aba9b2a
+SHA1 (patch-af) = a28c974dc854ca21cf2da8addbe98eac13c612a2
+SHA1 (patch-ag) = 3703932e134ae90281179d0a4ae4760fa420264b
diff --git a/security/sudo/patches/patch-af b/security/sudo/patches/patch-af
index f571a40c0c3..b545cbc3104 100644
--- a/security/sudo/patches/patch-af
+++ b/security/sudo/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.11 2003/04/01 16:07:22 wiz Exp $
+$NetBSD: patch-af,v 1.12 2004/05/19 19:26:38 kim Exp $
---- configure.in.orig Mon Mar 24 17:05:59 2003
-+++ configure.in
-@@ -110,7 +110,6 @@ dnl
+--- configure.in.orig 2003-05-06 11:22:36.000000000 -0400
++++ configure.in 2004-05-19 15:22:23.000000000 -0400
+@@ -110,7 +110,6 @@
test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man'
test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
@@ -10,13 +10,10 @@ $NetBSD: patch-af,v 1.11 2003/04/01 16:07:22 wiz Exp $
dnl
dnl Deprecated --with options (these all warn or generate an error)
-@@ -233,6 +232,19 @@ AC_ARG_WITH(csops, [ --with-csops
+@@ -236,6 +235,19 @@
;;
- no) ;;
- *) AC_MSG_WARN([Ignoring unknown argument to --with-csops: $with_csops])
-+ ;;
-+esac])
-+
+ esac])
+
+AC_ARG_WITH(nbsdops, [ --with-nbsdops add NetBSD standard options],
+[case $with_nbsdops in
+ yes) echo 'Adding NetBSD standard options'
@@ -27,6 +24,17 @@ $NetBSD: patch-af,v 1.11 2003/04/01 16:07:22 wiz Exp $
+ ;;
+ no) ;;
+ *) echo "Ignoring unknown argument to --with-nbsdops: $with_nbsdops"
- ;;
- esac])
-
++ ;;
++esac])
++
+ AC_ARG_WITH(passwd, [ --without-passwd don't use passwd/shadow file for authentication],
+ [case $with_passwd in
+ yes) ;;
+@@ -1813,6 +1825,7 @@
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_HEIMDAL, 1, [Define if your Kerberos is Heimdal.])
+ SUDO_LIBS="${SUDO_LIBS} -lkrb5 -ldes -lcom_err -lasn1"
++ AC_CHECK_LIB(crypto, main, [SUDO_LIBS="${SUDO_LIBS} -lcrypto"])
+ AC_CHECK_LIB(roken, main, [SUDO_LIBS="${SUDO_LIBS} -lroken"])
+ ], [
+ AC_MSG_RESULT(no)
diff --git a/security/sudo/patches/patch-ag b/security/sudo/patches/patch-ag
index f463960d45e..70dc7f4e5b1 100644
--- a/security/sudo/patches/patch-ag
+++ b/security/sudo/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.4 2003/04/01 16:07:22 wiz Exp $
+$NetBSD: patch-ag,v 1.5 2004/05/19 19:26:38 kim Exp $
---- configure.orig Mon Mar 24 17:06:06 2003
-+++ configure
-@@ -873,6 +873,7 @@ Optional Packages:
+--- configure.orig 2003-05-06 11:22:27.000000000 -0400
++++ configure 2004-05-19 15:17:50.000000000 -0400
+@@ -873,6 +873,7 @@
--with-devel add development options
--with-efence link with -lefence for malloc() debugging
--with-csops add CSOps standard options
@@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.4 2003/04/01 16:07:22 wiz Exp $
--without-passwd don't use passwd/shadow file for authentication
--with-skey=DIR enable S/Key support
--with-opie=DIR enable OPIE support
-@@ -1423,7 +1424,6 @@ CHECKSIA=true
+@@ -1423,7 +1424,6 @@
test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man'
test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
@@ -18,11 +18,10 @@ $NetBSD: patch-ag,v 1.4 2003/04/01 16:07:22 wiz Exp $
-@@ -1621,6 +1621,22 @@ echo "$as_me: WARNING: Ignoring unknown
- esac
+@@ -1622,6 +1622,22 @@
fi;
-+
+
+# Check whether --with-nbsdops or --without-nbsdops was given.
+if test "${with_nbsdops+set}" = set; then
+ withval="$with_nbsdops"
@@ -38,6 +37,74 @@ $NetBSD: patch-ag,v 1.4 2003/04/01 16:07:22 wiz Exp $
+ ;;
+esac
+fi;
-
++
# Check whether --with-passwd or --without-passwd was given.
if test "${with_passwd+set}" = set; then
+ withval="$with_passwd"
+@@ -13230,6 +13246,58 @@
+ _ACEOF
+
+ SUDO_LIBS="${SUDO_LIBS} -lkrb5 -ldes -lcom_err -lasn1"
++ echo "$as_me:$LINENO: checking for main in -lcrypto" >&5
++echo $ECHO_N "checking for main in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_main+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcrypto $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++
++int
++main ()
++{
++main ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_lib_crypto_main=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_crypto_main=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_main" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_main" >&6
++if test $ac_cv_lib_crypto_main = yes; then
++ SUDO_LIBS="${SUDO_LIBS} -lcrypto"
++fi
++
+ echo "$as_me:$LINENO: checking for main in -lroken" >&5
+ echo $ECHO_N "checking for main in -lroken... $ECHO_C" >&6
+ if test "${ac_cv_lib_roken_main+set}" = set; then
+@@ -13282,7 +13350,6 @@
+ SUDO_LIBS="${SUDO_LIBS} -lroken"
+ fi
+
+-
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5