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

[Sébastien Luttringer]

    Date: Saturday, March 12, 2016 @ 16:29:17
  Author: seblu
Revision: 261360

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

Added:
  pcre/repos/testing-i686/
  pcre/repos/testing-i686/01-CVE-2016-1283.patch
    (from rev 261359, pcre/trunk/01-CVE-2016-1283.patch)
  pcre/repos/testing-x86_64/
  pcre/repos/testing-x86_64/01-CVE-2016-1283.patch
    (from rev 261359, pcre/trunk/01-CVE-2016-1283.patch)
  pcre/repos/testing-x86_64/PKGBUILD
    (from rev 261359, pcre/trunk/PKGBUILD)

---------------------------------------+
 testing-i686/01-CVE-2016-1283.patch   |   18 ++++++++++
 testing-x86_64/01-CVE-2016-1283.patch |   18 ++++++++++
 testing-x86_64/PKGBUILD               |   55 ++++++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+)

Copied: pcre/repos/testing-i686/01-CVE-2016-1283.patch (from rev 261359, pcre/trunk/01-CVE-2016-1283.patch)
===================================================================
--- testing-i686/01-CVE-2016-1283.patch	                        (rev 0)
+++ testing-i686/01-CVE-2016-1283.patch	2016-03-12 15:29:17 UTC (rev 261360)
@@ -0,0 +1,18 @@
+Index: pcre_compile.c
+===================================================================
+--- a/pcre_compile.c	(revision 1635)
++++ b/pcre_compile.c	(revision 1636)
+@@ -7311,7 +7311,12 @@
+           so far in order to get the number. If the name is not found, leave
+           the value of recno as 0 for a forward reference. */
+ 
+-          else
++          /* This patch (removing "else") fixes a problem when a reference is
++          to multiple identically named nested groups from within the nest.
++          Once again, it is not the "proper" fix, and it results in an
++          over-allocation of memory. */
++
++          /* else */
+             {
+             ng = cd->named_groups;
+             for (i = 0; i < cd->names_found; i++, ng++)

Copied: pcre/repos/testing-x86_64/01-CVE-2016-1283.patch (from rev 261359, pcre/trunk/01-CVE-2016-1283.patch)
===================================================================
--- testing-x86_64/01-CVE-2016-1283.patch	                        (rev 0)
+++ testing-x86_64/01-CVE-2016-1283.patch	2016-03-12 15:29:17 UTC (rev 261360)
@@ -0,0 +1,18 @@
+Index: pcre_compile.c
+===================================================================
+--- a/pcre_compile.c	(revision 1635)
++++ b/pcre_compile.c	(revision 1636)
+@@ -7311,7 +7311,12 @@
+           so far in order to get the number. If the name is not found, leave
+           the value of recno as 0 for a forward reference. */
+ 
+-          else
++          /* This patch (removing "else") fixes a problem when a reference is
++          to multiple identically named nested groups from within the nest.
++          Once again, it is not the "proper" fix, and it results in an
++          over-allocation of memory. */
++
++          /* else */
+             {
+             ng = cd->named_groups;
+             for (i = 0; i < cd->names_found; i++, ng++)

Copied: pcre/repos/testing-x86_64/PKGBUILD (from rev 261359, pcre/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2016-03-12 15:29:17 UTC (rev 261360)
@@ -0,0 +1,55 @@
+# $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.38
+pkgrel=3
+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')
+validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel
+source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$pkgname-$pkgver.tar.bz2"{,.sig}
+        '01-CVE-2016-1283.patch')
+md5sums=('00aabbfe56d5a48b270f999b508c5ad2'
+         'SKIP'
+         '722aba6455a3f0240eaa22289f0176a0')
+
+prepare() {
+  for _f in "${source[@]}"; do
+    [[ "$_f" =~ \.patch$ ]] && { msg2 "$_f"; patch -p1 -d $pkgname-$pkgver < "$_f"; }
+  done
+  :
+}
+
+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: