[arch-commits] Commit in pcre/repos (6 files)

Sébastien Luttringer seblu at archlinux.org
Fri Nov 21 22:59:44 UTC 2014


    Date: Friday, November 21, 2014 @ 23:59:44
  Author: seblu
Revision: 226804

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  pcre/repos/testing-i686/
  pcre/repos/testing-i686/001-fix-heap-overflow.patch
    (from rev 226803, pcre/trunk/001-fix-heap-overflow.patch)
  pcre/repos/testing-i686/PKGBUILD
    (from rev 226803, pcre/trunk/PKGBUILD)
  pcre/repos/testing-x86_64/
  pcre/repos/testing-x86_64/001-fix-heap-overflow.patch
    (from rev 226803, pcre/trunk/001-fix-heap-overflow.patch)
  pcre/repos/testing-x86_64/PKGBUILD
    (from rev 226803, pcre/trunk/PKGBUILD)

--------------------------------------------+
 testing-i686/001-fix-heap-overflow.patch   |   16 ++++++++
 testing-i686/PKGBUILD                      |   51 +++++++++++++++++++++++++++
 testing-x86_64/001-fix-heap-overflow.patch |   16 ++++++++
 testing-x86_64/PKGBUILD                    |   51 +++++++++++++++++++++++++++
 4 files changed, 134 insertions(+)

Copied: pcre/repos/testing-i686/001-fix-heap-overflow.patch (from rev 226803, pcre/trunk/001-fix-heap-overflow.patch)
===================================================================
--- testing-i686/001-fix-heap-overflow.patch	                        (rev 0)
+++ testing-i686/001-fix-heap-overflow.patch	2014-11-21 22:59:44 UTC (rev 226804)
@@ -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];

Copied: pcre/repos/testing-i686/PKGBUILD (from rev 226803, pcre/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2014-11-21 22:59:44 UTC (rev 226804)
@@ -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/testing-x86_64/001-fix-heap-overflow.patch (from rev 226803, pcre/trunk/001-fix-heap-overflow.patch)
===================================================================
--- testing-x86_64/001-fix-heap-overflow.patch	                        (rev 0)
+++ testing-x86_64/001-fix-heap-overflow.patch	2014-11-21 22:59:44 UTC (rev 226804)
@@ -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];

Copied: pcre/repos/testing-x86_64/PKGBUILD (from rev 226803, pcre/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2014-11-21 22:59:44 UTC (rev 226804)
@@ -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