Merge branch 'master' into next

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

diff --git a/lfs/postfix b/lfs/postfix
index 6fe46d9a83f9a5ad200bbc91c4b2fdf8768a3fb6..29b0a3af061c743256087b4d6110ebe984c89dd7 100644 (file)
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -24,6 +24,8 @@
 
 include Config
 
+SUMMARY    = A fast, secure, and flexible mailer
+
 VER        = 3.6.3
 
 THISAPP    = postfix-$(VER)
@@ -36,6 +38,8 @@ PAK_VER    = 33
 
 DEPS       =
 
+SERVICES   = postfix
+
 CCARGS     = `getconf LFS_CFLAGS` \
        -DDEF_DAEMON_DIR="'\"/usr/lib/postfix\"'" \
        -DDEF_MANPAGE_DIR="'\"/usr/share/man\"'" \
@@ -76,7 +80,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
        @$(PAK)
 
 ###############################################################################
@@ -99,6 +103,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/postfix-3.6.2-glibc-234-build-fix.patch
        cd $(DIR_APP) && make -f Makefile.init makefiles \
                DEBUG="" OPT="$(CFLAGS) -fno-strict-aliasing" CCARGS="$(CCARGS)" AUXLIBS="$(AUXLIBS)"
        cd $(DIR_APP) && make $(MAKETUNING)
@@ -113,7 +118,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        mv /usr/sbin/sendmail /usr/sbin/sendmail.postfix
 
        #install initscripts
-       $(call INSTALL_INITSCRIPT,postfix)
+       $(call INSTALL_INITSCRIPTS,$(SERVICES))
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)