libpcre: updated to 8.31 and aligned with upstream

diff --git a/libpcre/.footprint b/libpcre/.footprint
index 43372ec6cf677484033f76e45e7c30d456fabbf9..f0ddcfcd8ff833d726b73a9a9d8ec571c9b6bb85 100644 (file)
--- a/libpcre/.footprint
+++ b/libpcre/.footprint
@@ -1,3 +1,10 @@
+drwxr-xr-x     root/root       lib/
+lrwxrwxrwx     root/root       lib/libpcre.so.1 -> libpcre.so.1.0.1
+-rwxr-xr-x     root/root       lib/libpcre.so.1.0.1
+lrwxrwxrwx     root/root       lib/libpcrecpp.so.0 -> libpcrecpp.so.0.0.0
+-rwxr-xr-x     root/root       lib/libpcrecpp.so.0.0.0
+lrwxrwxrwx     root/root       lib/libpcreposix.so.0 -> libpcreposix.so.0.0.1
+-rwxr-xr-x     root/root       lib/libpcreposix.so.0.0.1
 drwxr-xr-x     root/root       usr/
 drwxr-xr-x     root/root       usr/bin/
 -rwxr-xr-x     root/root       usr/bin/pcre-config
@@ -13,19 +20,13 @@ drwxr-xr-x  root/root       usr/include/
 drwxr-xr-x     root/root       usr/lib/
 -rw-r--r--     root/root       usr/lib/libpcre.a
 -rwxr-xr-x     root/root       usr/lib/libpcre.la
-lrwxrwxrwx     root/root       usr/lib/libpcre.so -> libpcre.so.0.0.1
-lrwxrwxrwx     root/root       usr/lib/libpcre.so.0 -> libpcre.so.0.0.1
--rwxr-xr-x     root/root       usr/lib/libpcre.so.0.0.1
+lrwxrwxrwx     root/root       usr/lib/libpcre.so -> ../../lib/libpcre.so.1.0.1
 -rw-r--r--     root/root       usr/lib/libpcrecpp.a
 -rwxr-xr-x     root/root       usr/lib/libpcrecpp.la
-lrwxrwxrwx     root/root       usr/lib/libpcrecpp.so -> libpcrecpp.so.0.0.0
-lrwxrwxrwx     root/root       usr/lib/libpcrecpp.so.0 -> libpcrecpp.so.0.0.0
--rwxr-xr-x     root/root       usr/lib/libpcrecpp.so.0.0.0
+lrwxrwxrwx     root/root       usr/lib/libpcrecpp.so -> ../../lib/libpcrecpp.so.0.0.0
 -rw-r--r--     root/root       usr/lib/libpcreposix.a
 -rwxr-xr-x     root/root       usr/lib/libpcreposix.la
-lrwxrwxrwx     root/root       usr/lib/libpcreposix.so -> libpcreposix.so.0.0.0
-lrwxrwxrwx     root/root       usr/lib/libpcreposix.so.0 -> libpcreposix.so.0.0.0
--rwxr-xr-x     root/root       usr/lib/libpcreposix.so.0.0.0
+lrwxrwxrwx     root/root       usr/lib/libpcreposix.so -> ../../lib/libpcreposix.so.0.0.1
 drwxr-xr-x     root/root       usr/lib/pkgconfig/
 -rw-r--r--     root/root       usr/lib/pkgconfig/libpcre.pc
 -rw-r--r--     root/root       usr/lib/pkgconfig/libpcrecpp.pc
@@ -37,6 +38,33 @@ drwxr-xr-x   root/root       usr/man/man1/
 -rw-r--r--     root/root       usr/man/man1/pcretest.1.gz
 drwxr-xr-x     root/root       usr/man/man3/
 -rw-r--r--     root/root       usr/man/man3/pcre.3.gz
