From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 31ba6f6fc99bd124bcc87e04d6087fdc2c401ddb Date: Mon, 17 Feb 2020 21:42:20 +0000 Message-ID: <48LyBP00H8z2xkw@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4097965428459800866==" List-Id: --===============4097965428459800866== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 31ba6f6fc99bd124bcc87e04d6087fdc2c401ddb (commit) via d875a2b157987307180ef0e578c4912ca5c388de (commit) via 4105d223d759e421a9277e1532534c438cda5aba (commit) from 4979531dac5c7d929dfc7f4ac8ff0281c195a526 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 31ba6f6fc99bd124bcc87e04d6087fdc2c401ddb Author: Michael Tremer Date: Mon Feb 17 11:59:32 2020 +0000 dehydrated: Fix various syntax errors =20 * The backup include file was missing a leading slash which caused no files to be backed up. =20 * The shell escaping was broken so a new configuration file was useless. =20 Fixes: #12297 Signed-off-by: Michael Tremer Signed-off-by: Arne Fitzenreiter commit d875a2b157987307180ef0e578c4912ca5c388de Author: Arne Fitzenreiter Date: Mon Feb 17 21:38:42 2020 +0000 paks: remove scripts for elinks and phpSANE =20 phpSANE is dropped long ago and elinks in core now. =20 Signed-off-by: Arne Fitzenreiter commit 4105d223d759e421a9277e1532534c438cda5aba Author: Arne Fitzenreiter Date: Mon Feb 17 21:34:14 2020 +0000 paks: add/move extract_backup_includes to pak update scripts =20 this function allow to update the backup filelist before the backup was d= one in uninstall.sh at packet updates. =20 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: config/backup/includes/dehydrated | 2 +- lfs/dehydrated | 6 +++--- src/paks/alsa/update.sh | 3 ++- src/paks/amazon-ssm-agent/uninstall.sh | 2 -- src/paks/amazon-ssm-agent/update.sh | 3 ++- src/paks/apcupsd/update.sh | 1 + src/paks/asterisk/update.sh | 3 ++- src/paks/avahi/update.sh | 3 ++- src/paks/bird/uninstall.sh | 1 - src/paks/bird/update.sh | 1 + src/paks/cups/update.sh | 3 ++- src/paks/dbus/update.sh | 1 + src/paks/default/update.sh | 3 ++- src/paks/dnsdist/uninstall.sh | 4 +--- src/paks/dnsdist/update.sh | 1 + src/paks/elinks/install.sh | 34 --------------------------------= -- src/paks/elinks/uninstall.sh | 27 --------------------------- src/paks/elinks/update.sh | 26 -------------------------- src/paks/freeradius/update.sh | 3 ++- src/paks/frr/uninstall.sh | 3 +-- src/paks/frr/update.sh | 3 ++- src/paks/git/update.sh | 1 + src/paks/gnump3d/update.sh | 3 ++- src/paks/guardian/update.sh | 3 ++- src/paks/haproxy/update.sh | 3 ++- src/paks/hostapd/update.sh | 3 ++- src/paks/igmpproxy/uninstall.sh | 3 +-- src/paks/igmpproxy/update.sh | 3 ++- src/paks/keepalived/update.sh | 3 ++- src/paks/libdaemon/update.sh | 3 ++- src/paks/libvirt/uninstall.sh | 3 +-- src/paks/mdns-repeater/update.sh | 4 ++-- src/paks/minidlna/update.sh | 4 +++- src/paks/motion/update.sh | 3 ++- src/paks/mpfire/update.sh | 3 ++- src/paks/netsnmpd/uninstall.sh | 1 - src/paks/netsnmpd/update.sh | 3 ++- src/paks/nfs/update.sh | 3 ++- src/paks/nginx/uninstall.sh | 1 - src/paks/nginx/update.sh | 3 ++- src/paks/nut/update.sh | 3 ++- src/paks/phpSANE/install.sh | 26 -------------------------- src/paks/phpSANE/uninstall.sh | 25 ------------------------- src/paks/phpSANE/update.sh | 26 -------------------------- src/paks/postfix/uninstall.sh | 1 - src/paks/postfix/update.sh | 3 ++- src/paks/qemu/update.sh | 3 ++- src/paks/rpcbind/update.sh | 3 ++- src/paks/sarg/update.sh | 3 ++- src/paks/shairport-sync/update.sh | 4 ++-- src/paks/squid-accounting/update.sh | 3 ++- src/paks/sslh/update.sh | 3 ++- src/paks/stunnel/update.sh | 3 ++- src/paks/tftpd/update.sh | 3 ++- src/paks/transmission/update.sh | 4 ++-- src/paks/watchdog/update.sh | 3 ++- src/paks/wio/update.sh | 3 ++- src/paks/xinetd/update.sh | 3 ++- 58 files changed, 86 insertions(+), 222 deletions(-) delete mode 100644 src/paks/elinks/install.sh delete mode 100644 src/paks/elinks/uninstall.sh delete mode 100644 src/paks/elinks/update.sh delete mode 100644 src/paks/phpSANE/install.sh delete mode 100644 src/paks/phpSANE/uninstall.sh delete mode 100644 src/paks/phpSANE/update.sh Difference in files: diff --git a/config/backup/includes/dehydrated b/config/backup/includes/dehyd= rated index b5c64f5ef..86fdb9b42 100644 --- a/config/backup/includes/dehydrated +++ b/config/backup/includes/dehydrated @@ -1 +1 @@ -etc/dehydrated +/etc/dehydrated diff --git a/lfs/dehydrated b/lfs/dehydrated index 232588461..fc82f270d 100644 --- a/lfs/dehydrated +++ b/lfs/dehydrated @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D dehydrated -PAK_VER =3D 2 +PAK_VER =3D 3 =20 DEPS =3D "" =20 @@ -92,8 +92,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) =20 # Install example configuration cd $(DIR_APP) && sed \ - -e 's|^#CONFIG_D=3D|CONFIG_D=3D"\${BASEDIR}/conf.d"|' \ - -e 's|^#HOOK=3D|HOOK=3D"\${BASEDIR}/hook.sh"|' \ + -e 's|^#CONFIG_D=3D|CONFIG_D=3D"\$${BASEDIR}/conf.d"|' \ + -e 's|^#HOOK=3D|HOOK=3D"\$${BASEDIR}/hook.sh"|' \ docs/examples/config > /etc/dehydrated/config =20 # Install example hook diff --git a/src/paks/alsa/update.sh b/src/paks/alsa/update.sh index 79af981e8..14cf836b2 100644 --- a/src/paks/alsa/update.sh +++ b/src/paks/alsa/update.sh @@ -17,12 +17,13 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh mv /etc/asound.state /tmp +extract_backup_includes ./uninstall.sh ./install.sh mv /tmp/asound.state /etc diff --git a/src/paks/amazon-ssm-agent/uninstall.sh b/src/paks/amazon-ssm-age= nt/uninstall.sh index 48f160762..126160805 100644 --- a/src/paks/amazon-ssm-agent/uninstall.sh +++ b/src/paks/amazon-ssm-agent/uninstall.sh @@ -23,8 +23,6 @@ # . /opt/pakfire/lib/functions.sh =20 -extract_backup_includes - stop_service ${NAME} =20 make_backup ${NAME} diff --git a/src/paks/amazon-ssm-agent/update.sh b/src/paks/amazon-ssm-agent/= update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/amazon-ssm-agent/update.sh +++ b/src/paks/amazon-ssm-agent/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/apcupsd/update.sh b/src/paks/apcupsd/update.sh index 89c40d0d7..8df996766 100644 --- a/src/paks/apcupsd/update.sh +++ b/src/paks/apcupsd/update.sh @@ -22,5 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/asterisk/update.sh b/src/paks/asterisk/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/asterisk/update.sh +++ b/src/paks/asterisk/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/avahi/update.sh b/src/paks/avahi/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/avahi/update.sh +++ b/src/paks/avahi/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/bird/uninstall.sh b/src/paks/bird/uninstall.sh index 4ba09c858..28792eaf0 100644 --- a/src/paks/bird/uninstall.sh +++ b/src/paks/bird/uninstall.sh @@ -27,7 +27,6 @@ stop_service "${NAME}" =20 # Create backup -extract_backup_includes make_backup "${NAME}" =20 # Remove all files diff --git a/src/paks/bird/update.sh b/src/paks/bird/update.sh index 89c40d0d7..8df996766 100644 --- a/src/paks/bird/update.sh +++ b/src/paks/bird/update.sh @@ -22,5 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/cups/update.sh b/src/paks/cups/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/cups/update.sh +++ b/src/paks/cups/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/dbus/update.sh b/src/paks/dbus/update.sh index 9f2f69331..5082e497e 100644 --- a/src/paks/dbus/update.sh +++ b/src/paks/dbus/update.sh @@ -22,5 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/default/update.sh b/src/paks/default/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/default/update.sh +++ b/src/paks/default/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/dnsdist/uninstall.sh b/src/paks/dnsdist/uninstall.sh index 966c525c4..41c600e77 100644 --- a/src/paks/dnsdist/uninstall.sh +++ b/src/paks/dnsdist/uninstall.sh @@ -17,14 +17,12 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh =20 -extract_backup_includes - stop_service ${NAME} =20 make_backup ${NAME} diff --git a/src/paks/dnsdist/update.sh b/src/paks/dnsdist/update.sh index 89c40d0d7..8df996766 100644 --- a/src/paks/dnsdist/update.sh +++ b/src/paks/dnsdist/update.sh @@ -22,5 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/elinks/install.sh b/src/paks/elinks/install.sh deleted file mode 100644 index cd5a6cea5..000000000 --- a/src/paks/elinks/install.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/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-2013 IPFire-Team . = # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -restore_backup ${NAME} - -# Suppress first welcome dialog by creating bookmark -# and history files for root -mkdir -p /root/.elinks -touch /root/.elinks/bookmarks -touch /root/.elinks/globhist - -start_service --background ${NAME} diff --git a/src/paks/elinks/uninstall.sh b/src/paks/elinks/uninstall.sh deleted file mode 100644 index e296ccb19..000000000 --- a/src/paks/elinks/uninstall.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/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-2013 IPFire-Team . = # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -stop_service ${NAME} -make_backup ${NAME} -remove_files diff --git a/src/paks/elinks/update.sh b/src/paks/elinks/update.sh deleted file mode 100644 index 1ad1831a7..000000000 --- a/src/paks/elinks/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/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-2013 IPFire-Team . = # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh diff --git a/src/paks/freeradius/update.sh b/src/paks/freeradius/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/freeradius/update.sh +++ b/src/paks/freeradius/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/frr/uninstall.sh b/src/paks/frr/uninstall.sh index 49e3fdd7d..835558ac4 100644 --- a/src/paks/frr/uninstall.sh +++ b/src/paks/frr/uninstall.sh @@ -17,7 +17,7 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # @@ -27,7 +27,6 @@ stop_service "${NAME}" =20 # Create backup -extract_backup_includes make_backup "${NAME}" =20 # Remove all files diff --git a/src/paks/frr/update.sh b/src/paks/frr/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/frr/update.sh +++ b/src/paks/frr/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/git/update.sh b/src/paks/git/update.sh index 89c40d0d7..8df996766 100644 --- a/src/paks/git/update.sh +++ b/src/paks/git/update.sh @@ -22,5 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/gnump3d/update.sh b/src/paks/gnump3d/update.sh index 6e387001f..2031a9613 100644 --- a/src/paks/gnump3d/update.sh +++ b/src/paks/gnump3d/update.sh @@ -17,11 +17,12 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes #Remove userdate from rootfile cat /opt/pakfire/db/rootfiles/gnump3d | \ grep -v "var/mp3" > /opt/pakfire/db/rootfiles/gnump3d.tmp diff --git a/src/paks/guardian/update.sh b/src/paks/guardian/update.sh index 4bec42b53..99776659c 100644 --- a/src/paks/guardian/update.sh +++ b/src/paks/guardian/update.sh @@ -17,10 +17,11 @@ # 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-2016 IPFire-Team . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/haproxy/update.sh b/src/paks/haproxy/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/haproxy/update.sh +++ b/src/paks/haproxy/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/hostapd/update.sh b/src/paks/hostapd/update.sh index f81b04116..46deb04d1 100644 --- a/src/paks/hostapd/update.sh +++ b/src/paks/hostapd/update.sh @@ -17,10 +17,11 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2008 IPFire-Team . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +exctract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/igmpproxy/uninstall.sh b/src/paks/igmpproxy/uninstall.sh index eb6ff5f9b..7685264c5 100644 --- a/src/paks/igmpproxy/uninstall.sh +++ b/src/paks/igmpproxy/uninstall.sh @@ -17,12 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh stop_service ${NAME} -extract_backup_includes make_backup ${NAME} remove_files diff --git a/src/paks/igmpproxy/update.sh b/src/paks/igmpproxy/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/igmpproxy/update.sh +++ b/src/paks/igmpproxy/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/keepalived/update.sh b/src/paks/keepalived/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/keepalived/update.sh +++ b/src/paks/keepalived/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/libdaemon/update.sh b/src/paks/libdaemon/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/libdaemon/update.sh +++ b/src/paks/libdaemon/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/libvirt/uninstall.sh b/src/paks/libvirt/uninstall.sh index 0d96e360d..ba1770553 100644 --- a/src/paks/libvirt/uninstall.sh +++ b/src/paks/libvirt/uninstall.sh @@ -17,14 +17,13 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh stop_service libvirtd stop_service virtlogd -extract_backup_includes make_backup ${NAME} =20 remove_files diff --git a/src/paks/mdns-repeater/update.sh b/src/paks/mdns-repeater/update= .sh index c6485bf0a..99776659c 100644 --- a/src/paks/mdns-repeater/update.sh +++ b/src/paks/mdns-repeater/update.sh @@ -17,11 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh - +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/minidlna/update.sh b/src/paks/minidlna/update.sh index d5e61164c..99776659c 100644 --- a/src/paks/minidlna/update.sh +++ b/src/paks/minidlna/update.sh @@ -17,9 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # +. /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/motion/update.sh b/src/paks/motion/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/motion/update.sh +++ b/src/paks/motion/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/mpfire/update.sh b/src/paks/mpfire/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/mpfire/update.sh +++ b/src/paks/mpfire/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/netsnmpd/uninstall.sh b/src/paks/netsnmpd/uninstall.sh index 278218b26..a7b8a5370 100644 --- a/src/paks/netsnmpd/uninstall.sh +++ b/src/paks/netsnmpd/uninstall.sh @@ -22,7 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh -extract_backup_includes stop_service ${NAME} make_backup ${NAME} remove_files diff --git a/src/paks/netsnmpd/update.sh b/src/paks/netsnmpd/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/netsnmpd/update.sh +++ b/src/paks/netsnmpd/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/nfs/update.sh b/src/paks/nfs/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/nfs/update.sh +++ b/src/paks/nfs/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/nginx/uninstall.sh b/src/paks/nginx/uninstall.sh index 7c7bfe8b8..ded53f042 100644 --- a/src/paks/nginx/uninstall.sh +++ b/src/paks/nginx/uninstall.sh @@ -23,7 +23,6 @@ # . /opt/pakfire/lib/functions.sh stop_service ${NAME} -extract_backup_includes make_backup ${NAME} remove_files =20 diff --git a/src/paks/nginx/update.sh b/src/paks/nginx/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/nginx/update.sh +++ b/src/paks/nginx/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/nut/update.sh b/src/paks/nut/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/nut/update.sh +++ b/src/paks/nut/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/phpSANE/install.sh b/src/paks/phpSANE/install.sh deleted file mode 100644 index 6368c6e50..000000000 --- a/src/paks/phpSANE/install.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 -/etc/init.d/apache reload diff --git a/src/paks/phpSANE/uninstall.sh b/src/paks/phpSANE/uninstall.sh deleted file mode 100644 index e5b5d7fe4..000000000 --- a/src/paks/phpSANE/uninstall.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/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 -remove_files diff --git a/src/paks/phpSANE/update.sh b/src/paks/phpSANE/update.sh deleted file mode 100644 index 89c40d0d7..000000000 --- a/src/paks/phpSANE/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 diff --git a/src/paks/postfix/uninstall.sh b/src/paks/postfix/uninstall.sh index bff411a91..ecf6b5b78 100644 --- a/src/paks/postfix/uninstall.sh +++ b/src/paks/postfix/uninstall.sh @@ -22,7 +22,6 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh -extract_backup_includes stop_service ${NAME} make_backup ${NAME} /usr/sbin/alternatives --remove sendmail /usr/sbin/sendmail.postfix diff --git a/src/paks/postfix/update.sh b/src/paks/postfix/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/postfix/update.sh +++ b/src/paks/postfix/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/qemu/update.sh b/src/paks/qemu/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/qemu/update.sh +++ b/src/paks/qemu/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/rpcbind/update.sh b/src/paks/rpcbind/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/rpcbind/update.sh +++ b/src/paks/rpcbind/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/sarg/update.sh b/src/paks/sarg/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/sarg/update.sh +++ b/src/paks/sarg/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/shairport-sync/update.sh b/src/paks/shairport-sync/upda= te.sh index c6485bf0a..99776659c 100644 --- a/src/paks/shairport-sync/update.sh +++ b/src/paks/shairport-sync/update.sh @@ -17,11 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh - +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/squid-accounting/update.sh b/src/paks/squid-accounting/= update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/squid-accounting/update.sh +++ b/src/paks/squid-accounting/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/sslh/update.sh b/src/paks/sslh/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/sslh/update.sh +++ b/src/paks/sslh/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/stunnel/update.sh b/src/paks/stunnel/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/stunnel/update.sh +++ b/src/paks/stunnel/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/tftpd/update.sh b/src/paks/tftpd/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/tftpd/update.sh +++ b/src/paks/tftpd/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/transmission/update.sh b/src/paks/transmission/update.sh index c6485bf0a..99776659c 100644 --- a/src/paks/transmission/update.sh +++ b/src/paks/transmission/update.sh @@ -17,11 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh - +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/watchdog/update.sh b/src/paks/watchdog/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/watchdog/update.sh +++ b/src/paks/watchdog/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/wio/update.sh b/src/paks/wio/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/wio/update.sh +++ b/src/paks/wio/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh diff --git a/src/paks/xinetd/update.sh b/src/paks/xinetd/update.sh index 89c40d0d7..99776659c 100644 --- a/src/paks/xinetd/update.sh +++ b/src/paks/xinetd/update.sh @@ -17,10 +17,11 @@ # 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 . = # +# Copyright (C) 2007-2020 IPFire-Team . = # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh ./install.sh hooks/post-receive -- IPFire 2.x development tree --===============4097965428459800866==--