X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fpostfix;h=9f5ad380946e13ea99c165bf8f2870ec709bedcb;hp=5866b97d85ac01cae96f6ecbd8c00fcce4e1fc65;hb=b389d73110b6584ff58ad6db570de046d1ed8fab;hpb=1d12008db5c86f06c70600ea2ac9cc0721af6d9b

diff --git a/lfs/postfix b/lfs/postfix
index 5866b97d85..9f5ad38094 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.6.5
+VER        = 2.10.0
 
 THISAPP    = postfix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,12 +32,34 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 6
+PAK_VER    = 9
 
 DEPS       = "amavisd mysql"
 
-# Fake kernel release
-export UTS_RELEASE = 2.6.32-ipfire
+CCARGS     = `getconf LFS_CFLAGS` \
+	-DDEF_DAEMON_DIR="'\"/usr/lib/postfix\"'" \
+	-DDEF_MANPAGE_DIR="'\"/usr/share/man\"'"
+AUXLIBS    =
+
+# LDAP
+CCARGS    += -DHAS_LDAP -DLDAP_DEPRECATED=1
+AUXLIBS   += -lldap -llber
+
+# PCRE
+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
+
+# SSL
+CCARGS    += -DUSE_TLS `pkg-config --cflags openssl`
+AUXLIBS   += `pkg-config --libs openssl`
 
 ###############################################################################
 # Top-level Rules
@@ -47,7 +69,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6b954cfb3eb6141dac1e773281211717
+$(DL_FILE)_MD5 = b2a563b2d5c53462952886e6fc4e4b7b
 
 install : $(TARGET)
 
@@ -80,9 +102,9 @@ $(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/$(THISAPP)-build_with_kernel4x.patch
 	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_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'
+		DEBUG="" OPT="$(CFLAGS) -fno-strict-aliasing" CCARGS="$(CCARGS)" AUXLIBS="$(AUXLIBS)"
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && sh postfix-install -non-interactive
 	## Install configuration
@@ -91,5 +113,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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)