Merge branch 'master' into kernel-4.9

[people/pmueller/ipfire-2.x.git] / lfs / postfix

diff --git a/lfs/postfix b/lfs/postfix
index cfebeac067cbdc0451cd7cc72c6ebeebecb8176c..9f5ad380946e13ea99c165bf8f2870ec709bedcb 100644 (file)
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -32,10 +32,35 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 7
+PAK_VER    = 9
 
 DEPS       = "amavisd mysql"
 
+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
 ###############################################################################
@@ -77,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 +116,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        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)