X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fpostfix;h=503f243b34e17b75996545c310dcf490d9f6f51c;hp=1638709d2f1f9ca387eef4b7b68595dcdb77eb1e;hb=31edf7ff85589e5923d1d0a70d0ba31a6f82b8a5;hpb=f86b0cc33aa1a7778f24a9e6bd7759c868da482d

diff --git a/lfs/postfix b/lfs/postfix
index 1638709d2f..503f243b34 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.4.5
+VER        = 2.6.2
 
 THISAPP    = postfix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,19 +32,22 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 1
+PAK_VER    = 5
 
-DEPS       = "amavisd"
+DEPS       = "amavisd mysql"
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+	postfix-2.5.5.patch
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+postfix-2.5.5.patch = $(DL_FROM)/postfix-2.5.5.patch
 
-$(DL_FILE)_MD5 = ceba0cde05d12baa0ba2ed69fbb96b42
+$(DL_FILE)_MD5 = 1f0edbd521d2b0473626f4d61e8bb4eb
+postfix-2.5.5.patch_MD5 = 36cb54665d95016af4ce0cd5f85c20a8
 
 install : $(TARGET)
 
@@ -78,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && make -f Makefile.init makefiles \
-				'CCARGS=-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" -DDEF_MANPAGE_DIR=\"/usr/share/man\" -DUSE_TLS -I/usr/include/openssl -DUSE_SALS_AUTH -I/usr/include/sasl -DHAS_MYSQL -I/usr/include/mysql' \
+				'CCARGS=-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" -DDEF_MANPAGE_DIR=\"/usr/share/man\" -DUSE_TLS -I/usr/include/openssl -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl -DHAS_MYSQL -I/usr/include/mysql' \
 				'AUXLIBS=-L/usr/lib -L/usr/lib/sasl2 -lz -lm  -lssl -lcrypto -lmysqlclient -L/usr/lib/mysql -lsasl2 -L/usr/lib'
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && sh postfix-install -non-interactive
@@ -86,5 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	rm -vf /etc/postfix/main.cf.default
 	cp -vf $(DIR_CONF)/postfix/* /etc/postfix
 	mv -vf /etc/postfix/aliases /etc/aliases
+	mkdir -p /var/lib/postfix
+	chown postfix.root /var/lib/postfix
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)