X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Famavisd;h=39464e4e6916314ec0041dc1f939c5bec77ad653;hp=4245ad64926bf2b8f27ff9ac77335cdff2b12a31;hb=af768a7e80bb8fb3b25bfd8f13a4a0561927f9e2;hpb=f0ca8c34a1148ab1b8c5f31567369e2ba558d6d5

diff --git a/lfs/amavisd b/lfs/amavisd
index 4245ad649..39464e4e6 100644
--- a/lfs/amavisd
+++ b/lfs/amavisd
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 2.4.1
+VER        = 2.5.2
 
 THISAPP    = amavisd-new-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = amavisd
-PAK_VER    = ipfire-beta1
+PAK_VER    = 1
+
+DEPS       = "clamav spamassassin"
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = bf770a3c7eee8a9c93932a04485e6a35
+$(DL_FILE)_MD5 = 52d227d442fac64916488b83d79806d7
 
 install : $(TARGET)
 
@@ -77,17 +77,14 @@ $(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) && cp -f amavisd /usr/local/bin
-	cd $(DIR_APP) && chown root.root /usr/local/bin/amavisd
-	cd $(DIR_APP) && chmod 755 /usr/local/bin/amavisd
-	cd $(DIR_APP) && cp amavisd.conf /etc
-	cd $(DIR_APP) && chown root.root /etc/amavisd.conf
-	cd $(DIR_APP) && chmod 644 /etc/amavisd.conf
-	cd $(DIR_APP) && test -d /var/virusmails || mkdir /var/virusmails
-	cd $(DIR_APP) && chown amavis.amavis /var/virusmails
-	cd $(DIR_APP) && chmod 750 /var/virusmails
-	cd $(DIR_APP) && test -d /var/amavis || mkdir /var/amavis
-	cd $(DIR_APP) && chown amavis.amavis /var/amavis
-	cd $(DIR_APP) && chmod 750 /var/amavis
+	cd $(DIR_APP) && cp -f amavisd /usr/bin
+	chown root.root /usr/bin/amavisd
+	chmod 755 /usr/bin/amavisd
+	cp -fv $(DIR_SRC)/config/amavisd/amavisd.conf /etc
+	chown root.root /etc/amavisd.conf
+	chmod 644 /etc/amavisd.conf
+	-mkdir -p /var/amavis/{db,tmp} /var/virusmails
+	chown amavis.amavis -Rv /var/{amavis,virusmails}
+	chmod 750 -Rv /var/{amavis,virusmails}
 	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
\ No newline at end of file
+	@$(POSTBUILD)