Attachment #34385 for bug #55884

View | Details | Raw Unified | Return to bug 55884
Collapse All | Expand All




#

PORTNAME=	apg
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>

Line 1 Link Here

(-)./distinfo (-1 / +1 lines)
1	MD5 (apg-2.1.0.tar.gz) = 402769cce2c5ffef9806993d93c5b56d	1	MD5 (apg-2.3.0b.tar.gz) = bd82400a5a731070ce895313576afe24




--- 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

 ##################################################################
 # Compilation flags
 # You should comment the line below for AIX+native cc
-CFLAGS = -Wall
+CFLAGS ?= -Wall
 
 ####################################################################
 # 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}
 # 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}
 
 apgbfm:
-	${CC} ${FLAGS} -DAPGBFM -o ${BFM_PROGNAME} ${BFM_SOURCES} ${APGBFM_CLIBS}
+	${CC} ${CFLAGS} -DAPGBFM -o ${BFM_PROGNAME} ${BFM_SOURCES} ${APGBFM_CLIBS}
 
 strip:
 	strip ${PROGNAME}

Lines 1-3 Link Here

(-)./pkg-plist (+5 lines)
1	bin/apg	1	bin/apg
2	bin/apgbfm	2	bin/apgbfm
3	sbin/apgd	3	sbin/apgd
		4	%%PORTDOCS%%%%DOCSDIR%%/APG_TIPS
		5	%%PORTDOCS%%%%DOCSDIR%%/pronun.txt
		6	%%PORTDOCS%%%%DOCSDIR%%/rfc0972.txt
		7	%%PORTDOCS%%%%DOCSDIR%%/rfc1750.txt
		8	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 55884

Lines 6-19 Link Here

(-)./Makefile (-1 / +21 lines)
6	#	6	#
7		7
8	PORTNAME= apg	8	PORTNAME= apg
9	PORTVERSION= 2.1.0	9	PORTVERSION= 2.3.0b
10	CATEGORIES= security	10	CATEGORIES= security
11	MASTER_SITES= http://www.adel.nursat.kz/apg/download/	11	MASTER_SITES= http://www.adel.nursat.kz/apg/download/
12		12
13	MAINTAINER= roam@FreeBSD.org	13	MAINTAINER= roam@FreeBSD.org
14	COMMENT= "An automated password generator"	14	COMMENT= "An automated password generator"
15		15
		16	.if defined(WITH_CRACKLIB)
		17	BUILD_DEPENDS= ${LOCALBASE}/lib/crack.a:${PORTSDIR}/security/cracklib
		18	MAKE_ARGS= -DWITH_CRACKLIB
		19	.endif
		20
16	MAN1= apg.1 apgbfm.1	21	MAN1= apg.1 apgbfm.1
17	MAN8= apgd.8	22	MAN8= apgd.8
		23	DOCS= APG_TIPS pronun.txt rfc0972.txt rfc1750.txt
		24
		25	do-install:
		26	${INSTALL_PROGRAM} ${WRKSRC}/apg ${PREFIX}/bin
		27	${INSTALL_PROGRAM} ${WRKSRC}/apgbfm ${PREFIX}/bin
		28	${INSTALL_PROGRAM} ${WRKSRC}/apgd ${PREFIX}/sbin
		29	${INSTALL_MAN} ${WRKSRC}/doc/man/apg.1 ${MANPREFIX}/man/man1
		30	${INSTALL_MAN} ${WRKSRC}/doc/man/apgbfm.1 ${MANPREFIX}/man/man1
		31	${INSTALL_MAN} ${WRKSRC}/doc/man/apgd.8 ${MANPREFIX}/man/man8
		32	.if !defined(NOPORTDOCS)
		33	${MKDIR} ${DOCSDIR}
		34	.for file in ${DOCS}
		35	${INSTALL_MAN} ${WRKSRC}/doc/${file} ${DOCSDIR}
		36	.endfor
		37	.endif
18		38
19	.include <bsd.port.mk>	39	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)./files/patch-aa (-28 / +27 lines)
1	--- Makefile 20 Sep 2002 07:24:50 -0000 1.1.1.4	1	--- Makefile.orig Thu Aug 7 17:40:39 2003
2	+++ Makefile 20 Sep 2002 07:27:21 -0000 1.6	2	+++ Makefile Sat Aug 23 00:18:35 2003
3	@@ -1,12 +1,12 @@	3	@@ -44,10 +44,12 @@
		4	# If you want to use cracklib for password quality check then you
		5	# must uncomment the folowing 4 lines (you must not do this for WIN32)
		6	#
		7	-#CRACKLIB_DICTPATH = "/usr/local/lib/pw_dict"
		8	-#STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
		9	-#CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
		10	-#APG_CLIBS += -lcrack
		11	+.if defined(WITH_CRACKLIB)
		12	+CRACKLIB_DICTPATH = "${LOCALBASE}/libdata/cracklib/pw_dict"
		13	+STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I${LOCALBASE}/include -L${LOCALBASE}/lib
		14	+CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I${LOCALBASE}/include -L${LOCALBASE}/lib
		15	+APG_CLIBS += -lcrack
		16	+.endif
		17
		18	##################################################################
		19	# Support for ANSI X9.17/SHA1 PRNG
		20	@@ -60,12 +62,12 @@
4	##################################################################	21	##################################################################
5	# You can modify CC variable if you have compiler other than GCC	22	# You can modify CC variable if you have compiler other than GCC
6	# But the code was designed and tested with GCC	23	# But the code was designed and tested with GCC
Lines 10-44 Link Here
10	##################################################################	27	##################################################################
11	# Compilation flags	28	# Compilation flags
12	# You should comment the line below for AIX+native cc	29	# You should comment the line below for AIX+native cc
13	-FLAGS = -Wall	30	-CFLAGS = -Wall
14	+CFLAGS ?= -Wall	31	+CFLAGS ?= -Wall
15		32
16	##################################################################	33	####################################################################
17	# Libraries	34	# If you plan to install APG daemon you should look at lines below #
18	@@ -37,7 +37,8 @@	35	@@ -135,7 +137,7 @@
19	##################################################################	36	${CC} ${CFLAGS} -DCLISERV ${CLISERV_OPTIONS} -o ${CS_PROGNAME} ${SOURCES} ${APG_CS_CLIBS}
20	# Directories
21	# Install dirs
22	-INSTALL_PREFIX = /usr/local
23	+PREFIX ?= /usr/local
24	+INSTALL_PREFIX = ${PREFIX}
25	APG_BIN_DIR = /bin
26	APG_MAN_DIR = /man/man1
27	APGD_BIN_DIR = /sbin
28	@@ -88,13 +89,13 @@
29	cygwin: standalone
30
31	apg:
32	- ${CC} ${FLAGS} -D${CRYPTED_PASS} -D${USE_SHA} -o ${PROGNAME} ${SOURCES} ${LIBS} ${LIBM}
33	+ ${CC} ${CFLAGS} -D${CRYPTED_PASS} -D${USE_SHA} -o ${PROGNAME} ${SOURCES} ${LIBS} ${LIBM}
34
35	apgd:
36	- ${CC} ${FLAGS} -DCLISERV -D${USE_SHA} -o ${CS_PROGNAME} ${SOURCES} ${CS_LIBS} ${LIBM}
37	+ ${CC} ${CFLAGS} -DCLISERV -D${USE_SHA} -o ${CS_PROGNAME} ${SOURCES} ${CS_LIBS} ${LIBM}
38		37
39	apgbfm:	38	apgbfm:
40	- ${CC} ${FLAGS} -o ${BFM_PROGNAME} ${BFM_SOURCES} ${LIBM}	39	- ${CC} ${FLAGS} -DAPGBFM -o ${BFM_PROGNAME} ${BFM_SOURCES} ${APGBFM_CLIBS}
41	+ ${CC} ${CFLAGS} -o ${BFM_PROGNAME} ${BFM_SOURCES} ${LIBM}	40	+ ${CC} ${CFLAGS} -DAPGBFM -o ${BFM_PROGNAME} ${BFM_SOURCES} ${APGBFM_CLIBS}
42		41
43	strip:	42	strip:
44	strip ${PROGNAME}	43	strip ${PROGNAME}