chiark / gitweb /
Refresh patch series for upstream version 8.38
authorMatthew Vernon <matthew@debian.org>
Tue, 22 Dec 2015 13:35:28 +0000 (13:35 +0000)
committerMatthew Vernon <matthew@debian.org>
Tue, 22 Dec 2015 13:35:28 +0000 (13:35 +0000)
Mostly this consists of removing the patches that were backports of
upstream fixes and refreshing the remainder. Additionally, update our
libtool revision numbers where appropriate.

debian/patches/Disable_JIT_on_sparc64.patch
debian/patches/no_jit_x32_powerpcspe.patch
debian/patches/pcre_info.patch
debian/patches/pcregrep.1-patch
debian/patches/series
debian/patches/soname.patch

index aacf883843230285d6ceb2cc7be5d52024179720..0a6de34ff133ba5cf1a099126513d61417642af0 100644 (file)
@@ -4,11 +4,11 @@ Description: Disable JIT on sparc64 as it needs explicit porting
  until it has been explicitly ported to sparc64.
  .
 
-Index: pcre3-8.35/sljit/sljitConfigInternal.h
+Index: pcre3/sljit/sljitConfigInternal.h
 ===================================================================
---- pcre3-8.35.orig/sljit/sljitConfigInternal.h
-+++ pcre3-8.35/sljit/sljitConfigInternal.h
-@@ -125,7 +125,11 @@
+--- pcre3.orig/sljit/sljitConfigInternal.h     2015-12-22 13:30:50.000000000 +0000
++++ pcre3/sljit/sljitConfigInternal.h  2015-12-22 13:33:30.000000000 +0000
+@@ -145,7 +145,11 @@
  #elif defined(__mips64)
  #define SLJIT_CONFIG_MIPS_64 1
  #elif defined(__sparc__) || defined(__sparc)
index e1b8133ea2d63c9ac6b93aa837a43cd6ab68f390..d49909680ad5d27823539de15e0e0bfb550d4fef 100644 (file)
@@ -1,9 +1,11 @@
 Description: Disable JIT on x32, needs explicit porting to ILP32 amd64, FPU-less PowerPC.
 Author: Thorsten Glaser <tg@mirbsd.org>, Roland Stigge <stigge@antcom.de>
 
---- a/sljit/sljitConfigInternal.h
-+++ b/sljit/sljitConfigInternal.h
-@@ -97,7 +97,11 @@
+Index: pcre3/sljit/sljitConfigInternal.h
+===================================================================
+--- pcre3.orig/sljit/sljitConfigInternal.h     2015-07-31 12:00:43.000000000 +0100
++++ pcre3/sljit/sljitConfigInternal.h  2015-12-22 13:30:50.000000000 +0000
+@@ -117,7 +117,11 @@
  #if defined(__i386__) || defined(__i386)
  #define SLJIT_CONFIG_X86_32 1
  #elif defined(__x86_64__)
@@ -16,7 +18,7 @@ Author: Thorsten Glaser <tg@mirbsd.org>, Roland Stigge <stigge@antcom.de>
  #elif defined(__arm__) || defined(__ARM__)
  #ifdef __thumb2__
  #define SLJIT_CONFIG_ARM_THUMB2 1
-@@ -111,7 +115,11 @@
+@@ -131,7 +135,11 @@
  #elif defined(__ppc64__) || defined(__powerpc64__) || defined(_ARCH_PPC64) || (defined(_POWER) && defined(__64BIT__))
  #define SLJIT_CONFIG_PPC_64 1
  #elif defined(__ppc__) || defined(__powerpc__) || defined(_ARCH_PPC) || defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER)
index a241224dfc8d93b9d5f5070a6a26712194b46e7f..5a8657b23ec524ca20ae6dc6fa874d8578a0dd39 100644 (file)
@@ -1,8 +1,10 @@
 From: Mark Baker <mark@mnb.org.uk>
 Description: Restore obsolete pcre_info() API for compatiblity
 
---- a/Makefile.am
-+++ b/Makefile.am
+Index: pcre3/Makefile.am
+===================================================================
+--- pcre3.orig/Makefile.am     2014-04-04 14:39:50.000000000 +0100
++++ pcre3/Makefile.am  2015-12-22 12:37:59.000000000 +0000
 @@ -233,6 +233,7 @@
    pcre_fullinfo.c \
    pcre_get.c \
