diff --git a/backport-pcre2-10.36-Get-rid-of-gcc-fanalyzer-error-though-it-was-probabl.patch b/backport-pcre2-10.36-Get-rid-of-gcc-fanalyzer-error-though-it-was-probabl.patch deleted file mode 100644 index b5b33c6dea56ca3d884929abc8e69c2e677822f0..0000000000000000000000000000000000000000 --- a/backport-pcre2-10.36-Get-rid-of-gcc-fanalyzer-error-though-it-was-probabl.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 32e83fc2d59413d13039cc31db1558d9c0e3b874 Mon Sep 17 00:00:00 2001 -From: ph10 -Date: Thu, 14 Jan 2021 16:56:44 +0000 -Subject: [PATCH] Get rid of gcc -fanalyzer error (though it was probably a - false positive). -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@1293 6239d852-aaf2-0410-a92c-79f79f948069 -Signed-off-by: Petr Písař -Petr Pisar: Ported to 10.36. ---- - src/pcre2_auto_possess.c | 13 +++++++++---- - -diff --git a/src/pcre2_auto_possess.c b/src/pcre2_auto_possess.c -index c64cf85..66064ed 100644 ---- a/src/pcre2_auto_possess.c -+++ b/src/pcre2_auto_possess.c -@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. - - Written by Philip Hazel - Original API code Copyright (c) 1997-2012 University of Cambridge -- New API code Copyright (c) 2016-2020 University of Cambridge -+ New API code Copyright (c) 2016-2021 University of Cambridge - - ----------------------------------------------------------------------------- - Redistribution and use in source and binary forms, with or without -@@ -490,6 +490,7 @@ switch(c) - list[2] = (uint32_t)(end - code); - return end; - } -+ - return NULL; /* Opcode not accepted */ - } - -@@ -1186,12 +1187,16 @@ for (;;) - c = *repeat_opcode; - if (c >= OP_CRSTAR && c <= OP_CRMINRANGE) - { -- /* end must not be NULL. */ -+ /* The return from get_chr_property_list() will never be NULL when -+ *code (aka c) is one of the three class opcodes. However, gcc with -+ -fanalyzer notes that a NULL return is possible, and grumbles. Hence we -+ put in a check. */ -+ - end = get_chr_property_list(code, utf, ucp, cb->fcc, list); -- - list[1] = (c & 1) == 0; - -- if (compare_opcodes(end, utf, ucp, cb, list, end, &rec_limit)) -+ if (end != NULL && -+ compare_opcodes(end, utf, ucp, cb, list, end, &rec_limit)) - { - switch (c) - { --- -2.26.2 - diff --git a/pcre2-10.36.tar.bz2 b/pcre2-10.36.tar.bz2 deleted file mode 100644 index 222b975125acf20e32c60a41446844febec4bb80..0000000000000000000000000000000000000000 Binary files a/pcre2-10.36.tar.bz2 and /dev/null differ diff --git a/pcre2-10.39.tar.bz2 b/pcre2-10.39.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..927de2b418949888af828ca5a04623fe8d904903 Binary files /dev/null and b/pcre2-10.39.tar.bz2 differ diff --git a/pcre2.spec b/pcre2.spec index fe393e30bad18dc98788242716762baf32fd7406..e382072f98187030f784198afd11c5f55d460a4e 100644 --- a/pcre2.spec +++ b/pcre2.spec @@ -1,5 +1,5 @@ Name: pcre2 -Version: 10.36 +Version: 10.39 Release: 1 Summary: Perl Compatible Regular Expressions License: BSD @@ -8,7 +8,6 @@ Source0: https://ftp.pcre.org/pub/pcre/%{name}-%{version}.tar.bz2 # Do no set RPATH if libdir is not /usr/lib Patch0: backport-pcre2-10.10-Fix-multilib.patch -Patch1: backport-pcre2-10.36-Get-rid-of-gcc-fanalyzer-error-though-it-was-probabl.patch BuildRequires: autoconf libtool automake coreutils gcc make readline-devel Obsoletes: pcre2-utf16 pcre2-utf32 pcre2-tools @@ -125,6 +124,12 @@ make check %{_pkgdocdir}/html/ %changelog +* Tue Feb 8 2022 yangzhuangzhuang - 10.39-1 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:update to 10.39 + * Thu Jan 21 2021 yixiangzhike - 10.36-1 - Type:requirement - ID:NA