Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b468ce8f9df98804d4027c1956aacf2a31ec31c0
commit b468ce8f9df98804d4027c1956aacf2a31ec31c0
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Sat Feb 9 14:31:31 2008 +0100
perl-5.10.0-1-i686
version bump
diff --git a/source/base/perl/CVE-2007-5116.diff
b/source/base/perl/CVE-2007-5116.diff
deleted file mode 100644
index 82ce340..0000000
--- a/source/base/perl/CVE-2007-5116.diff
+++ /dev/null
@@ -1,56 +0,0 @@
---- regcomp.c 2006-01-08 12:59:27.000000000 -0800
-+++ regcomp.c 2007-10-05 12:07:55.000000000 -0700
-@@ -135,7 +135,8 @@
- I32 extralen;
- I32 seen_zerolen;
- I32 seen_evals;
-- I32 utf8;
-+ I32 utf8; /* pattern is utf8 or not */
-+ I32 orig_utf8; /* pattern was originally utf8
*/
- #if ADD_TO_REGEXEC
- char *starttry; /* -Dr: where regtry was called. */
- #define RExC_starttry (pRExC_state->starttry)
-@@ -161,6 +162,7 @@
- #define RExC_seen_zerolen (pRExC_state->seen_zerolen)
- #define RExC_seen_evals (pRExC_state->seen_evals)
- #define RExC_utf8 (pRExC_state->utf8)
-+#define RExC_orig_utf8 (pRExC_state->orig_utf8)
-
- #define ISMULT1(c) ((c) == '*' || (c) == '+' || (c) == '?')
- #define ISMULT2(s) ((*s) == '*' || (*s) == '+' || (*s) == '?' || \
-@@ -1749,15 +1751,17 @@
- if (exp == NULL)
- FAIL("NULL regexp argument");
-
-- RExC_utf8 = pm->op_pmdynflags & PMdf_CMP_UTF8;
-+ RExC_orig_utf8 = RExC_utf8 = pm->op_pmdynflags & PMdf_CMP_UTF8;
-
-- RExC_precomp = exp;
- DEBUG_r({
- if (!PL_colorset) reginitcolors();
- PerlIO_printf(Perl_debug_log, "%sCompiling REx%s `%s%*s%s'\n",
- PL_colors[4],PL_colors[5],PL_colors[0],
-- (int)(xend - exp), RExC_precomp, PL_colors[1]);
-+ (int)(xend - exp), exp, PL_colors[1]);
- });
-+
-+redo_first_pass:
-+ RExC_precomp = exp;
- RExC_flags = pm->op_pmflags;
- RExC_sawback = 0;
-
-@@ -1783,6 +1787,17 @@
- RExC_precomp = Nullch;
- return(NULL);
- }
-+ if (RExC_utf8 && !RExC_orig_utf8) {
-+ STRLEN len = xend-exp;
-+ DEBUG_r(PerlIO_printf(Perl_debug_log,
-+ "UTF8 mismatch! Converting to utf8 for resizing and
compile\n"));
-+ exp = (char*)Perl_bytes_to_utf8(aTHX_ (U8*)exp, &len);
-+ xend = exp + len;
-+ RExC_orig_utf8 = RExC_utf8;
-+ SAVEFREEPV(exp);
-+ goto redo_first_pass;
-+ }
-+
diff --git a/source/base/perl/FrugalBuild b/source/base/perl/FrugalBuild
index 4f3de20..eb047ce 100644
--- a/source/base/perl/FrugalBuild
+++ b/source/base/perl/FrugalBuild
@@ -3,30 +3,29 @@
# Maintainer: Zsolt Szalai <[EMAIL PROTECTED]>
pkgname=perl
-pkgver=5.8.8
-pkgrel=5
+pkgver=5.10.0
+pkgrel=1
pkgdesc="Practical Extraction and Report Language."
url="http://www.perl.org/";
depends=('gdbm' 'db>=4.6.18')
+provides=('perl-version' 'perl-module-build' 'perl-io-zlib' \
+ 'perl-io-compress-zlib' 'perl-io-compress-base'
'perl-extutils-cbuilder' \
+ 'perl-compress-zlib' 'perl-compress-raw-zlib' 'perl-archive-tar')
+conflicts=([EMAIL PROTECTED])
rodepends=('udev')
groups=('base' 'devel-core')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump http://www.perl.org/|grep -m1 'Current Release:'|sed
's/.*]\(.*\).*/\1/'"
-source=(http://www.cpan.org/src/5.0/$pkgname-$pkgver.tar.bz2 \
- $pkgname.install libnet.cfg perl-5.8.6-picdl.patch0 \
- perl-5.8.8-gcc-4.2.patch CVE-2007-5116.diff)
-sha1sums=('4aab490040727ca4419098720eca2ba4367df539' \
- '384b7620e9758245db64190138011fc5e9f51956' \
+source=(http://www.cpan.org/src/5.0/$pkgname-$pkgver.tar.gz \
+ $pkgname.install libnet.cfg perl-5.8.6-picdl.patch0)
+sha1sums=('adf73606dd5248af7ccdd735bcaa0e628ea75b3c' \
+ 'af913431187111c8051dcbde5081ee746ece8dd0' \
'92179e28215bf7b802ded72e0ca6e473a21f5003' \
- '3000bd0130ed20e0ff5d9fb0147240e3909473a7' \
- '41aa378ab49869a4964acea882f47a3a8b826357' \
- '1673fa5c8747cb31ebeadb60237348a641f74236')
+ '3000bd0130ed20e0ff5d9fb0147240e3909473a7')
build() {
unset MAKEFLAGS
- Fpatch $pkgname-$pkgver-gcc-4.2.patch
- Fpatch CVE-2007-5116.diff
-# Fpatch $pkgname-$pkgver.patch || return 1
+ Fcd
[ "$CARCH" == "x86_64" ] && (Fpatch perl-5.8.6-picdl.patch0)
./Configure -de -Dprefix=/usr -Dinstallprefix=${Fdestdir}/usr \
-Dman1dir=/usr/man/man1 -Dman3dir=/usr/man/man3 \
diff --git a/source/base/perl/perl-5.8.8-gcc-4.2.patch
b/source/base/perl/perl-5.8.8-gcc-4.2.patch
deleted file mode 100644
index 6e9961a..0000000
--- a/source/base/perl/perl-5.8.8-gcc-4.2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur perl-5.8.8-orig/makedepend.SH perl-5.8.8/makedepend.SH
---- perl-5.8.8-orig/makedepend.SH 2003-06-05 20:11:10.000000000 +0200
-+++ perl-5.8.8/makedepend.SH 2007-08-07 17:07:10.000000000 +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#" \
diff --git a/source/base/perl/perl.install b/source/base/perl/perl.install
index 2cefa83..7517146 100644
--- a/source/base/perl/perl.install
+++ b/source/base/perl/perl.install
@@ -1,5 +1,5 @@
post_install() {
- for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do
+ for ver in 5.8.{0,1,2,3,4,5,6,7,8} 5.10.0; do
if [ -d usr/lib/perl5/$ver ] && \
[ ! `test -h usr/lib/perl5/$ver; echo $?` ]; then
echo -n "adapting old version: $ver... "
@@ -13,7 +13,6 @@ post_install() {
[ -h usr/lib/perl5/$ver ] || ln -sf current usr/lib/perl5/$ver
[ -h usr/lib/perl5/site_perl/$ver ] || ln -sf current
usr/lib/perl5/site_perl/$ver
done
- /bin/true
}
post_upgrade() {
@@ -21,17 +20,14 @@ post_upgrade() {
}
pre_remove() {
- for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do
+ for ver in 5.8.{0,1,2,3,4,5,6,7,8} 5.10.0; do
rm usr/lib/perl5/$ver
rm usr/lib/perl5/site_perl/$ver
rm usr/bin/perl$ver
done
- /bin/true
}
op=$1
shift
$op $*
-
-# vim: ft=sh
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