@@ -20,9 +22,11 @@ Description: Restore obsolete pcre_info() API for compatiblity
        pcre_newline.o pcre_ord2utf8.o pcre_refcount.o \
        pcre_study.o pcre_tables.o pcre_ucd.o \
        pcre_valid_utf8.o pcre_version.o pcre_chartables.o \
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -216,11 +216,11 @@
+Index: pcre3/Makefile.in
+===================================================================
+--- pcre3.orig/Makefile.in     2015-11-23 12:37:21.000000000 +0000
++++ pcre3/Makefile.in  2015-12-22 12:37:59.000000000 +0000
+@@ -218,11 +218,11 @@
  libpcre_la_DEPENDENCIES =
  am__libpcre_la_SOURCES_DIST = pcre_byte_order.c pcre_compile.c \
        pcre_config.c pcre_dfa_exec.c pcre_exec.c pcre_fullinfo.c \
@@ -39,7 +43,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  @WITH_PCRE8_TRUE@am_libpcre_la_OBJECTS =  \
  @WITH_PCRE8_TRUE@     libpcre_la-pcre_byte_order.lo \
  @WITH_PCRE8_TRUE@     libpcre_la-pcre_compile.lo \
-@@ -230,6 +230,7 @@
+@@ -232,6 +232,7 @@
  @WITH_PCRE8_TRUE@     libpcre_la-pcre_fullinfo.lo \
  @WITH_PCRE8_TRUE@     libpcre_la-pcre_get.lo \
  @WITH_PCRE8_TRUE@     libpcre_la-pcre_globals.lo \
@@ -47,7 +51,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  @WITH_PCRE8_TRUE@     libpcre_la-pcre_jit_compile.lo \
  @WITH_PCRE8_TRUE@     libpcre_la-pcre_maketables.lo \
  @WITH_PCRE8_TRUE@     libpcre_la-pcre_newline.lo \
-@@ -249,7 +250,7 @@
+@@ -251,7 +252,7 @@
  AM_V_lt = $(am__v_lt_@AM_V@)
  am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
  am__v_lt_0 = --silent
@@ -56,7 +60,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  libpcre_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libpcre_la_CFLAGS) \
        $(CFLAGS) $(libpcre_la_LDFLAGS) $(LDFLAGS) -o $@
-@@ -447,11 +448,11 @@
+@@ -449,11 +450,11 @@
  AM_V_GEN = $(am__v_GEN_@AM_V@)
  am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
  am__v_GEN_0 = @echo "  GEN     " $@;
@@ -70,7 +74,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  DEFAULT_INCLUDES = -I.@am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -465,7 +466,7 @@
+@@ -467,7 +468,7 @@
  AM_V_CC = $(am__v_CC_@AM_V@)
  am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
  am__v_CC_0 = @echo "  CC      " $@;
@@ -79,7 +83,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  CCLD = $(CC)
  LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-@@ -473,7 +474,7 @@
+@@ -475,7 +476,7 @@
  AM_V_CCLD = $(am__v_CCLD_@AM_V@)
  am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
  am__v_CCLD_0 = @echo "  CCLD    " $@;
@@ -88,7 +92,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
  LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-@@ -483,7 +484,7 @@
+@@ -485,7 +486,7 @@
  AM_V_CXX = $(am__v_CXX_@AM_V@)
  am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
  am__v_CXX_0 = @echo "  CXX     " $@;
@@ -97,7 +101,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  CXXLD = $(CXX)
  CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-@@ -491,7 +492,7 @@
+@@ -493,7 +494,7 @@
  AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
  am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
  am__v_CXXLD_0 = @echo "  CXXLD   " $@;
@@ -106,7 +110,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  SOURCES = $(libpcre_la_SOURCES) $(nodist_libpcre_la_SOURCES) \
        $(libpcre16_la_SOURCES) $(nodist_libpcre16_la_SOURCES) \
        $(libpcre32_la_SOURCES) $(nodist_libpcre32_la_SOURCES) \
