OpenPKG Specs: comparison perl/perl.patch

-:2991bcd0aa90
+:8bbbcd1102c0
 procedure forgot to create its top-level paths, too. In OpenPKG we use
 the "vendor" area, so make sure it is created the same way the "site"
 area is.
 Index: installperl
---- installperl.orig	2011-06-09 22:04:29.000000000 +0200
+--- installperl.orig	2012-04-25 02:18:34.000000000 +0200
-+++ installperl	2011-06-17 15:20:48.000000000 +0200
++++ installperl	2012-05-31 21:51:43.000000000 +0200
-@@ -200,6 +200,8 @@
+@@ -196,6 +196,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};
-@@ -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") {
+if (-d 'lib') {
-$do_installarchlib = ! samepath($installarchlib, '.');
+find({no_chdir => 1, wanted => \&installlib}, 'lib')
 -----------------------------------------------------------------------------
 Port to [Open]Darwin 6.6.2:
 3. Darwin 6 no longer accepts the non-standard "#import" statements,
 so replace with "#include" and circumvent some header problem
 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.orig	2012-02-20 20:48:38.000000000 +0100
-+++ hints/darwin.sh	2011-06-17 15:20:48.000000000 +0200
++++ hints/darwin.sh	2012-05-31 21:51:43.000000000 +0200
-@@ -189,8 +189,7 @@
+@@ -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';
 -# useshrplib=true results in much slower startup times.
 -# 'false' is the default value.  Use Configure -Duseshrplib to override.
 +useshrplib='true'
 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.orig	2012-02-15 05:44:47.000000000 +0100
-+++ ext/DynaLoader/dl_dyld.xs	2011-06-17 15:20:48.000000000 +0200
++++ ext/DynaLoader/dl_dyld.xs	2012-05-31 21:51:43.000000000 +0200
 @@ -47,7 +47,13 @@
 #undef environ
 #undef bool
 +#ifdef PERL_DARWIN
 #import <mach-o/dyld.h>
 +#endif
 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 <unistd.h>
-#endif
-#ifdef HAS_MMAP
-+#ifdef PERL_DARWIN
-+#define environ_safe environ
-+#undef environ
-#include <sys/mman.h>
-+#define environ environ_safe
-+#else
-+#include <sys/mman.h>
-+#endif
-#endif
-void
 -----------------------------------------------------------------------------
 Port to Tru64 5.1:
 optimization flags to ld(1). Under a brain-dead platform like Tru64 we
 really don't need any more optimization because we are already happy if
 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.orig	2012-04-25 02:18:34.000000000 +0200
-+++ hints/dec_osf.sh	2011-06-17 15:20:48.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"
 else
 -		  case "$myosvers" in
 -----------------------------------------------------------------------------
 Linker flag change for Solaris.
 Index: Configure
---- Configure.orig	2011-06-09 22:04:29.000000000 +0200
+--- Configure.orig	2012-04-25 02:18:30.000000000 +0200
-+++ Configure	2011-06-17 15:20:48.000000000 +0200
++++ Configure	2012-05-31 21:51:44.000000000 +0200
-@@ -8078,9 +8058,9 @@
+@@ -8014,9 +7994,9 @@
 			      ;;
 			linux|irix*|gnu*)  dflt="-shared $optimize" ;;
 			next)  dflt='none' ;;
 -			solaris) dflt='-G' ;;
 +			solaris) dflt='-shared' ;;
 -----------------------------------------------------------------------------
 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.orig	2012-04-25 02:18:35.000000000 +0200
-+++ sv.c	2011-06-17 15:20:48.000000000 +0200
++++ sv.c	2012-05-31 21:51:44.000000000 +0200
-@@ -10198,7 +10198,10 @@
+@@ -10283,7 +10283,10 @@
 	if ( (width = expect_number(&q)) ) {
 	    if (*q == '$') {
 		++q;
 -		efix = width;
 +		if (width > PERL_INT_MAX)
 -----------------------------------------------------------------------------
 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.orig	2012-04-25 02:18:30.000000000 +0200
-+++ Configure	2011-06-17 15:20:48.000000000 +0200
++++ Configure	2012-05-31 21:51:44.000000000 +0200
-@@ -5158,17 +5158,6 @@
+@@ -5103,17 +5103,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
 -		;;
 -	esac
 	;;
 esac
-@@ -5307,15 +5296,6 @@
+@@ -5252,15 +5241,6 @@
 	;;
 *) dflt="$ldflags";;
 esac
 -# See note above about -fstack-protector
 -case "$ccflags" in
 -	;;
 -esac
 : 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
 -	case "$ldflags" in
 -	*-fstack-protector*)
 -----------------------------------------------------------------------------
 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.orig	2012-04-25 02:18:30.000000000 +0200
-+++ Configure	2009-08-24 18:44:39 +0200
++++ Configure	2012-05-31 21:51:44.000000000 +0200
-@@ -1769,7 +1769,7 @@
+@@ -1778,7 +1778,7 @@
 touch posthint.sh
 : set package name
 -package='perl5'
 +package='perl'
 Multiple scripts in the perl package in Trustix Secure Linux 1.5
 through 2.1, and possibly other operating systems, allows local
 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.orig	2012-02-15 05:44:36.000000000 +0100
-+++ cpan/CGI/lib/CGI/Cookie.pm	2011-06-17 15:22:59.000000000 +0200
++++ 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:
 -       $COOKIES = `cat /usr/tmp/Cookie_stash`;
 +       $COOKIES = `cat /var/run/www/Cookie_stash`;
 %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('</etc/passwd');
-@pslines = ps('-ww'),
--   cp("/etc/passwd", "/tmp/passwd");
-+   cp("/etc/passwd", "/etc/passwd.orig");
-# object oriented
-my $sh = Shell->new;
 -----------------------------------------------------------------------------
 Linking against just libgdbm_compat under at least SUSE fails
 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.orig	2012-05-14 21:49:22.000000000 +0200
-+++ hints/linux.sh	2011-06-17 15:20:48.000000000 +0200
++++ hints/linux.sh	2012-05-31 21:51:44.000000000 +0200
-@@ -55,7 +55,9 @@
+@@ -58,7 +58,9 @@
 libswanted="$*"
 # Debian 4.0 puts ndbm in the -lgdbm_compat library.
 -libswanted="$libswanted gdbm_compat"
 +if [ -f /etc/debian_version -o -f /etc/ubuntu_version ]; then

OpenPKG Specs / file comparison

comparison: perl/perl.patch

perl/perl.patch