From 5e12f7ad0054d02b8ce467f81ca050c5a5affdb5c8d5c7baf2e38712e94cae15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Thu, 6 Jun 2013 13:35:18 +0000 Subject: [PATCH] - update to 5.18.0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=90 --- macros.perl | 6 +- perl-5.16.2.tar.gz | 3 - perl-5.16.0.dif => perl-5.18.0.dif | 145 ++++++++++++++--------------- perl-5.18.0.tar.gz | 3 + perl-clone_oldcop.diff | 22 ----- perl-nroff.diff | 6 +- perl-regexp-refoverflow.diff | 16 ++-- perl-saverecontext.diff | 12 +-- perl.changes | 14 +++ perl.spec | 10 +- 10 files changed, 109 insertions(+), 128 deletions(-) delete mode 100644 perl-5.16.2.tar.gz rename perl-5.16.0.dif => perl-5.18.0.dif (76%) create mode 100644 perl-5.18.0.tar.gz delete mode 100644 perl-clone_oldcop.diff diff --git a/macros.perl b/macros.perl index 4ec7a2c..008e85e 100644 --- a/macros.perl +++ b/macros.perl @@ -22,13 +22,13 @@ %perl_installarchlib %(perl -V:installarchlib | sed "s!.*='!!;s!'.*!!") %perl_prefix %{buildroot} -# Macro to encapsulate perl requires (empty for fedora and suse > 11.3) +# Macro to encapsulate perl requires (empty for fedora) # we keep the complicated form even here to easy sync the other macros with # perl-macros package # %perl_requires() \ -%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1700 \ -Requires: perl = %{perl_version} \ +%if 0%{?suse_version} > 0 \ +Requires: perl(:MODULE_COMPAT_%{perl_version}) \ %endif # suse specific macros diff --git a/perl-5.16.2.tar.gz b/perl-5.16.2.tar.gz deleted file mode 100644 index fb14da8..0000000 --- a/perl-5.16.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ef88b2feff1c925d7956670ce29059311de99f3c28e2d7f2cad6969f142d00e -size 16933974 diff --git a/perl-5.16.0.dif b/perl-5.18.0.dif similarity index 76% rename from perl-5.16.0.dif rename to perl-5.18.0.dif index a3aa720..8d26210 100644 --- a/perl-5.16.0.dif +++ b/perl-5.18.0.dif @@ -1,5 +1,5 @@ ---- ./Configure.orig 2012-04-25 00:18:30.000000000 +0000 -+++ ./Configure 2012-05-23 12:19:57.000000000 +0000 +--- ./Configure.orig 2013-05-10 14:13:56.000000000 +0000 ++++ ./Configure 2013-06-06 12:51:27.000000000 +0000 @@ -112,7 +112,7 @@ paths="$paths /usr/5bin /etc /usr/gnu/bi paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" @@ -9,7 +9,7 @@ paths="$paths /sbin /usr/sbin /usr/libexec" paths="$paths /system/gnu_library/bin" -@@ -1341,7 +1341,7 @@ loclibpth="/usr/local/lib /opt/local/lib +@@ -1346,7 +1346,7 @@ loclibpth="/usr/local/lib /opt/local/lib loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" : general looking path for locating libraries @@ -18,7 +18,7 @@ glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" test -f /shlib/libc.so && glibpth="/shlib $glibpth" -@@ -2389,7 +2389,7 @@ uname +@@ -2394,7 +2394,7 @@ uname zip " pth=`echo $PATH | sed -e "s/$p_/ /g"` @@ -27,7 +27,7 @@ for file in $loclist; do eval xxx=\$$file case "$xxx" in -@@ -11169,7 +11169,7 @@ void xxx(int n, ...) +@@ -11233,7 +11233,7 @@ void xxx(int n, ...) va_start(args, n); exit((unsigned long)vsprintf(buf,"%s",args) > 10L); } @@ -36,7 +36,7 @@ #else /* I_VARARGS */ -@@ -11181,7 +11181,7 @@ va_dcl +@@ -11245,7 +11245,7 @@ va_dcl va_start(args); exit((unsigned long)vsprintf(buf,"%s",args) > 10L); } @@ -45,7 +45,7 @@ #endif -@@ -19174,14 +19174,20 @@ int main(int argc, char *argv[]) +@@ -19335,14 +19335,20 @@ int main(int argc, char *argv[]) } EOCP set try @@ -66,7 +66,7 @@ i_db=$undef case " $libs " in *"-ldb "*) -@@ -19224,7 +19230,7 @@ int main() +@@ -19385,7 +19391,7 @@ int main() } #endif EOCP @@ -75,7 +75,7 @@ if $contains warning try.out >>/dev/null 2>&1 ; then db_hashtype='int' else -@@ -19269,7 +19275,7 @@ int main() +@@ -19430,7 +19436,7 @@ int main() } #endif EOCP @@ -84,7 +84,7 @@ if $contains warning try.out >>/dev/null 2>&1 ; then db_prefixtype='int' else -@@ -23602,7 +23608,7 @@ passcat='$passcat' +@@ -23736,7 +23742,7 @@ passcat='$passcat' patchlevel='$patchlevel' path_sep='$path_sep' perl5='$perl5' @@ -93,8 +93,8 @@ perl_patchlevel='$perl_patchlevel' perl_static_inline='$perl_static_inline' perladmin='$perladmin' ---- ./SuSE/SuSEconfig.perl.orig 2012-05-23 12:19:57.000000000 +0000 -+++ ./SuSE/SuSEconfig.perl 2012-05-23 12:19:57.000000000 +0000 +--- ./SuSE/SuSEconfig.perl.orig 2013-06-06 12:51:27.000000000 +0000 ++++ ./SuSE/SuSEconfig.perl 2013-06-06 12:51:27.000000000 +0000 @@ -0,0 +1,76 @@ +#! /bin/bash +# @@ -172,8 +172,8 @@ +# +# end of file SuSEconfig.perl +# ---- ./SuSE/perllocal.SuSE.orig 2012-05-23 12:19:57.000000000 +0000 -+++ ./SuSE/perllocal.SuSE 2012-05-23 12:19:57.000000000 +0000 +--- ./SuSE/perllocal.SuSE.orig 2013-06-06 12:51:27.000000000 +0000 ++++ ./SuSE/perllocal.SuSE 2013-06-06 12:51:27.000000000 +0000 @@ -0,0 +1,84 @@ +#!/usr/bin/perl +# Copyright (c) 1998 S.u.S.E. Gmbh Fuerth, Germany. All rights reserved. @@ -259,8 +259,8 @@ + print "SuSEconfig.perl: Can't write to file $Config{'installarchlib'}/perllocal.pod !\n\n"; +} + ---- ./SuSE/sysconfig.suseconfig-perl.orig 2012-05-23 12:19:57.000000000 +0000 -+++ ./SuSE/sysconfig.suseconfig-perl 2012-05-23 12:19:57.000000000 +0000 +--- ./SuSE/sysconfig.suseconfig-perl.orig 2013-06-06 12:51:27.000000000 +0000 ++++ ./SuSE/sysconfig.suseconfig-perl 2013-06-06 12:51:27.000000000 +0000 @@ -0,0 +1,8 @@ +## Path: System/SuSEconfig +## Type: yesno @@ -270,8 +270,8 @@ +# May SuSEconfig modify your perllocal.pod? (yes/no) +# +CREATE_PERLLOCAL_POD="yes" ---- ./cpan/CPAN/lib/CPAN.pm.orig 2012-04-25 00:18:30.000000000 +0000 -+++ ./cpan/CPAN/lib/CPAN.pm 2012-05-23 12:19:57.000000000 +0000 +--- ./cpan/CPAN/lib/CPAN.pm.orig 2013-05-01 02:52:54.000000000 +0000 ++++ ./cpan/CPAN/lib/CPAN.pm 2013-06-06 12:51:27.000000000 +0000 @@ -65,7 +65,7 @@ sub _uniq; no lib "."; @@ -281,8 +281,8 @@ if ($ENV{PERL5_CPAN_IS_RUNNING} && $$ != $ENV{PERL5_CPAN_IS_RUNNING}) { $ENV{PERL5_CPAN_IS_RUNNING_IN_RECURSION} ||= $ENV{PERL5_CPAN_IS_RUNNING}; my @rec = _uniq split(/,/, $ENV{PERL5_CPAN_IS_RUNNING_IN_RECURSION}), $$; ---- ./cpan/Compress-Raw-Zlib/config.in.orig 2012-03-19 20:38:24.000000000 +0000 -+++ ./cpan/Compress-Raw-Zlib/config.in 2012-05-23 12:19:57.000000000 +0000 +--- ./cpan/Compress-Raw-Zlib/config.in.orig 2013-05-01 02:52:54.000000000 +0000 ++++ ./cpan/Compress-Raw-Zlib/config.in 2013-06-06 12:51:27.000000000 +0000 @@ -16,9 +16,9 @@ # Setting the Gzip OS Code # @@ -296,8 +296,8 @@ OLD_ZLIB = False GZIP_OS_CODE = AUTO_DETECT ---- ./cpan/Encode/bin/enc2xs.orig 2012-02-15 04:44:38.000000000 +0000 -+++ ./cpan/Encode/bin/enc2xs 2012-05-23 12:19:57.000000000 +0000 +--- ./cpan/Encode/bin/enc2xs.orig 2013-05-01 02:52:54.000000000 +0000 ++++ ./cpan/Encode/bin/enc2xs 2013-06-06 12:51:27.000000000 +0000 @@ -1005,13 +1005,13 @@ sub make_configlocal_pm { $LocalMod{$enc} ||= $mod; } @@ -314,20 +314,20 @@ $_LocalVer = _mkversion(); $_E2X = find_e2x(); $_Inc = $INC{"Encode.pm"}; ---- ./cpan/File-Temp/Temp.pm.orig 2012-02-15 04:44:40.000000000 +0000 -+++ ./cpan/File-Temp/Temp.pm 2012-05-23 12:19:57.000000000 +0000 -@@ -146,7 +146,7 @@ use File::Path qw/ rmtree /; - use Fcntl 1.03; +--- ./cpan/File-Temp/lib/File/Temp.pm.orig 2013-05-01 02:52:55.000000000 +0000 ++++ ./cpan/File-Temp/lib/File/Temp.pm 2013-06-06 12:58:21.000000000 +0000 +@@ -149,7 +149,7 @@ use Fcntl 1.03; use IO::Seekable; # For SEEK_* use Errno; + use Scalar::Util 'refaddr'; -require VMS::Stdio if $^O eq 'VMS'; +#require VMS::Stdio if $^O eq 'VMS'; # pre-emptively load Carp::Heavy. If we don't when we run out of file # handles and attempt to call croak() we get an error message telling ---- ./cpan/Sys-Syslog/t/syslog.t.orig 2012-04-25 00:18:32.000000000 +0000 -+++ ./cpan/Sys-Syslog/t/syslog.t 2012-05-23 12:19:57.000000000 +0000 -@@ -218,6 +218,7 @@ SKIP: { +--- ./cpan/Sys-Syslog/t/syslog.t.orig 2013-05-01 02:52:55.000000000 +0000 ++++ ./cpan/Sys-Syslog/t/syslog.t 2013-06-06 12:51:27.000000000 +0000 +@@ -220,6 +220,7 @@ SKIP: { } } else { @@ -335,8 +335,8 @@ ok( $r, "setlogsock() should return true: '$r'" ); } ---- ./cpan/libnet/Net/Config.pm.orig 2012-02-15 04:44:44.000000000 +0000 -+++ ./cpan/libnet/Net/Config.pm 2012-05-23 12:19:57.000000000 +0000 +--- ./cpan/libnet/Net/Config.pm.orig 2013-05-01 02:52:55.000000000 +0000 ++++ ./cpan/libnet/Net/Config.pm 2013-06-06 12:51:27.000000000 +0000 @@ -37,7 +37,7 @@ eval { local $SIG{__DIE__}; require Net: # Try to get as much configuration info as possible from InternetConfig # @@ -346,8 +346,8 @@ { my %nc = ( ---- ./dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm.orig 2012-04-25 00:18:32.000000000 +0000 -+++ ./dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm 2012-05-23 12:19:57.000000000 +0000 +--- ./dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm.orig 2013-05-01 02:52:55.000000000 +0000 ++++ ./dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm 2013-06-06 12:51:27.000000000 +0000 @@ -207,8 +207,11 @@ foreach my $key (sort(keys(%{$self->{dat { if (! -e $key) @@ -362,8 +362,8 @@ } } return(@missing); ---- ./ext/DynaLoader/hints/linux.pl.orig 2012-02-15 04:44:47.000000000 +0000 -+++ ./ext/DynaLoader/hints/linux.pl 2012-05-23 12:19:57.000000000 +0000 +--- ./ext/DynaLoader/hints/linux.pl.orig 2013-02-26 21:28:27.000000000 +0000 ++++ ./ext/DynaLoader/hints/linux.pl 2013-06-06 12:51:27.000000000 +0000 @@ -2,4 +2,7 @@ # Some Linux releases like to hide their $self->{CCFLAGS} = $Config{ccflags} . ' -I/usr/include/libelf' @@ -372,8 +372,8 @@ +# module, so add cccdlflags if we're going for a shared libperl +$self->{CCFLAGS} = ($self->{CCFLAGS} || $Config{ccflags}) . " $Config{cccdlflags}" if $Config{'useshrplib'} eq 'true'; 1; ---- ./ext/ODBM_File/Makefile.PL.orig 2012-02-15 04:44:47.000000000 +0000 -+++ ./ext/ODBM_File/Makefile.PL 2012-05-23 12:19:57.000000000 +0000 +--- ./ext/ODBM_File/Makefile.PL.orig 2013-02-26 21:28:27.000000000 +0000 ++++ ./ext/ODBM_File/Makefile.PL 2013-06-06 12:51:27.000000000 +0000 @@ -1,7 +1,7 @@ use ExtUtils::MakeMaker; WriteMakefile( @@ -383,8 +383,8 @@ XSPROTOARG => '-noprototypes', # XXX remove later? VERSION_FROM => 'ODBM_File.pm', ); ---- ./ext/ODBM_File/hints/linux.pl.orig 2012-02-15 04:44:47.000000000 +0000 -+++ ./ext/ODBM_File/hints/linux.pl 2012-05-23 12:19:57.000000000 +0000 +--- ./ext/ODBM_File/hints/linux.pl.orig 2013-05-01 02:52:55.000000000 +0000 ++++ ./ext/ODBM_File/hints/linux.pl 2013-06-06 12:51:27.000000000 +0000 @@ -1,5 +1,5 @@ # uses GDBM dbm compatibility feature - at least on SuSE 8.0 -$self->{LIBS} = ['-lgdbm']; @@ -392,8 +392,8 @@ # Debian/Ubuntu have libgdbm_compat.so but not this file, # so linking may fail ---- ./hints/linux.sh.orig 2012-05-14 19:49:22.000000000 +0000 -+++ ./hints/linux.sh 2012-05-23 12:21:21.000000000 +0000 +--- ./hints/linux.sh.orig 2013-05-01 02:52:55.000000000 +0000 ++++ ./hints/linux.sh 2013-06-06 12:51:27.000000000 +0000 @@ -53,12 +53,14 @@ ignore_versioned_solibs='y' # BSD compatibility library no longer needed # 'kaffe' has a /usr/lib/libnet.so which is not at all relevant for perl. @@ -508,9 +508,9 @@ ;; esac EOCBU ---- ./installperl.orig 2012-04-25 00:18:34.000000000 +0000 -+++ ./installperl 2012-05-23 12:19:57.000000000 +0000 -@@ -762,7 +762,7 @@ sub installlib { +--- ./installperl.orig 2013-05-01 02:52:55.000000000 +0000 ++++ ./installperl 2013-06-06 12:51:27.000000000 +0000 +@@ -739,7 +739,7 @@ sub installlib { return if $name eq 'ExtUtils/XSSymSet.pm' and !$Is_VMS; my $installlib = $installprivlib; @@ -519,28 +519,29 @@ ($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) || ($name =~ /^(.*)\.(?:h|lib)$/i && ($Is_W32 || $Is_NetWare)) || $name=~/^Config_(heavy|git)\.pl\z/ ---- ./lib/perl5db.pl.orig 2012-05-10 18:38:09.000000000 +0000 -+++ ./lib/perl5db.pl 2012-05-23 12:19:57.000000000 +0000 -@@ -3194,6 +3194,8 @@ reading another. - open( OUT, ">&STDOUT" ) # XXX: lost message - || &warn("Can't restore DB::OUT"); - } -+ # tell readline the new OUT handle -+ $term->Attribs()->{outstream} = *OUT if defined &Term::ReadLine::Gnu::readline; - next CMD; - } ## end unless ($piped = open(OUT,... +--- ./lib/perl5db.pl.orig 2013-05-01 02:52:55.000000000 +0000 ++++ ./lib/perl5db.pl 2013-06-06 12:57:15.000000000 +0000 +@@ -2325,6 +2325,8 @@ sub _DB__handle_run_command_in_pager_com + open( OUT, ">&STDOUT" ) # XXX: lost message + || _db_warn("Can't restore DB::OUT"); + } ++ # tell readline the new OUT handle ++ $term->Attribs()->{outstream} = *OUT if defined &Term::ReadLine::Gnu::readline; + next CMD; + } ## end unless ($piped = open(OUT,... -@@ -3320,6 +3322,8 @@ our standard filehandles for input and o - # if necessary, - close(SAVEOUT); - select($selected), $selected = "" unless $selected eq ""; -+ # tell readline the new OUT handle -+ $term->Attribs()->{outstream} = *OUT if defined &Term::ReadLine::Gnu::readline; +@@ -2426,6 +2428,9 @@ sub _DB__at_end_of_every_command { + $obj->selected(""); + } - # No pipes now. - $piped = ""; ---- ./locale.c.orig 2012-04-25 00:18:34.000000000 +0000 -+++ ./locale.c 2012-05-23 12:19:57.000000000 +0000 ++ # tell readline the new OUT handle ++ $term->Attribs()->{outstream} = *OUT if defined &Term::ReadLine::Gnu::readline; ++ + # No pipes now. + $obj->piped(""); + } ## end if ($piped) +--- ./locale.c.orig 2013-05-01 02:52:55.000000000 +0000 ++++ ./locale.c 2013-06-06 12:51:27.000000000 +0000 @@ -354,9 +354,15 @@ Perl_init_i18nl10n(pTHX_ int printwarn) if (setlocale_failure) { @@ -557,8 +558,8 @@ if (locwarn) { #ifdef LC_ALL ---- ./t/op/numconvert.t.orig 2012-02-15 04:44:52.000000000 +0000 -+++ ./t/op/numconvert.t 2012-05-23 12:19:57.000000000 +0000 +--- ./t/op/numconvert.t.orig 2013-05-01 02:52:56.000000000 +0000 ++++ ./t/op/numconvert.t 2013-06-06 12:51:27.000000000 +0000 @@ -47,7 +47,7 @@ my $max_chain = $ENV{PERL_TEST_NUMCONVER # Bulk out if unsigned type is hopelessly wrong: @@ -568,16 +569,8 @@ my $big_iv = do {use integer; $max_uv1 * 16}; # 16 is an arbitrary number here my $max_uv_less3 = $max_uv1 - 3; ---- ./t/porting/customized.dat.orig 2012-05-23 12:59:38.000000000 +0000 -+++ ./t/porting/customized.dat 2012-05-23 12:59:49.000000000 +0000 -@@ -10,4 +10,4 @@ podlators pod/perlpodstyle.pod 4f1ba65ed - CPANPLUS cpan/CPANPLUS/Makefile.PL 5d533f6722af6aae73204755beb8d6c008fc0d4a - Text-Tabs+Wrap cpan/Text-Tabs/t/fill.t a960d2c4f66b7e30557b5479e0da2da1bf7a7f45 - Text-Tabs+Wrap cpan/Text-Tabs/t/tabs.t 63a67b3a319c858d7e66306b8a653de1951153dc --Sys::Syslog cpan/Sys-Syslog/t/syslog.t 647571fc90918883b871ff7e005ed7ab8a223784 -+Sys::Syslog cpan/Sys-Syslog/t/syslog.t e40234f4b9f521a16b4dcbf2981539281fdb3228 ---- ./utils/perlbug.PL.orig 2012-05-10 18:38:09.000000000 +0000 -+++ ./utils/perlbug.PL 2012-05-23 12:19:57.000000000 +0000 +--- ./utils/perlbug.PL.orig 2013-05-01 02:52:56.000000000 +0000 ++++ ./utils/perlbug.PL 2013-06-06 12:51:27.000000000 +0000 @@ -1017,6 +1017,7 @@ sub _message_headers { $headers{'Cc'} = $cc if ($cc); $headers{'Message-Id'} = $messageid if ($messageid); diff --git a/perl-5.18.0.tar.gz b/perl-5.18.0.tar.gz new file mode 100644 index 0000000..61db7a4 --- /dev/null +++ b/perl-5.18.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e56698de4ad3e3d54e8ed25d2e91ddffd6758c32b72a0de89c38a763e2f783b7 +size 17323206 diff --git a/perl-clone_oldcop.diff b/perl-clone_oldcop.diff deleted file mode 100644 index 5972473..0000000 --- a/perl-clone_oldcop.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- ./ext/XS-APItest/APItest.xs.orig 2012-05-25 14:49:20.000000000 +0000 -+++ ./ext/XS-APItest/APItest.xs 2012-05-25 14:49:54.000000000 +0000 -@@ -3084,7 +3084,8 @@ CODE: - PERL_SET_CONTEXT(interp_dup); - - /* continue after 'clone_with_stack' */ -- interp_dup->Iop = interp_dup->Iop->op_next; -+ if (interp_dup->Iop) -+ interp_dup->Iop = interp_dup->Iop->op_next; - - /* run with new perl */ - Perl_runops_standard(interp_dup); ---- ./sv.c.orig 2012-05-25 14:50:00.000000000 +0000 -+++ ./sv.c 2012-05-25 14:51:48.000000000 +0000 -@@ -12296,6 +12296,7 @@ Perl_cx_dup(pTHX_ PERL_CONTEXT *cxs, I32 - Perl_croak(aTHX_ "Cloning substitution context is unimplemented"); - } - else { -+ ncx->blk_oldcop = (COP*)any_dup(ncx->blk_oldcop, param->proto_perl); - switch (CxTYPE(ncx)) { - case CXt_SUB: - ncx->blk_sub.cv = (ncx->blk_sub.olddepth == 0 diff --git a/perl-nroff.diff b/perl-nroff.diff index cb1d9fc..471dce2 100644 --- a/perl-nroff.diff +++ b/perl-nroff.diff @@ -1,5 +1,5 @@ ---- cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm.orig 2012-05-23 15:16:34.000000000 +0000 -+++ cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm 2012-05-23 15:18:00.000000000 +0000 +--- ./cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm.orig 2013-05-01 02:52:55.000000000 +0000 ++++ ./cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm 2013-06-06 13:04:50.000000000 +0000 @@ -64,7 +64,7 @@ sub _roffer_candidates { my( $self ) = @_; @@ -9,7 +9,7 @@ } sub _find_roffer { -@@ -246,6 +246,7 @@ sub _collect_nroff_switches { +@@ -253,6 +253,7 @@ sub _collect_nroff_switches { # don't have a -c switch, so that unconditionally adding it here # would presumably be a Bad Thing -- sburke@cpan.org push @render_switches, '-c' if( $self->_is_roff and $self->is_cygwin ); diff --git a/perl-regexp-refoverflow.diff b/perl-regexp-refoverflow.diff index 5e2d801..f29cf5b 100644 --- a/perl-regexp-refoverflow.diff +++ b/perl-regexp-refoverflow.diff @@ -1,6 +1,6 @@ ---- ./regcomp.c.orig 2011-05-08 03:10:08.000000000 +0000 -+++ ./regcomp.c 2011-05-16 11:49:16.000000000 +0000 -@@ -6832,7 +6832,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I +--- ./regcomp.c.orig 2013-05-10 02:30:48.000000000 +0000 ++++ ./regcomp.c 2013-06-06 13:04:19.000000000 +0000 +@@ -8998,7 +8998,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I ret = reganode(pRExC_state, GOSUB, num); if (!SIZE_ONLY) { @@ -9,16 +9,16 @@ RExC_parse++; vFAIL("Reference to nonexistent group"); } -@@ -8428,7 +8428,7 @@ tryagain: +@@ -10654,7 +10654,7 @@ tryagain: if (num < 1) vFAIL("Reference to nonexistent or unclosed group"); } - if (!isg && num > 9 && num >= RExC_npar) + if (!isg && (num < 0 || (num > 9 && num >= RExC_npar))) + /* Probably a character specified in octal, e.g. \35 */ goto defchar; else { - char * const parse_start = RExC_parse - 1; /* MJD */ -@@ -8442,7 +8442,7 @@ tryagain: +@@ -10669,7 +10669,7 @@ tryagain: RExC_parse++; } if (!SIZE_ONLY) { @@ -27,9 +27,9 @@ vFAIL("Reference to nonexistent group"); } RExC_sawback = 1; -@@ -8666,7 +8666,7 @@ tryagain: +@@ -10934,7 +10934,7 @@ tryagain: case '0': case '1': case '2': case '3':case '4': - case '5': case '6': case '7': case '8':case '9': + case '5': case '6': case '7': if (*p == '0' || - (isDIGIT(p[1]) && atoi(p) >= RExC_npar)) + (isDIGIT(p[1]) && (U32)atoi(p) >= (U32)RExC_npar)) diff --git a/perl-saverecontext.diff b/perl-saverecontext.diff index b6669f5..3ce2a2d 100644 --- a/perl-saverecontext.diff +++ b/perl-saverecontext.diff @@ -1,6 +1,6 @@ ---- ./regcomp.c.orig 2011-05-16 11:56:49.000000000 +0000 -+++ ./regcomp.c 2011-05-16 11:57:14.000000000 +0000 -@@ -11929,8 +11929,23 @@ Perl_save_re_context(pTHX) +--- ./regcomp.c.orig 2013-06-06 13:04:19.000000000 +0000 ++++ ./regcomp.c 2013-06-06 13:15:51.000000000 +0000 +@@ -15461,8 +15461,21 @@ Perl_save_re_context(pTHX) if (gvp) { GV * const gv = *gvp; @@ -12,14 +12,12 @@ + SV * osv = *sptr; + SV * nsv = newSV(0); + save_pushptrptr(SvREFCNT_inc_simple(gv), SvREFCNT_inc(osv), SAVEt_SV); -+ if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(osv) && SvTYPE(osv) != SVt_PVGV) { ++ if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(osv)) { + if (SvGMAGICAL(osv)) { -+ const bool oldtainted = PL_tainted; + SvFLAGS(osv) |= (SvFLAGS(osv) & + (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT; -+ PL_tainted = oldtainted; + } -+ mg_localize(osv, nsv, 1); ++ mg_localize(osv, nsv, (bool)1); + } + *sptr = nsv; + } diff --git a/perl.changes b/perl.changes index f08230d..26b62f0 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Jun 6 15:21:34 CEST 2013 - mls@suse.de + +- update to 5.18.0 + * new handling of experimental features + * new hash functions to improve security + * better hash randomization + * upgrade to Unicode 6.2 + * support for computed labels + * vertical tabs are now whitespace + * smartmatch is experimental again + * lots of bug fixes +- change perl_requires macro to use MODULE_COMPAT form + ------------------------------------------------------------------- Mon May 20 19:02:09 UTC 2013 - schwab@suse.de diff --git a/perl.spec b/perl.spec index 486b1f9..31e05cd 100644 --- a/perl.spec +++ b/perl.spec @@ -21,23 +21,22 @@ Name: perl Summary: The Perl interpreter License: Artistic-1.0 or GPL-2.0+ Group: Development/Languages/Perl -Version: 5.16.2 +Version: 5.18.0 Release: 0 -%define pversion 5.16.2 +%define pversion 5.18.0 Url: http://www.perl.org/ Source: http://www.cpan.org/src/5.0/perl-%{version}.tar.gz Source1: %name-rpmlintrc Source2: macros.perl Source3: README.macros Source4: baselibs.conf -Patch0: perl-5.16.0.dif +Patch0: perl-5.18.0.dif Patch1: perl-gracefull-net-ftp.diff Patch2: perl-regexp-refoverflow.diff Patch3: perl-nroff.diff Patch4: perl-netcmdutf8.diff Patch5: perl-HiRes.t-timeout.diff Patch6: perl-saverecontext.diff -Patch7: perl-clone_oldcop.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: perl-base = %version #PreReq: %fillup_prereq @@ -161,7 +160,6 @@ cp -p %{S:3} . %patch4 %patch5 %patch6 -%patch7 %build cp -a lib savelib @@ -179,7 +177,7 @@ options="$options -Duse64bitint" %endif # always use glibc's setenv options="$options -Accflags='-DPERL_USE_SAFE_PUTENV'" -options="$options -Dotherlibdirs=/usr/lib/perl5/site_perl" +options="$options -Dotherlibdirs=/usr/lib/perl5/site_perl -Dinc_version_list=none" chmod 755 ./configure.gnu ./configure.gnu --prefix=/usr -Dvendorprefix=/usr -Dinstallusrbinperl -Dusethreads -Di_db -Di_dbm -Di_ndbm -Di_gdbm -Dd_dbm_open -Duseshrplib=\'true\' $options make %{?_smp_mflags}