Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b027e41f2f159a293f8ae0fe630b3065601f4a70
commit b027e41f2f159a293f8ae0fe630b3065601f4a70
Author: voroskoi <[EMAIL PROTECTED]>
Date: Sun Nov 11 21:16:11 2007 +0100
perl-5.8.8-5-x86_64
secfix relbump, closes #2568
cleanups in build()
diff --git a/source/base/perl/CVE-2007-5116.diff
b/source/base/perl/CVE-2007-5116.diff
new file mode 100644
index 0000000..82ce340
--- /dev/null
+++ b/source/base/perl/CVE-2007-5116.diff
@@ -0,0 +1,56 @@
+--- 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 e92c797..517cf85 100644
--- a/source/base/perl/FrugalBuild
+++ b/source/base/perl/FrugalBuild
@@ -4,8 +4,8 @@
pkgname=perl
pkgver=5.8.8
-pkgrel=4
-pkgdesc="Practical Extraction and Report Language"
+pkgrel=5
+pkgdesc="Practical Extraction and Report Language."
url="http://www.perl.org/";
depends=('gdbm' 'db>=4.6.18')
rodepends=('udev')
@@ -14,33 +14,34 @@ archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump http://www.cpan.org/src/README.html|grep stable|sed -n
's/.*s \(.*\)\. T.*/\1/;1 p'"
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)
+ perl-5.8.8-gcc-4.2.patch CVE-2007-5116.diff)
sha1sums=('4aab490040727ca4419098720eca2ba4367df539' \
'384b7620e9758245db64190138011fc5e9f51956' \
'92179e28215bf7b802ded72e0ca6e473a21f5003' \
'3000bd0130ed20e0ff5d9fb0147240e3909473a7' \
- '41aa378ab49869a4964acea882f47a3a8b826357')
+ '41aa378ab49869a4964acea882f47a3a8b826357' \
+ '1673fa5c8747cb31ebeadb60237348a641f74236')
build() {
unset MAKEFLAGS
- cd $startdir/src/$pkgname-$pkgver
- Fpatch $pkgname-$pkgver-gcc-4.2.patch || return 1
+ Fpatch $pkgname-$pkgver-gcc-4.2.patch
+ Fpatch CVE-2007-5116.diff
# Fpatch $pkgname-$pkgver.patch || return 1
- [ "$CARCH" == "x86_64" ] && (Fpatch perl-5.8.6-picdl.patch0 || return 1)
- ./Configure -de -Dprefix=/usr -Dinstallprefix=$startdir/pkg/usr \
+ [ "$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 \
-Dcccdlflags='-fPIC' -Doptimize="$CFLAGS" -Dusethreads
- make || return 1
+ make || Fdie
make install
- (cd $startdir/pkg/usr/bin; mv perl$pkgver perl; ln -sf c2ph pstruct)
- (cd $startdir/pkg/usr/bin; ln -sf s2p psed)
- (cd $startdir/pkg/usr/lib/perl5; mv $pkgver current)
- (cd $startdir/pkg/usr/lib/perl5/site_perl; mv $pkgver current)
- find $startdir/pkg -type f | xargs grep -l "$startdir/pkg" | \
- xargs -n1 perl -i -p -e "s|$startdir/pkg||g;"
- cp $startdir/src/libnet.cfg $startdir/pkg/usr/lib/perl5/current/Net/
+ (cd ${Fdestdir}/usr/bin; mv perl$pkgver perl; ln -sf c2ph pstruct)
+ (cd ${Fdestdir}/usr/bin; ln -sf s2p psed)
+ (cd ${Fdestdir}/usr/lib/perl5; mv $pkgver current)
+ (cd ${Fdestdir}/usr/lib/perl5/site_perl; mv $pkgver current)
+ find ${Fdestdir} -type f | xargs grep -l "${Fdestdir}" | \
+ xargs -n1 perl -i -p -e "s|${Fdestdir}||g;"
+ cp ${Fsrcdir}/libnet.cfg ${Fdestdir}/usr/lib/perl5/current/Net/
}
# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
