diff options
| author | Thomas Heil <heil@terminal-consulting.de> | 2017-08-17 01:18:45 +0200 |
|---|---|---|
| committer | Thomas Heil <heil@terminal-consulting.de> | 2017-08-17 01:18:45 +0200 |
| commit | 806e116dbf98e66a72d607fa61f72c185095c105 (patch) | |
| tree | 03ed378747435356f77613f40340e20fb3efa31e /libs/pcre | |
| parent | 79db9749ee72861cc9fabfeab1b8feb0a0e4df86 (diff) | |
pcre: upgrade to version 8.41
- fixes security issues
Signed-off-by: Thomas Heil <heil@terminal-consulting.de>
Diffstat (limited to 'libs/pcre')
| -rw-r--r-- | libs/pcre/Makefile | 6 | ||||
| -rw-r--r-- | libs/pcre/patches/001-CVE-2017-7186 | 53 |
2 files changed, 3 insertions, 56 deletions
diff --git a/libs/pcre/Makefile b/libs/pcre/Makefile index 861b561e2..b2c8ea322 100644 --- a/libs/pcre/Makefile +++ b/libs/pcre/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcre -PKG_VERSION:=8.40 -PKG_RELEASE:=2 +PKG_VERSION:=8.41 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ -PKG_MD5SUM:=41a842bf7dcecd6634219336e2167d1d +PKG_MD5SUM:=c160d22723b1670447341b08c58981c1 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> PKG_LICENSE:=BSD-3-Clause diff --git a/libs/pcre/patches/001-CVE-2017-7186 b/libs/pcre/patches/001-CVE-2017-7186 deleted file mode 100644 index 984cf81fd..000000000 --- a/libs/pcre/patches/001-CVE-2017-7186 +++ /dev/null @@ -1,53 +0,0 @@ -#CVE-2017-7186 patch ---- trunk/pcre_internal.h 2016/05/21 13:34:44 1649 -+++ trunk/pcre_internal.h 2017/02/24 17:30:30 1688 -@@ -2772,6 +2772,9 @@ - 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 @@ - /* 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 ---- trunk/pcre_ucd.c 2014/06/19 07:51:39 1490 -+++ trunk/pcre_ucd.c 2017/02/24 17:30:30 1688 -@@ -38,6 +38,20 @@ - 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): |