-@@ -820,9 +821,6 @@
+@@ -832,9 +833,6 @@
  PCRE_MINOR = @PCRE_MINOR@
  PCRE_PRERELEASE = @PCRE_PRERELEASE@
  PCRE_STATIC_CFLAG = @PCRE_STATIC_CFLAG@
@@ -116,7 +120,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  PTHREAD_CC = @PTHREAD_CC@
  PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
  PTHREAD_LIBS = @PTHREAD_LIBS@
-@@ -832,8 +830,6 @@
+@@ -844,8 +842,6 @@
  SHELL = @SHELL@
  SHTOOL = @SHTOOL@
  STRIP = @STRIP@
@@ -125,7 +129,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  VERSION = @VERSION@
  VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
  VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
-@@ -976,7 +972,7 @@
+@@ -988,7 +984,7 @@
  # The Libtool libraries to install.  We'll add to this later.
  lib_LTLIBRARIES = $(am__append_4) $(am__append_5) $(am__append_6) \
        $(am__append_20) $(am__append_22)
@@ -134,7 +138,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  dist_noinst_SCRIPTS = RunTest $(am__append_39)
  
  # Additional files to delete on 'make clean' and 'make maintainer-clean'.
-@@ -1081,6 +1077,7 @@
+@@ -1093,6 +1089,7 @@
  @WITH_PCRE8_TRUE@  pcre_fullinfo.c \
  @WITH_PCRE8_TRUE@  pcre_get.c \
  @WITH_PCRE8_TRUE@  pcre_globals.c \
@@ -142,7 +146,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  @WITH_PCRE8_TRUE@  pcre_internal.h \
  @WITH_PCRE8_TRUE@  pcre_jit_compile.c \
  @WITH_PCRE8_TRUE@  pcre_maketables.c \
-@@ -1098,7 +1095,7 @@
+@@ -1110,7 +1107,7 @@
  
  @WITH_PCRE8_TRUE@libpcre_la_CFLAGS = $(VISIBILITY_CFLAGS) $(AM_CFLAGS) \
  @WITH_PCRE8_TRUE@     $(am__append_7) $(am__append_10)
@@ -151,7 +155,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  @WITH_PCRE8_TRUE@nodist_libpcre_la_SOURCES = \
  @WITH_PCRE8_TRUE@  pcre_chartables.c
  
-@@ -1129,7 +1126,7 @@
+@@ -1141,7 +1138,7 @@
  @WITH_PCRE16_TRUE@libpcre16_la_CFLAGS = $(VISIBILITY_CFLAGS) \
  @WITH_PCRE16_TRUE@    $(AM_CFLAGS) $(am__append_8) \
  @WITH_PCRE16_TRUE@    $(am__append_11)
@@ -160,7 +164,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  @WITH_PCRE16_TRUE@nodist_libpcre16_la_SOURCES = \
  @WITH_PCRE16_TRUE@  pcre_chartables.c
  
-@@ -1160,7 +1157,7 @@
+@@ -1172,7 +1169,7 @@
  @WITH_PCRE32_TRUE@libpcre32_la_CFLAGS = $(VISIBILITY_CFLAGS) \
  @WITH_PCRE32_TRUE@    $(AM_CFLAGS) $(am__append_9) \
  @WITH_PCRE32_TRUE@    $(am__append_12)
@@ -169,7 +173,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  @WITH_PCRE32_TRUE@nodist_libpcre32_la_SOURCES = \
  @WITH_PCRE32_TRUE@  pcre_chartables.c
  
-@@ -1215,7 +1212,7 @@
+@@ -1227,7 +1224,7 @@
  # nice DLL for Windows use". (It is used by the pcre.dll target.)
  DLL_OBJS = pcre_byte_order.o pcre_compile.o pcre_config.o \
        pcre_dfa_exec.o pcre_exec.o pcre_fullinfo.o pcre_get.o \
@@ -178,7 +182,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
        pcre_newline.o pcre_ord2utf8.o pcre_refcount.o \
        pcre_study.o pcre_tables.o pcre_ucd.o \
        pcre_valid_utf8.o pcre_version.o pcre_chartables.o \
