summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>1998-05-29 08:30:27 +0000
committerobrien <obrien@FreeBSD.org>1998-05-29 08:30:27 +0000
commite399c745dae28d7b3fdb93134770a305e9f99cdd (patch)
treea01bb969a642964b997385e439fa52f513f8d9d0 /security
parent4a63c974c77b0081af29ab353749cdb3b666f8c2 (diff)
downloadFreeBSD-ports-e399c745dae28d7b3fdb93134770a305e9f99cdd.zip
FreeBSD-ports-e399c745dae28d7b3fdb93134770a305e9f99cdd.tar.gz
make S/Key support actually work
Diffstat (limited to 'security')
-rw-r--r--security/sudo/files/patch-aa45
1 files changed, 27 insertions, 18 deletions
diff --git a/security/sudo/files/patch-aa b/security/sudo/files/patch-aa
index 95030a5..e31695f 100644
--- a/security/sudo/files/patch-aa
+++ b/security/sudo/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Sun Aug 25 12:32:03 1996
-+++ configure Thu Aug 29 10:26:50 1996
-@@ -37,6 +37,8 @@
+--- configure.orig Mon Jan 12 20:45:09 1998
++++ configure Fri May 29 01:31:07 1998
+@@ -39,6 +39,8 @@
--with-libraries additional libraries to link with"
ac_help="$ac_help
--with-csops add CSOps standard options"
@@ -9,7 +9,7 @@
# Initialize some variables set by options.
# The variables have the same names as the options, with
-@@ -557,8 +559,8 @@
+@@ -565,8 +567,8 @@
test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man'
test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
@@ -20,17 +20,10 @@
# Check whether --with-CC or --without-CC was given.
-@@ -784,6 +786,20 @@
- yes) OPTIONS="${OPTIONS} -DIGNORE_DOT_PATH -DUSE_INSULTS -DCLASSIC_INSULTS -DCSOPS_INSULTS -DENV_EDITOR"
- sbindir='$(exec_prefix)/sbin'
- echo 'CSOps--adding options: IGNORE_DOT_PATH USE_INSULTS CLASSIC_INSULTS CSOPS_INSULTS ENV_EDITOR'
-+ ;;
-+ no) ;;
-+ *) echo "Ignoring unknown argument to --with-csops: $with_csops"
-+ ;;
-+esac
-+fi
-+
+@@ -816,6 +818,20 @@
+ esac
+ fi
+
+# Check whether --with-fbsdops or --without-fbsdops was given.
+if test "${with_fbsdops+set}" = set; then
+ withval="$with_fbsdops"
@@ -38,6 +31,22 @@
+ yes) OPTIONS="${OPTIONS} -DIGNORE_DOT_PATH -DENV_EDITOR -DUSE_TTY_TICKETS"
+ sbindir='$(exec_prefix)/sbin'
+ echo 'fbsdops--adding options: IGNORE_DOT_PATH ENV_EDITOR USE_TTY_TICKETS'
- ;;
- no) ;;
- *) echo "Ignoring unknown argument to --with-csops: $with_csops"
++ ;;
++ no) ;;
++ *) echo "Ignoring unknown argument to --with-csops: $with_csops"
++ ;;
++esac
++fi
++
+
+ # Extract the first word of "egrep", so it can be a program name with args.
+ set dummy egrep; ac_word=$2
+@@ -4557,7 +4573,7 @@
+ fi
+
+ if test "$with_skey" = "yes"; then
+- SUDO_LIBS="${SUDO_LIBS} -lskey"
++ SUDO_LIBS="${SUDO_LIBS} -lskey /usr/lib/libmd.a"
+ if test -f /usr/include/skey.h -a -f /usr/lib/libskey.a; then
+ :
+ elif test -f /usr/local/include/skey.h; then
OpenPOWER on IntegriCloud