OpenPKG Specs: perl/perl.patch@645923d1e875 (annotated)

perl/perl.patch@645923d1e875 (annotated)

perl/perl.patch

Fri, 16 Jan 2009 10:58:21 +0100

author: Michael Schloh von Bennewitz <michael@schloh.com>
date: Fri, 16 Jan 2009 10:58:21 +0100
changeset 92: 645923d1e875
parent 22: 0d4f475bfc81
child 358: 832ab278201b
permissions: -rw-r--r--

Correct and improve code logic, buildconf, and packaging. In particular:
1. Use descriptive variable names <var>libs instead of just <var>.
2. Although Nokia states in all Qt builds that 'NOTE: When linking
against OpenSSL, you can override the default library names
through OPENSSL_LIBS.' and even gives an example, their own
configuration logic rejects such an attempt. Correct this by
hard coding the OpenSSL library string in the configure script.
3. Consistently use the whitespace substitution [\t ] throughout.
4. Patch the buggy INCPATH of SQL plugin Qmake project files.
5. Add the 'x11' configuration variable to the qtconfig Qmake
project using the src/gui/gui.pro file as a model. This is
needed for qtconfig although not in other tools, because
the qtconfig buildconf indirectly includes qt_x11_p.h which
is dependent on X11 headers.
6. Avoid 'ld.so: fatal: hardware capability unsupported: SSE2 AMD_3DNow'
on platforms for which the config.tests/unix/[3dnow|sse2] succeed
although unsopported at run time by testing for the x86-64
instruction set at build time and regulating hardware capabilities.
7. Correctly install the desinger plugin by explicitly building it.
8. Remove custom plugin installation logic which is unnecessary.
9. Correct removal of temporary paths from shared object files.

 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	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}";
  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);
  if (chdir "lib") {
      $do_installarchlib = ! samepath($installarchlib, '.');
 -----------------------------------------------------------------------------
 By default, the Perl module search order is "use lib, -I, PERL[5]LIB,
 perl, site, vendor, other". This means that in OpenPKG both the modules
 installed via CPAN shell (in "site" area) and the "perl-xxx" packages
 (in "vendor" area) cannot override the (sometimes obsoleted) module
 versions distributed with Perl (in "perl" area). Hence, we change
 the search order to a more reasonable one for OpenPKG: "use lib, -I,
 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 @@
      incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
  #endif
 -#ifdef ARCHLIB_EXP
 -    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
 -#endif
 -#ifdef MACOS_TRADITIONAL
 -    {
 -	Stat_t tmpstatbuf;
 -    	SV * privdir = newSV(0);
 -	char * macperl = PerlEnv_getenv("MACPERL");
 -
 -	if (!macperl)
 -	    macperl = "";
 -
 -	Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
 -	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
 -	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
 -	Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
 -	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
 -	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
 -
 -   	SvREFCNT_dec(privdir);
 -    }
 -    if (!PL_tainting)
 -	incpush(":", FALSE, FALSE, TRUE, FALSE);
 -#else
 -#ifndef PRIVLIB_EXP
 -#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
 -#endif
 -#if defined(WIN32)
 -    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
 -#else
 -    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
 -#endif
 -
  #ifdef SITEARCH_EXP
      /* sitearch is always relative to sitelib on Windows for
       * DLL-based path intuition to work correctly */
@@ -4828,6 +4795,39 @@
      incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
  #endif
 +#ifdef ARCHLIB_EXP
 +    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
 +#endif
 +#ifdef MACOS_TRADITIONAL
 +    {
 +	Stat_t tmpstatbuf;
 +    	SV * privdir = newSV(0);
 +	char * macperl = PerlEnv_getenv("MACPERL");
 +
 +	if (!macperl)
 +	    macperl = "";
 +
 +	Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
 +	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
 +	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
 +	Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
 +	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
 +	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
 +
 +   	SvREFCNT_dec(privdir);
 +    }
 +    if (!PL_tainting)
 +	incpush(":", FALSE, FALSE, TRUE, FALSE);
 +#else
 +#ifndef PRIVLIB_EXP
 +#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
 +#endif
 +#if defined(WIN32)
 +    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
 +#else
 +    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
 +#endif
 +
  #ifdef PERL_OTHERLIBDIRS
      incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);
  #endif
 -----------------------------------------------------------------------------
 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	2007-12-18 11:47:07 +0100
 +++ hints/darwin.sh	2008-03-28 15:23:47 +0100
@@ -120,9 +120,6 @@
    *-2147483648) ccflags="${ccflags} -DINT32_MIN_BROKEN -DINT64_MIN_BROKEN" ;;
  esac
 -# Avoid Apple's cpp precompiler, better for extensions
 -cppflags="${cppflags} -no-cpp-precomp"
 -
  # This is necessary because perl's build system doesn't
  # apply cppflags to cc compile lines as it should.
  ccflags="${ccflags} ${cppflags}"
@@ -182,8 +179,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
 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 @@
  #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
 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()
  {
 -----------------------------------------------------------------------------
 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	2007-12-18 11:47:07 +0100
 +++ hints/dec_osf.sh	2008-03-28 15:23:47 +0100
@@ -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"
 -----------------------------------------------------------------------------
 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: 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
@@ -470,7 +470,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 = parse CGI::Cookie($COOKIES);
  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
@@ -151,7 +151,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;
 -----------------------------------------------------------------------------
 Index: Configure
 --- Configure.orig	2007-12-18 11:47:07 +0100
 +++ Configure	2008-03-28 15:23:47 +0100
@@ -7871,7 +7871,7 @@
  			      ;;
  			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" ;;
  	        *)     dflt='none' ;;
 -----------------------------------------------------------------------------
 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 @@
  	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;
  	    }
 -----------------------------------------------------------------------------
 Detect NetBSD 5.x as well
 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 @@
  	;;
  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"
 -----------------------------------------------------------------------------
 Corrections for Solaris 11:
 Index: perl.h
 diff -Nau perl.h.orig perl.h
 --- perl.h.orig	2007-12-18 11:47:08.000000000 +0100
 +++ perl.h	2009-01-06 15:28:45.843276063 +0100
@@ -1393,6 +1393,7 @@
   */
  #if defined(I_SYSMODE) && !defined(PERL_MICRO)
 +#include <sys/vnode.h>
  #include <sys/mode.h>
  #endif

OpenPKG Specs / annotate

perl/perl.patch@645923d1e875 (annotated)

perl/perl.patch