X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fpostfix;h=41ac9087917c03d0206708d0b926842ef60bdaeb;hp=fd332537a78cae1262f1a2bb7479b383d3c3182d;hb=f40cd26de2a0353fca1fdee407cfce153b16c76d;hpb=348334b6eb85aee6a4af46b907d19d6c45772ee6

diff --git a/lfs/postfix b/lfs/postfix
index fd332537a7..41ac908791 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2019  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.10.0
+VER        = 3.4.5
 
 THISAPP    = postfix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,13 +32,14 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 8
+PAK_VER    = 20
 
-DEPS       = "amavisd mysql"
+DEPS       = ""
 
-CCARGS     = -DNO_IPV6 `getconf LFS_CFLAGS` \
+CCARGS     = `getconf LFS_CFLAGS` \
 	-DDEF_DAEMON_DIR="'\"/usr/lib/postfix\"'" \
-	-DDEF_MANPAGE_DIR="'\"/usr/share/man\"'"
+	-DDEF_MANPAGE_DIR="'\"/usr/share/man\"'" \
+	-DNO_NIS
 AUXLIBS    =
 
 # LDAP
@@ -49,10 +50,6 @@ AUXLIBS   += -lldap -llber
 CCARGS    += -DHAS_PCRE -I/usr/include/pcre
 AUXLIBS   += -lpcre
 
-# MySQL
-CCARGS    += -DHAS_MYSQL -I/usr/include/mysql
-AUXLIBS   += -L/usr/lib/mysql -lmysqlclient -lm
-
 # SASL
 CCARGS    += -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl
 AUXLIBS   += -L/usr/lib/sasl2 -lsasl2
@@ -69,7 +66,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b2a563b2d5c53462952886e6fc4e4b7b
+$(DL_FILE)_MD5 = 093109941095390562166de766d4720d
 
 install : $(TARGET)
 
@@ -108,12 +105,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && sh postfix-install -non-interactive
 	## Install configuration
 	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
 
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/postfix \
 			 /var/ipfire/backup/addons/includes/postfix
+	mv /usr/sbin/sendmail /usr/sbin/sendmail.postfix
+
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,postfix)
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)