cyrus-imapd: Update to 2.5.11

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2017-05-31 21:00:21 +01:00
parent 4efce2359f
commit c065e264a4
2 changed files with 134 additions and 78 deletions

View File

@@ -1,3 +1,4 @@
etc/rc.d/init.d/cyrus-imapd
usr/bin/cyradm
usr/bin/imtest
usr/bin/installsieve
@@ -9,48 +10,70 @@ usr/bin/pop3test
usr/bin/sieveshell
usr/bin/sivtest
usr/bin/smtptest
usr/bin/synctest
#usr/include/cyrus
#usr/include/cyrus/acl.h
#usr/include/cyrus/arrayu64.h
#usr/include/cyrus/assert.h
#usr/include/cyrus/auth.h
#usr/include/cyrus/auth_pts.h
#usr/include/cyrus/bitvector.h
#usr/include/cyrus/bsearch.h
#usr/include/cyrus/charset.h
#usr/include/cyrus/chartable.h
#usr/include/cyrus/command.h
#usr/include/cyrus/crc32.h
#usr/include/cyrus/cyr_lock.h
#usr/include/cyrus/cyrusdb.h
#usr/include/cyrus/exitcodes.h
#usr/include/cyrus/glob.h
#usr/include/cyrus/gmtoff.h
#usr/include/cyrus/hash.h
#usr/include/cyrus/hashu64.h
#usr/include/cyrus/imapopts.h
#usr/include/cyrus/imapurl.h
#usr/include/cyrus/imclient.h
#usr/include/cyrus/imparse.h
#usr/include/cyrus/iostat.h
#usr/include/cyrus/iptostring.h
#usr/include/cyrus/libconfig.h
#usr/include/cyrus/libcyr_cfg.h
#usr/include/cyrus/lock.h
#usr/include/cyrus/lsort.h
#usr/include/cyrus/map.h
#usr/include/cyrus/mappedfile.h
#usr/include/cyrus/mkgmtime.h
#usr/include/cyrus/mpool.h
#usr/include/cyrus/nonblock.h
#usr/include/cyrus/parseaddr.h
#usr/include/cyrus/prot.h
#usr/include/cyrus/retry.h
#usr/include/cyrus/rfc822date.h
#usr/include/cyrus/rfc822tok.h
#usr/include/cyrus/sieve
#usr/include/cyrus/sieve/sieve_err.h
#usr/include/cyrus/sieve/sieve_interface.h
#usr/include/cyrus/signals.h
#usr/include/cyrus/strarray.h
#usr/include/cyrus/strhash.h
#usr/include/cyrus/strhash.o
#usr/include/cyrus/stristr.h
#usr/include/cyrus/sysexits.h
#usr/include/cyrus/util.h
#usr/include/cyrus/times.h
#usr/include/cyrus/tok.h
#usr/include/cyrus/vparse.h
#usr/include/cyrus/wildmat.h
#usr/include/cyrus/xmalloc.h
#usr/lib/cyrus
usr/lib/cyrus/arbitron
usr/lib/cyrus/chk_cyrus
usr/lib/cyrus/compile_sieve
usr/lib/cyrus/ctl_cyrusdb
usr/lib/cyrus/ctl_deliver
usr/lib/cyrus/ctl_mboxlist
usr/lib/cyrus/cvt_cyrusdb
usr/lib/cyrus/cyr_dbtool
usr/lib/cyrus/cyr_deny
usr/lib/cyrus/cyr_df
usr/lib/cyrus/cyr_expire
usr/lib/cyrus/cyr_info
usr/lib/cyrus/cyr_sequence
usr/lib/cyrus/cyr_synclog
usr/lib/cyrus/cyr_userseen
usr/lib/cyrus/cyrdump
usr/lib/cyrus/deliver
usr/lib/cyrus/fud
@@ -58,86 +81,122 @@ usr/lib/cyrus/idled
usr/lib/cyrus/imapd
usr/lib/cyrus/ipurge
usr/lib/cyrus/lmtpd
usr/lib/cyrus/lmtpproxyd
usr/lib/cyrus/master
usr/lib/cyrus/mbexamine
usr/lib/cyrus/mbpath
usr/lib/cyrus/mbtool
usr/lib/cyrus/notifyd
usr/lib/cyrus/pop3d
usr/lib/cyrus/pop3proxyd
usr/lib/cyrus/proxyd
usr/lib/cyrus/quota
usr/lib/cyrus/reconstruct
usr/lib/cyrus/sievec
usr/lib/cyrus/sieved
usr/lib/cyrus/smmapd
usr/lib/cyrus/squatter
usr/lib/cyrus/timsieved
usr/lib/cyrus/tls_prune
#usr/lib/libcyrus.a
#usr/lib/libcyrus_min.a
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/IMAP
usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/IMAP.pm
usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/IMAP/Admin.pm
usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/IMAP/IMSP.pm
usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/IMAP/Shell.pm
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/SIEVE
usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Cyrus/SIEVE/managesieve.pm
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/IMAP
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/IMAP/.packlist
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/IMAP/IMAP.bs
usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/IMAP/IMAP.so
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/.packlist
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.bs
usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.so
#usr/man/man1/imtest.1
#usr/man/man1/installsieve.1
#usr/man/man1/lmtptest.1
#usr/man/man1/mupdatetest.1
#usr/man/man1/nntptest.1
#usr/man/man1/pop3test.1
#usr/man/man1/sieveshell.1
#usr/man/man1/sivtest.1
#usr/man/man1/smtptest.1
#usr/man/man3/imclient.3
#usr/man/man5/cyrus.conf.5
#usr/man/man5/imapd.conf.5
#usr/man/man5/krb.equiv.5
#usr/man/man8/arbitron.8
#usr/man/man8/chk_cyrus.8
#usr/man/man8/ctl_cyrusdb.8
#usr/man/man8/ctl_deliver.8
#usr/man/man8/ctl_mboxlist.8
#usr/man/man8/cvt_cyrusdb.8
#usr/man/man8/cyr_expire.8
#usr/man/man8/deliver.8
#usr/man/man8/fetchnews.8
#usr/man/man8/fud.8
#usr/man/man8/idled.8
#usr/man/man8/imapd.8
#usr/man/man8/ipurge.8
#usr/man/man8/lmtpd.8
#usr/man/man8/master.8
#usr/man/man8/mbexamine.8
#usr/man/man8/mbpath.8
#usr/man/man8/nntpd.8
#usr/man/man8/notifyd.8
#usr/man/man8/pop3d.8
#usr/man/man8/quota.8
#usr/man/man8/reconstruct.8
#usr/man/man8/rmnews.8
#usr/man/man8/smmapd.8
#usr/man/man8/squatter.8
#usr/man/man8/syncnews.8
#usr/man/man8/timsieved.8
#usr/man/man8/tls_prune.8
usr/lib/cyrus/unexpunge
#usr/lib/libcyrus.la
#usr/lib/libcyrus.so
usr/lib/libcyrus.so.0
usr/lib/libcyrus.so.0.0.0
#usr/lib/libcyrus_imap.la
#usr/lib/libcyrus_imap.so
usr/lib/libcyrus_imap.so.0
usr/lib/libcyrus_imap.so.0.0.0
#usr/lib/libcyrus_min.la
#usr/lib/libcyrus_min.so
usr/lib/libcyrus_min.so.0
usr/lib/libcyrus_min.so.0.0.0
#usr/lib/libcyrus_sieve.la
#usr/lib/libcyrus_sieve.so
usr/lib/libcyrus_sieve.so.0
usr/lib/libcyrus_sieve.so.0.0.0
#usr/lib/perl5/site_perl/5.12.3/Cyrus
#usr/lib/perl5/site_perl/5.12.3/Cyrus/Annotator
usr/lib/perl5/site_perl/5.12.3/Cyrus/Annotator/Daemon.pm
usr/lib/perl5/site_perl/5.12.3/Cyrus/Annotator/Message.pm
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/IMAP
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/IMAP.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/IMAP/Admin.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/IMAP/IMSP.pm
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/IMAP/Shell.pm
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/SIEVE
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Cyrus/SIEVE/managesieve.pm
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/Annotator
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/Annotator/Daemon
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/Annotator/Daemon/.packlist
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/IMAP
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/IMAP/.packlist
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/IMAP/IMAP.bs
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/IMAP/IMAP.so
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/SIEVE
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/SIEVE/managesieve
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/.packlist
#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.bs
usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.so
#usr/lib/pkgconfig/libcyrus.pc
#usr/lib/pkgconfig/libcyrus_min.pc
#usr/lib/pkgconfig/libcyrus_sieve.pc
#usr/share/man/man1/cyradm.1
#usr/share/man/man1/imtest.1
#usr/share/man/man1/installsieve.1
#usr/share/man/man1/lmtptest.1
#usr/share/man/man1/mupdatetest.1
#usr/share/man/man1/nntptest.1
#usr/share/man/man1/pop3test.1
#usr/share/man/man1/sieveshell.1
#usr/share/man/man1/sivtest.1
#usr/share/man/man1/smtptest.1
#usr/share/man/man3/Cyrus::Annotator::Daemon.3
#usr/share/man/man3/Cyrus::Annotator::Message.3
#usr/share/man/man3/Cyrus::IMAP.3
#usr/share/man/man3/Cyrus::IMAP::Admin.3
#usr/share/man/man3/Cyrus::IMAP::IMSP.3
#usr/share/man/man3/Cyrus::IMAP::Shell.3
#usr/share/man/man3/Cyrus::SIEVE::managesieve.3
#usr/share/man/man3/imclient.3
#usr/share/man/man5/cyrus.conf.5
#usr/share/man/man5/imapd.conf.5
#usr/share/man/man5/krb.equiv.5
#usr/share/man/man8/arbitron.8
#usr/share/man/man8/chk_cyrus.8
#usr/share/man/man8/ctl_cyrusdb.8
#usr/share/man/man8/ctl_deliver.8
#usr/share/man/man8/ctl_mboxlist.8
#usr/share/man/man8/cvt_cyrusdb.8
#usr/share/man/man8/cyr_dbtool.8
#usr/share/man/man8/cyr_deny.8
#usr/share/man/man8/cyr_df.8
#usr/share/man/man8/cyr_expire.8
#usr/share/man/man8/cyr_info.8
#usr/share/man/man8/cyr_synclog.8
#usr/share/man/man8/deliver.8
#usr/share/man/man8/fud.8
#usr/share/man/man8/idled.8
#usr/share/man/man8/imapd.8
#usr/share/man/man8/ipurge.8
#usr/share/man/man8/lmtpd.8
#usr/share/man/man8/mbexamine.8
#usr/share/man/man8/mbpath.8
#usr/share/man/man8/notifyd.8
#usr/share/man/man8/pop3d.8
#usr/share/man/man8/quota.8
#usr/share/man/man8/reconstruct.8
#usr/share/man/man8/rmnews.8
#usr/share/man/man8/smmapd.8
#usr/share/man/man8/squatter.8
#usr/share/man/man8/sync_client.8
#usr/share/man/man8/sync_reset.8
#usr/share/man/man8/sync_server.8
#usr/share/man/man8/timsieved.8
#usr/share/man/man8/tls_prune.8
#usr/share/man/man8/unexpunge.8
usr/sieve
var/imap
var/imap/db
@@ -146,10 +205,11 @@ var/imap/msg
var/imap/proc
var/imap/ptclient
var/imap/socket
var/imap/sync
var/ipfire/backup/addons/includes/cyrus-imapd
var/ipfire/cyrusimap
var/ipfire/cyrusimap/cyrus.conf
var/ipfire/cyrusimap/imapd.conf
var/log/imap
var/log/imap/stage.
etc/rc.d/init.d/cyrus-imapd
var/log/imap/sync.

