From 3824b8258aa1d78e5e220c2eeab75f083c472c3a Mon Sep 17 00:00:00 2001
From: Lukas Javorsky <ljavorsk@redhat.com>
Date: Wed, 16 Jun 2021 11:42:25 +0200
Subject: [PATCH] Rebase to the 10.37

Resolves: rhbz#1970765
libpcre2-posix.so.2* renamed to libpcre2-posix.so.3*
Patches upstreamed: Patch 1,2,3,4
---
 .gitignore |  2 ++
 pcre2.spec | 24 +++++++++---------------
 sources    |  4 ++--
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 825910e..e233c6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@
 /pcre2-10.36-RC1.tar.bz2.sig
 /pcre2-10.36.tar.bz2
 /pcre2-10.36.tar.bz2.sig
+/pcre2-10.37.tar.bz2
+/pcre2-10.37.tar.bz2.sig
diff --git a/pcre2.spec b/pcre2.spec
index 46babec..9ee3365 100644
--- a/pcre2.spec
+++ b/pcre2.spec
@@ -8,8 +8,8 @@
 # This is stable release:
 #%%global rcversion RC1
 Name:       pcre2
-Version:    10.36
-Release:    %{?rcversion:0.}4%{?rcversion:.%rcversion}%{?dist}
+Version:    10.37
+Release:    %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist}
 %global     myversion %{version}%{?rcversion:-%rcversion}
 Summary:    Perl-compatible regular expression library
 # the library:                          BSD with exceptions
@@ -51,18 +51,6 @@ Source1:    https://ftp.pcre.org/pub/pcre/%{?rcversion:Testing/}%{name}-%{myvers
 Source2:    https://ftp.pcre.org/pub/pcre/Public-Key
 # Do no set RPATH if libdir is not /usr/lib
 Patch0:     pcre2-10.10-Fix-multilib.patch
-# Fix a possible NULL pointer dereference in auto_possessify(),
-# upstream bug #2686, in upstream after 10.36
-Patch1:     pcre2-10.36-Get-rid-of-gcc-fanalyzer-error-though-it-was-probabl.patch
-# Fix misparsing long numbers as a backreference and a number without
-# a closing bracket as a quantifier, upstream bug #2690, in upstream after
-# 10.36
-Patch2:     pcre2-10.36-Fix-some-numerical-checking-bugs-Bugzilla-2690.patch
-# Fix a mismatch if \K was involved in a recursion, in upstream after 10.36
-Patch3:     pcre2-10.36-Fix-K-within-recursion-bug-in-interpreter.patch
-# Restore single character repetition optimization in JIT, upstream bug #2698,
-# in upstream after 10.36
-Patch4:     pcre2-10.36-Restore-single-character-repetition-optimization-in-.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  coreutils
@@ -215,7 +203,7 @@ make %{?_smp_mflags} check VERBOSE=yes
 
 %files
 %{_libdir}/libpcre2-8.so.0*
-%{_libdir}/libpcre2-posix.so.2*
+%{_libdir}/libpcre2-posix.so.3*
 
 %files utf16
 %{_libdir}/libpcre2-16.so.0*
@@ -266,6 +254,12 @@ make %{?_smp_mflags} check VERBOSE=yes
 %{_mandir}/man1/pcre2test.*
 
 %changelog
+* Tue Jun 15 2021 Lukas Javorsky <ljavorsk@redhat.com> - 10.37-1
+- Rebase to the 10.37
+- libpcre2-posix.so.2* renamed to libpcre2-posix.so.3*
+- Patches upstreamed: Patch 1,2,3,4
+- Resolves: rhbz#1970765
+
 * Fri Feb 19 2021 Petr Pisar <ppisar@redhat.com> - 10.36-4
 - Fix a mismatch if \K was involved in a recursion
 - Restore single character repetition optimization in JIT (upstream bug #2698)
diff --git a/sources b/sources
index 0966770..0694fe0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pcre2-10.36.tar.bz2) = fc2a920562c80c3d31cedd94028fab55314ae0fb168cac7178f286c344a11fc514939edc3b83b8e0b57c872db4e595fd5530fd1d4b8c779be629553e9ec965a3
-SHA512 (pcre2-10.36.tar.bz2.sig) = f8df02cf3fc4787444ff14a8f1cd306e4d9f2c433420d4ffb40ab6c1f0516f67e51b08efc489ccca1f29cc7a2a0f6268f10a571a32c7835928faa3ab28cfeedf
+SHA512 (pcre2-10.37.tar.bz2) = 69f4bf4736b986e0fc855eedb292efe72a0df2e803bc0e61a6cf47775eed433bb1b2f28d7e641591ef4603d47beb543a64ed0eef9538d00f0746bc3435c143ec
+SHA512 (pcre2-10.37.tar.bz2.sig) = 734fad03576cea36c31a3f485f5b05ca675dc9ec4c405f62495e0864f085b82ad14e77cded4f0ff555e786aa77d51901412e1b49dc750c488b2d353140ae7781