Browse Source

Add pcre3, serd and sord

Signed-off-by: falkTX <falktx@falktx.com>
master
falkTX 3 years ago
parent
commit
d84da0e091
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
28 changed files with 925 additions and 4 deletions
  1. +1
    -1
      sources/libs/opus-static/debian/changelog
  2. +0
    -1
      sources/libs/opus-static/debian/control
  3. +5
    -0
      sources/libs/pcre3-static/debian/changelog
  4. +20
    -0
      sources/libs/pcre3-static/debian/control
  5. +19
    -0
      sources/libs/pcre3-static/debian/patches/CVE-2017-6004.patch
  6. +25
    -0
      sources/libs/pcre3-static/debian/patches/Disable_JIT_on_sparc64.patch
  7. +53
    -0
      sources/libs/pcre3-static/debian/patches/PCRE6_compatible_API.patch
  8. +38
    -0
      sources/libs/pcre3-static/debian/patches/no_jit_x32_powerpcspe.patch
  9. +26
    -0
      sources/libs/pcre3-static/debian/patches/patch-from-mariadb-to-fix-stack-frame-si
  10. +394
    -0
      sources/libs/pcre3-static/debian/patches/pcre_info.patch
  11. +30
    -0
      sources/libs/pcre3-static/debian/patches/pcregrep.1-patch
  12. +36
    -0
      sources/libs/pcre3-static/debian/patches/pcreposix.patch
  13. +11
    -0
      sources/libs/pcre3-static/debian/patches/series
  14. +28
    -0
      sources/libs/pcre3-static/debian/patches/soname.patch
  15. +59
    -0
      sources/libs/pcre3-static/debian/patches/upstream-fix-for-cve-2017-7186-upstream-
  16. +37
    -0
      sources/libs/pcre3-static/debian/patches/upstream-patch-fixing-cve-2020-14155.patch
  17. +24
    -0
      sources/libs/pcre3-static/debian/rules
  18. +1
    -0
      sources/libs/pcre3-static/debian/source/format
  19. +1
    -1
      sources/libs/serd-static/debian/changelog
  20. +3
    -1
      sources/libs/serd-static/debian/control
  21. +5
    -0
      sources/libs/sord-static/debian/changelog
  22. +34
    -0
      sources/libs/sord-static/debian/control
  23. +12
    -0
      sources/libs/sord-static/debian/patches/01_dont-run-ldconfig.patch
  24. +21
    -0
      sources/libs/sord-static/debian/patches/02_hidden-sord-api.patch
  25. +9
    -0
      sources/libs/sord-static/debian/patches/03_force-libs.patch
  26. +3
    -0
      sources/libs/sord-static/debian/patches/series
  27. +29
    -0
      sources/libs/sord-static/debian/rules
  28. +1
    -0
      sources/libs/sord-static/debian/source/format

+ 1
- 1
sources/libs/opus-static/debian/changelog View File

@@ -1,4 +1,4 @@
opus-static (3:1.3.1-1kxstudio6) focal; urgency=medium
opus-static (3:1.3.1-1kxstudio7) focal; urgency=medium


* Initial package * Initial package




+ 0
- 1
sources/libs/opus-static/debian/control View File

@@ -14,7 +14,6 @@ Rules-Requires-Root: no
Package: libopus-static Package: libopus-static
Architecture: any Architecture: any
Depends: ${misc:Depends} Depends: ${misc:Depends}
Conflicts: libopus-static
Description: Opus codec library (static) Description: Opus codec library (static)
The Opus codec is designed for interactive speech and audio transmission over The Opus codec is designed for interactive speech and audio transmission over
the Internet. It is designed by the IETF Codec Working Group and incorporates the Internet. It is designed by the IETF Codec Working Group and incorporates


+ 5
- 0
sources/libs/pcre3-static/debian/changelog View File

@@ -0,0 +1,5 @@
pcre3-static (6:8.39-1kxstudio1) focal; urgency=medium

* Initial package

-- falkTX <falktx@falktx.com> Sun, 17 Apr 2022 15:05:47 +0100

+ 20
- 0
sources/libs/pcre3-static/debian/control View File

@@ -0,0 +1,20 @@
Source: pcre3-static
Section: libs
Priority: optional
Maintainer: falkTX <falktx@falktx.com>
Build-Depends: debhelper-compat (= 13),
kxstudio-build-scripts,
autoconf,
automake,
libtool
Standards-Version: 4.5.0
Rules-Requires-Root: no

Package: libpcre3-static
Architecture: any
Depends: ${misc:Depends}
Description: Old Perl 5 Compatible Regular Expression Library (static)
This is a library of functions to support regular expressions whose syntax
and semantics are as close as possible to those of the Perl 5 language.
.
This package provides the static library used in KXStudio builds.

+ 19
- 0
sources/libs/pcre3-static/debian/patches/CVE-2017-6004.patch View File

@@ -0,0 +1,19 @@
Description: CVE-2017-6004: crafted regular expression may cause denial of service
Origin: upstream, https://vcs.pcre.org/pcre/code/trunk/pcre_jit_compile.c?r1=1676&r2=1680&view=patch
Bug: https://bugs.exim.org/show_bug.cgi?id=2035
Bug-Debian: https://bugs.debian.org/855405
Forwarded: not-needed
Author: Salvatore Bonaccorso <carnil@debian.org>
Last-Update: 2017-02-17

