[arch-commits] Commit in pcre/repos (8 files)
Sébastien Luttringer
seblu at archlinux.org
Tue Nov 25 22:34:13 UTC 2014
Date: Tuesday, November 25, 2014 @ 23:34:13
Author: seblu
Revision: 227099
db-move: moved pcre from [testing] to [core] (i686, x86_64)
Added:
pcre/repos/core-i686/001-fix-heap-overflow.patch
(from rev 227098, pcre/repos/testing-i686/001-fix-heap-overflow.patch)
pcre/repos/core-i686/PKGBUILD
(from rev 227098, pcre/repos/testing-i686/PKGBUILD)
pcre/repos/core-x86_64/001-fix-heap-overflow.patch
(from rev 227098, pcre/repos/testing-x86_64/001-fix-heap-overflow.patch)
pcre/repos/core-x86_64/PKGBUILD
(from rev 227098, pcre/repos/testing-x86_64/PKGBUILD)
Deleted:
pcre/repos/core-i686/PKGBUILD
pcre/repos/core-x86_64/PKGBUILD
pcre/repos/testing-i686/
pcre/repos/testing-x86_64/
-----------------------------------------+
/PKGBUILD | 102 ++++++++++++++++++++++++++++++
core-i686/001-fix-heap-overflow.patch | 16 ++++
core-i686/PKGBUILD | 45 -------------
core-x86_64/001-fix-heap-overflow.patch | 16 ++++
core-x86_64/PKGBUILD | 45 -------------
5 files changed, 134 insertions(+), 90 deletions(-)
Copied: pcre/repos/core-i686/001-fix-heap-overflow.patch (from rev 227098, pcre/repos/testing-i686/001-fix-heap-overflow.patch)
===================================================================
--- core-i686/001-fix-heap-overflow.patch (rev 0)
+++ core-i686/001-fix-heap-overflow.patch 2014-11-25 22:34:13 UTC (rev 227099)
@@ -0,0 +1,16 @@
+--- a/code/trunk/pcre_exec.c 2014/11/05 15:08:03 1510
++++ b/code/trunk/pcre_exec.c 2014/11/19 20:57:13 1513
+@@ -1404,8 +1404,11 @@
+ condition = TRUE;
+
+ /* Advance ecode past the assertion to the start of the first branch,
+- but adjust it so that the general choosing code below works. */
+-
++ but adjust it so that the general choosing code below works. If the
++ assertion has a quantifier that allows zero repeats we must skip over
++ the BRAZERO. This is a lunatic thing to do, but somebody did! */
++
++ if (*ecode == OP_BRAZERO) ecode++;
+ ecode += GET(ecode, 1);
+ while (*ecode == OP_ALT) ecode += GET(ecode, 1);
+ ecode += 1 + LINK_SIZE - PRIV(OP_lengths)[condcode];
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2014-11-25 22:27:40 UTC (rev 227098)
+++ core-i686/PKGBUILD 2014-11-25 22:34:13 UTC (rev 227099)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Sébastien "Seblu" Luttringer
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: John Proctor <jproctor at prium.net>
-
-pkgname=pcre
-pkgver=8.36
-pkgrel=1
-pkgdesc='A library that implements Perl 5-style regular expressions'
-arch=('i686' 'x86_64')
-url='http://www.pcre.org/'
-license=('BSD')
-depends=('gcc-libs' 'readline' 'zlib' 'bzip2' 'bash')
-source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$pkgname-$pkgver.tar.bz2"{,.sig})
-md5sums=('b767bc9af0c20bc9c1fe403b0d41ad97'
- 'SKIP')
-
-build() {
- cd $pkgname-$pkgver
- ./configure \
- --prefix=/usr \
- --enable-unicode-properties \
- --enable-pcre16 \
- --enable-pcre32 \
- --enable-jit \
- --enable-pcregrep-libz \
- --enable-pcregrep-libbz2 \
- --enable-pcretest-libreadline
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make -j1 check
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: pcre/repos/core-i686/PKGBUILD (from rev 227098, pcre/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2014-11-25 22:34:13 UTC (rev 227099)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=pcre
+pkgver=8.36
+pkgrel=2
+pkgdesc='A library that implements Perl 5-style regular expressions'
+arch=('i686' 'x86_64')
+url='http://www.pcre.org/'
+license=('BSD')
+depends=('gcc-libs' 'readline' 'zlib' 'bzip2' 'bash')
+source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$pkgname-$pkgver.tar.bz2"{,.sig}
+ '001-fix-heap-overflow.patch')
+md5sums=('b767bc9af0c20bc9c1fe403b0d41ad97'
+ 'SKIP'
+ '44a7e4fca07eff04d07bef65c982de9a')
+
+prepare() {
+ patch -d $pkgname-$pkgver < 001-fix-heap-overflow.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --enable-unicode-properties \
+ --enable-pcre16 \
+ --enable-pcre32 \
+ --enable-jit \
+ --enable-pcregrep-libz \
+ --enable-pcregrep-libbz2 \
+ --enable-pcretest-libreadline
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make -j1 check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: pcre/repos/core-x86_64/001-fix-heap-overflow.patch (from rev 227098, pcre/repos/testing-x86_64/001-fix-heap-overflow.patch)
===================================================================
--- core-x86_64/001-fix-heap-overflow.patch (rev 0)
+++ core-x86_64/001-fix-heap-overflow.patch 2014-11-25 22:34:13 UTC (rev 227099)
@@ -0,0 +1,16 @@
+--- a/code/trunk/pcre_exec.c 2014/11/05 15:08:03 1510
++++ b/code/trunk/pcre_exec.c 2014/11/19 20:57:13 1513
+@@ -1404,8 +1404,11 @@
+ condition = TRUE;
+
+ /* Advance ecode past the assertion to the start of the first branch,
+- but adjust it so that the general choosing code below works. */
+-
++ but adjust it so that the general choosing code below works. If the
++ assertion has a quantifier that allows zero repeats we must skip over
++ the BRAZERO. This is a lunatic thing to do, but somebody did! */
++
++ if (*ecode == OP_BRAZERO) ecode++;
+ ecode += GET(ecode, 1);
+ while (*ecode == OP_ALT) ecode += GET(ecode, 1);
+ ecode += 1 + LINK_SIZE - PRIV(OP_lengths)[condcode];
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2014-11-25 22:27:40 UTC (rev 227098)
+++ core-x86_64/PKGBUILD 2014-11-25 22:34:13 UTC (rev 227099)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Sébastien "Seblu" Luttringer
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: John Proctor <jproctor at prium.net>
-
-pkgname=pcre
-pkgver=8.36
-pkgrel=1
-pkgdesc='A library that implements Perl 5-style regular expressions'
-arch=('i686' 'x86_64')
-url='http://www.pcre.org/'
-license=('BSD')
-depends=('gcc-libs' 'readline' 'zlib' 'bzip2' 'bash')
-source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$pkgname-$pkgver.tar.bz2"{,.sig})
-md5sums=('b767bc9af0c20bc9c1fe403b0d41ad97'
- 'SKIP')
-
-build() {
- cd $pkgname-$pkgver
- ./configure \
- --prefix=/usr \
- --enable-unicode-properties \
- --enable-pcre16 \
- --enable-pcre32 \
- --enable-jit \
- --enable-pcregrep-libz \
- --enable-pcregrep-libbz2 \
- --enable-pcretest-libreadline
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make -j1 check
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: pcre/repos/core-x86_64/PKGBUILD (from rev 227098, pcre/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2014-11-25 22:34:13 UTC (rev 227099)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=pcre
+pkgver=8.36
+pkgrel=2
+pkgdesc='A library that implements Perl 5-style regular expressions'
+arch=('i686' 'x86_64')
+url='http://www.pcre.org/'
+license=('BSD')
+depends=('gcc-libs' 'readline' 'zlib' 'bzip2' 'bash')
+source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$pkgname-$pkgver.tar.bz2"{,.sig}
+ '001-fix-heap-overflow.patch')
+md5sums=('b767bc9af0c20bc9c1fe403b0d41ad97'
+ 'SKIP'
+ '44a7e4fca07eff04d07bef65c982de9a')
+
+prepare() {
+ patch -d $pkgname-$pkgver < 001-fix-heap-overflow.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --enable-unicode-properties \
+ --enable-pcre16 \
+ --enable-pcre32 \
+ --enable-jit \
+ --enable-pcregrep-libz \
+ --enable-pcregrep-libbz2 \
+ --enable-pcretest-libreadline
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make -j1 check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list