diff options
| author | markd <markd> | 2014-07-24 21:38:38 +0000 |
|---|---|---|
| committer | markd <markd> | 2014-07-24 21:38:38 +0000 |
| commit | f18659202ebceac55aee7efa078a3befc223a7ea (patch) | |
| tree | c789184c90097c6fa6b0a6933cd490fedd7ae4d4 | |
| parent | b59efef82acc60618b21450782d521fe1d95c2be (diff) | |
| download | pkgsrc-f18659202ebceac55aee7efa078a3befc223a7ea.tar.gz | |
Fix "Use of each() on hash after insertion without resetting hash iterator
results in undefined behavior" complaint from perl 5.20
| -rw-r--r-- | www/ap2-perl/Makefile | 4 | ||||
| -rw-r--r-- | www/ap2-perl/distinfo | 3 | ||||
| -rw-r--r-- | www/ap2-perl/patches/patch-Apache-Test_lib_Apache_TestSSLCA.pm | 20 |
3 files changed, 24 insertions, 3 deletions
diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile index 225b99171aa..099068440e1 100644 --- a/www/ap2-perl/Makefile +++ b/www/ap2-perl/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.48 2014/06/10 15:22:17 joerg Exp $ +# $NetBSD: Makefile,v 1.49 2014/07/24 21:38:38 markd Exp $ DISTNAME= mod_perl-2.0.8 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_APACHE:=perl/} diff --git a/www/ap2-perl/distinfo b/www/ap2-perl/distinfo index cd3245bb74b..6641d6cee2e 100644 --- a/www/ap2-perl/distinfo +++ b/www/ap2-perl/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.17 2013/11/14 17:03:40 adam Exp $ +$NetBSD: distinfo,v 1.18 2014/07/24 21:38:38 markd Exp $ SHA1 (mod_perl-2.0.8.tar.gz) = 165b1062f9680d1ccc92a88f1699797b6860c499 RMD160 (mod_perl-2.0.8.tar.gz) = 5863f229c1fe982852f05bf5c1af5d28dae28b7f Size (mod_perl-2.0.8.tar.gz) = 3790026 bytes +SHA1 (patch-Apache-Test_lib_Apache_TestSSLCA.pm) = 8eca011efaa67046c3d59f48e413859aed3ae7ed SHA1 (patch-src_modules_perl_modperl_common_util.h) = a5fd094351fef2994b67c6c70abc18c772aec532 diff --git a/www/ap2-perl/patches/patch-Apache-Test_lib_Apache_TestSSLCA.pm b/www/ap2-perl/patches/patch-Apache-Test_lib_Apache_TestSSLCA.pm new file mode 100644 index 00000000000..5f821ad9886 --- /dev/null +++ b/www/ap2-perl/patches/patch-Apache-Test_lib_Apache_TestSSLCA.pm @@ -0,0 +1,20 @@ +$NetBSD: patch-Apache-Test_lib_Apache_TestSSLCA.pm,v 1.1 2014/07/24 21:38:38 markd Exp $ + +Fix "Use of each() on hash after insertion without resetting hash iterator results in +undefined behavior" complaint from perl 5.20 + +--- Apache-Test/lib/Apache/TestSSLCA.pm.orig 2011-02-08 02:00:15.000000000 +0000 ++++ Apache-Test/lib/Apache/TestSSLCA.pm +@@ -100,10 +100,10 @@ my $cert_dn = { + }; + + #generate DSA versions of the server certs/keys +-while (my($key, $val) = each %$cert_dn) { ++for my $key (keys %$cert_dn) { + next unless $key =~ /^server/; + my $name = join '_', $key, 'dsa'; +- $cert_dn->{$name} = { %$val }; #copy ++ $cert_dn->{$name} = { %{$cert_dn->{$key}} }; #copy + $cert_dn->{$name}->{OU} =~ s/rsa/dsa/; + } + |