OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 24-Aug-2009 19:26:31
Branch: HEAD Handle: 2009082418263100
Modified files:
openpkg-src/perl perl.patch perl.spec
Log:
upgrading package: perl 5.10.0 -> 5.10.1
Summary:
Revision Changes Path
1.28 +123 -64 openpkg-src/perl/perl.patch
1.132 +2 -2 openpkg-src/perl/perl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl/perl.patch
============================================================================
$ cvs diff -u -r1.27 -r1.28 perl.patch
--- openpkg-src/perl/perl.patch 25 Dec 2008 18:04:40 -0000 1.27
+++ openpkg-src/perl/perl.patch 24 Aug 2009 17:26:31 -0000 1.28
@@ -4,23 +4,23 @@
area is.
Index: installperl
---- installperl.orig 2007-12-18 11:47:07 +0100
-+++ installperl 2008-03-28 15:23:47 +0100
-@@ -211,6 +211,8 @@
- my $installarchlib = "$destdir$Config{installarchlib}";
- my $installsitelib = "$destdir$Config{installsitelib}";
- my $installsitearch = "$destdir$Config{installsitearch}";
-+my $installvendorlib = "$destdir$Config{installvendorlib}";
-+my $installvendorarch = "$destdir$Config{installvendorarch}";
- my $installman1dir = "$destdir$Config{installman1dir}";
+--- installperl.orig 2009-08-14 00:40:10 +0200
++++ installperl 2009-08-24 09:37:51 +0200
+@@ -197,6 +197,8 @@
+ my $installarchlib = "$opts{destdir}$Config{installarchlib}";
+ my $installsitelib = "$opts{destdir}$Config{installsitelib}";
+ my $installsitearch = "$opts{destdir}$Config{installsitearch}";
++my $installvendorlib = "$opts{destdir}$Config{installvendorlib}";
++my $installvendorarch = "$opts{destdir}$Config{installvendorarch}";
+ my $installman1dir = "$opts{destdir}$Config{installman1dir}";
my $man1ext = $Config{man1ext};
my $libperl = $Config{libperl};
-@@ -372,6 +374,8 @@
- mkpath($installarchlib, $verbose, 0777);
- mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
- mkpath($installsitearch, $verbose, 0777) if ($installsitearch);
-+mkpath($installvendorlib, $verbose, 0777) if ($installvendorlib);
-+mkpath($installvendorarch, $verbose, 0777) if ($installvendorarch);
+@@ -356,6 +358,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, '.');
@@ -36,9 +36,9 @@
PERL[5]LIB, site, vendor, perl, other".
Index: perl.c
---- perl.c.orig 2007-12-18 11:47:08 +0100
-+++ perl.c 2008-03-28 15:23:47 +0100
-@@ -4753,39 +4753,6 @@
+--- perl.c.orig 2009-04-22 20:07:41 +0200
++++ perl.c 2009-08-24 09:36:28 +0200
+@@ -4879,39 +4879,6 @@
incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
#endif
@@ -78,7 +78,7 @@
#ifdef SITEARCH_EXP
/* sitearch is always relative to sitelib on Windows for
* DLL-based path intuition to work correctly */
-@@ -4828,6 +4795,39 @@
+@@ -4954,6 +4921,39 @@
incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
#endif
@@ -135,8 +135,8 @@
related to the non-standard "__private_extern__" attribute.
Index: hints/darwin.sh
---- hints/darwin.sh.orig 2007-12-18 11:47:07 +0100
-+++ hints/darwin.sh 2008-03-28 15:23:47 +0100
+--- hints/darwin.sh.orig 2009-04-14 20:38:15 +0200
++++ hints/darwin.sh 2009-08-24 09:36:28 +0200
@@ -120,9 +120,6 @@
*-2147483648) ccflags="${ccflags} -DINT32_MIN_BROKEN -DINT64_MIN_BROKEN"
;;
esac
@@ -157,10 +157,27 @@
cat > UU/archname.cbu <<'EOCBU'
# This script UU/archname.cbu will get 'called-back' by Configure
+Index: ext/DynaLoader/dl_dyld.xs
+--- ext/DynaLoader/dl_dyld.xs.orig 2009-04-15 22:51:42 +0200
++++ ext/DynaLoader/dl_dyld.xs 2009-08-24 09:36:28 +0200
+@@ -47,7 +47,13 @@
+
+ #undef environ
+ #undef bool
++#ifdef PERL_DARWIN
++#define __private_extern__ extern
++#include <mach-o/dyld.h>
++#undef __private_extern__
++#else
+ #import <mach-o/dyld.h>
++#endif
+
+ static char *dlerror()
+ {
Index: perlio.c
---- perlio.c.orig 2007-12-18 11:47:08 +0100
-+++ perlio.c 2008-03-28 15:23:47 +0100
-@@ -472,7 +472,14 @@
+--- perlio.c.orig 2009-04-15 01:47:25 +0200
++++ perlio.c 2009-08-24 09:36:28 +0200
+@@ -474,7 +474,14 @@
#include <unistd.h>
#endif
#ifdef HAS_MMAP
@@ -175,23 +192,6 @@
#endif
void
-Index: ext/DynaLoader/dl_dyld.xs
---- ext/DynaLoader/dl_dyld.xs.orig 2007-12-18 11:47:07 +0100
-+++ ext/DynaLoader/dl_dyld.xs 2008-03-28 15:23:47 +0100
-@@ -45,7 +45,13 @@
-
- #undef environ
- #undef bool
-+#ifdef PERL_DARWIN
-+#define __private_extern__ extern
-+#include <mach-o/dyld.h>
-+#undef __private_extern__
-+#else
- #import <mach-o/dyld.h>
-+#endif
-
- static char *dlerror()
- {
-----------------------------------------------------------------------------
@@ -204,8 +204,8 @@
it works at all.
Index: hints/dec_osf.sh
---- hints/dec_osf.sh.orig 2007-12-18 11:47:07 +0100
-+++ hints/dec_osf.sh 2008-03-28 15:23:47 +0100
+--- hints/dec_osf.sh.orig 2009-02-12 23:58:12 +0100
++++ hints/dec_osf.sh 2009-08-24 09:36:28 +0200
@@ -73,15 +73,6 @@
*) if $test "X$optimize" = "X$undef"; then
lddlflags="$lddlflags -msym"
@@ -231,8 +231,8 @@
users to overwrite files via a symlink attack on temporary files.
Index: lib/CGI/Cookie.pm
---- lib/CGI/Cookie.pm.orig 2007-12-18 11:47:07 +0100
-+++ lib/CGI/Cookie.pm 2008-03-28 15:23:47 +0100
+--- lib/CGI/Cookie.pm.orig 2009-02-12 23:58:12 +0100
++++ lib/CGI/Cookie.pm 2009-08-24 09:36:28 +0200
@@ -470,7 +470,7 @@
You may also retrieve cookies that were stored in some external
form using the parse() class method:
@@ -243,8 +243,8 @@
If you are in a mod_perl environment, you can save some overhead by
Index: lib/Shell.pm
---- lib/Shell.pm.orig 2007-12-18 11:47:07 +0100
-+++ lib/Shell.pm 2008-03-28 15:23:47 +0100
+--- lib/Shell.pm.orig 2009-02-12 23:58:16 +0100
++++ lib/Shell.pm 2009-08-24 09:36:28 +0200
@@ -151,7 +151,7 @@
use Shell qw(cat ps cp);
$passwd = cat('</etc/passwd');
@@ -257,10 +257,12 @@
-----------------------------------------------------------------------------
+Linker flag change for Solaris.
+
Index: Configure
---- Configure.orig 2007-12-18 11:47:07 +0100
-+++ Configure 2008-03-28 15:23:47 +0100
-@@ -7871,7 +7871,7 @@
+--- Configure.orig 2009-08-18 21:03:53 +0200
++++ Configure 2009-08-24 09:36:28 +0200
+@@ -8056,7 +8056,7 @@
;;
linux|irix*|gnu*) dflt="-shared $optimize" ;;
next) dflt='none' ;;
@@ -275,9 +277,9 @@
Security Fix (CVE-2005-3962, OpenPKG-SA-2005.025-perl)
Index: sv.c
---- sv.c.orig 2007-12-18 11:47:08 +0100
-+++ sv.c 2008-03-28 15:23:47 +0100
-@@ -8667,7 +8667,10 @@
+--- sv.c.orig 2009-08-05 16:48:19 +0200
++++ sv.c 2009-08-24 09:36:28 +0200
+@@ -9163,7 +9163,10 @@
if ( (width = expect_number(&q)) ) {
if (*q == '$') {
++q;
@@ -292,18 +294,75 @@
-----------------------------------------------------------------------------
-Detect NetBSD 5.x as well
+Do not use -fstack-protector as it causes too much portability issues.
-Index: hints/netbsd.sh
---- hints/netbsd.sh.orig 2007-12-18 11:47:07.000000000 +0100
-+++ hints/netbsd.sh 2008-12-24 10:51:08.000000000 +0100
-@@ -79,7 +79,7 @@
+Index: Configure
+--- Configure.orig 2009-08-24 09:42:33 +0200
++++ Configure 2009-08-24 13:01:27 +0200
+@@ -5140,17 +5140,6 @@
+ ;;
+ esac
+
+- # on x86_64 (at least) we require an extra library (libssp) in the
+- # link command line. This library is not named, so I infer that it is
+- # an implementation detail that may change. Hence the safest approach
+- # is to add the flag to the flags passed to the compiler at link time,
+- # as that way the compiler can do the right implementation dependant
+- # thing. (NWC)
+- case "$gccversion" in
+- ?*) set stack-protector -fstack-protector
+- eval $checkccflag
+- ;;
+- esac
;;
esac
- case "$osvers" in
--0.9*|1.*|2.*|3.*|4.*)
-+0.9*|1.*|2.*|3.*|4.*|5.*)
- d_getprotoent_r="$undef"
- d_getprotobyname_r="$undef"
- d_getprotobynumber_r="$undef"
+
+@@ -5289,15 +5278,6 @@
+ ;;
+ *) dflt="$ldflags";;
+ esac
+-# See note above about -fstack-protector
+-case "$ccflags" in
+-*-fstack-protector*)
+- case "$dflt" in
+- *-fstack-protector*) ;; # Don't add it again
+- *) dflt="$dflt -fstack-protector" ;;
+- esac
+- ;;
+-esac
+
+ : Try to guess additional flags to pick up local libraries.
+ for thislibdir in $libpth; do
+@@ -8085,14 +8065,6 @@
+ ''|' ') dflt='none' ;;
+ esac
+
+- case "$ldflags" in
+- *-fstack-protector*)
+- case "$dflt" in
+- *-fstack-protector*) ;; # Don't add it again
+- *) dflt="$dflt -fstack-protector" ;;
+- esac
+- ;;
+- esac
+
+
+ rp="Any special flags to pass to $ld to create a dynamically loaded
library?"
+
+-----------------------------------------------------------------------------
+
+Make sure we install into <prefix>/lib/perl/ and not <prefix>/lib/perl5/
+
+Index: Configure
+--- Configure.orig 2009-08-24 18:33:49 +0200
++++ Configure 2009-08-24 18:44:39 +0200
+@@ -1756,7 +1756,7 @@
+ touch posthint.sh
+
+ : set package name
+-package='perl5'
++package='perl'
+ first=`echo $package | sed -e 's/^\(.\).*/\1/'`
+ last=`echo $package | sed -e 's/^.\(.*\)/\1/'`
+ case "`echo AbyZ | tr '[:lower:]' '[:upper:]' 2>/dev/null`" in
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl/perl.spec
============================================================================
$ cvs diff -u -r1.131 -r1.132 perl.spec
--- openpkg-src/perl/perl.spec 18 Apr 2009 13:14:10 -0000 1.131
+++ openpkg-src/perl/perl.spec 24 Aug 2009 17:26:31 -0000 1.132
@@ -31,8 +31,8 @@
Class: CORE
Group: Perl
License: GPL/Artistic
-Version: 5.10.0
-Release: 20081225
+Version: 5.10.1
+Release: 20090824
# list of sources
Source0: ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