-@@ -1301,8 +1298,8 @@
+@@ -1313,8 +1310,8 @@
  @WITH_GCOV_TRUE@COVERAGE_NAME = $(PACKAGE)-$(VERSION)
  @WITH_GCOV_TRUE@COVERAGE_OUTPUT_FILE = $(COVERAGE_NAME)-coverage.info
  @WITH_GCOV_TRUE@COVERAGE_OUTPUT_DIR = $(COVERAGE_NAME)-coverage
@@ -189,7 +193,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  @WITH_GCOV_TRUE@coverage_quiet = $(coverage_quiet_$(V))
  @WITH_GCOV_TRUE@coverage_quiet_ = $(coverage_quiet_$(AM_DEFAULT_VERBOSITY))
  @WITH_GCOV_TRUE@coverage_quiet_0 = --quiet
-@@ -1353,7 +1350,7 @@
+@@ -1364,7 +1361,7 @@
  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
        @rm -f stamp-h1
        cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -198,7 +202,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
        ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
        rm -f stamp-h1
        touch $@
-@@ -1414,19 +1411,19 @@
+@@ -1425,19 +1422,19 @@
          rm -f $${locs}; \
        }
  
@@ -223,7 +227,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
        $(AM_V_CCLD)$(libpcreposix_la_LINK) $(am_libpcreposix_la_rpath) $(libpcreposix_la_OBJECTS) $(libpcreposix_la_LIBADD) $(LIBS)
  install-binPROGRAMS: $(bin_PROGRAMS)
        @$(NORMAL_INSTALL)
-@@ -1487,31 +1484,31 @@
+@@ -1498,31 +1495,31 @@
        echo " rm -f" $$list; \
        rm -f $$list
  
@@ -262,7 +266,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
        @rm -f pcretest$(EXEEXT)
        $(AM_V_CCLD)$(pcretest_LINK) $(pcretest_OBJECTS) $(pcretest_LDADD) $(LIBS)
  install-binSCRIPTS: $(bin_SCRIPTS)
-@@ -1612,6 +1609,7 @@
+@@ -1623,6 +1620,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpcre_la-pcre_fullinfo.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpcre_la-pcre_get.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpcre_la-pcre_globals.Plo@am__quote@
@@ -270,7 +274,7 @@ Description: Restore obsolete pcre_info() API for compatiblity
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpcre_la-pcre_jit_compile.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpcre_la-pcre_maketables.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpcre_la-pcre_newline.Plo@am__quote@
-@@ -1715,6 +1713,13 @@
+@@ -1726,6 +1724,13 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpcre_la_CFLAGS) $(CFLAGS) -c -o libpcre_la-pcre_globals.lo `test -f 'pcre_globals.c' || echo '$(srcdir)/'`pcre_globals.c
  
@@ -284,18 +288,10 @@ Description: Restore obsolete pcre_info() API for compatiblity
  libpcre_la-pcre_jit_compile.lo: pcre_jit_compile.c
  @am__fastdepCC_TRUE@  $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpcre_la_CFLAGS) $(CFLAGS) -MT libpcre_la-pcre_jit_compile.lo -MD -MP -MF $(DEPDIR)/libpcre_la-pcre_jit_compile.Tpo -c -o libpcre_la-pcre_jit_compile.lo `test -f 'pcre_jit_compile.c' || echo '$(srcdir)/'`pcre_jit_compile.c
  @am__fastdepCC_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libpcre_la-pcre_jit_compile.Tpo $(DEPDIR)/libpcre_la-pcre_jit_compile.Plo
