X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fpostfix;h=5f8a2e51ac19ebf7c395cfc60b9f9ece33a1667f;hp=b74a29430c1e2077d849f475be699f82d667c44d;hb=386325bb1c8319fb953c3bb8a67c60b5c3e27fd0;hpb=f9315063c76435e753b79a7994feb678557a8d9d

diff --git a/lfs/postfix b/lfs/postfix
index b74a29430c..5f8a2e51ac 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -26,13 +26,15 @@
 
 include Config
 
-VER        = 2.2.9
+VER        = 2.2.11
 
 THISAPP    = postfix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://netmirror.org/postfix.org/official
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = postfix
+PAK_VER    = ipfire-beta1
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = be78631bd9b6bf7735e43abfa54d69f6
+$(DL_FILE)_MD5 = 03f416410110bf46352004dcae67a5fe
 
 install : $(TARGET)
 
@@ -53,7 +55,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-	make-packages.sh postfix $(THISAPP)-ipfire-beta-1
+	@$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -76,11 +78,13 @@ $(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 -DUSE_SALS_AUTH -DHAS_PGSQL -I/usr/include/openssl -DHAS_MYSQL -I/opt/lampp/include/mysql -I/usr/include/sasl -I/opt/lampp/include' \
-				'AUXLIBS=-L/usr/lib -L/opt/lampp/lib/mysql -L/opt/lampp/lib -lmysqlclient -lz -lm -lssl -lsasl2 -lcrypto -lpq'
+				'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 -I/opt/lampp/include -DHAS_MYSQL -I/opt/lampp/include/mysql' \
+				'AUXLIBS=-L/usr/lib -L/usr/lib/sasl2 -lz -lm  -lssl -lcrypto -lmysqlclient -L/opt/lampp/lib/mysql -lsasl2 -L/opt/lampp/lib'
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && sh postfix-install -non-interactive
-	cp -v /usr/src/config/etc/aliases /etc/aliases
-	cd /etc/ && postmap aliases
+	## Install configuration
+	rm -vf /etc/postfix/main.cf.default
+	cp -vf $(DIR_CONF)/postfix/* /etc/postfix
+	mv -vf /etc/postfix/aliases /etc/aliases
 	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
\ No newline at end of file
+	@$(POSTBUILD)