Fix pcre2test -C to correctly show what \R matches

pcre2-10.31-Fix-pcre2test-C-to-correctly-show-what-R-matches.patch

@@ -0,0 +1,30 @@
+From 93c716bf538a172222aa60f77cff5ef46103c125 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>
+Date: Mon, 19 Feb 2018 16:55:47 +0000
+Subject: [PATCH 1/2] Fix pcre2test -C to correctly show what \R matches.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@916 6239d852-aaf2-0410-a92c-79f79f948069
+Petr Písař: Ported to 10.31.
+---
+ src/pcre2test.c | 3 ++-
+
+diff --git a/src/pcre2test.c b/src/pcre2test.c
+index 7eca618..40e2161 100644
+--- a/src/pcre2test.c
++++ b/src/pcre2test.c
+@@ -7877,7 +7877,8 @@ else
+ (void)PCRE2_CONFIG(PCRE2_CONFIG_NEWLINE, &optval);
+ print_newline_config(optval, FALSE);
+ (void)PCRE2_CONFIG(PCRE2_CONFIG_BSR, &optval);
+-printf("  \\R matches %s\n", optval? "CR, LF, or CRLF only" :
++printf("  \\R matches %s\n", 
++  (optval == PCRE2_BSR_ANYCRLF)? "CR, LF, or CRLF only" :
+                                  "all Unicode newlines");
+ (void)PCRE2_CONFIG(PCRE2_CONFIG_NEVER_BACKSLASH_C, &optval);
+ printf("  \\C is %ssupported\n", optval? "not ":"");
+-- 
+2.13.6
+

pcre2-10.31-Oops-forgot-about-C-bsr-in-previous-patch.patch

@@ -0,0 +1,29 @@
+From e3ac8929b8152e6a30eff90f791b76339e44d91b Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>
+Date: Mon, 19 Feb 2018 17:00:45 +0000
+Subject: [PATCH 2/2] Oops, forgot about "-C bsr" in previous patch.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@917 6239d852-aaf2-0410-a92c-79f79f948069
+Petr Písař: Ported to 10.31.
+---
+ src/pcre2test.c | 2 +-
+
+diff --git a/src/pcre2test.c b/src/pcre2test.c
+index 40e2161..ad3db2c 100644
+--- a/src/pcre2test.c
++++ b/src/pcre2test.c
+@@ -7793,7 +7793,7 @@ if (arg != NULL && arg[0] != CHAR_MINUS)
+     {
+     case CONF_BSR:
+     (void)PCRE2_CONFIG(coptlist[i].value, &optval);
+-    printf("%s\n", optval? "ANYCRLF" : "ANY");
++    printf("%s\n", (optval == PCRE2_BSR_ANYCRLF)? "ANYCRLF" : "ANY");
+     break;
+ 
+     case CONF_FIX:
+-- 
+2.13.6
+

pcre2.spec

@@ -51,6 +51,12 @@ Patch0:     pcre2-10.10-Fix-multilib.patch
 # Fix returning unset groups in POSIX interface if REG_STARTEND a non-zero
 # starting offset, upstream bug #2244, in upstream after 10.31
 Patch1:     pcre2-10.31-Fix-the-value-passed-back-for-POSIX-unset-groups-whe.patch
+# 1/2 Fix pcre2test -C to correctly show what \R matches,
+# in upstream after 10.31
+Patch2:     pcre2-10.31-Fix-pcre2test-C-to-correctly-show-what-R-matches.patch
+# 2/2 Fix pcre2test -C to correctly show what \R matches,
+# in upstream after 10.31
+Patch3:     pcre2-10.31-Oops-forgot-about-C-bsr-in-previous-patch.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  coreutils
@@ -128,6 +134,8 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test.
 %setup -q -n %{name}-%{myversion}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 # Because of multilib patch
 libtoolize --copy --force
 autoreconf -vif
@@ -233,6 +241,7 @@ make %{?_smp_mflags} check VERBOSE=yes
 * Tue Feb 20 2018 Petr Pisar <ppisar@redhat.com> - 10.31-2
 - Fix returning unset groups in POSIX interface if REG_STARTEND a non-zero
   starting offset (upstream bug #2244)
+- Fix pcre2test -C to correctly show what \R matches
 
 * Mon Feb 12 2018 Petr Pisar <ppisar@redhat.com> - 10.31-1
 - 10.31 bump