OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Dec-2007 22:41:52
Branch: HEAD Handle: 2007122221415100
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec perl.patch
Log:
upgrade to Perl 5.10.0
Summary:
Revision Changes Path
1.484 +1 -0 openpkg-src/openpkg/HISTORY
1.620 +2 -2 openpkg-src/openpkg/openpkg.spec
1.3 +41 -57 openpkg-src/openpkg/perl.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.483 -r1.484 HISTORY
--- openpkg-src/openpkg/HISTORY 30 Oct 2007 07:48:04 -0000 1.483
+++ openpkg-src/openpkg/HISTORY 22 Dec 2007 21:41:51 -0000 1.484
@@ -2,6 +2,7 @@
2007
====
+20071222 upgrade to Perl 5.10.0
20071030 upgrade to cURL 7.17.1
20071019 upgrade to OpenSSL 0.9.8g
20071018 upgrade to latest Tar patch
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.619 -r1.620 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 30 Oct 2007 07:48:04 -0000 1.619
+++ openpkg-src/openpkg/openpkg.spec 22 Dec 2007 21:41:51 -0000 1.620
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20071030
+%define V_openpkg 20071222
# the used software versions
%define V_rpm 4.2.1
@@ -56,7 +56,7 @@
%define V_uuid 1.6.0
%define V_config 20060923
%define V_registry 1.1.3
-%define V_perl 5.8.8
+%define V_perl 5.10.0
%define V_openssl 0.9.8g
%define V_tools 1.4.5
%define V_exec 2.0.1-C
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/perl.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 perl.patch
--- openpkg-src/openpkg/perl.patch 20 May 2007 07:55:38 -0000 1.2
+++ openpkg-src/openpkg/perl.patch 22 Dec 2007 21:41:51 -0000 1.3
@@ -4,9 +4,9 @@
area is.
Index: installperl
---- installperl.orig 2006-01-28 16:35:28 +0100
-+++ installperl 2006-02-01 20:00:56 +0100
-@@ -189,6 +189,8 @@
+--- installperl.orig 2006-08-15 14:37:41 +0200
++++ installperl 2006-08-18 21:05:05 +0200
+@@ -211,6 +211,8 @@
my $installarchlib = "$destdir$Config{installarchlib}";
my $installsitelib = "$destdir$Config{installsitelib}";
my $installsitearch = "$destdir$Config{installsitearch}";
@@ -15,7 +15,7 @@
my $installman1dir = "$destdir$Config{installman1dir}";
my $man1ext = $Config{man1ext};
my $libperl = $Config{libperl};
-@@ -381,6 +383,8 @@
+@@ -403,6 +405,8 @@
mkpath($installarchlib, $verbose, 0777);
mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
mkpath($installsitearch, $verbose, 0777) if ($installsitearch);
@@ -36,19 +36,19 @@
PERL[5]LIB, site, vendor, perl, other".
Index: perl.c
---- perl.c.orig 2006-01-31 13:34:47 +0100
-+++ perl.c 2006-02-01 20:00:56 +0100
-@@ -4776,39 +4776,6 @@
- incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
+--- perl.c.orig 2006-08-15 14:37:41 +0200
++++ perl.c 2006-08-18 21:08:14 +0200
+@@ -4749,39 +4749,6 @@
+ incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
#endif
-#ifdef ARCHLIB_EXP
-- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
+- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
-#endif
-#ifdef MACOS_TRADITIONAL
- {
- Stat_t tmpstatbuf;
-- SV * privdir = NEWSV(55, 0);
+- SV * privdir = newSV(0);
- char * macperl = PerlEnv_getenv("MACPERL");
-
- if (!macperl)
@@ -56,39 +56,39 @@
-
- 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);
+- 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);
+- incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
-
- SvREFCNT_dec(privdir);
- }
- if (!PL_tainting)
-- incpush(":", FALSE, FALSE, TRUE);
+- 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);
+- incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
-#else
-- incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
+- 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 */
-@@ -4850,6 +4817,39 @@
- incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
+@@ -4824,6 +4791,39 @@
+ incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
#endif
+#ifdef ARCHLIB_EXP
-+ incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
++ incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
+#endif
+#ifdef MACOS_TRADITIONAL
+ {
+ Stat_t tmpstatbuf;
-+ SV * privdir = NEWSV(55, 0);
++ SV * privdir = newSV(0);
+ char * macperl = PerlEnv_getenv("MACPERL");
+
+ if (!macperl)
@@ -96,27 +96,27 @@
+
+ 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);
++ 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);
++ incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
+
+ SvREFCNT_dec(privdir);
+ }
+ if (!PL_tainting)
-+ incpush(":", FALSE, FALSE, TRUE);
++ 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);
++ incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
+#else
-+ incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
++ incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
+#endif
+
#ifdef PERL_OTHERLIBDIRS
- incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE);
+ incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);
#endif
-----------------------------------------------------------------------------
@@ -135,8 +135,8 @@
related to the non-standard "__private_extern__" attribute.
Index: hints/darwin.sh
---- hints/darwin.sh.orig 2005-09-18 17:13:41 +0200
-+++ hints/darwin.sh 2006-02-01 20:00:56 +0100
+--- hints/darwin.sh.orig 2006-08-15 14:37:41 +0200
++++ hints/darwin.sh 2006-08-18 21:05:05 +0200
@@ -120,9 +120,6 @@
*-2147483648) ccflags="${ccflags} -DINT32_MIN_BROKEN -DINT64_MIN_BROKEN"
;;
esac
@@ -158,9 +158,9 @@
cat > UU/archname.cbu <<'EOCBU'
# This script UU/archname.cbu will get 'called-back' by Configure
Index: perlio.c
---- perlio.c.orig 2006-01-06 23:42:20 +0100
-+++ perlio.c 2006-02-01 20:00:56 +0100
-@@ -448,7 +448,14 @@
+--- perlio.c.orig 2006-08-15 14:37:41 +0200
++++ perlio.c 2006-08-18 21:05:05 +0200
+@@ -461,7 +461,14 @@
#include <unistd.h>
#endif
#ifdef HAS_MMAP
@@ -187,9 +187,9 @@
it works at all.
Index: hints/dec_osf.sh
---- hints/dec_osf.sh.orig 2006-01-08 10:53:29 +0100
-+++ hints/dec_osf.sh 2006-02-01 20:00:56 +0100
-@@ -279,15 +279,6 @@
+--- hints/dec_osf.sh.orig 2007-12-18 11:47:07 +0100
++++ hints/dec_osf.sh 2007-12-19 12:31:37 +0100
+@@ -73,15 +73,6 @@
*) if $test "X$optimize" = "X$undef"; then
lddlflags="$lddlflags -msym"
else
@@ -198,7 +198,7 @@
- # QAR 56761: -O4 + .so may produce broken code,
- # fixed in 4.0E or better.
- ;;
-- *)
+- *)
- lddlflags="$lddlflags $optimize"
- ;;
- esac
@@ -209,9 +209,9 @@
-----------------------------------------------------------------------------
Index: Configure
---- Configure.orig 2006-01-08 15:51:03 +0100
-+++ Configure 2006-02-01 20:00:56 +0100
-@@ -7663,7 +7663,7 @@
+--- Configure.orig 2006-08-15 14:37:40 +0200
++++ Configure 2006-08-18 21:05:05 +0200
+@@ -7787,7 +7787,7 @@
;;
linux|irix*|gnu*) dflt='-shared' ;;
next) dflt='none' ;;
@@ -226,10 +226,10 @@
Security Fix (CVE-2005-3962, OpenPKG-SA-2005.025-perl)
Index: sv.c
---- sv.c.orig 2006-01-16 13:22:21 +0100
-+++ sv.c 2006-02-01 20:00:56 +0100
-@@ -8650,7 +8650,10 @@
- if (EXPECT_NUMBER(q, width)) {
+--- sv.c.orig 2006-08-15 14:37:41 +0200
++++ sv.c 2006-08-18 21:05:05 +0200
+@@ -8595,7 +8595,10 @@
+ if ( (width = expect_number(&q)) ) {
if (*q == '$') {
++q;
- efix = width;
@@ -241,19 +241,3 @@
goto gotwidth;
}
------------------------------------------------------------------------------
-
-Support GCC 4.2
-
-Index: makedepend.SH
---- makedepend.SH.orig 2003-06-05 20:11:10 +0200
-+++ makedepend.SH 2007-05-20 09:32:10 +0200
-@@ -167,6 +167,7 @@
- -e '/^#.*<builtin>/d' \
- -e '/^#.*<built-in>/d' \
- -e '/^#.*<command line>/d' \
-+ -e '/^#.*<command-line>/d' \
- -e '/^#.*"-"/d' \
- -e '/: file path prefix .* never used$/d' \
- -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
-
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
