#2 Rebase to the 10.37
Merged 2 years ago by ljavorsk. Opened 2 years ago by ljavorsk.
rpms/ ljavorsk/pcre2 rawhide  into  rawhide

file modified
+2
@@ -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

file modified
+17 -15
@@ -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 @@ 

  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
@@ -74,6 +62,7 @@ 

  BuildRequires:  readline-devel

  %endif

  BuildRequires:  sed

+ BuildRequires:  pcre2

  Requires:       %{name}-syntax = %{version}-%{release}

  Provides:       bundled(sljit)

  
@@ -163,7 +152,7 @@ 

  %global optflags %{optflags} -fno-strict-aliasing

  %endif

  %configure \

- %ifarch s390 s390x sparc64 sparcv9 riscv64

+ %ifarch s390 sparc64 sparcv9 riscv64

      --disable-jit \

      --disable-pcre2grep-jit \

  %else
@@ -210,12 +199,17 @@ 

  # These are handled by %%doc in %%files

  rm -rf $RPM_BUILD_ROOT%{_docdir}/pcre2

  

+ # Copy old soname %{_libdir}/libpcre2-posix.so.2

+ cp %{_libdir}/libpcre2-posix.so.2* $RPM_BUILD_ROOT%{_libdir}

+ 

  %check

  make %{?_smp_mflags} check VERBOSE=yes

  

  %files

  %{_libdir}/libpcre2-8.so.0*

+ # We can delete this after rebuilding all dependent packages

  %{_libdir}/libpcre2-posix.so.2*

+ %{_libdir}/libpcre2-posix.so.3*

  

  %files utf16

  %{_libdir}/libpcre2-16.so.0*
@@ -266,6 +260,14 @@ 

  %{_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* SONAME bump to libpcre2-posix.so.3*

+ - Enable JIT for s390x arch

+ - Patches upstreamed: Patch 1,2,3,4

+ - Resolves: rhbz#1970765, BZ#1965025

+ 

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

file modified
+2 -2
@@ -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

Resolves: rhbz#1970765, BZ#1965025
libpcre2-posix.so.2 SONAME bump to libpcre2-posix.so.3
Enable JIT for s390x arch
Patches upstreamed: Patch 1,2,3,4

We will have to figure out how to backport the old soname version to be compatible with the packages that require it.

Don't merge this until we have the full plan of what to do with the packages that use the old library.

Also we will have to announce this change in the Fedora devel list

1 new commit added

  • Soname bump of libpcre2-posix.so
2 years ago

Metadata Update from @ljavorsk:
- Request assigned

2 years ago

Metadata Update from @mschorm:
- Request assigned

2 years ago

Metadata Update from @ljavorsk:
- Request assigned

2 years ago

For the second commit which copies the old library, you should, technically speaking, build-require pcre2 binary package.

@ppisar You mean to add BuildRequire: pcre2 to the spec? Or you meant something with the commit message?

I mean adding "BuildRequire: pcre2".

2 new commits added

  • Soname bump of libpcre2-posix.so
  • Rebase to the 10.37
2 years ago

Added, thanks for an advice

Pull-Request has been merged by ljavorsk

2 years ago