OpenPKG Specs: perl/perl.patch@a2c6460cfb16 (annotated)

perl/perl.patch@a2c6460cfb16 (annotated)

perl/perl.patch

Mon, 28 Jan 2013 17:37:18 +0100

author: Michael Schloh von Bennewitz <michael@schloh.com>
date: Mon, 28 Jan 2013 17:37:18 +0100
changeset 758: a2c6460cfb16
parent 358: 832ab278201b
permissions: -rw-r--r--

Correct socket error reporting improvement with IPv6 portable code,
after helpful recommendation by Saúl Ibarra Corretgé on OSips devlist.

 By default, the "vendor" area is not used, so Perl's installation
 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	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}";
 +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};
@@ -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 (-d 'lib') {
      find({no_chdir => 1, wanted => \&installlib}, 'lib')
 -----------------------------------------------------------------------------
 Port to [Open]Darwin 6.6.2:
 . In OpenPKG, Perl does not use the vendor GCC and our GCC does not
    understand "-no-cpp-precomp", so remove this build option.
 . The <sys/mman.h> indirectly includes system specific headers
    which in turn have fields named "environ" while Perl uses
    a define of "environ" internally. So wrap the inclusion.
 . 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	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';
 -# 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	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
  #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()
  {
 -----------------------------------------------------------------------------
 Port to Tru64 5.1:
 Under Tru64 our gcc has to be built without binutils and the system
 ld(1) does not accept a "-O" option, so remove the whole passing of
 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	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"
                else
 -		  case "$myosvers" in
 -		  *4.0D*)
 -		      # QAR 56761: -O4 + .so may produce broken code,
 -		      # fixed in 4.0E or better.
 -		      ;;
 -		  *)
 -                      lddlflags="$lddlflags $optimize"
 -		      ;;
 -		  esac
  		  # -msym: If using a sufficiently recent /sbin/loader,
  		  # keep the module symbols with the modules.
                    lddlflags="$lddlflags -msym $_lddlflags_strict_ansi"
 -----------------------------------------------------------------------------
 Linker flag change for Solaris.
 Index: Configure
 --- 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' ;;
 -			solaris) dflt='-G' ;;
 +			solaris) dflt='-shared' ;;
  			sunos) dflt='-assert nodefinitions' ;;
 -			svr4*|esix*|nonstopux) dflt="-G $ldflags" ;;
 +			svr4*|esix*|nonstopux) dflt="-shared $ldflags" ;;
  	        *)     dflt='none' ;;
  			esac
  			;;
 -----------------------------------------------------------------------------
 Security Fix (CVE-2005-3962, OpenPKG-SA-2005.025-perl)
 Index: sv.c
 --- 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;
 -		efix = width;
 +		if (width > PERL_INT_MAX)
 +		    efix = PERL_INT_MAX;
 +		else
 +		    efix = width;
  	    } else {
  		goto gotwidth;
  	    }
 -----------------------------------------------------------------------------
 Do not use -fstack-protector as it causes too much portability issues.
 Index: Configure
 --- Configure.orig	2012-04-25 02:18:30.000000000 +0200
 +++ Configure	2012-05-31 21:51:44.000000000 +0200
@@ -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
 -	# 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
@@ -5252,15 +5241,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
@@ -8043,14 +8023,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	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
 -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
 -----------------------------------------------------------------------------
 http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0976
     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	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:
 -       $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
 -----------------------------------------------------------------------------
 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	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.
 -libswanted="$libswanted gdbm_compat"
 +if [ -f /etc/debian_version -o -f /etc/ubuntu_version ]; then
 +    libswanted="$libswanted gdbm_compat"
 +fi
  # If you have glibc, then report the version for ./myconfig bug reporting.
  # (Configure doesn't need to know the specific version since it just uses

OpenPKG Specs / annotate

perl/perl.patch@a2c6460cfb16 (annotated)

perl/perl.patch