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, next has been updated via 9a6be065359cc1166af4caf61c0e3e1419cbc2d2 (commit) from 9f19223e4e4db2b120014d562367ce697011d3f8 (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 9a6be065359cc1166af4caf61c0e3e1419cbc2d2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Apr 6 19:57:46 2016 +0200

core101: start update.

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

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/{100 => 101}/exclude | 0 .../{oldcore/98 => core/101}/filelists/files | 0 config/rootfiles/core/101/filelists/i586/dmidecode | 1 + .../{oldcore/94 => core/101}/filelists/pcre | 0 config/rootfiles/core/{100 => 101}/filelists/squid | 0 .../rootfiles/core/101/filelists/x86_64/dmidecode | 1 + config/rootfiles/core/{99 => 101}/meta | 0 .../rootfiles/{oldcore/93 => core/101}/update.sh | 27 +++++++++++++++------- config/rootfiles/{core => oldcore}/100/exclude | 0 .../100/filelists/armv5tel/binutils | 0 .../{core => oldcore}/100/filelists/armv5tel/gcc | 0 .../{core => oldcore}/100/filelists/armv5tel/glibc | 0 .../100/filelists/armv5tel/linux-kirkwood | 0 .../100/filelists/armv5tel/linux-multi | 0 .../100/filelists/armv5tel/linux-rpi | 0 .../100/filelists/ath10k-firmware | 0 .../rootfiles/{core => oldcore}/100/filelists/bind | 0 .../{core => oldcore}/100/filelists/diffutils | 0 .../{core => oldcore}/100/filelists/dnsmasq | 0 .../{core => oldcore}/100/filelists/files | 0 .../rootfiles/{core => oldcore}/100/filelists/grep | 0 .../{core => oldcore}/100/filelists/i586/binutils | 0 .../{core => oldcore}/100/filelists/i586/gcc | 0 .../{core => oldcore}/100/filelists/i586/glibc | 0 .../{core => oldcore}/100/filelists/i586/grub | 0 .../{core => oldcore}/100/filelists/i586/linux | 0 .../100/filelists/i586/linux-initrd | 0 .../99 => oldcore/100}/filelists/i586/openssl-sse2 | 0 .../{core => oldcore}/100/filelists/libmpc | 0 .../rootfiles/{core => oldcore}/100/filelists/lua | 0 .../100/filelists/mt7601u-firmware | 0 .../{core => oldcore}/100/filelists/ncurses | 0 .../rootfiles/{core => oldcore}/100/filelists/ntp | 0 .../{core/99 => oldcore/100}/filelists/openssh | 0 .../{core/99 => oldcore/100}/filelists/openssl | 0 .../{core => oldcore}/100/filelists/openvpn | 0 .../rootfiles/{core => oldcore}/100/filelists/sed | 0 .../rootfiles/oldcore/{94 => 100}/filelists/squid | 0 .../{core => oldcore}/100/filelists/tzdata | 0 .../100/filelists/x86_64/binutils | 0 .../{core => oldcore}/100/filelists/x86_64/gcc | 0 .../{core => oldcore}/100/filelists/x86_64/glibc | 0 .../{core => oldcore}/100/filelists/x86_64/grub | 0 .../{core => oldcore}/100/filelists/x86_64/linux | 0 .../100/filelists/x86_64/linux-initrd | 0 .../rootfiles/{core => oldcore}/100/filelists/xz | 0 config/rootfiles/{core => oldcore}/100/meta | 0 config/rootfiles/{core => oldcore}/100/update.sh | 0 config/rootfiles/{core => oldcore}/99/exclude | 0 .../rootfiles/{core => oldcore}/99/filelists/files | 0 .../100 => oldcore/99}/filelists/i586/openssl-sse2 | 0 .../{core/100 => oldcore/99}/filelists/openssh | 0 .../{core/100 => oldcore/99}/filelists/openssl | 0 config/rootfiles/oldcore/{98 => 99}/meta | 0 config/rootfiles/{core => oldcore}/99/update.sh | 0 make.sh | 2 +- 56 files changed, 22 insertions(+), 9 deletions(-) copy config/rootfiles/core/{100 => 101}/exclude (100%) copy config/rootfiles/{oldcore/98 => core/101}/filelists/files (100%) create mode 120000 config/rootfiles/core/101/filelists/i586/dmidecode copy config/rootfiles/{oldcore/94 => core/101}/filelists/pcre (100%) rename config/rootfiles/core/{100 => 101}/filelists/squid (100%) create mode 120000 config/rootfiles/core/101/filelists/x86_64/dmidecode rename config/rootfiles/core/{99 => 101}/meta (100%) copy config/rootfiles/{oldcore/93 => core/101}/update.sh (86%) rename config/rootfiles/{core => oldcore}/100/exclude (100%) rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/binutils (100%) rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/gcc (100%) rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/glibc (100%) rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/{core => oldcore}/100/filelists/ath10k-firmware (100%) rename config/rootfiles/{core => oldcore}/100/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/100/filelists/diffutils (100%) rename config/rootfiles/{core => oldcore}/100/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/100/filelists/files (100%) rename config/rootfiles/{core => oldcore}/100/filelists/grep (100%) rename config/rootfiles/{core => oldcore}/100/filelists/i586/binutils (100%) rename config/rootfiles/{core => oldcore}/100/filelists/i586/gcc (100%) rename config/rootfiles/{core => oldcore}/100/filelists/i586/glibc (100%) rename config/rootfiles/{core => oldcore}/100/filelists/i586/grub (100%) rename config/rootfiles/{core => oldcore}/100/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/100/filelists/i586/linux-initrd (100%) rename config/rootfiles/{core/99 => oldcore/100}/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/100/filelists/libmpc (100%) rename config/rootfiles/{core => oldcore}/100/filelists/lua (100%) rename config/rootfiles/{core => oldcore}/100/filelists/mt7601u-firmware (100%) rename config/rootfiles/{core => oldcore}/100/filelists/ncurses (100%) rename config/rootfiles/{core => oldcore}/100/filelists/ntp (100%) rename config/rootfiles/{core/99 => oldcore/100}/filelists/openssh (100%) rename config/rootfiles/{core/99 => oldcore/100}/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/100/filelists/openvpn (100%) rename config/rootfiles/{core => oldcore}/100/filelists/sed (100%) copy config/rootfiles/oldcore/{94 => 100}/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/100/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/binutils (100%) rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/gcc (100%) rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/grub (100%) rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/linux (100%) rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/100/filelists/xz (100%) rename config/rootfiles/{core => oldcore}/100/meta (100%) rename config/rootfiles/{core => oldcore}/100/update.sh (100%) rename config/rootfiles/{core => oldcore}/99/exclude (100%) rename config/rootfiles/{core => oldcore}/99/filelists/files (100%) rename config/rootfiles/{core/100 => oldcore/99}/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core/100 => oldcore/99}/filelists/openssh (100%) rename config/rootfiles/{core/100 => oldcore/99}/filelists/openssl (100%) copy config/rootfiles/oldcore/{98 => 99}/meta (100%) rename config/rootfiles/{core => oldcore}/99/update.sh (100%)

