X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcyrus-imapd;h=1800a08ecbab9b3bb5c7ab8a17f2f8ca2e94c004;hp=f4c855c760e6f2bd3d0603a4c96ce02052b3c7b0;hb=d618d67e010e94e1ef26f2570abe9d6748e90416;hpb=ef4580b9be728017687792405eeb315d5348eb57

diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index f4c855c760..1800a08ecb 100644
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015  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,21 +24,18 @@
 
 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    = 7
 
 DEPS       = ""
 
-CFLAGS    += -I/usr/include/et
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -47,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 70b3bba526a8d36d3bb23a87d37e9188
+$(DL_FILE)_MD5 = 674083444c36a786d9431b6612969224
 
 install : $(TARGET)
 
@@ -80,13 +77,18 @@ $(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) && ./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 $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
 	-mkdir /var/imap
@@ -105,5 +107,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)