deleted file mode 100644

@@ -1,72 +0,0 @@

-From 8037f71d03b3cd8919248f38448a0a2d3715c18c Mon Sep 17 00:00:00 2001

-From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>

-Date: Fri, 24 Feb 2017 17:30:30 +0000

-Subject: [PATCH] Fix Unicode property crash for 32-bit characters greater than

- 0x10ffff.

-MIME-Version: 1.0

-Content-Type: text/plain; charset=UTF-8

-Content-Transfer-Encoding: 8bit

-

-git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1688 2f5784b3-3f2a-0410-8824-cb99058d5e15

-

-Petr Písař: Ported to 8.40.

-

-diff --git a/pcre_internal.h b/pcre_internal.h

-index 2923b29..154d3f6 100644

-+++ b/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_typerange)[];

- /* 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

-diff --git a/pcre_ucd.c b/pcre_ucd.c

-index 69c4fd4..f22f826 100644

-+++ b/pcre_ucd.c

-@@ -38,6 +38,20 @@ const pcre_uint16 PRIV(ucd_stage2)[] = {0};

- 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):

-2.7.4

-

deleted file mode 100644

@@ -1,78 +0,0 @@

-From 3b8f1ab07fb1744c57f5d04c872e81d8d669de87 Mon Sep 17 00:00:00 2001

-From: zherczeg <zherczeg@2f5784b3-3f2a-0410-8824-cb99058d5e15>

-Date: Fri, 31 Mar 2017 05:41:17 +0000

-Subject: [PATCH] Fix character type detection when 32-bit and UCP are enabled

- but UTF is not in JIT.

-MIME-Version: 1.0

-Content-Type: text/plain; charset=UTF-8

-Content-Transfer-Encoding: 8bit

-

-git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1693 2f5784b3-3f2a-0410-8824-cb99058d5e15

-Signed-off-by: Petr Písař <ppisar@redhat.com>

- pcre_jit_compile.c | 31 +++++++++++++++++++++++++++++++

- 1 file changed, 31 insertions(+)

-

-diff --git a/pcre_jit_compile.c b/pcre_jit_compile.c

-index 1a8ce1e..c9db7ee 100644

-+++ b/pcre_jit_compile.c

-@@ -559,6 +559,8 @@ the start pointers when the end of the capturing group has not yet reached. */

- 

- #define READ_CHAR_MAX 0x7fffffff

- 

-+#define INVALID_UTF_CHAR 888

-+

- static pcre_uchar *bracketend(pcre_uchar *cc)

- {

- SLJIT_ASSERT((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NOT) || (*cc >= OP_ONCE && *cc <= OP_SCOND));

-@@ -3277,10 +3279,30 @@ static void do_getucd(compiler_common *common)

- /* Search the UCD record for the character comes in TMP1.

- Returns chartype in TMP1 and UCD offset in TMP2. */

- DEFINE_COMPILER;

-+#ifdef COMPILE_PCRE32

-+struct sljit_jump *jump;

-+#endif

-+

-+#if defined SLJIT_DEBUG && SLJIT_DEBUG

-+/* dummy_ucd_record */

-+const ucd_record *record = GET_UCD(INVALID_UTF_CHAR);

-+SLJIT_ASSERT(record->script == ucp_Common && record->chartype == ucp_Cn && record->gbprop == ucp_gbOther);

-+SLJIT_ASSERT(record->caseset == 0 && record->other_case == 0);

-+#endif

- 

- SLJIT_ASSERT(UCD_BLOCK_SIZE == 128 && sizeof(ucd_record) == 8);

- 

- sljit_emit_fast_enter(compiler, RETURN_ADDR, 0);

-+

-+#ifdef COMPILE_PCRE32

-+if (!common->utf)

-+  {

-+  jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x10ffff + 1);

-+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR);

-+  JUMPHERE(jump);

-+  }

-+#endif

-+

- OP2(SLJIT_LSHR, TMP2, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);

- OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1));

- OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_MASK);

-@@ -5636,6 +5658,15 @@ if (needstype || needsscript)

-   if (needschar && !charsaved)

-     OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP1, 0);

- 

-+#ifdef COMPILE_PCRE32

-+  if (!common->utf)

-+    {

-+    jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0x10ffff + 1);

-+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR);

-+    JUMPHERE(jump);

-+    }

-+#endif

-+

-   OP2(SLJIT_LSHR, TMP2, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);

-   OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1));

-   OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_MASK);

-2.7.4

-

@@ -1,22 +1,18 @@

 Summary:        Grep for perl compatible regular expressions

 Name:           pcre

-Version:        8.40

-Release:        4%{?dist}

+Version:        8.41

+Release:        1%{?dist}

 License:        BSD

 URL:            ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-%{version}.tar.bz2

 Group:          Applications/System

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2

-%define sha1 pcre=12f338719b8b028a2eecbf9192fcc00a13fc04f6

-#Fixes CVE-2017-7244, CVE-2017-7245, CVE-2017-7246

-Patch0:         pcre-8.40-Fix-Unicode-property-crash-for-32-bit-characters-gre.patch

-#Fixes CVE-2017-7186

-Patch1:         pcre-8.40-Fix-character-type-detection-when-32-bit-and-UCP-are.patch

+%define sha1    pcre=7d1f4aae4191512744a718cc2b81bcf995ec1437

 BuildRequires:  bzip2-devel

 BuildRequires:  readline-devel

 Requires:       libgcc

-Requires:		readline

+Requires:       readline

 Requires:       libstdc++

 Requires:       pcre-libs = %{version}-%{release}

 %description

@@ -39,8 +35,6 @@ This package contains minimal set of shared pcre libraries.

 %prep

 %setup -q

-%patch0 -p1

-%patch1 -p1

 %build

 ./configure --prefix=/usr                     \

             --docdir=/usr/share/doc/pcre-%{version} \

@@ -67,7 +61,7 @@ make %{?_smp_mflags} check

 %postun -p /sbin/ldconfig

 %files 

 %defattr(-,root,root)

-%{_bindir}/pcregrep  

+%{_bindir}/pcregrep

 %{_bindir}/pcretest

 %{_mandir}/man1/pcregrep.1*

 %{_mandir}/man1/pcretest.1*

@@ -77,7 +71,7 @@ make %{?_smp_mflags} check

 %files devel

 %defattr(-, root, root)

 %{_bindir}/*

-%exclude %{_bindir}/pcregrep  

+%exclude %{_bindir}/pcregrep

 %exclude %{_bindir}/pcretest

 %{_defaultdocdir}/%{name}-%{version}/*

 %{_mandir}/*/*

@@ -91,6 +85,8 @@ make %{?_smp_mflags} check

 %{_libdir}/libpcre.so.*

 %changelog

+*   Wed Dec 20 2017 Xiaolin Li <xiaolinl@vmware.com> 8.41-1

+-   Update to version 8.41

 *   Wed Jul 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 8.40-4

 -   Added fix for CVE-2017-11164 by adding stack recursion limit

 *   Wed May 24 2017 Divya Thaluru <dthaluru@vmware.com> 8.40-3

@@ -112,4 +108,4 @@ make %{?_smp_mflags} check

 *   Mon Nov 30 2015 Sharath George <sharathg@vmware.com> 8.36-2

     Add symlink for libpcre.so.1

 *   Thu Nov 06 2014 Sharath George <sharathg@vmware.com> 8.36-1

-    Initial version 

+    Initial version