Geändert:

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

diff --git a/lfs/postfix b/lfs/postfix
index 35244734f89b8fac9f52fc4cd305a9ddf17ef1f9..6938ea722991486afd4d7b92b421b726b814d3e6 100644 (file)
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 2.2.9
+VER        = 2.2.10
 
 THISAPP    = postfix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://netmirror.org/postfix.org/official
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = be78631bd9b6bf7735e43abfa54d69f6
+$(DL_FILE)_MD5 = 440a4702182a79ac2f51e8974fb742c9
 
 install : $(TARGET)
 
@@ -59,7 +53,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-       make-packages.sh postfix $(THISAPP)
+       make-packages.sh postfix $(THISAPP)-ipfire-beta-1
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -86,7 +80,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                'AUXLIBS=-L/usr/lib -L/opt/lampp/lib/mysql -L/opt/lampp/lib -lmysqlclient -lz -lm -lssl -lsasl2 -lcrypto -lpq'
        cd $(DIR_APP) && make
        cd $(DIR_APP) && sh postfix-install -non-interactive
-       cp -v /usr/src/config/etc/aliases /etc/aliases
-       cd /etc/ && postmap aliases
+       ## Install configuration
+       rm -vf /etc/postfix/main.cf.default
+       cp -vf $(DIR_CONF)/postfix/* /etc/postfix
+       mv -vf /etc/postfix/aliases /etc/aliases
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
\ No newline at end of file