Author: glen Date: Sat Jun 11 08:36:28 2011 GMT Module: packages Tag: HEAD ---- Log message: - avoid modifying element in hash
---- Files affected: packages/fetch-crl: fetch-crl.spec (1.1 -> 1.2) , no-modify-template.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/fetch-crl/fetch-crl.spec diff -u packages/fetch-crl/fetch-crl.spec:1.1 packages/fetch-crl/fetch-crl.spec:1.2 --- packages/fetch-crl/fetch-crl.spec:1.1 Fri Jun 10 22:38:53 2011 +++ packages/fetch-crl/fetch-crl.spec Sat Jun 11 10:36:23 2011 @@ -11,6 +11,7 @@ URL: http://www.nikhef.nl/grid/gridwiki/index.php/FetchCRL3 Source0: https://dist.eugridpma.info/distribution/util/fetch-crl3/%{name}-%{version}.tar.gz # Source0-md5: b58f10fb76bab3a34fd4d80541956ef3 +Patch0: no-modify-template.patch BuildRequires: rpm-perlprov >= 4.1-13 Requires: openssl Obsoletes: fetch-crl3 @@ -41,6 +42,8 @@ %prep %setup -q +%patch0 -p1 + # use this to figure out deps #sed -i -e 's,,BLAAA,' %{name} @@ -92,5 +95,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2011/06/11 08:36:23 glen +- avoid modifying element in hash + Revision 1.1 2011/06/10 20:38:53 glen - initial, based on fc spec (the one in sources as well) ================================================================ Index: packages/fetch-crl/no-modify-template.patch diff -u /dev/null packages/fetch-crl/no-modify-template.patch:1.1 --- /dev/null Sat Jun 11 10:36:28 2011 +++ packages/fetch-crl/no-modify-template.patch Sat Jun 11 10:36:23 2011 @@ -0,0 +1,33 @@ +with Perl 5.12.3 we changed $self->{"nametemplate_pem"} via $file modification + +with such config: +nametemplate_pem = @[email protected]@[email protected] +infodir = /etc/pki/esteid +cadir = /etc/pki/esteid +output = /etc/pki/esteid/crl +formats = openssl, pem + +it tried to: +VERBOSE(3) Writing PEM file /etc/pki/esteid/crl//etc/pki/esteid/crl/ESTEID-SK_2007.r0.pem +should had been: +VERBOSE(3) Writing PEM file /etc/pki/esteid/crl/ESTEID-SK_2007.r0.pem + +--- fetch-crl-3.0.6/fetch-crl 2011-03-20 05:01:20.000000000 +0200 ++++ fetch-crl-3.0.6/fetch-crl 2011-06-11 11:30:58.731040625 +0300 +@@ -1873,13 +1879,14 @@ + $::cnf->{_}->{"output_der"}, $::cnf->{_}->{"output_pem"}, + $::cnf->{_}->{"output_nss"}, $::cnf->{_}->{"output_openssl"}) ) { + defined $output and $output or next; +- foreach my $file ( ++ foreach my $ref ( + $self->{"nametemplate_der"}, + $self->{"nametemplate_pem"}, + $self->{"alias"}.".r\@R\@", + $self->{"anchorname"}.".r\@R\@", + ) { +- next unless $file; ++ next unless $ref; ++ my $file = $ref; # copy, not to change original + $file =~ s/\@R\@/$i/g; + $file = join "/", $output, $file; + next if ! -e $file; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fetch-crl/fetch-crl.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
