X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fpostfix;h=77c6dd0e4aefbccb08c5bd9a6a45492a7e79e005;hb=d0e3e64b1ec93ec93e62546fd52d37b2ad3232dd;hp=85215ee3f00ee9d604c2f2a5ec564bedcdffd659;hpb=a692067b6a064f619b944e2937a413eb9cac2dc9;p=ipfire-2.x.git

diff --git a/lfs/postfix b/lfs/postfix
index 85215ee3f0..77c6dd0e4a 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.5.5
+VER        = 2.10.0
 
 THISAPP    = postfix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,22 +32,44 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 3
+PAK_VER    = 7
 
 DEPS       = "amavisd mysql"
 
+CCARGS     = -DNO_IPV6 `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
 ###############################################################################
 
-objects = $(DL_FILE) \
-	postfix-2.5.5.patch
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-postfix-2.5.5.patch = $(DL_FROM)/postfix-2.5.5.patch
 
-$(DL_FILE)_MD5 = 6b4b848bdd2239dddfc9d385e57e19ef
-postfix-2.5.5.patch_MD5 = 36cb54665d95016af4ce0cd5f85c20a8
+$(DL_FILE)_MD5 = b2a563b2d5c53462952886e6fc4e4b7b
 
 install : $(TARGET)
 
@@ -81,13 +103,17 @@ $(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_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
 	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
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)