From c9ac1e6372583e522d6c85245672ca7471ff37783d51f09642dbd00932faf9a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Mon, 14 Feb 2011 15:31:44 +0000 Subject: [PATCH] - update to perl-5.12.3 final - remove obsolete perl-cgi-injection.diff - remove obsolete perl-constprint.diff OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=57 --- perl-5.12.3-RC1.tar.bz2 | 3 --- perl-5.12.3.tar.bz2 | 3 +++ perl-cgi-injection.diff | 39 --------------------------------------- perl-constprint.diff | 20 -------------------- perl.changes | 7 +++++++ perl.spec | 14 +++++--------- 6 files changed, 15 insertions(+), 71 deletions(-) delete mode 100644 perl-5.12.3-RC1.tar.bz2 create mode 100644 perl-5.12.3.tar.bz2 delete mode 100644 perl-cgi-injection.diff delete mode 100644 perl-constprint.diff diff --git a/perl-5.12.3-RC1.tar.bz2 b/perl-5.12.3-RC1.tar.bz2 deleted file mode 100644 index f8d2f3e..0000000 --- a/perl-5.12.3-RC1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a82268951b0957a823f9104e3077e64aae5b856b0bba76ea7becfdbc2d9fe20 -size 12045720 diff --git a/perl-5.12.3.tar.bz2 b/perl-5.12.3.tar.bz2 new file mode 100644 index 0000000..c05074f --- /dev/null +++ b/perl-5.12.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e3ce3f19f2290c2a2a43a98bcf8cb0ccb69b652d67ddc629544339edc6c7343 +size 12041247 diff --git a/perl-cgi-injection.diff b/perl-cgi-injection.diff deleted file mode 100644 index 1f3136f..0000000 --- a/perl-cgi-injection.diff +++ /dev/null @@ -1,39 +0,0 @@ ---- ./cpan/CGI/lib/CGI.pm.orig 2010-05-07 13:34:10.000000000 +0000 -+++ ./cpan/CGI/lib/CGI.pm 2011-01-12 11:35:33.000000000 +0000 -@@ -1457,7 +1457,13 @@ END_OF_FUNC - sub multipart_init { - my($self,@p) = self_or_default(@_); - my($boundary,@other) = rearrange_header([BOUNDARY],@p); -- $boundary = $boundary || '------- =_aaaaaaaaaa0'; -+ if (!$boundary) { -+ $boundary = '------- =_'; -+ my @chrs = ('0'..'9', 'A'..'Z', 'a'..'z'); -+ for (1..17) { -+ $boundary .= $chrs[rand(scalar @chrs)]; -+ } -+ } - $self->{'separator'} = "$CRLF--$boundary$CRLF"; - $self->{'final_separator'} = "$CRLF--$boundary--$CRLF"; - $type = SERVER_PUSH($boundary); -@@ -1545,10 +1551,17 @@ sub header { - # CR escaping for values, per RFC 822 - for my $header ($type,$status,$cookie,$target,$expires,$nph,$charset,$attachment,$p3p,@other) { - if (defined $header) { -- $header =~ s/ -- (?<=\n) # For any character proceeded by a newline -- (?=\S) # ... that is not whitespace -- / /xg; # ... inject a leading space in the new line -+ # From RFC 822: -+ # Unfolding is accomplished by regarding CRLF immediately -+ # followed by a LWSP-char as equivalent to the LWSP-char. -+ $header =~ s/$CRLF(\s)/$1/g; -+ -+ # All other uses of newlines are invalid input. -+ if ($header =~ m/$CRLF|\015|\012/) { -+ # shorten very long values in the diagnostic -+ $header = substr($header,0,72).'...' if (length $header > 72); -+ die "Invalid header value contains a newline not followed by whitespace: $header"; -+ } - } - } - diff --git a/perl-constprint.diff b/perl-constprint.diff deleted file mode 100644 index eefb547..0000000 --- a/perl-constprint.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- ./gv.c.orig 2010-05-13 22:01:07.000000000 +0000 -+++ ./gv.c 2010-07-28 09:57:06.000000000 +0000 -@@ -250,8 +250,16 @@ Perl_gv_init(pTHX_ GV *gv, HV *stash, co - if (doproto) { /* Replicate part of newSUB here. */ - ENTER; - if (has_constant) { -+ char *name0 = NULL; -+ if (name[len]) { -+ /* newCONSTSUB doesn't take a len arg, so make sure w -+ * give it a \0-terminated string */ -+ name0 = savepvn(name, len); -+ } - /* newCONSTSUB takes ownership of the reference from us. */ -- GvCV(gv) = newCONSTSUB(stash, name, has_constant); -+ GvCV(gv) = newCONSTSUB(stash, (name0 ? name0 : name), has_constant); -+ if (name0) -+ Safefree(name0); - /* If this reference was a copy of another, then the subroutine - must have been "imported", by a Perl space assignment to a GV - from a reference to CV. */ diff --git a/perl.changes b/perl.changes index f6ce10f..5ca6ac1 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 14 16:30:20 CET 2011 - mls@suse.de + +- update to perl-5.12.3 final +- remove obsolete perl-cgi-injection.diff +- remove obsolete perl-constprint.diff + ------------------------------------------------------------------- Fri Jan 28 09:38:54 UTC 2011 - lnussel@suse.de diff --git a/perl.spec b/perl.spec index 39a3e47..b232565 100644 --- a/perl.spec +++ b/perl.spec @@ -27,7 +27,7 @@ License: Artistic License .. ; GPLv2+ Group: Development/Languages/Perl AutoReqProv: on Url: http://www.perl.org/ -Source: perl-5.12.3-RC1.tar.bz2 +Source: perl-5.12.3.tar.bz2 Source1: %name-rpmlintrc Source2: macros.perl Source3: README.macros @@ -39,10 +39,8 @@ Patch4: perl-nroff.diff Patch5: perl-netcmdutf8.diff Patch6: perl-autodie-flock.diff Patch7: perl-Fatal.diff -Patch8: perl-constprint.diff -Patch9: perl-h2ph.diff -Patch10: perl-HiRes.t-timeout.diff -Patch11: perl-cgi-injection.diff +Patch8: perl-h2ph.diff +Patch9: perl-HiRes.t-timeout.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: perl-base = %version #PreReq: %fillup_prereq @@ -127,7 +125,7 @@ BuildArch: noarch Perl man pages and pod files. %prep -%setup -q -n perl-5.12.3-RC1 +%setup -q -n perl-5.12.3 cp -p %{S:3} . %patch0 %patch1 @@ -139,9 +137,7 @@ cp -p %{S:3} . %patch7 %endif %patch8 -%patch9 -%patch10 -p1 -%patch11 +%patch9 -p1 %build cp -a lib savelib