From: Michael Tremer Date: Thu, 18 May 2017 10:47:07 +0000 (+0100) Subject: Start Core Update 111 X-Git-Tag: v2.19-core111~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0ab2f880e9dd8809b327b9245fb36cd7cb9b67e;p=people%2Fstevee%2Fipfire-2.x.git Start Core Update 111 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/111/exclude b/config/rootfiles/core/111/exclude new file mode 100644 index 0000000000..d6fd053b6e --- /dev/null +++ b/config/rootfiles/core/111/exclude @@ -0,0 +1,30 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/111/filelists/armv5tel/gcc b/config/rootfiles/core/111/filelists/armv5tel/gcc new file mode 120000 index 0000000000..84f7b9344e --- /dev/null +++ b/config/rootfiles/core/111/filelists/armv5tel/gcc @@ -0,0 +1 @@ +../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/armv5tel/gmp b/config/rootfiles/core/111/filelists/armv5tel/gmp new file mode 120000 index 0000000000..2bdf30dacf --- /dev/null +++ b/config/rootfiles/core/111/filelists/armv5tel/gmp @@ -0,0 +1 @@ +../../../../common/armv5tel/gmp \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/bind b/config/rootfiles/core/111/filelists/bind new file mode 120000 index 0000000000..48a0ebaefd --- /dev/null +++ b/config/rootfiles/core/111/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/coreutils b/config/rootfiles/core/111/filelists/coreutils new file mode 120000 index 0000000000..7351ed2cf5 --- /dev/null +++ b/config/rootfiles/core/111/filelists/coreutils @@ -0,0 +1 @@ +../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/dhcp b/config/rootfiles/core/111/filelists/dhcp new file mode 120000 index 0000000000..32d8da443d --- /dev/null +++ b/config/rootfiles/core/111/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/file b/config/rootfiles/core/111/filelists/file new file mode 120000 index 0000000000..0c60e43aa5 --- /dev/null +++ b/config/rootfiles/core/111/filelists/file @@ -0,0 +1 @@ +../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/files b/config/rootfiles/core/111/filelists/files new file mode 100644 index 0000000000..dbe65e2f0d --- /dev/null +++ b/config/rootfiles/core/111/filelists/files @@ -0,0 +1,22 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/wlanclient +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/ipinfo.cgi +srv/web/ipfire/cgi-bin/iptables.cgi +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/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/wirelessclient.cgi +srv/web/ipfire/html/images/back.png +usr/local/bin/getipstat +usr/local/bin/ipsecctrl +var/ipfire/langs +var/ipfire/graphs.pl +var/ipfire/network-functions.pl +var/ipfire/qos/bin/makeqosscripts.pl diff --git a/config/rootfiles/core/111/filelists/gzip b/config/rootfiles/core/111/filelists/gzip new file mode 120000 index 0000000000..aebcccd874 --- /dev/null +++ b/config/rootfiles/core/111/filelists/gzip @@ -0,0 +1 @@ +../../../common/gzip \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/i586/gcc b/config/rootfiles/core/111/filelists/i586/gcc new file mode 120000 index 0000000000..ba328e3b68 --- /dev/null +++ b/config/rootfiles/core/111/filelists/i586/gcc @@ -0,0 +1 @@ +../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/i586/gmp b/config/rootfiles/core/111/filelists/i586/gmp new file mode 120000 index 0000000000..52a09cd0ba --- /dev/null +++ b/config/rootfiles/core/111/filelists/i586/gmp @@ -0,0 +1 @@ +../../../../common/i586/gmp \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/i586/strongswan-padlock b/config/rootfiles/core/111/filelists/i586/strongswan-padlock new file mode 120000 index 0000000000..2412824fb2 --- /dev/null +++ b/config/rootfiles/core/111/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/libevent2 b/config/rootfiles/core/111/filelists/libevent2 new file mode 120000 index 0000000000..42edc99c3a --- /dev/null +++ b/config/rootfiles/core/111/filelists/libevent2 @@ -0,0 +1 @@ +../../../common/libevent2 \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/libevent2-compat b/config/rootfiles/core/111/filelists/libevent2-compat new file mode 120000 index 0000000000..4ea809b9b5 --- /dev/null +++ b/config/rootfiles/core/111/filelists/libevent2-compat @@ -0,0 +1 @@ +../../../common/libevent2-compat \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/logrotate b/config/rootfiles/core/111/filelists/logrotate new file mode 120000 index 0000000000..bc192c05db --- /dev/null +++ b/config/rootfiles/core/111/filelists/logrotate @@ -0,0 +1 @@ +../../../common/logrotate \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/logwatch b/config/rootfiles/core/111/filelists/logwatch new file mode 120000 index 0000000000..f14eabda99 --- /dev/null +++ b/config/rootfiles/core/111/filelists/logwatch @@ -0,0 +1 @@ +../../../common/logwatch \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/mpfr b/config/rootfiles/core/111/filelists/mpfr new file mode 120000 index 0000000000..c8468bf42f --- /dev/null +++ b/config/rootfiles/core/111/filelists/mpfr @@ -0,0 +1 @@ +../../../common/mpfr \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/pcre b/config/rootfiles/core/111/filelists/pcre new file mode 120000 index 0000000000..b390d9a367 --- /dev/null +++ b/config/rootfiles/core/111/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/php b/config/rootfiles/core/111/filelists/php new file mode 120000 index 0000000000..1ae48d7a71 --- /dev/null +++ b/config/rootfiles/core/111/filelists/php @@ -0,0 +1 @@ +../../../common/php \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/rrdtool b/config/rootfiles/core/111/filelists/rrdtool new file mode 120000 index 0000000000..7a82e414b6 --- /dev/null +++ b/config/rootfiles/core/111/filelists/rrdtool @@ -0,0 +1 @@ +../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/strongswan b/config/rootfiles/core/111/filelists/strongswan new file mode 120000 index 0000000000..90c727e265 --- /dev/null +++ b/config/rootfiles/core/111/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/unbound b/config/rootfiles/core/111/filelists/unbound new file mode 120000 index 0000000000..66adf09242 --- /dev/null +++ b/config/rootfiles/core/111/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/vnstat b/config/rootfiles/core/111/filelists/vnstat new file mode 120000 index 0000000000..2e2e6100bf --- /dev/null +++ b/config/rootfiles/core/111/filelists/vnstat @@ -0,0 +1 @@ +../../../common/vnstat \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/x86_64/gcc b/config/rootfiles/core/111/filelists/x86_64/gcc new file mode 120000 index 0000000000..d1616d377c --- /dev/null +++ b/config/rootfiles/core/111/filelists/x86_64/gcc @@ -0,0 +1 @@ +../../../../common/x86_64/gcc \ No newline at end of file diff --git a/config/rootfiles/core/111/filelists/x86_64/gmp b/config/rootfiles/core/111/filelists/x86_64/gmp new file mode 120000 index 0000000000..7c59c60c68 --- /dev/null +++ b/config/rootfiles/core/111/filelists/x86_64/gmp @@ -0,0 +1 @@ +../../../../common/x86_64/gmp \ No newline at end of file diff --git a/config/rootfiles/core/111/meta b/config/rootfiles/core/111/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/core/111/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/111/update.sh b/config/rootfiles/core/111/update.sh new file mode 100644 index 0000000000..1c3cc2795f --- /dev/null +++ b/config/rootfiles/core/111/update.sh @@ -0,0 +1,69 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2017 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=111 + +# 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 +ipsec stop +/etc/init.d/unbound stop + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/unbound start + +if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then + ipsec start +fi + +# 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