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 e26a93322da5dc6d0c1537c0122b24a6dd63119d (commit) via 59bddc7989e44800b7a855e88e28d6a6eb69e9b1 (commit) from feba68e4af48630d0c5dcd16bd799a0e02db2b36 (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 e26a93322da5dc6d0c1537c0122b24a6dd63119d Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Sep 26 21:03:33 2016 +0100

core106: Add recently updated packages, etc.

This update removes dnsmasq and replaces it with unbound.

Also many packages are updated and shipped.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 59bddc7989e44800b7a855e88e28d6a6eb69e9b1 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Sep 26 20:24:21 2016 +0100

Start Core Update 106

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

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

Summary of changes: config/rootfiles/core/{105 => 106}/exclude | 0 .../{oldcore/44 => core/106}/filelists/attr | 0 .../{oldcore/103 => core/106}/filelists/diffutils | 0 config/rootfiles/core/106/filelists/ed | 1 + .../{oldcore/90 => core/106}/filelists/expat | 0 .../{oldcore/94 => core/106}/filelists/file | 0 config/rootfiles/core/106/filelists/files | 17 +++++++++++ config/rootfiles/core/106/filelists/flex | 1 + .../{oldcore/66 => core/106}/filelists/gawk | 0 .../{oldcore/66 => core/106}/filelists/gettext | 0 .../{oldcore/89 => core/106}/filelists/gnupg | 0 .../core/{105 => 106}/filelists/i586/openssl-sse2 | 0 .../106}/filelists/i586/strongswan-padlock | 0 .../{oldcore/94 => core/106}/filelists/iproute2 | 0 .../{oldcore/95 => core/106}/filelists/ipset | 0 .../94 => core/106}/filelists/libgpg-error | 0 .../{oldcore/90 => core/106}/filelists/libjpeg | 0 config/rootfiles/core/106/filelists/libjpeg-compat | 1 + .../{oldcore/66 => core/106}/filelists/libmnl | 0 .../106}/filelists/libnetfilter_conntrack | 0 .../{oldcore/87 => core/106}/filelists/misc-progs | 0 .../rootfiles/core/{105 => 106}/filelists/openssl | 0 config/rootfiles/core/106/filelists/python-daemon | 1 + .../rootfiles/core/106/filelists/python-docutils | 1 + config/rootfiles/core/106/filelists/python-inotify | 1 + .../rootfiles/core/106/filelists/python-ipaddress | 1 + .../89 => core/106}/filelists/smartmontools | 0 .../{oldcore/94 => core/106}/filelists/squid | 0 .../{oldcore/96 => core/106}/filelists/strongswan | 0 config/rootfiles/core/106/filelists/unbound | 1 + .../77 => core/106}/filelists/usb_modeswitch | 0 .../77 => core/106}/filelists/usb_modeswitch_data | 0 config/rootfiles/core/{105 => 106}/meta | 0 .../rootfiles/{oldcore/103 => core/106}/update.sh | 35 ++++++++++++++-------- config/rootfiles/oldcore/{104 => 105}/exclude | 0 .../{core => oldcore}/105/filelists/files | 0 .../{99 => 105}/filelists/i586/openssl-sse2 | 0 .../{core => oldcore}/105/filelists/libgcrypt | 0 .../oldcore/{99 => 105}/filelists/openssl | 0 config/rootfiles/oldcore/{99 => 105}/meta | 0 config/rootfiles/{core => oldcore}/105/update.sh | 0 make.sh | 2 +- 42 files changed, 48 insertions(+), 14 deletions(-) rename config/rootfiles/core/{105 => 106}/exclude (100%) copy config/rootfiles/{oldcore/44 => core/106}/filelists/attr (100%) copy config/rootfiles/{oldcore/103 => core/106}/filelists/diffutils (100%) create mode 120000 config/rootfiles/core/106/filelists/ed copy config/rootfiles/{oldcore/90 => core/106}/filelists/expat (100%) copy config/rootfiles/{oldcore/94 => core/106}/filelists/file (100%) create mode 100644 config/rootfiles/core/106/filelists/files create mode 120000 config/rootfiles/core/106/filelists/flex copy config/rootfiles/{oldcore/66 => core/106}/filelists/gawk (100%) copy config/rootfiles/{oldcore/66 => core/106}/filelists/gettext (100%) copy config/rootfiles/{oldcore/89 => core/106}/filelists/gnupg (100%) rename config/rootfiles/core/{105 => 106}/filelists/i586/openssl-sse2 (100%) copy config/rootfiles/{oldcore/96 => core/106}/filelists/i586/strongswan-padlock (100%) copy config/rootfiles/{oldcore/94 => core/106}/filelists/iproute2 (100%) copy config/rootfiles/{oldcore/95 => core/106}/filelists/ipset (100%) copy config/rootfiles/{oldcore/94 => core/106}/filelists/libgpg-error (100%) copy config/rootfiles/{oldcore/90 => core/106}/filelists/libjpeg (100%) create mode 120000 config/rootfiles/core/106/filelists/libjpeg-compat copy config/rootfiles/{oldcore/66 => core/106}/filelists/libmnl (100%) copy config/rootfiles/{oldcore/92 => core/106}/filelists/libnetfilter_conntrack (100%) copy config/rootfiles/{oldcore/87 => core/106}/filelists/misc-progs (100%) rename config/rootfiles/core/{105 => 106}/filelists/openssl (100%) create mode 120000 config/rootfiles/core/106/filelists/python-daemon create mode 120000 config/rootfiles/core/106/filelists/python-docutils create mode 120000 config/rootfiles/core/106/filelists/python-inotify create mode 120000 config/rootfiles/core/106/filelists/python-ipaddress copy config/rootfiles/{oldcore/89 => core/106}/filelists/smartmontools (100%) copy config/rootfiles/{oldcore/94 => core/106}/filelists/squid (100%) copy config/rootfiles/{oldcore/96 => core/106}/filelists/strongswan (100%) create mode 120000 config/rootfiles/core/106/filelists/unbound copy config/rootfiles/{oldcore/77 => core/106}/filelists/usb_modeswitch (100%) copy config/rootfiles/{oldcore/77 => core/106}/filelists/usb_modeswitch_data (100%) rename config/rootfiles/core/{105 => 106}/meta (100%) copy config/rootfiles/{oldcore/103 => core/106}/update.sh (79%) copy config/rootfiles/oldcore/{104 => 105}/exclude (100%) rename config/rootfiles/{core => oldcore}/105/filelists/files (100%) copy config/rootfiles/oldcore/{99 => 105}/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/105/filelists/libgcrypt (100%) copy config/rootfiles/oldcore/{99 => 105}/filelists/openssl (100%) copy config/rootfiles/oldcore/{99 => 105}/meta (100%) rename config/rootfiles/{core => oldcore}/105/update.sh (100%)

Difference in files: diff --git a/config/rootfiles/core/105/exclude b/config/rootfiles/core/105/exclude deleted file mode 100644 index 7ddeae0..0000000 --- a/config/rootfiles/core/105/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/105/filelists/files b/config/rootfiles/core/105/filelists/files deleted file mode 100644 index 409e5fe..0000000 --- a/config/rootfiles/core/105/filelists/files +++ /dev/null @@ -1,2 +0,0 @@ -etc/system-release -etc/issue diff --git a/config/rootfiles/core/105/filelists/i586/openssl-sse2 b/config/rootfiles/core/105/filelists/i586/openssl-sse2 deleted file mode 120000 index f424713..0000000 --- a/config/rootfiles/core/105/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/105/filelists/libgcrypt b/config/rootfiles/core/105/filelists/libgcrypt deleted file mode 120000 index 2df12a2..0000000 --- a/config/rootfiles/core/105/filelists/libgcrypt +++ /dev/null @@ -1 +0,0 @@ -../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/core/105/filelists/openssl b/config/rootfiles/core/105/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/105/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/105/meta b/config/rootfiles/core/105/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/105/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/105/update.sh b/config/rootfiles/core/105/update.sh deleted file mode 100644 index 3e9f601..0000000 --- a/config/rootfiles/core/105/update.sh +++ /dev/null @@ -1,71 +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 - -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/core/106/exclude b/config/rootfiles/core/106/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/core/106/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/106/filelists/attr b/config/rootfiles/core/106/filelists/attr new file mode 120000 index 0000000..c808017 --- /dev/null +++ b/config/rootfiles/core/106/filelists/attr @@ -0,0 +1 @@ +../../../common/attr \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/diffutils b/config/rootfiles/core/106/filelists/diffutils new file mode 120000 index 0000000..a5c02f3 --- /dev/null +++ b/config/rootfiles/core/106/filelists/diffutils @@ -0,0 +1 @@ +../../../common/diffutils \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/ed b/config/rootfiles/core/106/filelists/ed new file mode 120000 index 0000000..0ed331c --- /dev/null +++ b/config/rootfiles/core/106/filelists/ed @@ -0,0 +1 @@ +../../../common/ed \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/expat b/config/rootfiles/core/106/filelists/expat new file mode 120000 index 0000000..e1923cf --- /dev/null +++ b/config/rootfiles/core/106/filelists/expat @@ -0,0 +1 @@ +../../../common/expat \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/file b/config/rootfiles/core/106/filelists/file new file mode 120000 index 0000000..0c60e43 --- /dev/null +++ b/config/rootfiles/core/106/filelists/file @@ -0,0 +1 @@ +../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files new file mode 100644 index 0000000..02b9d4c --- /dev/null +++ b/config/rootfiles/core/106/filelists/files @@ -0,0 +1,17 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/dhcp +etc/rc.d/init.d/network +etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders +etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders +etc/rc.d/init.d/unbound +etc/rc.d/rc0.d/K79unbound +etc/rc.d/rc3.d/S21unbound +etc/rc.d/rc6.d/K79unbound +srv/web/ipfire/cgi-bin/dns.cgi +srv/web/ipfire/cgi-bin/dnsforward.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/hosts.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/cgi-bin/pppsetup.cgi +srv/web/ipfire/cgi-bin/services.cgi diff --git a/config/rootfiles/core/106/filelists/flex b/config/rootfiles/core/106/filelists/flex new file mode 120000 index 0000000..feb0390 --- /dev/null +++ b/config/rootfiles/core/106/filelists/flex @@ -0,0 +1 @@ +../../../common/flex \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/gawk b/config/rootfiles/core/106/filelists/gawk new file mode 120000 index 0000000..a3bbe32 --- /dev/null +++ b/config/rootfiles/core/106/filelists/gawk @@ -0,0 +1 @@ +../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/gettext b/config/rootfiles/core/106/filelists/gettext new file mode 120000 index 0000000..b6c6c6f --- /dev/null +++ b/config/rootfiles/core/106/filelists/gettext @@ -0,0 +1 @@ +../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/gnupg b/config/rootfiles/core/106/filelists/gnupg new file mode 120000 index 0000000..a1a1564 --- /dev/null +++ b/config/rootfiles/core/106/filelists/gnupg @@ -0,0 +1 @@ +../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/i586/openssl-sse2 b/config/rootfiles/core/106/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/core/106/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/i586/strongswan-padlock b/config/rootfiles/core/106/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/core/106/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/iproute2 b/config/rootfiles/core/106/filelists/iproute2 new file mode 120000 index 0000000..05f0f71 --- /dev/null +++ b/config/rootfiles/core/106/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/ipset b/config/rootfiles/core/106/filelists/ipset new file mode 120000 index 0000000..2b43691 --- /dev/null +++ b/config/rootfiles/core/106/filelists/ipset @@ -0,0 +1 @@ +../../../common/ipset \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/libgpg-error b/config/rootfiles/core/106/filelists/libgpg-error new file mode 120000 index 0000000..cad4313 --- /dev/null +++ b/config/rootfiles/core/106/filelists/libgpg-error @@ -0,0 +1 @@ +../../../common/libgpg-error \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/libjpeg b/config/rootfiles/core/106/filelists/libjpeg new file mode 120000 index 0000000..3b1a782 --- /dev/null +++ b/config/rootfiles/core/106/filelists/libjpeg @@ -0,0 +1 @@ +../../../common/libjpeg \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/libjpeg-compat b/config/rootfiles/core/106/filelists/libjpeg-compat new file mode 120000 index 0000000..e6ff86d --- /dev/null +++ b/config/rootfiles/core/106/filelists/libjpeg-compat @@ -0,0 +1 @@ +../../../common/libjpeg-compat \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/libmnl b/config/rootfiles/core/106/filelists/libmnl new file mode 120000 index 0000000..f671c41 --- /dev/null +++ b/config/rootfiles/core/106/filelists/libmnl @@ -0,0 +1 @@ +../../../common/libmnl \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/libnetfilter_conntrack b/config/rootfiles/core/106/filelists/libnetfilter_conntrack new file mode 120000 index 0000000..6ef5cc4 --- /dev/null +++ b/config/rootfiles/core/106/filelists/libnetfilter_conntrack @@ -0,0 +1 @@ +../../../common/libnetfilter_conntrack \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/misc-progs b/config/rootfiles/core/106/filelists/misc-progs new file mode 120000 index 0000000..7223cad --- /dev/null +++ b/config/rootfiles/core/106/filelists/misc-progs @@ -0,0 +1 @@ +../../../common/misc-progs \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/openssl b/config/rootfiles/core/106/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/106/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/python-daemon b/config/rootfiles/core/106/filelists/python-daemon new file mode 120000 index 0000000..8e510bb --- /dev/null +++ b/config/rootfiles/core/106/filelists/python-daemon @@ -0,0 +1 @@ +../../../common/python-daemon \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/python-docutils b/config/rootfiles/core/106/filelists/python-docutils new file mode 120000 index 0000000..5ae1ada --- /dev/null +++ b/config/rootfiles/core/106/filelists/python-docutils @@ -0,0 +1 @@ +../../../common/python-docutils \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/python-inotify b/config/rootfiles/core/106/filelists/python-inotify new file mode 120000 index 0000000..6f572c3 --- /dev/null +++ b/config/rootfiles/core/106/filelists/python-inotify @@ -0,0 +1 @@ +../../../common/python-inotify \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/python-ipaddress b/config/rootfiles/core/106/filelists/python-ipaddress new file mode 120000 index 0000000..0702482 --- /dev/null +++ b/config/rootfiles/core/106/filelists/python-ipaddress @@ -0,0 +1 @@ +../../../common/python-ipaddress \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/smartmontools b/config/rootfiles/core/106/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/core/106/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/squid b/config/rootfiles/core/106/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/106/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/strongswan b/config/rootfiles/core/106/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/106/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/unbound b/config/rootfiles/core/106/filelists/unbound new file mode 120000 index 0000000..66adf09 --- /dev/null +++ b/config/rootfiles/core/106/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/usb_modeswitch b/config/rootfiles/core/106/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/core/106/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/usb_modeswitch_data b/config/rootfiles/core/106/filelists/usb_modeswitch_data new file mode 120000 index 0000000..4cbce46 --- /dev/null +++ b/config/rootfiles/core/106/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/106/meta b/config/rootfiles/core/106/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/106/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/106/update.sh b/config/rootfiles/core/106/update.sh new file mode 100644 index 0000000..4d50d90 --- /dev/null +++ b/config/rootfiles/core/106/update.sh @@ -0,0 +1,91 @@ +#!/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=106 + +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 +/etc/init.d/ipsec stop +/etc/init.d/dnsmasq stop + +# Extract files +extract_files + +# Delete dnsmasq +rm -vf \ + /etc/rc.d/init.d/dnsmasq \ + /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq \ + /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq \ + /usr/sbin/dnsmasq + +# update linker config +ldconfig + +grep -q unbound-anchor /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig + +# Update DNS trust anchor +%daily,random * * @runas(nobody) /usr/sbin/unbound-anchor -a /var/lib/unbound/root.key -c /etc/unbound/icannbundle.pem +EOF + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/unbound start +/etc/init.d/squid start +if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then + /etc/init.d/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 diff --git a/config/rootfiles/oldcore/105/exclude b/config/rootfiles/oldcore/105/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/oldcore/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/oldcore/105/filelists/files b/config/rootfiles/oldcore/105/filelists/files new file mode 100644 index 0000000..409e5fe --- /dev/null +++ b/config/rootfiles/oldcore/105/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/oldcore/105/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/105/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/oldcore/105/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/105/filelists/libgcrypt b/config/rootfiles/oldcore/105/filelists/libgcrypt new file mode 120000 index 0000000..2df12a2 --- /dev/null +++ b/config/rootfiles/oldcore/105/filelists/libgcrypt @@ -0,0 +1 @@ +../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/oldcore/105/filelists/openssl b/config/rootfiles/oldcore/105/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/105/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/105/meta b/config/rootfiles/oldcore/105/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/105/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/105/update.sh b/config/rootfiles/oldcore/105/update.sh new file mode 100644 index 0000000..3e9f601 --- /dev/null +++ b/config/rootfiles/oldcore/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/make.sh b/make.sh index 1446a9f..5e97c96 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="105" # Core Level (Filename) +CORE="106" # 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

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