diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/pcre/Makefile | 8 | ||||
| -rw-r--r-- | libs/pcre/patches/100-pcre-cve-2015-3210.patch | 32 |
2 files changed, 4 insertions, 36 deletions
diff --git a/libs/pcre/Makefile b/libs/pcre/Makefile index 6a9c4144c..75fa99299 100644 --- a/libs/pcre/Makefile +++ b/libs/pcre/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcre -PKG_VERSION:=8.37 -PKG_RELEASE:=2 +PKG_VERSION:=8.38 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@SF/pcre -PKG_MD5SUM:=ed91be292cb01d21bc7e526816c26981 +PKG_SOURCE_URL:=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ +PKG_MD5SUM:=00aabbfe56d5a48b270f999b508c5ad2 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> PKG_LICENSE:=BSD-3-Clause diff --git a/libs/pcre/patches/100-pcre-cve-2015-3210.patch b/libs/pcre/patches/100-pcre-cve-2015-3210.patch deleted file mode 100644 index 276d09e9a..000000000 --- a/libs/pcre/patches/100-pcre-cve-2015-3210.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: pcre-8.37/pcre_compile.c -=================================================================== ---- a/pcre_compile.c -+++ b/pcre_compile.c -@@ -7177,14 +7177,26 @@ - number. If the name is not found, set the value to 0 for a forward - reference. */ - -+ recno = 0; - ng = cd->named_groups; - for (i = 0; i < cd->names_found; i++, ng++) - { - if (namelen == ng->length && - STRNCMP_UC_UC(name, ng->name, namelen) == 0) -- break; -+ { -+ open_capitem *oc; -+ recno = ng->number; -+ if (is_recurse) break; -+ for (oc = cd->open_caps; oc != NULL; oc = oc->next) -+ { -+ if (oc->number == recno) -+ { -+ oc->flag = TRUE; -+ break; -+ } -+ } -+ } - } -- recno = (i < cd->names_found)? ng->number : 0; - - /* Count named back references. */ |