slang: revert parallelized build

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

diff --git a/lfs/amavisd b/lfs/amavisd
index 72caadc0450d3baf602fc861e583ff54a56c85a0..a468662367a3240b674b51c8a6306c1be57610f8 100644 (file)
--- a/lfs/amavisd
+++ b/lfs/amavisd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.4.1
+VER        = 2.5.2
 
 THISAPP    = amavisd-new-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,8 +34,6 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = amavisd
 PAK_VER    = 1
 
-DESCDE     = "Ein Daemon zum scannen von Emails."
-DESCEN     = "A daemon for scanning emails."
 DEPS       = "clamav spamassassin"
 
 ###############################################################################
@@ -46,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = bf770a3c7eee8a9c93932a04485e6a35
+$(DL_FILE)_MD5 = 52d227d442fac64916488b83d79806d7
 
 install : $(TARGET)
 
@@ -79,17 +77,18 @@ $(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
+
+       #install initscripts
+       $(call INSTALL_INITSCRIPT,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)