]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commitdiff
core102: ship openssl and openssl updates v2.19-core102
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 May 2016 19:30:14 +0000 (21:30 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 May 2016 19:31:37 +0000 (21:31 +0200)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
34 files changed:
config/rootfiles/core/102/exclude [moved from config/rootfiles/core/101/exclude with 100% similarity]
config/rootfiles/core/102/filelists/files [new file with mode: 0644]
config/rootfiles/core/102/filelists/i586/openssl-sse2 [new symlink]
config/rootfiles/core/102/filelists/openssh [new symlink]
config/rootfiles/core/102/filelists/openssl [new symlink]
config/rootfiles/core/102/meta [moved from config/rootfiles/core/101/meta with 100% similarity]
config/rootfiles/core/102/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/101/exclude [new file with mode: 0644]
config/rootfiles/oldcore/101/filelists/armv5tel/ath9k-module [moved from config/rootfiles/core/101/filelists/armv5tel/ath9k-module with 100% similarity]
config/rootfiles/oldcore/101/filelists/armv5tel/gmp [moved from config/rootfiles/core/101/filelists/armv5tel/gmp with 100% similarity]
config/rootfiles/oldcore/101/filelists/armv5tel/linux-rpi [moved from config/rootfiles/core/101/filelists/armv5tel/linux-rpi with 100% similarity]
config/rootfiles/oldcore/101/filelists/bind [moved from config/rootfiles/core/101/filelists/bind with 100% similarity]
config/rootfiles/oldcore/101/filelists/dma [moved from config/rootfiles/core/101/filelists/dma with 100% similarity]
config/rootfiles/oldcore/101/filelists/e2fsprogs [moved from config/rootfiles/core/101/filelists/e2fsprogs with 100% similarity]
config/rootfiles/oldcore/101/filelists/files [moved from config/rootfiles/core/101/filelists/files with 100% similarity]
config/rootfiles/oldcore/101/filelists/grep [moved from config/rootfiles/core/101/filelists/grep with 100% similarity]
config/rootfiles/oldcore/101/filelists/i586/ath9k-module [moved from config/rootfiles/core/101/filelists/i586/ath9k-module with 100% similarity]
config/rootfiles/oldcore/101/filelists/i586/dmidecode [moved from config/rootfiles/core/101/filelists/i586/dmidecode with 100% similarity]
config/rootfiles/oldcore/101/filelists/i586/gmp [moved from config/rootfiles/core/101/filelists/i586/gmp with 100% similarity]
config/rootfiles/oldcore/101/filelists/libxml2 [moved from config/rootfiles/core/101/filelists/libxml2 with 100% similarity]
config/rootfiles/oldcore/101/filelists/mpfr [moved from config/rootfiles/core/101/filelists/mpfr with 100% similarity]
config/rootfiles/oldcore/101/filelists/nettle [moved from config/rootfiles/core/101/filelists/nettle with 100% similarity]
config/rootfiles/oldcore/101/filelists/patch [moved from config/rootfiles/core/101/filelists/patch with 100% similarity]
config/rootfiles/oldcore/101/filelists/paxctl [moved from config/rootfiles/core/101/filelists/paxctl with 100% similarity]
config/rootfiles/oldcore/101/filelists/pciutils [moved from config/rootfiles/core/101/filelists/pciutils with 100% similarity]
config/rootfiles/oldcore/101/filelists/pcre [moved from config/rootfiles/core/101/filelists/pcre with 100% similarity]
config/rootfiles/oldcore/101/filelists/perl-Apache-Htpasswd [moved from config/rootfiles/core/101/filelists/perl-Apache-Htpasswd with 100% similarity]
config/rootfiles/oldcore/101/filelists/squid [moved from config/rootfiles/core/101/filelists/squid with 100% similarity]
config/rootfiles/oldcore/101/filelists/x86_64/ath9k-module [moved from config/rootfiles/core/101/filelists/x86_64/ath9k-module with 100% similarity]
config/rootfiles/oldcore/101/filelists/x86_64/dmidecode [moved from config/rootfiles/core/101/filelists/x86_64/dmidecode with 100% similarity]
config/rootfiles/oldcore/101/filelists/x86_64/gmp [moved from config/rootfiles/core/101/filelists/x86_64/gmp with 100% similarity]
config/rootfiles/oldcore/101/meta [new file with mode: 0644]
config/rootfiles/oldcore/101/update.sh [moved from config/rootfiles/core/101/update.sh with 100% similarity]
make.sh

diff --git a/config/rootfiles/core/102/filelists/files b/config/rootfiles/core/102/filelists/files
new file mode 100644 (file)
index 0000000..409e5fe
--- /dev/null
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue
diff --git a/config/rootfiles/core/102/filelists/i586/openssl-sse2 b/config/rootfiles/core/102/filelists/i586/openssl-sse2
new file mode 120000 (symlink)
index 0000000..f424713
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/i586/openssl-sse2
\ No newline at end of file
diff --git a/config/rootfiles/core/102/filelists/openssh b/config/rootfiles/core/102/filelists/openssh
new file mode 120000 (symlink)
index 0000000..d8c77fd
--- /dev/null
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/102/filelists/openssl b/config/rootfiles/core/102/filelists/openssl
new file mode 120000 (symlink)
index 0000000..e011a92
--- /dev/null
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/102/update.sh b/config/rootfiles/core/102/update.sh
new file mode 100644 (file)
index 0000000..2f51d10
--- /dev/null
@@ -0,0 +1,74 @@
+#!/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) 2016 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=102
+
+function exit_with_error() {
+       # Set last succesfull installed core.
+       echo $(($core-1)) > /opt/pakfire/db/core/mine
+       /usr/bin/logger -p syslog.emerg -t ipfire \
+               "core-update-${core}: $1"
+       exit $2
+}
+
+# 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
+#
+
+sync
+# This update need 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/101/exclude b/config/rootfiles/oldcore/101/exclude
new file mode 100644 (file)
index 0000000..7ddeae0
--- /dev/null
@@ -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/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/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/oldcore/101/meta b/config/rootfiles/oldcore/101/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
diff --git a/make.sh b/make.sh
index 960b45d6ec27d97905be5b19d9e8247a2b26fca3..d2d3e14a4301acbcca2e76ecae9b32757713369d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.19"                                                 # Version number
-CORE="101"                                                     # Core Level (Filename)
-PAKFIRE_CORE="101"                                             # Core Level (PAKFIRE)
+CORE="102"                                                     # Core Level (Filename)
+PAKFIRE_CORE="102"                                             # 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