[csw-devel] SF.net SVN: gar:[8788] csw/mgar/pkg/cyrus_imapd/trunk

[dmichelsen at users.sourceforge.net]

Revision: 8788
          http://gar.svn.sourceforge.net/gar/?rev=8788&view=rev
Author:   dmichelsen
Date:     2010-02-24 14:37:22 +0000 (Wed, 24 Feb 2010)

Log Message:
-----------
cyrus_imapd: Add explicit linkage to libperl.so to fix #3766

Modified Paths:
--------------
    csw/mgar/pkg/cyrus_imapd/trunk/Makefile
    csw/mgar/pkg/cyrus_imapd/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cyrus_imapd/trunk/files/0001-Force-linkage-to-libperl.so.patch

Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2010-02-24 14:21:56 UTC (rev 8787)
+++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2010-02-24 14:37:22 UTC (rev 8788)
@@ -92,6 +92,10 @@
 # we restore the previous default value to avoid upgrade problem
 PATCHFILES += restore_allowplaintext_default.patch
 
+# Make sure the module is self contained. This fixes bug
+#   <http://www.opencsw.org/mantis/view.php?id=3766>
+PATCHFILES += 0001-Force-linkage-to-libperl.so.patch
+
 #GARCOMPILER = GNU
 #GNU_CC_OPT = -g
 #GNU_LD_OPT = -g

Modified: csw/mgar/pkg/cyrus_imapd/trunk/checksums
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/checksums	2010-02-24 14:21:56 UTC (rev 8787)
+++ csw/mgar/pkg/cyrus_imapd/trunk/checksums	2010-02-24 14:37:22 UTC (rev 8788)
@@ -1,3 +1,4 @@
+c86246806025404625c98a2348d0739d  0001-Force-linkage-to-libperl.so.patch
 585646739e9403c02e868900ebed892a  CSWcyrusimapd.checkinstall
 5111a5573aa6d4878b852780aeae8a27  CSWcyrusimapd.preinstall
 940d00efcc42b92f05e92e6dd2764f61  CSWcyrusimapd.prototype

Added: csw/mgar/pkg/cyrus_imapd/trunk/files/0001-Force-linkage-to-libperl.so.patch
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/0001-Force-linkage-to-libperl.so.patch	                        (rev 0)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/0001-Force-linkage-to-libperl.so.patch	2010-02-24 14:37:22 UTC (rev 8788)
@@ -0,0 +1,39 @@
+From 46de9238dc1925a468812b315e9095600279c33f Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 24 Feb 2010 15:17:57 +0100
+Subject: [PATCH] Force linkage to libperl.so
+
+---
+ perl/imap/Makefile.PL              |    2 +-
+ perl/sieve/managesieve/Makefile.PL |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/perl/imap/Makefile.PL b/perl/imap/Makefile.PL
+index 27ae4ca..ea8080f 100644
+--- a/perl/imap/Makefile.PL
++++ b/perl/imap/Makefile.PL
+@@ -65,7 +65,7 @@ WriteMakefile(
+     'clean'	=> {'FILES' => 'libcyrperl.a cyradm'},
+     'OBJECT'    => 'IMAP.o',
+     'MYEXTLIB'  => '../../lib/libcyrus.a ../../lib/libcyrus_min.a',
+-    'LIBS'	=> ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto"],
++    'LIBS'	=> ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto -lperl"],
+     'DEFINE'	=> '-DPERL_POLLUTE',    # e.g., '-DHAVE_SOMETHING' 
+     'INC'	=> "-I../../lib -I../.. -I../../com_err/et $SASL_INC $OPENSSL_INC", 
+     'EXE_FILES' => [cyradm],
+diff --git a/perl/sieve/managesieve/Makefile.PL b/perl/sieve/managesieve/Makefile.PL
+index b577f4c..a32ffb8 100644
+--- a/perl/sieve/managesieve/Makefile.PL
++++ b/perl/sieve/managesieve/Makefile.PL
+@@ -62,7 +62,7 @@ WriteMakefile(
+     'ABSTRACT'  => 'Cyurs Sieve management interface',
+     'VERSION_FROM' => 'managesieve.pm', # finds $VERSION
+     'MYEXTLIB'  => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a',
+-    'LIBS'	=> ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto"], 
++    'LIBS'	=> ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto -lperl"], 
+     'DEFINE'	=> '-DPERL_POLLUTE',     # e.g., '-DHAVE_SOMETHING' 
+     'INC'	=> "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
+ );
+-- 
+1.6.5.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.