View File

@@ -24,7 +24,7 @@
include Config
VER = 2.2.12
VER = 2.5.11
THISAPP = cyrus-imapd-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -33,12 +33,10 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
SUP_ARCH = armv5tel i586
PROG = cyrus-imapd
PAK_VER = 5
PAK_VER = 6
DEPS = ""
CFLAGS += -I/usr/include/et
###############################################################################
# Top-level Rules
###############################################################################
@@ -47,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 70b3bba526a8d36d3bb23a87d37e9188
$(DL_FILE)_MD5 = 674083444c36a786d9431b6612969224
install : $(TARGET)
@@ -80,13 +78,11 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-autocreate-0.9.4.diff
cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-gcc4.patch
cd $(DIR_APP) && ./configure --prefix=/usr --with-service-path=/usr/lib/cyrus \
--with-cyrus-prefix=/usr/lib/cyrus --sysconfdir=/var/ipfire/cyrusimap \
--with-auth=unix --with-perl --with-sasl --with-idle=idled \
--with-syslogfacility=MAIL --enable-listext --without-snmp
cd $(DIR_APP) && make depend
--with-syslogfacility=MAIL --enable-listext --without-snmp \
--enable-autocreate --enable-idled
cd $(DIR_APP) && make $(EXTRA_MAKE)
cd $(DIR_APP) && make install
-mkdir /var/imap