core148: add libloc changes

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

diff --git a/config/rootfiles/core/147/exclude b/config/rootfiles/core/148/exclude
similarity index 100%
rename from config/rootfiles/core/147/exclude
rename to config/rootfiles/core/148/exclude

diff --git a/config/rootfiles/core/148/filelists/Locale-Country b/config/rootfiles/core/148/filelists/Locale-Country
new file mode 120000 (symlink)
index 0000000..025c278
--- /dev/null
+++ b/config/rootfiles/core/148/filelists/Locale-Country
@@ -0,0 +1 @@
+../../../common/Locale-Country
\ No newline at end of file

diff --git a/config/rootfiles/core/148/filelists/files b/config/rootfiles/core/148/filelists/files
new file mode 100644 (file)
index 0000000..3578b7a
--- /dev/null
+++ b/config/rootfiles/core/148/filelists/files
@@ -0,0 +1,28 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
+etc/rc.d/init.d/firewall
+srv/web/ipfire/cgi-bin/connections.cgi
+srv/web/ipfire/cgi-bin/country.cgi
+srv/web/ipfire/cgi-bin/dns.cgi
+srv/web/ipfire/cgi-bin/firewall.cgi
+srv/web/ipfire/cgi-bin/fwhosts.cgi
+srv/web/ipfire/cgi-bin/ipinfo.cgi
+srv/web/ipfire/cgi-bin/location-block.cgi
+srv/web/ipfire/cgi-bin//logs.cgi/firewalllog.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
+srv/web/ipfire/cgi-bin/netexternal.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/remote.cgi
+srv/web/ipfire/cgi-bin/tor.cgi
+usr/lib/firewall/firewall-lib.pl
+usr/lib/firewall/rules.pl
+usr/local/bin/convert-to-location
+usr/local/bin/update-location-database
+var/ipfire/backup/bin/backup.pl
+var/ipfire/firewall/locationblock
+var/ipfire/location-functions.pl
+var/ipfire/menu.d/50-firewall.menu

diff --git a/config/rootfiles/core/148/filelists/libloc b/config/rootfiles/core/148/filelists/libloc
new file mode 120000 (symlink)
index 0000000..ff4a924
--- /dev/null
+++ b/config/rootfiles/core/148/filelists/libloc
@@ -0,0 +1 @@
+../../../common/libloc
\ No newline at end of file

diff --git a/config/rootfiles/core/148/filelists/xtables-addons b/config/rootfiles/core/148/filelists/xtables-addons
new file mode 120000 (symlink)
index 0000000..2e24c42
--- /dev/null
+++ b/config/rootfiles/core/148/filelists/xtables-addons
@@ -0,0 +1 @@
+../../../common/xtables-addons
\ No newline at end of file

diff --git a/config/rootfiles/core/148/update.sh b/config/rootfiles/core/148/update.sh
new file mode 100644 (file)
index 0000000..c89da8f
--- /dev/null
+++ b/config/rootfiles/core/148/update.sh
@@ -0,0 +1,80 @@
+#!/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 3 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) 2020 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=148
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Remove files
+rm -vf \
+       /etc/rc.d/init.d/networking/red.ip/99-geoip-database \
+       /srv/web/ipfire/cgi-bin/geoip-block.cgi \
+       /usr/lib/libGeoIP*
+       /usr/lib/perl5/site_perl/5.30.0/Geo \
+       /usr/share/GeoIP \
+       /var/lib/GoIP \
+       /usr/local/bin/xt_geoip* \
+       /var/ipfire/geoip-functions.pl \
+
+# Stop services
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# update location database
+/usr/local/bin/convert-to-location
+/usr/local/bin/update-location-database
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Start services
+
+# This update needs a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+       grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0

diff --git a/config/rootfiles/oldcore/103/filelists/curl b/config/rootfiles/oldcore/103/filelists/curl
deleted file mode 120000 (symlink)
index 4b84bef..0000000
--- a/config/rootfiles/oldcore/103/filelists/curl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/curl
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/147/exclude b/config/rootfiles/oldcore/147/exclude
new file mode 100644 (file)
index 0000000..b221598
--- /dev/null
+++ b/config/rootfiles/oldcore/147/exclude
@@ -0,0 +1,28 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache

diff --git a/config/rootfiles/core/147/filelists/aarch64/gmp b/config/rootfiles/oldcore/147/filelists/aarch64/gmp
similarity index 100%
rename from config/rootfiles/core/147/filelists/aarch64/gmp
rename to config/rootfiles/oldcore/147/filelists/aarch64/gmp

diff --git a/config/rootfiles/core/147/filelists/armv5tel/gmp b/config/rootfiles/oldcore/147/filelists/armv5tel/gmp
similarity index 100%
rename from config/rootfiles/core/147/filelists/armv5tel/gmp
rename to config/rootfiles/oldcore/147/filelists/armv5tel/gmp

