]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge branch 'core105' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 22 Sep 2016 11:05:13 +0000 (12:05 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 22 Sep 2016 11:05:13 +0000 (12:05 +0100)
35 files changed:
config/rootfiles/core/105/exclude [moved from config/rootfiles/core/104/exclude with 100% similarity]
config/rootfiles/core/105/filelists/files [new file with mode: 0644]
config/rootfiles/core/105/filelists/libgcrypt [new symlink]
config/rootfiles/core/105/filelists/openssl [new symlink]
config/rootfiles/core/105/meta [moved from config/rootfiles/core/104/meta with 100% similarity]
config/rootfiles/core/105/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/104/exclude [new file with mode: 0644]
config/rootfiles/oldcore/104/filelists/acl [moved from config/rootfiles/core/104/filelists/acl with 100% similarity]
config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood [moved from config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood with 100% similarity]
config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi [moved from config/rootfiles/core/104/filelists/armv5tel/linux-multi with 100% similarity]
config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi [moved from config/rootfiles/core/104/filelists/armv5tel/linux-rpi with 100% similarity]
config/rootfiles/oldcore/104/filelists/curl [moved from config/rootfiles/core/104/filelists/curl with 100% similarity]
config/rootfiles/oldcore/104/filelists/ddns [moved from config/rootfiles/core/104/filelists/ddns with 100% similarity]
config/rootfiles/oldcore/104/filelists/dnsmasq [moved from config/rootfiles/core/104/filelists/dnsmasq with 100% similarity]
config/rootfiles/oldcore/104/filelists/files [moved from config/rootfiles/core/104/filelists/files with 100% similarity]
config/rootfiles/oldcore/104/filelists/i586/acpid [moved from config/rootfiles/core/104/filelists/i586/acpid with 100% similarity]
config/rootfiles/oldcore/104/filelists/i586/linux [moved from config/rootfiles/core/104/filelists/i586/linux with 100% similarity]
config/rootfiles/oldcore/104/filelists/iputils [moved from config/rootfiles/core/104/filelists/iputils with 100% similarity]
config/rootfiles/oldcore/104/filelists/libarchive [moved from config/rootfiles/core/104/filelists/libarchive with 100% similarity]
config/rootfiles/oldcore/104/filelists/libcap [moved from config/rootfiles/core/104/filelists/libcap with 100% similarity]
config/rootfiles/oldcore/104/filelists/ntp [moved from config/rootfiles/core/104/filelists/ntp with 100% similarity]
config/rootfiles/oldcore/104/filelists/openssh [moved from config/rootfiles/core/104/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/104/filelists/pcre [moved from config/rootfiles/core/104/filelists/pcre with 100% similarity]
config/rootfiles/oldcore/104/filelists/popt [moved from config/rootfiles/core/104/filelists/popt with 100% similarity]
config/rootfiles/oldcore/104/filelists/screen [moved from config/rootfiles/core/104/filelists/screen with 100% similarity]
config/rootfiles/oldcore/104/filelists/shadow [moved from config/rootfiles/core/104/filelists/shadow with 100% similarity]
config/rootfiles/oldcore/104/filelists/snort [moved from config/rootfiles/core/104/filelists/snort with 100% similarity]
config/rootfiles/oldcore/104/filelists/wget [moved from config/rootfiles/core/104/filelists/wget with 100% similarity]
config/rootfiles/oldcore/104/filelists/which [moved from config/rootfiles/core/104/filelists/which with 100% similarity]
config/rootfiles/oldcore/104/filelists/x86_64/acpid [moved from config/rootfiles/core/104/filelists/x86_64/acpid with 100% similarity]
config/rootfiles/oldcore/104/filelists/x86_64/linux [moved from config/rootfiles/core/104/filelists/x86_64/linux with 100% similarity]
config/rootfiles/oldcore/104/meta [new file with mode: 0644]
config/rootfiles/oldcore/104/update.sh [moved from config/rootfiles/core/104/update.sh with 100% similarity]
lfs/openssl
make.sh

diff --git a/config/rootfiles/core/105/filelists/files b/config/rootfiles/core/105/filelists/files
new file mode 100644 (file)
index 0000000..95f6e10
--- /dev/null
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue
\ No newline at end of file
diff --git a/config/rootfiles/core/105/filelists/libgcrypt b/config/rootfiles/core/105/filelists/libgcrypt
new file mode 120000 (symlink)
index 0000000..2df12a2
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libgcrypt
\ No newline at end of file
diff --git a/config/rootfiles/core/105/filelists/openssl b/config/rootfiles/core/105/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/105/update.sh b/config/rootfiles/core/105/update.sh
new file mode 100644 (file)
index 0000000..3e9f601
--- /dev/null
@@ -0,0 +1,71 @@
+#!/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=105
+
+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
+
+# 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/104/exclude b/config/rootfiles/oldcore/104/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/104/meta b/config/rootfiles/oldcore/104/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
index 0a0b2cffdaa125c06e9b384efb79074dc89e9e55..d0ed4d30b1aacc64a2f43957d9b84340af89f04f 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.2h
+VER        = 1.0.2i
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -87,7 +87,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9392e65072ce4b614c1392eefc1f23d0
+$(DL_FILE)_MD5 = 678374e63f8df456a697d3e5e5a931fb
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index 951f3dc8596dd2397d2e3c1ce3834586e4cc93de..e1a6233d90612a7e763c1cb0c140181b15a7abe5 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="104"                                                     # Core Level (Filename)
-PAKFIRE_CORE="104"                                             # Core Level (PAKFIRE)
+CORE="105"                                                     # Core Level (Filename)
+PAKFIRE_CORE="105"                                             # 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