Michael Schröder 2016-05-09 12:03:01 +00:00 committed by Git OBS Bridge
parent 824cdb245f
commit 9d75405fca
7 changed files with 83 additions and 92 deletions

View File

@ -1,9 +1,8 @@
diff -ur perl-5.22.0/dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm perl-5.22.0_fix/dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm
--- perl-5.22.0/dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm 2015-05-13 22:19:29.000000000 +0200
+++ perl-5.22.0_fix/dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm 2015-12-07 17:56:35.717373572 +0100
@@ -7,7 +7,8 @@
$VERSION = '1.9997';
--- ./cpan/Math-BigInt/lib/Math/BigInt/CalcEmu.pm.orig 2016-03-01 12:33:01.000000000 +0000
+++ ./cpan/Math-BigInt/lib/Math/BigInt/CalcEmu.pm 2016-05-09 11:56:55.769386963 +0000
@@ -7,7 +7,8 @@ use warnings;
our $VERSION = '1.999715';
$VERSION = eval $VERSION;
-package Math::BigInt;
+package Math::BigInt # line break to prevent wrong rpm provides
@ -11,10 +10,9 @@ diff -ur perl-5.22.0/dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm perl-5.22.0_fix
# See SYNOPSIS below.
diff -ur perl-5.22.0/lib/sigtrap.pm perl-5.22.0_fix/lib/sigtrap.pm
--- perl-5.22.0/lib/sigtrap.pm 2015-05-13 22:19:30.000000000 +0200
+++ perl-5.22.0_fix/lib/sigtrap.pm 2015-12-07 17:56:26.971631933 +0100
@@ -80,7 +80,8 @@
--- ./lib/sigtrap.pm.orig 2016-03-01 12:33:02.000000000 +0000
+++ ./lib/sigtrap.pm 2016-05-09 11:56:55.769386963 +0000
@@ -80,7 +80,8 @@ sub handler_die {
}
sub handler_traceback {

View File

@ -1,6 +1,6 @@
--- ./Configure.orig 2015-05-13 22:19:28.000000000 +0200
+++ ./Configure 2015-06-10 11:41:25.382999381 +0200
@@ -114,7 +114,7 @@ paths="$paths /usr/5bin /etc /usr/gnu/bi
--- ./Configure.orig 2016-04-26 22:11:09.000000000 +0000
+++ ./Configure 2016-05-09 11:46:57.865487194 +0000
@@ -117,7 +117,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"
paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
@ -9,7 +9,7 @@
paths="$paths /sbin /usr/sbin /usr/libexec"
paths="$paths /system/gnu_library/bin"
@@ -1422,7 +1422,7 @@ loclibpth="/usr/local/lib /opt/local/lib
@@ -1446,7 +1446,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"
@@ -2513,7 +2513,7 @@ uname
@@ -2541,7 +2541,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
@@ -11763,7 +11763,7 @@ void xxx(int n, ...)
@@ -11838,7 +11838,7 @@ void xxx(int n, ...)
va_start(args, n);
exit((unsigned long)vsprintf(buf,"%s",args) > 10L);
}
@ -36,7 +36,7 @@
#else /* I_VARARGS */
@@ -11775,7 +11775,7 @@ va_dcl
@@ -11850,7 +11850,7 @@ va_dcl
va_start(args);
exit((unsigned long)vsprintf(buf,"%s",args) > 10L);
}
@ -45,7 +45,7 @@
#endif
@@ -20221,14 +20221,20 @@ int main(int argc, char *argv[])
@@ -20354,14 +20354,20 @@ int main(int argc, char *argv[])
}
EOCP
set try
@ -66,7 +66,7 @@
i_db=$undef
case " $libs " in
*"-ldb "*)
@@ -20269,7 +20275,7 @@ int main()
@@ -20402,7 +20408,7 @@ int main()
}
#endif
EOCP
@ -75,7 +75,7 @@
if $contains warning try.out >>/dev/null 2>&1 ; then
db_hashtype='int'
else
@@ -20312,7 +20318,7 @@ int main()
@@ -20445,7 +20451,7 @@ int main()
}
#endif
EOCP
@ -84,7 +84,7 @@
if $contains warning try.out >>/dev/null 2>&1 ; then
db_prefixtype='int'
else
@@ -24603,7 +24609,7 @@ passcat='$passcat'
@@ -25039,7 +25045,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 1970-01-01 01:00:00.000000000 +0100
+++ ./SuSE/SuSEconfig.perl 2015-06-10 11:41:25.383999384 +0200
--- ./SuSE/SuSEconfig.perl.orig 2016-05-09 11:46:57.866487189 +0000
+++ ./SuSE/SuSEconfig.perl 2016-05-09 11:46:57.866487189 +0000
@@ -0,0 +1,76 @@
+#! /bin/bash
+#
@ -172,8 +172,8 @@
+#
+# end of file SuSEconfig.perl
+#
--- ./SuSE/perllocal.SuSE.orig 1970-01-01 01:00:00.000000000 +0100
+++ ./SuSE/perllocal.SuSE 2015-06-10 11:41:25.383999384 +0200
--- ./SuSE/perllocal.SuSE.orig 2016-05-09 11:46:57.866487189 +0000
+++ ./SuSE/perllocal.SuSE 2016-05-09 11:46:57.866487189 +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 1970-01-01 01:00:00.000000000 +0100
+++ ./SuSE/sysconfig.suseconfig-perl 2015-06-10 11:41:25.383999384 +0200
--- ./SuSE/sysconfig.suseconfig-perl.orig 2016-05-09 11:46:57.866487189 +0000
+++ ./SuSE/sysconfig.suseconfig-perl 2016-05-09 11:46:57.866487189 +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/Compress-Raw-Zlib/config.in.orig 2015-05-13 22:19:28.000000000 +0200
+++ ./cpan/Compress-Raw-Zlib/config.in 2015-06-10 11:41:25.384999384 +0200
--- ./cpan/Compress-Raw-Zlib/config.in.orig 2015-10-14 13:17:05.000000000 +0000
+++ ./cpan/Compress-Raw-Zlib/config.in 2016-05-09 11:46:57.867487184 +0000
@@ -16,9 +16,9 @@
# Setting the Gzip OS Code
#
@ -285,9 +285,9 @@
OLD_ZLIB = False
GZIP_OS_CODE = AUTO_DETECT
--- ./cpan/Encode/bin/enc2xs.orig 2015-05-13 22:19:28.000000000 +0200
+++ ./cpan/Encode/bin/enc2xs 2015-06-10 11:41:25.384999384 +0200
@@ -1025,7 +1025,7 @@ sub make_configlocal_pm {
--- ./cpan/Encode/bin/enc2xs.orig 2016-03-01 12:33:01.000000000 +0000
+++ ./cpan/Encode/bin/enc2xs 2016-05-09 11:46:57.867487184 +0000
@@ -1065,7 +1065,7 @@ sub make_configlocal_pm {
$LocalMod{$enc} ||= $mod;
}
};
@ -296,8 +296,8 @@
$_ModLines = "";
for my $enc ( sort keys %LocalMod ) {
$_ModLines .=
--- ./cpan/ExtUtils-Install/lib/ExtUtils/Packlist.pm.orig 2015-05-13 22:19:28.000000000 +0200
+++ ./cpan/ExtUtils-Install/lib/ExtUtils/Packlist.pm 2015-06-10 11:41:25.386999399 +0200
--- ./cpan/ExtUtils-Install/lib/ExtUtils/Packlist.pm.orig 2016-03-01 12:33:01.000000000 +0000
+++ ./cpan/ExtUtils-Install/lib/ExtUtils/Packlist.pm 2016-05-09 11:46:57.868487180 +0000
@@ -207,8 +207,11 @@ foreach my $key (sort(keys(%{$self->{dat
{
if (! -e $key)
@ -312,8 +312,8 @@
}
}
return(@missing);
--- ./cpan/File-Temp/lib/File/Temp.pm.orig 2015-05-13 22:19:28.000000000 +0200
+++ ./cpan/File-Temp/lib/File/Temp.pm 2015-06-10 11:41:25.385999390 +0200
--- ./cpan/File-Temp/lib/File/Temp.pm.orig 2016-02-05 15:26:05.000000000 +0000
+++ ./cpan/File-Temp/lib/File/Temp.pm 2016-05-09 11:46:57.869487178 +0000
@@ -16,7 +16,7 @@ use Fcntl 1.03;
use IO::Seekable; # For SEEK_*
use Errno;
@ -323,8 +323,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 2015-05-13 22:19:29.000000000 +0200
+++ ./cpan/Sys-Syslog/t/syslog.t 2015-06-10 11:41:25.385999390 +0200
--- ./cpan/Sys-Syslog/t/syslog.t.orig 2016-02-05 15:26:05.000000000 +0000
+++ ./cpan/Sys-Syslog/t/syslog.t 2016-05-09 11:46:57.869487178 +0000
@@ -220,6 +220,7 @@ SKIP: {
}
}
@ -333,9 +333,9 @@
ok( $r, "setlogsock() should return true: '$r'" );
}
--- ./cpan/libnet/lib/Net/Config.pm.orig 2015-05-13 22:19:29.000000000 +0200
+++ ./cpan/libnet/lib/Net/Config.pm 2015-06-10 11:41:25.386999399 +0200
@@ -47,7 +47,7 @@ our %NetConfig = (
--- ./cpan/libnet/lib/Net/Config.pm.orig 2016-03-01 12:33:02.000000000 +0000
+++ ./cpan/libnet/lib/Net/Config.pm 2016-05-09 11:46:57.869487178 +0000
@@ -48,7 +48,7 @@ our %NetConfig = (
{
## no critic (BuiltinFunctions::ProhibitStringyEval)
$^O eq 'MacOS' and eval <<TRY_INTERNET_CONFIG;
@ -344,8 +344,8 @@
{
my %nc = (
--- ./ext/DynaLoader/hints/linux.pl.orig 2015-05-13 22:19:29.000000000 +0200
+++ ./ext/DynaLoader/hints/linux.pl 2015-06-10 11:41:25.386999399 +0200
--- ./ext/DynaLoader/hints/linux.pl.orig 2015-10-14 13:17:06.000000000 +0000
+++ ./ext/DynaLoader/hints/linux.pl 2016-05-09 11:46:57.870487175 +0000
@@ -2,4 +2,7 @@
# Some Linux releases like to hide their <nlist.h>
$self->{CCFLAGS} = $Config{ccflags} . ' -I/usr/include/libelf'
@ -354,8 +354,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 2015-05-13 22:19:29.000000000 +0200
+++ ./ext/ODBM_File/Makefile.PL 2015-06-10 11:41:25.386999399 +0200
--- ./ext/ODBM_File/Makefile.PL.orig 2015-10-14 13:17:06.000000000 +0000
+++ ./ext/ODBM_File/Makefile.PL 2016-05-09 11:46:57.870487175 +0000
@@ -1,7 +1,7 @@
use ExtUtils::MakeMaker;
WriteMakefile(
@ -365,8 +365,8 @@
XSPROTOARG => '-noprototypes', # XXX remove later?
VERSION_FROM => 'ODBM_File.pm',
);
--- ./ext/ODBM_File/hints/linux.pl.orig 2015-05-13 22:19:29.000000000 +0200
+++ ./ext/ODBM_File/hints/linux.pl 2015-06-10 11:41:25.386999399 +0200
--- ./ext/ODBM_File/hints/linux.pl.orig 2015-10-14 13:17:06.000000000 +0000
+++ ./ext/ODBM_File/hints/linux.pl 2016-05-09 11:46:57.870487175 +0000
@@ -1,5 +1,5 @@
# uses GDBM dbm compatibility feature - at least on SuSE 8.0
-$self->{LIBS} = ['-lgdbm'];
@ -374,8 +374,8 @@
# Debian/Ubuntu have libgdbm_compat.so but not this file,
# so linking may fail
--- ./hints/linux.sh.orig 2015-05-13 22:19:29.000000000 +0200
+++ ./hints/linux.sh 2015-06-10 11:41:25.387999412 +0200
--- ./hints/linux.sh.orig 2016-03-01 12:33:02.000000000 +0000
+++ ./hints/linux.sh 2016-05-09 11:46:57.871487171 +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.
@ -474,10 +474,10 @@
;;
esac
EOCBU
--- ./installperl.orig 2015-05-13 22:19:29.000000000 +0200
+++ ./installperl 2015-06-10 11:41:25.387999412 +0200
@@ -704,7 +704,7 @@ sub installlib {
return if $name eq 'ExtUtils/XSSymSet.pm' and !$Is_VMS;
--- ./installperl.orig 2016-03-01 12:33:02.000000000 +0000
+++ ./installperl 2016-05-09 11:46:57.871487171 +0000
@@ -728,7 +728,7 @@ sub installlib {
return if $name eq 'ExtUtils/MakeMaker/version/regex.pm';
my $installlib = $installprivlib;
- if ($dir =~ /^auto\// ||
@ -485,9 +485,9 @@
($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) ||
($name =~ /^(.*)\.(?:h|lib)$/i && ($Is_W32 || $Is_NetWare)) ||
$name=~/^Config_(heavy|git)\.pl\z/
--- ./lib/perl5db.pl.orig 2015-05-13 22:19:30.000000000 +0200
+++ ./lib/perl5db.pl 2015-06-10 11:41:25.389999430 +0200
@@ -2343,6 +2343,8 @@ sub _DB__handle_run_command_in_pager_com
--- ./lib/perl5db.pl.orig 2016-04-26 22:11:09.000000000 +0000
+++ ./lib/perl5db.pl 2016-05-09 11:46:57.874487160 +0000
@@ -2356,6 +2356,8 @@ sub _DB__handle_run_command_in_pager_com
open( OUT, ">&STDOUT" ) # XXX: lost message
|| _db_warn("Can't restore DB::OUT");
}
@ -496,7 +496,7 @@
next CMD;
} ## end unless ($piped = open(OUT,...
@@ -2447,6 +2449,9 @@ sub _DB__at_end_of_every_command {
@@ -2460,6 +2462,9 @@ sub _DB__at_end_of_every_command {
$obj->selected("");
}
@ -506,8 +506,8 @@
# No pipes now.
$obj->piped("");
} ## end if ($piped)
--- ./utils/perlbug.PL.orig 2015-05-13 22:19:31.000000000 +0200
+++ ./utils/perlbug.PL 2015-06-10 11:41:25.390999437 +0200
--- ./utils/perlbug.PL.orig 2016-02-05 15:26:06.000000000 +0000
+++ ./utils/perlbug.PL 2016-05-09 11:46:57.875487157 +0000
@@ -1038,6 +1038,7 @@ sub _message_headers {
$headers{'Cc'} = $cc if ($cc);
$headers{'Message-Id'} = $messageid if ($messageid);

3
perl-5.24.0.tar.xz Normal file
View File

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

View File

@ -1,5 +1,5 @@
--- ./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
--- ./dist/Time-HiRes/t/alarm.t.orig 2016-03-01 12:33:02.000000000 +0000
+++ ./dist/Time-HiRes/t/alarm.t 2016-05-09 11:52:55.105232324 +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 2014-01-31 21:55:51.000000000 +0000
+++ ./cpan/Time-HiRes/t/clock.t 2014-06-02 14:43:54.672025619 +0000
--- ./dist/Time-HiRes/t/clock.t.orig 2016-03-01 12:33:02.000000000 +0000
+++ ./dist/Time-HiRes/t/clock.t 2016-05-09 11:52:55.106232324 +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 2014-01-31 21:55:51.000000000 +0000
+++ ./cpan/Time-HiRes/t/itimer.t 2014-06-02 14:43:54.673025616 +0000
--- ./dist/Time-HiRes/t/itimer.t.orig 2016-03-01 12:33:02.000000000 +0000
+++ ./dist/Time-HiRes/t/itimer.t 2016-05-09 11:52:55.106232324 +0000
@@ -28,7 +28,7 @@ BEGIN {
use Test::More 0.82 tests => 2;
use t::Watchdog;
@ -31,19 +31,8 @@
my $i = 3;
my $r = [Time::HiRes::gettimeofday()];
--- ./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 => 43;
use t::Watchdog;
-my $limit = 0.25; # 25% is acceptable slosh for testing timers
+my $limit = 0.60; # 25% is acceptable slosh for testing timers
my @atime;
my @mtime;
--- ./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
--- ./dist/Time-HiRes/t/usleep.t.orig 2016-03-01 12:33:02.000000000 +0000
+++ ./dist/Time-HiRes/t/usleep.t 2016-05-09 11:52:55.107232323 +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,6 +1,6 @@
--- ./cpan/libnet/lib/Net/Cmd.pm.orig 2009-09-03 14:32:13.000000000 +0000
+++ ./cpan/libnet/lib/Net/Cmd.pm 2009-09-03 14:47:30.000000000 +0000
@@ -254,6 +254,10 @@ sub command {
--- ./cpan/libnet/lib/Net/Cmd.pm.orig 2016-03-01 12:33:02.000000000 +0000
+++ ./cpan/libnet/lib/Net/Cmd.pm 2016-05-09 11:50:16.976787779 +0000
@@ -290,6 +290,10 @@ sub command {
$str = $cmd->toascii($str) if $tr;
$str .= "\015\012";
@ -8,10 +8,10 @@
+ # $str is a string (in internal UTF-8)
+ utf8::encode($str) if is_utf8($str);
+
my $len = length $str;
my $swlen;
$cmd->debug_print(1, $str)
if ($cmd->debug);
@@ -509,6 +512,10 @@ sub rawdatasend {
@@ -525,6 +529,10 @@ sub rawdatasend {
return 0
if $cmd->_is_closed;

View File

@ -21,16 +21,16 @@ Name: perl
Summary: The Perl interpreter
License: Artistic-1.0 or GPL-2.0+
Group: Development/Languages/Perl
Version: 5.22.1
Version: 5.24.0
Release: 0
%define pversion 5.22.1
%define pversion 5.24.0
Url: http://www.perl.org/
Source: http://www.cpan.org/src/5.0/perl-%{version}.tar.bz2
Source: http://www.cpan.org/src/5.0/perl-%{version}.tar.xz
Source1: %name-rpmlintrc
Source2: macros.perl
Source3: README.macros
Source4: baselibs.conf
Patch0: perl-5.22.0.dif
Patch0: perl-5.24.0.dif
Patch2: perl-regexp-refoverflow.diff
Patch3: perl-nroff.diff
Patch4: perl-netcmdutf8.diff
@ -48,6 +48,7 @@ BuildRequires: db-devel
BuildRequires: gdbm-devel
BuildRequires: libbz2-devel
BuildRequires: ncurses-devel
BuildRequires: xz
BuildRequires: zlib-devel
#Requires: gzip # needed in SuSEconfig.perl
Suggests: perl-doc = %version
@ -176,7 +177,7 @@ cp -p %{S:3} .
%patch4
%patch5
%patch6
%patch7 -p1
%patch7
%ifarch ppc ppc64
%patch8 -p1
%endif

View File

@ -1,7 +1,7 @@
Index: perl-5.18.0/cpan/Time-HiRes/t/itimer.t
Index: perl-5.18.0/dist/Time-HiRes/t/itimer.t
===================================================================
--- perl-5.18.0.orig/cpan/Time-HiRes/t/itimer.t
+++ perl-5.18.0/cpan/Time-HiRes/t/itimer.t
--- perl-5.18.0.orig/dist/Time-HiRes/t/itimer.t
+++ perl-5.18.0/dist/Time-HiRes/t/itimer.t
@@ -1,5 +1,7 @@
use strict;