From: Michael Tremer Date: Sat, 1 Jul 2017 11:44:48 +0000 (+0100) Subject: Package Core Update 112 X-Git-Tag: v2.19-core112~14 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=ea938f62896af3b2b366fd5552bf552ee71eadc2 Package Core Update 112 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/112/exclude b/config/rootfiles/core/112/exclude new file mode 100644 index 0000000000..d6fd053b6e --- /dev/null +++ b/config/rootfiles/core/112/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/112/filelists/armv5tel/binutils b/config/rootfiles/core/112/filelists/armv5tel/binutils new file mode 120000 index 0000000000..ac971f931b --- /dev/null +++ b/config/rootfiles/core/112/filelists/armv5tel/binutils @@ -0,0 +1 @@ +../../../../common/armv5tel/binutils \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/armv5tel/gcc b/config/rootfiles/core/112/filelists/armv5tel/gcc new file mode 120000 index 0000000000..84f7b9344e --- /dev/null +++ b/config/rootfiles/core/112/filelists/armv5tel/gcc @@ -0,0 +1 @@ +../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/armv5tel/glibc b/config/rootfiles/core/112/filelists/armv5tel/glibc new file mode 120000 index 0000000000..4c70d724b4 --- /dev/null +++ b/config/rootfiles/core/112/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/autoconf b/config/rootfiles/core/112/filelists/autoconf new file mode 120000 index 0000000000..aa39ce671c --- /dev/null +++ b/config/rootfiles/core/112/filelists/autoconf @@ -0,0 +1 @@ +../../../common/autoconf \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/bc b/config/rootfiles/core/112/filelists/bc new file mode 120000 index 0000000000..a729f5d2d8 --- /dev/null +++ b/config/rootfiles/core/112/filelists/bc @@ -0,0 +1 @@ +../../../common/bc \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/boost b/config/rootfiles/core/112/filelists/boost new file mode 120000 index 0000000000..05246f07cc --- /dev/null +++ b/config/rootfiles/core/112/filelists/boost @@ -0,0 +1 @@ +../../../common/boost \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/cmake b/config/rootfiles/core/112/filelists/cmake new file mode 120000 index 0000000000..491d25f727 --- /dev/null +++ b/config/rootfiles/core/112/filelists/cmake @@ -0,0 +1 @@ +../../../common/cmake \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/files b/config/rootfiles/core/112/filelists/files new file mode 100644 index 0000000000..9337d4ab30 --- /dev/null +++ b/config/rootfiles/core/112/filelists/files @@ -0,0 +1,7 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +var/ipfire/langs +var/ipfire/general-functions.pl diff --git a/config/rootfiles/core/112/filelists/flex b/config/rootfiles/core/112/filelists/flex new file mode 120000 index 0000000000..feb0390ffe --- /dev/null +++ b/config/rootfiles/core/112/filelists/flex @@ -0,0 +1 @@ +../../../common/flex \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/fuse b/config/rootfiles/core/112/filelists/fuse new file mode 120000 index 0000000000..570edaadef --- /dev/null +++ b/config/rootfiles/core/112/filelists/fuse @@ -0,0 +1 @@ +../../../common/fuse \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/gawk b/config/rootfiles/core/112/filelists/gawk new file mode 120000 index 0000000000..a3bbe32ce6 --- /dev/null +++ b/config/rootfiles/core/112/filelists/gawk @@ -0,0 +1 @@ +../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/gnutls b/config/rootfiles/core/112/filelists/gnutls new file mode 120000 index 0000000000..8dbe60bc32 --- /dev/null +++ b/config/rootfiles/core/112/filelists/gnutls @@ -0,0 +1 @@ +../../../common/gnutls \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/i586/binutils b/config/rootfiles/core/112/filelists/i586/binutils new file mode 120000 index 0000000000..78695d73a3 --- /dev/null +++ b/config/rootfiles/core/112/filelists/i586/binutils @@ -0,0 +1 @@ +../../../../common/i586/binutils \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/i586/gcc b/config/rootfiles/core/112/filelists/i586/gcc new file mode 120000 index 0000000000..ba328e3b68 --- /dev/null +++ b/config/rootfiles/core/112/filelists/i586/gcc @@ -0,0 +1 @@ +../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/i586/glibc b/config/rootfiles/core/112/filelists/i586/glibc new file mode 120000 index 0000000000..943021f19a --- /dev/null +++ b/config/rootfiles/core/112/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/i586/python b/config/rootfiles/core/112/filelists/i586/python new file mode 120000 index 0000000000..a2b842b995 --- /dev/null +++ b/config/rootfiles/core/112/filelists/i586/python @@ -0,0 +1 @@ +../../../../common/i586/python \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/kbd b/config/rootfiles/core/112/filelists/kbd new file mode 120000 index 0000000000..9b85839b1f --- /dev/null +++ b/config/rootfiles/core/112/filelists/kbd @@ -0,0 +1 @@ +../../../common/kbd \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/libarchive b/config/rootfiles/core/112/filelists/libarchive new file mode 120000 index 0000000000..551f1f7434 --- /dev/null +++ b/config/rootfiles/core/112/filelists/libarchive @@ -0,0 +1 @@ +../../../common/libarchive \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/libgcrypt b/config/rootfiles/core/112/filelists/libgcrypt new file mode 120000 index 0000000000..2df12a20ec --- /dev/null +++ b/config/rootfiles/core/112/filelists/libgcrypt @@ -0,0 +1 @@ +../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/libgpg-error b/config/rootfiles/core/112/filelists/libgpg-error new file mode 120000 index 0000000000..cad431339f --- /dev/null +++ b/config/rootfiles/core/112/filelists/libgpg-error @@ -0,0 +1 @@ +../../../common/libgpg-error \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/libxml2 b/config/rootfiles/core/112/filelists/libxml2 new file mode 120000 index 0000000000..242e69fa35 --- /dev/null +++ b/config/rootfiles/core/112/filelists/libxml2 @@ -0,0 +1 @@ +../../../common/libxml2 \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/ncurses b/config/rootfiles/core/112/filelists/ncurses new file mode 120000 index 0000000000..512faef6ae --- /dev/null +++ b/config/rootfiles/core/112/filelists/ncurses @@ -0,0 +1 @@ +../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/reiserfsprogs b/config/rootfiles/core/112/filelists/reiserfsprogs new file mode 120000 index 0000000000..008c3e8915 --- /dev/null +++ b/config/rootfiles/core/112/filelists/reiserfsprogs @@ -0,0 +1 @@ +../../../common/reiserfsprogs \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/sudo b/config/rootfiles/core/112/filelists/sudo new file mode 120000 index 0000000000..0d3c45e042 --- /dev/null +++ b/config/rootfiles/core/112/filelists/sudo @@ -0,0 +1 @@ +../../../common/sudo \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/tzdata b/config/rootfiles/core/112/filelists/tzdata new file mode 120000 index 0000000000..5a6e3252f3 --- /dev/null +++ b/config/rootfiles/core/112/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/unbound b/config/rootfiles/core/112/filelists/unbound new file mode 120000 index 0000000000..66adf09242 --- /dev/null +++ b/config/rootfiles/core/112/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/web-user-interface b/config/rootfiles/core/112/filelists/web-user-interface new file mode 120000 index 0000000000..70c74b4382 --- /dev/null +++ b/config/rootfiles/core/112/filelists/web-user-interface @@ -0,0 +1 @@ +../../../common/web-user-interface \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/x86_64/binutils b/config/rootfiles/core/112/filelists/x86_64/binutils new file mode 120000 index 0000000000..7d0fda554d --- /dev/null +++ b/config/rootfiles/core/112/filelists/x86_64/binutils @@ -0,0 +1 @@ +../../../../common/x86_64/binutils \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/x86_64/gcc b/config/rootfiles/core/112/filelists/x86_64/gcc new file mode 120000 index 0000000000..d1616d377c --- /dev/null +++ b/config/rootfiles/core/112/filelists/x86_64/gcc @@ -0,0 +1 @@ +../../../../common/x86_64/gcc \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/x86_64/glibc b/config/rootfiles/core/112/filelists/x86_64/glibc new file mode 120000 index 0000000000..1119099669 --- /dev/null +++ b/config/rootfiles/core/112/filelists/x86_64/glibc @@ -0,0 +1 @@ +../../../../common/x86_64/glibc \ No newline at end of file diff --git a/config/rootfiles/core/112/filelists/x86_64/python b/config/rootfiles/core/112/filelists/x86_64/python new file mode 120000 index 0000000000..a593187de6 --- /dev/null +++ b/config/rootfiles/core/112/filelists/x86_64/python @@ -0,0 +1 @@ +../../../../common/x86_64/python \ No newline at end of file diff --git a/config/rootfiles/core/112/meta b/config/rootfiles/core/112/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/core/112/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/112/update.sh b/config/rootfiles/core/112/update.sh new file mode 100644 index 0000000000..4aef38b944 --- /dev/null +++ b/config/rootfiles/core/112/update.sh @@ -0,0 +1,64 @@ +#!/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=112 + +# 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/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 + +# 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 c7b1f41ad2..a3fb4027a9 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="111" # Core Level (Filename) +CORE="112" # Core Level (Filename) PAKFIRE_CORE="111" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan