Hi Matthew
Attached is an updated version of Iain's all-in-one patch which can be
applied on top of 2:8.38-1.
The libpcrecpp0v5 symbols have been dropped since they are now in the
Debian packaging.
The libpcre{16,32}-3 symbols are now also generated dynamically to deal
with JIT, like the libpcre3 symbols in Iain's previous patch.
Please consider applying this patch as it will allow pcre3 in Ubuntu to
automatically synchronize with Debian in future.
Regards
Graham
diff -Nru pcre3-8.38/debian/libpcre16-3.symbols.in
pcre3-8.38/debian/libpcre16-3.symbols.in
--- pcre3-8.38/debian/libpcre16-3.symbols.in 1970-01-01 02:00:00.000000000
+0200
+++ pcre3-8.38/debian/libpcre16-3.symbols.in 2015-09-08 16:42:49.000000000
+0200
@@ -0,0 +1,34 @@
+libpcre16.so.3 libpcre16-3 #MINVER#
+ pcre16_assign_jit_stack@Base 2:8.35-4
+ pcre16_callout@Base 2:8.35-4
+ pcre16_compile2@Base 2:8.35-4
+ pcre16_compile@Base 2:8.35-4
+ pcre16_config@Base 2:8.35-4
+ pcre16_copy_named_substring@Base 2:8.35-4
+ pcre16_copy_substring@Base 2:8.35-4
+ pcre16_dfa_exec@Base 2:8.35-4
+ pcre16_exec@Base 2:8.35-4
+ pcre16_free@Base 2:8.35-4
+ pcre16_free_study@Base 2:8.35-4
+ pcre16_free_substring@Base 2:8.35-4
+ pcre16_free_substring_list@Base 2:8.35-4
+ pcre16_fullinfo@Base 2:8.35-4
+ pcre16_get_named_substring@Base 2:8.35-4
+ pcre16_get_stringnumber@Base 2:8.35-4
+ pcre16_get_stringtable_entries@Base 2:8.35-4
+ pcre16_get_substring@Base 2:8.35-4
+ pcre16_get_substring_list@Base 2:8.35-4
+JIT pcre16_jit_exec@Base 2:8.35-4
+ pcre16_jit_free_unused_memory@Base 2:8.35-4
+ pcre16_jit_stack_alloc@Base 2:8.35-4
+ pcre16_jit_stack_free@Base 2:8.35-4
+ pcre16_maketables@Base 2:8.35-4
+ pcre16_malloc@Base 2:8.35-4
+ pcre16_pattern_to_host_byte_order@Base 2:8.35-4
+ pcre16_refcount@Base 2:8.35-4
+ pcre16_stack_free@Base 2:8.35-4
+ pcre16_stack_guard@Base 2:8.35-4
+ pcre16_stack_malloc@Base 2:8.35-4
+ pcre16_study@Base 2:8.35-4
+ pcre16_utf16_to_host_byte_order@Base 2:8.35-4
+ pcre16_version@Base 2:8.35-4
diff -Nru pcre3-8.38/debian/libpcre32-3.symbols.in
pcre3-8.38/debian/libpcre32-3.symbols.in
--- pcre3-8.38/debian/libpcre32-3.symbols.in 1970-01-01 02:00:00.000000000
+0200
+++ pcre3-8.38/debian/libpcre32-3.symbols.in 2015-09-08 16:43:01.000000000
+0200
@@ -0,0 +1,34 @@
+libpcre32.so.3 libpcre32-3 #MINVER#
+ pcre32_assign_jit_stack@Base 2:8.35-4
+ pcre32_callout@Base 2:8.35-4
+ pcre32_compile2@Base 2:8.35-4
+ pcre32_compile@Base 2:8.35-4
+ pcre32_config@Base 2:8.35-4
+ pcre32_copy_named_substring@Base 2:8.35-4
+ pcre32_copy_substring@Base 2:8.35-4
+ pcre32_dfa_exec@Base 2:8.35-4
+ pcre32_exec@Base 2:8.35-4
+ pcre32_free@Base 2:8.35-4
+ pcre32_free_study@Base 2:8.35-4
+ pcre32_free_substring@Base 2:8.35-4
+ pcre32_free_substring_list@Base 2:8.35-4
+ pcre32_fullinfo@Base 2:8.35-4
+ pcre32_get_named_substring@Base 2:8.35-4
+ pcre32_get_stringnumber@Base 2:8.35-4
+ pcre32_get_stringtable_entries@Base 2:8.35-4
+ pcre32_get_substring@Base 2:8.35-4
+ pcre32_get_substring_list@Base 2:8.35-4
+JIT pcre32_jit_exec@Base 2:8.35-4
+ pcre32_jit_free_unused_memory@Base 2:8.35-4
+ pcre32_jit_stack_alloc@Base 2:8.35-4
+ pcre32_jit_stack_free@Base 2:8.35-4
+ pcre32_maketables@Base 2:8.35-4
+ pcre32_malloc@Base 2:8.35-4
+ pcre32_pattern_to_host_byte_order@Base 2:8.35-4
+ pcre32_refcount@Base 2:8.35-4
+ pcre32_stack_free@Base 2:8.35-4
+ pcre32_stack_guard@Base 2:8.35-4
+ pcre32_stack_malloc@Base 2:8.35-4
+ pcre32_study@Base 2:8.35-4
+ pcre32_utf32_to_host_byte_order@Base 2:8.35-4
+ pcre32_version@Base 2:8.35-4
diff -Nru pcre3-8.38/debian/libpcre3.symbols.in
pcre3-8.38/debian/libpcre3.symbols.in
--- pcre3-8.38/debian/libpcre3.symbols.in 1970-01-01 02:00:00.000000000
+0200
+++ pcre3-8.38/debian/libpcre3.symbols.in 2014-10-29 17:45:20.000000000
+0200
@@ -0,0 +1,39 @@
+libpcre.so.3 libpcre3
+ pcre_assign_jit_stack@Base 8.10
+ pcre_callout@Base 8.10
+ pcre_compile2@Base 8.10
+ pcre_compile@Base 8.10
+ pcre_config@Base 8.10
+ pcre_copy_named_substring@Base 8.10
+ pcre_copy_substring@Base 8.10
+ pcre_dfa_exec@Base 8.10
+ pcre_exec@Base 8.10
+ pcre_free@Base 8.10
+ pcre_free_study@Base 8.20
+ pcre_free_substring@Base 8.10
+ pcre_free_substring_list@Base 8.10
+ pcre_fullinfo@Base 8.10
+ pcre_get_named_substring@Base 8.10
+ pcre_get_stringnumber@Base 8.10
+ pcre_get_stringtable_entries@Base 8.10
+ pcre_get_substring@Base 8.10
+ pcre_get_substring_list@Base 8.10
+ pcre_info@Base 8.10
+JIT pcre_jit_exec@Base 1:8.35
+ pcre_jit_free_unused_memory@Base 1:8.35
+ pcre_jit_stack_alloc@Base 8.10
+ pcre_jit_stack_free@Base 8.10
+ pcre_maketables@Base 8.10
+ pcre_malloc@Base 8.10
+ pcre_pattern_to_host_byte_order@Base 8.10
+ pcre_refcount@Base 8.10
+ pcre_stack_free@Base 8.10
+ pcre_stack_guard@Base 1:8.35
+ pcre_stack_malloc@Base 8.10
+ pcre_study@Base 8.10
+ pcre_version@Base 8.10
+libpcreposix.so.3 libpcre3
+ pcreposix_regcomp@Base 8.10
+ pcreposix_regerror@Base 8.10
+ pcreposix_regexec@Base 8.10
+ pcreposix_regfree@Base 8.10
diff -Nru pcre3-8.38/debian/rules pcre3-8.38/debian/rules
--- pcre3-8.38/debian/rules 2015-08-29 14:15:21.000000000 +0200
+++ pcre3-8.38/debian/rules 2016-01-12 21:59:53.000000000 +0200
@@ -21,6 +21,12 @@
INSTALL_PROGRAM += -s
endif
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NJOBS = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+endif
+
+ENABLE_JIT=$(shell . debian/jit-test)
+
configure-stamp:
dh_testdir
# Add here commands to configure the package.
@@ -32,9 +38,9 @@
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--enable-utf8 --enable-unicode-properties \
--disable-silent-rules \
+ $(ENABLE_JIT) \
--enable-pcre16 \
--enable-pcre32 \
- $(shell . debian/jit-test) \
$(shell DEB_CFLAGS_MAINT_APPEND=-Wall
DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --export=configure)
touch configure-stamp
@@ -45,7 +51,7 @@
dh_testdir
# Add here commands to compile the package.
- $(MAKE)
+ $(MAKE) $(NJOBS)
ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
$(MAKE) check VERBOSE=1
endif
@@ -63,6 +69,9 @@
### -test -r /usr/share/misc/config.guess && \
### cp -f /usr/share/misc/config.guess config.guess
rm -f dftables testsavedregex
+ rm -f debian/libpcre3.symbols
+ rm -f debian/libpcre16-3.symbols
+ rm -f debian/libpcre32-3.symbols
dh_autoreconf_clean
dh_clean
@@ -112,9 +121,18 @@
rm debian/libpcre3-dbg/usr/lib/debug/usr/lib/libpcre*
dh_compress -a
dh_fixperms -a
- dh_makeshlibs -plibpcre3 --add-udeb="libpcre3-udeb" -V 'libpcre3 (>=
1:8.35)'
+ifneq (,$(ENABLE_JIT))
+ sed -e 's/JIT//' debian/libpcre3.symbols.in > debian/libpcre3.symbols
+ sed -e 's/JIT//' debian/libpcre16-3.symbols.in >
debian/libpcre16-3.symbols
+ sed -e 's/JIT//' debian/libpcre32-3.symbols.in >
debian/libpcre32-3.symbols
+else
+ sed -e 's/JIT/#/' debian/libpcre3.symbols.in > debian/libpcre3.symbols
+ sed -e 's/JIT/#/' debian/libpcre16-3.symbols.in >
debian/libpcre16-3.symbols
+ sed -e 's/JIT/#/' debian/libpcre32-3.symbols.in >
debian/libpcre32-3.symbols
+endif
+ dh_makeshlibs -plibpcre3 --add-udeb="libpcre3-udeb" -V 'libpcre3 (>=
1:8.35)' -- -c4
dh_makeshlibs -plibpcrecpp0v5 -V 'libpcrecpp0v5 (>= 7.7)' -- -c4
- dh_makeshlibs -plibpcre16-3 -plibpcre32-3
+ dh_makeshlibs -plibpcre16-3 -plibpcre32-3 -- -c4
dh_installdeb -a
# dh_perl -a
dh_shlibdeps -a -ldebian/libpcre3/usr/lib/$(DEB_HOST_MULTIARCH)
