Author: wiget Date: Sun Apr 11 21:02:32 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 2.3.16
- shared patch is back
---- Files affected:
packages/cyrus-imapd:
cyrus-imapd-shared.patch (1.14 -> 1.15) , cyrus-imapd.spec (1.135 -> 1.136)
---- Diffs:
================================================================
Index: packages/cyrus-imapd/cyrus-imapd-shared.patch
diff -u packages/cyrus-imapd/cyrus-imapd-shared.patch:1.14
packages/cyrus-imapd/cyrus-imapd-shared.patch:1.15
--- packages/cyrus-imapd/cyrus-imapd-shared.patch:1.14 Wed Sep 24 15:46:36 2008
+++ packages/cyrus-imapd/cyrus-imapd-shared.patch Sun Apr 11 23:02:23 2010
@@ -1,83 +1,192 @@
---- cyrus-imapd-2.3.12p2.shared/configure.in 2008-09-23 21:44:50.591844716
+0300
-+++ cyrus-imapd-2.3.12p2/configure.in 2008-09-23 22:25:22.672454302 +0300
-@@ -87,7 +87,7 @@
- AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",[Config File Location])
+--- cyrus-imapd-2.3.16/master/Makefile.in.wiget 2008-03-24
18:47:41.000000000 +0100
++++ cyrus-imapd-2.3.16/master/Makefile.in 2010-04-11 22:34:54.330511878
+0200
+@@ -48,6 +48,8 @@ VPATH = @srcdir@
+ CC = @CC@
+ INSTALL = @INSTALL@
+ RANLIB = @RANLIB@
++LIBTOOL = @LIBTOOL@
++top_builddir = @top_builddir@
- AC_PROG_CC
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- AC_PROG_MAKE_SET
- AC_PROG_INSTALL
- AC_AIX
-@@ -133,7 +133,7 @@
- cyrus_cv_getaddrinfo=no)], cyrus_cv_getaddrinfo=no)
+ cyrus_us...@cyrus_user@
+ cyrus_gro...@cyrus_group@
+@@ -58,7 +60,7 @@ DEPLIBS = @DEPLIBS@
- if test $cyrus_cv_getaddrinfo = no; then
-- IPV6_OBJS="getaddrinfo.o"
-+ IPV6_OBJS="getaddrinfo.lo"
- fi
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
+-LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
++LIBS = ../lib/libcyrus_min.la @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
- cyrus_cv_getnameinfo=yes
-@@ -142,7 +142,7 @@
- cyrus_cv_getnameinfo=no)
+ SHELL = /bin/sh
+ MAKEDEPEND = @MAKEDEPEND@
+@@ -68,7 +70,7 @@ exec_prefix = @exec_prefix@
+ cyrus_prefix = @cyrus_prefix@
+ service_path = @service_path@
- if test $cyrus_cv_getnameinfo = no; then
-- IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
-+ IPV6_OBJS="$IPV6_OBJS getnameinfo.lo"
- fi
+-LOBJS=service.o service-thread.o
++LOBJS=service.lo service-thread.lo
- IPv6_CHECK_SS_FAMILY()
-@@ -166,7 +166,7 @@
- dnl function for doing each of the database backends
- dnl parameters: backend name, variable to set, withval
+ PROGS=master
--CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
-+CYRUSDB_OBJS="cyrusdb_flat.lo cyrusdb_skiplist.lo cyrusdb_quotalegacy.lo"
+@@ -78,18 +80,18 @@ install:
+ $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
+ for file in $(PROGS); \
+ do \
+- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
++ $(LIBTOOL) --mode=install $(INSTALL) $$file
$(DESTDIR)$(service_path) || exit 1; \
+ done
- dnl Berkeley DB Detection
+-.c.o:
+- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
++%.lo: %.c
++ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS)
$(CFLAGS) \
+ $<
-@@ -213,7 +213,7 @@
- LIBS="${LIBS} ${BDB_LIBADD}"
- CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
+-master: master.o masterconf.o cyrusMasterMIB.o ../lib/lo...@[email protected]
+- $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o
../lib/lo...@[email protected] $(LIBS) $(DEPLIBS)
++master: master.lo masterconf.lo cyrusMasterMIB.lo ../lib/lo...@[email protected]
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o master master.lo
masterconf.lo cyrusMasterMIB.lo ../lib/lo...@[email protected] $(LIBS) $(DEPLIBS)
-- CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
-+ CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.lo"
- AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
- fi
+ clean:
+- rm -f *.o *.a Makefile.bak $(PROGS)
++ rm -rf .libs *.lo *.a *.la Makefile.bak $(PROGS)
-@@ -230,9 +230,9 @@
- fi)
+ distclean: clean
+ rm -f Makefile
+--- cyrus-imapd-2.3.16/notifyd/Makefile.in.wiget 2008-03-24
20:59:32.000000000 +0100
++++ cyrus-imapd-2.3.16/notifyd/Makefile.in 2010-04-11 22:34:54.330511878
+0200
+@@ -49,6 +49,8 @@ VPATH = @srcdir@
- if test "$sievedir" != "no"; then
-- SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
-+ SIEVE_OBJS="lmtp_sieve.lo smtpclient.lo"
- AC_SUBST(SIEVE_OBJS)
-- SIEVE_LIBS="../${sievedir}/libsieve.a"
-+ SIEVE_LIBS="../${sievedir}/libsieve.la"
- AC_SUBST(SIEVE_LIBS)
- SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
- AC_SUBST(SIEVE_CPPFLAGS)
-@@ -914,7 +914,7 @@
- if test $cyrus_cv_lib_syslog = no; then
- PRE_SUBDIRS="${PRE_SUBDIRS} syslog"
- EXTRA_OUTPUT="${EXTRA_OUTPUT} syslog/Makefile"
-- DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
-+ DEPLIBS="${DEPLIBS} ../syslog/libsyslog.la"
- CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
- fi
- AC_MSG_RESULT($cyrus_cv_lib_syslog)
-@@ -1010,7 +1010,7 @@
- dnl Check for MD5 functions
- AC_FUNC_CHECK(MD5Init,,
- AC_CHECK_LIB(md, MD5Init, LIBS="${LIBS} -lmd",
-- MD5OBJ="md5.o"))
-+ MD5OBJ="md5.lo"))
- AC_SUBST(MD5OBJ)
+ CC = @CC@
+ RANLIB = @RANLIB@
++LIBTOOL = @LIBTOOL@
++top_builddir = @top_builddir@
- dnl snmp
---- cyrus-imapd-2.3.12p2.shared/depot/Makefile.in 2008-09-23
21:44:50.599845178 +0300
-+++ cyrus-imapd-2.3.12p2/depot/Makefile.in 2008-09-23 22:10:04.419383504
+0300
-@@ -44,16 +44,18 @@
+ INSTALL = @INSTALL@
+ cyrus_us...@cyrus_user@
+@@ -68,13 +70,13 @@ MAKEDEPEND = @MAKEDEPEND@
+
+ NOTIFYD_LIBS = @NOTIFYD_LIBS@
+
+-SERVICE=../master/service.o
++SERVICE=../master/service.lo
+
+ IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
+ IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
+ LIB_WRAP = @LIB_WRAP@
+ LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
+-DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a
../lib/libcyrus_min.a @DEPLIBS@
++DEPLIBS=../imap/mutex_fake.lo ../imap/libimap.la ../lib/libcyrus.la
../lib/libcyrus_min.la @DEPLIBS@
+
+ PURIFY=/usr/local/bin/purify
+ PUREOPT=-best-effort
+@@ -82,25 +84,25 @@ PUREOPT=-best-effort
+ all: notifyd
+
+ install:
+- $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
++ $(LIBTOOL) --mode=install $(INSTALL) -m 755 notifyd
$(DESTDIR)$(service_path)
+
+-OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o
++OBJS= notifyd.lo notify_null.lo notify_log.lo notify_mailto.lo
notify_zephyr.lo
+
+-notifytest: notifytest.o
+- $(CC) $(LDFLAGS) -o notifytest \
+- notifytest.o $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
++notifytest: notifytest.lo
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o notifytest \
++ notifytest.lo $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
+
+ notifyd: $(OBJS) $(SERVICE)
+- $(CC) $(LDFLAGS) -o notifyd \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o notifyd \
+ $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
+
+ notifyd.pure: $(OBJS) $(SERVICE)
+ $(PURIFY) $(PUREOPT) \
+- $(CC) $(LDFLAGS) -o notifyd.pure \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o notifyd.pure \
+ $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
+
+ clean:
+- rm -f notifyd notifytest *.o *.a *~ Makefile.bak makedepend.log
++ rm -rf notifyd notifytest .libs *.o *.lo *.a *.la *~ Makefile.bak
makedepend.log
+
+ distclean: clean
+ rm -f Makefile
+@@ -108,8 +110,8 @@ distclean: clean
+ depend:
+ ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c
$(srcdir)/*.c 1>makedepend.log 2>&1
+
+-.c.o:
+- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
++%.lo: %.c
++ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS)
$(CFLAGS) \
+ $<
+
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+--- cyrus-imapd-2.3.16/installsieve/Makefile.in.wiget 2008-03-24
21:33:11.000000000 +0100
++++ cyrus-imapd-2.3.16/installsieve/Makefile.in 2010-04-11
22:34:54.330511878 +0200
+@@ -47,6 +47,8 @@ VPATH = @srcdir@
+
+ CC = @CC@
+ RANLIB = @RANLIB@
++LIBTOOL = @LIBTOOL@
++top_builddir = @top_builddir@
+
+ DEFS = @DEFS@
+ CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
+@@ -59,7 +61,7 @@ MAKEDEPEND = @MAKEDEPEND@
+
+ IMAP_LIBS = @IMAP_LIBS@
+ LIBS =
+-DEPLIBS= ../lib/libcyrus.a @DEPLIBS@
++DEPLIBS= ../lib/libcyrus.la @DEPLIBS@
+
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+@@ -68,20 +70,18 @@ cyrus_prefix = @cyrus_prefix@
+ all: installsieve
+
+ install:
+- $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
++ $(LIBTOOL) --mode=install $(INSTALL) installsieve
$(DESTDIR)$(exec_prefix)/bin
+
+-OBJS=lex.o mystring.o request.o isieve.o
++OBJS=lex.lo mystring.lo request.lo isieve.lo
+
+-libinstallsieve.a: $(OBJS)
+- rm -f libinstallsieve.a
+- ar cr libinstallsieve.a $(OBJS)
+- $(RANLIB) libinstallsieve.a
++libinstallsieve.la: $(OBJS)
++ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libinstallsieve.la $(OBJS)
+
+-installsieve: libinstallsieve.a installscript.o $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o
$(DEPLIBS) $(IMAP_LIBS)
++installsieve: libinstallsieve.la installscript.lo $(DEPLIBS)
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o installsieve
libinstallsieve.la installscript.lo $(DEPLIBS) $(IMAP_LIBS)
+
+ clean:
+- rm -f *.o *.a Makefile.bak makedepend.log
++ rm -rf .libs *.o *.lo *.a *.la Makefile.bak makedepend.log
+
+ distclean: clean
+ rm -f Makefile installsieve
+@@ -89,9 +89,8 @@ distclean: clean
+ depend:
+ ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c
$(srcdir)/*.c 1>makedepend.log 2>&1
+
+-.c.o:
+- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
++%.lo: %.c
++ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS)
-I$(srcdir) -I. $(CFLAGS) \
+ $<
+
+-
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+--- cyrus-imapd-2.3.16/syslog/Makefile.in.wiget 2008-03-24
21:15:59.000000000 +0100
++++ cyrus-imapd-2.3.16/syslog/Makefile.in 2010-04-11 22:34:54.330511878
+0200
+@@ -44,12 +44,14 @@
# $Id$
srcdir = @srcdir@
@@ -85,36 +194,48 @@
VPATH = @srcdir@
CC = @CC@
+
INSTALL = @INSTALL@
RANLIB = @RANLIB@
+LIBTOOL = @LIBTOOL@
DEFS = @DEFS@
- CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
- LIBS = @LIBS@
--DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-+DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
+ CPPFLAGS = @CPPFLAGS@
+@@ -61,23 +63,22 @@ LDFLAGS = @LDFLAGS@
+ SHELL = /bin/sh
+ MAKEDEPEND = @MAKEDEPEND@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
-@@ -73,11 +75,11 @@
- $(INSTALL) -m 644 $(srcdir)/rc.local.imap $(DESTDIR)etc
- $(INSTALL) -m 644 $(srcdir)/rc.local.ptclient $(DESTDIR)etc
+-all: libsyslog.a syslogd
++all: libsyslog.la syslogd
+
+ install:
+ @echo "Install syslogd and syslog.conf as appropriate"
-.c.o:
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
+- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
+%.lo: %.c
-+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS)
$(CFLAGS) $<
++ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS)
-I$(srcdir) $(CFLAGS) $<
+
+-libsyslog.a: syslog.o
+- ar cr libsyslog.a syslog.o
+- $(RANLIB) libsyslog.a
++libsyslog.la: syslog.lo
++ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libsyslog.la syslog.lo
+
+-syslogd: syslogd.o
+- $(CC) $(LDFLAGS) -o syslogd syslogd.o $(LIBS)
++syslogd: syslogd.lo
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o syslogd syslogd.lo
$(LIBS)
clean:
-- rm -f *.o Makefile.bak makedepend.log
-+ rm -rf .libs *.o *.lo Makefile.bak makedepend.log
+- rm -f *.o *.a Makefile.bak
++ rm -rf .libs *.o *.lo *.a *.la Makefile.bak
distclean: clean
rm -f Makefile
---- cyrus-imapd-2.3.12p2.shared/imap/Makefile.in 2008-09-23
21:44:50.591844716 +0300
-+++ cyrus-imapd-2.3.12p2/imap/Makefile.in 2008-09-24 16:29:37.354850372
+0300
-@@ -45,16 +45,18 @@
+--- cyrus-imapd-2.3.16/imap/Makefile.in.wiget 2009-03-30 18:04:56.000000000
+0200
++++ cyrus-imapd-2.3.16/imap/Makefile.in 2010-04-11 22:34:54.330511878
+0200
+@@ -45,16 +45,18 @@ DEFINES=-DSETPROCTITLE
# \Seen state database. Either 'db' (berkeley db) or
# 'local' (legacy flat file).
@@ -134,7 +255,7 @@
cyrus_us...@cyrus_user@
cyrus_gro...@cyrus_group@
-@@ -67,7 +69,7 @@
+@@ -67,7 +69,7 @@ SIEVE_LIBS = @SIEVE_LIBS@
IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
LIB_WRAP = @LIB_WRAP@
LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
@@ -143,7 +264,7 @@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
-@@ -96,23 +98,23 @@
+@@ -96,23 +98,23 @@ exec_prefix = @exec_prefix@
cyrus_prefix = @cyrus_prefix@
service_path = @service_path@
@@ -179,7 +300,7 @@
PROGS = imapd lmtpd pop3d \
fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \
-@@ -131,31 +133,28 @@
+@@ -131,31 +133,28 @@ pure: imapd.pure lmtpd.pure mupdate.pure
install:
$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
@@ -218,7 +339,7 @@
pushstats.c: pushstats.snmp $(srcdir)/../snmp/snmpgen
$(srcdir)/../snmp/snmpgen $(srcdir)/pushstats.snmp
-@@ -183,179 +182,179 @@
+@@ -183,182 +182,182 @@ mupdate_err.c: mupdate_err.et
mupdate_err.h: mupdate_err.c
### Services
@@ -252,7 +373,7 @@
+
+lmtpd: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.lo \
+ libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd \
+ $(SERVICE) lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
+ mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
+
@@ -452,10 +573,18 @@
- $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
- libimap.a $(DEPLIBS) $(LIBS)
-
+-cyr_virusscan: cyr_virusscan.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o cyr_virusscan cyr_virusscan.o index.o $(CLIOBJS) \
+- libimap.a $(DEPLIBS) $(LIBS) -lclamav
+-
-cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
- $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
- libimap.a $(DEPLIBS) $(LIBS)
-
+-cyr_df: cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o \
+- cyr_df cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
+-
-mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
- $(CC) $(LDFLAGS) -o \
- mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
@@ -497,10 +626,18 @@
+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o ipurge ipurge.lo
$(CLIOBJS) \
+ libimap.la $(DEPLIBS) $(LIBS)
+
++cyr_virusscan: cyr_virusscan.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_virusscan
cyr_virusscan.lo index.lo $(CLIOBJS) \
++ libimap.la $(DEPLIBS) $(LIBS) -lclamav
++
+cyrdump: cyrdump.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyrdump cyrdump.lo
index.lo $(CLIOBJS) \
+ libimap.la $(DEPLIBS) $(LIBS)
+
++cyr_df: cyr_df.lo $(CLIOBJS) libimap.la $(DEPLIBS)
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
++ cyr_df cyr_df.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
++
+mbexamine: mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
+ mbexamine mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
@@ -541,193 +678,348 @@
### Other Misc Targets
- clean:
-- rm -f *.o *.a Makefile.bak makedepend.log \
-+ rm -rf .libs *.o *.lo *.a *.la Makefile.bak makedepend.log \
- $(BUILTSOURCES) $(PROGS) $(SUIDPROGS)
+--- cyrus-imapd-2.3.16/configure.in.wiget 2010-04-11 22:34:54.327178680
+0200
++++ cyrus-imapd-2.3.16/configure.in 2010-04-11 22:34:54.330511878 +0200
+@@ -87,7 +87,7 @@ fi
+ AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",[Config File Location])
- distclean: clean
---- cyrus-imapd-2.3.12p2.shared/imtest/Makefile.in 2008-09-23
21:44:50.599845178 +0300
-+++ cyrus-imapd-2.3.12p2/imtest/Makefile.in 2008-09-23 22:10:57.494451435
+0300
-@@ -50,12 +50,14 @@
+ AC_PROG_CC
+-AC_PROG_RANLIB
++AC_PROG_LIBTOOL
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+ AC_AIX
+@@ -137,7 +137,7 @@ IPv6_CHECK_FUNC(getaddrinfo, [IPv6_CHECK
+ cyrus_cv_getaddrinfo=no)], cyrus_cv_getaddrinfo=no)
+
+ if test $cyrus_cv_getaddrinfo = no; then
+- IPV6_OBJS="getaddrinfo.o"
++ IPV6_OBJS="getaddrinfo.lo"
+ fi
+
+ cyrus_cv_getnameinfo=yes
+@@ -146,7 +146,7 @@ IPv6_CHECK_FUNC(getnameinfo,
+ cyrus_cv_getnameinfo=no)
+
+ if test $cyrus_cv_getnameinfo = no; then
+- IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
++ IPV6_OBJS="$IPV6_OBJS getnameinfo.lo"
+ fi
+
+ IPv6_CHECK_SS_FAMILY()
+@@ -170,7 +170,7 @@ AC_FUNC_VPRINTF
+ dnl function for doing each of the database backends
+ dnl parameters: backend name, variable to set, withval
+
+-CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
++CYRUSDB_OBJS="cyrusdb_flat.lo cyrusdb_skiplist.lo cyrusdb_quotalegacy.lo"
+
+ dnl Berkeley DB Detection
+
+@@ -217,7 +217,7 @@ if test "$use_berkeley" != "no"; then
+ LIBS="${LIBS} ${BDB_LIBADD}"
+ CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
+
+- CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
++ CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.lo"
+ AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
+ fi
+
+@@ -377,9 +377,9 @@ AC_ARG_ENABLE(sieve,
+ fi)
+
+ if test "$sievedir" != "no"; then
+- SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
++ SIEVE_OBJS="lmtp_sieve.lo smtpclient.lo"
+ AC_SUBST(SIEVE_OBJS)
+- SIEVE_LIBS="../${sievedir}/libsieve.a"
++ SIEVE_LIBS="../${sievedir}/libsieve.la"
+ AC_SUBST(SIEVE_LIBS)
+ SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
+ AC_SUBST(SIEVE_CPPFLAGS)
+@@ -1069,7 +1069,7 @@ AC_CACHE_VAL(cyrus_cv_lib_syslog, AC_TRY
+ if test $cyrus_cv_lib_syslog = no; then
+ PRE_SUBDIRS="${PRE_SUBDIRS} syslog"
+ EXTRA_OUTPUT="${EXTRA_OUTPUT} syslog/Makefile"
+- DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
++ DEPLIBS="${DEPLIBS} ../syslog/libsyslog.la"
+ CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
+ fi
+ AC_MSG_RESULT($cyrus_cv_lib_syslog)
+@@ -1173,7 +1173,7 @@ fi
+ dnl Check for MD5 functions
+ AC_FUNC_CHECK(MD5Init,,
+ AC_CHECK_LIB(md, MD5Init, LIBS="${LIBS} -lmd",
+- MD5OBJ="md5.o"))
++ MD5OBJ="md5.lo"))
+ AC_SUBST(MD5OBJ)
+
+ dnl snmp
+--- cyrus-imapd-2.3.16/netnews/Makefile.in.wiget 2008-03-24
20:06:32.000000000 +0100
++++ cyrus-imapd-2.3.16/netnews/Makefile.in 2010-04-11 22:34:54.333846752
+0200
+@@ -49,11 +49,13 @@ VPATH = @srcdir@
CC = @CC@
INSTALL = @INSTALL@
RANLIB = @RANLIB@
+LIBTOOL = @LIBTOOL@
+top_builddir = @top_builddir@
- DEFS = @DEFS@ @LOCALDEFS@
- CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
- LIBS = @LIBS@
- IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
--DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
-+DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
+ DEFS = @DEFS@
+ CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../com_err/et
@CPPFLAGS@
+ LIBS = @IMAP_LIBS@ @LIB_RT@
+-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
++DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
-@@ -73,7 +75,7 @@
- all: imtest
+ LDFLAGS = @LDFLAGS@
+@@ -66,23 +68,23 @@ exec_prefix = @exec_prefix@
+ cyrus_prefix = @cyrus_prefix@
+ service_path = @service_path@
+
+-OBJS = remotepurge.o readconfig.o
++OBJS = remotepurge.lo readconfig.lo
+
+ all: remotepurge
install:
-- $(INSTALL) -s -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
-+ $(LIBTOOL) --mode=install $(INSTALL) imtest $(DESTDIR)$(exec_prefix)/bin
- ln -f $(DESTDIR)$(exec_prefix)/bin/imtest
$(DESTDIR)$(exec_prefix)/bin/pop3test
- ln -f $(DESTDIR)$(exec_prefix)/bin/imtest
$(DESTDIR)$(exec_prefix)/bin/nntptest
- ln -f $(DESTDIR)$(exec_prefix)/bin/imtest
$(DESTDIR)$(exec_prefix)/bin/lmtptest
-@@ -82,17 +84,17 @@
- ln -f $(DESTDIR)$(exec_prefix)/bin/imtest
$(DESTDIR)$(exec_prefix)/bin/sivtest
- ln -f $(DESTDIR)$(exec_prefix)/bin/imtest
$(DESTDIR)$(exec_prefix)/bin/synctest
+- $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
++ $(LIBTOOL) --mode=install $(INSTALL) remotepurge
$(DESTDIR)$(service_path)
-.c.o:
- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
+%.lo: %.c
+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS)
$(CFLAGS) $<
--imtest: imtest.o $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
-+imtest: imtest.lo $(DEPLIBS)
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imtest imtest.lo
$(DEPLIBS) $(IMAP_LIBS)
+ remotepurge: $(OBJS) $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o remotepurge $(OBJS)
\
+ $(DEPLIBS) $(LIBS)
--imtest.pure: imtest.o $(DEPLIBS)
-- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS)
$(LIBS) $(IMAP_LIBS)
-+imtest.pure: imtest.lo $(DEPLIBS)
-+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS)
-o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
clean:
-- rm -f *.o Makefile.bak makedepend.log imtest
-+ rm -rf .libs *.o *.lo Makefile.bak makedepend.log imtest
+- rm -f *.o Makefile.bak remotepurge makedepend.log
++ rm -rf .libs *.o *.lo Makefile.bak remotepurge makedepend.log
distclean: clean
rm -f Makefile
---- cyrus-imapd-2.3.12p2/imtest/imtest.c 2008-04-11 15:35:18.000000000
+0300
-+++ cyrus-imapd-2.3.12p2.shared/imtest/imtest.c 2008-09-23
21:44:50.595844947 +0300
-@@ -272,6 +272,9 @@
- imtest_fatal(msg);
- }
-
-+/* config.c stuff */
-+const int config_need_data = 0;
-+
- int mysasl_config(void *context __attribute__((unused)),
- const char *plugin_name,
- const char *option,
---- cyrus-imapd-2.3.12p2/installsieve/Makefile.in 2008-03-24
22:33:11.000000000 +0200
-+++ cyrus-imapd-2.3.12p2.shared/installsieve/Makefile.in 2008-09-23
21:44:50.591844716 +0300
-@@ -47,6 +47,8 @@
+--- cyrus-imapd-2.3.16/timsieved/Makefile.in.wiget 2008-03-24
21:20:57.000000000 +0100
++++ cyrus-imapd-2.3.16/timsieved/Makefile.in 2010-04-11 22:34:54.333846752
+0200
+@@ -49,6 +49,8 @@ VPATH = @srcdir@
CC = @CC@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-imapd/cyrus-imapd-shared.patch?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-imapd/cyrus-imapd.spec?r1=1.135&r2=1.136&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