diff --git a/config/rootfiles/core/147/filelists/bind b/config/rootfiles/oldcore/147/filelists/bind
similarity index 100%
rename from config/rootfiles/core/147/filelists/bind
rename to config/rootfiles/oldcore/147/filelists/bind

diff --git a/config/rootfiles/core/147/filelists/ca-certificates b/config/rootfiles/oldcore/147/filelists/ca-certificates
similarity index 100%
rename from config/rootfiles/core/147/filelists/ca-certificates
rename to config/rootfiles/oldcore/147/filelists/ca-certificates

diff --git a/config/rootfiles/core/147/filelists/dhcpcd b/config/rootfiles/oldcore/147/filelists/dhcpcd
similarity index 100%
rename from config/rootfiles/core/147/filelists/dhcpcd
rename to config/rootfiles/oldcore/147/filelists/dhcpcd

diff --git a/config/rootfiles/core/147/filelists/files b/config/rootfiles/oldcore/147/filelists/files
similarity index 100%
rename from config/rootfiles/core/147/filelists/files
rename to config/rootfiles/oldcore/147/filelists/files

diff --git a/config/rootfiles/core/147/filelists/gnutls b/config/rootfiles/oldcore/147/filelists/gnutls
similarity index 100%
rename from config/rootfiles/core/147/filelists/gnutls
rename to config/rootfiles/oldcore/147/filelists/gnutls

diff --git a/config/rootfiles/core/147/filelists/i586/gmp b/config/rootfiles/oldcore/147/filelists/i586/gmp
similarity index 100%
rename from config/rootfiles/core/147/filelists/i586/gmp
rename to config/rootfiles/oldcore/147/filelists/i586/gmp

diff --git a/config/rootfiles/core/147/filelists/iproute2 b/config/rootfiles/oldcore/147/filelists/iproute2
similarity index 100%
rename from config/rootfiles/core/147/filelists/iproute2
rename to config/rootfiles/oldcore/147/filelists/iproute2

diff --git a/config/rootfiles/core/147/filelists/libgcrypt b/config/rootfiles/oldcore/147/filelists/libgcrypt
similarity index 100%
rename from config/rootfiles/core/147/filelists/libgcrypt
rename to config/rootfiles/oldcore/147/filelists/libgcrypt

diff --git a/config/rootfiles/core/147/filelists/libgpg-error b/config/rootfiles/oldcore/147/filelists/libgpg-error
similarity index 100%
rename from config/rootfiles/core/147/filelists/libgpg-error
rename to config/rootfiles/oldcore/147/filelists/libgpg-error

diff --git a/config/rootfiles/core/147/filelists/linux-firmware-updates b/config/rootfiles/oldcore/147/filelists/linux-firmware-updates
similarity index 100%
rename from config/rootfiles/core/147/filelists/linux-firmware-updates
rename to config/rootfiles/oldcore/147/filelists/linux-firmware-updates

diff --git a/config/rootfiles/core/147/filelists/ntp b/config/rootfiles/oldcore/147/filelists/ntp
similarity index 100%
rename from config/rootfiles/core/147/filelists/ntp
rename to config/rootfiles/oldcore/147/filelists/ntp

diff --git a/config/rootfiles/core/147/filelists/openssh b/config/rootfiles/oldcore/147/filelists/openssh
similarity index 100%
rename from config/rootfiles/core/147/filelists/openssh
rename to config/rootfiles/oldcore/147/filelists/openssh

diff --git a/config/rootfiles/core/147/filelists/squid b/config/rootfiles/oldcore/147/filelists/squid
similarity index 100%
rename from config/rootfiles/core/147/filelists/squid
rename to config/rootfiles/oldcore/147/filelists/squid

diff --git a/config/rootfiles/core/147/filelists/squidguard b/config/rootfiles/oldcore/147/filelists/squidguard
similarity index 100%
rename from config/rootfiles/core/147/filelists/squidguard
rename to config/rootfiles/oldcore/147/filelists/squidguard

diff --git a/config/rootfiles/core/147/filelists/x86_64/gmp b/config/rootfiles/oldcore/147/filelists/x86_64/gmp
similarity index 100%
rename from config/rootfiles/core/147/filelists/x86_64/gmp
rename to config/rootfiles/oldcore/147/filelists/x86_64/gmp

diff --git a/config/rootfiles/core/147/update.sh b/config/rootfiles/oldcore/147/update.sh
similarity index 100%
rename from config/rootfiles/core/147/update.sh
rename to config/rootfiles/oldcore/147/update.sh

diff --git a/make.sh b/make.sh
index 21e84400bc4aca5f17a53df92b9d363e5b753c83..a2e54f233923fe383612eced435f3e0068c736e6 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.25"                                                 # Version number
-CORE="147"                                                     # Core Level (Filename)
+CORE="148"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 NICE=10                                                                # Nice level