From a977a867033f248ebedc42f16bd53ef33e4962dc Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Thu, 24 Jan 2019 12:22:04 -0600 Subject: [PATCH] Update Perl linking patch. --- cyrus-imapd.spec | 7 +++++-- patch-cyrus-perl-linking | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index d55a59c..28260f6 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -9,7 +9,7 @@ Name: cyrus-imapd Version: 3.0.8 -Release: 7%{?dist} +Release: 8%{?dist} %define ssl_pem_file /etc/pki/%name/%name.pem @@ -47,7 +47,7 @@ Patch3: patch-vzic-proper-cflags # https://github.com/cyrusimap/cyrus-imapd/issues/2621 Patch4: patch-clamav101 -# Ugly workaround for some compiled Perl modules not being linked against +# Workaround for some compiled Perl modules not being linked against # libpcreposix, which causes them to fail to load. # https://bugzilla.redhat.com/show_bug.cgi?id=1668723 # https://github.com/cyrusimap/cyrus-imapd/issues/2629#issuecomment-456925909 @@ -690,6 +690,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v %changelog +* Thu Jan 24 2019 Jason L Tibbitts III - 3.0.8-8 +- Update Perl linkage patch. + * Wed Jan 23 2019 Pete Walter - 3.0.8-7 - Rebuild for ICU 63 diff --git a/patch-cyrus-perl-linking b/patch-cyrus-perl-linking index 630b9f3..71c8bd4 100644 --- a/patch-cyrus-perl-linking +++ b/patch-cyrus-perl-linking @@ -1,26 +1,26 @@ diff --git a/perl/imap/Makefile.PL.in b/perl/imap/Makefile.PL.in -index a0fda4a..5fb0f1f 100644 +index a0fda4a..df71c0c 100644 --- a/perl/imap/Makefile.PL.in +++ b/perl/imap/Makefile.PL.in -@@ -89,7 +89,7 @@ WriteMakefile( - }, +@@ -90,7 +90,7 @@ WriteMakefile( 'clean' => {'FILES' => 'libcyrperl.a cyradm'}, 'OBJECT' => 'IMAP.o', -- 'MYEXTLIB' => '@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a', -+ 'MYEXTLIB' => '@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a -lpcreposix', - 'LIBS' => [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@"], + 'MYEXTLIB' => '@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a', +- 'LIBS' => [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@"], ++ 'LIBS' => [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ -lpcreposix"], 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' 'INC' => "-I@top_srcdir@ -I@top_srcdir@/com_err/et @SASLFLAGS@ @SSL_CPPFLAGS@ -I@top_srcdir@/perl/imap", + 'EXE_FILES' => [cyradm], diff --git a/perl/sieve/managesieve/Makefile.PL.in b/perl/sieve/managesieve/Makefile.PL.in -index 2a3415a..f2a2592 100644 +index 2a3415a..67fb2d1 100644 --- a/perl/sieve/managesieve/Makefile.PL.in +++ b/perl/sieve/managesieve/Makefile.PL.in -@@ -68,7 +68,7 @@ WriteMakefile( - 'NAME' => 'Cyrus::SIEVE::managesieve', +@@ -69,7 +69,7 @@ WriteMakefile( 'ABSTRACT' => 'Cyrus Sieve management interface', 'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", # finds $VERSION -- 'MYEXTLIB' => '../lib/.libs/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a', -+ 'MYEXTLIB' => '../lib/.libs/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a -lpcreposix', - 'LIBS' => ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@"], + 'MYEXTLIB' => '../lib/.libs/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a', +- 'LIBS' => ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@"], ++ 'LIBS' => ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@ -lpcreposix"], 'CCFLAGS' => '@GCOV_CFLAGS@', 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' + 'INC' => "-I@top_srcdir@/lib -I@top_srcdir@/perl/sieve -I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@",