---- cyrus-imapd-2.4.18/configure.in~ 2015-07-06 06:38:29.000000000 +0300
-+++ cyrus-imapd-2.4.18/configure.in 2016-07-28 13:23:41.093544787 +0300
-@@ -1108,7 +1108,8 @@
- COM_ERR_CPPFLAGS=""
+--- cyrus-imapd-3.0.8/configure.ac~ 2018-08-10 04:59:00.000000000 +0200
++++ cyrus-imapd-3.0.8/configure.ac 2018-09-16 13:54:40.617032333 +0200
+@@ -1742,8 +1742,8 @@ case "$with_com_err" in
+ COM_ERR_CPPFLAGS=""
;;
*) # use whatever they told us, or whatever we found
- COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
-+ COM_ERR_LDFLAGS=""
+- COM_ERR_CPPFLAGS="-I${with_com_err}/include"
+ COM_ERR_LIBS="-lcom_err"
- COM_ERR_CPPFLAGS="-I${with_com_err}/include"
++ COM_ERR_CPPFLAGS=""
# Ever get the feeling people hide this stuff on purpose?
if test -d "${with_com_err}/include/et" ; then
+ COM_ERR_CPPFLAGS="-I${with_com_err}/include/et"
+++ /dev/null
---- cyrus-imapd-2.4.4/com_err/et/Makefile.in 2010-11-30 07:53:22.181949458 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//com_err/et/Makefile.in 2010-11-29 09:02:12.537952808 +0200
-@@ -44,11 +44,12 @@
- # $Id$
-
- srcdir = @srcdir@
-+top_builddir = @top_builddir@
- VPATH = @srcdir@
-
- CC = @CC@
- INSTALL = @INSTALL@
--RANLIB = @RANLIB@
-+LIBTOOL = @LIBTOOL@
- ARCHIVE = ar cr
-
- AWK = @AWK@
-@@ -71,8 +72,8 @@
-
- install:
-
--.c.lo:
-- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
-+%.lo: %.c
-+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
-
- # solaris make loses on com_err.c but not on init_et.c, but this helps
- com_err.lo: com_err.c
-@@ -92,14 +93,9 @@
- $(CP) $(srcdir)/et_h.lawk et_h.lawk
-
- clean:
-- rm -f compile_et compile_et.lo error_table.lo
-- rm -f libcom_err.la
-- rm -f $(LIBOBJS)
-+ rm -rf .libs *.la *.lo *.o compile_et $(LIBOBJS)
-
- distclean: clean
-- rm -f compile_et compile_et.lo error_table.lo
-- rm -f libcom_err.la
-- rm -f $(LIBOBJS)
- rm Makefile
-
- depend: compile_et
-@@ -120,20 +116,14 @@
- ## install_library_target(com_err,$(LIBOBJS),$(LINTFILES),)
-
- libcom_err.la: $(LIBOBJS)
-- rm -f libcom_err.la
-- $(ARCHIVE) $@ $(LIBOBJS)
-- $(RANLIB) $@
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(LIBOBJS)
-
- #install::
--# $(INSTALLLIB) libcom_err.la $(DESTDIR)$(LIBDIR)/libcom_err.la
--# $(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libcom_err.la
--# $(RANLIB) $(DESTDIR)$(LIBDIR)/libcom_err.la
--# $(CHMOD) 444 $(DESTDIR)$(LIBDIR)/libcom_err.la
-+# $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcom_err.la $(DESTDIR)$(LIBDIR)
- ##
-
- libcom_err.lo: $(LIBOBJS)
-- ld -r -s -o $@ $? \
-- chmod -x libcom_err.lo
-+ $(LIBTOOL) --mode=link --tag=CC ld -r -s -o $@ $?
-
- TAGS: et_name.c error_message.c compile_et.c error_table.c \
- lex.yy.c init_et.c
---- cyrus-imapd-2.4.4/configure.in 2010-11-30 07:53:22.188617226 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//configure.in 2010-11-30 07:56:42.315002988 +0200
-@@ -87,7 +87,7 @@
- AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",[Config File Location])
-
- AC_PROG_CC
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- AC_PROG_MAKE_SET
- AC_PROG_INSTALL
- AC_AIX
---- cyrus-imapd-2.4.4/depot/Makefile.in 2010-11-30 07:53:22.195284994 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//depot/Makefile.in 2010-11-29 09:03:17.505292828 +0200
-@@ -44,11 +44,12 @@
- # $Id$
-
- srcdir = @srcdir@
-+top_builddir = @top_builddir@
- VPATH = @srcdir@
-
- CC = @CC@
- INSTALL = @INSTALL@
--RANLIB = @RANLIB@
-+LIBTOOL = @LIBTOOL@
-
- DEFS = @DEFS@
- CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
-@@ -73,11 +74,11 @@
- $(INSTALL) -m 644 $(srcdir)/rc.local.imap $(DESTDIR)etc
- $(INSTALL) -m 644 $(srcdir)/rc.local.ptclient $(DESTDIR)etc
-
--.c.lo:
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-+%.lo: %.c
-+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
- clean:
-- rm -f *.lo Makefile.bak makedepend.log
-+ rm -rf .libs *.lo *.o Makefile.bak makedepend.log
-
- distclean: clean
- rm -f Makefile
---- cyrus-imapd-2.4.4/imap/Makefile.in 2010-11-30 07:53:22.195284994 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//imap/Makefile.in 2010-11-29 08:33:40.489840319 +0200
-@@ -48,12 +48,14 @@
-
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
-+top_builddir = @top_builddir@
- VPATH = @srcdir@
-
- CC = @CC@
- INSTALL = @INSTALL@
- RANLIB = @RANLIB@
- AWK = @AWK@
-+LIBTOOL = @LIBTOOL@
-
- CYRUS_USER=@cyrus_user@
- CYRUS_GROUP=@cyrus_group@
-@@ -133,22 +135,20 @@
- $(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) -m 755 $$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
- ln -f $(DESTDIR)$(service_path)/lmtpd $(DESTDIR)$(service_path)/lmtpproxyd
-
--.c.lo:
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
-+%.lo: %.c
-+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
- $<
-
- ### libimap
-
- libimap.la: $(LOBJS)
-- rm -f libimap.la
-- ar cr libimap.la $(LOBJS)
-- $(RANLIB) libimap.la
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(LOBJS)
-
- ### Built Source Files
-
-@@ -181,177 +181,177 @@
-
- ### Services
- idled: idled.lo mutex_fake.lo libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- lmtpd: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.lo \
- libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS) $(LIB_WRAP)
-
- lmtpd.pure: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
- mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
-- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
-+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS) $(LIB_WRAP)
-
- imapd: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS) $(LIB_WRAP)
-
- imapd.pure: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
-- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
-+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS) $(LIB_WRAP)
-
- imapd.quant: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
-- $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o $@ $? \
-+ $(QUANTIFY) $(QUANTOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS) $(LIB_WRAP)
-
- mupdate: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo tls.lo \
- libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(SERVICETHREAD) \
- $(LIBS) $(LIB_WRAP) -lpthread
-
- mupdate.pure: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo \
- libimap.la $(DEPLIBS)
-- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
-+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(SERVICETHREAD) \
- $(LIBS) $(LIB_WRAP) -lpthread
-
- pop3d: pop3d.lo proxy.lo backend.lo tls.lo mutex_fake.lo libimap.la \
- $(DEPLIBS) $(SERVICE)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS) $(LIB_WRAP)
-
- nntpd: nntpd.lo proxy.lo backend.lo index.lo smtpclient.lo spool.lo tls.lo \
- mutex_fake.lo nntp_err.lo libimap.la $(DEPLIBS) $(SERVICE)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS) $(LIB_WRAP)
-
- fud: fud.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS) $(LIB_WRAP)
-
- smmapd: smmapd.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS) $(LIB_WRAP)
-
- sync_server: sync_server.lo sync_support.lo \
- imapparse.lo tls.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS) $(LIB_WRAP)
-
- ### Command Line Utilities
- arbitron: arbitron.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- cyr_userseen: cyr_userseen.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- cyr_sequence: cyr_sequence.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- cyr_dbtool: cyr_dbtool.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- cyr_synclog: cyr_synclog.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- cvt_cyrusdb: cvt_cyrusdb.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- chk_cyrus: chk_cyrus.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- deliver: deliver.lo $(LMTPOBJS) proxy.lo mutex_fake.lo libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- ctl_deliver: ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- ctl_mboxlist: ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- ctl_cyrusdb: ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- cyr_expire: cyr_expire.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- fetchnews: fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- squatter: squatter.lo index.lo squat_build.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- mbpath: mbpath.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- ipurge: ipurge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- cyr_virusscan: cyr_virusscan.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS) -lclamav
-
- cyrdump: cyrdump.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- cyr_df: cyr_df.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- mbexamine: mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- reconstruct: reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- quota: quota.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- tls_prune: tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- unexpunge: unexpunge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- sync_client: sync_client.lo sync_support.lo \
- backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- sync_reset: sync_reset.lo sync_support.lo \
- libimap.la mutex_fake.lo $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- ### Other Misc Targets
-
- clean:
-- rm -f *.lo *.la Makefile.bak makedepend.log \
-+ rm -rf .libs *.lo *.o *.la *.a Makefile.bak makedepend.log \
- $(BUILTSOURCES) $(PROGS) $(SUIDPROGS) cyr_virusscan
-
- distclean: clean
---- cyrus-imapd-2.4.4/imtest/imtest.c 2010-11-30 07:53:22.205286646 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//imtest/imtest.c 2010-11-29 08:14:14.318040263 +0200
-@@ -283,6 +283,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.4.4/imtest/Makefile.in 2010-11-30 07:53:22.205286646 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//imtest/Makefile.in 2010-11-29 08:56:17.502937602 +0200
-@@ -45,11 +45,12 @@
-
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
-+top_builddir = @top_builddir@
- VPATH = @srcdir@
-
- CC = @CC@
- INSTALL = @INSTALL@
--RANLIB = @RANLIB@
-+LIBTOOL = @LIBTOOL@
-
- DEFS = @DEFS@ @LOCALDEFS@
- CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-@@ -73,7 +74,7 @@
- all: imtest
-
- 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,19 +83,19 @@
- ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/sivtest
- ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/synctest
-
--.c.lo:
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-+%.lo: %.c
-+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
- imtest: imtest.lo $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(IMAP_LIBS)
-
- imtest.pure: imtest.lo $(OBJS) $(DEPLIBS)
-- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
-+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS) $(IMAP_LIBS)
-
- clean:
-- rm -f *.lo Makefile.bak makedepend.log imtest
-+ rm -rf .libs *.lo *.o Makefile.bak makedepend.log imtest
-
- distclean: clean
- rm -f Makefile
---- cyrus-imapd-2.4.4/installsieve/Makefile.in 2010-11-30 07:53:22.205286646 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//installsieve/Makefile.in 2010-11-29 08:23:07.319044464 +0200
-@@ -47,6 +47,8 @@
-
- CC = @CC@
- RANLIB = @RANLIB@
-+LIBTOOL = @LIBTOOL@
-+top_builddir = @top_builddir@
-
- DEFS = @DEFS@
- CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
-@@ -68,21 +70,19 @@
- all: installsieve
-
- install:
-- $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
-+ $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin
-
- OBJS=lex.lo mystring.lo request.lo isieve.lo
-
- libinstallsieve.la: $(OBJS)
-- rm -f libinstallsieve.la
-- ar cr libinstallsieve.la $(OBJS)
-- $(RANLIB) libinstallsieve.la
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(OBJS)
-
- installsieve: libinstallsieve.la installscript.lo $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(IMAP_LIBS)
-
- clean:
-- rm -f *.lo *.la Makefile.bak makedepend.log
-+ rm -rf .libs *.lo *.o *.la *.a Makefile.bak makedepend.log
-
- distclean: clean
- rm -f Makefile installsieve
-@@ -90,8 +90,8 @@
- depend:
- ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
-
--.c.lo:
-- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
-+%.lo: %.c
-+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
- $<
-
-
---- cyrus-imapd-2.4.4/lib/Makefile.in 2010-11-30 07:53:22.205286646 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//lib/Makefile.in 2010-11-29 08:53:13.346000595 +0200
-@@ -56,7 +56,8 @@
- CC = @CC@
-
- INSTALL = @INSTALL@
--RANLIB = @RANLIB@
-+LIBTOOL = @LIBTOOL@
-+top_builddir = @top_builddir@
-
- DEFS = @DEFS@ @LOCALDEFS@
- CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
-@@ -110,9 +111,8 @@
-
- install:
- $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
-- $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir)
-- $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir)
-- $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.la
-+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir)
-+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir)
- for file in $(LIBCYR_HDRS); \
- do \
- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
-@@ -122,19 +122,15 @@
- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
- done
-
--.c.lo:
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
-+%.lo: %.c
-+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
- $<
-
--libcyrus.la: $(LIBCYR_OBJS)
-- rm -f libcyrus.la
-- ar cr libcyrus.la $(LIBCYR_OBJS)
-- $(RANLIB) libcyrus.la
-+libcyrus.la: $(LIBCYR_OBJS) libcyrus_min.la
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $? @LIBS@ @LIB_SASL@ -rpath $(libdir) -release $(VERSION)
-
- libcyrus_min.la: $(LIBCYRM_OBJS)
-- rm -f libcyrus_min.la
-- ar cr libcyrus_min.la $(LIBCYRM_OBJS)
-- $(RANLIB) libcyrus_min.la
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $? @IMAP_COM_ERR_LIBS@ -rpath $(libdir) -release $(VERSION)
-
- imapopts.c: imapoptions $(srcdir)/../tools/config2header
- $(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
-@@ -153,7 +149,7 @@
- @echo "### Done building chartables."
-
- clean:
-- rm -f *.lo *.la chartable.c Makefile.bak makedepend.log \
-+ rm -rf .libs *.lo *.o *.la *.a chartable.c Makefile.bak makedepend.log \
- $(BUILTSOURCES)
-
- distclean: clean
---- cyrus-imapd-2.4.4/makedepend/configure.in 2010-11-30 07:53:22.205286646 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//makedepend/configure.in 2010-11-29 08:14:14.308038617 +0200
-@@ -2,7 +2,7 @@
- AC_INIT(cppsetup.c)
- AC_PROG_CC
- AC_PROG_INSTALL
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- AC_PROG_MAKE_SET
- AC_CHECK_HEADERS(stdarg.h)
- AC_SUBST(CPPFLAGS)
---- cyrus-imapd-2.4.4/makedepend/Makefile.in 2010-11-30 07:53:22.205286646 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//makedepend/Makefile.in 2010-11-29 08:54:31.942253188 +0200
-@@ -44,11 +44,13 @@
- # $Id$
- #
- srcdir = @srcdir@
-+top_builddir = @top_builddir@
- VPATH = @srcdir@
-
- CC = @CC@
- INSTALL = @INSTALL@
- RANLIB = @RANLIB@
-+LIBTOOL = @LIBTOOL@
-
- DEFS = @DEFS@
- CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
-@@ -62,15 +64,15 @@
-
- all: makedepend
-
--.c.lo:
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-+%.lo: %.c
-+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
- makedepend: cppsetup.lo ifparser.lo include.lo main.lo parse.lo pr.lo $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- clean:
-- rm -f *.lo Makefile.bak makedepend
-+ rm -rf .libs *.lo *.o Makefile.bak makedepend
-
- distclean: clean
- rm -f Makefile
---- cyrus-imapd-2.4.4/master/Makefile.in 2010-11-30 07:53:22.205286646 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//master/Makefile.in 2010-11-29 08:17:23.282457954 +0200
-@@ -48,6 +48,8 @@
- CC = @CC@
- INSTALL = @INSTALL@
- RANLIB = @RANLIB@
-+LIBTOOL = @LIBTOOL@
-+top_builddir = @top_builddir@
-
- CYRUS_USER=@cyrus_user@
- CYRUS_GROUP=@cyrus_group@
-@@ -78,19 +80,19 @@
- $(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
-
--.c.lo:
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
-+%.lo: %.c
-+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
- $<
-
- master: master.lo masterconf.lo cyrusMasterMIB.lo ../lib/lock_@WITH_LOCK@.lo
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS) $(DEPLIBS)
-
- clean:
-- rm -f *.lo *.la Makefile.bak $(PROGS)
-+ rm -f .libs *.a *.lo *.la Makefile.bak $(PROGS)
-
- distclean: clean
- rm -f Makefile
---- cyrus-imapd-2.4.4/netnews/Makefile.in 2010-11-30 07:53:22.208620530 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//netnews/Makefile.in 2010-11-29 08:37:19.582533564 +0200
-@@ -48,7 +48,8 @@
-
- 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@
-@@ -71,17 +72,17 @@
- all: remotepurge
-
- install:
-- $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
-+ $(LIBTOOL) --mode=install $(INSTALL) remotepurge $(DESTDIR)$(service_path)
-
--.c.lo:
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-+%.lo: %.c
-+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
- remotepurge: $(OBJS) $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-
-
- clean:
-- rm -f *.lo Makefile.bak remotepurge makedepend.log
-+ rm -rf .libs *.lo *.o Makefile.bak remotepurge makedepend.log
-
- distclean: clean
- rm -f Makefile
---- cyrus-imapd-2.4.4/notifyd/Makefile.in 2010-11-30 07:53:22.208620530 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//notifyd/Makefile.in 2010-11-29 08:20:28.862982985 +0200
-@@ -49,6 +49,8 @@
-
- CC = @CC@
- RANLIB = @RANLIB@
-+LIBTOOL = @LIBTOOL@
-+top_builddir = @top_builddir@
-
- INSTALL = @INSTALL@
- CYRUS_USER=@cyrus_user@
-@@ -82,26 +84,26 @@
- all: notifyd
-
- install:
-- $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
-+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
-
- OBJS= notifyd.lo notify_null.lo notify_log.lo notify_mailto.lo notify_zephyr.lo \
- notify_external.lo
-
- notifytest: notifytest.lo
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-
- notifyd: $(OBJS) $(SERVICE)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-
- notifyd.pure: $(OBJS) $(SERVICE)
- $(PURIFY) $(PUREOPT) \
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-
- clean:
-- rm -f notifyd notifytest *.lo *.la *~ Makefile.bak makedepend.log
-+ rm -rf notifyd notifytest .libs *.lo *.o *.la *.a *~ Makefile.bak makedepend.log
-
- distclean: clean
- rm -f Makefile
-@@ -109,8 +111,8 @@
- depend:
- ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
-
--.c.lo:
-- $(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.4.4/perl/imap/IMAP.xs 2010-11-30 07:53:22.211954414 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//perl/imap/IMAP.xs 2010-11-29 08:14:14.301370855 +0200
-@@ -76,6 +76,7 @@
- {
- croak(s);
- }
-+const int config_need_data = 0;
-
- /*
- * Decrement the refcounts of the Perl SV's in the passed rock, then free the
---- cyrus-imapd-2.4.4/perl/sieve/lib/Makefile.in 2010-11-30 07:53:22.211954414 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//perl/sieve/lib/Makefile.in 2010-11-29 08:44:40.675056075 +0200
-@@ -49,7 +49,8 @@
-
- CC = @CC@
- INSTALL = @INSTALL@
--RANLIB = @RANLIB@
-+LIBTOOL = @LIBTOOL@
-+top_builddir = @top_builddir@
-
- DEFS = @DEFS@ @LOCALDEFS@ -Dbool=char -DHAS_BOOL
- CPPFLAGS = -I. -I../../.. -I$(srcdir) -I$(srcdir)/../../../lib @CPPFLAGS@ @DYNSASLFLAGS@ @COM_ERR_CPPFLAGS@
-@@ -74,16 +75,14 @@
-
- install:
-
--.c.lo:
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-+%.lo: %.c
-+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
- libisieve.la: $(OBJS)
-- rm -f libisieve.la
-- ar cr libisieve.la $(OBJS)
-- $(RANLIB) libisieve.la
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(OBJS)
-
- clean:
-- rm -f *.lo Makefile.bak makedepend.log libisieve.la
-+ rm -rf .libs *.la *.lo *.o Makefile.bak makedepend.log
-
- distclean: clean
- rm -f Makefile
---- cyrus-imapd-2.4.4/perl/sieve/managesieve/managesieve.xs 2010-11-30 07:53:22.211954414 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//perl/sieve/managesieve/managesieve.xs 2010-11-29 08:14:14.304704736 +0200
-@@ -72,6 +72,7 @@
- croak("failure: %s", s);
- exit(-1);
- }
-+const int config_need_data = 0;
-
- static int
- perlsieve_getpass(conn, context, id, psecret)
---- cyrus-imapd-2.4.4/ptclient/Makefile.in 2010-11-30 07:53:22.211954414 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//ptclient/Makefile.in 2010-11-29 08:58:33.885354117 +0200
-@@ -50,7 +50,8 @@
-
- CC = @CC@
- INSTALL = @INSTALL@
--RANLIB = @RANLIB@
-+LIBTOOL = @LIBTOOL@
-+top_builddir = @top_builddir@
-
- DEFS = @DEFS@
- CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-@@ -89,36 +90,36 @@
- all: $(PROGS)
-
- install:
-- $(INSTALL) -m 755 ptloader $(DESTDIR)$(service_path)
-- $(INSTALL) -m 755 ptexpire $(DESTDIR)$(service_path)
-- $(INSTALL) -m 755 ptdump $(DESTDIR)$(service_path)
-+ $(LIBTOOL) --mode=install $(INSTALL) ptloader $(DESTDIR)$(service_path)
-+ $(LIBTOOL) --mode=install $(INSTALL) ptexpire $(DESTDIR)$(service_path)
-+ $(LIBTOOL) --mode=install $(INSTALL) ptdump $(DESTDIR)$(service_path)
-
--.c.lo:
-- $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
-+%.lo: %.c
-+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
- ptloader: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-
- ptloader.pure: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
-- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-+ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-
- ptexpire: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
-- $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
-
- ptexpire.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
-- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-+ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-
- ptdump: ptdump.lo $(DEPLIBS) $(UTIL_LIBS)
-- $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
-
- ptdump.pure: ptdump.lo $(DEPLIBS) $(UTIL_LIBS)
-- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-+ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-
- ptextract: ptextract.lo $(DEPLIBS) $(UTIL_LIBS)
-- $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-
- clean:
-- rm -f *.lo Makefile.bak $(PROGS) makedepend.log
-+ rm -rf .libs *.lo *.o Makefile.bak $(PROGS) makedepend.log
-
- distclean: clean
- rm -f Makefile
---- cyrus-imapd-2.4.4-shared-patch//sieve/Makefile.in 2010-11-29 09:06:25.952918572 +0200
-+++ cyrus-imapd-2.4.18/sieve/Makefile.in 2016-07-28 13:36:20.937139019 +0300
-@@ -44,6 +44,7 @@
-
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
-+top_builddir = @top_builddir@
- VPATH = @srcdir@
-
- prefix = @prefix@
-@@ -51,10 +52,11 @@
- service_path = @service_path@
-
- CC = @CC@
-+INSTALL = @INSTALL@
- YACC = @YACC@
- YFLAGS = -d
- LEX = @LEX@
--RANLIB = @RANLIB@
-+LIBTOOL = @LIBTOOL@
- COMPILE_ET = @COMPILE_ET@
-
- DEFS = @DEFS@ @LOCALDEFS@
-@@ -81,11 +83,11 @@
-
- install: sievec sieved
- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
-- $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
-- $(srcdir)/../install-sh -c -m 755 sieved $(DESTDIR)$(service_path) || exit
-+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 sievec $(DESTDIR)$(service_path)
-+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 sieved $(DESTDIR)$(service_path)
-
- test: libsieve.la test.lo ../imap/message.lo $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
- $(LIBS)
-
- OBJS = sieve_err.lo \
-@@ -119,15 +121,13 @@
- #libsieve.la: sieve.c sieve.h sieve_err.h sieve_err.c $(OBJS)
- #changed to...
- libsieve.la: $(OBJS)
-- rm -f libsieve.la
-- ar cr libsieve.la $(OBJS)
-- $(RANLIB) libsieve.la
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(OBJS)
-
- sievec: sievec.lo libsieve.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-
- sieved: sieved.lo libsieve.la $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ sieved.lo libsieve.la $(LIBS) $(DEPLIBS)
-
-
- sieve_interface.h: sieve_err.h
-@@ -136,7 +136,7 @@
- $(COMPILE_ET) $(srcdir)/sieve_err.et
-
- clean:
-- rm -f sievec sieved test *~ *.lo *.la Makefile.bak makedepend.log
-+ rm -rf .libs sievec sieved test *~ *.lo *.o *.la *.a Makefile.bak makedepend.log
-
- distclean: clean
- rm -f sieve_err.c sieve_err.h
-@@ -148,7 +148,8 @@
- depend:
- ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(MAKEDEPEND_CFLAGS) *.c *.y $(srcdir)/*.y $(srcdir)/*.c 1>makedepend.log 2>&1
-
--.c.lo:
-+%.lo: %.c
-+ $(LIBTOOL) --mode=compile --tag=CC \
- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
- $<
-
---- cyrus-imapd-2.4.4/syslog/Makefile.in 2010-11-30 07:53:22.215288298 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//syslog/Makefile.in 2010-11-29 08:25:14.816679541 +0200
-@@ -44,12 +44,14 @@
- # $Id$
-
- srcdir = @srcdir@
-+top_builddir = @top_builddir@
- VPATH = @srcdir@
-
- CC = @CC@
-
- INSTALL = @INSTALL@
- RANLIB = @RANLIB@
-+LIBTOOL = @LIBTOOL@
-
- DEFS = @DEFS@
- CPPFLAGS = @CPPFLAGS@
-@@ -66,18 +68,17 @@
- install:
- @echo "Install syslogd and syslog.conf as appropriate"
-
--.c.lo:
-- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
-+%.lo: %.c
-+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
-
- libsyslog.la: syslog.lo
-- ar cr libsyslog.la syslog.lo
-- $(RANLIB) libsyslog.la
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $<
-
- syslogd: syslogd.lo
-- $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-
- clean:
-- rm -f *.lo *.la Makefile.bak
-+ rm -rf .libs *.lo *.o *.la *.a Makefile.bak
-
- distclean: clean
- rm -f Makefile
---- cyrus-imapd-2.4.4/timsieved/Makefile.in 2010-11-30 07:53:22.215288298 +0200
-+++ cyrus-imapd-2.4.4-shared-patch//timsieved/Makefile.in 2010-11-29 08:40:02.882717314 +0200
-@@ -48,7 +48,8 @@
- VPATH = @srcdir@
-
- CC = @CC@
--RANLIB = @RANLIB@
-+LIBTOOL = @LIBTOOL@
-+top_builddir = @top_builddir@
-
- INSTALL = @INSTALL@
- CYRUS_USER=@cyrus_user@
-@@ -82,22 +83,22 @@
- all: timsieved
-
- install:
-- $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
-+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
-
- OBJS= actions.lo lex.lo mystring.lo scripttest.lo timsieved.lo parser.lo \
- ../imap/proxy.lo
-
- timsieved: $(OBJS) $(SERVICE)
-- $(CC) $(LDFLAGS) -o $@ \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ \
- $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-
- timsieved.pure: $(OBJS) $(SERVICE)
- $(PURIFY) $(PUREOPT) \
-- $(CC) $(LDFLAGS) -o $@ \
-+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ \
- $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-
- clean:
-- rm -f timsieved *~ *.lo *.la Makefile.bak makedepend.log
-+ rm -rf timsieved .libs *~ *.lo *.o *.la *.a Makefile.bak makedepend.log
-
- distclean: clean
- rm -f Makefile
-@@ -105,8 +106,8 @@
- depend:
- ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
-
--.c.lo:
-- $(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.4.10/perl/sieve/managesieve/Makefile.PL.wiget 2011-07-04 17:05:01.000000000 +0200
-+++ cyrus-imapd-2.4.10/perl/sieve/managesieve/Makefile.PL 2011-07-31 19:33:33.426399853 +0200
-@@ -61,8 +61,8 @@ WriteMakefile(
- 'NAME' => 'Cyrus::SIEVE::managesieve',
- '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"],
-+ 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o',
-+ 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto -L../../../lib/.libs -lcyrus -lcyrus_min"],
- 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
- 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
- );
---- cyrus-imapd-2.4.10/perl/imap/Makefile.PL.wiget 2011-07-04 17:05:01.000000000 +0200
-+++ cyrus-imapd-2.4.10/perl/imap/Makefile.PL 2011-07-31 20:20:12.772972475 +0200
-@@ -73,8 +73,8 @@ WriteMakefile(
- 'macro' => {'IMCLIENT_LIBS' => ''}, # hack
- '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"],
-+ 'MYEXTLIB' => '',
-+ 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto -L../../lib/.libs -lcyrus -lcyrus_min"],
- 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
- 'INC' => "-I../../lib -I../.. -I../../com_err/et $SASL_INC $OPENSSL_INC",
- 'EXE_FILES' => [cyradm],
+++ /dev/null
---- cyrus-imapd-2.3.12p2/cmulocal/berkdb.m4~ 2007-08-15 20:18:01.000000000 +0300
-+++ cyrus-imapd-2.3.12p2/cmulocal/berkdb.m4 2008-09-24 01:07:28.790721366 +0300
-@@ -216,13 +216,29 @@
- for dbname in ${with_bdb} db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
- do
- LIBS="$saved_LIBS -l$dbname"
-- AC_TRY_LINK([#include <stdio.h>
--#include <db.h>],
-- [db_create(NULL, NULL, 0);],
-+ dnl check that the header / library matches
-+ AC_RUN_IFELSE([
-+ #include <db.h>
-+
-+ int main() {
-+ DB *db;
-+ db_create(&db, NULL, 0);
-+ int major, minor;
-+
-+ db_version(&major, &minor, NULL);
-+ if (major == DB_VERSION_MAJOR && minor == DB_VERSION_MINOR) {
-+ exit(0);
-+ } else {
-+ exit(1);
-+ }
-+ }
-+ ],
- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
-- dblib="no")
-+ dblib="no"
-+ )
- if test "$dblib" = "berkeley"; then break; fi
- done
-+
- if test "$dblib" = "no"; then
- LIBS="$saved_LIBS -ldb"
- AC_TRY_LINK([#include <stdio.h>
#
# Conditional build:
%bcond_without perl # build with perl
-%bcond_without shared # build with shared patch (not updated)
%{?with_perl:%include /usr/lib/rpm/macros.perl}
Summary: High-performance mail store with IMAP and POP3
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.4.18
-Release: 6
+Version: 3.0.8
+Release: 1
License: BSD-like
Group: Networking/Daemons/POP3
Source0: ftp://ftp.cyrusimap.org/cyrus-imapd/%{name}-%{version}.tar.gz
-# Source0-md5: 6b5151fbb1619cf1a133f65f55cda619
+# Source0-md5: 7dc5cf7987d146c6df608146087e0c75
Source1: cyrus-README
Source2: cyrus-procmailrc
Source3: cyrus-deliver-wrapper.c
Source12: cyrus.conf
Source13: cyrus-sync.init
Patch0: %{name}-et.patch
-# http://bugzilla.cyrusimap.org/bugzilla3/show_bug.cgi?id=3095
-Patch1: %{name}-shared.patch
-# http://bugzilla.cyrusimap.org/bugzilla3/show_bug.cgi?id=3094
-Patch2: %{name}-verifydbver.patch
-Patch3: gcc44.patch
-Patch4: glibc.patch
-Patch6: makeopt.patch
+Patch1: link.patch
URL: http://www.cyrusimap.org/
BuildRequires: autoconf >= 2.54
BuildRequires: automake
Requires(postun): /usr/sbin/userdel
Requires(pre): /bin/id
Requires(pre): /usr/sbin/useradd
-%{?with_shared:Requires: %{name}-libs = %{version}-%{release}}
+Requires: %{name}-libs = %{version}-%{release}
Requires: rc-scripts >= 0.4.0.18
-%{!?with_shared:Obsoletes: %{name}-libs}
# needed by scripts from %{_bindir}
Requires: pam >= 0.79.0
%{?with_perl:Requires: perl-%{name} = %{version}-%{release}}
%define _libexecdir %{_libdir}/cyrus
+%define skip_post_check_so libcyrus(|_min|_imap|_sieve).so.*
+
%description
The Cyrus IMAP server is a scalable enterprise mail system designed
for use from small to large enterprise environments using
%description -n perl-%{name} -l pl.UTF-8
Perlowy interfejs do biblioteki cyrus-imapd.
-%package doc
-Summary: Cyrus-IMAP documentation
-Group: Documentation
-%if "%{_rpmversion}" >= "5"
-BuildArch: noarch
-%endif
-
-%description doc
-Cyrus-IMAP HTML documentation.
-
%prep
%setup -q
-%patch6 -p1
%patch0 -p1
-%if %{with shared}
-lsdiff --strip 1 %{PATCH1} |grep -E '(configure.in|Makefile.in)'| xargs %{__sed} -i -e '
- s/\.o/.lo/g
- s/\.a/.la/g
-'
%patch1 -p1
-%endif
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
rm -rf autom4te.cache
cp -p %{SOURCE1} %{SOURCE2} %{SOURCE4} %{SOURCE5} .
%build
-cd makedepend
%{__libtoolize}
%{__aclocal}
-%{__autoconf}
-cp -f %{_datadir}/automake/config.* .
-%configure
-%{__make}
-PATH=$PATH:$(pwd); export PATH
-cd ..
-%{__libtoolize}
-%{__aclocal} -I cmulocal
%{__autoheader}
%{__autoconf}
-cp -f %{_datadir}/automake/config.* .
-cp -f %{_datadir}/automake/install-sh .
+%{__automake}
%configure \
--with-cyrus-prefix=%{_libexecdir} \
--with-service-path=%{_libexecdir} \
--%{!?with_perl:without-perl}%{?with_perl:with-perl=%{__perl}} \
--without-libwrap \
--enable-nntp \
- --enable-replication
+ --enable-replication \
+ --enable-static
+
%{__make} -j1 \
INSTALLDIRS=vendor \
VERSION=%{version}
sed -e 's,/''usr/lib/cyrus,%{_libexecdir},' %{SOURCE13} > $RPM_BUILD_ROOT/etc/rc.d/init.d/cyrus-sync
cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/cyrus.conf
-# move lots of admin-only/system-only stuff to sbin and lib
-# but keep compat links as they are used in configs
-for i in master reconstruct quota deliver; do
- mv $RPM_BUILD_ROOT{%{_libexecdir}/$i,%{_sbindir}/cyr$i}
- ln -s %{_sbindir}/cyr$i $RPM_BUILD_ROOT%{_libexecdir}/$i
-done
-for i in mbpath ctl_mboxlist ctl_deliver ctl_cyrusdb squatter \
- tls_prune ipurge cyrdump cvt_cyrusdb chk_cyrus arbitron \
- cyr_expire; do
- mv $RPM_BUILD_ROOT{%{_libexecdir},%{_sbindir}}/$i
- ln -s %{_sbindir}/$i $RPM_BUILD_ROOT%{_libexecdir}
-done
# We rename some utils, so we need to sort out the manpages
for i in master reconstruct quota deliver; do
mv $RPM_BUILD_ROOT%{_mandir}/man8/{,cyr}$i.8
%files
%defattr(644,root,root,755)
%doc cyrus-README cyrus-procmailrc cyrus-user-procmailrc.template
-%doc cyrus-imapd-procmail+cyrus.mc COPYRIGHT tools
+%doc cyrus-imapd-procmail+cyrus.mc COPYING tools
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/cyrus-imapd
%attr(440,cyrus,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*
%attr(754,root,root) /etc/rc.d/init.d/cyrus-sync
%attr(640,cyrus,mail) %ghost /var/lib/imap/faillog
%attr(755,root,root) %{_bindir}/cyradm
+%attr(755,root,root) %{_bindir}/httptest
%attr(755,root,root) %{_bindir}/imtest
%attr(755,root,root) %{_bindir}/installsieve
%attr(755,root,root) %{_bindir}/lmtptest
%attr(755,root,root) %{_bindir}/smtptest
%attr(755,root,root) %{_bindir}/synctest
-%attr(4754,cyrus,mail) %{_sbindir}/cyrdeliver
-%attr(755,root,root) %{_sbindir}/arbitron
-%attr(755,root,root) %{_sbindir}/chk_cyrus
-%attr(755,root,root) %{_sbindir}/ctl_cyrusdb
-%attr(755,root,root) %{_sbindir}/ctl_deliver
-%attr(755,root,root) %{_sbindir}/ctl_mboxlist
-%attr(755,root,root) %{_sbindir}/cvt_cyrusdb
-%attr(755,root,root) %{_sbindir}/cyr_expire
-%attr(755,root,root) %{_sbindir}/cyrdump
-%attr(755,root,root) %{_sbindir}/cyrmaster
-%attr(755,root,root) %{_sbindir}/cyrquota
-%attr(755,root,root) %{_sbindir}/cyrreconstruct
-%attr(755,root,root) %{_sbindir}/ipurge
-%attr(755,root,root) %{_sbindir}/mbpath
-%attr(755,root,root) %{_sbindir}/squatter
-%attr(755,root,root) %{_sbindir}/tls_prune
-
%dir %{_libexecdir}
%attr(2755,cyrus,mail) %{_libexecdir}/deliver-wrapper
-%attr(755,root,root) %{_libexecdir}/cyr_dbtool
-%attr(755,root,root) %{_libexecdir}/cyr_df
-%attr(755,root,root) %{_libexecdir}/cyr_sequence
-%attr(755,root,root) %{_libexecdir}/cyr_synclog
-%attr(755,root,root) %{_libexecdir}/cyr_userseen
-%attr(755,root,root) %{_libexecdir}/fetchnews
%attr(755,root,root) %{_libexecdir}/fud
%attr(755,root,root) %{_libexecdir}/imapd
%attr(755,root,root) %{_libexecdir}/lmtpd
%attr(755,root,root) %{_libexecdir}/lmtpproxyd
-%attr(755,root,root) %{_libexecdir}/mbexamine
+%attr(755,root,root) %{_libexecdir}/master
%attr(755,root,root) %{_libexecdir}/nntpd
%attr(755,root,root) %{_libexecdir}/notifyd
%attr(755,root,root) %{_libexecdir}/pop3d
%attr(755,root,root) %{_libexecdir}/pop3proxyd
%attr(755,root,root) %{_libexecdir}/proxyd
-%attr(755,root,root) %{_libexecdir}/sievec
-%attr(755,root,root) %{_libexecdir}/sieved
%attr(755,root,root) %{_libexecdir}/smmapd
-%attr(755,root,root) %{_libexecdir}/sync_client
-%attr(755,root,root) %{_libexecdir}/sync_reset
%attr(755,root,root) %{_libexecdir}/sync_server
%attr(755,root,root) %{_libexecdir}/timsieved
-%attr(755,root,root) %{_libexecdir}/unexpunge
-
-# symlinks
-%attr(755,root,root) %{_libexecdir}/arbitron
-%attr(755,root,root) %{_libexecdir}/chk_cyrus
-%attr(755,root,root) %{_libexecdir}/ctl_cyrusdb
-%attr(755,root,root) %{_libexecdir}/ctl_deliver
-%attr(755,root,root) %{_libexecdir}/ctl_mboxlist
-%attr(755,root,root) %{_libexecdir}/cvt_cyrusdb
-%attr(755,root,root) %{_libexecdir}/cyr_expire
-%attr(755,root,root) %{_libexecdir}/cyrdump
-%attr(755,root,root) %{_libexecdir}/deliver
-%attr(755,root,root) %{_libexecdir}/ipurge
-%attr(755,root,root) %{_libexecdir}/master
-%attr(755,root,root) %{_libexecdir}/mbpath
-%attr(755,root,root) %{_libexecdir}/quota
-%attr(755,root,root) %{_libexecdir}/reconstruct
-%attr(755,root,root) %{_libexecdir}/squatter
-%attr(755,root,root) %{_libexecdir}/tls_prune
+%attr(755,root,root) %{_sbindir}/arbitron
+%attr(755,root,root) %{_sbindir}/chk_cyrus
+%attr(755,root,root) %{_sbindir}/ctl_conversationsdb
+%attr(755,root,root) %{_sbindir}/ctl_cyrusdb
+%attr(755,root,root) %{_sbindir}/ctl_deliver
+%attr(755,root,root) %{_sbindir}/ctl_mboxlist
+%attr(755,root,root) %{_sbindir}/cvt_cyrusdb
+%attr(755,root,root) %{_sbindir}/cvt_xlist_specialuse
+%attr(755,root,root) %{_sbindir}/cyr_buildinfo
+%attr(755,root,root) %{_sbindir}/cyr_dbtool
+%attr(755,root,root) %{_sbindir}/cyr_deny
+%attr(755,root,root) %{_sbindir}/cyr_df
+%attr(755,root,root) %{_sbindir}/cyrdump
+%attr(755,root,root) %{_sbindir}/cyr_expire
+%attr(755,root,root) %{_sbindir}/cyr_info
+%attr(755,root,root) %{_sbindir}/cyr_sequence
+%attr(755,root,root) %{_sbindir}/cyr_synclog
+%attr(755,root,root) %{_sbindir}/cyr_userseen
+%attr(755,root,root) %{_sbindir}/cyr_virusscan
+%attr(755,root,root) %{_sbindir}/deliver
+%attr(755,root,root) %{_sbindir}/fetchnews
+%attr(755,root,root) %{_sbindir}/ipurge
+%attr(755,root,root) %{_sbindir}/mbexamine
+%attr(755,root,root) %{_sbindir}/mbpath
+%attr(755,root,root) %{_sbindir}/mbtool
+%attr(755,root,root) %{_sbindir}/quota
+%attr(755,root,root) %{_sbindir}/reconstruct
+%attr(755,root,root) %{_sbindir}/sievec
+%attr(755,root,root) %{_sbindir}/sieved
+%attr(755,root,root) %{_sbindir}/squatter
+%attr(755,root,root) %{_sbindir}/sync_client
+%attr(755,root,root) %{_sbindir}/sync_reset
+%attr(755,root,root) %{_sbindir}/tls_prune
+%attr(755,root,root) %{_sbindir}/unexpunge
%attr(750,cyrus,mail) /var/spool/imap
%attr(750,cyrus,mail) %dir /var/lib/imap
%{_mandir}/man*/*
-%if %{with shared}
%files libs
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libcyrus-%{version}.so
-%attr(755,root,root) %{_libdir}/libcyrus_min-%{version}.so
-%endif
+%attr(755,root,root) %{_libdir}/libcyrus.so.0
+%attr(755,root,root) %ghost %{_libdir}/libcyrus.so.*.*
+%attr(755,root,root) %{_libdir}/libcyrus_min.so.0
+%attr(755,root,root) %ghost %{_libdir}/libcyrus_min.so.*.*
+%attr(755,root,root) %{_libdir}/libcyrus_imap.so.0
+%attr(755,root,root) %ghost %{_libdir}/libcyrus_imap.so.*.*
+%attr(755,root,root) %{_libdir}/libcyrus_sieve.so.0
+%attr(755,root,root) %ghost %{_libdir}/libcyrus_sieve.so.*.*
%files devel
%defattr(644,root,root,755)
%{_includedir}/cyrus
-%if %{with shared}
%attr(755,root,root) %{_libdir}/libcyrus.so
%attr(755,root,root) %{_libdir}/libcyrus_min.so
+%attr(755,root,root) %{_libdir}/libcyrus_imap.so
+%attr(755,root,root) %{_libdir}/libcyrus_sieve.so
%{_libdir}/libcyrus.la
%{_libdir}/libcyrus_min.la
+%{_libdir}/libcyrus_imap.la
+%{_libdir}/libcyrus_sieve.la
+%{_pkgconfigdir}/libcyrus.pc
+%{_pkgconfigdir}/libcyrus_min.pc
+%{_pkgconfigdir}/libcyrus_sieve.pc
%files static
%defattr(644,root,root,755)
-%endif
%{_libdir}/libcyrus.a
+%{_libdir}/libcyrus_imap.a
%{_libdir}/libcyrus_min.a
+%{_libdir}/libcyrus_sieve.a
%if %{with perl}
%files -n perl-%{name}
%dir %{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve
%attr(755,root,root) %{perl_vendorarch}/auto/Cyrus/SIEVE/managesieve/managesieve.so
%endif
-
-%files doc
-%defattr(644,root,root,755)
-%doc doc/*.html
+++ /dev/null
---- cyrus-imapd-2.3.14/makedepend/def.h~ 2009-08-30 10:41:27.000000000 +0300
-+++ cyrus-imapd-2.3.14/makedepend/def.h 2009-08-30 10:42:37.085562797 +0300
-@@ -74,6 +74,7 @@
- #include <sys/types.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-+#include <string.h>
-
- #define MAXDEFINES 512
- #define MAXFILES 512
+++ /dev/null
---- cyrus-imapd-2.3.14/makedepend/def.h~ 2008-04-04 15:46:47.000000000 +0300
-+++ cyrus-imapd-2.3.14/makedepend/def.h 2009-08-30 10:45:47.435735860 +0300
-@@ -163,7 +163,7 @@
-
- char *copy();
- char *base_name();
--char *getline();
-+char *cyrus_getline();
- struct symtab *slookup();
- struct symtab *isdefined();
- struct symtab *fdefined();
---- cyrus-imapd-2.3.14/makedepend/main.c~ 2008-04-04 15:46:49.000000000 +0300
-+++ cyrus-imapd-2.3.14/makedepend/main.c 2009-08-30 10:43:37.258890563 +0300
-@@ -549,7 +549,7 @@
- * Get the next line. We only return lines beginning with '#' since that
- * is all this program is ever interested in.
- */
--char *getline(filep)
-+char *cyrus_getline(filep)
- register struct filepointer *filep;
- {
- register char *p, /* walking pointer */
---- cyrus-imapd-2.3.14/makedepend/parse.c~ 2008-04-04 15:46:49.000000000 +0300
-+++ cyrus-imapd-2.3.14/makedepend/parse.c 2009-08-30 10:44:33.088884798 +0300
-@@ -83,7 +83,7 @@
- register int type;
- boolean recfailOK;
-
-- while (line = getline(filep)) {
-+ while (line = cyrus_getline(filep)) {
- switch(type = deftype(line, filep, file_red, file, TRUE)) {
- case IF:
- doif:
-@@ -205,7 +205,7 @@
- register char *line;
- register int type;
-
-- while (line = getline(filep)) {
-+ while (line = cyrus_getline(filep)) {
- switch(type = deftype(line, filep, file_red, file, FALSE)) {
- case IF:
- case IFFALSE:
+++ /dev/null
---- cyrus-imapd-2.4.4/com_err/et/Makefile.in 2010-11-12 00:15:33.000000000 +0200
-+++ cyrus-imapd-2.4.4-makeopt/com_err/et/Makefile.in 2010-11-27 17:50:39.110743283 +0200
-@@ -132,7 +132,7 @@
- ##
-
- libcom_err.o: $(LIBOBJS)
-- ld -r -s -o libcom_err.o $(LIBOBJS)
-+ ld -r -s -o $@ $? \
- chmod -x libcom_err.o
-
- TAGS: et_name.c error_message.c compile_et.c error_table.c \
---- cyrus-imapd-2.4.4/imap/Makefile.in 2010-11-12 00:15:33.000000000 +0200
-+++ cyrus-imapd-2.4.4-makeopt/imap/Makefile.in 2010-11-27 17:45:48.382799837 +0200
-@@ -181,183 +181,172 @@
-
- ### Services
- idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o idled \
-- idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
- libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
-- $(CC) $(LDFLAGS) -o lmtpd \
-- $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
-- mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(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 \
-- $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
-- mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS) $(LIB_WRAP)
-
- imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
-- $(CC) $(LDFLAGS) -o imapd \
-- $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
-- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS) $(LIB_WRAP)
-
- imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
-- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
-- $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS) $(LIB_WRAP)
-
- imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
-- $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
-- $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS) $(LIB_WRAP)
-
- mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
- libimap.a $(DEPLIBS)
-- $(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
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(SERVICETHREAD) \
-+ $(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 \
-- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
-- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+ $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
-+ $(SERVICETHREAD) \
-+ $(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) \
-- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(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 \
-- smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \
-- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(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 \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(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 \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS) $(LIB_WRAP)
-
- sync_server: sync_server.o sync_support.o \
- imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
-- $(CC) $(LDFLAGS) -o \
-- sync_server sync_server.o sync_support.o \
-- imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS) $(LIB_WRAP)
-
- ### Command Line Utilities
- arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
--cyr_userseen: cyr_userseen.o mutex_fake.o libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o cyr_userseen cyr_userseen.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
--
--cyr_sequence: cyr_sequence.o mutex_fake.o libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o cyr_sequence cyr_sequence.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) \
-- libimap.a $(DEPLIBS) $(LIBS)
--
--cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS)
-- $(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) \
-- libimap.a $(DEPLIBS) $(LIBS)
--
--chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+cyr_userseen: cyr_userseen.o mutex_fake.o libimap.a $(CLIOBJS) $(DEPLIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-+
-+cyr_sequence: cyr_sequence.o mutex_fake.o libimap.a $(CLIOBJS) $(DEPLIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-+
-+cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(CLIOBJS) $(DEPLIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-+
-+cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(CLIOBJS) $(DEPLIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-+
-+cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(CLIOBJS) $(DEPLIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-+
-+chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(CLIOBJS) $(DEPLIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \
-- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-- $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-- $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-- $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
-- $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
-- $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(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
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS) -lclamav
-
- cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- cyr_df: cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-- cyr_df cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-- mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-- reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-- $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- sync_client: sync_client.o sync_support.o \
- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-- sync_client sync_client.o sync_support.o \
-- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- sync_reset: sync_reset.o sync_support.o \
- libimap.a mutex_fake.o $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-- sync_reset sync_reset.o sync_support.o \
-- libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- ### Other Misc Targets
-
---- cyrus-imapd-2.4.4/imtest/Makefile.in 2010-11-12 00:15:33.000000000 +0200
-+++ cyrus-imapd-2.4.4-makeopt/imtest/Makefile.in 2010-11-27 17:49:42.564752106 +0200
-@@ -86,10 +86,12 @@
- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
- imtest: imtest.o $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(IMAP_LIBS)
-
--imtest.pure: imtest.o $(DEPLIBS)
-- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
-+imtest.pure: imtest.o $(OBJS) $(DEPLIBS)
-+ $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS) $(IMAP_LIBS)
-
- clean:
- rm -f *.o Makefile.bak makedepend.log imtest
---- cyrus-imapd-2.4.4/installsieve/Makefile.in 2010-11-12 00:15:33.000000000 +0200
-+++ cyrus-imapd-2.4.4-makeopt/installsieve/Makefile.in 2010-11-27 17:48:40.131123165 +0200
-@@ -78,7 +78,8 @@
- $(RANLIB) libinstallsieve.a
-
- installsieve: libinstallsieve.a installscript.o $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(IMAP_LIBS)
-
- clean:
- rm -f *.o *.a Makefile.bak makedepend.log
---- cyrus-imapd-2.4.4/makedepend/Makefile.in 2010-11-12 00:15:33.000000000 +0200
-+++ cyrus-imapd-2.4.4-makeopt/makedepend/Makefile.in 2010-11-27 17:48:27.795755643 +0200
-@@ -65,9 +65,9 @@
- .c.o:
- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
--makedepend: cppsetup.o ifparser.o include.o main.o parse.o pr.o
-- $(CC) $(LDFLAGS) -o makedepend cppsetup.o ifparser.o include.o \
-- main.o parse.o pr.o $(DEPLIBS) $(LIBS)
-+makedepend: cppsetup.o ifparser.o include.o main.o parse.o pr.o $(DEPLIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- clean:
- rm -f *.o Makefile.bak makedepend
---- cyrus-imapd-2.4.4/master/Makefile.in 2010-11-12 00:15:33.000000000 +0200
-+++ cyrus-imapd-2.4.4-makeopt/master/Makefile.in 2010-11-27 17:50:06.291998115 +0200
-@@ -86,7 +86,8 @@
- $<
-
- 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)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS) $(DEPLIBS)
-
- clean:
- rm -f *.o *.a Makefile.bak $(PROGS)
---- cyrus-imapd-2.4.4/netnews/Makefile.in 2010-11-12 00:15:33.000000000 +0200
-+++ cyrus-imapd-2.4.4-makeopt/netnews/Makefile.in 2010-11-27 17:29:33.031532813 +0200
-@@ -77,8 +77,7 @@
- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
- remotepurge: $(OBJS) $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
-- $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-
-
- clean:
---- cyrus-imapd-2.4.4/syslog/Makefile.in 2010-11-12 00:15:33.000000000 +0200
-+++ cyrus-imapd-2.4.4-makeopt/syslog/Makefile.in 2010-11-27 17:47:32.069899278 +0200
-@@ -74,7 +74,7 @@
- $(RANLIB) libsyslog.a
-
- syslogd: syslogd.o
-- $(CC) $(LDFLAGS) -o syslogd syslogd.o $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-
- clean:
- rm -f *.o *.a Makefile.bak
---- cyrus-imapd-2.4.4/timsieved/Makefile.in 2010-11-12 00:15:33.000000000 +0200
-+++ cyrus-imapd-2.4.4-makeopt/timsieved/Makefile.in 2010-11-27 17:30:16.995473471 +0200
-@@ -88,12 +88,12 @@
- ../imap/proxy.o
-
- timsieved: $(OBJS) $(SERVICE)
-- $(CC) $(LDFLAGS) -o timsieved \
-+ $(CC) $(LDFLAGS) -o $@ \
- $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-
- timsieved.pure: $(OBJS) $(SERVICE)
- $(PURIFY) $(PUREOPT) \
-- $(CC) $(LDFLAGS) -o timsieved.pure \
-+ $(CC) $(LDFLAGS) -o $@ \
- $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-
- clean:
---- cyrus-imapd-2.4.4/notifyd/Makefile.in 2010-11-12 00:15:33.000000000 +0200
-+++ cyrus-imapd-2.4.4-makeopt4/notifyd/Makefile.in 2010-11-29 07:44:19.039527336 +0200
-@@ -88,17 +88,17 @@
- notify_external.o
-
- notifytest: notifytest.o
-- $(CC) $(LDFLAGS) -o notifytest \
-- notifytest.o $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-
- notifyd: $(OBJS) $(SERVICE)
-- $(CC) $(LDFLAGS) -o notifyd \
-- $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-
- notifyd.pure: $(OBJS) $(SERVICE)
- $(PURIFY) $(PUREOPT) \
-- $(CC) $(LDFLAGS) -o notifyd.pure \
-- $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
-
- clean:
- rm -f notifyd notifytest *.o *.a *~ Makefile.bak makedepend.log
---- cyrus-imapd-2.4.4/ptclient/Makefile.in 2010-11-12 00:15:33.000000000 +0200
-+++ cyrus-imapd-2.4.4-makeopt4/ptclient/Makefile.in 2010-11-29 07:47:21.146089774 +0200
-@@ -97,25 +97,25 @@
- $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
- ptloader: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-+ $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-
- ptloader.pure: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
-- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-+ $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-
- ptexpire: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
-- $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
-+ $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
-
- ptexpire.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
-- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-+ $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-
- ptdump: ptdump.o $(DEPLIBS) $(UTIL_LIBS)
-- $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
-+ $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
-
--ptdump.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
-- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-+ptdump.pure: ptdump.o $(DEPLIBS) $(UTIL_LIBS)
-+ $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
-
- ptextract: ptextract.o $(DEPLIBS) $(UTIL_LIBS)
-- $(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-
- clean:
- rm -f *.o Makefile.bak $(PROGS) makedepend.log
---- cyrus-imapd-2.4.4/sieve/Makefile.in 2010-11-12 00:15:33.000000000 +0200
-+++ cyrus-imapd-2.4.4-makeopt4/sieve/Makefile.in 2010-11-29 07:48:28.187095358 +0200
-@@ -84,9 +84,9 @@
- $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
- $(srcdir)/../install-sh -c -m 755 sieved $(DESTDIR)$(service_path) || exit
-
--test: $(DEPLIBS) libsieve.a test.o ../imap/message.o
-- $(CC) $(LDFLAGS) -o test test.o ../imap/message.o \
-- libsieve.a $(DEPLIBS) $(LIBS)
-+test: libsieve.a test.o ../imap/message.o $(DEPLIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? \
-+ $(LIBS)
-
- OBJS = sieve_err.o \
- sieve.o sieve-lex.o comparator.o interp.o message.o \
-@@ -123,11 +123,11 @@
- ar cr libsieve.a $(OBJS)
- $(RANLIB) libsieve.a
-
--sievec: sievec.o libsieve.a
-- $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS)
-+sievec: sievec.o libsieve.a $(DEPLIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-
--sieved: sieved.o libsieve.a
-- $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS)
-+sieved: sieved.o libsieve.a $(DEPLIBS)
-+ $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
-
-
- sieve_interface.h: sieve_err.h
projects / packages / cyrus-imapd.git / commitdiff