diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile index 61d51f7251d..a24a9e7fd0a 100644 --- a/security/libgcrypt/Makefile +++ b/security/libgcrypt/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.22 2011/05/17 19:04:14 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.23 2011/07/07 17:18:11 jasper Exp $ COMMENT= crypto library based on code used in GnuPG DISTNAME= libgcrypt-1.4.6 CATEGORIES= security SHARED_LIBS= gcrypt 15.0 # .17.0 -REVISION= 0 +REVISION= 1 HOMEPAGE= http://www.gnupg.org/ diff --git a/security/libgcrypt/patches/patch-configure b/security/libgcrypt/patches/patch-configure deleted file mode 100644 index eadb7e24240..00000000000 --- a/security/libgcrypt/patches/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-configure,v 1.7 2010/04/20 20:42:11 ajacoutot Exp $ ---- configure.orig Fri Dec 11 16:43:32 2009 -+++ configure Tue Apr 20 22:36:53 2010 -@@ -19778,8 +19778,8 @@ esac - # - case "${host}" in - *-openbsd*) -- NAME_OF_DEV_RANDOM="/dev/srandom" -- NAME_OF_DEV_URANDOM="/dev/urandom" -+ NAME_OF_DEV_RANDOM="/dev/arandom" -+ NAME_OF_DEV_URANDOM="/dev/arandom" - ;; - - *) diff --git a/security/p5-Crypt-DSA/Makefile b/security/p5-Crypt-DSA/Makefile index 6be6345e136..753e500384f 100644 --- a/security/p5-Crypt-DSA/Makefile +++ b/security/p5-Crypt-DSA/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.9 2010/12/03 11:46:46 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.10 2011/07/07 17:18:11 jasper Exp $ COMMENT= DSA Signatures and Key Generation MODULES= cpan DISTNAME= Crypt-DSA-0.13 -REVISION= 1 +REVISION= 2 CATEGORIES= security USE_GROFF = Yes -# GPL/Artistic +# perl PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes diff --git a/security/p5-Crypt-DSA/patches/patch-lib_Crypt_DSA_Util_pm b/security/p5-Crypt-DSA/patches/patch-lib_Crypt_DSA_Util_pm deleted file mode 100644 index 57779225aea..00000000000 --- a/security/p5-Crypt-DSA/patches/patch-lib_Crypt_DSA_Util_pm +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_Crypt_DSA_Util_pm,v 1.1 2005/12/12 20:50:12 sturm Exp $ ---- lib/Crypt/DSA/Util.pm.orig Mon Dec 12 21:25:08 2005 -+++ lib/Crypt/DSA/Util.pm Mon Dec 12 21:26:10 2005 -@@ -50,7 +50,7 @@ sub makerandom { - my %param = @_; - my $size = $param{Size}; - my $bytes = int($size / 8) + 1; -- sysopen my $fh, '/dev/random', O_RDONLY -+ sysopen my $fh, '/dev/arandom', O_RDONLY - or return; - my($r, $read) = ('', 0); - while ($read < $bytes) { diff --git a/security/p5-Crypt-Random/Makefile b/security/p5-Crypt-Random/Makefile index 8106457ddcc..d3c91270a69 100644 --- a/security/p5-Crypt-Random/Makefile +++ b/security/p5-Crypt-Random/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.9 2010/12/03 11:46:47 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.10 2011/07/07 17:18:11 jasper Exp $ COMMENT= cryptographically secure random number generator MODULES= cpan DISTNAME= Crypt-Random-1.25 -REVISION= 1 +REVISION= 2 CATEGORIES= security USE_GROFF = Yes -# GPL/Artistic +# perl PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -18,11 +18,4 @@ BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= devel/p5-Class-Loader \ math/p5-Math-Pari -post-configure: - @perl -pi -e "s,/dev/urandom,/dev/arandom,g;" \ - -e "s,/dev/random,/dev/srandom,g;" \ - ${WRKSRC}/lib/Crypt/Random.pm \ - ${WRKSRC}/lib/Crypt/Random/Provider/devrandom.pm \ - ${WRKSRC}/lib/Crypt/Random/Provider/devurandom.pm - .include diff --git a/security/passwdqc/Makefile b/security/passwdqc/Makefile index 2963ac73c2a..171aaab89a4 100644 --- a/security/passwdqc/Makefile +++ b/security/passwdqc/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2010/11/20 17:22:45 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2011/07/07 17:18:11 jasper Exp $ COMMENT= plugin password complexity checker for passwd(1) DISTNAME= passwdqc-1.2.2 +REVISION= 0 CATEGORIES= security sysutils SHARED_LIBS= passwdqc 0.0 # .0 diff --git a/security/passwdqc/patches/patch-passwdqc_random_c b/security/passwdqc/patches/patch-passwdqc_random_c deleted file mode 100644 index a1fe24ca4ba..00000000000 --- a/security/passwdqc/patches/patch-passwdqc_random_c +++ /dev/null @@ -1,12 +0,0 @@ -$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; diff --git a/security/passwdqc/patches/patch-pwqgen_1 b/security/passwdqc/patches/patch-pwqgen_1 index f3581025d9a..00332fa83d8 100644 --- a/security/passwdqc/patches/patch-pwqgen_1 +++ b/security/passwdqc/patches/patch-pwqgen_1 @@ -1,15 +1,6 @@ -$OpenBSD: patch-pwqgen_1,v 1.1 2010/07/07 21:29:58 ajacoutot Exp $ +$OpenBSD: patch-pwqgen_1,v 1.2 2011/07/07 17:18:11 jasper 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