+-rw-r--r--     root/root       usr/man/man3/pcre16.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_assign_jit_stack.3.gz -> pcre_assign_jit_stack.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_compile.3.gz -> pcre_compile.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_compile2.3.gz -> pcre_compile2.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_config.3.gz -> pcre_config.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_copy_named_substring.3.gz -> pcre_copy_named_substring.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_copy_substring.3.gz -> pcre_copy_substring.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_dfa_exec.3.gz -> pcre_dfa_exec.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_exec.3.gz -> pcre_exec.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_free_study.3.gz -> pcre_free_study.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_free_substring.3.gz -> pcre_free_substring.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_free_substring_list.3.gz -> pcre_free_substring_list.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_fullinfo.3.gz -> pcre_fullinfo.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_get_named_substring.3.gz -> pcre_get_named_substring.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_get_stringnumber.3.gz -> pcre_get_stringnumber.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_get_stringtable_entries.3.gz -> pcre_get_stringtable_entries.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_get_substring.3.gz -> pcre_get_substring.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_get_substring_list.3.gz -> pcre_get_substring_list.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_jit_stack_alloc.3.gz -> pcre_jit_stack_alloc.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_jit_stack_free.3.gz -> pcre_jit_stack_free.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_maketables.3.gz -> pcre_maketables.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_pattern_to_host_byte_order.3.gz -> pcre_pattern_to_host_byte_order.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_refcount.3.gz -> pcre_refcount.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_study.3.gz -> pcre_study.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_utf16_to_host_byte_order.3.gz -> pcre_utf16_to_host_byte_order.3.gz
+lrwxrwxrwx     root/root       usr/man/man3/pcre16_version.3.gz -> pcre_version.3.gz
+-rw-r--r--     root/root       usr/man/man3/pcre_assign_jit_stack.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcre_compile.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcre_compile2.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcre_config.3.gz
@@ -44,6 +72,7 @@ drwxr-xr-x    root/root       usr/man/man3/
 -rw-r--r--     root/root       usr/man/man3/pcre_copy_substring.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcre_dfa_exec.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcre_exec.3.gz
+-rw-r--r--     root/root       usr/man/man3/pcre_free_study.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcre_free_substring.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcre_free_substring_list.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcre_fullinfo.3.gz
@@ -52,16 +81,21 @@ drwxr-xr-x  root/root       usr/man/man3/
 -rw-r--r--     root/root       usr/man/man3/pcre_get_stringtable_entries.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcre_get_substring.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcre_get_substring_list.3.gz
--rw-r--r--     root/root       usr/man/man3/pcre_info.3.gz
+-rw-r--r--     root/root       usr/man/man3/pcre_jit_stack_alloc.3.gz
+-rw-r--r--     root/root       usr/man/man3/pcre_jit_stack_free.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcre_maketables.3.gz
+-rw-r--r--     root/root       usr/man/man3/pcre_pattern_to_host_byte_order.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcre_refcount.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcre_study.3.gz
+-rw-r--r--     root/root       usr/man/man3/pcre_utf16_to_host_byte_order.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcre_version.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcreapi.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcrebuild.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcrecallout.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcrecompat.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcrecpp.3.gz
+-rw-r--r--     root/root       usr/man/man3/pcrejit.3.gz
+-rw-r--r--     root/root       usr/man/man3/pcrelimits.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcrematching.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcrepartial.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcrepattern.3.gz
@@ -71,3 +105,4 @@ drwxr-xr-x   root/root       usr/man/man3/
 -rw-r--r--     root/root       usr/man/man3/pcresample.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcrestack.3.gz
 -rw-r--r--     root/root       usr/man/man3/pcresyntax.3.gz
+-rw-r--r--     root/root       usr/man/man3/pcreunicode.3.gz

diff --git a/libpcre/.md5sum b/libpcre/.md5sum
index 195a6a99a46379b0dbdd9155724d922452798897..d68d6838032e77c6c49800747db50a37dfb698a6 100644 (file)
--- a/libpcre/.md5sum
+++ b/libpcre/.md5sum
@@ -1 +1 @@
-f14a9fef3c92f3fc6c5ac92d7a2c7eb3  pcre-8.12.tar.bz2
+1c9a276af932b5599157f96e945391f0  pcre-8.31.tar.bz2

diff --git a/libpcre/Pkgfile b/libpcre/Pkgfile
index 04668c163bb74030372475b7c972963a487690be..dfab1eccf03789fc2198abce862694185856b5ba 100644 (file)
--- a/libpcre/Pkgfile
+++ b/libpcre/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:
 
 name=libpcre
-version=8.12
+version=8.31
 release=1
 source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$version.tar.bz2)
 
@@ -17,9 +17,19 @@ build() {
               --prefix=/usr \
               --mandir=/usr/man \
               --enable-utf8 \
-              --enable-unicode-properties
+              --enable-unicode-properties \
+              --enable-jit
+
   make
   make DESTDIR=$PKG install
   
+  install -d $PKG/lib
+  local lib
+  for lib in libpcre libpcrecpp libpcreposix ; do
+    mv $PKG/usr/lib/${lib}.so* $PKG/lib
+    ln -sf ../../lib/$(readlink $PKG/lib/${lib}.so) $PKG/usr/lib/${lib}.so
+    rm $PKG/lib/${lib}.so
+  done
+
   rm -r $PKG/usr/share
 }