This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via cd805ced09c2e203e7e6b874b7b96fb5e86a11b5 (commit) via 3bc177eec53248b296e13654003f278c65ddc413 (commit) via 8bbed7a5b6a878dae03d605042b48304f3900304 (commit) via db7ef87902096d8268bb348ba5821eba344e27ba (commit) via c4a1169ed975c15ee8c29c99d0667388a09c29bf (commit) from ad7e47072b4993d96749f4e8f0f106b409ed77ca (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit cd805ced09c2e203e7e6b874b7b96fb5e86a11b5 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 22 12:04:18 2016 +0100
Tag Core Update 105
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3bc177eec53248b296e13654003f278c65ddc413 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 22 12:02:32 2016 +0100
openssl: Update to 1.0.2i
https://www.openssl.org/news/openssl-1.0.2-notes.html
This release fixes various security flaws:
* OCSP Status Request extension unbounded memory growth (CVE-2016-6304) * SWEET32 Mitigation (CVE-2016-2183) * OOB write in MDC2_Update() (CVE-2016-6303) * Malformed SHA512 ticket DoS (CVE-2016-6302) * OOB write in BN_bn2dec() (CVE-2016-2182) * OOB read in TS_OBJ_print_bio() (CVE-2016-2180) * Pointer arithmetic undefined behaviour (CVE-2016-2177) * Constant time flag not preserved in DSA signing (CVE-2016-2178) * DTLS buffered message DoS (CVE-2016-2179) * DTLS replay protection DoS (CVE-2016-2181) * Certificate message OOB reads (CVE-2016-6306)
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8bbed7a5b6a878dae03d605042b48304f3900304 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 22 10:30:28 2016 +0100
core105: Ship security update for libgcrypt
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit db7ef87902096d8268bb348ba5821eba344e27ba Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Aug 20 12:33:55 2016 +0200
libgcrypt: Update to 1.7.3
Fixes CVE-2016-6313
For details, see: https://lists.gnupg.org/pipermail/gnupg-announce/2016q3/000395.html https://bugzilla.redhat.com/show_bug.cgi?id=1366105
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c4a1169ed975c15ee8c29c99d0667388a09c29bf Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 22 10:28:36 2016 +0100
Start Core Update 105
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/libgcrypt | 2 +- config/rootfiles/core/{104 => 105}/exclude | 0 config/rootfiles/{oldcore/55 => core/105}/filelists/files | 2 +- config/rootfiles/{oldcore/94 => core/105}/filelists/libgcrypt | 0 config/rootfiles/{oldcore/99 => core/105}/filelists/openssl | 0 config/rootfiles/core/{104 => 105}/meta | 0 config/rootfiles/{oldcore/102 => core/105}/update.sh | 5 +---- config/rootfiles/oldcore/{103 => 104}/exclude | 0 config/rootfiles/{core => oldcore}/104/filelists/acl | 0 .../{core => oldcore}/104/filelists/armv5tel/linux-kirkwood | 0 .../rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-multi | 0 config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-rpi | 0 config/rootfiles/{core => oldcore}/104/filelists/curl | 0 config/rootfiles/{core => oldcore}/104/filelists/ddns | 0 config/rootfiles/{core => oldcore}/104/filelists/dnsmasq | 0 config/rootfiles/{core => oldcore}/104/filelists/files | 0 config/rootfiles/{core => oldcore}/104/filelists/i586/acpid | 0 config/rootfiles/{core => oldcore}/104/filelists/i586/linux | 0 config/rootfiles/{core => oldcore}/104/filelists/iputils | 0 config/rootfiles/{core => oldcore}/104/filelists/libarchive | 0 config/rootfiles/{core => oldcore}/104/filelists/libcap | 0 config/rootfiles/{core => oldcore}/104/filelists/ntp | 0 config/rootfiles/{core => oldcore}/104/filelists/openssh | 0 config/rootfiles/{core => oldcore}/104/filelists/pcre | 0 config/rootfiles/{core => oldcore}/104/filelists/popt | 0 config/rootfiles/{core => oldcore}/104/filelists/screen | 0 config/rootfiles/{core => oldcore}/104/filelists/shadow | 0 config/rootfiles/{core => oldcore}/104/filelists/snort | 0 config/rootfiles/{core => oldcore}/104/filelists/wget | 0 config/rootfiles/{core => oldcore}/104/filelists/which | 0 config/rootfiles/{core => oldcore}/104/filelists/x86_64/acpid | 0 config/rootfiles/{core => oldcore}/104/filelists/x86_64/linux | 0 config/rootfiles/oldcore/{99 => 104}/meta | 0 config/rootfiles/{core => oldcore}/104/update.sh | 0 lfs/libgcrypt | 6 +++--- lfs/openssl | 4 ++-- make.sh | 4 ++-- 37 files changed, 10 insertions(+), 13 deletions(-) rename config/rootfiles/core/{104 => 105}/exclude (100%) copy config/rootfiles/{oldcore/55 => core/105}/filelists/files (65%) copy config/rootfiles/{oldcore/94 => core/105}/filelists/libgcrypt (100%) copy config/rootfiles/{oldcore/99 => core/105}/filelists/openssl (100%) rename config/rootfiles/core/{104 => 105}/meta (100%) copy config/rootfiles/{oldcore/102 => core/105}/update.sh (99%) copy config/rootfiles/oldcore/{103 => 104}/exclude (100%) rename config/rootfiles/{core => oldcore}/104/filelists/acl (100%) rename config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/{core => oldcore}/104/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/104/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/104/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/104/filelists/files (100%) rename config/rootfiles/{core => oldcore}/104/filelists/i586/acpid (100%) rename config/rootfiles/{core => oldcore}/104/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/104/filelists/iputils (100%) rename config/rootfiles/{core => oldcore}/104/filelists/libarchive (100%) rename config/rootfiles/{core => oldcore}/104/filelists/libcap (100%) rename config/rootfiles/{core => oldcore}/104/filelists/ntp (100%) rename config/rootfiles/{core => oldcore}/104/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/104/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/104/filelists/popt (100%) rename config/rootfiles/{core => oldcore}/104/filelists/screen (100%) rename config/rootfiles/{core => oldcore}/104/filelists/shadow (100%) rename config/rootfiles/{core => oldcore}/104/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/104/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/104/filelists/which (100%) rename config/rootfiles/{core => oldcore}/104/filelists/x86_64/acpid (100%) rename config/rootfiles/{core => oldcore}/104/filelists/x86_64/linux (100%) copy config/rootfiles/oldcore/{99 => 104}/meta (100%) rename config/rootfiles/{core => oldcore}/104/update.sh (100%)
Difference in files: diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt index 578e0b6..4706343 100644 --- a/config/rootfiles/common/libgcrypt +++ b/config/rootfiles/common/libgcrypt @@ -6,7 +6,7 @@ #usr/lib/libgcrypt.la #usr/lib/libgcrypt.so usr/lib/libgcrypt.so.20 -usr/lib/libgcrypt.so.20.0.4 +usr/lib/libgcrypt.so.20.1.3 #usr/share/aclocal/libgcrypt.m4 #usr/share/info/gcrypt.info #usr/share/man/man1/hmac256.1 diff --git a/config/rootfiles/core/104/exclude b/config/rootfiles/core/104/exclude deleted file mode 100644 index 7ddeae0..0000000 --- a/config/rootfiles/core/104/exclude +++ /dev/null @@ -1,28 +0,0 @@ -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/core/104/filelists/acl b/config/rootfiles/core/104/filelists/acl deleted file mode 120000 index d819f9c..0000000 --- a/config/rootfiles/core/104/filelists/acl +++ /dev/null @@ -1 +0,0 @@ -../../../common/acl \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 7217107..0000000 --- a/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-multi b/config/rootfiles/core/104/filelists/armv5tel/linux-multi deleted file mode 120000 index 204eb4c..0000000 --- a/config/rootfiles/core/104/filelists/armv5tel/linux-multi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-rpi b/config/rootfiles/core/104/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a49..0000000 --- a/config/rootfiles/core/104/filelists/armv5tel/linux-rpi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/curl b/config/rootfiles/core/104/filelists/curl deleted file mode 120000 index 4b84bef..0000000 --- a/config/rootfiles/core/104/filelists/curl +++ /dev/null @@ -1 +0,0 @@ -../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/ddns b/config/rootfiles/core/104/filelists/ddns deleted file mode 120000 index 7395164..0000000 --- a/config/rootfiles/core/104/filelists/ddns +++ /dev/null @@ -1 +0,0 @@ -../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/dnsmasq b/config/rootfiles/core/104/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/104/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/files b/config/rootfiles/core/104/filelists/files deleted file mode 100644 index c172c14..0000000 --- a/config/rootfiles/core/104/filelists/files +++ /dev/null @@ -1,14 +0,0 @@ -etc/system-release -etc/issue -etc/collectd.conf -etc/httpd/conf/global.conf -etc/rc.d/init.d/snort -opt/pakfire/lib/functions.sh -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/cgi-bin/logs.cgi/log.dat -srv/web/ipfire/html/themes/ipfire/include/functions.pl -srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js -var/ipfire/langs -var/ipfire/fwhosts/customservices.default -var/ipfire/updatexlrator/bin/download diff --git a/config/rootfiles/core/104/filelists/i586/acpid b/config/rootfiles/core/104/filelists/i586/acpid deleted file mode 120000 index 21d36ee..0000000 --- a/config/rootfiles/core/104/filelists/i586/acpid +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/i586/linux b/config/rootfiles/core/104/filelists/i586/linux deleted file mode 120000 index 693ec4b..0000000 --- a/config/rootfiles/core/104/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/iputils b/config/rootfiles/core/104/filelists/iputils deleted file mode 120000 index 361c28f..0000000 --- a/config/rootfiles/core/104/filelists/iputils +++ /dev/null @@ -1 +0,0 @@ -../../../common/iputils \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/libarchive b/config/rootfiles/core/104/filelists/libarchive deleted file mode 120000 index 551f1f7..0000000 --- a/config/rootfiles/core/104/filelists/libarchive +++ /dev/null @@ -1 +0,0 @@ -../../../common/libarchive \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/libcap b/config/rootfiles/core/104/filelists/libcap deleted file mode 120000 index ed67d95..0000000 --- a/config/rootfiles/core/104/filelists/libcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/ntp b/config/rootfiles/core/104/filelists/ntp deleted file mode 120000 index 7542d86..0000000 --- a/config/rootfiles/core/104/filelists/ntp +++ /dev/null @@ -1 +0,0 @@ -../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/openssh b/config/rootfiles/core/104/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/104/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/pcre b/config/rootfiles/core/104/filelists/pcre deleted file mode 120000 index b390d9a..0000000 --- a/config/rootfiles/core/104/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/popt b/config/rootfiles/core/104/filelists/popt deleted file mode 120000 index d71a9ab..0000000 --- a/config/rootfiles/core/104/filelists/popt +++ /dev/null @@ -1 +0,0 @@ -../../../common/popt \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/screen b/config/rootfiles/core/104/filelists/screen deleted file mode 120000 index 81008f4..0000000 --- a/config/rootfiles/core/104/filelists/screen +++ /dev/null @@ -1 +0,0 @@ -../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/shadow b/config/rootfiles/core/104/filelists/shadow deleted file mode 120000 index c0824b7..0000000 --- a/config/rootfiles/core/104/filelists/shadow +++ /dev/null @@ -1 +0,0 @@ -../../../common/shadow \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/snort b/config/rootfiles/core/104/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/104/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/wget b/config/rootfiles/core/104/filelists/wget deleted file mode 120000 index fcb57df..0000000 --- a/config/rootfiles/core/104/filelists/wget +++ /dev/null @@ -1 +0,0 @@ -../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/which b/config/rootfiles/core/104/filelists/which deleted file mode 120000 index 9cfc884..0000000 --- a/config/rootfiles/core/104/filelists/which +++ /dev/null @@ -1 +0,0 @@ -../../../common/which \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/x86_64/acpid b/config/rootfiles/core/104/filelists/x86_64/acpid deleted file mode 120000 index 289f8f5..0000000 --- a/config/rootfiles/core/104/filelists/x86_64/acpid +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/acpid \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/x86_64/linux b/config/rootfiles/core/104/filelists/x86_64/linux deleted file mode 120000 index 0615b5b..0000000 --- a/config/rootfiles/core/104/filelists/x86_64/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/104/meta b/config/rootfiles/core/104/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/104/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/104/update.sh b/config/rootfiles/core/104/update.sh deleted file mode 100644 index 0223923..0000000 --- a/config/rootfiles/core/104/update.sh +++ /dev/null @@ -1,254 +0,0 @@ -#!/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 - -function find_device() { - local mountpoint="${1}" - - local root - local dev mp fs flags rest - while read -r dev mp fs flags rest; do - # Skip unwanted entries - [ "${dev}" = "rootfs" ] && continue - - if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then - root="$(basename "${dev}")" - break - fi - done < /proc/mounts - - # Get the actual device from the partition that holds / - while [ -n "${root}" ]; do - if [ -e "/sys/block/${root}" ]; then - echo "${root}" - return 0 - fi - - # Remove last character - root="${root::-1}" - done - - return 1 -} - - -core=104 - -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 - -# -# Do some sanity checks. -case $(uname -r) in - *-ipfire* ) - # Ok. - ;; - * ) - exit_with_error "ERROR cannot update. No IPFire Kernel." 1 - ;; -esac - - -# -# -KVER="xxxKVERxxx" - -# Check diskspace on root -ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $ROOTSPACE -lt 100000 ]; then - exit_with_error "ERROR cannot update because not enough free space on root." 2 - exit 2 -fi - -echo -echo Update Kernel to $KVER ... -# -# Remove old kernel, configs, initrd, modules, dtb's ... -# -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/initramfs-* -rm -rf /boot/vmlinuz-* -rm -rf /boot/uImage-ipfire-* -rm -rf /boot/zImage-ipfire-* -rm -rf /boot/uInit-ipfire-* -rm -rf /boot/dtb-*-ipfire-* -rm -rf /lib/modules - -case "$(uname -m)" in - armv*) - # Backup uEnv.txt if exist - if [ -e /boot/uEnv.txt ]; then - cp -vf /boot/uEnv.txt /boot/uEnv.txt.org - fi - - # work around the u-boot folder detection bug - mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood - mkdir -pv /boot/dtb-$KVER-ipfire-multi - touch /boot/uImage-ipfire-kirkwood - touch /boot/zImage-ipfire-multi - touch /boot/uIinit-ipfire-kirkwood - touch /boot/uIinit-ipfire-multi - ;; -esac - -# Stop services -/etc/init.d/collectd stop -/etc/init.d/snort stop -/etc/init.d/squid stop -/etc/init.d/dnsmasq stop -/etc/init.d/sshd stop -/etc/init.d/ipsec stop -/etc/init.d/apache stop - -# Extract files -tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / - -# Remove some old files -rm -f /bin/groups /lib/libshadow.so.0* - -# update linker config -ldconfig - -# Check diskspace on boot -BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $BOOTSPACE -lt 1000 ]; then - case $(uname -r) in - *-ipfire-kirkwood ) - # Special handling for old kirkwood images. - # (install only kirkwood kernel) - rm -rf /boot/* - # work around the u-boot folder detection bug - mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ - --numeric-owner -C / --wildcards 'boot/*-kirkwood*' - ;; - * ) - /etc/init.d/apache start - exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4 - ;; - esac -fi - -# Update Language cache -/usr/local/bin/update-lang-cache - -# -# Start services -# -/etc/init.d/collectd start -/etc/init.d/apache start -/etc/init.d/dnsmasq start -/etc/init.d/sshd start -/etc/init.d/squid start -/etc/init.d/snort start -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -# Delete old QoS enabled indicator -rm -f /var/ipfire/qos/enable - -# Upadate Kernel version uEnv.txt -if [ -e /boot/uEnv.txt ]; then - sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt -fi - -# call user update script (needed for some arm boards) -if [ -e /boot/pakfire-kernel-update ]; then - /boot/pakfire-kernel-update ${KVER} -fi - -case "$(uname -m)" in - i?86) - # Force (re)install pae kernel if pae is supported - rm -rf /opt/pakfire/db/installed/meta-linux-pae - if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then - ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: WARNING not enough space for pae kernel." - else - echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae - fi - fi - ;; -esac -# -# After pakfire has ended run it again and update the lists and do upgrade -# -echo '#!/bin/bash' > /tmp/pak_update -echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update -echo 'touch /var/run/need_reboot ' >> /tmp/pak_update -# -killall -KILL pak_update -chmod +x /tmp/pak_update -/tmp/pak_update & - -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/core/105/exclude b/config/rootfiles/core/105/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/core/105/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/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/core/105/filelists/files b/config/rootfiles/core/105/filelists/files new file mode 100644 index 0000000..95f6e10 --- /dev/null +++ b/config/rootfiles/core/105/filelists/files @@ -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 index 0000000..2df12a2 --- /dev/null +++ b/config/rootfiles/core/105/filelists/libgcrypt @@ -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 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/105/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/105/meta b/config/rootfiles/core/105/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/105/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/105/update.sh b/config/rootfiles/core/105/update.sh new file mode 100644 index 0000000..3e9f601 --- /dev/null +++ b/config/rootfiles/core/105/update.sh @@ -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 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/oldcore/104/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/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/filelists/acl b/config/rootfiles/oldcore/104/filelists/acl new file mode 120000 index 0000000..d819f9c --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/acl @@ -0,0 +1 @@ +../../../common/acl \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/curl b/config/rootfiles/oldcore/104/filelists/curl new file mode 120000 index 0000000..4b84bef --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/ddns b/config/rootfiles/oldcore/104/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/dnsmasq b/config/rootfiles/oldcore/104/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/files b/config/rootfiles/oldcore/104/filelists/files new file mode 100644 index 0000000..c172c14 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/files @@ -0,0 +1,14 @@ +etc/system-release +etc/issue +etc/collectd.conf +etc/httpd/conf/global.conf +etc/rc.d/init.d/snort +opt/pakfire/lib/functions.sh +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/html/themes/ipfire/include/functions.pl +srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js +var/ipfire/langs +var/ipfire/fwhosts/customservices.default +var/ipfire/updatexlrator/bin/download diff --git a/config/rootfiles/oldcore/104/filelists/i586/acpid b/config/rootfiles/oldcore/104/filelists/i586/acpid new file mode 120000 index 0000000..21d36ee --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/i586/acpid @@ -0,0 +1 @@ +../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/i586/linux b/config/rootfiles/oldcore/104/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/iputils b/config/rootfiles/oldcore/104/filelists/iputils new file mode 120000 index 0000000..361c28f --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/iputils @@ -0,0 +1 @@ +../../../common/iputils \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/libarchive b/config/rootfiles/oldcore/104/filelists/libarchive new file mode 120000 index 0000000..551f1f7 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/libarchive @@ -0,0 +1 @@ +../../../common/libarchive \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/libcap b/config/rootfiles/oldcore/104/filelists/libcap new file mode 120000 index 0000000..ed67d95 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/libcap @@ -0,0 +1 @@ +../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/ntp b/config/rootfiles/oldcore/104/filelists/ntp new file mode 120000 index 0000000..7542d86 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/ntp @@ -0,0 +1 @@ +../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/openssh b/config/rootfiles/oldcore/104/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/pcre b/config/rootfiles/oldcore/104/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/popt b/config/rootfiles/oldcore/104/filelists/popt new file mode 120000 index 0000000..d71a9ab --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/popt @@ -0,0 +1 @@ +../../../common/popt \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/screen b/config/rootfiles/oldcore/104/filelists/screen new file mode 120000 index 0000000..81008f4 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/screen @@ -0,0 +1 @@ +../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/shadow b/config/rootfiles/oldcore/104/filelists/shadow new file mode 120000 index 0000000..c0824b7 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/shadow @@ -0,0 +1 @@ +../../../common/shadow \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/snort b/config/rootfiles/oldcore/104/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/wget b/config/rootfiles/oldcore/104/filelists/wget new file mode 120000 index 0000000..fcb57df --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/which b/config/rootfiles/oldcore/104/filelists/which new file mode 120000 index 0000000..9cfc884 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/which @@ -0,0 +1 @@ +../../../common/which \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/x86_64/acpid b/config/rootfiles/oldcore/104/filelists/x86_64/acpid new file mode 120000 index 0000000..289f8f5 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/x86_64/acpid @@ -0,0 +1 @@ +../../../../common/x86_64/acpid \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/x86_64/linux b/config/rootfiles/oldcore/104/filelists/x86_64/linux new file mode 120000 index 0000000..0615b5b --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/meta b/config/rootfiles/oldcore/104/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/104/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/104/update.sh b/config/rootfiles/oldcore/104/update.sh new file mode 100644 index 0000000..0223923 --- /dev/null +++ b/config/rootfiles/oldcore/104/update.sh @@ -0,0 +1,254 @@ +#!/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 + +function find_device() { + local mountpoint="${1}" + + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + + # Get the actual device from the partition that holds / + while [ -n "${root}" ]; do + if [ -e "/sys/block/${root}" ]; then + echo "${root}" + return 0 + fi + + # Remove last character + root="${root::-1}" + done + + return 1 +} + + +core=104 + +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 + +# +# Do some sanity checks. +case $(uname -r) in + *-ipfire* ) + # Ok. + ;; + * ) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules, dtb's ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/zImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +case "$(uname -m)" in + armv*) + # Backup uEnv.txt if exist + if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org + fi + + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + mkdir -pv /boot/dtb-$KVER-ipfire-multi + touch /boot/uImage-ipfire-kirkwood + touch /boot/zImage-ipfire-multi + touch /boot/uIinit-ipfire-kirkwood + touch /boot/uIinit-ipfire-multi + ;; +esac + +# Stop services +/etc/init.d/collectd stop +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/dnsmasq stop +/etc/init.d/sshd stop +/etc/init.d/ipsec stop +/etc/init.d/apache stop + +# Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# Remove some old files +rm -f /bin/groups /lib/libshadow.so.0* + +# update linker config +ldconfig + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /etc/init.d/apache start + exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4 + ;; + esac +fi + +# Update Language cache +/usr/local/bin/update-lang-cache + +# +# Start services +# +/etc/init.d/collectd start +/etc/init.d/apache start +/etc/init.d/dnsmasq start +/etc/init.d/sshd start +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# Delete old QoS enabled indicator +rm -f /var/ipfire/qos/enable + +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +case "$(uname -m)" in + i?86) + # Force (re)install pae kernel if pae is supported + rm -rf /opt/pakfire/db/installed/meta-linux-pae + if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + fi + fi + ;; +esac +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +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/lfs/libgcrypt b/lfs/libgcrypt index 98cf787..5a06032 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 1.6.4 +VER = 1.7.3
THISAPP = libgcrypt-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4c13c5fa43147866f993d73ee62af176 +$(DL_FILE)_MD5 = c869e542cc13a1c28d8055487bf7f5c4
install : $(TARGET)
diff --git a/lfs/openssl b/lfs/openssl index 0a0b2cf..d0ed4d3 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -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 1c832d0..b6cb506 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="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
hooks/post-receive -- IPFire 2.x development tree