Merge branch 'master' into kernel-4.9

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

diff --git a/lfs/postfix b/lfs/postfix
index fd332537a78cae1262f1a2bb7479b383d3c3182d..9f5ad380946e13ea99c165bf8f2870ec709bedcb 100644 (file)
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -32,11 +32,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       = "amavisd mysql"
 
-CCARGS     = -DNO_IPV6 `getconf LFS_CFLAGS` \
+CCARGS     = `getconf LFS_CFLAGS` \
        -DDEF_DAEMON_DIR="'\"/usr/lib/postfix\"'" \
        -DDEF_MANPAGE_DIR="'\"/usr/share/man\"'"
 AUXLIBS    =
@@ -102,6 +102,7 @@ $(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 \
                DEBUG="" OPT="$(CFLAGS) -fno-strict-aliasing" CCARGS="$(CCARGS)" AUXLIBS="$(AUXLIBS)"
        cd $(DIR_APP) && make $(MAKETUNING)
@@ -115,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)