01/01: gnu: Remove a left-over patch.

[Leo Famulari]

lfam pushed a commit to branch master
in repository guix.

commit 8582e03ae59ff51d2aacc24da611f769484dd4cb
Author: Leo Famulari <address@hidden>
Date:   Thu Jul 20 08:59:35 2017 -0400

    gnu: Remove a left-over patch.
    
    This is a followup to commit 426b0b898f70a58133d80779980f163a5761686e.
    
    * gnu/packages/patches/pcre-CVE-2017-7186.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/patches/pcre-CVE-2017-7186.patch | 56 ---------------------------
 2 files changed, 57 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index ee93200..bf9143a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -893,7 +893,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/patchelf-rework-for-arm.patch           \
   %D%/packages/patches/patchutils-xfail-gendiff-tests.patch    \
   %D%/packages/patches/patch-hurd-path-max.patch               \
-  %D%/packages/patches/pcre-CVE-2017-7186.patch                        \
   %D%/packages/patches/pcre2-CVE-2017-7186.patch               \
   %D%/packages/patches/pcre2-CVE-2017-8786.patch               \
   %D%/packages/patches/perl-file-path-CVE-2017-6512.patch      \
diff --git a/gnu/packages/patches/pcre-CVE-2017-7186.patch 
b/gnu/packages/patches/pcre-CVE-2017-7186.patch
deleted file mode 100644
index d23aa10..0000000
--- a/gnu/packages/patches/pcre-CVE-2017-7186.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Patch for <https://nvd.nist.gov/vuln/detail?vulnId=CVE-2017-7186>
-from <https://vcs.pcre.org/pcre?view=revision&revision=1688>.
-
---- 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):