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 5f39eb211974f1fa21c1f769f62b779f85ffbdf4 (commit) from 77c48fbe35e59957036b9533db0ec5b88a7a1e3d (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 5f39eb211974f1fa21c1f769f62b779f85ffbdf4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Feb 26 07:27:09 2016 +0100

rename core99 to core100 for inserting another OpenSSL Security update

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

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

Summary of changes: config/rootfiles/core/{99 => 100}/exclude | 0 config/rootfiles/core/{99 => 100}/filelists/bind | 0 config/rootfiles/core/{99 => 100}/filelists/dnsmasq | 0 config/rootfiles/core/{99 => 100}/filelists/files | 0 config/rootfiles/core/{99 => 100}/filelists/grep | 0 config/rootfiles/core/{99 => 100}/filelists/ntp | 0 config/rootfiles/core/{99 => 100}/filelists/openssh | 0 config/rootfiles/core/{99 => 100}/filelists/openvpn | 0 config/rootfiles/core/{99 => 100}/filelists/sed | 0 config/rootfiles/core/{99 => 100}/filelists/squid | 0 config/rootfiles/core/{99 => 100}/filelists/tzdata | 0 config/rootfiles/core/{99 => 100}/filelists/xz | 0 config/rootfiles/core/{99 => 100}/meta | 0 config/rootfiles/core/{99 => 100}/update.sh | 2 +- make.sh | 2 +- 15 files changed, 2 insertions(+), 2 deletions(-) rename config/rootfiles/core/{99 => 100}/exclude (100%) rename config/rootfiles/core/{99 => 100}/filelists/bind (100%) rename config/rootfiles/core/{99 => 100}/filelists/dnsmasq (100%) rename config/rootfiles/core/{99 => 100}/filelists/files (100%) rename config/rootfiles/core/{99 => 100}/filelists/grep (100%) rename config/rootfiles/core/{99 => 100}/filelists/ntp (100%) rename config/rootfiles/core/{99 => 100}/filelists/openssh (100%) rename config/rootfiles/core/{99 => 100}/filelists/openvpn (100%) rename config/rootfiles/core/{99 => 100}/filelists/sed (100%) rename config/rootfiles/core/{99 => 100}/filelists/squid (100%) rename config/rootfiles/core/{99 => 100}/filelists/tzdata (100%) rename config/rootfiles/core/{99 => 100}/filelists/xz (100%) rename config/rootfiles/core/{99 => 100}/meta (100%) rename config/rootfiles/core/{99 => 100}/update.sh (99%)

Difference in files: diff --git a/config/rootfiles/core/100/exclude b/config/rootfiles/core/100/exclude new file mode 100644 index 0000000..8e446ce --- /dev/null +++ b/config/rootfiles/core/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/core/100/filelists/bind b/config/rootfiles/core/100/filelists/bind new file mode 120000 index 0000000..48a0eba --- /dev/null +++ b/config/rootfiles/core/100/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/dnsmasq b/config/rootfiles/core/100/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/core/100/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/files b/config/rootfiles/core/100/filelists/files new file mode 100644 index 0000000..1202ea8 --- /dev/null +++ b/config/rootfiles/core/100/filelists/files @@ -0,0 +1,23 @@ +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/modprobe.d/nf_conntrack.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/qosctrl +usr/local/bin/timectrl +var/ipfire/dhcpc/dhcpcd-hooks/10-mtu diff --git a/config/rootfiles/core/100/filelists/grep b/config/rootfiles/core/100/filelists/grep new file mode 120000 index 0000000..ab5ef8b --- /dev/null +++ b/config/rootfiles/core/100/filelists/grep @@ -0,0 +1 @@ +../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/ntp b/config/rootfiles/core/100/filelists/ntp new file mode 120000 index 0000000..7542d86 --- /dev/null +++ b/config/rootfiles/core/100/filelists/ntp @@ -0,0 +1 @@ +../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/openssh b/config/rootfiles/core/100/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/100/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/openvpn b/config/rootfiles/core/100/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/core/100/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/sed b/config/rootfiles/core/100/filelists/sed new file mode 120000 index 0000000..fc5f5c6 --- /dev/null +++ b/config/rootfiles/core/100/filelists/sed @@ -0,0 +1 @@ +../../../common/sed \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/squid b/config/rootfiles/core/100/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/100/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/tzdata b/config/rootfiles/core/100/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/core/100/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/xz b/config/rootfiles/core/100/filelists/xz new file mode 120000 index 0000000..734e926 --- /dev/null +++ b/config/rootfiles/core/100/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/100/meta b/config/rootfiles/core/100/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/100/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/100/update.sh b/config/rootfiles/core/100/update.sh new file mode 100644 index 0000000..8745ff1 --- /dev/null +++ b/config/rootfiles/core/100/update.sh @@ -0,0 +1,68 @@ +#!/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=100 +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/dnsmasq stop + +# Extract files +extract_files + +# Fix hardening flags in grub +paxctl -mpexs /usr/bin/grub-script-check + +# Update Language cache +# /usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/dnsmasq start +/etc/init.d/sshd restart +/etc/init.d/squid start + +# Delete old QoS enabled indicator +rm -f /var/ipfire/qos/enable + +# 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 8e446ce..0000000 --- a/config/rootfiles/core/99/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/99/filelists/bind b/config/rootfiles/core/99/filelists/bind deleted file mode 120000 index 48a0eba..0000000 --- a/config/rootfiles/core/99/filelists/bind +++ /dev/null @@ -1 +0,0 @@ -../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/99/filelists/dnsmasq b/config/rootfiles/core/99/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/99/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/99/filelists/files b/config/rootfiles/core/99/filelists/files deleted file mode 100644 index 1202ea8..0000000 --- a/config/rootfiles/core/99/filelists/files +++ /dev/null @@ -1,23 +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/modprobe.d/nf_conntrack.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/qosctrl -usr/local/bin/timectrl -var/ipfire/dhcpc/dhcpcd-hooks/10-mtu diff --git a/config/rootfiles/core/99/filelists/grep b/config/rootfiles/core/99/filelists/grep deleted file mode 120000 index ab5ef8b..0000000 --- a/config/rootfiles/core/99/filelists/grep +++ /dev/null @@ -1 +0,0 @@ -../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/99/filelists/ntp b/config/rootfiles/core/99/filelists/ntp deleted file mode 120000 index 7542d86..0000000 --- a/config/rootfiles/core/99/filelists/ntp +++ /dev/null @@ -1 +0,0 @@ -../../../common/ntp \ 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/openvpn b/config/rootfiles/core/99/filelists/openvpn deleted file mode 120000 index 493f3f7..0000000 --- a/config/rootfiles/core/99/filelists/openvpn +++ /dev/null @@ -1 +0,0 @@ -../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/99/filelists/sed b/config/rootfiles/core/99/filelists/sed deleted file mode 120000 index fc5f5c6..0000000 --- a/config/rootfiles/core/99/filelists/sed +++ /dev/null @@ -1 +0,0 @@ -../../../common/sed \ No newline at end of file diff --git a/config/rootfiles/core/99/filelists/squid b/config/rootfiles/core/99/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/99/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/99/filelists/tzdata b/config/rootfiles/core/99/filelists/tzdata deleted file mode 120000 index 5a6e325..0000000 --- a/config/rootfiles/core/99/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/99/filelists/xz b/config/rootfiles/core/99/filelists/xz deleted file mode 120000 index 734e926..0000000 --- a/config/rootfiles/core/99/filelists/xz +++ /dev/null @@ -1 +0,0 @@ -../../../common/xz \ 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 b16b18d..0000000 --- a/config/rootfiles/core/99/update.sh +++ /dev/null @@ -1,68 +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 -/etc/init.d/squid stop -/etc/init.d/dnsmasq stop - -# Extract files -extract_files - -# Fix hardening flags in grub -paxctl -mpexs /usr/bin/grub-script-check - -# Update Language cache -# /usr/local/bin/update-lang-cache - -# Start services -/etc/init.d/dnsmasq start -/etc/init.d/sshd restart -/etc/init.d/squid start - -# Delete old QoS enabled indicator -rm -f /var/ipfire/qos/enable - -# 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 189f7d9..bed9230 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.17" # Version number -CORE="99" # Core Level (Filename) +CORE="100" # Core Level (Filename) PAKFIRE_CORE="98" # 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