summaryrefslogtreecommitdiff
path: root/security/apg/files
diff options
context:
space:
mode:
authorPeter Pentchev <roam@FreeBSD.org>2003-09-02 15:45:45 +0000
committerPeter Pentchev <roam@FreeBSD.org>2003-09-02 15:45:45 +0000
commit4df511c24770c0f97791a446e682ecbe38cd31e5 (patch)
tree14530b5e01719c80675468f2823a24adc4b35a0b /security/apg/files
parentWhen using addport on freefall, there's no need to ssh freefall once more to (diff)
Update to 2.3.0b, enabling cracklib use and installing docfiles.
PR: 55884 Submitted by: Roman Neuhauser <roman@bellavista.cz>
Notes
Notes: svn path=/head/; revision=88365
Diffstat (limited to 'security/apg/files')
-rw-r--r--security/apg/files/patch-aa55
1 files changed, 27 insertions, 28 deletions
diff --git a/security/apg/files/patch-aa b/security/apg/files/patch-aa
index 89340e111829..0a259f8641bf 100644
--- a/security/apg/files/patch-aa
+++ b/security/apg/files/patch-aa
@@ -1,6 +1,23 @@
---- Makefile 20 Sep 2002 07:24:50 -0000 1.1.1.4
-+++ Makefile 20 Sep 2002 07:27:21 -0000 1.6
-@@ -1,12 +1,12 @@
+--- Makefile.orig Thu Aug 7 17:40:39 2003
++++ Makefile Sat Aug 23 00:18:35 2003
+@@ -44,10 +44,12 @@
+ # If you want to use cracklib for password quality check then you
+ # must uncomment the folowing 4 lines (you must not do this for WIN32)
+ #
+-#CRACKLIB_DICTPATH = "/usr/local/lib/pw_dict"
+-#STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
+-#CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
+-#APG_CLIBS += -lcrack
++.if defined(WITH_CRACKLIB)
++CRACKLIB_DICTPATH = "${LOCALBASE}/libdata/cracklib/pw_dict"
++STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I${LOCALBASE}/include -L${LOCALBASE}/lib
++CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I${LOCALBASE}/include -L${LOCALBASE}/lib
++APG_CLIBS += -lcrack
++.endif
+
+ ##################################################################
+ # Support for ANSI X9.17/SHA1 PRNG
+@@ -60,12 +62,12 @@
##################################################################
# You can modify CC variable if you have compiler other than GCC
# But the code was designed and tested with GCC
@@ -10,35 +27,17 @@
##################################################################
# Compilation flags
# You should comment the line below for AIX+native cc
--FLAGS = -Wall
+-CFLAGS = -Wall
+CFLAGS ?= -Wall
- ##################################################################
- # Libraries
-@@ -37,7 +37,8 @@
- ##################################################################
- # Directories
- # Install dirs
--INSTALL_PREFIX = /usr/local
-+PREFIX ?= /usr/local
-+INSTALL_PREFIX = ${PREFIX}
- APG_BIN_DIR = /bin
- APG_MAN_DIR = /man/man1
- APGD_BIN_DIR = /sbin
-@@ -88,13 +89,13 @@
- cygwin: standalone
-
- apg:
-- ${CC} ${FLAGS} -D${CRYPTED_PASS} -D${USE_SHA} -o ${PROGNAME} ${SOURCES} ${LIBS} ${LIBM}
-+ ${CC} ${CFLAGS} -D${CRYPTED_PASS} -D${USE_SHA} -o ${PROGNAME} ${SOURCES} ${LIBS} ${LIBM}
-
- apgd:
-- ${CC} ${FLAGS} -DCLISERV -D${USE_SHA} -o ${CS_PROGNAME} ${SOURCES} ${CS_LIBS} ${LIBM}
-+ ${CC} ${CFLAGS} -DCLISERV -D${USE_SHA} -o ${CS_PROGNAME} ${SOURCES} ${CS_LIBS} ${LIBM}
+ ####################################################################
+ # If you plan to install APG daemon you should look at lines below #
+@@ -135,7 +137,7 @@
+ ${CC} ${CFLAGS} -DCLISERV ${CLISERV_OPTIONS} -o ${CS_PROGNAME} ${SOURCES} ${APG_CS_CLIBS}
apgbfm:
-- ${CC} ${FLAGS} -o ${BFM_PROGNAME} ${BFM_SOURCES} ${LIBM}
-+ ${CC} ${CFLAGS} -o ${BFM_PROGNAME} ${BFM_SOURCES} ${LIBM}
+- ${CC} ${FLAGS} -DAPGBFM -o ${BFM_PROGNAME} ${BFM_SOURCES} ${APGBFM_CLIBS}
++ ${CC} ${CFLAGS} -DAPGBFM -o ${BFM_PROGNAME} ${BFM_SOURCES} ${APGBFM_CLIBS}
strip:
strip ${PROGNAME}