Merge branch 'master' into next

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

diff --git a/lfs/postfix b/lfs/postfix
index 3735f7e69b3c2f8fd7e39c1f7edfa243a68e0988..29b0a3af061c743256087b4d6110ebe984c89dd7 100644 (file)
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -24,7 +24,9 @@
 
 include Config
 
-VER        = 3.6.1
+SUMMARY    = A fast, secure, and flexible mailer
+
+VER        = 3.6.3
 
 THISAPP    = postfix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,10 +34,12 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 31
+PAK_VER    = 33
 
 DEPS       =
 
+SERVICES   = postfix
+
 CCARGS     = `getconf LFS_CFLAGS` \
        -DDEF_DAEMON_DIR="'\"/usr/lib/postfix\"'" \
        -DDEF_MANPAGE_DIR="'\"/usr/share/man\"'" \
@@ -66,7 +70,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 85d1c2b06a469ba6cc61946c7042e40e
+$(DL_FILE)_MD5 = 793f9f4abf74d07a2557bd97a903b98d
 
 install : $(TARGET)
 
@@ -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)