changeset
Resynchronize with upstream package maintainer version.
Thu, 09 Aug 2012 19:04:25 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 09 Aug 2012 19:04:25 +0200
- changeset 501
- 4d4d275a712a
- parent 500
- 7911e95d7847
- child 502
- 0bdbde429f77
Resynchronize with upstream package maintainer version.
| perl/perl.patch | file | annotate | diff | comparison | revisions | |
| perl/perl.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/perl/perl.patch Thu Aug 09 19:02:16 2012 +0200 1.2 +++ b/perl/perl.patch Thu Aug 09 19:04:25 2012 +0200 1.3 @@ -4,9 +4,9 @@ 1.4 area is. 1.5 1.6 Index: installperl 1.7 ---- installperl.orig 2011-06-09 22:04:29.000000000 +0200 1.8 -+++ installperl 2011-06-17 15:20:48.000000000 +0200 1.9 -@@ -200,6 +200,8 @@ 1.10 +--- installperl.orig 2012-04-25 02:18:34.000000000 +0200 1.11 ++++ installperl 2012-05-31 21:51:43.000000000 +0200 1.12 +@@ -196,6 +196,8 @@ 1.13 my $installarchlib = "$opts{destdir}$Config{installarchlib}"; 1.14 my $installsitelib = "$opts{destdir}$Config{installsitelib}"; 1.15 my $installsitearch = "$opts{destdir}$Config{installsitearch}"; 1.16 @@ -15,15 +15,15 @@ 1.17 my $installman1dir = "$opts{destdir}$Config{installman1dir}"; 1.18 my $man1ext = $Config{man1ext}; 1.19 my $libperl = $Config{libperl}; 1.20 -@@ -349,6 +351,8 @@ 1.21 +@@ -347,6 +349,8 @@ 1.22 mkpath($installarchlib, $opts{verbose}, 0777); 1.23 mkpath($installsitelib, $opts{verbose}, 0777) if ($installsitelib); 1.24 mkpath($installsitearch, $opts{verbose}, 0777) if ($installsitearch); 1.25 +mkpath($installvendorlib, $opts{verbose}, 0777) if ($installvendorlib); 1.26 +mkpath($installvendorarch, $opts{verbose}, 0777) if ($installvendorarch); 1.27 1.28 - if (chdir "lib") { 1.29 - $do_installarchlib = ! samepath($installarchlib, '.'); 1.30 + if (-d 'lib') { 1.31 + find({no_chdir => 1, wanted => \&installlib}, 'lib') 1.32 1.33 ----------------------------------------------------------------------------- 1.34 1.35 @@ -41,9 +41,30 @@ 1.36 related to the non-standard "__private_extern__" attribute. 1.37 1.38 Index: hints/darwin.sh 1.39 ---- hints/darwin.sh.orig 2011-06-09 22:04:29.000000000 +0200 1.40 -+++ hints/darwin.sh 2011-06-17 15:20:48.000000000 +0200 1.41 -@@ -189,8 +189,7 @@ 1.42 +--- hints/darwin.sh.orig 2012-02-20 20:48:38.000000000 +0100 1.43 ++++ hints/darwin.sh 2012-05-31 21:51:43.000000000 +0200 1.44 +@@ -181,6 +181,20 @@ 1.45 + ldflags="${ldflags} -flat_namespace" 1.46 + lddlflags="${ldflags} -bundle -undefined suppress" 1.47 + ;; 1.48 ++9.*) 1.49 ++ lddlflags="${ldflags} -bundle -undefined dynamic_lookup" 1.50 ++ case "$ld" in 1.51 ++ *MACOSX_DEVELOPMENT_TARGET*) ;; 1.52 ++ *) ld="env MACOSX_DEPLOYMENT_TARGET=10.5 ${ld}" ;; 1.53 ++ esac 1.54 ++ ;; 1.55 ++10.*) 1.56 ++ lddlflags="${ldflags} -bundle -undefined dynamic_lookup" 1.57 ++ case "$ld" in 1.58 ++ *MACOSX_DEVELOPMENT_TARGET*) ;; 1.59 ++ *) ld="env MACOSX_DEPLOYMENT_TARGET=10.6 ${ld}" ;; 1.60 ++ esac 1.61 ++ ;; 1.62 + *) 1.63 + lddlflags="${ldflags} -bundle -undefined dynamic_lookup" 1.64 + case "$ld" in 1.65 +@@ -191,8 +205,7 @@ 1.66 esac 1.67 ldlibpthname='DYLD_LIBRARY_PATH'; 1.68 1.69 @@ -53,9 +74,16 @@ 1.70 1.71 cat > UU/archname.cbu <<'EOCBU' 1.72 # This script UU/archname.cbu will get 'called-back' by Configure 1.73 +@@ -326,3 +339,6 @@ 1.74 + # makefile in the same place. Since Darwin uses GNU make, this dodges 1.75 + # the problem. 1.76 + firstmakefile=GNUmakefile; 1.77 ++ 1.78 ++usenm='false' 1.79 ++ 1.80 Index: ext/DynaLoader/dl_dyld.xs 1.81 ---- ext/DynaLoader/dl_dyld.xs.orig 2011-04-13 13:36:34.000000000 +0200 1.82 -+++ ext/DynaLoader/dl_dyld.xs 2011-06-17 15:20:48.000000000 +0200 1.83 +--- ext/DynaLoader/dl_dyld.xs.orig 2012-02-15 05:44:47.000000000 +0100 1.84 ++++ ext/DynaLoader/dl_dyld.xs 2012-05-31 21:51:43.000000000 +0200 1.85 @@ -47,7 +47,13 @@ 1.86 1.87 #undef environ 1.88 @@ -70,24 +98,6 @@ 1.89 1.90 static char *dlerror() 1.91 { 1.92 -Index: perlio.c 1.93 ---- perlio.c.orig 2011-06-09 22:04:29.000000000 +0200 1.94 -+++ perlio.c 2011-06-17 15:20:48.000000000 +0200 1.95 -@@ -476,7 +476,14 @@ 1.96 - #include <unistd.h> 1.97 - #endif 1.98 - #ifdef HAS_MMAP 1.99 -+#ifdef PERL_DARWIN 1.100 -+#define environ_safe environ 1.101 -+#undef environ 1.102 - #include <sys/mman.h> 1.103 -+#define environ environ_safe 1.104 -+#else 1.105 -+#include <sys/mman.h> 1.106 -+#endif 1.107 - #endif 1.108 - 1.109 - void 1.110 1.111 ----------------------------------------------------------------------------- 1.112 1.113 @@ -100,8 +110,8 @@ 1.114 it works at all. 1.115 1.116 Index: hints/dec_osf.sh 1.117 ---- hints/dec_osf.sh.orig 2011-06-17 02:06:09.000000000 +0200 1.118 -+++ hints/dec_osf.sh 2011-06-17 15:20:48.000000000 +0200 1.119 +--- hints/dec_osf.sh.orig 2012-04-25 02:18:34.000000000 +0200 1.120 ++++ hints/dec_osf.sh 2012-05-31 21:51:43.000000000 +0200 1.121 @@ -73,15 +73,6 @@ 1.122 *) if $test "X$optimize" = "X$undef"; then 1.123 lddlflags="$lddlflags -msym" 1.124 @@ -124,9 +134,9 @@ 1.125 Linker flag change for Solaris. 1.126 1.127 Index: Configure 1.128 ---- Configure.orig 2011-06-09 22:04:29.000000000 +0200 1.129 -+++ Configure 2011-06-17 15:20:48.000000000 +0200 1.130 -@@ -8078,9 +8058,9 @@ 1.131 +--- Configure.orig 2012-04-25 02:18:30.000000000 +0200 1.132 ++++ Configure 2012-05-31 21:51:44.000000000 +0200 1.133 +@@ -8014,9 +7994,9 @@ 1.134 ;; 1.135 linux|irix*|gnu*) dflt="-shared $optimize" ;; 1.136 next) dflt='none' ;; 1.137 @@ -144,9 +154,9 @@ 1.138 Security Fix (CVE-2005-3962, OpenPKG-SA-2005.025-perl) 1.139 1.140 Index: sv.c 1.141 ---- sv.c.orig 2011-06-17 02:06:09.000000000 +0200 1.142 -+++ sv.c 2011-06-17 15:20:48.000000000 +0200 1.143 -@@ -10198,7 +10198,10 @@ 1.144 +--- sv.c.orig 2012-04-25 02:18:35.000000000 +0200 1.145 ++++ sv.c 2012-05-31 21:51:44.000000000 +0200 1.146 +@@ -10283,7 +10283,10 @@ 1.147 if ( (width = expect_number(&q)) ) { 1.148 if (*q == '$') { 1.149 ++q; 1.150 @@ -164,9 +174,9 @@ 1.151 Do not use -fstack-protector as it causes too much portability issues. 1.152 1.153 Index: Configure 1.154 ---- Configure.orig 2011-06-09 22:04:29.000000000 +0200 1.155 -+++ Configure 2011-06-17 15:20:48.000000000 +0200 1.156 -@@ -5158,17 +5158,6 @@ 1.157 +--- Configure.orig 2012-04-25 02:18:30.000000000 +0200 1.158 ++++ Configure 2012-05-31 21:51:44.000000000 +0200 1.159 +@@ -5103,17 +5103,6 @@ 1.160 ;; 1.161 esac 1.162 1.163 @@ -184,7 +194,7 @@ 1.164 ;; 1.165 esac 1.166 1.167 -@@ -5307,15 +5296,6 @@ 1.168 +@@ -5252,15 +5241,6 @@ 1.169 ;; 1.170 *) dflt="$ldflags";; 1.171 esac 1.172 @@ -200,7 +210,7 @@ 1.173 1.174 : Try to guess additional flags to pick up local libraries. 1.175 for thislibdir in $libpth; do 1.176 -@@ -8107,14 +8087,6 @@ 1.177 +@@ -8043,14 +8023,6 @@ 1.178 ''|' ') dflt='none' ;; 1.179 esac 1.180 1.181 @@ -221,9 +231,9 @@ 1.182 Make sure we install into <prefix>/lib/perl/ and not <prefix>/lib/perl5/ 1.183 1.184 Index: Configure 1.185 ---- Configure.orig 2009-08-24 18:33:49 +0200 1.186 -+++ Configure 2009-08-24 18:44:39 +0200 1.187 -@@ -1769,7 +1769,7 @@ 1.188 +--- Configure.orig 2012-04-25 02:18:30.000000000 +0200 1.189 ++++ Configure 2012-05-31 21:51:44.000000000 +0200 1.190 +@@ -1778,7 +1778,7 @@ 1.191 touch posthint.sh 1.192 1.193 : set package name 1.194 @@ -241,8 +251,8 @@ 1.195 users to overwrite files via a symlink attack on temporary files. 1.196 1.197 Index: cpan/CGI/lib/CGI/Cookie.pm 1.198 ---- cpan/CGI/lib/CGI/Cookie.pm.orig 2011-06-09 22:04:29.000000000 +0200 1.199 -+++ cpan/CGI/lib/CGI/Cookie.pm 2011-06-17 15:22:59.000000000 +0200 1.200 +--- cpan/CGI/lib/CGI/Cookie.pm.orig 2012-02-15 05:44:36.000000000 +0100 1.201 ++++ cpan/CGI/lib/CGI/Cookie.pm 2012-05-31 21:51:44.000000000 +0200 1.202 @@ -464,7 +464,7 @@ 1.203 You may also retrieve cookies that were stored in some external 1.204 form using the parse() class method: 1.205 @@ -252,18 +262,6 @@ 1.206 %cookies = CGI::Cookie->parse($COOKIES); 1.207 1.208 If you are in a mod_perl environment, you can save some overhead by 1.209 -Index: cpan/Shell/Shell.pm 1.210 ---- cpan/Shell/Shell.pm.orig 2011-06-17 02:06:09.000000000 +0200 1.211 -+++ cpan/Shell/Shell.pm 2011-06-17 15:20:48.000000000 +0200 1.212 -@@ -153,7 +153,7 @@ 1.213 - use Shell qw(cat ps cp); 1.214 - $passwd = cat('</etc/passwd'); 1.215 - @pslines = ps('-ww'), 1.216 -- cp("/etc/passwd", "/tmp/passwd"); 1.217 -+ cp("/etc/passwd", "/etc/passwd.orig"); 1.218 - 1.219 - # object oriented 1.220 - my $sh = Shell->new; 1.221 1.222 ----------------------------------------------------------------------------- 1.223 1.224 @@ -271,9 +269,9 @@ 1.225 because it also needs libgdbm (which Perl doesn't pick up, too) 1.226 1.227 Index: hints/linux.sh 1.228 ---- hints/linux.sh.orig 2011-06-09 22:04:29.000000000 +0200 1.229 -+++ hints/linux.sh 2011-06-17 15:20:48.000000000 +0200 1.230 -@@ -55,7 +55,9 @@ 1.231 +--- hints/linux.sh.orig 2012-05-14 21:49:22.000000000 +0200 1.232 ++++ hints/linux.sh 2012-05-31 21:51:44.000000000 +0200 1.233 +@@ -58,7 +58,9 @@ 1.234 libswanted="$*" 1.235 1.236 # Debian 4.0 puts ndbm in the -lgdbm_compat library.
2.1 --- a/perl/perl.spec Thu Aug 09 19:02:16 2012 +0200 2.2 +++ b/perl/perl.spec Thu Aug 09 19:04:25 2012 +0200 2.3 @@ -1,6 +1,6 @@ 2.4 ## 2.5 ## perl.spec -- OpenPKG RPM Package Specification 2.6 -## Copyright (c) 2000-2011 OpenPKG Foundation e.V. <http://openpkg.net/> 2.7 +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/> 2.8 ## 2.9 ## Permission to use, copy, modify, and distribute this software for 2.10 ## any purpose with or without fee is hereby granted, provided that 2.11 @@ -31,20 +31,16 @@ 2.12 Class: CORE 2.13 Group: Perl 2.14 License: GPL/Artistic 2.15 -Version: 5.14.1 2.16 -Release: 20110914 2.17 +Version: 5.16.0 2.18 +Release: 20120712 2.19 2.20 # list of sources 2.21 Source0: http://www.cpan.org/src/perl-%{version}.tar.gz 2.22 Patch0: perl.patch 2.23 2.24 # build information 2.25 -Prefix: %{l_prefix} 2.26 -BuildRoot: %{l_buildroot} 2.27 -BuildPreReq: OpenPKG, openpkg >= 20060823, gcc 2.28 -PreReq: OpenPKG, openpkg >= 20060823 2.29 -AutoReq: no 2.30 -AutoReqProv: no 2.31 +BuildPreReq: OpenPKG, openpkg >= 20100101, gcc 2.32 +PreReq: OpenPKG, openpkg >= 20100101 2.33 2.34 %description 2.35 Perl ("Practical Reporting and Extraction Language") is a very 2.36 @@ -119,8 +115,6 @@ 2.37 %{l_make} %{l_mflags} -f Makefile 2.38 2.39 %install 2.40 - # remove build cruft 2.41 - rm -rf $RPM_BUILD_ROOT 2.42 2.43 # install the Perl package via standard procedure 2.44 %{l_make} %{l_mflags} -f Makefile install DESTDIR=$RPM_BUILD_ROOT 2.45 @@ -201,18 +195,23 @@ 2.46 # resolve file conflicts (with perl-sys) 2.47 rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/ptar \ 2.48 $RPM_BUILD_ROOT%{l_prefix}/bin/ptardiff \ 2.49 + $RPM_BUILD_ROOT%{l_prefix}/bin/ptargrep \ 2.50 $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptar.1 \ 2.51 - $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptardiff.1 2.52 + $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptardiff.1 \ 2.53 + $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptargrep.1 2.54 2.55 # resolve file conflicts (with perl-crypto) 2.56 rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/shasum \ 2.57 $RPM_BUILD_ROOT%{l_prefix}/man/man1/shasum.1 2.58 2.59 + # resolve file conflicts (with perl-comp) 2.60 + rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/zipdetails \ 2.61 + $RPM_BUILD_ROOT%{l_prefix}/man/man1/zipdetails.1 2.62 + 2.63 # determine installed files 2.64 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} 2.65 2.66 %files -f files 2.67 2.68 %clean 2.69 - rm -rf $RPM_BUILD_ROOT 2.70
