diff --git a/pcre-8.42-pcreposix.patch b/pcre-8.42-pcreposix.patch new file mode 100644 index 0000000..dcc88ee --- /dev/null +++ b/pcre-8.42-pcreposix.patch @@ -0,0 +1,36 @@ +From: Mark Baker +Date: Wed, 13 Jul 2016 21:20:13 +0100 +Subject: pcreposix + +--- + pcreposix.h | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/pcreposix.h b/pcreposix.h +index c77c0b0..4527f78 100644 +--- a/pcreposix.h ++++ b/pcreposix.h +@@ -133,14 +133,19 @@ file. */ + + /* The functions */ + +-PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int); +-PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t, ++PCREPOSIX_EXP_DECL int pcreposix_regcomp(regex_t *, const char *, int); ++PCREPOSIX_EXP_DECL int pcreposix_regexec(const regex_t *, const char *, size_t, + regmatch_t *, int); +-PCREPOSIX_EXP_DECL size_t regerror(int, const regex_t *, char *, size_t); +-PCREPOSIX_EXP_DECL void regfree(regex_t *); ++PCREPOSIX_EXP_DECL size_t pcreposix_regerror(int, const regex_t *, char *, size_t); ++PCREPOSIX_EXP_DECL void pcreposix_regfree(regex_t *); + + #ifdef __cplusplus + } /* extern "C" */ + #endif + ++#define regcomp pcreposix_regcomp ++#define regexec pcreposix_regexec ++#define regerror pcreposix_regerror ++#define regfree pcreposix_regfree ++ + #endif /* End of pcreposix.h */ diff --git a/pcre.changes b/pcre.changes index d353ee7..c048b8d 100644 --- a/pcre.changes +++ b/pcre.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 25 10:24:59 UTC 2018 - lauffer@ph-freiburg.de + +- pcreposix patch taken from debian. Solves cyrus-imapd issue #1731, too. + ------------------------------------------------------------------- Tue Sep 4 11:46:19 UTC 2018 - astieger@suse.com diff --git a/pcre.spec b/pcre.spec index 60c39de..f089a14 100644 --- a/pcre.spec +++ b/pcre.spec @@ -34,6 +34,8 @@ Patch0: pcre-8.32-visibility.patch Patch1: pcre-8.21-multilib.patch #PATCH-FIX-OPENSUSE kstreitova@suse.com fix pcre stack frame size detection https://bugs.exim.org/show_bug.cgi?id=2173 Patch2: pcre-8.41-stack_frame_size_detection.patch +#Patch 3: see: https://sources.debian.net/patches/pcre3/2:8.39-2/pcreposix.patch/ and cyrus imapd issue #1731 +Patch3: pcre-8.42-pcreposix.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -144,6 +146,7 @@ as Perl 5. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # Available JIT archs see sljit/sljitConfig.h