From 5f54d32ef60b67ceb4c48b4804a072bdf868ed58 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 23 Sep 2008 15:51:31 +0000 Subject: [PATCH] - partial update to 2.3.12p2 Changed files: cyrus-imapd-shared.patch -> 1.6 --- cyrus-imapd-shared.patch | 153 +++++++++++++++++---------------------- 1 file changed, 67 insertions(+), 86 deletions(-) diff --git a/cyrus-imapd-shared.patch b/cyrus-imapd-shared.patch index f0a2e48..f99a616 100644 --- a/cyrus-imapd-shared.patch +++ b/cyrus-imapd-shared.patch @@ -108,9 +108,9 @@ sieve_interface.h: sieve_err.h ---- cyrus-imapd-2.3.8/netnews/Makefile.in.wiget 2006-11-30 18:11:23.000000000 +0100 -+++ cyrus-imapd-2.3.8/netnews/Makefile.in 2007-02-18 23:43:17.000000000 +0100 -@@ -47,11 +47,13 @@ +--- cyrus-imapd-2.3.12p2/netnews/Makefile.in~ 2008-09-23 18:00:16.000000000 +0300 ++++ cyrus-imapd-2.3.12p2/netnews/Makefile.in 2008-09-23 18:01:26.824280572 +0300 +@@ -49,11 +49,13 @@ CC = @CC@ INSTALL = @INSTALL@ RANLIB = @RANLIB@ @@ -118,7 +118,7 @@ +top_builddir = @top_builddir@ DEFS = @DEFS@ - CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ + 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@ @@ -239,79 +239,52 @@ AC_SUBST(MD5OBJ) dnl snmp ---- cyrus-imapd-2.3.8/imap/Makefile.in.wiget 2007-01-09 18:41:35.000000000 +0100 -+++ cyrus-imapd-2.3.8/imap/Makefile.in 2007-02-18 23:43:17.000000000 +0100 -@@ -54,6 +54,8 @@ - CC = @CC@ - INSTALL = @INSTALL@ - RANLIB = @RANLIB@ -+LIBTOOL = @LIBTOOL@ -+top_builddir = @top_builddir@ - AWK = @AWK@ - - CYRUS_USER=@cyrus_user@ -@@ -67,7 +69,7 @@ - IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@ - LIB_WRAP = @LIB_WRAP@ - LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS) --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@ -@@ -132,7 +134,7 @@ - $(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 - ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd - ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd -@@ -184,164 +186,164 @@ +--- cyrus-imapd-2.3.12p2/imap/Makefile.in~ 2008-09-23 18:02:00.000000000 +0300 ++++ cyrus-imapd-2.3.12p2/imap/Makefile.in 2008-09-23 18:30:40.169774729 +0300 +@@ -186,171 +186,171 @@ ### Services idled: idled.o mutex_fake.o libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o idled \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o idled \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o idled \ idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \ libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o lmtpd \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o lmtpd \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd \ $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpd.pure \ -+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o lmtpd.pure \ ++ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd.pure \ $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) + imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o imapd \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imapd \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd \ $(SERVICE) $(IMAPDOBJS) mutex_fake.o \ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \ -+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imapd.pure \ ++ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.pure \ $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ $(DEPLIBS) $(LIBS) $(LIB_WRAP) imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) - $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \ -+ $(QUANTIFY) $(QUANTOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imapd.quant \ ++ $(QUANTIFY) $(QUANTOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.quant \ $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ $(DEPLIBS) $(LIBS) $(LIB_WRAP) mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \ libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o mupdate \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o mupdate \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate \ $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ mutex_pthread.o tls.o libimap.a \ $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread @@ -319,37 +292,37 @@ mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \ libimap.a $(DEPLIBS) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \ -+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o mupdate.pure \ ++ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate.pure \ $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \ $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \ mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \ mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \ smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \ libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \ $(DEPLIBS) $(LIBS) $(LIB_WRAP) smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \ $(DEPLIBS) $(LIBS) $(LIB_WRAP) sync_server: sync_server.o sync_support.o sync_commit.o \ imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ sync_server sync_server.o sync_support.o sync_commit.o \ imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \ $(DEPLIBS) $(LIBS) $(LIB_WRAP) @@ -357,114 +330,123 @@ ### Command Line Utilities arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \ libimap.a $(DEPLIBS) $(LIBS) cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \ + libimap.a $(DEPLIBS) $(LIBS) + + cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS) +- $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \ libimap.a $(DEPLIBS) $(LIBS) cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \ libimap.a $(DEPLIBS) $(LIBS) chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \ libimap.a $(DEPLIBS) $(LIBS) deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \ mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \ libimap.a $(DEPLIBS) $(LIBS) ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \ libimap.a $(DEPLIBS) $(LIBS) fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \ $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \ $(DEPLIBS) $(LIBS) ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \ libimap.a $(DEPLIBS) $(LIBS) cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \ libimap.a $(DEPLIBS) $(LIBS) mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \ libimap.a $(DEPLIBS) $(LIBS) tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \ libimap.a $(DEPLIBS) $(LIBS) make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS) - $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) + + make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) +- $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) sync_client: sync_client.o sync_support.o \ backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ sync_client sync_client.o sync_support.o \ backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) sync_reset: sync_reset.o sync_support.o sync_commit.o \ libimap.a mutex_fake.o $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ sync_reset sync_reset.o sync_support.o sync_commit.o \ libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) @@ -694,8 +676,8 @@ $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP) clean: ---- cyrus-imapd-2.3.8/master/Makefile.in.wiget 2006-11-30 18:11:23.000000000 +0100 -+++ cyrus-imapd-2.3.8/master/Makefile.in 2007-02-18 23:43:17.000000000 +0100 +--- cyrus-imapd-2.3.12p2/master/Makefile.in~ 2008-09-23 18:31:43.000000000 +0300 ++++ cyrus-imapd-2.3.12p2/master/Makefile.in 2008-09-23 18:32:06.430769398 +0300 @@ -49,6 +49,8 @@ CC = @CC@ INSTALL = @INSTALL@ @@ -723,17 +705,17 @@ done .c.o: -@@ -87,7 +89,7 @@ +@@ -88,7 +88,7 @@ $< - master: master.o masterconf.o message_uuid_master.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o -- $(CC) $(LDFLAGS) -o master master.o masterconf.o message_uuid_master.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS) -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o master master.o masterconf.o message_uuid_master.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS) + master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o +- $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS) clean: rm -f *.o *.a Makefile.bak $(PROGS) ---- cyrus-imapd-2.3.8/lib/Makefile.in.wiget 2006-11-30 18:11:22.000000000 +0100 -+++ cyrus-imapd-2.3.8/lib/Makefile.in 2007-02-18 23:47:27.000000000 +0100 +--- cyrus-imapd-2.3.12p2/lib/Makefile.in~ 2008-09-23 18:31:43.000000000 +0300 ++++ cyrus-imapd-2.3.12p2/lib/Makefile.in 2008-09-23 18:35:29.430522834 +0300 @@ -43,10 +43,10 @@ # $Id$ @@ -764,9 +746,9 @@ libdir = @libdir@ -@@ -88,28 +91,28 @@ +@@ -93,28 +93,28 @@ $(srcdir)/libcyr_cfg.h $(srcdir)/byteorder64.h \ - $(srcdir)/message_uuid.h $(srcdir)/md5.h $(srcdir)/hmac-md5.h + $(srcdir)/md5.h $(srcdir)/hmac-md5.h -LIBCYR_OBJS = acl.o bsearch.o charset.o glob.o retry.o util.o \ - libcyr_cfg.o mkgmtime.o prot.o parseaddr.o imclient.o imparse.o \ @@ -780,14 +762,13 @@ + gmtoff_@WITH_GMTOFF@.lo map_@WITH_MAP@.lo $(ACL) $(AUTH) \ @LIBOBJS@ @CYRUSDB_OBJS@ @MD5OBJ@ \ - iptostring.o xmalloc.o wildmat.o byteorder64.o \ -- message_uuid.o xstrlcat.o xstrlcpy.o +- xstrlcat.o xstrlcpy.o + iptostring.lo xmalloc.lo wildmat.lo byteorder64.lo \ -+ message_uuid.lo xstrlcat.lo xstrlcpy.lo ++ xstrlcat.lo xstrlcpy.lo LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \ $(srcdir)/xstrlcat.h $(srcdir)/xstrlcpy.h $(srcdir)/util.h \ -- $(srcdir)/strhash.h $(srcdir)/libconfig.h $(srcdir)/assert.h \ -+ $(srcdir)/strhash.h $(srcdir)/libconfig.h $(srcdir)/assert.h \ + $(srcdir)/strhash.h $(srcdir)/libconfig.h $(srcdir)/assert.h \ imapopts.h -LIBCYRM_OBJS = libconfig.o imapopts.o hash.o mpool.o xmalloc.o strhash.o \ - xstrlcat.o xstrlcpy.o assert.o util.o @IPV6_OBJS@ @@ -801,8 +782,8 @@ $(srcdir)/../install-sh -d $(DESTDIR)$(libdir) - $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir) - $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir) -+ $(LIBTOOL) --mode=install $(INSTALL) libcyrus_min.la $(DESTDIR)$(libdir) -+ $(LIBTOOL) --mode=install $(INSTALL) libcyrus.la $(DESTDIR)$(libdir) ++ $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir) ++ $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir) $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a for file in $(LIBCYR_HDRS); \ do \ -- 2.44.0