Tak to jest jak się nie z tego katalogu pliki przegrywa ... :/
Poprawione diffy patch i spec w zał.
--
Pozdrawiam,
Paweł 'duddits' Długosz
.::http://dlugosz.eu::.
Index: cyrus-imapd.spec
===================================================================
RCS file: /cvsroot/SPECS/cyrus-imapd.spec,v
retrieving revision 1.125
diff -u -r1.125 cyrus-imapd.spec
--- cyrus-imapd.spec 15 May 2008 14:39:39 -0000 1.125
+++ cyrus-imapd.spec 7 Sep 2008 15:16:45 -0000
@@ -4,12 +4,12 @@
Summary(pl.UTF-8): Wysoko wydajny serwer IMAP i POP3
Summary(pt_BR.UTF-8): Um servidor de mail de alto desempenho que suporta IMAP
e POP3
Name: cyrus-imapd
-Version: 2.3.9
+Version: 2.3.12p2
Release: 0.3
License: BSD-like
Group: Networking/Daemons
Source0:
ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%{name}-%{version}.tar.gz
-# Source0-md5: 113433c1fdc777e3b0466b5ce643b8bc
+# Source0-md5: ee2c300687994e4982c6af6aa154c742
Source1: cyrus-README
Source2: cyrus-procmailrc
Source3: cyrus-deliver-wrapper.c
@@ -364,6 +364,8 @@
%defattr(644,root,root,755)
%{_libdir}/libcyrus.a
%{_libdir}/libcyrus_min.a
+%attr(755,root,root) %{_libdir}/cyrus/cyr_synclog
+%attr(755,root,root) %{_libdir}/cyrus/make_sha1
%files -n perl-%{name}
%defattr(644,root,root,755)
Index: cyrus-imapd-shared.patch
===================================================================
RCS file: /cvsroot/SOURCES/cyrus-imapd-shared.patch,v
retrieving revision 1.5
diff -u -r1.5 cyrus-imapd-shared.patch
--- cyrus-imapd-shared.patch 4 Jan 2008 12:05:20 -0000 1.5
+++ cyrus-imapd-shared.patch 7 Sep 2008 15:15:22 -0000
@@ -108,39 +108,6 @@
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 @@
- CC = @CC@
- INSTALL = @INSTALL@
- RANLIB = @RANLIB@
-+LIBTOOL = @LIBTOOL@
-+top_builddir = @top_builddir@
-
- DEFS = @DEFS@
- CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../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@
-@@ -69,13 +71,13 @@
- all: remotepurge
-
- install:
-- $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
-+ $(LIBTOOL) --mode=install $(INSTALL) remotepurge
$(DESTDIR)$(service_path)
-
- .c.o:
- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
- remotepurge: $(OBJS) $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
-+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
- $(DEPLIBS) $(LIBS)
-
-
--- cyrus-imapd-2.3.8/timsieved/Makefile.in.wiget 2006-11-30
18:11:25.000000000 +0100
+++ cyrus-imapd-2.3.8/timsieved/Makefile.in 2007-02-18 23:43:17.000000000
+0100
@@ -47,6 +47,8 @@
@@ -239,235 +206,6 @@
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@
-
- [EMAIL PROTECTED]@
-@@ -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 @@
-
- ### Services
- idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o idled \
-+ $(LIBTOOL) --mode=link $(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 \
- $(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 \
- $(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)
-- $(CC) $(LDFLAGS) -o imapd \
-+ $(LIBTOOL) --mode=link $(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 \
- $(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 \
- $(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 \
- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- mutex_pthread.o tls.o libimap.a \
- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-
- 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 \
- $(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) \
- 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 \
- 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 \
- $(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 \
- $(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 \
- 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)
-
- ### 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) \
- 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) \
- 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) \
- 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) \
- 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 \
- 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 \
- $@ 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) \
- libimap.a $(DEPLIBS) $(LIBS)
-
- ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-+ $(LIBTOOL) --mode=link $(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) \
- libimap.a $(DEPLIBS) $(LIBS)
-
- fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-+ $(LIBTOOL) --mode=link $(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 \
- $(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 \
- $(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) \
- 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) \
- libimap.a $(DEPLIBS) $(LIBS)
-
- mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-+ $(LIBTOOL) --mode=link $(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 \
- 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) \
- libimap.a $(DEPLIBS) $(LIBS)
-
- tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-+ $(LIBTOOL) --mode=link $(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) \
- 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)
-
- 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 \
- 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 \
- sync_reset sync_reset.o sync_support.o sync_commit.o \
- libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
-
--- cyrus-imapd-2.3.8/installsieve/Makefile.in.wiget 2003-10-22
20:50:11.000000000 +0200
+++ cyrus-imapd-2.3.8/installsieve/Makefile.in 2007-02-18 23:43:17.000000000
+0100
@@ -45,6 +45,8 @@
@@ -694,18 +432,65 @@
$(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
-@@ -49,6 +49,8 @@
- CC = @CC@
- INSTALL = @INSTALL@
- RANLIB = @RANLIB@
-+LIBTOOL = @LIBTOOL@
-+top_builddir = @top_builddir@
+--- cyrus-imapd-2.3.8/depot/Makefile.in.wiget 2004-05-28 15:39:38.000000000
+0200
++++ cyrus-imapd-2.3.8/depot/Makefile.in 2007-02-18 23:43:17.000000000
+0100
+@@ -49,7 +49,7 @@
+ 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@
+
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+--- cyrus-imapd-2.3.12p2/netnews/Makefile.in 2008-03-24 20:06:32.000000000
+0100
++++ cyrus-imapd-2.3.12p2/netnews/Makefile.in-new 2008-09-07
14:59:24.077026618 +0200
+@@ -49,11 +49,13 @@
+ CC = @CC@
+ INSTALL = @INSTALL@
+ RANLIB = @RANLIB@
++LIBTOOL = @LIBTOOL@
++top_builddir = @top_builddir@
+
+ 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@
+@@ -71,16 +73,15 @@
+ all: remotepurge
+
+ install:
+- $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
++ $(LIBTOOL) --mode=install $(INSTALL) remotepurge
$(DESTDIR)$(service_path)
+
+ .c.o:
+ $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
+
+ remotepurge: $(OBJS) $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
+ $(DEPLIBS) $(LIBS)
+
+-
+ clean:
+ rm -f *.o Makefile.bak remotepurge makedepend.log
+
+--- cyrus-imapd-2.3.12p2/master/Makefile.in 2008-03-24 18:47:41.000000000
+0100
++++ cyrus-imapd-2.3.12p2/master/Makefile.in-new 2008-09-07
16:27:27.283323324 +0200
+@@ -48,6 +48,8 @@
+ CC = @CC@
+ INSTALL = @INSTALL@
+ RANLIB = @RANLIB@
++LIBTOOL = @LIBTOOL@
++top_builddir = @top_builddir@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-@@ -59,7 +61,7 @@
+@@ -58,7 +60,7 @@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
@@ -714,7 +499,7 @@
SHELL = /bin/sh
MAKEDEPEND = @MAKEDEPEND@
-@@ -79,7 +81,7 @@
+@@ -78,7 +80,7 @@
$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
for file in $(PROGS); \
do \
@@ -723,19 +508,257 @@
done
.c.o:
-@@ -87,7 +89,7 @@
+@@ -86,7 +88,7 @@
$<
- master: master.o masterconf.o message_uuid_master.o cyrusMasterMIB.o
../lib/[EMAIL PROTECTED]@.o
-- $(CC) $(LDFLAGS) -o master master.o masterconf.o message_uuid_master.o
cyrusMasterMIB.o ../lib/[EMAIL PROTECTED]@.o $(LIBS) $(DEPLIBS)
-+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o master master.o masterconf.o
message_uuid_master.o cyrusMasterMIB.o ../lib/[EMAIL PROTECTED]@.o $(LIBS)
$(DEPLIBS)
+ master: master.o masterconf.o cyrusMasterMIB.o ../lib/[EMAIL PROTECTED]@.o
+- $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o
../lib/[EMAIL PROTECTED]@.o $(LIBS) $(DEPLIBS)
++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o master master.o masterconf.o
cyrusMasterMIB.o ../lib/[EMAIL PROTECTED]@.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
-@@ -43,10 +43,10 @@
- # $Id: Makefile.in,v 1.65 2006/11/30 17:11:22 murch Exp $
+--- cyrus-imapd-2.3.12p2/imap/Makefile.in 2008-04-03 23:09:51.000000000
+0200
++++ cyrus-imapd-2.3.12p2/imap/Makefile.in-new 2008-09-07 15:54:13.449763887
+0200
+@@ -54,6 +54,8 @@
+ CC = @CC@
+ INSTALL = @INSTALL@
+ RANLIB = @RANLIB@
++LIBTOOL = @LIBTOOL@
++top_builddir = @top_builddir@
+ AWK = @AWK@
+
+ [EMAIL PROTECTED]@
+@@ -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@
+@@ -133,7 +135,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,171 +186,171 @@
+
+ ### Services
+ idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o idled \
++ $(LIBTOOL) --mode=link $(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 \
+ $(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 \
+ $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
+ mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
+
+ imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
+- $(CC) $(LDFLAGS) -o imapd \
++ $(LIBTOOL) --mode=link $(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 \
+ $(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 \
+ $(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 \
+ $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
+ mutex_pthread.o tls.o libimap.a \
+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
+
+ 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 \
+ $(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) \
+ 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 \
+ 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 \
+ $(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 \
+ $(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 \
+ 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)
+
+ ### 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) \
+ 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) \
+ 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 $(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) \
+ 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) \
+ 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 \
+ 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 \
+ $@ 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) \
+ libimap.a $(DEPLIBS) $(LIBS)
+
+ ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o \
++ $(LIBTOOL) --mode=link $(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) \
+ libimap.a $(DEPLIBS) $(LIBS)
+
+ fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o \
++ $(LIBTOOL) --mode=link $(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 \
+ $(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 \
+ $(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) \
+ 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) \
+ libimap.a $(DEPLIBS) $(LIBS)
+
+ mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o \
++ $(LIBTOOL) --mode=link $(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 \
+ 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) \
+ libimap.a $(DEPLIBS) $(LIBS)
+
+ tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o \
++ $(LIBTOOL) --mode=link $(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) \
+ 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)
+
+ 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 $(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 \
+ 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 \
+ sync_reset sync_reset.o sync_support.o sync_commit.o \
+ libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
+
+--- cyrus-imapd-2.3.12p2/lib/Makefile.in 2008-03-24 18:43:08.000000000
+0100
++++ cyrus-imapd-2.3.12p2/lib/Makefile.in-new 2008-09-07 16:23:53.524036217
+0200
+@@ -44,10 +44,10 @@
+ # $Id: Makefile.in,v 1.72 2008/03/24 17:43:08 murch Exp $
# Authorization namespace.
-AUTH=auth.o auth_krb.o auth_unix.o auth_krb5.o auth_pts.o
@@ -747,7 +770,7 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-@@ -56,6 +56,8 @@
+@@ -57,6 +57,8 @@
INSTALL = @INSTALL@
RANLIB = @RANLIB@
@@ -756,7 +779,7 @@
DEFS = @DEFS@ @LOCALDEFS@
CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
-@@ -71,6 +73,7 @@
+@@ -72,6 +74,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
cyrus_prefix = @cyrus_prefix@
@@ -764,9 +787,9 @@
libdir = @libdir@
-@@ -88,28 +91,28 @@
+@@ -90,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 +803,14 @@
+ [EMAIL PROTECTED]@.lo [EMAIL PROTECTED]@.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@
@@ -795,7 +818,7 @@
+ xstrlcat.lo xstrlcpy.lo assert.lo util.lo @IPV6_OBJS@
-all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
-+all: $(BUILTSOURCES) libcyrus_min.la libcyrus.la
++all: $(BUILTSOURCES) libcyrus_min.la libcyrus.la
install:
$(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
@@ -806,7 +829,7 @@
$(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a
for file in $(LIBCYR_HDRS); \
do \
-@@ -120,19 +123,15 @@
+@@ -122,19 +125,15 @@
$(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus ||
exit 1; \
done
@@ -833,14 +856,3 @@
imapopts.c: imapoptions $(srcdir)/../tools/config2header
$(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c
$(srcdir)/imapopts.h < $(srcdir)/imapoptions
---- cyrus-imapd-2.3.8/depot/Makefile.in.wiget 2004-05-28 15:39:38.000000000
+0200
-+++ cyrus-imapd-2.3.8/depot/Makefile.in 2007-02-18 23:43:17.000000000
+0100
-@@ -49,7 +49,7 @@
- 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@
-
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
