Major update to passwdqc-1.2.2 which brings native OpenBSD support.

ok okan@ sthen@ millert@

security/passwdqc/Makefile

@@ -1,26 +1,45 @@
-# $OpenBSD: Makefile,v 1.3 2007/09/15 23:30:00 merdely Exp $
+# $OpenBSD: Makefile,v 1.4 2010/07/07 21:29:58 ajacoutot Exp $
 
 COMMENT=		plugin password complexity checker for passwd(1)
 
-DISTNAME=		passwdqc-0.1
+DISTNAME=		passwdqc-1.2.2
 CATEGORIES=     	security sysutils
 
-HOMEPAGE=		http://www.mindrot.org/passwdqc.html
+SHARED_LIBS=		passwdqc 0.0 # .0
 
-# BSDish
+HOMEPAGE=		http://www.openwall.com/passwdqc/
+
+# BSD
 PERMIT_PACKAGE_CDROM=	Yes 
 PERMIT_PACKAGE_FTP=	Yes 
 PERMIT_DISTFILES_CDROM= Yes 
 PERMIT_DISTFILES_FTP=	Yes
+
 WANTLIB=		c
 
-MASTER_SITES=		http://www2.mindrot.org/files/passwdqc/
+MASTER_SITES=		${HOMEPAGE}
 
 NO_REGRESS=		Yes
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/passwdqc/passwdqc ${PREFIX}/libexec
-	${INSTALL_MAN} ${WRKSRC}/passwdqc/passwdqc.cat8 \
-	    ${PREFIX}/man/cat8/passwdqc.0
+ALL_TARGET=		utils
+INSTALL_TARGET=		install_lib install_utils
+
+MAKE_FLAGS=	CC=${CC} \
+		CFLAGS="${CFLAGS}" \
+		BINDIR=${PREFIX}/bin \
+		SHARED_LIBDIR=${PREFIX}/lib \
+		DEVEL_LIBDIR=${PREFIX}/lib \
+		INCLUDEDIR=${PREFIX}/include \
+		MANDIR=${PREFIX}/man \
+		CONFDIR=${PREFIX}/share/examples/passwdqc \
+		SHARED_LIB=libpasswdqc.so.${LIBpasswdqc_VERSION}
+
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/pwqcheck.1
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/passwdqc
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${PREFIX}/share/doc/passwdqc
 
 .include <bsd.port.mk>

security/passwdqc/distinfo

@@ -1,5 +1,5 @@
-MD5 (passwdqc-0.1.tar.gz) = fplRYz6o8P5s7OMr4j/FvA==
-RMD160 (passwdqc-0.1.tar.gz) = qXBArE0B+S6sQe9s4O76Bh14Csw=
-SHA1 (passwdqc-0.1.tar.gz) = x9WptRoGRiGQArXrmbUgbv6KVy0=
-SHA256 (passwdqc-0.1.tar.gz) = HJ2nCMNqnBnSpfp0ZNG4WUP/NYnhRTf8TVTfkSSsQwY=
-SIZE (passwdqc-0.1.tar.gz) = 19552
+MD5 (passwdqc-1.2.2.tar.gz) = gGgR0Zkd4Qz0MEk8CJ7p3w==
+RMD160 (passwdqc-1.2.2.tar.gz) = wIdURBEck6gE+YJIVVBd4rKlOtQ=
+SHA1 (passwdqc-1.2.2.tar.gz) = jLD+bmppROJbzXFg1CqJdse+cJw=
+SHA256 (passwdqc-1.2.2.tar.gz) = SgWoxsKfJkj2f8CWrGuJcvYu+UQME+IgZsUwSn7iy4A=
+SIZE (passwdqc-1.2.2.tar.gz) = 47274

security/passwdqc/patches/patch-passwdqc_conf_5

@@ -0,0 +1,13 @@
+$OpenBSD: patch-passwdqc_conf_5,v 1.1 2010/07/07 21:29:58 ajacoutot Exp $
+--- passwdqc.conf.5.orig	Wed Jul  7 11:38:20 2010
++++ passwdqc.conf.5	Wed Jul  7 11:38:45 2010
+@@ -248,8 +248,7 @@ is that the former is incompatible with
+ .Sh FILES
+ .Pa /etc/passwdqc.conf .
+ .Sh SEE ALSO
+-.Xr getpwnam 3 ,
+-.Xr pam_passwdqc 8 .
++.Xr getpwnam 3 .
+ .Pp
+ http://www.openwall.com/passwdqc/
+ .Sh AUTHORS

