X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcyrus-imapd;h=4ae56a92591e26d75221b0a0212907abf98f29ec;hb=63ba176be3ef1d72e92a056f64c724ca5b5c81b6;hp=fc87bd62b472be117b8024551fcd9bd7e30b37f4;hpb=cb3c00e01e4f41c2712914eb13e766fdaf7f8c99;p=ipfire-2.x.git

diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index fc87bd62b4..4ae56a9259 100644
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -24,15 +24,16 @@
 
 include Config
 
-VER        = 2.2.12
+VER        = 2.5.11
 
 THISAPP    = cyrus-imapd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = armv5tel i586
 PROG       = cyrus-imapd
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = ""
 
@@ -44,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 70b3bba526a8d36d3bb23a87d37e9188
+$(DL_FILE)_MD5 = 674083444c36a786d9431b6612969224
 
 install : $(TARGET)
 
@@ -77,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
@@ -102,5 +101,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	chown cyrus.mail /var/imap/socket
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/cyrus-imapd \
 		/var/ipfire/backup/addons/includes/cyrus-imapd
+
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,cyrus-imapd)
+
 	@rm -rf $(DIR_APP) /usr/include/com_err.h
 	@$(POSTBUILD)