On Thu, Oct 30, 2014 at 05:41:31PM +0000, Iain Lane wrote: > On Thu, Oct 30, 2014 at 04:51:47PM +0000, Iain Lane wrote: > > Source: pcre3 > > Version: 1:8.35-3.1 > > Severity: wishlist > > Tags: patch > > > > Hi Mark, > > > > In Ubuntu we've been carrying this diff to add a symbols file for a > > little while. I thought you might like to have it in Debian too. > > Also (unrelated) here's a patch to enable parallel builds.
Updated version on top of 2:8.35-7 with all changes in one. -- Iain Lane [ [email protected] ] Debian Developer [ [email protected] ] Ubuntu Developer [ [email protected] ]
diff -Nru pcre3-8.35/debian/libpcre16-3.symbols
pcre3-8.35/debian/libpcre16-3.symbols
--- pcre3-8.35/debian/libpcre16-3.symbols 1970-01-01 01:00:00.000000000
+0100
+++ pcre3-8.35/debian/libpcre16-3.symbols 2015-07-09 13:19:19.000000000
+0100
@@ -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
+ 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.35/debian/libpcre32-3.symbols
pcre3-8.35/debian/libpcre32-3.symbols
--- pcre3-8.35/debian/libpcre32-3.symbols 1970-01-01 01:00:00.000000000
+0100
+++ pcre3-8.35/debian/libpcre32-3.symbols 2015-07-09 13:23:36.000000000
+0100
@@ -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
+ 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.35/debian/libpcre3.symbols.in
pcre3-8.35/debian/libpcre3.symbols.in
--- pcre3-8.35/debian/libpcre3.symbols.in 1970-01-01 01:00:00.000000000
+0100
+++ pcre3-8.35/debian/libpcre3.symbols.in 2014-10-29 15:45:20.000000000
+0000
@@ -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.35/debian/libpcrecpp0.symbols
pcre3-8.35/debian/libpcrecpp0.symbols
--- pcre3-8.35/debian/libpcrecpp0.symbols 1970-01-01 01:00:00.000000000
+0100
+++ pcre3-8.35/debian/libpcrecpp0.symbols 2015-07-09 14:27:54.000000000
+0100
@@ -0,0 +1,86 @@
+libpcrecpp.so.0 libpcrecpp0 #MINVER#
+ (c++)"pcrecpp::Arg::parse_char(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_double(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_float(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_int(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_int_cradix(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_int_hex(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_int_octal(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_int_radix(char const*, int, void*, int)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_long(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_long_cradix(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_long_hex(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_longlong(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_longlong_cradix(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_longlong_hex(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_longlong_octal(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_longlong_radix(char const*, int, void*, int)@Base"
7.7
+ (c++)"pcrecpp::Arg::parse_long_octal(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_long_radix(char const*, int, void*, int)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_null(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_short(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_short_cradix(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_short_hex(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_short_octal(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_short_radix(char const*, int, void*, int)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_string(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_stringpiece(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_uchar(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_uint(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_uint_cradix(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_uint_hex(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_uint_octal(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_uint_radix(char const*, int, void*, int)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_ulong(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_ulong_cradix(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_ulong_hex(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_ulonglong(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_ulonglong_cradix(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_ulonglong_hex(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_ulonglong_octal(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_ulonglong_radix(char const*, int, void*, int)@Base"
7.7
+ (c++)"pcrecpp::Arg::parse_ulong_octal(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_ulong_radix(char const*, int, void*, int)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_ushort(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_ushort_cradix(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_ushort_hex(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_ushort_octal(char const*, int, void*)@Base" 7.7
+ (c++)"pcrecpp::Arg::parse_ushort_radix(char const*, int, void*, int)@Base" 7.7
+ (c++)"pcrecpp::RE::Cleanup()@Base" 7.7
+ (c++)"pcrecpp::RE::Compile(pcrecpp::RE::Anchor)@Base" 7.7
+ (c++)"pcrecpp::RE::Consume(pcrecpp::StringPiece*, pcrecpp::Arg const&,
pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg
const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&,
pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg
const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&,
pcrecpp::Arg const&) const@Base" 7.7
+ (c++)"pcrecpp::Scanner::Consume(pcrecpp::RE const&, pcrecpp::Arg const&,
pcrecpp::Arg const&, pcrecpp::Arg const&)@Base" 7.7
+ (c++)"pcrecpp::RE::DoMatchImpl(pcrecpp::StringPiece const&,
pcrecpp::RE::Anchor, int*, pcrecpp::Arg const* const*, int, int*, int)
const@Base" 7.7
+ (c++)"pcrecpp::RE::DoMatch(pcrecpp::StringPiece const&, pcrecpp::RE::Anchor,
int*, pcrecpp::Arg const* const*, int) const@Base" 7.7
+ (c++)"pcrecpp::RE::Extract(pcrecpp::StringPiece const&, pcrecpp::StringPiece
const&, std::basic_string<char, std::char_traits<char>, std::allocator<char>
>*) const@Base" 7.7
+ (c++)"pcrecpp::RE::FindAndConsume(pcrecpp::StringPiece*, pcrecpp::Arg const&,
pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg
const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&,
pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg
const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&,
pcrecpp::Arg const&) const@Base" 7.7
+ (c++)"pcrecpp::RE::FullMatch(pcrecpp::StringPiece const&, pcrecpp::Arg
const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&,
pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg
const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&,
pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg
const&, pcrecpp::Arg const&) const@Base" 7.7
+ (c++)"pcrecpp::RE::GlobalReplace(pcrecpp::StringPiece const&,
std::basic_string<char, std::char_traits<char>, std::allocator<char> >*)
const@Base" 7.7
+ (c++)"pcrecpp::RE::Init(char const*, pcrecpp::RE_Options const*)@Base" 7.7
+ (c++)"pcrecpp::RE::Init(std::basic_string<char, std::char_traits<char>,
std::allocator<char> > const&, pcrecpp::RE_Options const*)@Base" 7.7
+ (c++)"pcrecpp::RE::no_arg@Base" 7.7
+ (c++)"pcrecpp::RE::NumberOfCapturingGroups() const@Base" 7.7
+ (c++)"pcrecpp::RE::PartialMatch(pcrecpp::StringPiece const&, pcrecpp::Arg
const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&,
pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg
const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&,
pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg const&, pcrecpp::Arg
const&, pcrecpp::Arg const&) const@Base" 7.7
+ (c++)"pcrecpp::RE::QuoteMeta(pcrecpp::StringPiece const&)@Base" 7.7
+ (c++)"pcrecpp::RE::~RE()@Base" 7.7
+ (c++)"pcrecpp::RE::~RE()@Base" 7.7
+ (c++)"pcrecpp::RE::Replace(pcrecpp::StringPiece const&,
std::basic_string<char, std::char_traits<char>, std::allocator<char> >*)
const@Base" 7.7
+ (c++)"pcrecpp::RE::Rewrite(std::basic_string<char, std::char_traits<char>,
std::allocator<char> >*, pcrecpp::StringPiece const&, pcrecpp::StringPiece
const&, int*, int) const@Base" 7.7
+ (c++)"pcrecpp::RE::TryMatch(pcrecpp::StringPiece const&, int,
pcrecpp::RE::Anchor, bool, int*, int) const@Base" 7.7
+ (c++)"pcrecpp::Scanner::ConsumeSkip()@Base" 7.7
+ (c++)"pcrecpp::Scanner::DisableSkip()@Base" 7.7
+ (c++)"pcrecpp::Scanner::EnableSkip()@Base" 7.7
+ (c++)"pcrecpp::Scanner::GetComments(int, int,
std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece>
>*)@Base" 7.7
+ (c++)"pcrecpp::Scanner::GetNextComments(std::vector<pcrecpp::StringPiece,
std::allocator<pcrecpp::StringPiece> >*)@Base" 7.7
+ (c++)"pcrecpp::Scanner::LineNumber() const@Base" 7.7
+ (c++)"pcrecpp::Scanner::LookingAt(pcrecpp::RE const&) const@Base" 7.7
+ (c++)"pcrecpp::Scanner::Offset() const@Base" 7.7
+ (c++)"pcrecpp::Scanner::~Scanner()@Base" 7.7
+ (c++)"pcrecpp::Scanner::~Scanner()@Base" 7.7
+ (c++)"pcrecpp::Scanner::Scanner()@Base" 7.7
+ (c++)"pcrecpp::Scanner::Scanner()@Base" 7.7
+ (c++)"pcrecpp::Scanner::Scanner(std::basic_string<char,
std::char_traits<char>, std::allocator<char> > const&)@Base" 7.7
+ (c++)"pcrecpp::Scanner::Scanner(std::basic_string<char,
std::char_traits<char>, std::allocator<char> > const&)@Base" 7.7
+ (c++)"pcrecpp::Scanner::SetSkipExpression(char const*)@Base" 7.7
+ (c++)"pcrecpp::Scanner::Skip(char const*)@Base" 7.7
+ (c++)"std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece>
>::_M_insert_aux(__gnu_cxx::__normal_iterator<pcrecpp::StringPiece*,
std::vector<pcrecpp::StringPiece, std::allocator<pcrecpp::StringPiece> > >,
pcrecpp::StringPiece const&)@Base" 7.7
diff -Nru pcre3-8.35/debian/rules pcre3-8.35/debian/rules
--- pcre3-8.35/debian/rules 2015-03-07 19:21:29.000000000 +0000
+++ pcre3-8.35/debian/rules 2015-07-09 13:24:19.000000000 +0100
@@ -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,7 @@
### -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
dh_autoreconf_clean
dh_clean
@@ -112,9 +119,14 @@
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)'
- dh_makeshlibs -plibpcrecpp0 -V 'libpcrecpp0 (>= 7.7)'
- dh_makeshlibs -plibpcre16-3 -plibpcre32-3
+ifneq (,$(ENABLE_JIT))
+ sed -e 's/JIT//' debian/libpcre3.symbols.in > debian/libpcre3.symbols
+else
+ sed -e 's/JIT/#/' debian/libpcre3.symbols.in > debian/libpcre3.symbols
+endif
+ dh_makeshlibs -plibpcre3 --add-udeb="libpcre3-udeb" -V 'libpcre3 (>=
1:8.35)' -- -c4
+ dh_makeshlibs -plibpcrecpp0 -V 'libpcrecpp0 (>= 7.7)' -- -c4
+ dh_makeshlibs -plibpcre16-3 -plibpcre32-3 -- -c4
dh_installdeb -a
# dh_perl -a
dh_shlibdeps -a -ldebian/libpcre3/usr/lib/$(DEB_HOST_MULTIARCH)
signature.asc
Description: Digital signature
