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 d6c0b444d63673ae92347f15298d5b4509e62da8 (commit) via 523b5d1afa51d31a6f99e07c54bdd17844acef51 (commit) via d773e8dd788c69e25c1a7927a55680b34ab6e13e (commit) via 517d02ab1ea53f1a5a531cc80f4ad545eac87e79 (commit) via 183e19ceccc374e68a2a1ec8efbefdf1d12e1f5d (commit) via 7becf946d0abbe103a96d81b5b7cef811c893ac9 (commit) from a6ba20538291d9860815316dcbcf1387dec3004d (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 d6c0b444d63673ae92347f15298d5b4509e62da8 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 11 19:04:44 2013 +0200

core 70: Add squid initscript.

commit 523b5d1afa51d31a6f99e07c54bdd17844acef51 Merge: d773e8d 517d02a Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 11 19:04:12 2013 +0200

Merge remote-tracking branch 'stevee/squid-fast-shutdown' into next

commit d773e8dd788c69e25c1a7927a55680b34ab6e13e Author: Alexander Marx amarx@ipfire.org Date: Tue Jun 11 11:29:53 2013 +0200

Core70: Added message "update needs a reboot" because of new firewall script

commit 517d02ab1ea53f1a5a531cc80f4ad545eac87e79 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Jun 11 16:44:51 2013 +0200

squid: Speed up the stop process.

The squid proxy server has been blocked by unresponsive redirectors and it took ages to kill it in the past.

To speed up the shutdown process, we will stop all redirector services at the same time. If the squid service is still running we will wait up to 30 seconds before a TERM and finaly a KILL signal will be sent.

Fixes #10368.

commit 183e19ceccc374e68a2a1ec8efbefdf1d12e1f5d Author: Alexander Marx amarx@ipfire.org Date: Mon Jun 10 14:55:44 2013 +0200

core70: added openvpnctrl and /etc/init.d/firewall to files

commit 7becf946d0abbe103a96d81b5b7cef811c893ac9 Author: Alexander Marx amarx@ipfire.org Date: Mon Jun 10 13:56:08 2013 +0200

core70: cleanup of /config/rootfiles/core/70/filelists/file, increased version number to 70 in make.sh. copied core 68 dir to 70

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

Summary of changes: config/rootfiles/core/{68 => 70}/exclude | 0 config/rootfiles/core/{68 => 70}/filelists/GeoIP | 0 config/rootfiles/core/70/filelists/files | 5 +++++ config/rootfiles/core/{68 => 70}/filelists/hwdata | 0 config/rootfiles/core/{67 => 70}/meta | 0 config/rootfiles/core/{68 => 70}/update.sh | 4 ++-- make.sh | 2 +- src/initscripts/init.d/squid | 27 ++++++++++++++++++++--- 8 files changed, 32 insertions(+), 6 deletions(-) copy config/rootfiles/core/{68 => 70}/exclude (100%) copy config/rootfiles/core/{68 => 70}/filelists/GeoIP (100%) create mode 100644 config/rootfiles/core/70/filelists/files copy config/rootfiles/core/{68 => 70}/filelists/hwdata (100%) copy config/rootfiles/core/{67 => 70}/meta (100%) copy config/rootfiles/core/{68 => 70}/update.sh (98%)

Difference in files: diff --git a/config/rootfiles/core/70/exclude b/config/rootfiles/core/70/exclude new file mode 100644 index 0000000..321a931 --- /dev/null +++ b/config/rootfiles/core/70/exclude @@ -0,0 +1,17 @@ +srv/web/ipfire/html/proxy.pac +boot/config.txt +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/70/filelists/GeoIP b/config/rootfiles/core/70/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/core/70/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/70/filelists/files b/config/rootfiles/core/70/filelists/files new file mode 100644 index 0000000..331b77b --- /dev/null +++ b/config/rootfiles/core/70/filelists/files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/squid +usr/local/bin/openvpnctrl +etc/init.d/firewall diff --git a/config/rootfiles/core/70/filelists/hwdata b/config/rootfiles/core/70/filelists/hwdata new file mode 100644 index 0000000..5a9672f --- /dev/null +++ b/config/rootfiles/core/70/filelists/hwdata @@ -0,0 +1,2 @@ +usr/share/hwdata/pci.ids +usr/share/hwdata/usb.ids diff --git a/config/rootfiles/core/70/meta b/config/rootfiles/core/70/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/70/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/70/update.sh b/config/rootfiles/core/70/update.sh new file mode 100644 index 0000000..39b1371 --- /dev/null +++ b/config/rootfiles/core/70/update.sh @@ -0,0 +1,75 @@ +#!/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) 2013 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=70 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Remove meta's of packages that are now common... +# +rm -rf /opt/pakfire/db/*/meta-freefont + +# +#Stop services +/etc/init.d/ipsec stop + +# +#Extract files +extract_files + +# Regenerate ipsec configuration files. +/srv/web/ipfire/cgi-bin/vpnmain.cgi + +# +#Start services +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Regenerate font cache +fc-cache -f &>/dev/null + +sync + +# This update need a reboot... +touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 + diff --git a/make.sh b/make.sh index af76c59..939a04e 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.13" # Version number -CORE="69" # Core Level (Filename) +CORE="70" # Core Level (Filename) PAKFIRE_CORE="69" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid index 1a1425d..08a3029 100644 --- a/src/initscripts/init.d/squid +++ b/src/initscripts/init.d/squid @@ -86,10 +86,31 @@ case "$1" in boot_mesg "Stopping Squid Proxy Server..." squid -k shutdown >/dev/null 2>&1 evaluate_retval - killproc /usr/bin/squidGuard >/dev/null - killproc /usr/sbin/updxlrator >/dev/null - killproc /usr/bin/squidclamav >/dev/null + + # Stop squidGuard, updxlrator, squidclamav + # and redirect_wrappers. + killproc /usr/bin/squidGuard >/dev/null & + killproc /usr/sbin/updxlrator >/dev/null & + killproc /usr/bin/squidclamav >/dev/null & + killproc /usr/sbin/redirect_wrapper >/dev/null & + + # Wait until all redirectors have been stopped. + wait + + # If squid is still running, wait up to 30 seconds + # before we go on to kill it. + counter=30 + + while [ ${counter} -gt 0 ]; do + statusproc /usr/sbin/squid >/dev/null && break; + sleep 1 + counter=$(( ${counter} - 1)) + done + + # Kill squid service, if still running. killproc /usr/sbin/squid >/dev/null + + # Trash remain pid file from squid. rm -rf /var/run/squid.pid fi ;;

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