paks: add/move extract_backup_includes to pak update scripts

this function allow to update the backup filelist before the backup was done in uninstall.sh at packet updates.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/src/paks/alsa/update.sh b/src/paks/alsa/update.sh
index 79af981e8ee221d4e81a4817c25e695c974c7e9d..14cf836b2d64c4d03eee016767963d6d03bccf40 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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-agent/uninstall.sh
index 48f160762aa5677e67c87a81c5b830f7a58352c0..126160805c5db2da545777dd9ad43220c666c63a 100644 (file)
--- 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
 
-extract_backup_includes
-
 stop_service ${NAME}
 
 make_backup ${NAME}

diff --git a/src/paks/amazon-ssm-agent/update.sh b/src/paks/amazon-ssm-agent/update.sh
index 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..8df99676653755acfdb526c838d3375d9ba356c9 100644 (file)
--- 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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 4ba09c858cd49f2ae6089c9808602653db16c891..28792eaf010b68cf4b2da64928c9c7c76f2075a2 100644 (file)
--- a/src/paks/bird/uninstall.sh
+++ b/src/paks/bird/uninstall.sh
@@ -27,7 +27,6 @@
 stop_service "${NAME}"
 
 # Create backup
-extract_backup_includes
 make_backup "${NAME}"
 
 # Remove all files

diff --git a/src/paks/bird/update.sh b/src/paks/bird/update.sh
index 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..8df99676653755acfdb526c838d3375d9ba356c9 100644 (file)
--- 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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 9f2f69331cca153d7c9c7648f03dd8730e34cbff..5082e497ea222e1b18b319f331f4f645b3774b0c 100644 (file)
--- 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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 966c525c49e46f5125abb3b7da764a0bafa6ab7b..41c600e77c4c6e940f59d35ab782c8d5237259df 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 
-extract_backup_includes
-
 stop_service ${NAME}
 
 make_backup ${NAME}

diff --git a/src/paks/dnsdist/update.sh b/src/paks/dnsdist/update.sh
index 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..8df99676653755acfdb526c838d3375d9ba356c9 100644 (file)
--- 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/freeradius/update.sh b/src/paks/freeradius/update.sh
index 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 49e3fdd7d1b7a4c60ee55feef809b5d6060ea2b5..835558ac4ceb3ccd93b60e3f3c18582577eb2d95 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
@@ -27,7 +27,6 @@
 stop_service "${NAME}"
 
 # Create backup
-extract_backup_includes
 make_backup "${NAME}"
 
 # Remove all files

diff --git a/src/paks/frr/update.sh b/src/paks/frr/update.sh
index 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..8df99676653755acfdb526c838d3375d9ba356c9 100644 (file)
--- 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 6e387001ff2019031eb0d65c16a3231f6d5e28d1..2031a9613d543fc724ebe65eaa8bf8b4ca1af8cd 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 4bec42b537948ea09909f047bf66ef63abbd3a5e..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                   #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 f81b0411681889901792eb33529290f452ea1d95..46deb04d1fa10f9a8c766c7f7986ce864534bdcc 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 eb6ff5f9b916cae8b5ba20e49179cc518e127773..7685264c5ce6fb69250a786be27edfa98ecee1e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 0d96e360dfd5ee1fbf7e6004881916473bc861ba..ba17705537e53f0dfb7a6121c77c97c7798a41e1 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 stop_service libvirtd
 stop_service virtlogd
-extract_backup_includes
 make_backup ${NAME}
 
 remove_files

diff --git a/src/paks/mdns-repeater/update.sh b/src/paks/mdns-repeater/update.sh
index c6485bf0ae822fe08e62ddd59af78c7cc3951412..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 d5e61164c9f4710d9d8b465fd1a5ebfeca8bd03c..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
+. /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 278218b26066bb104c4e310d58e5e9f4782f00e4..a7b8a5370f68e23809d3bd94083f0150545980cb 100644 (file)
--- 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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 7c7bfe8b8c8c9969f0c08be43ba12ed31f06f1fb..ded53f042176bcf0eaf99f7c40c874d37e046045 100644 (file)
--- 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
 

diff --git a/src/paks/nginx/update.sh b/src/paks/nginx/update.sh
index 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+extract_backup_includes
 ./uninstall.sh
 ./install.sh

diff --git a/src/paks/postfix/uninstall.sh b/src/paks/postfix/uninstall.sh
index bff411a91ddd72444e4e4cda4d71b975e10c2d6b..ecf6b5b78755767c04857984057eea036a4fc005 100644 (file)
--- 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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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/update.sh
index c6485bf0ae822fe08e62ddd59af78c7cc3951412..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 c6485bf0ae822fe08e62ddd59af78c7cc3951412..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /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 89c40d0d7c5d3dd57b5944f3af4977d5f8d76760..99776659c31ca813c685a8c1c983df98896933e9 100644 (file)
--- 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 <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+extract_backup_includes
 ./uninstall.sh
 ./install.sh