Date: Sat, 23 Aug 2003 01:15:18 +0200 (CEST) From: Roman Neuhauser <roman@bellavista.cz> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/55884: update Message-ID: <20030822231518.CDA9D2FDA03@freepuppy.bellavista.cz> Resent-Message-ID: <200308222320.h7MNKIkP018552@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 55884 >Category: ports >Synopsis: update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Aug 22 16:20:17 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Roman Neuhauser >Release: FreeBSD 4.8-STABLE i386 >Organization: >Environment: System: FreeBSD freepuppy.bellavista.cz 4.8-STABLE FreeBSD 4.8-STABLE #2: Thu Jun 5 12:57:47 CEST 2003 root@freepuppy.bellavista.cz:/usr/obj/usr/src/sys/FREEPUPPY2_5 i386 >Description: update security/apg to 2.3.0b, with optional cracklib support >How-To-Repeat: apply the patch >Fix: --- security-apg-2.3.0b.patch begins here --- diff -uNr ../apg-orig/Makefile ./Makefile --- ../apg-orig/Makefile Wed Mar 5 22:59:17 2003 +++ ./Makefile Sat Aug 23 00:19:17 2003 @@ -6,14 +6,34 @@ # PORTNAME= apg -PORTVERSION= 2.1.0 +PORTVERSION= 2.3.0b CATEGORIES= security MASTER_SITES= http://www.adel.nursat.kz/apg/download/ MAINTAINER= roam@FreeBSD.org COMMENT= "An automated password generator" +.if defined(WITH_CRACKLIB) +BUILD_DEPENDS= ${LOCALBASE}/lib/crack.a:${PORTSDIR}/security/cracklib +MAKE_ARGS= -DWITH_CRACKLIB +.endif + MAN1= apg.1 apgbfm.1 MAN8= apgd.8 +DOCS= APG_TIPS pronun.txt rfc0972.txt rfc1750.txt + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/apg ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/apgbfm ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/apgd ${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/doc/man/apg.1 ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/man/apgbfm.1 ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/man/apgd.8 ${MANPREFIX}/man/man8 +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} +.for file in ${DOCS} + ${INSTALL_MAN} ${WRKSRC}/doc/${file} ${DOCSDIR} +.endfor +.endif .include <bsd.port.mk> diff -uNr ../apg-orig/distinfo ./distinfo --- ../apg-orig/distinfo Fri Sep 20 10:26:34 2002 +++ ./distinfo Fri Aug 22 22:27:55 2003 @@ -1 +1 @@ -MD5 (apg-2.1.0.tar.gz) = 402769cce2c5ffef9806993d93c5b56d +MD5 (apg-2.3.0b.tar.gz) = bd82400a5a731070ce895313576afe24 diff -uNr ../apg-orig/files/patch-aa ./files/patch-aa --- ../apg-orig/files/patch-aa Fri Sep 20 10:26:34 2002 +++ ./files/patch-aa Sat Aug 23 00:20:29 2003 @@ -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} diff -uNr ../apg-orig/pkg-plist ./pkg-plist --- ../apg-orig/pkg-plist Tue May 21 12:25:16 2002 +++ ./pkg-plist Fri Aug 22 23:54:26 2003 @@ -1,3 +1,8 @@ bin/apg bin/apgbfm sbin/apgd +%%PORTDOCS%%%%DOCSDIR%%/APG_TIPS +%%PORTDOCS%%%%DOCSDIR%%/pronun.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc0972.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc1750.txt +%%PORTDOCS%%@dirrm %%DOCSDIR%% --- security-apg-2.3.0b.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030822231518.CDA9D2FDA03>