public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
* [PATCH] Start Core Update 121
@ 2018-04-26 15:06 Peter Müller
  2018-04-26 16:59 ` Michael Tremer
  0 siblings, 1 reply; 4+ messages in thread
From: Peter Müller @ 2018-04-26 15:06 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 14995 bytes --]

Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
---
 config/rootfiles/core/{120 => 121}/exclude         |  0
 config/rootfiles/core/{120 => 121}/meta            |  0
 config/rootfiles/core/121/update.sh                | 62 ++++++++++++++++++++++
 config/rootfiles/oldcore/120/exclude               | 30 +++++++++++
 .../{core => oldcore}/120/filelists/Net_SSLeay     |  0
 .../{core => oldcore}/120/filelists/apache2        |  0
 .../rootfiles/{core => oldcore}/120/filelists/apr  |  0
 .../{core => oldcore}/120/filelists/aprutil        |  0
 .../rootfiles/{core => oldcore}/120/filelists/bind |  0
 .../rootfiles/{core => oldcore}/120/filelists/curl |  0
 .../{core => oldcore}/120/filelists/cyrus-sasl     |  0
 .../rootfiles/{core => oldcore}/120/filelists/dma  |  0
 .../{core => oldcore}/120/filelists/files          |  0
 .../{core => oldcore}/120/filelists/gnupg          |  0
 .../120/filelists/i586/openssl-sse2                |  0
 .../{core => oldcore}/120/filelists/libevent2      |  0
 .../{core => oldcore}/120/filelists/logrotate      |  0
 .../rootfiles/{core => oldcore}/120/filelists/ntp  |  0
 .../{core => oldcore}/120/filelists/openssh        |  0
 .../{core => oldcore}/120/filelists/openssl        |  0
 .../{core => oldcore}/120/filelists/openssl-compat |  0
 .../{core => oldcore}/120/filelists/openvpn        |  0
 .../{core => oldcore}/120/filelists/python-typing  |  0
 .../{core => oldcore}/120/filelists/snort          |  0
 .../{core => oldcore}/120/filelists/strongswan     |  0
 .../{core => oldcore}/120/filelists/unbound        |  0
 .../{core => oldcore}/120/filelists/vnstat         |  0
 .../rootfiles/{core => oldcore}/120/filelists/wget |  0
 .../{core => oldcore}/120/filelists/wpa_supplicant |  0
 config/rootfiles/{core => oldcore}/120/update.sh   |  0
 make.sh                                            |  4 +-
 31 files changed, 94 insertions(+), 2 deletions(-)
 rename config/rootfiles/core/{120 => 121}/exclude (100%)
 rename config/rootfiles/core/{120 => 121}/meta (100%)
 create mode 100644 config/rootfiles/core/121/update.sh
 create mode 100644 config/rootfiles/oldcore/120/exclude
 rename config/rootfiles/{core => oldcore}/120/filelists/Net_SSLeay (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/apache2 (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/apr (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/aprutil (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/bind (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/curl (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/cyrus-sasl (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/dma (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/files (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/gnupg (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/i586/openssl-sse2 (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/libevent2 (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/logrotate (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/ntp (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/openssh (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/openssl (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/openssl-compat (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/openvpn (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/python-typing (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/snort (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/strongswan (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/unbound (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/vnstat (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/wget (100%)
 rename config/rootfiles/{core => oldcore}/120/filelists/wpa_supplicant (100%)
 rename config/rootfiles/{core => oldcore}/120/update.sh (100%)

diff --git a/config/rootfiles/core/120/exclude b/config/rootfiles/core/121/exclude
similarity index 100%
rename from config/rootfiles/core/120/exclude
rename to config/rootfiles/core/121/exclude
diff --git a/config/rootfiles/core/120/meta b/config/rootfiles/core/121/meta
similarity index 100%
rename from config/rootfiles/core/120/meta
rename to config/rootfiles/core/121/meta
diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/core/121/update.sh
new file mode 100644
index 000000000..9986316e9
--- /dev/null
+++ b/config/rootfiles/core/121/update.sh
@@ -0,0 +1,62 @@
+#!/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) 2017 IPFire-Team <info(a)ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=120
+
+# 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
+
+# Stop services
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# 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/120/exclude b/config/rootfiles/oldcore/120/exclude
new file mode 100644
index 000000000..d6fd053b6
--- /dev/null
+++ b/config/rootfiles/oldcore/120/exclude
@@ -0,0 +1,30 @@
+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/ssh/ssh_config
+etc/ssh/sshd_config
+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/120/filelists/Net_SSLeay b/config/rootfiles/oldcore/120/filelists/Net_SSLeay
similarity index 100%
rename from config/rootfiles/core/120/filelists/Net_SSLeay
rename to config/rootfiles/oldcore/120/filelists/Net_SSLeay
diff --git a/config/rootfiles/core/120/filelists/apache2 b/config/rootfiles/oldcore/120/filelists/apache2
similarity index 100%
rename from config/rootfiles/core/120/filelists/apache2
rename to config/rootfiles/oldcore/120/filelists/apache2
diff --git a/config/rootfiles/core/120/filelists/apr b/config/rootfiles/oldcore/120/filelists/apr
similarity index 100%
rename from config/rootfiles/core/120/filelists/apr
rename to config/rootfiles/oldcore/120/filelists/apr
diff --git a/config/rootfiles/core/120/filelists/aprutil b/config/rootfiles/oldcore/120/filelists/aprutil
similarity index 100%
rename from config/rootfiles/core/120/filelists/aprutil
rename to config/rootfiles/oldcore/120/filelists/aprutil
diff --git a/config/rootfiles/core/120/filelists/bind b/config/rootfiles/oldcore/120/filelists/bind
similarity index 100%
rename from config/rootfiles/core/120/filelists/bind
rename to config/rootfiles/oldcore/120/filelists/bind
diff --git a/config/rootfiles/core/120/filelists/curl b/config/rootfiles/oldcore/120/filelists/curl
similarity index 100%
rename from config/rootfiles/core/120/filelists/curl
rename to config/rootfiles/oldcore/120/filelists/curl
diff --git a/config/rootfiles/core/120/filelists/cyrus-sasl b/config/rootfiles/oldcore/120/filelists/cyrus-sasl
similarity index 100%
rename from config/rootfiles/core/120/filelists/cyrus-sasl
rename to config/rootfiles/oldcore/120/filelists/cyrus-sasl
diff --git a/config/rootfiles/core/120/filelists/dma b/config/rootfiles/oldcore/120/filelists/dma
similarity index 100%
rename from config/rootfiles/core/120/filelists/dma
rename to config/rootfiles/oldcore/120/filelists/dma
diff --git a/config/rootfiles/core/120/filelists/files b/config/rootfiles/oldcore/120/filelists/files
similarity index 100%
rename from config/rootfiles/core/120/filelists/files
rename to config/rootfiles/oldcore/120/filelists/files
diff --git a/config/rootfiles/core/120/filelists/gnupg b/config/rootfiles/oldcore/120/filelists/gnupg
similarity index 100%
rename from config/rootfiles/core/120/filelists/gnupg
rename to config/rootfiles/oldcore/120/filelists/gnupg
diff --git a/config/rootfiles/core/120/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/120/filelists/i586/openssl-sse2
similarity index 100%
rename from config/rootfiles/core/120/filelists/i586/openssl-sse2
rename to config/rootfiles/oldcore/120/filelists/i586/openssl-sse2
diff --git a/config/rootfiles/core/120/filelists/libevent2 b/config/rootfiles/oldcore/120/filelists/libevent2
similarity index 100%
rename from config/rootfiles/core/120/filelists/libevent2
rename to config/rootfiles/oldcore/120/filelists/libevent2
diff --git a/config/rootfiles/core/120/filelists/logrotate b/config/rootfiles/oldcore/120/filelists/logrotate
similarity index 100%
rename from config/rootfiles/core/120/filelists/logrotate
rename to config/rootfiles/oldcore/120/filelists/logrotate
diff --git a/config/rootfiles/core/120/filelists/ntp b/config/rootfiles/oldcore/120/filelists/ntp
similarity index 100%
rename from config/rootfiles/core/120/filelists/ntp
rename to config/rootfiles/oldcore/120/filelists/ntp
diff --git a/config/rootfiles/core/120/filelists/openssh b/config/rootfiles/oldcore/120/filelists/openssh
similarity index 100%
rename from config/rootfiles/core/120/filelists/openssh
rename to config/rootfiles/oldcore/120/filelists/openssh
diff --git a/config/rootfiles/core/120/filelists/openssl b/config/rootfiles/oldcore/120/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/120/filelists/openssl
rename to config/rootfiles/oldcore/120/filelists/openssl
diff --git a/config/rootfiles/core/120/filelists/openssl-compat b/config/rootfiles/oldcore/120/filelists/openssl-compat
similarity index 100%
rename from config/rootfiles/core/120/filelists/openssl-compat
rename to config/rootfiles/oldcore/120/filelists/openssl-compat
diff --git a/config/rootfiles/core/120/filelists/openvpn b/config/rootfiles/oldcore/120/filelists/openvpn
similarity index 100%
rename from config/rootfiles/core/120/filelists/openvpn
rename to config/rootfiles/oldcore/120/filelists/openvpn
diff --git a/config/rootfiles/core/120/filelists/python-typing b/config/rootfiles/oldcore/120/filelists/python-typing
similarity index 100%
rename from config/rootfiles/core/120/filelists/python-typing
rename to config/rootfiles/oldcore/120/filelists/python-typing
diff --git a/config/rootfiles/core/120/filelists/snort b/config/rootfiles/oldcore/120/filelists/snort
similarity index 100%
rename from config/rootfiles/core/120/filelists/snort
rename to config/rootfiles/oldcore/120/filelists/snort
diff --git a/config/rootfiles/core/120/filelists/strongswan b/config/rootfiles/oldcore/120/filelists/strongswan
similarity index 100%
rename from config/rootfiles/core/120/filelists/strongswan
rename to config/rootfiles/oldcore/120/filelists/strongswan
diff --git a/config/rootfiles/core/120/filelists/unbound b/config/rootfiles/oldcore/120/filelists/unbound
similarity index 100%
rename from config/rootfiles/core/120/filelists/unbound
rename to config/rootfiles/oldcore/120/filelists/unbound
diff --git a/config/rootfiles/core/120/filelists/vnstat b/config/rootfiles/oldcore/120/filelists/vnstat
similarity index 100%
rename from config/rootfiles/core/120/filelists/vnstat
rename to config/rootfiles/oldcore/120/filelists/vnstat
diff --git a/config/rootfiles/core/120/filelists/wget b/config/rootfiles/oldcore/120/filelists/wget
similarity index 100%
rename from config/rootfiles/core/120/filelists/wget
rename to config/rootfiles/oldcore/120/filelists/wget
diff --git a/config/rootfiles/core/120/filelists/wpa_supplicant b/config/rootfiles/oldcore/120/filelists/wpa_supplicant
similarity index 100%
rename from config/rootfiles/core/120/filelists/wpa_supplicant
rename to config/rootfiles/oldcore/120/filelists/wpa_supplicant
diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/oldcore/120/update.sh
similarity index 100%
rename from config/rootfiles/core/120/update.sh
rename to config/rootfiles/oldcore/120/update.sh
diff --git a/make.sh b/make.sh
index 1f8738665..85f101bf0 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.19"							# Version number
-CORE="120"							# Core Level (Filename)
-PAKFIRE_CORE="120"						# Core Level (PAKFIRE)
+CORE="121"							# Core Level (Filename)
+PAKFIRE_CORE="121"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
-- 
2.13.6

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-04-26 17:22 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-26 15:06 [PATCH] Start Core Update 121 Peter Müller
2018-04-26 16:59 ` Michael Tremer
2018-04-26 17:19   ` Peter Müller
2018-04-26 17:22     ` Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox