X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Famavisd;h=39464e4e6916314ec0041dc1f939c5bec77ad653;hp=45b5cf176af68abd486a4d8dfad6af333f177446;hb=d6d19d9280b1232629ed21643b2646e98d01fcaf;hpb=f86b0cc33aa1a7778f24a9e6bd7759c868da482d

diff --git a/lfs/amavisd b/lfs/amavisd
index 45b5cf176a..39464e4e69 100644
--- a/lfs/amavisd
+++ b/lfs/amavisd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.4.1
+VER        = 2.5.2
 
 THISAPP    = amavisd-new-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -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)