From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcel Lorenz To: development@lists.ipfire.org Subject: [PATCH] amavisd: uptdate to 2.10.1 Date: Thu, 17 Mar 2016 15:44:37 +0100 Message-ID: <1458225877-17465-1-git-send-email-marcel.lorenz@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0225132202053222342==" List-Id: --===============0225132202053222342== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The amavisd tools (amavisd-release) are now included. This patch adds a minimal install script. Signed-off-by: Marcel Lorenz --- config/rootfiles/packages/amavisd | 11 ++++++++++- lfs/amavisd | 39 +++++++++++++++++++++++++++++--------= -- src/paks/amavisd/install.sh | 32 ++++++++++++++++++++++++++++++++ src/paks/amavisd/uninstall.sh | 27 +++++++++++++++++++++++++++ src/paks/amavisd/update.sh | 26 ++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 11 deletions(-) create mode 100644 src/paks/amavisd/install.sh create mode 100644 src/paks/amavisd/uninstall.sh create mode 100644 src/paks/amavisd/update.sh diff --git a/config/rootfiles/packages/amavisd b/config/rootfiles/packages/am= avisd index f2e1c3f..d77b39d 100644 --- a/config/rootfiles/packages/amavisd +++ b/config/rootfiles/packages/amavisd @@ -1,7 +1,16 @@ etc/amavisd.conf -etc/rc.d/init.d/amavisd usr/bin/amavisd +usr/sbin/amavis-mc +usr/sbin/amavis-mc_init.sh +usr/sbin/amavis-services +usr/sbin/amavisd-agent +usr/sbin/amavisd-nanny +usr/sbin/amavisd-release +usr/sbin/amavisd-signer +usr/sbin/amavisd-status +usr/sbin/amavisd-submit var/amavis var/amavis/db var/amavis/tmp var/virusmails +etc/rc.d/init.d/amavisd diff --git a/lfs/amavisd b/lfs/amavisd index 39464e4..da75869 100644 --- 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) 2016 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 = # @@ -24,16 +24,15 @@ =20 include Config =20 -VER =3D 2.5.2 +VER =3D 2.10.1 =20 THISAPP =3D amavisd-new-$(VER) -DL_FILE =3D $(THISAPP).tar.gz +DL_FILE =3D $(THISAPP).tar.xz DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D amavisd -PAK_VER =3D 1 - +PAK_VER =3D 2 DEPS =3D "clamav spamassassin" =20 ############################################################################= ### @@ -42,9 +41,9 @@ DEPS =3D "clamav spamassassin" =20 objects =3D $(DL_FILE) =20 -$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) +#$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 52d227d442fac64916488b83d79806d7 +$(DL_FILE)_MD5 =3D adb0c64ac6a91249ddeb4ed97747d755 =20 install : $(TARGET) =20 @@ -76,10 +75,30 @@ $(subst %,%_MD5,$(objects)) : =20 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && cp -f amavisd /usr/bin - chown root.root /usr/bin/amavisd - chmod 755 /usr/bin/amavisd + cd $(DIR_APP) && cp -f amavisd-status amavisd-submit amavisd-signer amavisd= -release \ + amavisd-nanny amavisd-agent amavis-mc amavis-mc_init.sh amavis-services /u= sr/sbin + chown root.root /usr/bin/amavisd \ + /usr/sbin/amavisd-status \ + /usr/sbin/amavisd-submit \ + /usr/sbin/amavisd-signer \ + /usr/sbin/amavisd-release \ + /usr/sbin/amavisd-nanny \ + /usr/sbin/amavisd-agent \ + /usr/sbin/amavis-mc \ + /usr/sbin/amavis-mc_init.sh \ + /usr/sbin/amavis-services + chmod 755 /usr/bin/amavisd \ + /usr/sbin/amavisd-status \ + /usr/sbin/amavisd-submit \ + /usr/sbin/amavisd-signer \ + /usr/sbin/amavisd-release \ + /usr/sbin/amavisd-nanny \ + /usr/sbin/amavisd-agent \ + /usr/sbin/amavis-mc \ + /usr/sbin/amavis-mc_init.sh \ + /usr/sbin/amavis-services cp -fv $(DIR_SRC)/config/amavisd/amavisd.conf /etc chown root.root /etc/amavisd.conf chmod 644 /etc/amavisd.conf diff --git a/src/paks/amavisd/install.sh b/src/paks/amavisd/install.sh new file mode 100644 index 0000000..6b3be4e --- /dev/null +++ b/src/paks/amavisd/install.sh @@ -0,0 +1,32 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . = # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} + +# Enable autostart for amavisd +ln -sf ../init.d/amavisd /etc/rc.d/rc0.d/K24amavisd +ln -sf ../init.d/amavisd /etc/rc.d/rc3.d/S45amavisd +ln -sf ../init.d/amavisd /etc/rc.d/rc6.d/K24amavisd +chmod 0754 /etc/rc.d/init.d/amavisd diff --git a/src/paks/amavisd/uninstall.sh b/src/paks/amavisd/uninstall.sh new file mode 100644 index 0000000..54398f5 --- /dev/null +++ b/src/paks/amavisd/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . = # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/etc/init.d/amavisd stop +remove_files +rm -rfv /etc/rc.d/rc*.d/*amavisd diff --git a/src/paks/amavisd/update.sh b/src/paks/amavisd/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/amavisd/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team . = # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh --=20 1.9.1 --===============0225132202053222342==--