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 d82668d553b7005fbf1666e6336ecb5e63f0a11d (commit) via 072f4c10ccf4c28b906dd89943e3b23008211b59 (commit) via c45c2a1561884bb51ce24c71c824829a5aa89e54 (commit) from 2fc5124b7ea5dd6b7035574e68be0f6441aec77e (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 d82668d553b7005fbf1666e6336ecb5e63f0a11d Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Aug 14 12:45:37 2014 +0200
core82: Add changed files
commit 072f4c10ccf4c28b906dd89943e3b23008211b59 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Aug 14 12:27:56 2014 +0200
Move core updates 80 and 81 to oldcore.
commit c45c2a1561884bb51ce24c71c824829a5aa89e54 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Aug 14 12:27:15 2014 +0200
Create empty core update 82.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/{80 => 82}/exclude | 0 config/rootfiles/core/82/filelists/armv5tel/gmp | 1 + config/rootfiles/core/82/filelists/batctl | 1 + config/rootfiles/core/82/filelists/boost | 1 + config/rootfiles/core/82/filelists/files | 15 +++++++++++++++ config/rootfiles/core/{80 => 82}/filelists/i586/gmp | 0 config/rootfiles/core/82/filelists/libnl-3 | 1 + config/rootfiles/{oldcore/66 => core/82}/filelists/mpfr | 0 config/rootfiles/core/{80 => 82}/meta | 0 config/rootfiles/core/{81 => 82}/update.sh | 12 ++++++------ config/rootfiles/{core/81 => oldcore/80}/exclude | 0 config/rootfiles/{core => oldcore}/80/filelists/bind | 0 config/rootfiles/{core => oldcore}/80/filelists/ddns | 0 config/rootfiles/{core => oldcore}/80/filelists/dnsmasq | 0 config/rootfiles/{core => oldcore}/80/filelists/files | 0 config/rootfiles/{core => oldcore}/80/filelists/i586/gmp | 0 config/rootfiles/{core => oldcore}/80/filelists/libgcrypt | 0 .../rootfiles/{core => oldcore}/80/filelists/libgpg-error | 0 config/rootfiles/{core => oldcore}/80/filelists/lzo | 0 config/rootfiles/{core => oldcore}/80/filelists/nettle | 0 config/rootfiles/{core => oldcore}/80/filelists/rng-tools | 0 .../rootfiles/{core => oldcore}/80/filelists/strongswan | 0 .../{core => oldcore}/80/filelists/wpa_supplicant | 0 config/rootfiles/{core/81 => oldcore/80}/meta | 0 config/rootfiles/{core => oldcore}/80/update.sh | 0 config/rootfiles/{core/80 => oldcore/81}/exclude | 0 config/rootfiles/{core => oldcore}/81/filelists/ddns | 0 config/rootfiles/{core => oldcore}/81/filelists/files | 0 config/rootfiles/{core => oldcore}/81/filelists/lzo | 0 config/rootfiles/{core => oldcore}/81/filelists/openssh | 0 config/rootfiles/{core => oldcore}/81/filelists/openssl | 0 config/rootfiles/{core/80 => oldcore/81}/meta | 0 config/rootfiles/{core => oldcore}/81/update.sh | 0 make.sh | 2 +- 34 files changed, 26 insertions(+), 7 deletions(-) copy config/rootfiles/core/{80 => 82}/exclude (100%) create mode 120000 config/rootfiles/core/82/filelists/armv5tel/gmp create mode 120000 config/rootfiles/core/82/filelists/batctl create mode 120000 config/rootfiles/core/82/filelists/boost create mode 100644 config/rootfiles/core/82/filelists/files copy config/rootfiles/core/{80 => 82}/filelists/i586/gmp (100%) create mode 120000 config/rootfiles/core/82/filelists/libnl-3 copy config/rootfiles/{oldcore/66 => core/82}/filelists/mpfr (100%) copy config/rootfiles/core/{80 => 82}/meta (100%) copy config/rootfiles/core/{81 => 82}/update.sh (92%) rename config/rootfiles/{core/81 => oldcore/80}/exclude (100%) rename config/rootfiles/{core => oldcore}/80/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/80/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/80/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/80/filelists/files (100%) rename config/rootfiles/{core => oldcore}/80/filelists/i586/gmp (100%) rename config/rootfiles/{core => oldcore}/80/filelists/libgcrypt (100%) rename config/rootfiles/{core => oldcore}/80/filelists/libgpg-error (100%) rename config/rootfiles/{core => oldcore}/80/filelists/lzo (100%) rename config/rootfiles/{core => oldcore}/80/filelists/nettle (100%) rename config/rootfiles/{core => oldcore}/80/filelists/rng-tools (100%) rename config/rootfiles/{core => oldcore}/80/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/80/filelists/wpa_supplicant (100%) rename config/rootfiles/{core/81 => oldcore/80}/meta (100%) rename config/rootfiles/{core => oldcore}/80/update.sh (100%) rename config/rootfiles/{core/80 => oldcore/81}/exclude (100%) rename config/rootfiles/{core => oldcore}/81/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/81/filelists/files (100%) rename config/rootfiles/{core => oldcore}/81/filelists/lzo (100%) rename config/rootfiles/{core => oldcore}/81/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/81/filelists/openssl (100%) rename config/rootfiles/{core/80 => oldcore/81}/meta (100%) rename config/rootfiles/{core => oldcore}/81/update.sh (100%)
Difference in files: diff --git a/config/rootfiles/core/80/exclude b/config/rootfiles/core/80/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/80/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/80/filelists/bind b/config/rootfiles/core/80/filelists/bind deleted file mode 120000 index 48a0eba..0000000 --- a/config/rootfiles/core/80/filelists/bind +++ /dev/null @@ -1 +0,0 @@ -../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/80/filelists/ddns b/config/rootfiles/core/80/filelists/ddns deleted file mode 120000 index 7395164..0000000 --- a/config/rootfiles/core/80/filelists/ddns +++ /dev/null @@ -1 +0,0 @@ -../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/80/filelists/dnsmasq b/config/rootfiles/core/80/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/80/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files deleted file mode 100644 index cdddaac..0000000 --- a/config/rootfiles/core/80/filelists/files +++ /dev/null @@ -1,21 +0,0 @@ -etc/system-release -etc/issue -etc/logrotate.conf -etc/rc.d/init.d/cleanfs -etc/rc.d/init.d/dhcrelay -etc/rc.d/init.d/dnsmasq -etc/rc.d/init.d/firewall -etc/rc.d/init.d/networking/red.up/30-ddns -etc/rc.d/init.d/rngd -srv/web/ipfire/cgi-bin/ddns.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat -srv/web/ipfire/cgi-bin/logs.cgi/log.dat -srv/web/ipfire/cgi-bin/netexternal.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/cgi-bin/routing.cgi -usr/sbin/dhcrelay -var/ipfire/general-functions.pl -var/ipfire/header.pl -var/ipfire/langs diff --git a/config/rootfiles/core/80/filelists/i586/gmp b/config/rootfiles/core/80/filelists/i586/gmp deleted file mode 120000 index 52a09cd..0000000 --- a/config/rootfiles/core/80/filelists/i586/gmp +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/gmp \ No newline at end of file diff --git a/config/rootfiles/core/80/filelists/libgcrypt b/config/rootfiles/core/80/filelists/libgcrypt deleted file mode 120000 index 2df12a2..0000000 --- a/config/rootfiles/core/80/filelists/libgcrypt +++ /dev/null @@ -1 +0,0 @@ -../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/core/80/filelists/libgpg-error b/config/rootfiles/core/80/filelists/libgpg-error deleted file mode 120000 index cad4313..0000000 --- a/config/rootfiles/core/80/filelists/libgpg-error +++ /dev/null @@ -1 +0,0 @@ -../../../common/libgpg-error \ No newline at end of file diff --git a/config/rootfiles/core/80/filelists/lzo b/config/rootfiles/core/80/filelists/lzo deleted file mode 120000 index 8e11e78..0000000 --- a/config/rootfiles/core/80/filelists/lzo +++ /dev/null @@ -1 +0,0 @@ -../../../common/lzo \ No newline at end of file diff --git a/config/rootfiles/core/80/filelists/nettle b/config/rootfiles/core/80/filelists/nettle deleted file mode 120000 index f0dba7a..0000000 --- a/config/rootfiles/core/80/filelists/nettle +++ /dev/null @@ -1 +0,0 @@ -../../../common/nettle \ No newline at end of file diff --git a/config/rootfiles/core/80/filelists/rng-tools b/config/rootfiles/core/80/filelists/rng-tools deleted file mode 120000 index a7853e4..0000000 --- a/config/rootfiles/core/80/filelists/rng-tools +++ /dev/null @@ -1 +0,0 @@ -../../../common/rng-tools \ No newline at end of file diff --git a/config/rootfiles/core/80/filelists/strongswan b/config/rootfiles/core/80/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/80/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/80/filelists/wpa_supplicant b/config/rootfiles/core/80/filelists/wpa_supplicant deleted file mode 120000 index 1d04c03..0000000 --- a/config/rootfiles/core/80/filelists/wpa_supplicant +++ /dev/null @@ -1 +0,0 @@ -../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/80/meta b/config/rootfiles/core/80/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/80/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh deleted file mode 100644 index 67244c6..0000000 --- a/config/rootfiles/core/80/update.sh +++ /dev/null @@ -1,101 +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=80 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# Stop services -/etc/init.d/ipsec stop - -# Remove old strongswan files -rm -f \ - /etc/strongswan.d/charon/unity.conf \ - /usr/lib/ipsec/plugins/libstrongswan-unity.so \ - /usr/share/strongswan/templates/config/plugins/unity.conf - -rm -f /usr/local/bin/setddns.pl - -# Extract files -extract_files - -# Start services -/etc/init.d/dnsmasq restart -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" - -# Uninstall the libgpg-error package. -rm -f \ - /opt/pakfire/db/installed/meta-libgpg-error \ - /opt/pakfire/db/rootfiles/libgpg-error - -# Fix broken proxy configuration permissions -chown -R nobody.nobody \ - /var/ipfire/proxy/advanced \ - /var/ipfire/proxy/acl-1.4 \ - /var/ipfire/proxy/enable \ - /var/ipfire/proxy/settings \ - /var/ipfire/proxy/squid.conf \ - /var/ipfire/proxy/transparent - -# Regenerate squid configuration file -sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi - -# Generate ddns configuration file -sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi - -# Update crontab -sed -i /var/spool/cron/root.orig -e "/setddns.pl/d" - -grep -q /usr/bin/ddns /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig - -# Update dynamic DNS records every five minutes. -# Force an update once a month -*/5 * * * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all -3 2 1 * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all --force -EOF - -fcrontab -z &>/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/config/rootfiles/core/81/exclude b/config/rootfiles/core/81/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/81/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/81/filelists/ddns b/config/rootfiles/core/81/filelists/ddns deleted file mode 120000 index 7395164..0000000 --- a/config/rootfiles/core/81/filelists/ddns +++ /dev/null @@ -1 +0,0 @@ -../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/81/filelists/files b/config/rootfiles/core/81/filelists/files deleted file mode 100644 index 4b0ae1e..0000000 --- a/config/rootfiles/core/81/filelists/files +++ /dev/null @@ -1,5 +0,0 @@ -etc/system-release -etc/issue -etc/rc.d/init.d/firewall -srv/web/ipfire/cgi-bin/ddns.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi diff --git a/config/rootfiles/core/81/filelists/lzo b/config/rootfiles/core/81/filelists/lzo deleted file mode 120000 index 8e11e78..0000000 --- a/config/rootfiles/core/81/filelists/lzo +++ /dev/null @@ -1 +0,0 @@ -../../../common/lzo \ No newline at end of file diff --git a/config/rootfiles/core/81/filelists/openssh b/config/rootfiles/core/81/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/81/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/81/filelists/openssl b/config/rootfiles/core/81/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/81/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/81/meta b/config/rootfiles/core/81/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/81/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/81/update.sh b/config/rootfiles/core/81/update.sh deleted file mode 100644 index 16a559e..0000000 --- a/config/rootfiles/core/81/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=81 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# Stop services - -# Remove old strongswan files - -# Extract files -extract_files - -# Start services -/etc/init.d/apache restart - -# 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/82/exclude b/config/rootfiles/core/82/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/core/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/core/82/filelists/armv5tel/gmp b/config/rootfiles/core/82/filelists/armv5tel/gmp new file mode 120000 index 0000000..2bdf30d --- /dev/null +++ b/config/rootfiles/core/82/filelists/armv5tel/gmp @@ -0,0 +1 @@ +../../../../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 new file mode 120000 index 0000000..6a6edde --- /dev/null +++ b/config/rootfiles/core/82/filelists/batctl @@ -0,0 +1 @@ +../../../common/batctl \ No newline at end of file diff --git a/config/rootfiles/core/82/filelists/boost b/config/rootfiles/core/82/filelists/boost new file mode 120000 index 0000000..05246f0 --- /dev/null +++ b/config/rootfiles/core/82/filelists/boost @@ -0,0 +1 @@ +../../../common/boost \ No newline at end of file diff --git a/config/rootfiles/core/82/filelists/files b/config/rootfiles/core/82/filelists/files new file mode 100644 index 0000000..19e551c --- /dev/null +++ b/config/rootfiles/core/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/core/82/filelists/i586/gmp b/config/rootfiles/core/82/filelists/i586/gmp new file mode 120000 index 0000000..52a09cd --- /dev/null +++ b/config/rootfiles/core/82/filelists/i586/gmp @@ -0,0 +1 @@ +../../../../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 new file mode 120000 index 0000000..00e61c2 --- /dev/null +++ b/config/rootfiles/core/82/filelists/libnl-3 @@ -0,0 +1 @@ +../../../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 new file mode 120000 index 0000000..c8468bf --- /dev/null +++ b/config/rootfiles/core/82/filelists/mpfr @@ -0,0 +1 @@ +../../../common/mpfr \ No newline at end of file diff --git a/config/rootfiles/core/82/meta b/config/rootfiles/core/82/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/82/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/82/update.sh b/config/rootfiles/core/82/update.sh new file mode 100644 index 0000000..76677ae --- /dev/null +++ b/config/rootfiles/core/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/config/rootfiles/oldcore/80/exclude b/config/rootfiles/oldcore/80/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/oldcore/80/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/80/filelists/bind b/config/rootfiles/oldcore/80/filelists/bind new file mode 120000 index 0000000..48a0eba --- /dev/null +++ b/config/rootfiles/oldcore/80/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/oldcore/80/filelists/ddns b/config/rootfiles/oldcore/80/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/oldcore/80/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/oldcore/80/filelists/dnsmasq b/config/rootfiles/oldcore/80/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/oldcore/80/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/oldcore/80/filelists/files b/config/rootfiles/oldcore/80/filelists/files new file mode 100644 index 0000000..cdddaac --- /dev/null +++ b/config/rootfiles/oldcore/80/filelists/files @@ -0,0 +1,21 @@ +etc/system-release +etc/issue +etc/logrotate.conf +etc/rc.d/init.d/cleanfs +etc/rc.d/init.d/dhcrelay +etc/rc.d/init.d/dnsmasq +etc/rc.d/init.d/firewall +etc/rc.d/init.d/networking/red.up/30-ddns +etc/rc.d/init.d/rngd +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/cgi-bin/netexternal.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/routing.cgi +usr/sbin/dhcrelay +var/ipfire/general-functions.pl +var/ipfire/header.pl +var/ipfire/langs diff --git a/config/rootfiles/oldcore/80/filelists/i586/gmp b/config/rootfiles/oldcore/80/filelists/i586/gmp new file mode 120000 index 0000000..52a09cd --- /dev/null +++ b/config/rootfiles/oldcore/80/filelists/i586/gmp @@ -0,0 +1 @@ +../../../../common/i586/gmp \ No newline at end of file diff --git a/config/rootfiles/oldcore/80/filelists/libgcrypt b/config/rootfiles/oldcore/80/filelists/libgcrypt new file mode 120000 index 0000000..2df12a2 --- /dev/null +++ b/config/rootfiles/oldcore/80/filelists/libgcrypt @@ -0,0 +1 @@ +../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/oldcore/80/filelists/libgpg-error b/config/rootfiles/oldcore/80/filelists/libgpg-error new file mode 120000 index 0000000..cad4313 --- /dev/null +++ b/config/rootfiles/oldcore/80/filelists/libgpg-error @@ -0,0 +1 @@ +../../../common/libgpg-error \ No newline at end of file diff --git a/config/rootfiles/oldcore/80/filelists/lzo b/config/rootfiles/oldcore/80/filelists/lzo new file mode 120000 index 0000000..8e11e78 --- /dev/null +++ b/config/rootfiles/oldcore/80/filelists/lzo @@ -0,0 +1 @@ +../../../common/lzo \ No newline at end of file diff --git a/config/rootfiles/oldcore/80/filelists/nettle b/config/rootfiles/oldcore/80/filelists/nettle new file mode 120000 index 0000000..f0dba7a --- /dev/null +++ b/config/rootfiles/oldcore/80/filelists/nettle @@ -0,0 +1 @@ +../../../common/nettle \ No newline at end of file diff --git a/config/rootfiles/oldcore/80/filelists/rng-tools b/config/rootfiles/oldcore/80/filelists/rng-tools new file mode 120000 index 0000000..a7853e4 --- /dev/null +++ b/config/rootfiles/oldcore/80/filelists/rng-tools @@ -0,0 +1 @@ +../../../common/rng-tools \ No newline at end of file diff --git a/config/rootfiles/oldcore/80/filelists/strongswan b/config/rootfiles/oldcore/80/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/80/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/80/filelists/wpa_supplicant b/config/rootfiles/oldcore/80/filelists/wpa_supplicant new file mode 120000 index 0000000..1d04c03 --- /dev/null +++ b/config/rootfiles/oldcore/80/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/oldcore/80/meta b/config/rootfiles/oldcore/80/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/80/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/80/update.sh b/config/rootfiles/oldcore/80/update.sh new file mode 100644 index 0000000..67244c6 --- /dev/null +++ b/config/rootfiles/oldcore/80/update.sh @@ -0,0 +1,101 @@ +#!/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=80 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +/etc/init.d/ipsec stop + +# Remove old strongswan files +rm -f \ + /etc/strongswan.d/charon/unity.conf \ + /usr/lib/ipsec/plugins/libstrongswan-unity.so \ + /usr/share/strongswan/templates/config/plugins/unity.conf + +rm -f /usr/local/bin/setddns.pl + +# Extract files +extract_files + +# Start services +/etc/init.d/dnsmasq restart +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" + +# Uninstall the libgpg-error package. +rm -f \ + /opt/pakfire/db/installed/meta-libgpg-error \ + /opt/pakfire/db/rootfiles/libgpg-error + +# Fix broken proxy configuration permissions +chown -R nobody.nobody \ + /var/ipfire/proxy/advanced \ + /var/ipfire/proxy/acl-1.4 \ + /var/ipfire/proxy/enable \ + /var/ipfire/proxy/settings \ + /var/ipfire/proxy/squid.conf \ + /var/ipfire/proxy/transparent + +# Regenerate squid configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi + +# Generate ddns configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi + +# Update crontab +sed -i /var/spool/cron/root.orig -e "/setddns.pl/d" + +grep -q /usr/bin/ddns /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig + +# Update dynamic DNS records every five minutes. +# Force an update once a month +*/5 * * * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all +3 2 1 * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all --force +EOF + +fcrontab -z &>/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/config/rootfiles/oldcore/81/exclude b/config/rootfiles/oldcore/81/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/oldcore/81/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/81/filelists/ddns b/config/rootfiles/oldcore/81/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/oldcore/81/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/oldcore/81/filelists/files b/config/rootfiles/oldcore/81/filelists/files new file mode 100644 index 0000000..4b0ae1e --- /dev/null +++ b/config/rootfiles/oldcore/81/filelists/files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/firewall +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi diff --git a/config/rootfiles/oldcore/81/filelists/lzo b/config/rootfiles/oldcore/81/filelists/lzo new file mode 120000 index 0000000..8e11e78 --- /dev/null +++ b/config/rootfiles/oldcore/81/filelists/lzo @@ -0,0 +1 @@ +../../../common/lzo \ No newline at end of file diff --git a/config/rootfiles/oldcore/81/filelists/openssh b/config/rootfiles/oldcore/81/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/81/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/81/filelists/openssl b/config/rootfiles/oldcore/81/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/81/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/81/meta b/config/rootfiles/oldcore/81/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/81/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/81/update.sh b/config/rootfiles/oldcore/81/update.sh new file mode 100644 index 0000000..16a559e --- /dev/null +++ b/config/rootfiles/oldcore/81/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=81 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Remove old strongswan files + +# Extract files +extract_files + +# Start services +/etc/init.d/apache restart + +# 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 739fc53..4cbdae4 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="81" # Core Level (Filename) +CORE="82" # Core Level (Filename) PAKFIRE_CORE="81" # 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