SHA256
1
0
forked from pool/perl

- update to perl-5.20.0

OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=113
This commit is contained in:
Michael Schröder 2014-06-02 15:21:22 +00:00 committed by Git OBS Bridge
parent 9aedf66db4
commit 9b4b7aec91
10 changed files with 138 additions and 358 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7cbed5ef11900e8f68041215eea0de5e443d53393f84c41d5c9c69c150a4982f
size 17296490

View File

@ -1,5 +1,5 @@
--- ./Configure.orig 2013-05-10 14:13:56.000000000 +0000
+++ ./Configure 2013-06-06 12:51:27.000000000 +0000
--- ./Configure.orig 2014-05-26 13:34:18.000000000 +0000
+++ ./Configure 2014-06-02 14:12:24.160911277 +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"
@@ -1346,7 +1346,7 @@ loclibpth="/usr/local/lib /opt/local/lib
@@ -1355,7 +1355,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,16 +18,16 @@
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"
@@ -2394,7 +2394,7 @@ uname
@@ -2446,7 +2446,7 @@ uname
zip
"
pth=`echo $PATH | sed -e "s/$p_/ /g"`
-pth="$pth /lib /usr/lib"
+pth="$pth /lib /usr/lib /lib64 /usr/lib64"
-pth="$pth $sysroot/lib $sysroot/usr/lib"
+pth="$pth $sysroot/lib $sysroot/usr/lib $sysroot/lib64 $sysroot/usr/lib64"
for file in $loclist; do
eval xxx=\$$file
case "$xxx" in
@@ -11233,7 +11233,7 @@ void xxx(int n, ...)
@@ -11435,7 +11435,7 @@ void xxx(int n, ...)
va_start(args, n);
exit((unsigned long)vsprintf(buf,"%s",args) > 10L);
}
@ -36,7 +36,7 @@
#else /* I_VARARGS */
@@ -11245,7 +11245,7 @@ va_dcl
@@ -11447,7 +11447,7 @@ va_dcl
va_start(args);
exit((unsigned long)vsprintf(buf,"%s",args) > 10L);
}
@ -45,7 +45,7 @@
#endif
@@ -19335,14 +19335,20 @@ int main(int argc, char *argv[])
@@ -19458,14 +19458,20 @@ int main(int argc, char *argv[])
}
EOCP
set try
@ -66,7 +66,7 @@
i_db=$undef
case " $libs " in
*"-ldb "*)
@@ -19385,7 +19391,7 @@ int main()
@@ -19508,7 +19514,7 @@ int main()
}
#endif
EOCP
@ -75,7 +75,7 @@
if $contains warning try.out >>/dev/null 2>&1 ; then
db_hashtype='int'
else
@@ -19430,7 +19436,7 @@ int main()
@@ -19553,7 +19559,7 @@ int main()
}
#endif
EOCP
@ -84,7 +84,7 @@
if $contains warning try.out >>/dev/null 2>&1 ; then
db_prefixtype='int'
else
@@ -23736,7 +23742,7 @@ passcat='$passcat'
@@ -23743,7 +23749,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 2013-06-06 12:51:27.000000000 +0000
+++ ./SuSE/SuSEconfig.perl 2013-06-06 12:51:27.000000000 +0000
--- ./SuSE/SuSEconfig.perl.orig 2014-06-02 14:10:31.871498553 +0000
+++ ./SuSE/SuSEconfig.perl 2014-06-02 14:10:31.871498553 +0000
@@ -0,0 +1,76 @@
+#! /bin/bash
+#
@ -172,8 +172,8 @@
+#
+# end of file SuSEconfig.perl
+#
--- ./SuSE/perllocal.SuSE.orig 2013-06-06 12:51:27.000000000 +0000
+++ ./SuSE/perllocal.SuSE 2013-06-06 12:51:27.000000000 +0000
--- ./SuSE/perllocal.SuSE.orig 2014-06-02 14:10:31.871498553 +0000
+++ ./SuSE/perllocal.SuSE 2014-06-02 14:10:31.871498553 +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 2013-06-06 12:51:27.000000000 +0000
+++ ./SuSE/sysconfig.suseconfig-perl 2013-06-06 12:51:27.000000000 +0000
--- ./SuSE/sysconfig.suseconfig-perl.orig 2014-06-02 14:10:31.871498553 +0000
+++ ./SuSE/sysconfig.suseconfig-perl 2014-06-02 14:10:31.871498553 +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 2013-05-01 02:52:54.000000000 +0000
+++ ./cpan/CPAN/lib/CPAN.pm 2013-06-06 12:51:27.000000000 +0000
--- ./cpan/CPAN/lib/CPAN.pm.orig 2014-05-26 13:34:18.000000000 +0000
+++ ./cpan/CPAN/lib/CPAN.pm 2014-06-02 14:10:31.872498486 +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 2013-05-01 02:52:54.000000000 +0000
+++ ./cpan/Compress-Raw-Zlib/config.in 2013-06-06 12:51:27.000000000 +0000
--- ./cpan/Compress-Raw-Zlib/config.in.orig 2014-01-31 21:55:50.000000000 +0000
+++ ./cpan/Compress-Raw-Zlib/config.in 2014-06-02 14:10:31.872498486 +0000
@@ -16,9 +16,9 @@
# Setting the Gzip OS Code
#
@ -296,9 +296,9 @@
OLD_ZLIB = False
GZIP_OS_CODE = AUTO_DETECT
--- ./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 {
--- ./cpan/Encode/bin/enc2xs.orig 2014-05-26 13:34:19.000000000 +0000
+++ ./cpan/Encode/bin/enc2xs 2014-06-02 14:10:31.872498486 +0000
@@ -1010,13 +1010,13 @@ sub make_configlocal_pm {
$LocalMod{$enc} ||= $mod;
}
};
@ -314,9 +314,9 @@
$_LocalVer = _mkversion();
$_E2X = find_e2x();
$_Inc = $INC{"Encode.pm"};
--- ./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;
--- ./cpan/File-Temp/lib/File/Temp.pm.orig 2014-05-26 13:34:19.000000000 +0000
+++ ./cpan/File-Temp/lib/File/Temp.pm 2014-06-02 14:10:31.872498486 +0000
@@ -16,7 +16,7 @@ use Fcntl 1.03;
use IO::Seekable; # For SEEK_*
use Errno;
use Scalar::Util 'refaddr';
@ -325,8 +325,8 @@
# 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 2013-05-01 02:52:55.000000000 +0000
+++ ./cpan/Sys-Syslog/t/syslog.t 2013-06-06 12:51:27.000000000 +0000
--- ./cpan/Sys-Syslog/t/syslog.t.orig 2014-01-31 21:55:50.000000000 +0000
+++ ./cpan/Sys-Syslog/t/syslog.t 2014-06-02 14:10:31.872498486 +0000
@@ -220,6 +220,7 @@ SKIP: {
}
}
@ -335,8 +335,8 @@
ok( $r, "setlogsock() should return true: '$r'" );
}
--- ./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
--- ./cpan/libnet/Net/Config.pm.orig 2014-05-26 13:34:19.000000000 +0000
+++ ./cpan/libnet/Net/Config.pm 2014-06-02 14:10:31.873498422 +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 2013-05-01 02:52:55.000000000 +0000
+++ ./dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm 2013-06-06 12:51:27.000000000 +0000
--- ./dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm.orig 2014-05-26 13:34:19.000000000 +0000
+++ ./dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm 2014-06-02 14:10:31.873498422 +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 2013-02-26 21:28:27.000000000 +0000
+++ ./ext/DynaLoader/hints/linux.pl 2013-06-06 12:51:27.000000000 +0000
--- ./ext/DynaLoader/hints/linux.pl.orig 2014-01-31 21:55:51.000000000 +0000
+++ ./ext/DynaLoader/hints/linux.pl 2014-06-02 14:10:31.873498422 +0000
@@ -2,4 +2,7 @@
# Some Linux releases like to hide their <nlist.h>
$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 2013-02-26 21:28:27.000000000 +0000
+++ ./ext/ODBM_File/Makefile.PL 2013-06-06 12:51:27.000000000 +0000
--- ./ext/ODBM_File/Makefile.PL.orig 2014-01-31 21:55:51.000000000 +0000
+++ ./ext/ODBM_File/Makefile.PL 2014-06-02 14:10:31.873498422 +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 2013-05-01 02:52:55.000000000 +0000
+++ ./ext/ODBM_File/hints/linux.pl 2013-06-06 12:51:27.000000000 +0000
--- ./ext/ODBM_File/hints/linux.pl.orig 2014-01-31 21:55:51.000000000 +0000
+++ ./ext/ODBM_File/hints/linux.pl 2014-06-02 14:10:31.873498422 +0000
@@ -1,5 +1,5 @@
# uses GDBM dbm compatibility feature - at least on SuSE 8.0
-$self->{LIBS} = ['-lgdbm'];
@ -392,46 +392,39 @@
# Debian/Ubuntu have libgdbm_compat.so but not this file,
# so linking may fail
--- ./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'
--- ./hints/linux.sh.orig 2014-05-26 13:34:20.000000000 +0000
+++ ./hints/linux.sh 2014-06-02 14:28:21.977903155 +0000
@@ -53,7 +53,7 @@ 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.
# bind causes issues with several reentrant functions
-set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ net / /' -e 's/ bind / /'`
+set `echo X "$libswanted "| \
+ sed -e 's/ bsd / /' -e 's/ net / /' -e 's/ bind / /' \
+ -e 's/ db / /' -e 's/ gdbm / /' -e 's/ ndbm / /'`
+set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ net / /' -e 's/ bind / /' -e 's/ db / /' -e 's/ gdbm / /' -e 's/ ndbm / /'`
shift
libswanted="$*"
# Debian 4.0 puts ndbm in the -lgdbm_compat library.
-libswanted="$libswanted gdbm_compat"
+#libswanted="$libswanted gdbm_compat"
@@ -64,6 +64,20 @@ if echo " $libswanted " | grep -q ' gdbm
libswanted="$libswanted gdbm_compat"
fi
# If you have glibc, then report the version for ./myconfig bug reporting.
# (Configure doesn't need to know the specific version since it just uses
@@ -66,7 +68,18 @@ libswanted="$libswanted gdbm_compat"
# We don't use __GLIBC__ and __GLIBC_MINOR__ because they
# are insufficiently precise to distinguish things like
# libc-2.0.6 and libc-2.0.7.
-if test -L /lib/libc.so.6; then
+if test -e /lib64/libc.so.6 ; then
+ libc=`ls -l /lib64/libc.so.6 | awk '{print $NF}'`
+ libc=/lib64/$libc
+ #plibpth='/usr/local/lib64 /usr/lib64 /lib64'
+ glibpth='/lib64 /usr/lib64 /usr/local/lib64'
+ libspath='/usr/local/lib64 /lib64 /usr/lib64'
+ #libpth='/usr/local/lib64 /lib64 /usr/lib64'
+ loclibpth='/usr/local/lib64'
+ lddlflags='-shared -L/usr/local/lib64'
+ ldflags=' -L/usr/local/lib64'
+ libs='-lm -ldl -lcrypt'
+elif test -L /lib/libc.so.6; then
libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`
libc=/lib/$libc
fi
@@ -151,6 +164,7 @@ case "$optimize" in
+ libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`
+ libc=/lib/$libc
+fi
+
# Configure may fail to find lstat() since it's a static/inline
# function in <sys/stat.h>.
d_lstat=define
@@ -147,6 +161,7 @@ case "$optimize" in
esac
;;
esac
@ -439,16 +432,7 @@
;;
esac
@@ -174,7 +188,7 @@ else
fi
case "$plibpth" in
-'') plibpth=`LANG=C LC_ALL=C $gcc -print-search-dirs | grep libraries |
+'UBUNTU') plibpth=`LANG=C LC_ALL=C $gcc -print-search-dirs | grep libraries |
cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
set X $plibpth # Collapse all entries on one line
shift
@@ -182,6 +196,10 @@ case "$plibpth" in
@@ -204,6 +219,10 @@ case "$libc" in
;;
esac
@ -459,7 +443,7 @@
# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
# for this test.
cat >try.c <<'EOM'
@@ -266,6 +284,29 @@ EOM
@@ -288,6 +307,29 @@ EOM
esac
fi
@ -488,8 +472,8 @@
+
rm -f try.c a.out
if /bin/sh -c exit; then
@@ -315,6 +356,9 @@ else
if ${sh:-/bin/sh} -c exit; then
@@ -337,6 +379,9 @@ else
echo "Couldn't find tcsh. Csh-based globbing might be broken."
fi
fi
@ -499,7 +483,7 @@
# Shimpei Yamashita <shimpei@socrates.patnet.caltech.edu>
# Message-Id: <33EF1634.B36B6500@pobox.com>
@@ -387,6 +431,8 @@ $define|true|[yY]*)
@@ -447,6 +492,8 @@ $define|true|[yY]*)
d_localtime_r_proto="$define"
d_random_r_proto="$define"
@ -508,9 +492,9 @@
;;
esac
EOCBU
--- ./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 {
--- ./installperl.orig 2014-05-26 13:34:20.000000000 +0000
+++ ./installperl 2014-06-02 14:10:31.873498422 +0000
@@ -722,7 +722,7 @@ sub installlib {
return if $name eq 'ExtUtils/XSSymSet.pm' and !$Is_VMS;
my $installlib = $installprivlib;
@ -519,9 +503,9 @@
($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) ||
($name =~ /^(.*)\.(?:h|lib)$/i && ($Is_W32 || $Is_NetWare)) ||
$name=~/^Config_(heavy|git)\.pl\z/
--- ./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
--- ./lib/perl5db.pl.orig 2014-05-26 13:34:20.000000000 +0000
+++ ./lib/perl5db.pl 2014-06-02 14:10:31.875498305 +0000
@@ -2327,6 +2327,8 @@ sub _DB__handle_run_command_in_pager_com
open( OUT, ">&STDOUT" ) # XXX: lost message
|| _db_warn("Can't restore DB::OUT");
}
@ -530,7 +514,7 @@
next CMD;
} ## end unless ($piped = open(OUT,...
@@ -2426,6 +2428,9 @@ sub _DB__at_end_of_every_command {
@@ -2431,6 +2433,9 @@ sub _DB__at_end_of_every_command {
$obj->selected("");
}
@ -540,26 +524,19 @@
# 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) {
--- ./locale.c.orig 2014-06-02 14:10:31.875498305 +0000
+++ ./locale.c 2014-06-02 14:16:48.640529661 +0000
@@ -512,7 +512,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
char *p;
+#if 0
const bool locwarn = (printwarn > 1 ||
(printwarn &&
(!(p = PerlEnv_getenv("PERL_BADLANG")) || atoi(p))));
+#else
+ const bool locwarn = (printwarn > 1 ||
+ (printwarn &&
- (!(p = PerlEnv_getenv("PERL_BADLANG")) || atoi(p))));
+ ((p = PerlEnv_getenv("PERL_BADLANG")) && atoi(p))));
+#endif
bool done = FALSE;
const char *system_default_locale = NULL;
if (locwarn) {
#ifdef LC_ALL
--- ./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
--- ./t/op/numconvert.t.orig 2014-01-31 21:55:52.000000000 +0000
+++ ./t/op/numconvert.t 2014-06-02 14:10:31.875498305 +0000
@@ -47,7 +47,7 @@ my $max_chain = $ENV{PERL_TEST_NUMCONVER
# Bulk out if unsigned type is hopelessly wrong:
@ -569,13 +546,13 @@
my $big_iv = do {use integer; $max_uv1 * 16}; # 16 is an arbitrary number here
my $max_uv_less3 = $max_uv1 - 3;
--- ./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 {
--- ./utils/perlbug.PL.orig 2014-05-26 13:34:20.000000000 +0000
+++ ./utils/perlbug.PL 2014-06-02 14:10:31.876498251 +0000
@@ -1038,6 +1038,7 @@ sub _message_headers {
$headers{'Cc'} = $cc if ($cc);
$headers{'Message-Id'} = $messageid if ($messageid);
$headers{'Reply-To'} = $from if ($from);
+ $headers{'X-Webfrontend'} = 'perlbug';
$headers{'From'} = $from if ($from);
return \%headers;
}
if ($have_attachment) {
$headers{'MIME-Version'} = '1.0';

3
perl-5.20.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1e3e23c11d58dcfb8610fec76ad32a84482c7e221e12dfd8c63f141e004d30f2
size 13770469

View File

@ -1,5 +1,5 @@
--- cpan/Time-HiRes/t/alarm.t.orig 2012-05-23 12:33:36.000000000 +0000
+++ cpan/Time-HiRes/t/alarm.t 2012-05-23 12:34:12.000000000 +0000
--- ./cpan/Time-HiRes/t/alarm.t.orig 2014-01-31 21:55:51.000000000 +0000
+++ ./cpan/Time-HiRes/t/alarm.t 2014-06-02 14:43:54.672025619 +0000
@@ -7,7 +7,7 @@ BEGIN { require_ok "Time::HiRes"; }
use Config;
@ -9,8 +9,8 @@
my $xdefine = '';
if (open(XDEFINE, "xdefine")) {
--- cpan/Time-HiRes/t/clock.t.orig 2012-05-23 12:33:41.000000000 +0000
+++ cpan/Time-HiRes/t/clock.t 2012-05-23 12:34:27.000000000 +0000
--- ./cpan/Time-HiRes/t/clock.t.orig 2014-01-31 21:55:51.000000000 +0000
+++ ./cpan/Time-HiRes/t/clock.t 2014-06-02 14:43:54.672025619 +0000
@@ -28,7 +28,7 @@ note sprintf "have_clock = %d"
# completes fine with (say) 30% slosh, and fail otherwise. If you do that,
# consider changing over to test.pl at the same time.
@ -20,8 +20,8 @@
SKIP: {
skip "no clock_gettime", 1
--- cpan/Time-HiRes/t/itimer.t.orig 2012-05-23 12:33:46.000000000 +0000
+++ cpan/Time-HiRes/t/itimer.t 2012-05-23 12:34:31.000000000 +0000
--- ./cpan/Time-HiRes/t/itimer.t.orig 2014-01-31 21:55:51.000000000 +0000
+++ ./cpan/Time-HiRes/t/itimer.t 2014-06-02 14:43:54.673025616 +0000
@@ -28,7 +28,7 @@ BEGIN {
use Test::More 0.82 tests => 2;
use t::Watchdog;
@ -31,10 +31,10 @@
my $i = 3;
my $r = [Time::HiRes::gettimeofday()];
--- cpan/Time-HiRes/t/stat.t.orig 2012-05-23 12:33:51.000000000 +0000
+++ cpan/Time-HiRes/t/stat.t 2012-05-23 12:34:36.000000000 +0000
--- ./cpan/Time-HiRes/t/stat.t.orig 2014-05-26 13:34:19.000000000 +0000
+++ ./cpan/Time-HiRes/t/stat.t 2014-06-02 14:43:54.673025616 +0000
@@ -16,7 +16,7 @@ BEGIN {
use Test::More 0.82 tests => 16;
use Test::More 0.82 tests => 43;
use t::Watchdog;
-my $limit = 0.25; # 25% is acceptable slosh for testing timers
@ -42,8 +42,8 @@
my @atime;
my @mtime;
--- cpan/Time-HiRes/t/usleep.t.orig 2012-05-23 12:33:56.000000000 +0000
+++ cpan/Time-HiRes/t/usleep.t 2012-05-23 12:34:40.000000000 +0000
--- ./cpan/Time-HiRes/t/usleep.t.orig 2014-01-31 21:55:51.000000000 +0000
+++ ./cpan/Time-HiRes/t/usleep.t 2014-06-02 14:43:54.673025616 +0000
@@ -15,7 +15,7 @@ eval { Time::HiRes::usleep(-2) };
like $@, qr/::usleep\(-2\): negative time not invented yet/,
"negative time error";

View File

@ -1,118 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2013-06-15 00:47:07.629124845 +0200
perl: support building with libdb-6.0.
This patch data was generated from the Perl5 git tree using
git diff --stat -p v5.18.0..blead cpan/DB_File/
to resolve
DB_File.xs: In function 'ParseOpenInfo':
DB_File.xs:1316:17: warning: passing argument 2 of 'dbp->set_bt_compare' from incompatible pointer type [enabled by default]
DB_File.xs:1316:17: note: expected 'int (*)(struct DB *, const struct DBT *, const struct DBT *, size_t *)' but argument is of type 'int (*)(struct DB *, const struct DBT *, const struct DBT *)'
cpan/DB_File/Changes | 4 ++++
cpan/DB_File/DB_File.pm | 8 +++-----
cpan/DB_File/DB_File.xs | 24 ++++++++++++++++++++----
3 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/cpan/DB_File/Changes b/cpan/DB_File/Changes
index a650c75..c76b08e 100644
--- a/cpan/DB_File/Changes
+++ b/cpan/DB_File/Changes
@@ -1,3 +1,7 @@
+1.828 7 May 2013
+
+ * Minor change to build with Berkeley DB 6.x
+
1.827 25 Jan 2012
* DB_File.pm - Don't use "@_" construct
diff --git a/cpan/DB_File/DB_File.pm b/cpan/DB_File/DB_File.pm
index 58cbebe..2828770 100644
--- a/cpan/DB_File/DB_File.pm
+++ b/cpan/DB_File/DB_File.pm
@@ -1,10 +1,8 @@
# DB_File.pm -- Perl 5 interface to Berkeley DB
#
-# written by Paul Marquess (pmqs@cpan.org)
-# last modified 28th October 2007
-# version 1.818
+# Written by Paul Marquess (pmqs@cpan.org)
#
-# Copyright (c) 1995-2009 Paul Marquess. All rights reserved.
+# Copyright (c) 1995-2013 Paul Marquess. All rights reserved.
# This program is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
@@ -165,7 +163,7 @@ our ($db_version, $use_XSLoader, $splice_end_array_no_length, $splice_end_array,
use Carp;
-$VERSION = "1.827" ;
+$VERSION = "1.828" ;
$VERSION = eval $VERSION; # needed for dev releases
{
diff --git a/cpan/DB_File/DB_File.xs b/cpan/DB_File/DB_File.xs
index 6790d5d..d7958fe 100644
--- a/cpan/DB_File/DB_File.xs
+++ b/cpan/DB_File/DB_File.xs
@@ -2,13 +2,11 @@
DB_File.xs -- Perl 5 interface to Berkeley DB
- written by Paul Marquess <pmqs@cpan.org>
- last modified 4th February 2007
- version 1.818
+ Written by Paul Marquess <pmqs@cpan.org>
All comments/suggestions/problems are welcome
- Copyright (c) 1995-2012 Paul Marquess. All rights reserved.
+ Copyright (c) 1995-2013 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
@@ -208,6 +206,10 @@
# define AT_LEAST_DB_4_3
#endif
+#if DB_VERSION_MAJOR >= 6
+# define AT_LEAST_DB_6_0
+#endif
+
#ifdef AT_LEAST_DB_3_3
# define WANT_ERROR
#endif
@@ -536,6 +538,19 @@ tidyUp(DB_File db)
static int
+
+#ifdef AT_LEAST_DB_6_0
+#ifdef CAN_PROTOTYPE
+btree_compare(DB * db, const DBT *key1, const DBT *key2, size_t* locp)
+#else
+btree_compare(db, key1, key2, locp)
+DB * db ;
+const DBT * key1 ;
+const DBT * key2 ;
+size_t* locp;
+#endif /* CAN_PROTOTYPE */
+
+#else /* Berkeley DB < 6.0 */
#ifdef AT_LEAST_DB_3_2
#ifdef CAN_PROTOTYPE
@@ -558,6 +573,7 @@ const DBT * key2 ;
#endif
#endif
+#endif
{
#ifdef dTHX

View File

@ -1,58 +0,0 @@
This patch avoids several silly warnings, and fills $res->status_line with something useful
in case your FTP server babbles some text message without a leading response code.
Seen from ftp.opensuse.org:
connect(3, {sa_family=AF_INET, sin_port=htons(21), sin_addr=inet_addr("195.135.221.134")}, 16) = 0
read(3, "This server is busy, please try again later or any of my mirrors: http://download.opensuse.org\n\n", 1024) = 96
Note the missing "500 " before "This".
Command line ftp clients handle this gracefully, so should we.
With this patch, LWP clients see a status_line of "500 This server is busy, ..."
2006-12-20, jw@suse.de
--- cpan/libnet/Net/FTP.pm.orig 2007-12-18 10:47:07.000000000 +0000
+++ cpan/libnet/Net/FTP.pm 2008-01-07 10:08:30.000000000 +0000
@@ -107,7 +107,7 @@ sub new {
unless ($ftp->response() == CMD_OK) {
$ftp->close();
- $@ = $ftp->message;
+ $@ = $ftp->message || $@; # keep $@ if no message. Happens when response did not start with a code.
undef $ftp;
}
@@ -1077,7 +1077,7 @@ sub command {
sub response {
my $ftp = shift;
- my $code = $ftp->SUPER::response();
+ my $code = $ftp->SUPER::response() || CMD_ERROR; # assume error if undef
delete ${*$ftp}{'net_ftp_pasv'}
if ($code != CMD_MORE && $code != CMD_INFO);
@@ -1094,7 +1094,7 @@ sub parse_response {
# Darn MS FTP server is a load of CRAP !!!!
return ()
- unless ${*$ftp}{'net_cmd_code'} + 0;
+ unless (${*$ftp}{'net_cmd_code'} || 0) + 0;
(${*$ftp}{'net_cmd_code'}, 1);
}
--- cpan/libnet/Net/Cmd.pm.orig 2007-12-18 10:47:07.000000000 +0000
+++ cpan/libnet/Net/Cmd.pm 2008-01-07 10:09:34.000000000 +0000
@@ -353,6 +353,7 @@ sub response {
($code, $more) = $cmd->parse_response($str);
unless (defined $code) {
$cmd->ungetline($str);
+ $@ = $str; # $@ is used as a tunneling hack.
last;
}
@@ -363,6 +364,7 @@ sub response {
last unless ($more);
}
+ return undef unless defined $code;
substr($code, 0, 1);
}

View File

@ -1,15 +1,15 @@
--- ./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
--- ./cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm.orig 2014-06-02 14:40:44.776012754 +0000
+++ ./cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm 2014-06-02 14:41:31.621766916 +0000
@@ -64,7 +64,7 @@ sub _roffer_candidates {
my( $self ) = @_;
if( $self->is_openbsd ) { qw( mandoc groff nroff ) }
if( $self->is_openbsd || $self->is_bitrig ) { qw( mandoc groff nroff ) }
- else { qw( groff nroff mandoc ) }
+ else { qw( nroff groff mandoc ) }
}
sub _find_roffer {
@@ -253,6 +253,7 @@ sub _collect_nroff_switches {
@@ -232,6 +232,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 );

View File

@ -1,6 +1,6 @@
--- ./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
--- ./regcomp.c.orig 2014-05-26 13:34:20.000000000 +0000
+++ ./regcomp.c 2014-06-02 14:39:25.188429940 +0000
@@ -9771,7 +9771,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I
ret = reganode(pRExC_state, GOSUB, num);
if (!SIZE_ONLY) {
@ -9,30 +9,3 @@
RExC_parse++;
vFAIL("Reference to nonexistent group");
}
@@ -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 {
@@ -10669,7 +10669,7 @@ tryagain:
RExC_parse++;
}
if (!SIZE_ONLY) {
- if (num > (I32)RExC_rx->nparens)
+ if (num < 0 || num > (I32)RExC_rx->nparens)
vFAIL("Reference to nonexistent group");
}
RExC_sawback = 1;
@@ -10934,7 +10934,7 @@ tryagain:
case '0': case '1': case '2': case '3':case '4':
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))
{
I32 flags = PERL_SCAN_SILENT_ILLDIGIT;
STRLEN numlen = 3;

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Mon Jun 2 16:50:44 CEST 2014 - mls@suse.de
- update to perl-5.20.0
* experimental subroutine signatures
* new slice syntax
* experimental postfix dereferencing
* unicode 6.3 support
* better 64-bit support
* do" can no longer be used to call subroutines
* tainting now conforms to documentation
* performance enhancements
* multiple modules updated to current version
- perl-5.18.0.dif renamed to perl-5.20.0.dif
- dropped patches: perl-db6.diff and perl-gracefull-net-ftp.diff
-------------------------------------------------------------------
Mon Apr 7 16:43:51 CEST 2014 - mls@suse.de

View File

@ -21,26 +21,23 @@ Name: perl
Summary: The Perl interpreter
License: Artistic-1.0 or GPL-2.0+
Group: Development/Languages/Perl
Version: 5.18.2
Version: 5.20.0
Release: 0
%define pversion 5.18.2
%define pversion 5.20.0
Url: http://www.perl.org/
Source: http://www.cpan.org/src/5.0/perl-%{version}.tar.gz
Source: http://www.cpan.org/src/5.0/perl-%{version}.tar.bz2
Source1: %name-rpmlintrc
Source2: macros.perl
Source3: README.macros
Source4: baselibs.conf
Patch0: perl-5.18.0.dif
Patch1: perl-gracefull-net-ftp.diff
Patch0: perl-5.20.0.dif
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-db6.diff
Patch8: skip_time_hires.patch
Patch9: perl-incfix.diff
Patch10: perl-threads.t-timeout.diff
Patch11: perl-5.18.2-overflow.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: perl-base = %version
@ -59,9 +56,7 @@ Provides: perl = %pversion-%release
Provides: perl-500
Provides: perl-Filter-Simple
Provides: perl(:MODULE_COMPAT_%pversion)
%global versionlist 5.18.0 5.18.1
Provides: perl(:MODULE_COMPAT_5.18.0)
Provides: perl(:MODULE_COMPAT_5.18.1)
#%%global versionlist 5.20.0
Obsoletes: perl-Filter-Simple
Provides: perl-I18N-LangTags
Obsoletes: perl-I18N-LangTags
@ -69,8 +64,8 @@ Provides: perl-MIME-Base64
Obsoletes: perl-MIME-Base64
Provides: perl-Storable
Obsoletes: perl-Storable
Provides: perl-Test-Simple = 0.98-%{release}
Obsoletes: perl-Test-Simple < 0.98
Provides: perl-Test-Simple = 1.001003
Obsoletes: perl-Test-Simple < 1.001003
Provides: perl-Text-Balanced
Obsoletes: perl-Text-Balanced
Provides: perl-Time-HiRes
@ -90,22 +85,20 @@ Obsoletes: perl-IO-Zlib
Provides: perl-Archive-Tar
Obsoletes: perl-Archive-Tar
Obsoletes: perl-Module-Build <= 0.4003
Provides: perl-Module-Pluggable = 4.0
Obsoletes: perl-Module-Pluggable < 4.0
Provides: perl-Locale-Maketext-Simple = 0.21
Obsoletes: perl-Locale-Maketext-Simple < 0.21
Provides: perl-Pod-Escapes = 1.04
Obsoletes: perl-Pod-Escapes < 1.04
Provides: perl-Pod-Simple = 3.2
Obsoletes: perl-Pod-Simple < 3.2
Provides: perl-Pod-Escapes = 1.06
Obsoletes: perl-Pod-Escapes < 1.06
Provides: perl-Pod-Simple = 3.28
Obsoletes: perl-Pod-Simple < 3.28
Provides: perl-ExtUtils-ParseXS
Obsoletes: perl-ExtUtils-ParseXS
Provides: perl-version
Obsoletes: perl-CPAN-Meta <= 2.120921
Obsoletes: perl-CPAN-Meta-YAML <= 0.008
Obsoletes: perl-ExtUtils-CBuilder <= 0.280205
Obsoletes: perl-Parse-CPAN-Meta <= 1.4402
Obsoletes: perl-PathTools <= 3.40
Obsoletes: perl-CPAN-Meta <= 2.140640
Obsoletes: perl-CPAN-Meta-YAML <= 0.012
Obsoletes: perl-ExtUtils-CBuilder <= 0.280216
Obsoletes: perl-Parse-CPAN-Meta <= 1.4414
Obsoletes: perl-PathTools <= 3.47
Obsoletes: perl-version
%description
@ -165,18 +158,15 @@ Perl man pages and pod files.
%setup -q -n perl-%{pversion}
cp -p %{S:3} .
%patch0
%patch1
%patch2
%patch3
%patch4
%patch5
%patch6
%patch -P 7 -p1
%ifarch ppc ppc64
%patch8 -p1
%endif
%patch9
%patch10 -p1
%patch11
%build