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 5aa856ce1cc1375e2a5a21c17411f7be20d57bfe (commit) via 5f17f9f341e95e374cc872e2dabee51a8feb6e27 (commit) from 6cda6f906eafb269ea7362343b8af609b3d9ce41 (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 5aa856ce1cc1375e2a5a21c17411f7be20d57bfe Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Sep 24 20:38:59 2014 +0200

core83: add changed files

commit 5f17f9f341e95e374cc872e2dabee51a8feb6e27 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Sep 24 20:31:55 2014 +0200

Create core update 83

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

Summary of changes: config/rootfiles/core/{82 => 83}/exclude | 0 config/rootfiles/{oldcore/66 => core/83}/filelists/bash | 0 config/rootfiles/core/83/filelists/files | 6 ++++++ config/rootfiles/{oldcore/44 => core/83}/filelists/findutils | 0 config/rootfiles/{oldcore/32 => core/83}/filelists/squid | 0 config/rootfiles/core/{82 => 83}/meta | 0 config/rootfiles/core/{82 => 83}/update.sh | 5 ++--- config/rootfiles/{core => oldcore}/82/exclude | 0 config/rootfiles/{core => oldcore}/82/filelists/armv5tel/gmp | 0 config/rootfiles/{core => oldcore}/82/filelists/batctl | 0 config/rootfiles/{core => oldcore}/82/filelists/boost | 0 config/rootfiles/{core => oldcore}/82/filelists/files | 0 config/rootfiles/{core => oldcore}/82/filelists/i586/gmp | 0 config/rootfiles/{core => oldcore}/82/filelists/libnl-3 | 0 config/rootfiles/{core => oldcore}/82/filelists/mpfr | 0 config/rootfiles/{core => oldcore}/82/filelists/ppp | 0 config/rootfiles/{core => oldcore}/82/meta | 0 config/rootfiles/{core => oldcore}/82/update.sh | 0 make.sh | 2 +- 19 files changed, 9 insertions(+), 4 deletions(-) copy config/rootfiles/core/{82 => 83}/exclude (100%) copy config/rootfiles/{oldcore/66 => core/83}/filelists/bash (100%) create mode 100644 config/rootfiles/core/83/filelists/files copy config/rootfiles/{oldcore/44 => core/83}/filelists/findutils (100%) copy config/rootfiles/{oldcore/32 => core/83}/filelists/squid (100%) copy config/rootfiles/core/{82 => 83}/meta (100%) copy config/rootfiles/core/{82 => 83}/update.sh (95%) rename config/rootfiles/{core => oldcore}/82/exclude (100%) rename config/rootfiles/{core => oldcore}/82/filelists/armv5tel/gmp (100%) rename config/rootfiles/{core => oldcore}/82/filelists/batctl (100%) rename config/rootfiles/{core => oldcore}/82/filelists/boost (100%) rename config/rootfiles/{core => oldcore}/82/filelists/files (100%) rename config/rootfiles/{core => oldcore}/82/filelists/i586/gmp (100%) rename config/rootfiles/{core => oldcore}/82/filelists/libnl-3 (100%) rename config/rootfiles/{core => oldcore}/82/filelists/mpfr (100%) rename config/rootfiles/{core => oldcore}/82/filelists/ppp (100%) rename config/rootfiles/{core => oldcore}/82/meta (100%) rename config/rootfiles/{core => oldcore}/82/update.sh (100%)

Difference in files: diff --git a/config/rootfiles/core/82/exclude b/config/rootfiles/core/82/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/82/exclude +++ /dev/null @@ -1,20 +0,0 @@ -boot/config.txt -etc/collectd.custom -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -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/ovpn -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/82/filelists/armv5tel/gmp b/config/rootfiles/core/82/filelists/armv5tel/gmp deleted file mode 120000 index 2bdf30d..0000000 --- a/config/rootfiles/core/82/filelists/armv5tel/gmp +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/gmp \ No newline at end of file diff --git a/config/rootfiles/core/82/filelists/batctl b/config/rootfiles/core/82/filelists/batctl deleted file mode 120000 index 6a6edde..0000000 --- a/config/rootfiles/core/82/filelists/batctl +++ /dev/null @@ -1 +0,0 @@ -../../../common/batctl \ No newline at end of file diff --git a/config/rootfiles/core/82/filelists/boost b/config/rootfiles/core/82/filelists/boost deleted file mode 120000 index 05246f0..0000000 --- a/config/rootfiles/core/82/filelists/boost +++ /dev/null @@ -1 +0,0 @@ -../../../common/boost \ No newline at end of file diff --git a/config/rootfiles/core/82/filelists/files b/config/rootfiles/core/82/filelists/files deleted file mode 100644 index 19e551c..0000000 --- a/config/rootfiles/core/82/filelists/files +++ /dev/null @@ -1,15 +0,0 @@ -etc/system-release -etc/issue -etc/rc.d/init.d/firewall -etc/rc.d/init.d/networking/red.down/20-firewall -etc/rc.d/init.d/networking/red.up/20-firewall -srv/web/ipfire/cgi-bin/connections.cgi -srv/web/ipfire/cgi-bin/ddns.cgi -srv/web/ipfire/cgi-bin/fwhosts.cgi -srv/web/ipfire/cgi-bin/optionsfw.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -usr/lib/firewall/rules.pl -var/ipfire/general-functions.pl -var/ipfire/langs -var/ipfire/network-functions.pl diff --git a/config/rootfiles/core/82/filelists/i586/gmp b/config/rootfiles/core/82/filelists/i586/gmp deleted file mode 120000 index 52a09cd..0000000 --- a/config/rootfiles/core/82/filelists/i586/gmp +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/gmp \ No newline at end of file diff --git a/config/rootfiles/core/82/filelists/libnl-3 b/config/rootfiles/core/82/filelists/libnl-3 deleted file mode 120000 index 00e61c2..0000000 --- a/config/rootfiles/core/82/filelists/libnl-3 +++ /dev/null @@ -1 +0,0 @@ -../../../common/libnl-3 \ No newline at end of file diff --git a/config/rootfiles/core/82/filelists/mpfr b/config/rootfiles/core/82/filelists/mpfr deleted file mode 120000 index c8468bf..0000000 --- a/config/rootfiles/core/82/filelists/mpfr +++ /dev/null @@ -1 +0,0 @@ -../../../common/mpfr \ No newline at end of file diff --git a/config/rootfiles/core/82/filelists/ppp b/config/rootfiles/core/82/filelists/ppp deleted file mode 120000 index 4844a9b..0000000 --- a/config/rootfiles/core/82/filelists/ppp +++ /dev/null @@ -1 +0,0 @@ -../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/core/82/meta b/config/rootfiles/core/82/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/82/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/82/update.sh b/config/rootfiles/core/82/update.sh deleted file mode 100644 index 76677ae..0000000 --- a/config/rootfiles/core/82/update.sh +++ /dev/null @@ -1,57 +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) 2014 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=82 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# Stop services - -# Remove old files -rm -vf /etc/rc.d/init.d/networking/red.up/20-RL-firewall - -# Extract files -extract_files - -# Start services - -# 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/config/rootfiles/core/83/exclude b/config/rootfiles/core/83/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/core/83/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +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/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/83/filelists/bash b/config/rootfiles/core/83/filelists/bash new file mode 120000 index 0000000..de970cb --- /dev/null +++ b/config/rootfiles/core/83/filelists/bash @@ -0,0 +1 @@ +../../../common/bash \ No newline at end of file diff --git a/config/rootfiles/core/83/filelists/files b/config/rootfiles/core/83/filelists/files new file mode 100644 index 0000000..5c0b6fe --- /dev/null +++ b/config/rootfiles/core/83/filelists/files @@ -0,0 +1,6 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/logs.cgi/ids.dat +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/urlfilter.cgi +var/ipfire/general-functions.pl diff --git a/config/rootfiles/core/83/filelists/findutils b/config/rootfiles/core/83/filelists/findutils new file mode 120000 index 0000000..545280a --- /dev/null +++ b/config/rootfiles/core/83/filelists/findutils @@ -0,0 +1 @@ +../../../common/findutils \ No newline at end of file diff --git a/config/rootfiles/core/83/filelists/squid b/config/rootfiles/core/83/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/83/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/83/meta b/config/rootfiles/core/83/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/83/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/83/update.sh b/config/rootfiles/core/83/update.sh new file mode 100644 index 0000000..195ba23 --- /dev/null +++ b/config/rootfiles/core/83/update.sh @@ -0,0 +1,56 @@ +#!/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) 2014 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=83 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Remove old files + +# Extract files +extract_files + +# Start services + +# 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/config/rootfiles/oldcore/82/exclude b/config/rootfiles/oldcore/82/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/oldcore/82/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +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/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/82/filelists/armv5tel/gmp b/config/rootfiles/oldcore/82/filelists/armv5tel/gmp new file mode 120000 index 0000000..2bdf30d --- /dev/null +++ b/config/rootfiles/oldcore/82/filelists/armv5tel/gmp @@ -0,0 +1 @@ +../../../../common/armv5tel/gmp \ No newline at end of file diff --git a/config/rootfiles/oldcore/82/filelists/batctl b/config/rootfiles/oldcore/82/filelists/batctl new file mode 120000 index 0000000..6a6edde --- /dev/null +++ b/config/rootfiles/oldcore/82/filelists/batctl @@ -0,0 +1 @@ +../../../common/batctl \ No newline at end of file diff --git a/config/rootfiles/oldcore/82/filelists/boost b/config/rootfiles/oldcore/82/filelists/boost new file mode 120000 index 0000000..05246f0 --- /dev/null +++ b/config/rootfiles/oldcore/82/filelists/boost @@ -0,0 +1 @@ +../../../common/boost \ No newline at end of file diff --git a/config/rootfiles/oldcore/82/filelists/files b/config/rootfiles/oldcore/82/filelists/files new file mode 100644 index 0000000..19e551c --- /dev/null +++ b/config/rootfiles/oldcore/82/filelists/files @@ -0,0 +1,15 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/firewall +etc/rc.d/init.d/networking/red.down/20-firewall +etc/rc.d/init.d/networking/red.up/20-firewall +srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/optionsfw.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +usr/lib/firewall/rules.pl +var/ipfire/general-functions.pl +var/ipfire/langs +var/ipfire/network-functions.pl diff --git a/config/rootfiles/oldcore/82/filelists/i586/gmp b/config/rootfiles/oldcore/82/filelists/i586/gmp new file mode 120000 index 0000000..52a09cd --- /dev/null +++ b/config/rootfiles/oldcore/82/filelists/i586/gmp @@ -0,0 +1 @@ +../../../../common/i586/gmp \ No newline at end of file diff --git a/config/rootfiles/oldcore/82/filelists/libnl-3 b/config/rootfiles/oldcore/82/filelists/libnl-3 new file mode 120000 index 0000000..00e61c2 --- /dev/null +++ b/config/rootfiles/oldcore/82/filelists/libnl-3 @@ -0,0 +1 @@ +../../../common/libnl-3 \ No newline at end of file diff --git a/config/rootfiles/oldcore/82/filelists/mpfr b/config/rootfiles/oldcore/82/filelists/mpfr new file mode 120000 index 0000000..c8468bf --- /dev/null +++ b/config/rootfiles/oldcore/82/filelists/mpfr @@ -0,0 +1 @@ +../../../common/mpfr \ No newline at end of file diff --git a/config/rootfiles/oldcore/82/filelists/ppp b/config/rootfiles/oldcore/82/filelists/ppp new file mode 120000 index 0000000..4844a9b --- /dev/null +++ b/config/rootfiles/oldcore/82/filelists/ppp @@ -0,0 +1 @@ +../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/oldcore/82/meta b/config/rootfiles/oldcore/82/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/82/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/82/update.sh b/config/rootfiles/oldcore/82/update.sh new file mode 100644 index 0000000..76677ae --- /dev/null +++ b/config/rootfiles/oldcore/82/update.sh @@ -0,0 +1,57 @@ +#!/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) 2014 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=82 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Remove old files +rm -vf /etc/rc.d/init.d/networking/red.up/20-RL-firewall + +# Extract files +extract_files + +# Start services + +# 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 ce45d0d..2b8f769 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.15" # Version number -CORE="82" # Core Level (Filename) +CORE="83" # Core Level (Filename) PAKFIRE_CORE="82" # 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