Difference in files: diff --git a/config/rootfiles/core/100/exclude b/config/rootfiles/core/100/exclude deleted file mode 100644 index 8e446ce..0000000 --- a/config/rootfiles/core/100/exclude +++ /dev/null @@ -1,26 +0,0 @@ -boot/config.txt -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/100/filelists/armv5tel/binutils b/config/rootfiles/core/100/filelists/armv5tel/binutils deleted file mode 120000 index ac971f9..0000000 --- a/config/rootfiles/core/100/filelists/armv5tel/binutils +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/binutils \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/armv5tel/gcc b/config/rootfiles/core/100/filelists/armv5tel/gcc deleted file mode 120000 index 84f7b93..0000000 --- a/config/rootfiles/core/100/filelists/armv5tel/gcc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/armv5tel/glibc b/config/rootfiles/core/100/filelists/armv5tel/glibc deleted file mode 120000 index 4c70d72..0000000 --- a/config/rootfiles/core/100/filelists/armv5tel/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/100/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 7217107..0000000 --- a/config/rootfiles/core/100/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/100/filelists/armv5tel/linux-multi b/config/rootfiles/core/100/filelists/armv5tel/linux-multi deleted file mode 120000 index 204eb4c..0000000 --- a/config/rootfiles/core/100/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/100/filelists/armv5tel/linux-rpi b/config/rootfiles/core/100/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a49..0000000 --- a/config/rootfiles/core/100/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/100/filelists/ath10k-firmware b/config/rootfiles/core/100/filelists/ath10k-firmware deleted file mode 120000 index e7e87c2..0000000 --- a/config/rootfiles/core/100/filelists/ath10k-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../common/ath10k-firmware \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/bind b/config/rootfiles/core/100/filelists/bind deleted file mode 120000 index 48a0eba..0000000 --- a/config/rootfiles/core/100/filelists/bind +++ /dev/null @@ -1 +0,0 @@ -../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/diffutils b/config/rootfiles/core/100/filelists/diffutils deleted file mode 120000 index a5c02f3..0000000 --- a/config/rootfiles/core/100/filelists/diffutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/diffutils \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/dnsmasq b/config/rootfiles/core/100/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/100/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/files b/config/rootfiles/core/100/filelists/files deleted file mode 100644 index c75a26d..0000000 --- a/config/rootfiles/core/100/filelists/files +++ /dev/null @@ -1,31 +0,0 @@ -etc/system-release -etc/issue -etc/dracut.conf -etc/ppp/ip-up -etc/rc.d/init.d/firewall -etc/rc.d/init.d/functions -etc/rc.d/init.d/networking/dhcpcd.exe -etc/rc.d/init.d/ntp -etc/modprobe.d/nf_conntrack.conf -lib/udev/rules.d/60-net.rules -opt/pakfire/etc/pakfire.conf -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/firewalllogport.dat -srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat -srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat -srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat -srv/web/ipfire/cgi-bin/optionsfw.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/qos.cgi -srv/web/ipfire/cgi-bin/webaccess.cgi -usr/bin/pgrep -usr/local/bin/backupiso -usr/local/bin/qosctrl -usr/local/bin/timectrl -usr/local/bin/wirelessctrl -usr/sbin/firewall-policy -usr/sbin/setup -var/ipfire/dhcpc/dhcpcd-hooks/10-mtu -var/ipfire/langs diff --git a/config/rootfiles/core/100/filelists/grep b/config/rootfiles/core/100/filelists/grep deleted file mode 120000 index ab5ef8b..0000000 --- a/config/rootfiles/core/100/filelists/grep +++ /dev/null @@ -1 +0,0 @@ -../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/binutils b/config/rootfiles/core/100/filelists/i586/binutils deleted file mode 120000 index 78695d7..0000000 --- a/config/rootfiles/core/100/filelists/i586/binutils +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/binutils \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/gcc b/config/rootfiles/core/100/filelists/i586/gcc deleted file mode 120000 index ba328e3..0000000 --- a/config/rootfiles/core/100/filelists/i586/gcc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/glibc b/config/rootfiles/core/100/filelists/i586/glibc deleted file mode 120000 index 943021f..0000000 --- a/config/rootfiles/core/100/filelists/i586/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/grub b/config/rootfiles/core/100/filelists/i586/grub deleted file mode 120000 index feb236a..0000000 --- a/config/rootfiles/core/100/filelists/i586/grub +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/linux b/config/rootfiles/core/100/filelists/i586/linux deleted file mode 120000 index 693ec4b..0000000 --- a/config/rootfiles/core/100/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/linux-initrd b/config/rootfiles/core/100/filelists/i586/linux-initrd deleted file mode 120000 index 32a03e6..0000000 --- a/config/rootfiles/core/100/filelists/i586/linux-initrd +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/openssl-sse2 b/config/rootfiles/core/100/filelists/i586/openssl-sse2 deleted file mode 120000 index f424713..0000000 --- a/config/rootfiles/core/100/filelists/i586/openssl-sse2 +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/libmpc b/config/rootfiles/core/100/filelists/libmpc deleted file mode 120000 index 88840fc..0000000 --- a/config/rootfiles/core/100/filelists/libmpc +++ /dev/null @@ -1 +0,0 @@ -../../../common/libmpc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/lua b/config/rootfiles/core/100/filelists/lua deleted file mode 120000 index 951f661..0000000 --- a/config/rootfiles/core/100/filelists/lua +++ /dev/null @@ -1 +0,0 @@ -../../../common/lua \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/mt7601u-firmware b/config/rootfiles/core/100/filelists/mt7601u-firmware deleted file mode 120000 index 300ac04..0000000 --- a/config/rootfiles/core/100/filelists/mt7601u-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../common/mt7601u-firmware \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/ncurses b/config/rootfiles/core/100/filelists/ncurses deleted file mode 120000 index 512faef..0000000 --- a/config/rootfiles/core/100/filelists/ncurses +++ /dev/null @@ -1 +0,0 @@ -../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/ntp b/config/rootfiles/core/100/filelists/ntp deleted file mode 120000 index 7542d86..0000000 --- a/config/rootfiles/core/100/filelists/ntp +++ /dev/null @@ -1 +0,0 @@ -../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/openssh b/config/rootfiles/core/100/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/100/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/openssl b/config/rootfiles/core/100/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/100/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/openvpn b/config/rootfiles/core/100/filelists/openvpn deleted file mode 120000 index 493f3f7..0000000 --- a/config/rootfiles/core/100/filelists/openvpn +++ /dev/null @@ -1 +0,0 @@ -../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/sed b/config/rootfiles/core/100/filelists/sed deleted file mode 120000 index fc5f5c6..0000000 --- a/config/rootfiles/core/100/filelists/sed +++ /dev/null @@ -1 +0,0 @@ -../../../common/sed \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/squid b/config/rootfiles/core/100/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/100/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/tzdata b/config/rootfiles/core/100/filelists/tzdata deleted file mode 120000 index 5a6e325..0000000 --- a/config/rootfiles/core/100/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/binutils b/config/rootfiles/core/100/filelists/x86_64/binutils deleted file mode 120000 index 7d0fda5..0000000 --- a/config/rootfiles/core/100/filelists/x86_64/binutils +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/binutils \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/gcc b/config/rootfiles/core/100/filelists/x86_64/gcc deleted file mode 120000 index d1616d3..0000000 --- a/config/rootfiles/core/100/filelists/x86_64/gcc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/gcc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/glibc b/config/rootfiles/core/100/filelists/x86_64/glibc deleted file mode 120000 index 1119099..0000000 --- a/config/rootfiles/core/100/filelists/x86_64/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/glibc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/grub b/config/rootfiles/core/100/filelists/x86_64/grub deleted file mode 120000 index 78d3bd7..0000000 --- a/config/rootfiles/core/100/filelists/x86_64/grub +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/grub \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/linux b/config/rootfiles/core/100/filelists/x86_64/linux deleted file mode 120000 index 0615b5b..0000000 --- a/config/rootfiles/core/100/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/100/filelists/x86_64/linux-initrd b/config/rootfiles/core/100/filelists/x86_64/linux-initrd deleted file mode 120000 index 1b9fff7..0000000 --- a/config/rootfiles/core/100/filelists/x86_64/linux-initrd +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/xz b/config/rootfiles/core/100/filelists/xz deleted file mode 120000 index 734e926..0000000 --- a/config/rootfiles/core/100/filelists/xz +++ /dev/null @@ -1 +0,0 @@ -../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/100/meta b/config/rootfiles/core/100/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/100/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/100/update.sh b/config/rootfiles/core/100/update.sh deleted file mode 100644 index 931930a..0000000 --- a/config/rootfiles/core/100/update.sh +++ /dev/null @@ -1,260 +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=100 - -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/snort stop -/etc/init.d/squid stop -/etc/init.d/dnsmasq stop -/etc/init.d/ipsec stop -/etc/init.d/ntp stop -/etc/init.d/apache stop - - -# Extract files -tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / - -# 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 - -# restart init because the glibc was updated. -telinit u - -# Fix hardening flags in grub -paxctl -mpexs /usr/bin/grub-script-check - -# Regenerate IPsec configuration -sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi - -# Update Language cache -/usr/local/bin/update-lang-cache - -# -# Start services -# -/etc/init.d/apache start -/etc/init.d/ntp start -/etc/init.d/dnsmasq start -/etc/init.d/sshd restart -/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/101/exclude b/config/rootfiles/core/101/exclude new file mode 100644 index 0000000..8e446ce --- /dev/null +++ b/config/rootfiles/core/101/exclude @@ -0,0 +1,26 @@ +boot/config.txt +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/101/filelists/files b/config/rootfiles/core/101/filelists/files new file mode 100644 index 0000000..409e5fe --- /dev/null +++ b/config/rootfiles/core/101/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/101/filelists/i586/dmidecode b/config/rootfiles/core/101/filelists/i586/dmidecode new file mode 120000 index 0000000..1add99b --- /dev/null +++ b/config/rootfiles/core/101/filelists/i586/dmidecode @@ -0,0 +1 @@ +../../../../common/i586/dmidecode \ No newline at end of file diff --git a/config/rootfiles/core/101/filelists/pcre b/config/rootfiles/core/101/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/core/101/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/101/filelists/squid b/config/rootfiles/core/101/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/101/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/101/filelists/x86_64/dmidecode b/config/rootfiles/core/101/filelists/x86_64/dmidecode new file mode 120000 index 0000000..88f5f0a --- /dev/null +++ b/config/rootfiles/core/101/filelists/x86_64/dmidecode @@ -0,0 +1 @@ +../../../../common/x86_64/dmidecode \ No newline at end of file diff --git a/config/rootfiles/core/101/meta b/config/rootfiles/core/101/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/101/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/101/update.sh b/config/rootfiles/core/101/update.sh new file mode 100644 index 0000000..f448474 --- /dev/null +++ b/config/rootfiles/core/101/update.sh @@ -0,0 +1,76 @@ +#!/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=101 + +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 +/etc/init.d/squid stop + +# Extract files +extract_files + +# update linker config +ldconfig + + +# Update Language cache +#/usr/local/bin/update-lang-cache + +# +# Start services +# +/etc/init.d/squid start + +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/99/exclude b/config/rootfiles/core/99/exclude deleted file mode 100644 index d87f175..0000000 --- a/config/rootfiles/core/99/exclude +++ /dev/null @@ -1,25 +0,0 @@ -boot/config.txt -etc/alternatives -etc/collectd.custom -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/99/filelists/files b/config/rootfiles/core/99/filelists/files deleted file mode 100644 index 76b5b4e..0000000 --- a/config/rootfiles/core/99/filelists/files +++ /dev/null @@ -1,3 +0,0 @@ -etc/system-release -etc/issue -var/ipfire/backup/include diff --git a/config/rootfiles/core/99/filelists/i586/openssl-sse2 b/config/rootfiles/core/99/filelists/i586/openssl-sse2 deleted file mode 120000 index f424713..0000000 --- a/config/rootfiles/core/99/filelists/i586/openssl-sse2 +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/99/filelists/openssh b/config/rootfiles/core/99/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/99/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/99/filelists/openssl b/config/rootfiles/core/99/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/99/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/99/meta b/config/rootfiles/core/99/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/99/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/99/update.sh b/config/rootfiles/core/99/update.sh deleted file mode 100644 index b57d0a7..0000000 --- a/config/rootfiles/core/99/update.sh +++ /dev/null @@ -1,62 +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 - -# Remove old core updates from pakfire cache to save space... -core=99 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# Stop services - -# remove slogin which is not included in new OpenSSH -rm /usr/bin/slogin - -# Extract files -extract_files - -# Update Language cache -# /usr/local/bin/update-lang-cache - -# Start services -/etc/init.d/sshd restart -/etc/init.d/apache restart - -# 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/100/exclude b/config/rootfiles/oldcore/100/exclude new file mode 100644 index 0000000..8e446ce --- /dev/null +++ b/config/rootfiles/oldcore/100/exclude @@ -0,0 +1,26 @@ +boot/config.txt +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/100/filelists/armv5tel/binutils b/config/rootfiles/oldcore/100/filelists/armv5tel/binutils new file mode 120000 index 0000000..ac971f9 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/armv5tel/binutils @@ -0,0 +1 @@ +../../../../common/armv5tel/binutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/gcc b/config/rootfiles/oldcore/100/filelists/armv5tel/gcc new file mode 120000 index 0000000..84f7b93 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/armv5tel/gcc @@ -0,0 +1 @@ +../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/glibc b/config/rootfiles/oldcore/100/filelists/armv5tel/glibc new file mode 120000 index 0000000..4c70d72 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/ath10k-firmware b/config/rootfiles/oldcore/100/filelists/ath10k-firmware new file mode 120000 index 0000000..e7e87c2 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/ath10k-firmware @@ -0,0 +1 @@ +../../../common/ath10k-firmware \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/bind b/config/rootfiles/oldcore/100/filelists/bind new file mode 120000 index 0000000..48a0eba --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/diffutils b/config/rootfiles/oldcore/100/filelists/diffutils new file mode 120000 index 0000000..a5c02f3 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/diffutils @@ -0,0 +1 @@ +../../../common/diffutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/dnsmasq b/config/rootfiles/oldcore/100/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/files b/config/rootfiles/oldcore/100/filelists/files new file mode 100644 index 0000000..c75a26d --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/files @@ -0,0 +1,31 @@ +etc/system-release +etc/issue +etc/dracut.conf +etc/ppp/ip-up +etc/rc.d/init.d/firewall +etc/rc.d/init.d/functions +etc/rc.d/init.d/networking/dhcpcd.exe +etc/rc.d/init.d/ntp +etc/modprobe.d/nf_conntrack.conf +lib/udev/rules.d/60-net.rules +opt/pakfire/etc/pakfire.conf +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/firewalllogport.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat +srv/web/ipfire/cgi-bin/optionsfw.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/qos.cgi +srv/web/ipfire/cgi-bin/webaccess.cgi +usr/bin/pgrep +usr/local/bin/backupiso +usr/local/bin/qosctrl +usr/local/bin/timectrl +usr/local/bin/wirelessctrl +usr/sbin/firewall-policy +usr/sbin/setup +var/ipfire/dhcpc/dhcpcd-hooks/10-mtu +var/ipfire/langs diff --git a/config/rootfiles/oldcore/100/filelists/grep b/config/rootfiles/oldcore/100/filelists/grep new file mode 120000 index 0000000..ab5ef8b --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/grep @@ -0,0 +1 @@ +../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/i586/binutils b/config/rootfiles/oldcore/100/filelists/i586/binutils new file mode 120000 index 0000000..78695d7 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/i586/binutils @@ -0,0 +1 @@ +../../../../common/i586/binutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/i586/gcc b/config/rootfiles/oldcore/100/filelists/i586/gcc new file mode 120000 index 0000000..ba328e3 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/i586/gcc @@ -0,0 +1 @@ +../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/i586/glibc b/config/rootfiles/oldcore/100/filelists/i586/glibc new file mode 120000 index 0000000..943021f --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/i586/grub b/config/rootfiles/oldcore/100/filelists/i586/grub new file mode 120000 index 0000000..feb236a --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/i586/grub @@ -0,0 +1 @@ +../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/i586/linux b/config/rootfiles/oldcore/100/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/i586/linux-initrd b/config/rootfiles/oldcore/100/filelists/i586/linux-initrd new file mode 120000 index 0000000..32a03e6 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/100/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/libmpc b/config/rootfiles/oldcore/100/filelists/libmpc new file mode 120000 index 0000000..88840fc --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/libmpc @@ -0,0 +1 @@ +../../../common/libmpc \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/lua b/config/rootfiles/oldcore/100/filelists/lua new file mode 120000 index 0000000..951f661 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/lua @@ -0,0 +1 @@ +../../../common/lua \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/mt7601u-firmware b/config/rootfiles/oldcore/100/filelists/mt7601u-firmware new file mode 120000 index 0000000..300ac04 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/mt7601u-firmware @@ -0,0 +1 @@ +../../../common/mt7601u-firmware \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/ncurses b/config/rootfiles/oldcore/100/filelists/ncurses new file mode 120000 index 0000000..512faef --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/ncurses @@ -0,0 +1 @@ +../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/ntp b/config/rootfiles/oldcore/100/filelists/ntp new file mode 120000 index 0000000..7542d86 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/ntp @@ -0,0 +1 @@ +../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/openssh b/config/rootfiles/oldcore/100/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/openssl b/config/rootfiles/oldcore/100/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/openvpn b/config/rootfiles/oldcore/100/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/sed b/config/rootfiles/oldcore/100/filelists/sed new file mode 120000 index 0000000..fc5f5c6 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/sed @@ -0,0 +1 @@ +../../../common/sed \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/squid b/config/rootfiles/oldcore/100/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/tzdata b/config/rootfiles/oldcore/100/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/binutils b/config/rootfiles/oldcore/100/filelists/x86_64/binutils new file mode 120000 index 0000000..7d0fda5 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/x86_64/binutils @@ -0,0 +1 @@ +../../../../common/x86_64/binutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/gcc b/config/rootfiles/oldcore/100/filelists/x86_64/gcc new file mode 120000 index 0000000..d1616d3 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/x86_64/gcc @@ -0,0 +1 @@ +../../../../common/x86_64/gcc \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/glibc b/config/rootfiles/oldcore/100/filelists/x86_64/glibc new file mode 120000 index 0000000..1119099 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/x86_64/glibc @@ -0,0 +1 @@ +../../../../common/x86_64/glibc \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/grub b/config/rootfiles/oldcore/100/filelists/x86_64/grub new file mode 120000 index 0000000..78d3bd7 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/x86_64/grub @@ -0,0 +1 @@ +../../../../common/x86_64/grub \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/linux b/config/rootfiles/oldcore/100/filelists/x86_64/linux new file mode 120000 index 0000000..0615b5b --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/100/filelists/x86_64/linux-initrd new file mode 120000 index 0000000..1b9fff7 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/x86_64/linux-initrd @@ -0,0 +1 @@ +../../../../common/x86_64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/xz b/config/rootfiles/oldcore/100/filelists/xz new file mode 120000 index 0000000..734e926 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/meta b/config/rootfiles/oldcore/100/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/100/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/100/update.sh b/config/rootfiles/oldcore/100/update.sh new file mode 100644 index 0000000..931930a --- /dev/null +++ b/config/rootfiles/oldcore/100/update.sh @@ -0,0 +1,260 @@ +#!/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=100 + +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/snort stop +/etc/init.d/squid stop +/etc/init.d/dnsmasq stop +/etc/init.d/ipsec stop +/etc/init.d/ntp stop +/etc/init.d/apache stop + + +# Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# 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 + +# restart init because the glibc was updated. +telinit u + +# Fix hardening flags in grub +paxctl -mpexs /usr/bin/grub-script-check + +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi + +# Update Language cache +/usr/local/bin/update-lang-cache + +# +# Start services +# +/etc/init.d/apache start +/etc/init.d/ntp start +/etc/init.d/dnsmasq start +/etc/init.d/sshd restart +/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/oldcore/99/exclude b/config/rootfiles/oldcore/99/exclude new file mode 100644 index 0000000..d87f175 --- /dev/null +++ b/config/rootfiles/oldcore/99/exclude @@ -0,0 +1,25 @@ +boot/config.txt +etc/alternatives +etc/collectd.custom +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/99/filelists/files b/config/rootfiles/oldcore/99/filelists/files new file mode 100644 index 0000000..76b5b4e --- /dev/null +++ b/config/rootfiles/oldcore/99/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +var/ipfire/backup/include diff --git a/config/rootfiles/oldcore/99/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/99/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/oldcore/99/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/99/filelists/openssh b/config/rootfiles/oldcore/99/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/99/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/99/filelists/openssl b/config/rootfiles/oldcore/99/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/99/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/99/meta b/config/rootfiles/oldcore/99/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/99/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/99/update.sh b/config/rootfiles/oldcore/99/update.sh new file mode 100644 index 0000000..b57d0a7 --- /dev/null +++ b/config/rootfiles/oldcore/99/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) 2016 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=99 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# remove slogin which is not included in new OpenSSH +rm /usr/bin/slogin + +# Extract files +extract_files + +# Update Language cache +# /usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/sshd restart +/etc/init.d/apache restart + +# 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/make.sh b/make.sh index d954b62..22ff820 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="100" # Core Level (Filename) +CORE="101" # Core Level (Filename) PAKFIRE_CORE="100" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan

hooks/post-receive -- IPFire 2.x development tree