From f156398dc5ffd29ea4f9b7d2396b388cfdfc77cb7b12096f46a346d8cbac491d Mon Sep 17 00:00:00 2001 From: Yuchen Lin Date: Sat, 23 May 2020 15:19:04 +0000 Subject: [PATCH] Accepting request 806245 from devel:libraries:c_c++ OBS-URL: https://build.opensuse.org/request/show/806245 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pcre2?expand=0&rev=18 --- pcre2-10.34.tar.bz2 | 3 --- pcre2-10.34.tar.bz2.sig | Bin 310 -> 0 bytes pcre2-10.35.tar.bz2 | 3 +++ pcre2-10.35.tar.bz2.sig | Bin 0 -> 310 bytes pcre2.changes | 27 +++++++++++++++++++++++++++ pcre2.spec | 35 +++++++++++++++++------------------ 6 files changed, 47 insertions(+), 21 deletions(-) delete mode 100644 pcre2-10.34.tar.bz2 delete mode 100644 pcre2-10.34.tar.bz2.sig create mode 100644 pcre2-10.35.tar.bz2 create mode 100644 pcre2-10.35.tar.bz2.sig diff --git a/pcre2-10.34.tar.bz2 b/pcre2-10.34.tar.bz2 deleted file mode 100644 index 030a1c0..0000000 --- a/pcre2-10.34.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74c473ffaba9e13db6951fd146e0143fe9887852ce73406a03277af1d9b798ca -size 1714731 diff --git a/pcre2-10.34.tar.bz2.sig b/pcre2-10.34.tar.bz2.sig deleted file mode 100644 index e68531214d5ae09265661f609a104343ac08e62d166b000c18217d255708a747..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}0W$;u0SEvc79j*h_Kj4#;y<$kn?~iAX5fVT4@1}m0$tX-O#liB5SM1) zg!>Oe*kl3-0H2XZEh)uI>^tTb$Vt*XXHILSogZllYA6EAL3rd9?LMn&=L#(TsYL%M z&Qya~nTp64!-K6~Te=|qkXcgf^;VUi4%XXag<+B|uV~TK-LyZ+B}yV*4%^qXp7JPw+%EEn6#L5CM``8Z zYC{rDd+a+1vO}~&{V%DUO}SbADo2uHC--$<|E!AMhuDmE5^RM8x5wa3*X9o31?B~x z59vf_?n%6#D{aIDNoZUh_)Mc!bv=ruKBP8G@jd>RepK#m_()?5l$KDK<6?$Q2;gI7 INR)6sjd1XjQ2+n{ diff --git a/pcre2-10.35.tar.bz2 b/pcre2-10.35.tar.bz2 new file mode 100644 index 0000000..47d2030 --- /dev/null +++ b/pcre2-10.35.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ccba8e02b0ce78046cdfb52e5c177f0f445e421059e43becca4359c669d4613 +size 1725214 diff --git a/pcre2-10.35.tar.bz2.sig b/pcre2-10.35.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..37a843f054ade32cc8b537360c953cde529055aab2b8060ef85bf8c4618fc526 GIT binary patch literal 310 zcmV-60m=S}0W$;u0SEvc79j*h_Kj4#;y<$kn?~iAX5fVT4@1}m0$#Sy!~hBj5SM1) zg!>Oe*laNf0H26T%3I}O)Nq)rp9XnnPkwzG`=Be&=rL4{dAz0CbogwK+(dd(&MIIr zCMgXgf_h?B`D^Um<`^L!Gc84%kXx9H}`6rSxBvhE literal 0 HcmV?d00001 diff --git a/pcre2.changes b/pcre2.changes index 8741ddd..22256d8 100644 --- a/pcre2.changes +++ b/pcre2.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Wed May 13 22:24:30 UTC 2020 - Илья Индиго + +- Refresh spec-file via spec-cleaner. + * Add %make_build and %license macros. +- Update to 10.35 + * https://www.pcre.org/changelog.txt + * Use PCRE2_MATCH_EMPTY flag to detect empty matches in JIT. + * A JIT bug is fixed which allowed to read the fields + of the compiled pattern before its existence is checked. + * Added PCRE2_SUBSTITUTE_LITERAL. + * Avoid some VS compiler warnings. + * Added PCRE2_SUBSTITUTE_MATCHED. + * Added (?* and (?<* as synonms for (*napla: and (*naplb: + to match another regex engine. + * Fix *THEN verbs in lookahead assertions in JIT. + * Added PCRE2_SUBSTITUTE_REPLACEMENT_ONLY. + * The JIT stack should be freed when the low-level stack + allocation fails. + * Changed setting of CMAKE_MODULE_PATH in CMakeLists.txt from SET + to LIST(APPEND...) to allow a setting from the command line + to be included. + * Updated to Unicode 13.0.0. + * CMake build now checks for secure_getenv() and strerror(). + * Restrict the configuration setting for the SELinux compatible + execmem allocator (change 10.30/44) to Linux and NetBSD. + ------------------------------------------------------------------- Fri Mar 27 16:26:54 UTC 2020 - Marketa Calabkova diff --git a/pcre2.spec b/pcre2.spec index 5f99f95..53fc96e 100644 --- a/pcre2.spec +++ b/pcre2.spec @@ -16,15 +16,16 @@ # +%global _lto_cflags %{_lto_cflags} -ffat-lto-objects Name: pcre2 -Version: 10.34 +Version: 10.35 Release: 0 Summary: A library for Perl-compatible regular expressions License: BSD-3-Clause Group: Development/Libraries/C and C++ -URL: https://www.pcre.org/ +URL: https://www.pcre.org #SVN-Clone: svn://vcs.exim.org/pcre/code/trunk -Source: https://ftp.pcre.org/pub/pcre/%{name}-%{version}.tar.bz2 +Source0: https://ftp.pcre.org/pub/pcre/%{name}-%{version}.tar.bz2 Source2: https://ftp.pcre.org/pub/pcre/%{name}-%{version}.tar.bz2.sig Source3: %{name}.keyring Source4: baselibs.conf @@ -39,8 +40,6 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: zlib-devel -%global _lto_cflags %{_lto_cflags} -ffat-lto-objects - %description The PCRE2 library is a set of functions that implement regular expression pattern matching using the same syntax and semantics @@ -190,14 +189,14 @@ export LDFLAGS="-Wl,-z,relro,-z,now" --enable-unicode %if 0%{?do_profiling} - make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" V=1 + %make_build CFLAGS="%{optflags} %{cflags_profile_generate}" export LANG=POSIX # do not run profiling in parallel for reproducible builds (boo#1040589 boo#1102408) - make CFLAGS="%{optflags} %{cflags_profile_generate}" check - make %{?_smp_mflags} clean - make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}" V=1 + %make_build CFLAGS="%{optflags} %{cflags_profile_generate}" check + %make_build clean + %make_build CFLAGS="%{optflags} %{cflags_profile_feedback}" %else - make %{?_smp_mflags} CFLAGS="%{optflags}" + %make_build CFLAGS="%{optflags}" %endif %install @@ -209,7 +208,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %check export LANG=POSIX -make check -j1 +%make_build check -j1 %post -n libpcre2-8-0 -p /sbin/ldconfig %postun -n libpcre2-8-0 -p /sbin/ldconfig @@ -226,32 +225,32 @@ make check -j1 %{_libdir}/libpcre2-8.so.* %files -n libpcre2-16-0 -%doc LICENCE +%license LICENCE %{_libdir}/libpcre2-16.so.* %files -n libpcre2-32-0 -%doc LICENCE +%license LICENCE %{_libdir}/libpcre2-32.so.* %files -n libpcre2-posix2 -%doc LICENCE +%license LICENCE %{_libdir}/libpcre2-posix.so.* %files tools -%doc LICENCE +%license LICENCE %{_bindir}/pcre2grep %{_bindir}/pcre2test %{_mandir}/man1/pcre2grep.1%{?ext_man} %{_mandir}/man1/pcre2test.1%{?ext_man} %files doc -%license COPYING -%doc AUTHORS ChangeLog LICENCE NEWS README +%license COPYING LICENCE +%doc AUTHORS ChangeLog NEWS README %doc doc/html doc/*.txt %doc %{_defaultdocdir}/pcre2-doc %files devel -%doc LICENCE +%license LICENCE %{_bindir}/pcre2-config %{_includedir}/* %{_libdir}/*.so