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 bdbfbac6b473908dcf93cf96bce8dc762c87d3fc (commit) via 57c8392d1c42e8794ac193a88923d0823103861d (commit) via c0a4b928399ca37112dda7de1e55ae93642889dc (commit) via ec4a4fafb28f4eaadf122e03754c9d601ec7f881 (commit) via b1c17c7a95e0a108a9ddcf022ec34f30dec1689b (commit) via fce512dce39a56dc1e099b1c73544f87beedcacf (commit) from 532b997c65fba44c2c5778fd7622fafe513cc245 (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 bdbfbac6b473908dcf93cf96bce8dc762c87d3fc Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 2 20:55:58 2013 +0100

core74: Add strongswan update.

commit 57c8392d1c42e8794ac193a88923d0823103861d Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 2 20:48:58 2013 +0100

core74: Add dnsforward.cgi to ISO.

Bug #10447.

commit c0a4b928399ca37112dda7de1e55ae93642889dc Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 2 20:45:20 2013 +0100

core74: Add updated proxy.cgi.

Reflects the FD changes.

commit ec4a4fafb28f4eaadf122e03754c9d601ec7f881 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 2 20:44:28 2013 +0100

core74: Add openvpn.

This package has been updated before.

commit b1c17c7a95e0a108a9ddcf022ec34f30dec1689b Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 2 20:43:58 2013 +0100

core74: Add squid.

Covers the filedescriptors issues.

commit fce512dce39a56dc1e099b1c73544f87beedcacf Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 2 20:41:25 2013 +0100

Create Core Update 74.

Will automatically increase the transparent proxy port if it is set to 81.

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

Summary of changes: config/rootfiles/common/apache2 | 1 + config/rootfiles/core/{70 => 74}/exclude | 0 config/rootfiles/core/74/filelists/files | 5 +++++ .../{72 => 74}/filelists/i586/strongswan-padlock | 0 .../{oldcore/53 => core/74}/filelists/openvpn | 0 config/rootfiles/core/{71 => 74}/filelists/squid | 0 .../rootfiles/core/{72 => 74}/filelists/strongswan | 0 config/rootfiles/core/{70 => 74}/meta | 0 config/rootfiles/core/{73 => 74}/update.sh | 22 ++++++++++++---------- make.sh | 2 +- 10 files changed, 19 insertions(+), 11 deletions(-) copy config/rootfiles/core/{70 => 74}/exclude (100%) create mode 100644 config/rootfiles/core/74/filelists/files copy config/rootfiles/core/{72 => 74}/filelists/i586/strongswan-padlock (100%) copy config/rootfiles/{oldcore/53 => core/74}/filelists/openvpn (100%) copy config/rootfiles/core/{71 => 74}/filelists/squid (100%) copy config/rootfiles/core/{72 => 74}/filelists/strongswan (100%) copy config/rootfiles/core/{70 => 74}/meta (100%) copy config/rootfiles/core/{73 => 74}/update.sh (87%)

Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 9be3581..c18b5ed 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1388,6 +1388,7 @@ srv/web/ipfire/cgi-bin/connscheduler.cgi srv/web/ipfire/cgi-bin/country.cgi srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/dns.cgi +srv/web/ipfire/cgi-bin/dnsforward.cgi srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/dmzholes.cgi diff --git a/config/rootfiles/core/74/exclude b/config/rootfiles/core/74/exclude new file mode 100644 index 0000000..321a931 --- /dev/null +++ b/config/rootfiles/core/74/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/74/filelists/files b/config/rootfiles/core/74/filelists/files new file mode 100644 index 0000000..74d2466 --- /dev/null +++ b/config/rootfiles/core/74/filelists/files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/proxy.cgi +var/ipfire/header.pl +var/ipfire/langs diff --git a/config/rootfiles/core/74/filelists/i586/strongswan-padlock b/config/rootfiles/core/74/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/core/74/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/74/filelists/openvpn b/config/rootfiles/core/74/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/core/74/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/74/filelists/squid b/config/rootfiles/core/74/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/74/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/74/filelists/strongswan b/config/rootfiles/core/74/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/74/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/74/meta b/config/rootfiles/core/74/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/74/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/74/update.sh b/config/rootfiles/core/74/update.sh new file mode 100644 index 0000000..3f8abce --- /dev/null +++ b/config/rootfiles/core/74/update.sh @@ -0,0 +1,83 @@ +#!/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=74 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + + +# +#Stop services +/etc/init.d/ipsec stop +/etc/init.d/squid stop + + +# +#Extract files +extract_files + +if [ -e "/var/ipfire/proxy/enable" ] || [ -e "/var/ipfire/proxy/enable_blue" ]; then + ( + eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings) + + if [ "${TRANSPARENT_PORT}" = "81" ]; then + sed -e "s/^TRANSPARENT_PORT=.*/TRANSPARENT_PORT=${TRANSPARENT_PORT}/" \ + -i /var/ipfire/proxy/advanced/settings + fi + ) +fi + +# Regenerate squid configuration files. +/srv/web/ipfire/cgi-bin/proxy.cgi +chown nobody:nobody /var/ipfire/proxy/squid.conf + +# +#Start services +/etc/init.d/squid start + +if grep -q "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" + +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 ef98d6f..c90e89d 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="73" # Core Level (Filename) +CORE="74" # Core Level (Filename) PAKFIRE_CORE="73" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan

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