security/passwdqc/patches/patch-passwdqc_random_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-passwdqc_random_c,v 1.1 2010/07/07 21:29:58 ajacoutot Exp $
+--- passwdqc_random.c.orig	Wed Jul  7 10:49:33 2010
++++ passwdqc_random.c	Wed Jul  7 10:49:42 2010
+@@ -69,7 +69,7 @@ char *passwdqc_random(const passwdqc_params_qc_t *para
+ 	if (length >= sizeof(output) || (int)length > params->max)
+ 		return NULL;
+ 
+-	if ((fd = open("/dev/urandom", O_RDONLY)) < 0)
++	if ((fd = open("/dev/arandom", O_RDONLY)) < 0)
+ 		return NULL;
+ 
+ 	length = 0;

security/passwdqc/patches/patch-pwqcheck_1

@@ -0,0 +1,12 @@
+$OpenBSD: patch-pwqcheck_1,v 1.1 2010/07/07 21:29:58 ajacoutot Exp $
+--- pwqcheck.1.orig	Wed Jul  7 10:56:38 2010
++++ pwqcheck.1	Wed Jul  7 10:56:55 2010
+@@ -160,7 +160,7 @@ Read just 1 line (new passphrase).
+ This is needed to use
+ .Nm
+ as the passwordcheck program on OpenBSD - e.g., with
+-":passwordcheck=/usr/bin/pwqcheck -1:\\"
++":passwordcheck=${PREFIX}/bin/pwqcheck -1:\\"
+ in the "default" section in
+ .Cm /etc/login.conf .
+ .It Cm -2

security/passwdqc/patches/patch-pwqgen_1

@@ -0,0 +1,24 @@
+$OpenBSD: patch-pwqgen_1,v 1.1 2010/07/07 21:29:58 ajacoutot Exp $
+--- pwqgen.1.orig	Sat Mar 13 22:29:15 2010
++++ pwqgen.1	Wed Jul  7 11:38:13 2010
+@@ -32,7 +32,7 @@ The
+ program generates a random passphrase using the libpasswdqc library.
+ Strength of the generated passphrase depends on the amount of randomness
+ read from
+-.Pa /dev/urandom .
++.Pa /dev/arandom .
+ .Sh OPTIONS
+ .Bl -tag -width indent
+ .It Cm random Ns = Ns Ar N
+@@ -68,9 +68,8 @@ randomness, and in any case when it fails to generate 
+ .Pa /etc/passwdqc.conf .
+ .Sh SEE ALSO
+ .Xr pwqcheck 1 ,
+-.Xr urandom 4 ,
+-.Xr passwdqc.conf 5 ,
+-.Xr pam_passwdqc 8 .
++.Xr arandom 4 ,
++.Xr passwdqc.conf 5 .
+ .Pp
+ http://www.openwall.com/passwdqc/
+ .Sh AUTHORS

security/passwdqc/pkg/DESCR

@@ -1,5 +1,5 @@
-passwdqc is a plugin password strength checker for OpenBSD's
-/usr/bin/passwd. It is basically a thin wrapper around Solar
-Designer's excellent password complexity checking code from
-pam_passwdqc. It allows more control over password quality 
-enforcement than the built-in checks in passwd(1).
+passwdqc is a simple password strength checking module for password
+changing programs, such as passwd(1).  In addition to checking regular
+passwords, it offers support for passphrases and can provide randomly
+generated ones.  All features are optional and can be (re-)configured
+without rebuilding.

security/passwdqc/pkg/MESSAGE

@@ -0,0 +1,5 @@
+To enable passphrase quality checking using pwqcheck(1) globally, add
+the following lines at the end the "default" class in login.conf(5).
+
+	:passwordcheck=${PREFIX}/bin/pwqcheck -1:\
+	:passwordtries=0:

security/passwdqc/pkg/PFRAG.shared

@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1 2010/07/07 21:29:58 ajacoutot Exp $
+@lib lib/libpasswdqc.so.${LIBpasswdqc_VERSION}

security/passwdqc/pkg/PLIST

@@ -1,3 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/01/30 20:36:28 djm Exp $
-libexec/passwdqc
-@man man/cat8/passwdqc.0
+@comment $OpenBSD: PLIST,v 1.2 2010/07/07 21:29:58 ajacoutot Exp $
+%%SHARED%%
+@bin bin/pwqcheck
+@bin bin/pwqgen
+include/passwdqc.h
+@comment lib/libpasswdqc.so
+@man man/man1/pwqcheck.1
+@man man/man1/pwqgen.1
+@man man/man5/passwdqc.conf.5
+share/doc/passwdqc/
+share/doc/passwdqc/README
+share/examples/passwdqc/
+share/examples/passwdqc/passwdqc.conf
+@sample ${SYSCONFDIR}/passwdqc.conf