X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcyrus-imapd;h=50cd66875189161dcb0067e2c1a9a8f7c4dd75e1;hp=2a826cd7039b7996feab4e4ce242189739167f6b;hb=06fc6170a2b8827125977c2f4e9c6f94e7d93c0a;hpb=413abba64a7aa6a9f55533e1b2d31a7a88ee0fba

diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index 2a826cd703..50cd668751 100644
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.2.12
+VER        = 2.5.11
 
 THISAPP    = cyrus-imapd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cyrus-imapd
-PAK_VER    = 3
+PAK_VER    = 7
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 70b3bba526a8d36d3bb23a87d37e9188
+$(DL_FILE)_MD5 = 674083444c36a786d9431b6612969224
 
 install : $(TARGET)
 
@@ -77,14 +77,19 @@ $(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
-	cd $(DIR_APP) && make $(EXTRA_MAKE)
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--with-service-path=/usr/lib/cyrus \
+		--with-cyrus-prefix=/usr/lib/cyrus \
+		--sysconfdir=/var/ipfire/cyrusimap \
+		--with-perl \
+		--with-sasl \
+		--with-syslogfacility=MAIL \
+		--without-snmp \
+		--enable-autocreate \
+		--enable-idled
+
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
 	-mkdir /var/imap
 	chown cyrus:mail /var/imap
@@ -100,5 +105,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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
+	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)