--- a/pcre_jit_compile.c
+++ b/pcre_jit_compile.c
@@ -8111,7 +8111,7 @@ if (opcode == OP_COND || opcode == OP_SC
if (*matchingpath == OP_FAIL)
stacksize = 0;
- if (*matchingpath == OP_RREF)
+ else if (*matchingpath == OP_RREF)
{
stacksize = GET2(matchingpath, 1);
if (common->currententry == NULL)

+ 25
- 0
sources/libs/pcre3-static/debian/patches/Disable_JIT_on_sparc64.patch View File

@@ -0,0 +1,25 @@
From: Matthew Vernon <matthew@debian.org>
Date: Wed, 13 Jul 2016 21:20:13 +0100
Subject: Disable_JIT_on_sparc64

---
sljit/sljitConfigInternal.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sljit/sljitConfigInternal.h b/sljit/sljitConfigInternal.h
index b2bc80a..2d031f5 100644
--- a/sljit/sljitConfigInternal.h
+++ b/sljit/sljitConfigInternal.h
@@ -145,7 +145,11 @@
#elif defined(__mips64)
#define SLJIT_CONFIG_MIPS_64 1
#elif defined(__sparc__) || defined(__sparc)
-#define SLJIT_CONFIG_SPARC_32 1
+# if defined(__arch64__)
+# define SLJIT_CONFIG_UNSUPPORTED 1
+# else
+# define SLJIT_CONFIG_SPARC_32 1
+# endif
#elif defined(__tilegx__)
#define SLJIT_CONFIG_TILEGX 1
#else

+ 53
- 0
sources/libs/pcre3-static/debian/patches/PCRE6_compatible_API.patch View File

@@ -0,0 +1,53 @@
From: Mark Baker <mark@mnb.org.uk>
Date: Wed, 13 Jul 2016 21:20:13 +0100
Subject: PCRE6_compatible_API

---
pcrecpp.cc | 6 ++++++
pcrecpp.h | 2 ++
pcretest.c | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pcrecpp.cc b/pcrecpp.cc
index d09c9ab..728b074 100644
--- a/pcrecpp.cc
+++ b/pcrecpp.cc
@@ -80,6 +80,12 @@ static const string empty_string;
// If the user doesn't ask for any options, we just use this one
static RE_Options default_options;
+// PCRE6.x compatible API
+void RE::Init(const char *c_pat, const RE_Options* options) {
+ const string cxx_pat(c_pat);
+ Init(cxx_pat, options);
+}
+
void RE::Init(const string& pat, const RE_Options* options) {
pattern_ = pat;
if (options == NULL) {
diff --git a/pcrecpp.h b/pcrecpp.h
index 3e594b0..a520057 100644
--- a/pcrecpp.h
+++ b/pcrecpp.h
@@ -658,6 +658,8 @@ class PCRECPP_EXP_DEFN RE {
private:
void Init(const string& pattern, const RE_Options* options);
+ // Old version from PCRE 6.x, for compatibility
+ void Init(const char *pattern, const RE_Options* options);
void Cleanup();
// Match against "text", filling in "vec" (up to "vecsize" * 2/3) with
diff --git a/pcretest.c b/pcretest.c
index 78ef517..f42f0a3 100644
--- a/pcretest.c
+++ b/pcretest.c
@@ -2984,7 +2984,7 @@ int main(int argc, char **argv)
{
FILE *infile = stdin;
const char *version;
-int options = 0;
+long int options = 0;
int study_options = 0;
int default_find_match_limit = FALSE;
pcre_uint32 default_options = 0;

+ 38
- 0
sources/libs/pcre3-static/debian/patches/no_jit_x32_powerpcspe.patch View File

@@ -0,0 +1,38 @@
From: Matthew Vernon <matthew@debian.org>
Date: Wed, 13 Jul 2016 21:20:13 +0100
Subject: no_jit_x32_powerpcspe

---
sljit/sljitConfigInternal.h | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/sljit/sljitConfigInternal.h b/sljit/sljitConfigInternal.h
index 9275b14..b2bc80a 100644
--- a/sljit/sljitConfigInternal.h
+++ b/sljit/sljitConfigInternal.h
@@ -117,7 +117,11 @@
#if defined(__i386__) || defined(__i386)
#define SLJIT_CONFIG_X86_32 1
#elif defined(__x86_64__)
-#define SLJIT_CONFIG_X86_64 1
+# if defined(__ILP32__)
+# define SLJIT_CONFIG_UNSUPPORTED 1
+# else
+# define SLJIT_CONFIG_X86_64 1
+# endif
#elif defined(__arm__) || defined(__ARM__)
#ifdef __thumb2__
#define SLJIT_CONFIG_ARM_THUMB2 1
@@ -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)
-#define SLJIT_CONFIG_PPC_32 1
+# ifndef __NO_FPRS__
+# define SLJIT_CONFIG_PPC_32 1
+# else
+# define SLJIT_CONFIG_UNSUPPORTED 1
+# endif
#elif defined(__mips__) && !defined(_LP64)
#define SLJIT_CONFIG_MIPS_32 1
#elif defined(__mips64)

+ 26
- 0
sources/libs/pcre3-static/debian/patches/patch-from-mariadb-to-fix-stack-frame-si View File

@@ -0,0 +1,26 @@
From: Matthew Vernon <matthew@debian.org>
Date: Thu, 30 Nov 2017 15:37:30 +0000
X-Dgit-Generated: 2:8.39-6 a1c9961364820d491470bba8fb48bf51b0c56895
Subject: Patch from MariaDB to fix stack frame size detection

This comes via Ondřej Surý <ondrej@debian.org> in #878107. Upstream
don't consider it sufficiently important to fix, but it is causing us
issues.

---

--- pcre3-8.39.orig/pcre_exec.c
+++ pcre3-8.39/pcre_exec.c
@@ -509,6 +509,12 @@ Returns: MATCH_MATCH if matched
(e.g. stopped by repeated call or recursion limit)
*/
+#ifdef __GNUC__
+static int
+match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
+ PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
+ unsigned int rdepth) __attribute__((noinline,noclone));
+#endif
static int
match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,

+ 394
- 0
sources/libs/pcre3-static/debian/patches/pcre_info.patch View File

@@ -0,0 +1,394 @@
From: Mark Baker <mark@mnb.org.uk>
Date: Wed, 13 Jul 2016 21:20:13 +0100
Subject: pcre_info

---
Makefile.am | 3 ++-
Makefile.in | 79 ++++++++++++++++++++++++++++-------------------------
pcre_info.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 134 insertions(+), 38 deletions(-)
create mode 100644 pcre_info.c

diff --git a/Makefile.am b/Makefile.am
index 22b6947..59c564a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -233,6 +233,7 @@ libpcre_la_SOURCES = \
pcre_fullinfo.c \
pcre_get.c \
pcre_globals.c \
+ pcre_info.c \
pcre_internal.h \
pcre_jit_compile.c \
pcre_maketables.c \
@@ -648,7 +649,7 @@ test: check ;
# 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 \
- pcre_globals.o pcre_jit_compile.o pcre_maketables.o \
+ pcre_globals.o pcre_info.o pcre_jit_compile.o pcre_maketables.o \
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 \
diff --git a/Makefile.in b/Makefile.in
index 6d03912..22c1ae9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -218,11 +218,11 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
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 \
- pcre_get.c pcre_globals.c pcre_internal.h pcre_jit_compile.c \
- pcre_maketables.c pcre_newline.c pcre_ord2utf8.c \
- pcre_refcount.c pcre_string_utils.c pcre_study.c pcre_tables.c \
- pcre_ucd.c pcre_valid_utf8.c pcre_version.c pcre_xclass.c \
- ucp.h
+ pcre_get.c pcre_globals.c pcre_info.c pcre_internal.h \
+ pcre_jit_compile.c pcre_maketables.c pcre_newline.c \
+ pcre_ord2utf8.c pcre_refcount.c pcre_string_utils.c \
+ pcre_study.c pcre_tables.c pcre_ucd.c pcre_valid_utf8.c \
+ pcre_version.c pcre_xclass.c ucp.h
@WITH_PCRE8_TRUE@am_libpcre_la_OBJECTS = \
@WITH_PCRE8_TRUE@ libpcre_la-pcre_byte_order.lo \
@WITH_PCRE8_TRUE@ libpcre_la-pcre_compile.lo \
@@ -232,6 +232,7 @@ am__libpcre_la_SOURCES_DIST = pcre_byte_order.c pcre_compile.c \
@WITH_PCRE8_TRUE@ libpcre_la-pcre_fullinfo.lo \
@WITH_PCRE8_TRUE@ libpcre_la-pcre_get.lo \
@WITH_PCRE8_TRUE@ libpcre_la-pcre_globals.lo \
+@WITH_PCRE8_TRUE@ libpcre_la-pcre_info.lo \
@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 \
@@ -251,7 +252,7 @@ libpcre_la_OBJECTS = $(am_libpcre_la_OBJECTS) \
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
-am__v_lt_1 =
+am__v_lt_1 =
libpcre_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libpcre_la_CFLAGS) \
$(CFLAGS) $(libpcre_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -449,11 +450,11 @@ am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
+am__v_GEN_1 =
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
-am__v_at_1 =
+am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -467,7 +468,7 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
-am__v_CC_1 =
+am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -475,7 +476,7 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
-am__v_CCLD_1 =
+am__v_CCLD_1 =
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -485,7 +486,7 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
AM_V_CXX = $(am__v_CXX_@AM_V@)
am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
am__v_CXX_0 = @echo " CXX " $@;
-am__v_CXX_1 =
+am__v_CXX_1 =
CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -493,7 +494,7 @@ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
-am__v_CXXLD_1 =
+am__v_CXXLD_1 =
SOURCES = $(libpcre_la_SOURCES) $(nodist_libpcre_la_SOURCES) \
$(libpcre16_la_SOURCES) $(nodist_libpcre16_la_SOURCES) \
$(libpcre32_la_SOURCES) $(nodist_libpcre32_la_SOURCES) \
@@ -832,9 +833,6 @@ PCRE_MAJOR = @PCRE_MAJOR@
PCRE_MINOR = @PCRE_MINOR@
PCRE_PRERELEASE = @PCRE_PRERELEASE@
PCRE_STATIC_CFLAG = @PCRE_STATIC_CFLAG@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -844,8 +842,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SHTOOL = @SHTOOL@
STRIP = @STRIP@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
VERSION = @VERSION@
VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
@@ -988,7 +984,7 @@ dist_noinst_DATA = $(pcrecpp_html)
# 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)
-check_SCRIPTS =
+check_SCRIPTS =
dist_noinst_SCRIPTS = RunTest $(am__append_39)
# Additional files to delete on 'make clean' and 'make maintainer-clean'.
@@ -1093,6 +1089,7 @@ BUILT_SOURCES = pcre_chartables.c
@WITH_PCRE8_TRUE@ pcre_fullinfo.c \
@WITH_PCRE8_TRUE@ pcre_get.c \
@WITH_PCRE8_TRUE@ pcre_globals.c \
+@WITH_PCRE8_TRUE@ pcre_info.c \
@WITH_PCRE8_TRUE@ pcre_internal.h \
@WITH_PCRE8_TRUE@ pcre_jit_compile.c \
@WITH_PCRE8_TRUE@ pcre_maketables.c \
@@ -1110,7 +1107,7 @@ BUILT_SOURCES = pcre_chartables.c
@WITH_PCRE8_TRUE@libpcre_la_CFLAGS = $(VISIBILITY_CFLAGS) $(AM_CFLAGS) \
@WITH_PCRE8_TRUE@ $(am__append_7) $(am__append_10)
-@WITH_PCRE8_TRUE@libpcre_la_LIBADD =
+@WITH_PCRE8_TRUE@libpcre_la_LIBADD =
@WITH_PCRE8_TRUE@nodist_libpcre_la_SOURCES = \
@WITH_PCRE8_TRUE@ pcre_chartables.c
@@ -1141,7 +1138,7 @@ BUILT_SOURCES = pcre_chartables.c
@WITH_PCRE16_TRUE@libpcre16_la_CFLAGS = $(VISIBILITY_CFLAGS) \
@WITH_PCRE16_TRUE@ $(AM_CFLAGS) $(am__append_8) \
@WITH_PCRE16_TRUE@ $(am__append_11)
-@WITH_PCRE16_TRUE@libpcre16_la_LIBADD =
+@WITH_PCRE16_TRUE@libpcre16_la_LIBADD =
@WITH_PCRE16_TRUE@nodist_libpcre16_la_SOURCES = \
@WITH_PCRE16_TRUE@ pcre_chartables.c
@@ -1172,7 +1169,7 @@ BUILT_SOURCES = pcre_chartables.c
@WITH_PCRE32_TRUE@libpcre32_la_CFLAGS = $(VISIBILITY_CFLAGS) \
@WITH_PCRE32_TRUE@ $(AM_CFLAGS) $(am__append_9) \
@WITH_PCRE32_TRUE@ $(am__append_12)
-@WITH_PCRE32_TRUE@libpcre32_la_LIBADD =
+@WITH_PCRE32_TRUE@libpcre32_la_LIBADD =
@WITH_PCRE32_TRUE@nodist_libpcre32_la_SOURCES = \
@WITH_PCRE32_TRUE@ pcre_chartables.c
@@ -1227,7 +1224,7 @@ pcretest_LDADD = $(LIBREADLINE) $(am__append_30) $(am__append_32) \
# 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 \
- pcre_globals.o pcre_jit_compile.o pcre_maketables.o \
+ pcre_globals.o pcre_info.o pcre_jit_compile.o pcre_maketables.o \
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 \
@@ -1313,8 +1310,8 @@ pcrecpp_man = doc/pcrecpp.3
@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
-@WITH_GCOV_TRUE@COVERAGE_LCOV_EXTRA_FLAGS =
-@WITH_GCOV_TRUE@COVERAGE_GENHTML_EXTRA_FLAGS =
+@WITH_GCOV_TRUE@COVERAGE_LCOV_EXTRA_FLAGS =
+@WITH_GCOV_TRUE@COVERAGE_GENHTML_EXTRA_FLAGS =
@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
@@ -1364,7 +1361,7 @@ config.h: stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: $(am__configure_deps)
+$(srcdir)/config.h.in: $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
@@ -1425,19 +1422,19 @@ clean-libLTLIBRARIES:
rm -f $${locs}; \
}
-libpcre.la: $(libpcre_la_OBJECTS) $(libpcre_la_DEPENDENCIES) $(EXTRA_libpcre_la_DEPENDENCIES)
+libpcre.la: $(libpcre_la_OBJECTS) $(libpcre_la_DEPENDENCIES) $(EXTRA_libpcre_la_DEPENDENCIES)
$(AM_V_CCLD)$(libpcre_la_LINK) $(am_libpcre_la_rpath) $(libpcre_la_OBJECTS) $(libpcre_la_LIBADD) $(LIBS)
-libpcre16.la: $(libpcre16_la_OBJECTS) $(libpcre16_la_DEPENDENCIES) $(EXTRA_libpcre16_la_DEPENDENCIES)
+libpcre16.la: $(libpcre16_la_OBJECTS) $(libpcre16_la_DEPENDENCIES) $(EXTRA_libpcre16_la_DEPENDENCIES)
$(AM_V_CCLD)$(libpcre16_la_LINK) $(am_libpcre16_la_rpath) $(libpcre16_la_OBJECTS) $(libpcre16_la_LIBADD) $(LIBS)
-libpcre32.la: $(libpcre32_la_OBJECTS) $(libpcre32_la_DEPENDENCIES) $(EXTRA_libpcre32_la_DEPENDENCIES)
+libpcre32.la: $(libpcre32_la_OBJECTS) $(libpcre32_la_DEPENDENCIES) $(EXTRA_libpcre32_la_DEPENDENCIES)
$(AM_V_CCLD)$(libpcre32_la_LINK) $(am_libpcre32_la_rpath) $(libpcre32_la_OBJECTS) $(libpcre32_la_LIBADD) $(LIBS)
-libpcrecpp.la: $(libpcrecpp_la_OBJECTS) $(libpcrecpp_la_DEPENDENCIES) $(EXTRA_libpcrecpp_la_DEPENDENCIES)
+libpcrecpp.la: $(libpcrecpp_la_OBJECTS) $(libpcrecpp_la_DEPENDENCIES) $(EXTRA_libpcrecpp_la_DEPENDENCIES)
$(AM_V_CXXLD)$(libpcrecpp_la_LINK) $(am_libpcrecpp_la_rpath) $(libpcrecpp_la_OBJECTS) $(libpcrecpp_la_LIBADD) $(LIBS)
-libpcreposix.la: $(libpcreposix_la_OBJECTS) $(libpcreposix_la_DEPENDENCIES) $(EXTRA_libpcreposix_la_DEPENDENCIES)
+libpcreposix.la: $(libpcreposix_la_OBJECTS) $(libpcreposix_la_DEPENDENCIES) $(EXTRA_libpcreposix_la_DEPENDENCIES)
$(AM_V_CCLD)$(libpcreposix_la_LINK) $(am_libpcreposix_la_rpath) $(libpcreposix_la_OBJECTS) $(libpcreposix_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -1498,31 +1495,31 @@ clean-noinstPROGRAMS:
echo " rm -f" $$list; \
rm -f $$list
-dftables$(EXEEXT): $(dftables_OBJECTS) $(dftables_DEPENDENCIES) $(EXTRA_dftables_DEPENDENCIES)
+dftables$(EXEEXT): $(dftables_OBJECTS) $(dftables_DEPENDENCIES) $(EXTRA_dftables_DEPENDENCIES)
@rm -f dftables$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(dftables_OBJECTS) $(dftables_LDADD) $(LIBS)
-pcre_jit_test$(EXEEXT): $(pcre_jit_test_OBJECTS) $(pcre_jit_test_DEPENDENCIES) $(EXTRA_pcre_jit_test_DEPENDENCIES)
+pcre_jit_test$(EXEEXT): $(pcre_jit_test_OBJECTS) $(pcre_jit_test_DEPENDENCIES) $(EXTRA_pcre_jit_test_DEPENDENCIES)
@rm -f pcre_jit_test$(EXEEXT)
$(AM_V_CCLD)$(pcre_jit_test_LINK) $(pcre_jit_test_OBJECTS) $(pcre_jit_test_LDADD) $(LIBS)
-pcre_scanner_unittest$(EXEEXT): $(pcre_scanner_unittest_OBJECTS) $(pcre_scanner_unittest_DEPENDENCIES) $(EXTRA_pcre_scanner_unittest_DEPENDENCIES)
+pcre_scanner_unittest$(EXEEXT): $(pcre_scanner_unittest_OBJECTS) $(pcre_scanner_unittest_DEPENDENCIES) $(EXTRA_pcre_scanner_unittest_DEPENDENCIES)
@rm -f pcre_scanner_unittest$(EXEEXT)
$(AM_V_CXXLD)$(pcre_scanner_unittest_LINK) $(pcre_scanner_unittest_OBJECTS) $(pcre_scanner_unittest_LDADD) $(LIBS)
-pcre_stringpiece_unittest$(EXEEXT): $(pcre_stringpiece_unittest_OBJECTS) $(pcre_stringpiece_unittest_DEPENDENCIES) $(EXTRA_pcre_stringpiece_unittest_DEPENDENCIES)
+pcre_stringpiece_unittest$(EXEEXT): $(pcre_stringpiece_unittest_OBJECTS) $(pcre_stringpiece_unittest_DEPENDENCIES) $(EXTRA_pcre_stringpiece_unittest_DEPENDENCIES)
@rm -f pcre_stringpiece_unittest$(EXEEXT)
$(AM_V_CXXLD)$(pcre_stringpiece_unittest_LINK) $(pcre_stringpiece_unittest_OBJECTS) $(pcre_stringpiece_unittest_LDADD) $(LIBS)
-pcrecpp_unittest$(EXEEXT): $(pcrecpp_unittest_OBJECTS) $(pcrecpp_unittest_DEPENDENCIES) $(EXTRA_pcrecpp_unittest_DEPENDENCIES)
+pcrecpp_unittest$(EXEEXT): $(pcrecpp_unittest_OBJECTS) $(pcrecpp_unittest_DEPENDENCIES) $(EXTRA_pcrecpp_unittest_DEPENDENCIES)
@rm -f pcrecpp_unittest$(EXEEXT)
$(AM_V_CXXLD)$(pcrecpp_unittest_LINK) $(pcrecpp_unittest_OBJECTS) $(pcrecpp_unittest_LDADD) $(LIBS)
-pcregrep$(EXEEXT): $(pcregrep_OBJECTS) $(pcregrep_DEPENDENCIES) $(EXTRA_pcregrep_DEPENDENCIES)
+pcregrep$(EXEEXT): $(pcregrep_OBJECTS) $(pcregrep_DEPENDENCIES) $(EXTRA_pcregrep_DEPENDENCIES)
@rm -f pcregrep$(EXEEXT)
$(AM_V_CCLD)$(pcregrep_LINK) $(pcregrep_OBJECTS) $(pcregrep_LDADD) $(LIBS)
-pcretest$(EXEEXT): $(pcretest_OBJECTS) $(pcretest_DEPENDENCIES) $(EXTRA_pcretest_DEPENDENCIES)
+pcretest$(EXEEXT): $(pcretest_OBJECTS) $(pcretest_DEPENDENCIES) $(EXTRA_pcretest_DEPENDENCIES)
@rm -f pcretest$(EXEEXT)
$(AM_V_CCLD)$(pcretest_LINK) $(pcretest_OBJECTS) $(pcretest_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)
@@ -1623,6 +1620,7 @@ distclean-compile:
@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@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpcre_la-pcre_info.Plo@am__quote@
@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@
@@ -1726,6 +1724,13 @@ libpcre_la-pcre_globals.lo: pcre_globals.c
@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
+libpcre_la-pcre_info.lo: pcre_info.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_info.lo -MD -MP -MF $(DEPDIR)/libpcre_la-pcre_info.Tpo -c -o libpcre_la-pcre_info.lo `test -f 'pcre_info.c' || echo '$(srcdir)/'`pcre_info.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpcre_la-pcre_info.Tpo $(DEPDIR)/libpcre_la-pcre_info.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pcre_info.c' object='libpcre_la-pcre_info.lo' libtool=yes @AMDEPBACKSLASH@
+@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_info.lo `test -f 'pcre_info.c' || echo '$(srcdir)/'`pcre_info.c
+
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
diff --git a/pcre_info.c b/pcre_info.c
new file mode 100644
index 0000000..17dafea
--- /dev/null
+++ b/pcre_info.c
@@ -0,0 +1,90 @@
+/*************************************************
+* Perl-Compatible Regular Expressions *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+ Written by Philip Hazel
+ Copyright (c) 1997-2009 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ * Neither the name of the University of Cambridge nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+
+/* This module contains the external function pcre_info(), which gives some
+information about a compiled pattern. However, use of this function is now
+deprecated, as it has been superseded by pcre_fullinfo(). */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre_internal.h"
+
+
+/*************************************************
+* (Obsolete) Return info about compiled pattern *
+*************************************************/
+
+/* This is the original "info" function. It picks potentially useful data out
+of the private structure, but its interface was too rigid. It remains for
+backwards compatibility. The public options are passed back in an int - though
+the re->options field has been expanded to a long int, all the public options
+at the low end of it, and so even on 16-bit systems this will still be OK.
+Therefore, I haven't changed the API for pcre_info().
+
+Arguments:
+ argument_re points to compiled code
+ optptr where to pass back the options
+ first_byte where to pass back the first character,
+ or -1 if multiline and all branches start ^,
+ or -2 otherwise
+
+Returns: number of capturing subpatterns
+ or negative values on error
+*/
+
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
+pcre_info(const pcre *argument_re, int *optptr, int *first_byte)
+{
+const real_pcre *re = (const real_pcre *)argument_re;
+if (re == NULL) return PCRE_ERROR_NULL;
+if (re->magic_number != MAGIC_NUMBER)
+ return PCRE_ERROR_BADMAGIC;
+
+if (optptr != NULL) *optptr = (int)(re->options & PUBLIC_COMPILE_OPTIONS);
+if (first_byte != NULL)
+ *first_byte = ((re->flags & PCRE_FIRSTSET) != 0)? re->first_char :
+ ((re->flags & PCRE_STARTLINE) != 0)? -1 : -2;
+return re->top_bracket;
+}
+
+/* End of pcre_info.c */

+ 30
- 0
sources/libs/pcre3-static/debian/patches/pcregrep.1-patch View File

@@ -0,0 +1,30 @@
From: Mark Baker <mark@mnb.org.uk>
Date: Wed, 13 Jul 2016 21:20:13 +0100
Subject: pcregrep.1-patch

---
doc/pcregrep.1 | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/doc/pcregrep.1 b/doc/pcregrep.1
index 9886675..07b8f57 100644
--- a/doc/pcregrep.1
+++ b/doc/pcregrep.1
@@ -3,6 +3,7 @@
pcregrep - a grep with Perl-compatible regular expressions.
.SH SYNOPSIS
.B pcregrep [options] [long options] [pattern] [path1 path2 ...]
+.B zpcregrep [options] [long options] [pattern] [file1 file2 ...]
.
.SH DESCRIPTION
.rs
@@ -87,6 +88,9 @@ the matching substrings are being shown.
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.
+.P
+\fBzpcregrep\fR is a wrapper script that allows pcregrep to work on
+gzip compressed files.
.
.
.SH "SUPPORT FOR COMPRESSED FILES"

+ 36
- 0
sources/libs/pcre3-static/debian/patches/pcreposix.patch View File

@@ -0,0 +1,36 @@
From: Mark Baker <mark@mnb.org.uk>
Date: Wed, 13 Jul 2016 21:20:13 +0100
Subject: pcreposix

---
pcreposix.h | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pcreposix.h b/pcreposix.h
index c77c0b0..4527f78 100644
--- a/pcreposix.h
+++ b/pcreposix.h
@@ -133,14 +133,19 @@ file. */
/* The functions */
-PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int);
-PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t,
+PCREPOSIX_EXP_DECL int pcreposix_regcomp(regex_t *, const char *, int);
+PCREPOSIX_EXP_DECL int pcreposix_regexec(const regex_t *, const char *, size_t,
regmatch_t *, int);
-PCREPOSIX_EXP_DECL size_t regerror(int, const regex_t *, char *, size_t);
-PCREPOSIX_EXP_DECL void regfree(regex_t *);
+PCREPOSIX_EXP_DECL size_t pcreposix_regerror(int, const regex_t *, char *, size_t);
+PCREPOSIX_EXP_DECL void pcreposix_regfree(regex_t *);
#ifdef __cplusplus
} /* extern "C" */
#endif
+#define regcomp pcreposix_regcomp
+#define regexec pcreposix_regexec
+#define regerror pcreposix_regerror
+#define regfree pcreposix_regfree
+
#endif /* End of pcreposix.h */

+ 11
- 0
sources/libs/pcre3-static/debian/patches/series View File

@@ -0,0 +1,11 @@
PCRE6_compatible_API.patch
pcreposix.patch
pcre_info.patch
pcregrep.1-patch
soname.patch
no_jit_x32_powerpcspe.patch
Disable_JIT_on_sparc64.patch
CVE-2017-6004.patch
upstream-fix-for-cve-2017-7186-upstream-
patch-from-mariadb-to-fix-stack-frame-si
upstream-patch-fixing-cve-2020-14155.patch

+ 28
- 0
sources/libs/pcre3-static/debian/patches/soname.patch View File

@@ -0,0 +1,28 @@
From: Mark Baker <mark@mnb.org.uk>
Date: Wed, 13 Jul 2016 21:20:13 +0100
Subject: soname

===================================================================
---
configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3cefaf1..6077ad5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,10 +17,10 @@ m4_define(pcre_date, [2016-06-14])
# 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:7:2])
-m4_define(libpcre16_version, [2:7:2])
-m4_define(libpcre32_version, [0:7:0])
-m4_define(libpcreposix_version, [0:4:0])
+m4_define(libpcre_version, [16:3:13])
+m4_define(libpcre16_version, [16:3:13])
+m4_define(libpcre32_version, [16:3:13])
+m4_define(libpcreposix_version, [16:3:13])
m4_define(libpcrecpp_version, [0:1:0])
AC_PREREQ(2.57)

+ 59
- 0
sources/libs/pcre3-static/debian/patches/upstream-fix-for-cve-2017-7186-upstream- View File

@@ -0,0 +1,59 @@
Description: Upstream fix for CVE-2017-7186 (Upstream rev 1688)
Fix Unicode property crash for 32-bit characters greater than 0x10ffff.
Author: Matthew Vernon <matthew@debian.org>
X-Dgit-Generated: 2:8.39-3 c4c2c7c4f74d53b263af2471d8e11db88096bd13

---

--- pcre3-8.39.orig/pcre_internal.h
+++ pcre3-8.39/pcre_internal.h
@@ -2772,6 +2772,9 @@ extern const pcre_uint8 PRIV(ucd_stage1
extern const pcre_uint16 PRIV(ucd_stage2)[];
extern const pcre_uint32 PRIV(ucp_gentype)[];
extern const pcre_uint32 PRIV(ucp_gbtable)[];
+#ifdef COMPILE_PCRE32
+extern const ucd_record PRIV(dummy_ucd_record)[];
+#endif
#ifdef SUPPORT_JIT
extern const int PRIV(ucp_typerange)[];
#endif
@@ -2780,9 +2783,15 @@ extern const int PRIV(ucp_typera
/* UCD access macros */
#define UCD_BLOCK_SIZE 128
-#define GET_UCD(ch) (PRIV(ucd_records) + \
+#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \
PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \
UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE])
+
+#ifdef COMPILE_PCRE32
+#define GET_UCD(ch) ((ch > 0x10ffff)? PRIV(dummy_ucd_record) : REAL_GET_UCD(ch))
+#else
+#define GET_UCD(ch) REAL_GET_UCD(ch)
+#endif
#define UCD_CHARTYPE(ch) GET_UCD(ch)->chartype
#define UCD_SCRIPT(ch) GET_UCD(ch)->script
--- pcre3-8.39.orig/pcre_ucd.c
+++ pcre3-8.39/pcre_ucd.c
@@ -38,6 +38,20 @@ const pcre_uint16 PRIV(ucd_stage2)[] = {
const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0};
#else
+/* If the 32-bit library is run in non-32-bit mode, character values
+greater than 0x10ffff may be encountered. For these we set up a
+special record. */
+
+#ifdef COMPILE_PCRE32
+const ucd_record PRIV(dummy_ucd_record)[] = {{
+ ucp_Common, /* script */
+ ucp_Cn, /* type unassigned */
+ ucp_gbOther, /* grapheme break property */
+ 0, /* case set */
+ 0, /* other case */
+ }};
+#endif
+
/* When recompiling tables with a new Unicode version, please check the
types in this structure definition from pcre_internal.h (the actual
field names will be different):

+ 37
- 0
sources/libs/pcre3-static/debian/patches/upstream-patch-fixing-cve-2020-14155.patch View File

@@ -0,0 +1,37 @@
From: Matthew Vernon <matthew@debian.org>
Date: Thu, 18 Jun 2020 19:32:51 +0100
X-Dgit-Generated: 2:8.39-13 7b88c83f87391950756256072f886a08c44ed78f
Subject: upstream patch fixing CVE-2020-14155

This checks the size of the number after (?C as it is read, in order
to avoid integer overflow.

---

--- pcre3-8.39.orig/pcre_compile.c
+++ pcre3-8.39/pcre_compile.c
@@ -7086,17 +7086,19 @@ for (;; ptr++)
int n = 0;
ptr++;
while(IS_DIGIT(*ptr))
+ {
n = n * 10 + *ptr++ - CHAR_0;
+ if (n > 255)
+ {
+ *errorcodeptr = ERR38;
+ goto FAILED;
+ }
+ }
if (*ptr != CHAR_RIGHT_PARENTHESIS)
{
*errorcodeptr = ERR39;
goto FAILED;
}
- if (n > 255)
- {
- *errorcodeptr = ERR38;
- goto FAILED;
- }
*code++ = n;
PUT(code, 0, (int)(ptr - cd->start_pattern + 1)); /* Pattern offset */
PUT(code, LINK_SIZE, 0); /* Default length */

+ 24
- 0
sources/libs/pcre3-static/debian/rules View File

@@ -0,0 +1,24 @@
#!/usr/bin/make -f

KXSTUDIO_NO_FASTMATH = y
include /usr/share/dpkg/kxstudio.mk

override_dh_auto_configure:
./configure --disable-maintainer-mode \
--prefix=/opt/kxstudio \
--enable-static \
--disable-shared \
--enable-utf8 \
--enable-unicode-properties \
--enable-pcre16 \
--enable-pcre32

override_dh_auto_install:
dh_auto_install
# remove unwanted files
rm $(CURDIR)/debian/libpcre3-static/opt/kxstudio/lib/*.la
rm -r $(CURDIR)/debian/libpcre3-static/opt/kxstudio/bin
rm -r $(CURDIR)/debian/libpcre3-static/opt/kxstudio/share

%:
dh $@

+ 1
- 0
sources/libs/pcre3-static/debian/source/format View File

@@ -0,0 +1 @@
3.0 (quilt)

+ 1
- 1
sources/libs/serd-static/debian/changelog View File

@@ -1,4 +1,4 @@
serd-static (6:0.30.10-1kxstudio1) focal; urgency=medium
serd-static (6:0.30.10-1kxstudio2) focal; urgency=medium


* Initial package * Initial package




+ 3
- 1
sources/libs/serd-static/debian/control View File

@@ -9,9 +9,11 @@ Standards-Version: 4.5.0
Homepage: http://drobilla.net/software/serd/ Homepage: http://drobilla.net/software/serd/
Rules-Requires-Root: no Rules-Requires-Root: no


Package: serd-static
Package: libserd-static
Architecture: any Architecture: any
Depends: ${misc:Depends} Depends: ${misc:Depends}
Conflicts: serd-static
Breaks: serd-static
Description: lightweight RDF syntax library (static) Description: lightweight RDF syntax library (static)
Serd is a lightweight C library for RDF syntax which supports reading Serd is a lightweight C library for RDF syntax which supports reading
and writing Turtle and NTriples. and writing Turtle and NTriples.


+ 5
- 0
sources/libs/sord-static/debian/changelog View File

@@ -0,0 +1,5 @@
sord-static (5:0.16.8-1kxstudio2) focal; urgency=medium

* Initial package

-- falkTX <falktx@falktx.com> Sun, 17 Apr 2022 15:05:47 +0100

+ 34
- 0
sources/libs/sord-static/debian/control View File

@@ -0,0 +1,34 @@
Source: sord-static
Section: libs
Priority: optional
Maintainer: falkTX <falktx@falktx.com>
Build-Depends: debhelper-compat (= 13),
kxstudio-build-scripts,
python3,
pkg-config,
libpcre3-static,
libserd-static
Standards-Version: 4.5.0
Homepage: http://drobilla.net/software/sord/
Rules-Requires-Root: no

Package: libsord-static
Architecture: any
Depends: ${misc:Depends}, libserd-static
Conflicts: sord-static
Breaks: sord-static
Description: library for storing RDF data in memory (static)
Sord is a lightweight C library for storing Resource
Description Framework (RDF) data in memory.
.
This package provides the static library used in KXStudio builds.

Package: sordi
Architecture: any
Section: text
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: library for storing RDF data in memory - utilities
Sord is a lightweight C library for storing Resource
Description Framework (RDF) data in memory.
.
This package provides the 'sordi' and 'sord_validate' utilities.

+ 12
- 0
sources/libs/sord-static/debian/patches/01_dont-run-ldconfig.patch View File

@@ -0,0 +1,12 @@
diff --git a/wscript b/wscript
index 4e8ebde..41e784c 100644
--- a/wscript
+++ b/wscript
@@ -231,7 +231,6 @@ def build(bld):
# Man pages
bld.install_files('${MANDIR}/man1', bld.path.ant_glob('doc/*.1'))
- bld.add_post_fun(autowaf.run_ldconfig)
def lint(ctx):
"checks code for style issues"

+ 21
- 0
sources/libs/sord-static/debian/patches/02_hidden-sord-api.patch View File

@@ -0,0 +1,21 @@
Index: sord-static/include/sord/sord.h
===================================================================
--- sord-static.orig/include/sord/sord.h
+++ sord-static/include/sord/sord.h
@@ -27,15 +27,7 @@
#include <stddef.h>
#include <stdint.h>
-#if defined(_WIN32) && !defined(SORD_STATIC) && defined(SORD_INTERNAL)
-# define SORD_API __declspec(dllexport)
-#elif defined(_WIN32) && !defined(SORD_STATIC)
-# define SORD_API __declspec(dllimport)
-#elif defined(__GNUC__)
-# define SORD_API __attribute__((visibility("default")))
-#else
-# define SORD_API
-#endif
+#define SORD_API
#ifdef __cplusplus
extern "C" {

+ 9
- 0
sources/libs/sord-static/debian/patches/03_force-libs.patch View File

@@ -0,0 +1,9 @@
--- sord-static-0.12.0.orig/sord.pc.in
+++ sord-static-0.12.0/sord.pc.in
@@ -7,5 +7,5 @@ Name: Sord
Version: @SORD_VERSION@
Description: A lightweight C library for storing RDF statements in memory.
Requires: @SORD_PKG_DEPS@
-Libs: -L${libdir} -l@LIB_SORD@
+Libs: -L${libdir} -l@LIB_SORD@ -lserd-0 -lm
Cflags: -I${includedir}/sord-@SORD_MAJOR_VERSION@

+ 3
- 0
sources/libs/sord-static/debian/patches/series View File

@@ -0,0 +1,3 @@
01_dont-run-ldconfig.patch
02_hidden-sord-api.patch
03_force-libs.patch

+ 29
- 0
sources/libs/sord-static/debian/rules View File

@@ -0,0 +1,29 @@
#!/usr/bin/make -f

KXSTUDIO_NO_FASTMATH = y
include /usr/share/dpkg/kxstudio.mk

WAF = python3 ./waf

override_dh_auto_configure:
$(WAF) configure \
--static \
--no-shared \
--prefix=/opt/kxstudio \
--strict \
--test

override_dh_auto_build:
$(WAF)

override_dh_auto_clean:
$(WAF) clean || true

override_dh_auto_install:
$(WAF) install --destdir=$(CURDIR)/debian/tmp

override_dh_auto_test:
$(WAF) test

%:
dh $@

+ 1
- 0
sources/libs/sord-static/debian/source/format View File

@@ -0,0 +1 @@
3.0 (quilt)

Loading…
Cancel
Save