-@@ -2992,8 +2997,8 @@
-       @echo "it deletes files that may require special tools to rebuild."
-       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
--@WITH_GCOV_FALSE@clean-local:
- @WITH_GCOV_FALSE@distclean-local:
-+@WITH_GCOV_FALSE@clean-local:
- clean: clean-am
- clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
---- /dev/null
-+++ b/pcre_info.c
+Index: pcre3/pcre_info.c
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ pcre3/pcre_info.c  2015-12-22 12:37:59.000000000 +0000
 @@ -0,0 +1,90 @@
 +/*************************************************
 +*      Perl-Compatible Regular Expressions       *
index e7328be1f7b61352acb27f221ff7ec92977e7749..40123694c593d8b979afd0fac404ef814c7b8a07 100644 (file)
@@ -2,10 +2,10 @@ From: Mark Baker <mark@mnb.org.uk>
 Description: Mention zpcregrep wrapper script in pcregrep man page.
 
 
-Index: pcre-8.30/doc/pcregrep.1
+Index: pcre3/doc/pcregrep.1
 ===================================================================
---- pcre-8.30.orig/doc/pcregrep.1      2011-09-11 16:28:04.000000000 +0200
-+++ pcre-8.30/doc/pcregrep.1   2012-03-23 11:05:02.276360705 +0100
+--- pcre3.orig/doc/pcregrep.1  2014-04-04 14:37:38.000000000 +0100
++++ pcre3/doc/pcregrep.1       2015-12-22 12:39:07.000000000 +0000
 @@ -3,6 +3,7 @@
  pcregrep - a grep with Perl-compatible regular expressions.
  .SH SYNOPSIS
@@ -14,7 +14,7 @@ Index: pcre-8.30/doc/pcregrep.1
  .
  .SH DESCRIPTION
  .rs
-@@ -82,6 +83,9 @@
+@@ -87,6 +88,9 @@
  If the \fBLC_ALL\fP or \fBLC_CTYPE\fP environment variable is set,
  \fBpcregrep\fP uses the value to set a locale when calling the PCRE library.
  The \fB--locale\fP option can be used to override this.
index 6bdf0051b84e5e7bd258b39292129cf3e87764a0..bdf74b5c2ffb26792f420fd565f3c72bcffc96ac 100644 (file)
@@ -3,14 +3,5 @@ pcreposix.patch
 pcre_info.patch
 pcregrep.1-patch
 soname.patch
-Fix-silly-quantifier-size-check.patch
-cve-2014-8964.patch
 no_jit_x32_powerpcspe.patch
-fix_find_fixedlength.patch
-Fix-compiler-crash-misbehaviour-for-zero-repeated-gr.patch
-Fix-compile-time-loop-for-recursive-reference-within.patch
-794589-information-disclosure.patch
-Fix-bad-compile-for-groups-like-2-0-1999.patch
-Fix-bad-compilation-for-patterns-like-1-1-with-forwa.patch
-Fix-buffer-overflow-for-named-recursive-back-referen.patch
 Disable_JIT_on_sparc64.patch
index cddd9b05e3cf0c5f293927777ea24f47e594c8fc..cbdae2acd6c7750c3a879069c53b6e46816cbd89 100644 (file)
@@ -1,19 +1,21 @@
 From: Mark Baker <mark@mnb.org.uk>
 Description: Change soname to what debian use
---- a/configure.ac
-+++ b/configure.ac
+Index: pcre3/configure.ac
+===================================================================
+--- pcre3.orig/configure.ac    2015-12-22 13:27:15.000000000 +0000
++++ pcre3/configure.ac 2015-12-22 13:28:37.000000000 +0000
 @@ -17,10 +17,10 @@
  # 50 lines of this file. Please update that if the variables above are moved.
  
  # Libtool shared library interface versions (current:revision:age)
--m4_define(libpcre_version, [3:3:2])
--m4_define(libpcre16_version, [2:3:2])
--m4_define(libpcre32_version, [0:3:0])
--m4_define(libpcreposix_version, [0:2:0])
-+m4_define(libpcre_version, [16:1:13])
-+m4_define(libpcre16_version, [16:1:13])
-+m4_define(libpcre32_version, [16:1:13])
-+m4_define(libpcreposix_version, [16:1:13])
- m4_define(libpcrecpp_version, [0:0:0])
+-m4_define(libpcre_version, [3:6:2])
+-m4_define(libpcre16_version, [2:6:2])
+-m4_define(libpcre32_version, [0:6:0])
+-m4_define(libpcreposix_version, [0:3:0])
++m4_define(libpcre_version, [16:2:13])
++m4_define(libpcre16_version, [16:2:13])
++m4_define(libpcre32_version, [16:2:13])
++m4_define(libpcreposix_version, [16:2:13])
+ m4_define(libpcrecpp_version, [0:1:0])
  
  AC_PREREQ(2.57)