# HG changeset patch # User Michael Schloh von Bennewitz # Date 1344531865 -7200 # Node ID 4d4d275a712a721bca2b3f73c10574e046e8f443 # Parent 7911e95d784763946d5dcac1d947607800484604 Resynchronize with upstream package maintainer version. diff -r 7911e95d7847 -r 4d4d275a712a perl/perl.patch --- a/perl/perl.patch Thu Aug 09 19:02:16 2012 +0200 +++ b/perl/perl.patch Thu Aug 09 19:04:25 2012 +0200 @@ -4,9 +4,9 @@ area is. Index: installperl ---- installperl.orig 2011-06-09 22:04:29.000000000 +0200 -+++ installperl 2011-06-17 15:20:48.000000000 +0200 -@@ -200,6 +200,8 @@ +--- installperl.orig 2012-04-25 02:18:34.000000000 +0200 ++++ installperl 2012-05-31 21:51:43.000000000 +0200 +@@ -196,6 +196,8 @@ my $installarchlib = "$opts{destdir}$Config{installarchlib}"; my $installsitelib = "$opts{destdir}$Config{installsitelib}"; my $installsitearch = "$opts{destdir}$Config{installsitearch}"; @@ -15,15 +15,15 @@ my $installman1dir = "$opts{destdir}$Config{installman1dir}"; my $man1ext = $Config{man1ext}; my $libperl = $Config{libperl}; -@@ -349,6 +351,8 @@ +@@ -347,6 +349,8 @@ mkpath($installarchlib, $opts{verbose}, 0777); mkpath($installsitelib, $opts{verbose}, 0777) if ($installsitelib); mkpath($installsitearch, $opts{verbose}, 0777) if ($installsitearch); +mkpath($installvendorlib, $opts{verbose}, 0777) if ($installvendorlib); +mkpath($installvendorarch, $opts{verbose}, 0777) if ($installvendorarch); - if (chdir "lib") { - $do_installarchlib = ! samepath($installarchlib, '.'); + if (-d 'lib') { + find({no_chdir => 1, wanted => \&installlib}, 'lib') ----------------------------------------------------------------------------- @@ -41,9 +41,30 @@ related to the non-standard "__private_extern__" attribute. Index: hints/darwin.sh ---- hints/darwin.sh.orig 2011-06-09 22:04:29.000000000 +0200 -+++ hints/darwin.sh 2011-06-17 15:20:48.000000000 +0200 -@@ -189,8 +189,7 @@ +--- hints/darwin.sh.orig 2012-02-20 20:48:38.000000000 +0100 ++++ hints/darwin.sh 2012-05-31 21:51:43.000000000 +0200 +@@ -181,6 +181,20 @@ + ldflags="${ldflags} -flat_namespace" + lddlflags="${ldflags} -bundle -undefined suppress" + ;; ++9.*) ++ lddlflags="${ldflags} -bundle -undefined dynamic_lookup" ++ case "$ld" in ++ *MACOSX_DEVELOPMENT_TARGET*) ;; ++ *) ld="env MACOSX_DEPLOYMENT_TARGET=10.5 ${ld}" ;; ++ esac ++ ;; ++10.*) ++ lddlflags="${ldflags} -bundle -undefined dynamic_lookup" ++ case "$ld" in ++ *MACOSX_DEVELOPMENT_TARGET*) ;; ++ *) ld="env MACOSX_DEPLOYMENT_TARGET=10.6 ${ld}" ;; ++ esac ++ ;; + *) + lddlflags="${ldflags} -bundle -undefined dynamic_lookup" + case "$ld" in +@@ -191,8 +205,7 @@ esac ldlibpthname='DYLD_LIBRARY_PATH'; @@ -53,9 +74,16 @@ cat > UU/archname.cbu <<'EOCBU' # This script UU/archname.cbu will get 'called-back' by Configure +@@ -326,3 +339,6 @@ + # makefile in the same place. Since Darwin uses GNU make, this dodges + # the problem. + firstmakefile=GNUmakefile; ++ ++usenm='false' ++ Index: ext/DynaLoader/dl_dyld.xs ---- ext/DynaLoader/dl_dyld.xs.orig 2011-04-13 13:36:34.000000000 +0200 -+++ ext/DynaLoader/dl_dyld.xs 2011-06-17 15:20:48.000000000 +0200 +--- ext/DynaLoader/dl_dyld.xs.orig 2012-02-15 05:44:47.000000000 +0100 ++++ ext/DynaLoader/dl_dyld.xs 2012-05-31 21:51:43.000000000 +0200 @@ -47,7 +47,13 @@ #undef environ @@ -70,24 +98,6 @@ static char *dlerror() { -Index: perlio.c ---- perlio.c.orig 2011-06-09 22:04:29.000000000 +0200 -+++ perlio.c 2011-06-17 15:20:48.000000000 +0200 -@@ -476,7 +476,14 @@ - #include - #endif - #ifdef HAS_MMAP -+#ifdef PERL_DARWIN -+#define environ_safe environ -+#undef environ - #include -+#define environ environ_safe -+#else -+#include -+#endif - #endif - - void ----------------------------------------------------------------------------- @@ -100,8 +110,8 @@ it works at all. Index: hints/dec_osf.sh ---- hints/dec_osf.sh.orig 2011-06-17 02:06:09.000000000 +0200 -+++ hints/dec_osf.sh 2011-06-17 15:20:48.000000000 +0200 +--- hints/dec_osf.sh.orig 2012-04-25 02:18:34.000000000 +0200 ++++ hints/dec_osf.sh 2012-05-31 21:51:43.000000000 +0200 @@ -73,15 +73,6 @@ *) if $test "X$optimize" = "X$undef"; then lddlflags="$lddlflags -msym" @@ -124,9 +134,9 @@ Linker flag change for Solaris. Index: Configure ---- Configure.orig 2011-06-09 22:04:29.000000000 +0200 -+++ Configure 2011-06-17 15:20:48.000000000 +0200 -@@ -8078,9 +8058,9 @@ +--- Configure.orig 2012-04-25 02:18:30.000000000 +0200 ++++ Configure 2012-05-31 21:51:44.000000000 +0200 +@@ -8014,9 +7994,9 @@ ;; linux|irix*|gnu*) dflt="-shared $optimize" ;; next) dflt='none' ;; @@ -144,9 +154,9 @@ Security Fix (CVE-2005-3962, OpenPKG-SA-2005.025-perl) Index: sv.c ---- sv.c.orig 2011-06-17 02:06:09.000000000 +0200 -+++ sv.c 2011-06-17 15:20:48.000000000 +0200 -@@ -10198,7 +10198,10 @@ +--- sv.c.orig 2012-04-25 02:18:35.000000000 +0200 ++++ sv.c 2012-05-31 21:51:44.000000000 +0200 +@@ -10283,7 +10283,10 @@ if ( (width = expect_number(&q)) ) { if (*q == '$') { ++q; @@ -164,9 +174,9 @@ Do not use -fstack-protector as it causes too much portability issues. Index: Configure ---- Configure.orig 2011-06-09 22:04:29.000000000 +0200 -+++ Configure 2011-06-17 15:20:48.000000000 +0200 -@@ -5158,17 +5158,6 @@ +--- Configure.orig 2012-04-25 02:18:30.000000000 +0200 ++++ Configure 2012-05-31 21:51:44.000000000 +0200 +@@ -5103,17 +5103,6 @@ ;; esac @@ -184,7 +194,7 @@ ;; esac -@@ -5307,15 +5296,6 @@ +@@ -5252,15 +5241,6 @@ ;; *) dflt="$ldflags";; esac @@ -200,7 +210,7 @@ : Try to guess additional flags to pick up local libraries. for thislibdir in $libpth; do -@@ -8107,14 +8087,6 @@ +@@ -8043,14 +8023,6 @@ ''|' ') dflt='none' ;; esac @@ -221,9 +231,9 @@ Make sure we install into /lib/perl/ and not /lib/perl5/ Index: Configure ---- Configure.orig 2009-08-24 18:33:49 +0200 -+++ Configure 2009-08-24 18:44:39 +0200 -@@ -1769,7 +1769,7 @@ +--- Configure.orig 2012-04-25 02:18:30.000000000 +0200 ++++ Configure 2012-05-31 21:51:44.000000000 +0200 +@@ -1778,7 +1778,7 @@ touch posthint.sh : set package name @@ -241,8 +251,8 @@ users to overwrite files via a symlink attack on temporary files. Index: cpan/CGI/lib/CGI/Cookie.pm ---- cpan/CGI/lib/CGI/Cookie.pm.orig 2011-06-09 22:04:29.000000000 +0200 -+++ cpan/CGI/lib/CGI/Cookie.pm 2011-06-17 15:22:59.000000000 +0200 +--- cpan/CGI/lib/CGI/Cookie.pm.orig 2012-02-15 05:44:36.000000000 +0100 ++++ cpan/CGI/lib/CGI/Cookie.pm 2012-05-31 21:51:44.000000000 +0200 @@ -464,7 +464,7 @@ You may also retrieve cookies that were stored in some external form using the parse() class method: @@ -252,18 +262,6 @@ %cookies = CGI::Cookie->parse($COOKIES); If you are in a mod_perl environment, you can save some overhead by -Index: cpan/Shell/Shell.pm ---- cpan/Shell/Shell.pm.orig 2011-06-17 02:06:09.000000000 +0200 -+++ cpan/Shell/Shell.pm 2011-06-17 15:20:48.000000000 +0200 -@@ -153,7 +153,7 @@ - use Shell qw(cat ps cp); - $passwd = cat('new; ----------------------------------------------------------------------------- @@ -271,9 +269,9 @@ because it also needs libgdbm (which Perl doesn't pick up, too) Index: hints/linux.sh ---- hints/linux.sh.orig 2011-06-09 22:04:29.000000000 +0200 -+++ hints/linux.sh 2011-06-17 15:20:48.000000000 +0200 -@@ -55,7 +55,9 @@ +--- hints/linux.sh.orig 2012-05-14 21:49:22.000000000 +0200 ++++ hints/linux.sh 2012-05-31 21:51:44.000000000 +0200 +@@ -58,7 +58,9 @@ libswanted="$*" # Debian 4.0 puts ndbm in the -lgdbm_compat library. diff -r 7911e95d7847 -r 4d4d275a712a perl/perl.spec --- a/perl/perl.spec Thu Aug 09 19:02:16 2012 +0200 +++ b/perl/perl.spec Thu Aug 09 19:04:25 2012 +0200 @@ -1,6 +1,6 @@ ## ## perl.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2011 OpenPKG Foundation e.V. +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -31,20 +31,16 @@ Class: CORE Group: Perl License: GPL/Artistic -Version: 5.14.1 -Release: 20110914 +Version: 5.16.0 +Release: 20120712 # list of sources Source0: http://www.cpan.org/src/perl-%{version}.tar.gz Patch0: perl.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20060823, gcc -PreReq: OpenPKG, openpkg >= 20060823 -AutoReq: no -AutoReqProv: no +BuildPreReq: OpenPKG, openpkg >= 20100101, gcc +PreReq: OpenPKG, openpkg >= 20100101 %description Perl ("Practical Reporting and Extraction Language") is a very @@ -119,8 +115,6 @@ %{l_make} %{l_mflags} -f Makefile %install - # remove build cruft - rm -rf $RPM_BUILD_ROOT # install the Perl package via standard procedure %{l_make} %{l_mflags} -f Makefile install DESTDIR=$RPM_BUILD_ROOT @@ -201,18 +195,23 @@ # resolve file conflicts (with perl-sys) rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/ptar \ $RPM_BUILD_ROOT%{l_prefix}/bin/ptardiff \ + $RPM_BUILD_ROOT%{l_prefix}/bin/ptargrep \ $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptar.1 \ - $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptardiff.1 + $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptardiff.1 \ + $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptargrep.1 # resolve file conflicts (with perl-crypto) rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/shasum \ $RPM_BUILD_ROOT%{l_prefix}/man/man1/shasum.1 + # resolve file conflicts (with perl-comp) + rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/zipdetails \ + $RPM_BUILD_ROOT%{l_prefix}/man/man1/zipdetails.1 + # determine installed files %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} %files -f files %clean - rm -rf $RPM_BUILD_ROOT