libpcre-32: 8.37 -> 8.38

libpcre-32/.footprint

@@ -1,21 +1,20 @@
-drwxr-xr-x	root/root	lib32/
-lrwxrwxrwx	root/root	lib32/libpcre.so.1 -> libpcre.so.1.2.5
--rwxr-xr-x	root/root	lib32/libpcre.so.1.2.5
-lrwxrwxrwx	root/root	lib32/libpcrecpp.so.0 -> libpcrecpp.so.0.0.1
--rwxr-xr-x	root/root	lib32/libpcrecpp.so.0.0.1
-lrwxrwxrwx	root/root	lib32/libpcreposix.so.0 -> libpcreposix.so.0.0.3
--rwxr-xr-x	root/root	lib32/libpcreposix.so.0.0.3
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
 -rw-r--r--	root/root	usr/lib32/libpcre.a
 -rwxr-xr-x	root/root	usr/lib32/libpcre.la
-lrwxrwxrwx	root/root	usr/lib32/libpcre.so -> ../../lib32/libpcre.so.1.2.5
+lrwxrwxrwx	root/root	usr/lib32/libpcre.so -> libpcre.so.1.2.6
+lrwxrwxrwx	root/root	usr/lib32/libpcre.so.1 -> libpcre.so.1.2.6
+-rwxr-xr-x	root/root	usr/lib32/libpcre.so.1.2.6
 -rw-r--r--	root/root	usr/lib32/libpcrecpp.a
 -rwxr-xr-x	root/root	usr/lib32/libpcrecpp.la
-lrwxrwxrwx	root/root	usr/lib32/libpcrecpp.so -> ../../lib32/libpcrecpp.so.0.0.1
+lrwxrwxrwx	root/root	usr/lib32/libpcrecpp.so -> libpcrecpp.so.0.0.1
+lrwxrwxrwx	root/root	usr/lib32/libpcrecpp.so.0 -> libpcrecpp.so.0.0.1
+-rwxr-xr-x	root/root	usr/lib32/libpcrecpp.so.0.0.1
 -rw-r--r--	root/root	usr/lib32/libpcreposix.a
 -rwxr-xr-x	root/root	usr/lib32/libpcreposix.la
-lrwxrwxrwx	root/root	usr/lib32/libpcreposix.so -> ../../lib32/libpcreposix.so.0.0.3
+lrwxrwxrwx	root/root	usr/lib32/libpcreposix.so -> libpcreposix.so.0.0.3
+lrwxrwxrwx	root/root	usr/lib32/libpcreposix.so.0 -> libpcreposix.so.0.0.3
+-rwxr-xr-x	root/root	usr/lib32/libpcreposix.so.0.0.3
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/libpcre.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/libpcrecpp.pc

libpcre-32/.md5sum

@@ -1,3 +1 @@
-45df6737e61738cc8bb061e0b9c0fbb2  01-seven-security-patches.patch
-5222dd119a2cfde15df9ae2583c64698  libpcre-8.37-CVE-2015-5073.patch
-ed91be292cb01d21bc7e526816c26981  pcre-8.37.tar.bz2
+00aabbfe56d5a48b270f999b508c5ad2  pcre-8.38.tar.bz2

libpcre-32/Pkgfile

@@ -3,34 +3,22 @@
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
 
 name=libpcre-32
-version=8.37
-release=2
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$version.tar.bz2
-    01-seven-security-patches.patch
-    libpcre-8.37-CVE-2015-5073.patch)
+version=8.38
+release=1
+source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$version.tar.bz2)
 
 build() {
     cd pcre-$version
 
-    patch -p1 -i $SRC/01-seven-security-patches.patch
-    patch -p1 -i $SRC/libpcre-8.37-CVE-2015-5073.patch
-
     ./configure --prefix=/usr \
                 --libdir=/usr/lib32 \
                 --mandir=/usr/man \
                 --enable-utf8 \
                 --enable-unicode-properties \
                 --enable-jit
+
     make
     make DESTDIR=$PKG install
 
-    install -d $PKG/lib32
-    local lib
-    for lib in libpcre libpcrecpp libpcreposix ; do
-        mv $PKG/usr/lib32/${lib}.so* $PKG/lib32
-        ln -sf ../../lib32/$(readlink $PKG/lib32/${lib}.so) $PKG/usr/lib32/${lib}.so
-        rm $PKG/lib32/${lib}.so
-    done
-
     rm -r $PKG/usr/{bin,include,man,share}
 }

libpcre-32/libpcre-8.37-CVE-2015-5073.patch

@@ -1,72 +0,0 @@
-https://bugs.exim.org/show_bug.cgi?id=1651
-https://bugs.gentoo.org/553300
-https://bugzilla.redhat.com/1237224
-
-From 354e1f8e921dcb9cf2f3a5eac93cd826d01a7d8a Mon Sep 17 00:00:00 2001
-From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date: Tue, 23 Jun 2015 16:34:53 +0000
-Subject: [PATCH] Fix buffer overflow for forward reference within backward
- assertion with excess closing parenthesis. Bugzilla 1651.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is upstream commit ported to 8.37:
-
-commit 764692f9aea9eab50fdba6cb537441d8b34c6c37
-Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date:   Tue Jun 23 16:34:53 2015 +0000
-
-    Fix buffer overflow for forward reference within backward assertion with excess
-    closing parenthesis. Bugzilla 1651.
-
-    git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1571 2f5784b3-3f2a-0410-8824-cb99058d5e15
-
-It fixes CVE-2015-5073.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- pcre_compile.c       | 2 +-
- testdata/testinput2  | 2 ++
- testdata/testoutput2 | 3 +++
- 3 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/pcre_compile.c b/pcre_compile.c
-index 6f06912..b66b1f6 100644
---- a/pcre_compile.c
-+++ b/pcre_compile.c
-@@ -9392,7 +9392,7 @@ OP_RECURSE that are not fixed length get a diagnosic with a useful offset. The
- exceptional ones forgo this. We scan the pattern to check that they are fixed
- length, and set their lengths. */
- 
--if (cd->check_lookbehind)
-+if (errorcode == 0 && cd->check_lookbehind)
-   {
-   pcre_uchar *cc = (pcre_uchar *)codestart;
- 
-diff --git a/testdata/testinput2 b/testdata/testinput2
-index 83bb471..5cc9ce6 100644
---- a/testdata/testinput2
-+++ b/testdata/testinput2
-@@ -4154,4 +4154,6 @@ backtracking verbs. --/
- 
- "(?J)(?'d'(?'d'\g{d}))"
- 
-+/(?=di(?<=(?1))|(?=(.))))/
-+
- /-- End of testinput2 --/
-diff --git a/testdata/testoutput2 b/testdata/testoutput2
-index 7dff52a..4decb8d 100644
---- a/testdata/testoutput2
-+++ b/testdata/testoutput2
-@@ -14425,4 +14425,7 @@ Failed: lookbehind assertion is not fixed length at offset 17
- 
- "(?J)(?'d'(?'d'\g{d}))"
- 
-+/(?=di(?<=(?1))|(?=(.))))/
-+Failed: unmatched parentheses at offset 23
-+
- /-- End of testinput2 --/
--- 
-2.4.3
-