Fix a segfault when using the -y option. While I'm here:

- remove the MD5 checksum from the distfile
- note upstream's BSD license
- OPTIONSify the support for CrackLib
- add a descriptive patch header to the existing patch-aa
- remove the packetstorm master site, it only seems to carry a much
  older version of apg
- bump PORTREVISION for the segfault fix

PR:		153382 (the segfault fix)
Submitted by:	David Boyd <David.Boyd@insightbb.com>

4 files changed, 34 insertions, 6 deletions

diff --git a/security/apg/Makefile b/security/apg/Makefile
index 4c1724c7d7b2..0de420042717 100644
--- a/security/apg/Makefile
+++ b/security/apg/Makefile
@@ -7,20 +7,25 @@
 
 PORTNAME=	apg
 PORTVERSION=	2.3.0b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
-MASTER_SITES=	http://www.adel.nursat.kz/apg/download/ \
-		${MASTER_SITE_PACKETSTORM}
+MASTER_SITES=	http://www.adel.nursat.kz/apg/download/
 MASTER_SITE_SUBDIR=	UNIX/misc
 
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	An automated password generator
 
+OPTIONS=	CRACKLIB "CrackLib support for password quality" off
+
+.include <bsd.port.options.mk>
+
 .if defined(WITH_CRACKLIB)
 LIB_DEPENDS=	crack.1:${PORTSDIR}/security/cracklib
 MAKE_ARGS=	-DWITH_CRACKLIB
 .endif
 
+LICENSE=	BSD
+
 MAN1=		apg.1 apgbfm.1
 MAN8=		apgd.8
 DOCS=		APG_TIPS pronun.txt rfc0972.txt rfc1750.txt
diff --git a/security/apg/distinfo b/security/apg/distinfo
index 211a4a414421..796f6f7fa120 100644
--- a/security/apg/distinfo
+++ b/security/apg/distinfo
@@ -1,3 +1,2 @@
-MD5 (apg-2.3.0b.tar.gz) = bd82400a5a731070ce895313576afe24
 SHA256 (apg-2.3.0b.tar.gz) = d1e52029709e2d7f9cb99bedce3e02ee7a63cff7b8e2b4c2bc55b3dc03c28b92
 SIZE (apg-2.3.0b.tar.gz) = 109995
diff --git a/security/apg/files/patch-aa b/security/apg/files/patch-aa
index 0a259f8641bf..b6ff9bb8f508 100644
--- a/security/apg/files/patch-aa
+++ b/security/apg/files/patch-aa
@@ -1,5 +1,12 @@
---- Makefile.orig	Thu Aug  7 17:40:39 2003
-+++ Makefile	Sat Aug 23 00:18:35 2003
+Description: Add CrackLib support and conditionalize the build variables.
+Forwarded: no
+Author: Peter Pentchev <roam@FreeBSD.org>,
+	Dominic Marks <dominic_marks@btinternet.com>,
+	Roman Neuhauser <roman@bellavista.cz>
+Last-Update: 2010-12-23
+
+--- Makefile.orig
++++ Makefile
 @@ -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)
diff --git a/security/apg/files/patch-apg.c b/security/apg/files/patch-apg.c
new file mode 100644
index 000000000000..cd451eb6a2a7
--- /dev/null
+++ b/security/apg/files/patch-apg.c
@@ -0,0 +1,17 @@
+Description: Fix a segfault with crypt(3) password encryption.
+Origin: Debian; http://bugs.debian.org/337116
+Forwarded: yes
+Author: Paul Martin <pm@debian.org>
+Last-Update: 2010-12-23
+
+--- apg.c.orig
++++ apg.c
+@@ -709,7 +709,7 @@
+ */
+ char * crypt_passstring (const char *p)
+ {
+- char salt[10];
++ char salt[11];
+  gen_rand_pass (salt, 10, 10, S_SL|S_CL|S_NB);
+  return (crypt(p, salt));
+ }