X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcyrusimap;h=17fe3a76fce2669c690e2357fd92b592b8acc06a;hp=ace970a3f4707df7765a3337c3ce5dec60369b4a;hb=786f2c8a296f053a6db934993a0611f1dadb8db5;hpb=0d0521b60cf071e69452565c3da7015e86dfc7ad

diff --git a/lfs/cyrusimap b/lfs/cyrusimap
index ace970a3f4..17fe3a76fc 100644
--- a/lfs/cyrusimap
+++ b/lfs/cyrusimap
@@ -26,13 +26,15 @@
 
 include Config
 
-VER        = 2.2.13
+VER        = 2.2.12
 
 THISAPP    = cyrus-imapd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = cyrusimap
+PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3ff679714836d1d7b1e1df0e026d4844
+$(DL_FILE)_MD5 = 70b3bba526a8d36d3bb23a87d37e9188
 
 install : $(TARGET)
 
@@ -53,7 +55,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-	make-packages.sh cyrusimap cyrusimap-$(VER)-ipfire-beta-1
+	@$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -75,9 +77,52 @@ $(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) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/cyrusimap --with-auth=unix --with-perl --with-sasl --without-ucdsnmp
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-no_transfig.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-autocreate-0.9.4.diff
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-autosievefolder-0.6.diff
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-rmquota+deletemailbox-0.2-1.diff
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.1.3-flock.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-munge8bit.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.1.16-getrlimit.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.10-groupcache.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-seenstate.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-acceptinvalidfrom.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.3.3-deleteacl_invalid_identifier_fix.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-notify_sms.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-gcc4.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/timsieved_reset_sasl_conn.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/allow_auth_plain_proxying.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/authid_normalize.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-64bit_quota-p1.patch
+	# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-64bit_quota-p2.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-singleinstancestore.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-spool.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-mupdate-thread-safe.patch
+	cp -f /usr/include/et/com_err.h /usr/include/com_err.h
+	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
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
+	-mkdir /var/imap
+	chown cyrus:mail /var/imap
+	chmod 750 /var/imap
+	-mkdir /var/log/imap
+	chown cyrus:mail /var/log/imap
+	chmod 750 /var/log/imap
+	-mkdir /usr/sieve
+	chown cyrus:mail /usr/sieve
+	chmod 750 /usr/sieve
+	-mkdir /var/ipfire/cyrusimap
+	cp -f $(DIR_SRC)/config/cyrusimap/* /var/ipfire/cyrusimap
+	cp -f $(DIR_APP)/tools/mkimap /usr/bin
+	sudo -u cyrus /usr/bin/mkimap /var/ipfire/cyrusimap/imapd.conf
+	chown cyrus.mail /var/imap/socket
+	# Wenn das Dateisystem ext2 waere...
+	# cd /var/imap && chattr +S user quota user/* quota/* && chattr +S /var/spool/imap /var/spool/imap/*
+	# Give user cyrus a password
+	echo cyrus:ipfire | /usr/sbin/chpasswd
+	@rm -rf $(DIR_APP) /usr/include/com_err.h
 	@$(POSTBUILD)