IPFire-SCM March 2015

ipfire-scm@lists.ipfire.org

1 participants
63 discussions

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0fbf41404c75702d73b5234c6dde210c346ae0e6
by git＠ipfire.org 17 Mar '15

17 Mar '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c98cc4ae90643b9a43431be5de7d821c110267c0
by git＠ipfire.org 17 Mar '15

17 Mar '15

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 c98cc4ae90643b9a43431be5de7d821c110267c0 (commit) via a810e7665e3e039981d2caec9d1dda3c20a08b56 (commit) via 22ecf3100a1cefd3e07f34ba400c7b2e254866fe (commit) via 3e0982277a6a69048ab2e1eaf029a4b610c0c31d (commit) via 20aa2ca56261c2a39c995af2cb824fc9bdc76fb1 (commit) via 3d53eb68afe9b9a1feffdd7e68af21767461ee48 (commit) via 3b90253598c5ceea9f4c92e1b363a72d9424c7b8 (commit) via 9029c9d056e2251b6c1130b2b3a8f0e5a77bff40 (commit) via e5f58910c522420511f793e84282343b2e6506a6 (commit) via de7abd2cd52e3751ac94d5d56ae9ff510311fc67 (commit) via 6f67121767baf299bb118da35dfe35732f98a9f7 (commit) via 6409aa7e549d236eedaeae35c84d5e9c1a10ff18 (commit) via d0bd5afe1b27020b41d0e7e043578e313a0ebf39 (commit) via 33bfe91f5b3a332f8a711d00de8f967243daf6c5 (commit) via a71beeb2342c5dcc3c99c5523e74c3914b9cbee9 (commit) via 42c545b1f5848767251cffc9ffb6d29b3cd7a4c3 (commit) via 4a0e9b63184ad7dc280299d6619fd91e91d0f895 (commit) from e60cd3a4042e95cf2748aac2de9d991c724ef24d (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 c98cc4ae90643b9a43431be5de7d821c110267c0 Merge: e60cd3a a810e76 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 17 14:05:56 2015 +0100 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/cfgroot/lang.pl | 3 +++ config/rootfiles/common/armv5tel/initscripts | 1 + config/rootfiles/common/i586/initscripts | 1 + config/rootfiles/core/88/filelists/files | 6 ------ config/rootfiles/core/{88 => 89}/exclude | 0 .../{oldcore/66 => core/89}/filelists/collectd | 0 config/rootfiles/core/{88 => 89}/filelists/daq | 0 config/rootfiles/core/{88 => 89}/filelists/ddns | 0 config/rootfiles/core/{88 => 89}/filelists/dnsmasq | 0 config/rootfiles/core/{88 => 89}/filelists/ethtool | 0 config/rootfiles/core/{88 => 89}/filelists/fcron | 0 config/rootfiles/core/{88 => 89}/filelists/file | 0 config/rootfiles/core/89/filelists/files | 18 ++++++++++++++++++ .../{oldcore/38 => core/89}/filelists/fuse | 0 config/rootfiles/core/{88 => 89}/filelists/gnupg | 0 config/rootfiles/core/{88 => 89}/filelists/grep | 0 config/rootfiles/core/{88 => 89}/filelists/hdparm | 0 config/rootfiles/core/{88 => 89}/filelists/libart | 0 config/rootfiles/core/{88 => 89}/filelists/libcap | 0 config/rootfiles/core/{88 => 89}/filelists/libffi | 0 config/rootfiles/core/{88 => 89}/filelists/libpcap | 0 .../{oldcore/49 => core/89}/filelists/ntfs-3g | 0 .../{oldcore/81 => core/89}/filelists/openssh | 0 .../{oldcore/87 => core/89}/filelists/openssl | 0 .../87 => core/89}/filelists/openssl-compat | 0 config/rootfiles/core/{88 => 89}/filelists/pcre | 0 config/rootfiles/core/{88 => 89}/filelists/screen | 0 .../{oldcore/87 => core/89}/filelists/setup | 0 .../core/{88 => 89}/filelists/smartmontools | 0 config/rootfiles/core/{88 => 89}/filelists/snort | 0 config/rootfiles/core/{88 => 89}/filelists/sqlite | 0 config/rootfiles/core/{88 => 89}/filelists/squid | 0 .../{oldcore/87 => core/89}/filelists/strongswan | 0 config/rootfiles/core/{88 => 89}/filelists/tar | 0 .../{oldcore/87 => core/89}/filelists/tzdata | 0 config/rootfiles/core/{88 => 89}/filelists/wget | 0 config/rootfiles/core/{88 => 89}/filelists/zlib | 0 config/rootfiles/core/{88 => 89}/meta | 0 config/rootfiles/core/{88 => 89}/update.sh | 14 +++++++++++--- html/cgi-bin/ddns.cgi | 3 ++- lfs/crda | 1 - lfs/openssl | 3 +-- lfs/openssl-compat | 1 + make.sh | 4 ++-- src/patches/crda-3.13-crypto_use_optional.patch | 22 ---------------------- src/patches/openssl-disable-sslv2-sslv3.patch | 13 +++++++++++++ 46 files changed, 53 insertions(+), 37 deletions(-) mode change 100755 => 100644 config/rootfiles/common/armv5tel/initscripts mode change 100755 => 100644 config/rootfiles/common/i586/initscripts delete mode 100644 config/rootfiles/core/88/filelists/files rename config/rootfiles/core/{88 => 89}/exclude (100%) copy config/rootfiles/{oldcore/66 => core/89}/filelists/collectd (100%) rename config/rootfiles/core/{88 => 89}/filelists/daq (100%) rename config/rootfiles/core/{88 => 89}/filelists/ddns (100%) rename config/rootfiles/core/{88 => 89}/filelists/dnsmasq (100%) rename config/rootfiles/core/{88 => 89}/filelists/ethtool (100%) rename config/rootfiles/core/{88 => 89}/filelists/fcron (100%) rename config/rootfiles/core/{88 => 89}/filelists/file (100%) create mode 100644 config/rootfiles/core/89/filelists/files copy config/rootfiles/{oldcore/38 => core/89}/filelists/fuse (100%) rename config/rootfiles/core/{88 => 89}/filelists/gnupg (100%) rename config/rootfiles/core/{88 => 89}/filelists/grep (100%) rename config/rootfiles/core/{88 => 89}/filelists/hdparm (100%) rename config/rootfiles/core/{88 => 89}/filelists/libart (100%) rename config/rootfiles/core/{88 => 89}/filelists/libcap (100%) rename config/rootfiles/core/{88 => 89}/filelists/libffi (100%) rename config/rootfiles/core/{88 => 89}/filelists/libpcap (100%) copy config/rootfiles/{oldcore/49 => core/89}/filelists/ntfs-3g (100%) copy config/rootfiles/{oldcore/81 => core/89}/filelists/openssh (100%) copy config/rootfiles/{oldcore/87 => core/89}/filelists/openssl (100%) copy config/rootfiles/{oldcore/87 => core/89}/filelists/openssl-compat (100%) rename config/rootfiles/core/{88 => 89}/filelists/pcre (100%) rename config/rootfiles/core/{88 => 89}/filelists/screen (100%) copy config/rootfiles/{oldcore/87 => core/89}/filelists/setup (100%) rename config/rootfiles/core/{88 => 89}/filelists/smartmontools (100%) rename config/rootfiles/core/{88 => 89}/filelists/snort (100%) rename config/rootfiles/core/{88 => 89}/filelists/sqlite (100%) rename config/rootfiles/core/{88 => 89}/filelists/squid (100%) copy config/rootfiles/{oldcore/87 => core/89}/filelists/strongswan (100%) rename config/rootfiles/core/{88 => 89}/filelists/tar (100%) copy config/rootfiles/{oldcore/87 => core/89}/filelists/tzdata (100%) rename config/rootfiles/core/{88 => 89}/filelists/wget (100%) rename config/rootfiles/core/{88 => 89}/filelists/zlib (100%) rename config/rootfiles/core/{88 => 89}/meta (100%) rename config/rootfiles/core/{88 => 89}/update.sh (88%) delete mode 100644 src/patches/crda-3.13-crypto_use_optional.patch create mode 100644 src/patches/openssl-disable-sslv2-sslv3.patch Difference in files: diff --git a/config/cfgroot/lang.pl b/config/cfgroot/lang.pl index 3b001ad..c77e0a0 100644 --- a/config/cfgroot/lang.pl +++ b/config/cfgroot/lang.pl @@ -169,6 +169,9 @@ sub FindWebLanguage() { my ($language, $country) = split(/_/, $shortlang); push(@options, $language); + # Add English as fallback + push(@options, "en"); + foreach my $option (@options) { return $option if (-e "${General::swroot}/langs/$option.pl"); } diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts old mode 100755 new mode 100644 index 05b8cee..8ddf34a --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -34,6 +34,7 @@ etc/rc.d/init.d/firstsetup etc/rc.d/init.d/functions #etc/rc.d/init.d/gnump3d etc/rc.d/init.d/halt +#etc/rc.d/init.d/haproxy #etc/rc.d/init.d/hostapd #etc/rc.d/init.d/imspector etc/rc.d/init.d/ipsec diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts old mode 100755 new mode 100644 index d4779ab..3d4dd62 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -36,6 +36,7 @@ etc/rc.d/init.d/firstsetup etc/rc.d/init.d/functions #etc/rc.d/init.d/gnump3d etc/rc.d/init.d/halt +#etc/rc.d/init.d/haproxy #etc/rc.d/init.d/hostapd #etc/rc.d/init.d/imspector etc/rc.d/init.d/ipsec diff --git a/config/rootfiles/core/88/exclude b/config/rootfiles/core/88/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/88/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/88/filelists/daq b/config/rootfiles/core/88/filelists/daq deleted file mode 120000 index d0e0956..0000000 --- a/config/rootfiles/core/88/filelists/daq +++ /dev/null @@ -1 +0,0 @@ -../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/ddns b/config/rootfiles/core/88/filelists/ddns deleted file mode 120000 index 7395164..0000000 --- a/config/rootfiles/core/88/filelists/ddns +++ /dev/null @@ -1 +0,0 @@ -../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/dnsmasq b/config/rootfiles/core/88/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/88/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/ethtool b/config/rootfiles/core/88/filelists/ethtool deleted file mode 120000 index 494a53e..0000000 --- a/config/rootfiles/core/88/filelists/ethtool +++ /dev/null @@ -1 +0,0 @@ -../../../common/ethtool \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/fcron b/config/rootfiles/core/88/filelists/fcron deleted file mode 120000 index 4a454ea..0000000 --- a/config/rootfiles/core/88/filelists/fcron +++ /dev/null @@ -1 +0,0 @@ -../../../common/fcron \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/file b/config/rootfiles/core/88/filelists/file deleted file mode 120000 index 0c60e43..0000000 --- a/config/rootfiles/core/88/filelists/file +++ /dev/null @@ -1 +0,0 @@ -../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/files b/config/rootfiles/core/88/filelists/files deleted file mode 100644 index 0251b5d..0000000 --- a/config/rootfiles/core/88/filelists/files +++ /dev/null @@ -1,6 +0,0 @@ -etc/system-release -etc/issue -srv/web/ipfire/cgi-bin/fwhosts.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -var/ipfire/backup/bin/backup.pl -var/ipfire/langs diff --git a/config/rootfiles/core/88/filelists/gnupg b/config/rootfiles/core/88/filelists/gnupg deleted file mode 120000 index a1a1564..0000000 --- a/config/rootfiles/core/88/filelists/gnupg +++ /dev/null @@ -1 +0,0 @@ -../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/grep b/config/rootfiles/core/88/filelists/grep deleted file mode 120000 index ab5ef8b..0000000 --- a/config/rootfiles/core/88/filelists/grep +++ /dev/null @@ -1 +0,0 @@ -../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/hdparm b/config/rootfiles/core/88/filelists/hdparm deleted file mode 120000 index b644751..0000000 --- a/config/rootfiles/core/88/filelists/hdparm +++ /dev/null @@ -1 +0,0 @@ -../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/libart b/config/rootfiles/core/88/filelists/libart deleted file mode 120000 index bb1e078..0000000 --- a/config/rootfiles/core/88/filelists/libart +++ /dev/null @@ -1 +0,0 @@ -../../../common/libart \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/libcap b/config/rootfiles/core/88/filelists/libcap deleted file mode 120000 index ed67d95..0000000 --- a/config/rootfiles/core/88/filelists/libcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/libffi b/config/rootfiles/core/88/filelists/libffi deleted file mode 120000 index c391acd..0000000 --- a/config/rootfiles/core/88/filelists/libffi +++ /dev/null @@ -1 +0,0 @@ -../../../common/libffi \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/libpcap b/config/rootfiles/core/88/filelists/libpcap deleted file mode 120000 index c7f9f52..0000000 --- a/config/rootfiles/core/88/filelists/libpcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/pcre b/config/rootfiles/core/88/filelists/pcre deleted file mode 120000 index b390d9a..0000000 --- a/config/rootfiles/core/88/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/screen b/config/rootfiles/core/88/filelists/screen deleted file mode 120000 index 81008f4..0000000 --- a/config/rootfiles/core/88/filelists/screen +++ /dev/null @@ -1 +0,0 @@ -../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/smartmontools b/config/rootfiles/core/88/filelists/smartmontools deleted file mode 120000 index fb66daf..0000000 --- a/config/rootfiles/core/88/filelists/smartmontools +++ /dev/null @@ -1 +0,0 @@ -../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/snort b/config/rootfiles/core/88/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/88/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/sqlite b/config/rootfiles/core/88/filelists/sqlite deleted file mode 120000 index 4ea5697..0000000 --- a/config/rootfiles/core/88/filelists/sqlite +++ /dev/null @@ -1 +0,0 @@ -../../../common/sqlite \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/squid b/config/rootfiles/core/88/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/88/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/tar b/config/rootfiles/core/88/filelists/tar deleted file mode 120000 index 3e585d2..0000000 --- a/config/rootfiles/core/88/filelists/tar +++ /dev/null @@ -1 +0,0 @@ -../../../common/tar \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/wget b/config/rootfiles/core/88/filelists/wget deleted file mode 120000 index fcb57df..0000000 --- a/config/rootfiles/core/88/filelists/wget +++ /dev/null @@ -1 +0,0 @@ -../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/zlib b/config/rootfiles/core/88/filelists/zlib deleted file mode 120000 index e345663..0000000 --- a/config/rootfiles/core/88/filelists/zlib +++ /dev/null @@ -1 +0,0 @@ -../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/core/88/meta b/config/rootfiles/core/88/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/88/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/88/update.sh b/config/rootfiles/core/88/update.sh deleted file mode 100644 index 18dd9af..0000000 --- a/config/rootfiles/core/88/update.sh +++ /dev/null @@ -1,64 +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(a)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=88 -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" - -# Uninstall the sqlite package. -rm -f \ - /opt/pakfire/db/installed/meta-sqlite \ - /opt/pakfire/db/rootfiles/sqlite - -# Fix #10625 -mkdir -p /etc/logrotate.d - -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/89/exclude b/config/rootfiles/core/89/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/core/89/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/89/filelists/collectd b/config/rootfiles/core/89/filelists/collectd new file mode 120000 index 0000000..871b32f --- /dev/null +++ b/config/rootfiles/core/89/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/daq b/config/rootfiles/core/89/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/core/89/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/ddns b/config/rootfiles/core/89/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/core/89/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/dnsmasq b/config/rootfiles/core/89/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/core/89/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/ethtool b/config/rootfiles/core/89/filelists/ethtool new file mode 120000 index 0000000..494a53e --- /dev/null +++ b/config/rootfiles/core/89/filelists/ethtool @@ -0,0 +1 @@ +../../../common/ethtool \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/fcron b/config/rootfiles/core/89/filelists/fcron new file mode 120000 index 0000000..4a454ea --- /dev/null +++ b/config/rootfiles/core/89/filelists/fcron @@ -0,0 +1 @@ +../../../common/fcron \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/file b/config/rootfiles/core/89/filelists/file new file mode 120000 index 0000000..0c60e43 --- /dev/null +++ b/config/rootfiles/core/89/filelists/file @@ -0,0 +1 @@ +../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/files b/config/rootfiles/core/89/filelists/files new file mode 100644 index 0000000..5ed7194 --- /dev/null +++ b/config/rootfiles/core/89/filelists/files @@ -0,0 +1,18 @@ +etc/system-release +etc/issue +etc/collectd.conf +etc/collectd.vpn +etc/rc.d/init.d/dnsmasq +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/netovpnrw.cgi +srv/web/ipfire/cgi-bin/netovpnsrv.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +var/ipfire/backup/bin/backup.pl +var/ipfire/graphs.pl +var/ipfire/langs +var/ipfire/lang.pl +var/ipfire/menu.d/20-status.menu diff --git a/config/rootfiles/core/89/filelists/fuse b/config/rootfiles/core/89/filelists/fuse new file mode 120000 index 0000000..570edaa --- /dev/null +++ b/config/rootfiles/core/89/filelists/fuse @@ -0,0 +1 @@ +../../../common/fuse \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/gnupg b/config/rootfiles/core/89/filelists/gnupg new file mode 120000 index 0000000..a1a1564 --- /dev/null +++ b/config/rootfiles/core/89/filelists/gnupg @@ -0,0 +1 @@ +../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/grep b/config/rootfiles/core/89/filelists/grep new file mode 120000 index 0000000..ab5ef8b --- /dev/null +++ b/config/rootfiles/core/89/filelists/grep @@ -0,0 +1 @@ +../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/hdparm b/config/rootfiles/core/89/filelists/hdparm new file mode 120000 index 0000000..b644751 --- /dev/null +++ b/config/rootfiles/core/89/filelists/hdparm @@ -0,0 +1 @@ +../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libart b/config/rootfiles/core/89/filelists/libart new file mode 120000 index 0000000..bb1e078 --- /dev/null +++ b/config/rootfiles/core/89/filelists/libart @@ -0,0 +1 @@ +../../../common/libart \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libcap b/config/rootfiles/core/89/filelists/libcap new file mode 120000 index 0000000..ed67d95 --- /dev/null +++ b/config/rootfiles/core/89/filelists/libcap @@ -0,0 +1 @@ +../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libffi b/config/rootfiles/core/89/filelists/libffi new file mode 120000 index 0000000..c391acd --- /dev/null +++ b/config/rootfiles/core/89/filelists/libffi @@ -0,0 +1 @@ +../../../common/libffi \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libpcap b/config/rootfiles/core/89/filelists/libpcap new file mode 120000 index 0000000..c7f9f52 --- /dev/null +++ b/config/rootfiles/core/89/filelists/libpcap @@ -0,0 +1 @@ +../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/ntfs-3g b/config/rootfiles/core/89/filelists/ntfs-3g new file mode 120000 index 0000000..d93adc2 --- /dev/null +++ b/config/rootfiles/core/89/filelists/ntfs-3g @@ -0,0 +1 @@ +../../../common/ntfs-3g \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/openssh b/config/rootfiles/core/89/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/89/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/openssl b/config/rootfiles/core/89/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/89/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/openssl-compat b/config/rootfiles/core/89/filelists/openssl-compat new file mode 120000 index 0000000..c9fa421 --- /dev/null +++ b/config/rootfiles/core/89/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/pcre b/config/rootfiles/core/89/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/core/89/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/screen b/config/rootfiles/core/89/filelists/screen new file mode 120000 index 0000000..81008f4 --- /dev/null +++ b/config/rootfiles/core/89/filelists/screen @@ -0,0 +1 @@ +../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/setup b/config/rootfiles/core/89/filelists/setup new file mode 120000 index 0000000..209374b --- /dev/null +++ b/config/rootfiles/core/89/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/smartmontools b/config/rootfiles/core/89/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/core/89/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/snort b/config/rootfiles/core/89/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/89/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/sqlite b/config/rootfiles/core/89/filelists/sqlite new file mode 120000 index 0000000..4ea5697 --- /dev/null +++ b/config/rootfiles/core/89/filelists/sqlite @@ -0,0 +1 @@ +../../../common/sqlite \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/squid b/config/rootfiles/core/89/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/89/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/strongswan b/config/rootfiles/core/89/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/89/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/tar b/config/rootfiles/core/89/filelists/tar new file mode 120000 index 0000000..3e585d2 --- /dev/null +++ b/config/rootfiles/core/89/filelists/tar @@ -0,0 +1 @@ +../../../common/tar \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/tzdata b/config/rootfiles/core/89/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/core/89/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/wget b/config/rootfiles/core/89/filelists/wget new file mode 120000 index 0000000..fcb57df --- /dev/null +++ b/config/rootfiles/core/89/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/zlib b/config/rootfiles/core/89/filelists/zlib new file mode 120000 index 0000000..e345663 --- /dev/null +++ b/config/rootfiles/core/89/filelists/zlib @@ -0,0 +1 @@ +../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/core/89/meta b/config/rootfiles/core/89/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/89/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh new file mode 100644 index 0000000..f3de863 --- /dev/null +++ b/config/rootfiles/core/89/update.sh @@ -0,0 +1,72 @@ +#!/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(a)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=89 +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 files + +# Extract files +extract_files + +# Generate ddns configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi + +# 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" + +# Prevent uninstall sqlite (now common package). +rm -f \ + /opt/pakfire/db/*/meta-sqlite \ + /opt/pakfire/db/rootfiles/sqlite + +# Fix #10625 +mkdir -p /etc/logrotate.d + +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/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index ea30319..044aa97 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -667,7 +667,8 @@ sub GenerateDDNSConfigFile { my $use_token = 0; # Handle token based auth for various providers. - if ($provider ~~ ["dns.lightningwirelabs.com", "entrydns.net", "regfish.com", "spdns.de"] && $username eq "token") { + if ($provider ~~ ["dns.lightningwirelabs.com", "entrydns.net", "regfish.com", + "spdns.de", "zzzz.io"] && $username eq "token") { $use_token = 1; # Handle token auth for freedns.afraid.org and regfish.com. diff --git a/lfs/crda b/lfs/crda index 2b1aff8..8bee258 100644 --- a/lfs/crda +++ b/lfs/crda @@ -71,7 +71,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/crda-3.13-crypto_use_optional.patch cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/openssl b/lfs/openssl index 82f26bd..df068f3 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -86,6 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1e-cryptodev.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1e-fix_parallel_build-1.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1e-weak-ciphers.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-disable-sslv2-sslv3.patch cd $(DIR_APP) && find crypto/ -name Makefile -exec \ sed 's/^ASFLAGS=/&-Wa,--noexecstack /' -i {} \; @@ -105,8 +106,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) no-mdc2 \ no-rc5 \ no-srp \ - no-ssl2 \ - no-ssl3 \ $(CONFIGURE_ARGS) \ -DSSL_FORBID_ENULL \ -DHAVE_CRYPTODEV \ diff --git a/lfs/openssl-compat b/lfs/openssl-compat index 52a8e91..8e22a34 100644 --- a/lfs/openssl-compat +++ b/lfs/openssl-compat @@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8u-cryptodev.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-disable-sslv2-sslv3.patch cd $(DIR_APP) && sed -i -e 's/mcpu/march/' config cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-march=i486/-march=i586/' Configure diff --git a/make.sh b/make.sh index 7d41b59..d049888 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.17" # Version number -CORE="87" # Core Level (Filename) -PAKFIRE_CORE="87" # Core Level (PAKFIRE) +CORE="88" # Core Level (Filename) +PAKFIRE_CORE="88" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/patches/crda-3.13-crypto_use_optional.patch b/src/patches/crda-3.13-crypto_use_optional.patch deleted file mode 100644 index 56ad6b7..0000000 --- a/src/patches/crda-3.13-crypto_use_optional.patch +++ /dev/null @@ -1,22 +0,0 @@ -Submitted By: hauke from OpenWRT -Date: 2009-04-17 -Initial Package Version: 1.0.2 -Origin: https://dev.openwrt.org/changeset/15405/trunk/package/crda/patches/101-make… -Description: The patch was modified for version crda-3.13 by Erik Kapfer <erik.kapfer(a)ipfire.org>.. -This patch provides the following improvements: - * Crypto usage is optional. - -diff -Nur crda-3.13.orig/Makefile crda-3.13/Makefile ---- crda-3.13.orig/Makefile 2015-01-12 07:55:08.791183765 +0100 -+++ crda-3.13/Makefile 2015-01-12 07:56:35.437381029 +0100 -@@ -43,7 +43,9 @@ - - $(LIBREG): keys-ssl.c - --else -+endif -+ -+ifeq ($(USE_GCRYPT),1) - CFLAGS += -DUSE_GCRYPT - LDLIBS += -lgcrypt - diff --git a/src/patches/openssl-disable-sslv2-sslv3.patch b/src/patches/openssl-disable-sslv2-sslv3.patch new file mode 100644 index 0000000..ebf5429 --- /dev/null +++ b/src/patches/openssl-disable-sslv2-sslv3.patch @@ -0,0 +1,13 @@ +diff -up openssl-1.0.1h/ssl/ssl_lib.c.v2v3 openssl-1.0.1h/ssl/ssl_lib.c +--- openssl-1.0.1h/ssl/ssl_lib.c.v2v3 2014-06-11 16:02:52.000000000 +0200 ++++ openssl-1.0.1h/ssl/ssl_lib.c 2014-06-30 14:18:04.290248080 +0200 +@@ -1875,6 +1875,9 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *m + */ + ret->options |= SSL_OP_LEGACY_SERVER_CONNECT; + ++ /* Disable SSLv2 and SSLv3 by default (affects the SSLv23_method() only) */ ++ ret->options |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; ++ + return(ret); + err: + SSLerr(SSL_F_SSL_CTX_NEW,ERR_R_MALLOC_FAILURE); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. a810e7665e3e039981d2caec9d1dda3c20a08b56
by git＠ipfire.org 17 Mar '15

17 Mar '15

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, master has been updated via a810e7665e3e039981d2caec9d1dda3c20a08b56 (commit) via 22ecf3100a1cefd3e07f34ba400c7b2e254866fe (commit) via 3e0982277a6a69048ab2e1eaf029a4b610c0c31d (commit) via 20aa2ca56261c2a39c995af2cb824fc9bdc76fb1 (commit) from 3d53eb68afe9b9a1feffdd7e68af21767461ee48 (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 a810e7665e3e039981d2caec9d1dda3c20a08b56 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 17 14:03:31 2015 +0100 core89: stop/start ipsec, rewrite ddns config with new cgi. commit 22ecf3100a1cefd3e07f34ba400c7b2e254866fe Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 17 13:56:51 2015 +0100 core89: add changed packages to updater. commit 3e0982277a6a69048ab2e1eaf029a4b610c0c31d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 17 13:54:19 2015 +0100 core89: remove all sqlite meta-data files. commit 20aa2ca56261c2a39c995af2cb824fc9bdc76fb1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 17 13:50:38 2015 +0100 move core88 to 89. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{88 => 89}/exclude | 0 config/rootfiles/core/{88 => 89}/filelists/collectd | 0 config/rootfiles/core/{88 => 89}/filelists/daq | 0 config/rootfiles/core/{88 => 89}/filelists/ddns | 0 config/rootfiles/core/{88 => 89}/filelists/dnsmasq | 0 config/rootfiles/core/{88 => 89}/filelists/ethtool | 0 config/rootfiles/core/{88 => 89}/filelists/fcron | 0 config/rootfiles/core/{88 => 89}/filelists/file | 0 config/rootfiles/core/{88 => 89}/filelists/files | 0 config/rootfiles/{oldcore/38 => core/89}/filelists/fuse | 0 config/rootfiles/core/{88 => 89}/filelists/gnupg | 0 config/rootfiles/core/{88 => 89}/filelists/grep | 0 config/rootfiles/core/{88 => 89}/filelists/hdparm | 0 config/rootfiles/core/{88 => 89}/filelists/libart | 0 config/rootfiles/core/{88 => 89}/filelists/libcap | 0 config/rootfiles/core/{88 => 89}/filelists/libffi | 0 config/rootfiles/core/{88 => 89}/filelists/libpcap | 0 config/rootfiles/{oldcore/49 => core/89}/filelists/ntfs-3g | 0 config/rootfiles/core/{88 => 89}/filelists/openssh | 0 config/rootfiles/core/{88 => 89}/filelists/openssl | 0 config/rootfiles/core/{88 => 89}/filelists/openssl-compat | 0 config/rootfiles/core/{88 => 89}/filelists/pcre | 0 config/rootfiles/core/{88 => 89}/filelists/screen | 0 config/rootfiles/{oldcore/87 => core/89}/filelists/setup | 0 config/rootfiles/core/{88 => 89}/filelists/smartmontools | 0 config/rootfiles/core/{88 => 89}/filelists/snort | 0 config/rootfiles/core/{88 => 89}/filelists/sqlite | 0 config/rootfiles/core/{88 => 89}/filelists/squid | 0 config/rootfiles/core/{88 => 89}/filelists/strongswan | 0 config/rootfiles/core/{88 => 89}/filelists/tar | 0 config/rootfiles/core/{88 => 89}/filelists/tzdata | 0 config/rootfiles/core/{88 => 89}/filelists/wget | 0 config/rootfiles/core/{88 => 89}/filelists/zlib | 0 config/rootfiles/core/{88 => 89}/meta | 0 config/rootfiles/core/{88 => 89}/update.sh | 14 +++++++++++--- 35 files changed, 11 insertions(+), 3 deletions(-) rename config/rootfiles/core/{88 => 89}/exclude (100%) rename config/rootfiles/core/{88 => 89}/filelists/collectd (100%) rename config/rootfiles/core/{88 => 89}/filelists/daq (100%) rename config/rootfiles/core/{88 => 89}/filelists/ddns (100%) rename config/rootfiles/core/{88 => 89}/filelists/dnsmasq (100%) rename config/rootfiles/core/{88 => 89}/filelists/ethtool (100%) rename config/rootfiles/core/{88 => 89}/filelists/fcron (100%) rename config/rootfiles/core/{88 => 89}/filelists/file (100%) rename config/rootfiles/core/{88 => 89}/filelists/files (100%) copy config/rootfiles/{oldcore/38 => core/89}/filelists/fuse (100%) rename config/rootfiles/core/{88 => 89}/filelists/gnupg (100%) rename config/rootfiles/core/{88 => 89}/filelists/grep (100%) rename config/rootfiles/core/{88 => 89}/filelists/hdparm (100%) rename config/rootfiles/core/{88 => 89}/filelists/libart (100%) rename config/rootfiles/core/{88 => 89}/filelists/libcap (100%) rename config/rootfiles/core/{88 => 89}/filelists/libffi (100%) rename config/rootfiles/core/{88 => 89}/filelists/libpcap (100%) copy config/rootfiles/{oldcore/49 => core/89}/filelists/ntfs-3g (100%) rename config/rootfiles/core/{88 => 89}/filelists/openssh (100%) rename config/rootfiles/core/{88 => 89}/filelists/openssl (100%) rename config/rootfiles/core/{88 => 89}/filelists/openssl-compat (100%) rename config/rootfiles/core/{88 => 89}/filelists/pcre (100%) rename config/rootfiles/core/{88 => 89}/filelists/screen (100%) copy config/rootfiles/{oldcore/87 => core/89}/filelists/setup (100%) rename config/rootfiles/core/{88 => 89}/filelists/smartmontools (100%) rename config/rootfiles/core/{88 => 89}/filelists/snort (100%) rename config/rootfiles/core/{88 => 89}/filelists/sqlite (100%) rename config/rootfiles/core/{88 => 89}/filelists/squid (100%) rename config/rootfiles/core/{88 => 89}/filelists/strongswan (100%) rename config/rootfiles/core/{88 => 89}/filelists/tar (100%) rename config/rootfiles/core/{88 => 89}/filelists/tzdata (100%) rename config/rootfiles/core/{88 => 89}/filelists/wget (100%) rename config/rootfiles/core/{88 => 89}/filelists/zlib (100%) rename config/rootfiles/core/{88 => 89}/meta (100%) rename config/rootfiles/core/{88 => 89}/update.sh (88%) Difference in files: diff --git a/config/rootfiles/core/88/exclude b/config/rootfiles/core/88/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/88/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/88/filelists/collectd b/config/rootfiles/core/88/filelists/collectd deleted file mode 120000 index 871b32f..0000000 --- a/config/rootfiles/core/88/filelists/collectd +++ /dev/null @@ -1 +0,0 @@ -../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/daq b/config/rootfiles/core/88/filelists/daq deleted file mode 120000 index d0e0956..0000000 --- a/config/rootfiles/core/88/filelists/daq +++ /dev/null @@ -1 +0,0 @@ -../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/ddns b/config/rootfiles/core/88/filelists/ddns deleted file mode 120000 index 7395164..0000000 --- a/config/rootfiles/core/88/filelists/ddns +++ /dev/null @@ -1 +0,0 @@ -../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/dnsmasq b/config/rootfiles/core/88/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/88/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/ethtool b/config/rootfiles/core/88/filelists/ethtool deleted file mode 120000 index 494a53e..0000000 --- a/config/rootfiles/core/88/filelists/ethtool +++ /dev/null @@ -1 +0,0 @@ -../../../common/ethtool \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/fcron b/config/rootfiles/core/88/filelists/fcron deleted file mode 120000 index 4a454ea..0000000 --- a/config/rootfiles/core/88/filelists/fcron +++ /dev/null @@ -1 +0,0 @@ -../../../common/fcron \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/file b/config/rootfiles/core/88/filelists/file deleted file mode 120000 index 0c60e43..0000000 --- a/config/rootfiles/core/88/filelists/file +++ /dev/null @@ -1 +0,0 @@ -../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/files b/config/rootfiles/core/88/filelists/files deleted file mode 100644 index 5ed7194..0000000 --- a/config/rootfiles/core/88/filelists/files +++ /dev/null @@ -1,18 +0,0 @@ -etc/system-release -etc/issue -etc/collectd.conf -etc/collectd.vpn -etc/rc.d/init.d/dnsmasq -srv/web/ipfire/cgi-bin/ddns.cgi -srv/web/ipfire/cgi-bin/firewall.cgi -srv/web/ipfire/cgi-bin/fwhosts.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/netovpnrw.cgi -srv/web/ipfire/cgi-bin/netovpnsrv.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -var/ipfire/backup/bin/backup.pl -var/ipfire/graphs.pl -var/ipfire/langs -var/ipfire/lang.pl -var/ipfire/menu.d/20-status.menu diff --git a/config/rootfiles/core/88/filelists/gnupg b/config/rootfiles/core/88/filelists/gnupg deleted file mode 120000 index a1a1564..0000000 --- a/config/rootfiles/core/88/filelists/gnupg +++ /dev/null @@ -1 +0,0 @@ -../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/grep b/config/rootfiles/core/88/filelists/grep deleted file mode 120000 index ab5ef8b..0000000 --- a/config/rootfiles/core/88/filelists/grep +++ /dev/null @@ -1 +0,0 @@ -../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/hdparm b/config/rootfiles/core/88/filelists/hdparm deleted file mode 120000 index b644751..0000000 --- a/config/rootfiles/core/88/filelists/hdparm +++ /dev/null @@ -1 +0,0 @@ -../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/libart b/config/rootfiles/core/88/filelists/libart deleted file mode 120000 index bb1e078..0000000 --- a/config/rootfiles/core/88/filelists/libart +++ /dev/null @@ -1 +0,0 @@ -../../../common/libart \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/libcap b/config/rootfiles/core/88/filelists/libcap deleted file mode 120000 index ed67d95..0000000 --- a/config/rootfiles/core/88/filelists/libcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/libffi b/config/rootfiles/core/88/filelists/libffi deleted file mode 120000 index c391acd..0000000 --- a/config/rootfiles/core/88/filelists/libffi +++ /dev/null @@ -1 +0,0 @@ -../../../common/libffi \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/libpcap b/config/rootfiles/core/88/filelists/libpcap deleted file mode 120000 index c7f9f52..0000000 --- a/config/rootfiles/core/88/filelists/libpcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/openssh b/config/rootfiles/core/88/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/88/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/openssl b/config/rootfiles/core/88/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/88/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/openssl-compat b/config/rootfiles/core/88/filelists/openssl-compat deleted file mode 120000 index c9fa421..0000000 --- a/config/rootfiles/core/88/filelists/openssl-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/pcre b/config/rootfiles/core/88/filelists/pcre deleted file mode 120000 index b390d9a..0000000 --- a/config/rootfiles/core/88/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/screen b/config/rootfiles/core/88/filelists/screen deleted file mode 120000 index 81008f4..0000000 --- a/config/rootfiles/core/88/filelists/screen +++ /dev/null @@ -1 +0,0 @@ -../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/smartmontools b/config/rootfiles/core/88/filelists/smartmontools deleted file mode 120000 index fb66daf..0000000 --- a/config/rootfiles/core/88/filelists/smartmontools +++ /dev/null @@ -1 +0,0 @@ -../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/snort b/config/rootfiles/core/88/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/88/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/sqlite b/config/rootfiles/core/88/filelists/sqlite deleted file mode 120000 index 4ea5697..0000000 --- a/config/rootfiles/core/88/filelists/sqlite +++ /dev/null @@ -1 +0,0 @@ -../../../common/sqlite \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/squid b/config/rootfiles/core/88/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/88/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/strongswan b/config/rootfiles/core/88/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/88/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/tar b/config/rootfiles/core/88/filelists/tar deleted file mode 120000 index 3e585d2..0000000 --- a/config/rootfiles/core/88/filelists/tar +++ /dev/null @@ -1 +0,0 @@ -../../../common/tar \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/tzdata b/config/rootfiles/core/88/filelists/tzdata deleted file mode 120000 index 5a6e325..0000000 --- a/config/rootfiles/core/88/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/wget b/config/rootfiles/core/88/filelists/wget deleted file mode 120000 index fcb57df..0000000 --- a/config/rootfiles/core/88/filelists/wget +++ /dev/null @@ -1 +0,0 @@ -../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/zlib b/config/rootfiles/core/88/filelists/zlib deleted file mode 120000 index e345663..0000000 --- a/config/rootfiles/core/88/filelists/zlib +++ /dev/null @@ -1 +0,0 @@ -../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/core/88/meta b/config/rootfiles/core/88/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/88/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/88/update.sh b/config/rootfiles/core/88/update.sh deleted file mode 100644 index 18dd9af..0000000 --- a/config/rootfiles/core/88/update.sh +++ /dev/null @@ -1,64 +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(a)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=88 -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" - -# Uninstall the sqlite package. -rm -f \ - /opt/pakfire/db/installed/meta-sqlite \ - /opt/pakfire/db/rootfiles/sqlite - -# Fix #10625 -mkdir -p /etc/logrotate.d - -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/89/exclude b/config/rootfiles/core/89/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/core/89/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/89/filelists/collectd b/config/rootfiles/core/89/filelists/collectd new file mode 120000 index 0000000..871b32f --- /dev/null +++ b/config/rootfiles/core/89/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/daq b/config/rootfiles/core/89/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/core/89/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/ddns b/config/rootfiles/core/89/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/core/89/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/dnsmasq b/config/rootfiles/core/89/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/core/89/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/ethtool b/config/rootfiles/core/89/filelists/ethtool new file mode 120000 index 0000000..494a53e --- /dev/null +++ b/config/rootfiles/core/89/filelists/ethtool @@ -0,0 +1 @@ +../../../common/ethtool \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/fcron b/config/rootfiles/core/89/filelists/fcron new file mode 120000 index 0000000..4a454ea --- /dev/null +++ b/config/rootfiles/core/89/filelists/fcron @@ -0,0 +1 @@ +../../../common/fcron \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/file b/config/rootfiles/core/89/filelists/file new file mode 120000 index 0000000..0c60e43 --- /dev/null +++ b/config/rootfiles/core/89/filelists/file @@ -0,0 +1 @@ +../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/files b/config/rootfiles/core/89/filelists/files new file mode 100644 index 0000000..5ed7194 --- /dev/null +++ b/config/rootfiles/core/89/filelists/files @@ -0,0 +1,18 @@ +etc/system-release +etc/issue +etc/collectd.conf +etc/collectd.vpn +etc/rc.d/init.d/dnsmasq +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/netovpnrw.cgi +srv/web/ipfire/cgi-bin/netovpnsrv.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +var/ipfire/backup/bin/backup.pl +var/ipfire/graphs.pl +var/ipfire/langs +var/ipfire/lang.pl +var/ipfire/menu.d/20-status.menu diff --git a/config/rootfiles/core/89/filelists/fuse b/config/rootfiles/core/89/filelists/fuse new file mode 120000 index 0000000..570edaa --- /dev/null +++ b/config/rootfiles/core/89/filelists/fuse @@ -0,0 +1 @@ +../../../common/fuse \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/gnupg b/config/rootfiles/core/89/filelists/gnupg new file mode 120000 index 0000000..a1a1564 --- /dev/null +++ b/config/rootfiles/core/89/filelists/gnupg @@ -0,0 +1 @@ +../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/grep b/config/rootfiles/core/89/filelists/grep new file mode 120000 index 0000000..ab5ef8b --- /dev/null +++ b/config/rootfiles/core/89/filelists/grep @@ -0,0 +1 @@ +../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/hdparm b/config/rootfiles/core/89/filelists/hdparm new file mode 120000 index 0000000..b644751 --- /dev/null +++ b/config/rootfiles/core/89/filelists/hdparm @@ -0,0 +1 @@ +../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libart b/config/rootfiles/core/89/filelists/libart new file mode 120000 index 0000000..bb1e078 --- /dev/null +++ b/config/rootfiles/core/89/filelists/libart @@ -0,0 +1 @@ +../../../common/libart \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libcap b/config/rootfiles/core/89/filelists/libcap new file mode 120000 index 0000000..ed67d95 --- /dev/null +++ b/config/rootfiles/core/89/filelists/libcap @@ -0,0 +1 @@ +../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libffi b/config/rootfiles/core/89/filelists/libffi new file mode 120000 index 0000000..c391acd --- /dev/null +++ b/config/rootfiles/core/89/filelists/libffi @@ -0,0 +1 @@ +../../../common/libffi \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/libpcap b/config/rootfiles/core/89/filelists/libpcap new file mode 120000 index 0000000..c7f9f52 --- /dev/null +++ b/config/rootfiles/core/89/filelists/libpcap @@ -0,0 +1 @@ +../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/ntfs-3g b/config/rootfiles/core/89/filelists/ntfs-3g new file mode 120000 index 0000000..d93adc2 --- /dev/null +++ b/config/rootfiles/core/89/filelists/ntfs-3g @@ -0,0 +1 @@ +../../../common/ntfs-3g \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/openssh b/config/rootfiles/core/89/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/89/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/openssl b/config/rootfiles/core/89/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/89/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/openssl-compat b/config/rootfiles/core/89/filelists/openssl-compat new file mode 120000 index 0000000..c9fa421 --- /dev/null +++ b/config/rootfiles/core/89/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/pcre b/config/rootfiles/core/89/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/core/89/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/screen b/config/rootfiles/core/89/filelists/screen new file mode 120000 index 0000000..81008f4 --- /dev/null +++ b/config/rootfiles/core/89/filelists/screen @@ -0,0 +1 @@ +../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/setup b/config/rootfiles/core/89/filelists/setup new file mode 120000 index 0000000..209374b --- /dev/null +++ b/config/rootfiles/core/89/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/smartmontools b/config/rootfiles/core/89/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/core/89/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/snort b/config/rootfiles/core/89/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/89/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/sqlite b/config/rootfiles/core/89/filelists/sqlite new file mode 120000 index 0000000..4ea5697 --- /dev/null +++ b/config/rootfiles/core/89/filelists/sqlite @@ -0,0 +1 @@ +../../../common/sqlite \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/squid b/config/rootfiles/core/89/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/89/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/strongswan b/config/rootfiles/core/89/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/89/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/tar b/config/rootfiles/core/89/filelists/tar new file mode 120000 index 0000000..3e585d2 --- /dev/null +++ b/config/rootfiles/core/89/filelists/tar @@ -0,0 +1 @@ +../../../common/tar \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/tzdata b/config/rootfiles/core/89/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/core/89/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/wget b/config/rootfiles/core/89/filelists/wget new file mode 120000 index 0000000..fcb57df --- /dev/null +++ b/config/rootfiles/core/89/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/89/filelists/zlib b/config/rootfiles/core/89/filelists/zlib new file mode 120000 index 0000000..e345663 --- /dev/null +++ b/config/rootfiles/core/89/filelists/zlib @@ -0,0 +1 @@ +../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/core/89/meta b/config/rootfiles/core/89/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/89/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh new file mode 100644 index 0000000..f3de863 --- /dev/null +++ b/config/rootfiles/core/89/update.sh @@ -0,0 +1,72 @@ +#!/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(a)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=89 +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 files + +# Extract files +extract_files + +# Generate ddns configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi + +# 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" + +# Prevent uninstall sqlite (now common package). +rm -f \ + /opt/pakfire/db/*/meta-sqlite \ + /opt/pakfire/db/rootfiles/sqlite + +# Fix #10625 +mkdir -p /etc/logrotate.d + +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 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e60cd3a4042e95cf2748aac2de9d991c724ef24d
by git＠ipfire.org 13 Mar '15

13 Mar '15

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 e60cd3a4042e95cf2748aac2de9d991c724ef24d (commit) from dfea4f86c22c83e07d0f4a6f2a02166229ecb120 (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 e60cd3a4042e95cf2748aac2de9d991c724ef24d Author: Dominik Hassler <hadfl(a)cpan.org> Date: Fri Mar 13 10:56:03 2015 +0100 use colour of destination network for DNAT ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/connections.cgi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index f1ed212..5c17d33 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -520,7 +520,8 @@ foreach my $line (@conntrack) { } my $sip_colour = ipcolour($sip); - my $dip_colour = ipcolour($dip); + # use colour of destination network for DNAT + my $dip_colour = $dip ne $dip_ret ? ipcolour($dip_ret) : ipcolour($dip); my $sserv = ''; if ($sport < 1024) { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3d53eb68afe9b9a1feffdd7e68af21767461ee48
by git＠ipfire.org 12 Mar '15

12 Mar '15

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, master has been updated via 3d53eb68afe9b9a1feffdd7e68af21767461ee48 (commit) from 3b90253598c5ceea9f4c92e1b363a72d9424c7b8 (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 3d53eb68afe9b9a1feffdd7e68af21767461ee48 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 12 13:25:29 2015 +0100 core88: Add collectd to updater ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/66 => core/88}/filelists/collectd | 0 1 file changed, 0 insertions(+), 0 deletions(-) copy config/rootfiles/{oldcore/66 => core/88}/filelists/collectd (100%) Difference in files: diff --git a/config/rootfiles/core/88/filelists/collectd b/config/rootfiles/core/88/filelists/collectd new file mode 120000 index 0000000..871b32f --- /dev/null +++ b/config/rootfiles/core/88/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 3b90253598c5ceea9f4c92e1b363a72d9424c7b8
by git＠ipfire.org 12 Mar '15

12 Mar '15

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, master has been updated via 3b90253598c5ceea9f4c92e1b363a72d9424c7b8 (commit) from 9029c9d056e2251b6c1130b2b3a8f0e5a77bff40 (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 3b90253598c5ceea9f4c92e1b363a72d9424c7b8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 12 13:14:26 2015 +0100 openssl-compat: Disable SSLv3 and SSLv2 as well ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/81 => core/88}/filelists/openssh | 0 config/rootfiles/{oldcore/87 => core/88}/filelists/openssl | 0 config/rootfiles/{oldcore/87 => core/88}/filelists/openssl-compat | 0 lfs/openssl-compat | 1 + 4 files changed, 1 insertion(+) copy config/rootfiles/{oldcore/81 => core/88}/filelists/openssh (100%) copy config/rootfiles/{oldcore/87 => core/88}/filelists/openssl (100%) copy config/rootfiles/{oldcore/87 => core/88}/filelists/openssl-compat (100%) Difference in files: diff --git a/config/rootfiles/core/88/filelists/openssh b/config/rootfiles/core/88/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/88/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/openssl b/config/rootfiles/core/88/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/88/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/openssl-compat b/config/rootfiles/core/88/filelists/openssl-compat new file mode 120000 index 0000000..c9fa421 --- /dev/null +++ b/config/rootfiles/core/88/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file diff --git a/lfs/openssl-compat b/lfs/openssl-compat index 52a8e91..8e22a34 100644 --- a/lfs/openssl-compat +++ b/lfs/openssl-compat @@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8u-cryptodev.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-disable-sslv2-sslv3.patch cd $(DIR_APP) && sed -i -e 's/mcpu/march/' config cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-march=i486/-march=i586/' Configure hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9029c9d056e2251b6c1130b2b3a8f0e5a77bff40
by git＠ipfire.org 12 Mar '15

12 Mar '15

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, master has been updated via 9029c9d056e2251b6c1130b2b3a8f0e5a77bff40 (commit) via e5f58910c522420511f793e84282343b2e6506a6 (commit) via de7abd2cd52e3751ac94d5d56ae9ff510311fc67 (commit) via 6f67121767baf299bb118da35dfe35732f98a9f7 (commit) via 6409aa7e549d236eedaeae35c84d5e9c1a10ff18 (commit) via d0bd5afe1b27020b41d0e7e043578e313a0ebf39 (commit) via 33bfe91f5b3a332f8a711d00de8f967243daf6c5 (commit) from a71beeb2342c5dcc3c99c5523e74c3914b9cbee9 (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 9029c9d056e2251b6c1130b2b3a8f0e5a77bff40 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 12 13:07:44 2015 +0100 Add more missing files of Core Update 88 commit e5f58910c522420511f793e84282343b2e6506a6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 10 16:21:58 2015 +0100 dnsmasq: Import more patches from upstream commit de7abd2cd52e3751ac94d5d56ae9ff510311fc67 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 10 16:22:09 2015 +0100 dnsmasq: Enable DNSSEC timestamp feature This disables DNSSEC until the system clock has been set correctly. There is a circular dependency on working DNS and being able to resolve DNS records in order to reach a time server. Systems without a RTC or empty RTC battery will start up with time way in the past in which all DNSSEC signatures are invalid. commit 6f67121767baf299bb118da35dfe35732f98a9f7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 12 12:58:04 2015 +0100 core88: Add ddns.cgi to updater commit 6409aa7e549d236eedaeae35c84d5e9c1a10ff18 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Sep 7 15:44:19 2014 +0200 ddns.cgi: Add token handling for zzzz.io. commit d0bd5afe1b27020b41d0e7e043578e313a0ebf39 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 12 12:55:40 2015 +0100 openssl: Disable SSLv3 and SSLv2 by default This patch will disable SSLv3 and SSLv2 by default but leaves the protocol compiled in into the library so that applications can use it when they still need it (e.g. sslscan). commit 33bfe91f5b3a332f8a711d00de8f967243daf6c5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 12 12:55:05 2015 +0100 Revert "openssl: Disable SSLv2 and SSLv3." This reverts commit 98a5192ef2f3cde9b9c6867f69f3a400f3c62ec5. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/88/filelists/files | 11 ++ .../{oldcore/87 => core/88}/filelists/strongswan | 0 .../{oldcore/87 => core/88}/filelists/tzdata | 0 html/cgi-bin/ddns.cgi | 3 +- lfs/crda | 1 - lfs/dnsmasq | 2 + lfs/openssl | 3 +- src/initscripts/init.d/dnsmasq | 2 +- src/patches/crda-3.13-crypto_use_optional.patch | 22 --- .../0056-New-version-of-contrib-reverse-dns.patch | 194 ++++++++++++++++++++ ...C-timestamp-code-to-create-file-later-rem.patch | 202 +++++++++++++++++++++ src/patches/openssl-disable-sslv2-sslv3.patch | 13 ++ 12 files changed, 426 insertions(+), 27 deletions(-) copy config/rootfiles/{oldcore/87 => core/88}/filelists/strongswan (100%) copy config/rootfiles/{oldcore/87 => core/88}/filelists/tzdata (100%) delete mode 100644 src/patches/crda-3.13-crypto_use_optional.patch create mode 100644 src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch create mode 100644 src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch create mode 100644 src/patches/openssl-disable-sslv2-sslv3.patch Difference in files: diff --git a/config/rootfiles/core/88/filelists/files b/config/rootfiles/core/88/filelists/files index fb7073e..5ed7194 100644 --- a/config/rootfiles/core/88/filelists/files +++ b/config/rootfiles/core/88/filelists/files @@ -1,7 +1,18 @@ etc/system-release etc/issue +etc/collectd.conf +etc/collectd.vpn +etc/rc.d/init.d/dnsmasq +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/netovpnrw.cgi +srv/web/ipfire/cgi-bin/netovpnsrv.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/backup/bin/backup.pl +var/ipfire/graphs.pl var/ipfire/langs var/ipfire/lang.pl +var/ipfire/menu.d/20-status.menu diff --git a/config/rootfiles/core/88/filelists/strongswan b/config/rootfiles/core/88/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/88/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/88/filelists/tzdata b/config/rootfiles/core/88/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/core/88/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index ea30319..044aa97 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -667,7 +667,8 @@ sub GenerateDDNSConfigFile { my $use_token = 0; # Handle token based auth for various providers. - if ($provider ~~ ["dns.lightningwirelabs.com", "entrydns.net", "regfish.com", "spdns.de"] && $username eq "token") { + if ($provider ~~ ["dns.lightningwirelabs.com", "entrydns.net", "regfish.com", + "spdns.de", "zzzz.io"] && $username eq "token") { $use_token = 1; # Handle token auth for freedns.afraid.org and regfish.com. diff --git a/lfs/crda b/lfs/crda index 2b1aff8..8bee258 100644 --- a/lfs/crda +++ b/lfs/crda @@ -71,7 +71,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/crda-3.13-crypto_use_optional.patch cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/dnsmasq b/lfs/dnsmasq index c256f75..4bb7f9f 100644 --- a/lfs/dnsmasq +++ b/lfs/dnsmasq @@ -128,6 +128,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0053-Log-parsing-utils-in-contrib-reverse-dns.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0054-Add-dnssec-timestamp-option-and-facility.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0055-Fix-last-commit-to-not-crash-if-uid-changing-not-con.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch cd $(DIR_APP) && sed -i src/config.h \ -e 's|/\* #define HAVE_IDN \*/|#define HAVE_IDN|g' \ diff --git a/lfs/openssl b/lfs/openssl index 82f26bd..df068f3 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -86,6 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1e-cryptodev.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1e-fix_parallel_build-1.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1e-weak-ciphers.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-disable-sslv2-sslv3.patch cd $(DIR_APP) && find crypto/ -name Makefile -exec \ sed 's/^ASFLAGS=/&-Wa,--noexecstack /' -i {} \; @@ -105,8 +106,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) no-mdc2 \ no-rc5 \ no-srp \ - no-ssl2 \ - no-ssl3 \ $(CONFIGURE_ARGS) \ -DSSL_FORBID_ENULL \ -DHAVE_CRYPTODEV \ diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq index 48b9d19..4e37925 100644 --- a/src/initscripts/init.d/dnsmasq +++ b/src/initscripts/init.d/dnsmasq @@ -26,7 +26,7 @@ SHOW_SRV=1 TRUST_ANCHOR=".,19036,8,2,49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5" function dnssec_args() { - local cmdline="--dnssec" + local cmdline="--dnssec --dnssec-timestamp" if [ -n "${TRUST_ANCHOR}" ]; then cmdline="${cmdline} --trust-anchor=${TRUST_ANCHOR}" diff --git a/src/patches/crda-3.13-crypto_use_optional.patch b/src/patches/crda-3.13-crypto_use_optional.patch deleted file mode 100644 index 56ad6b7..0000000 --- a/src/patches/crda-3.13-crypto_use_optional.patch +++ /dev/null @@ -1,22 +0,0 @@ -Submitted By: hauke from OpenWRT -Date: 2009-04-17 -Initial Package Version: 1.0.2 -Origin: https://dev.openwrt.org/changeset/15405/trunk/package/crda/patches/101-make… -Description: The patch was modified for version crda-3.13 by Erik Kapfer <erik.kapfer(a)ipfire.org>.. -This patch provides the following improvements: - * Crypto usage is optional. - -diff -Nur crda-3.13.orig/Makefile crda-3.13/Makefile ---- crda-3.13.orig/Makefile 2015-01-12 07:55:08.791183765 +0100 -+++ crda-3.13/Makefile 2015-01-12 07:56:35.437381029 +0100 -@@ -43,7 +43,9 @@ - - $(LIBREG): keys-ssl.c - --else -+endif -+ -+ifeq ($(USE_GCRYPT),1) - CFLAGS += -DUSE_GCRYPT - LDLIBS += -lgcrypt - diff --git a/src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch b/src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch new file mode 100644 index 0000000..9a05215 --- /dev/null +++ b/src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch @@ -0,0 +1,194 @@ +From 4c960fa90a975d20f75a1ecabd217247f1922c8f Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Wed, 4 Mar 2015 20:32:26 +0000 +Subject: [PATCH 56/57] New version of contrib/reverse-dns + +--- + contrib/reverse-dns/README | 22 +++--- + contrib/reverse-dns/reverse_replace.sh | 131 ++++++++++++++++++++++++++++----- + 2 files changed, 125 insertions(+), 28 deletions(-) + +diff --git a/contrib/reverse-dns/README b/contrib/reverse-dns/README +index f87eb77c4c22..2ec4df1f957e 100644 +--- a/contrib/reverse-dns/README ++++ b/contrib/reverse-dns/README +@@ -1,18 +1,18 @@ +-Hi. ++The script reads stdin and replaces all IP addresses with names before ++outputting it again. IPs from private networks are reverse looked up ++via dns. Other IP adresses are searched for in the dnsmasq query log. ++This gives names (CNAMEs if I understand DNS correctly) that are closer ++to the name the client originally asked for then the names obtained by ++reverse lookup. Just run + +-To translate my routers netstat-nat output into names that actually talk +-to me I have started writing to simple shell scripts. They require ++netstat -n -4 | ./reverse_replace.sh ++ ++to see what it does. It needs + + log-queries + log-facility=/var/log/dnsmasq.log + +-to be set. With +- +-netstat-nat -n -4 | reverse_replace.sh +- +-I get retranslated output. +- +-Sincerely, +-Joachim ++in the dnsmasq configuration. + ++The script runs on debian (with ash installed) and on busybox. + +diff --git a/contrib/reverse-dns/reverse_replace.sh b/contrib/reverse-dns/reverse_replace.sh +index a11c164b7f19..5b4aebd71456 100644 +--- a/contrib/reverse-dns/reverse_replace.sh ++++ b/contrib/reverse-dns/reverse_replace.sh +@@ -1,28 +1,125 @@ +-#!/bin/bash +-# $Id: reverse_replace.sh 4 2015-02-17 20:14:59Z jo $ ++#!/bin/ash ++# $Id: reverse_replace.sh 18 2015-03-01 16:12:35Z jo $ + # + # Usage e.g.: netstat -n -4 | reverse_replace.sh + # Parses stdin for IP4 addresses and replaces them +-# with names retrieved by reverse_dns.sh ++# with names retrieved by parsing the dnsmasq log. ++# This currently only gives CNAMEs. But these ++# usually tell ou more than the mones from reverse ++# lookups. ++# ++# This has been tested on debian and asuswrt. Plese ++# report successful tests on other platforms. ++# ++# Author: Joachim Zobel <jz-2014(a)heute-morgen.de> ++# License: Consider this MIT style licensed. You can ++# do as you ike, but you must not remove my name. + # + +-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +-DNS=$DIR/reverse_dns.sh ++LOG=/var/log/dnsmasq.log ++MAX_LINES=15000 + +-# sed regex ++# sed regex do match IPs + IP_regex='[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' ++# private IP ranges ++IP_private='$^127\.$\|$^192\.168\.$\|$^10\.$\|$^172\.1[6-9]\.$\|$^172\.2[0-9]\.$\|$^172\.3[0-1]\.$' + +-while read LINE; do +- if grep --quiet $IP_regex <<< "$LINE"; then +- IPs=`sed "s#.*\b$$IP_regex$\b.*#\1 #g" <<< "$LINE"` +- IPs=($IPs) +- for IP in "${IPs[@]}" +- do +- NAME=`$DNS $IP` +- # echo "$NAME is $IP"; +- LINE="${LINE/$IP/$NAME}" +- done ++####################################################################### ++# Find Commands ++ ++HOST=nslookup ++if type host > /dev/null 2>&1; then ++ # echo "No need for nslookup, host is there" ++ HOST=host ++fi ++ ++####################################################################### ++# Functions ++ ++# Use shell variables for an (IP) lookup table ++create_lookup_table() ++{ ++ # Parse log into lookup table ++ local CMDS="$( tail -"$MAX_LINES" "$LOG" | \ ++ grep " is $IP_regex" | \ ++ sed "s#.* $[^ ]*$ is $$IP_regex$.*#set_val \2 \1;#" )" ++ ++ local IFS=' ++' ++ for CMD in $CMDS ++ do ++ eval $CMD ++ done ++} ++ ++set_val() ++{ ++ local _IP=$(echo $1 | tr . _) ++ local KEY="__IP__$_IP" ++ eval "$KEY"=$2 ++} ++ ++get_val() ++{ ++ local _IP=$(echo $1 | tr . _) ++ local KEY="__IP__$_IP" ++ eval echo -n '${'"$KEY"'}' ++} ++ ++dns_lookup() ++{ ++ local IP=$1 ++ ++ local RTN="$($HOST $IP | \ ++ sed 's#\s\+#\n#g' | \ ++ grep -v '^$' | \ ++ tail -1 | tr -d '\n' | \ ++ sed 's#\.$##')" ++ if echo $RTN | grep -q NXDOMAIN; then ++ echo -n $IP ++ else ++ echo -n "$RTN" ++ fi ++} ++ ++reverse_dns() ++{ ++ local IP=$1 ++ ++ # Skip if it is not an IP ++ if ! echo $IP | grep -q "^$IP_regex$"; then ++ echo -n $IP ++ return ++ fi ++ ++ # Do a dns lookup, if it is a local IP ++ if echo $IP | grep -q $IP_private; then ++ dns_lookup $IP ++ return + fi ++ ++ local NAME="$(get_val $IP)" ++ ++ if [ -z "$NAME" ]; then ++ echo -n $IP ++ else ++ echo -n $NAME ++ fi ++} ++ ++####################################################################### ++# Main ++create_lookup_table ++ ++while read LINE; do ++ for IP in $(echo "$LINE" | \ ++ sed "s#\b$$IP_regex$\b#\n\1\n#g" | \ ++ grep $IP_regex) ++ do ++ NAME=`reverse_dns $IP ` ++ # echo "$NAME $IP" ++ LINE=`echo "$LINE" | sed "s#$IP#$NAME#" ` ++ done + echo $LINE +-done < /dev/stdin ++done + +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch b/src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch new file mode 100644 index 0000000..df47cd0 --- /dev/null +++ b/src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch @@ -0,0 +1,202 @@ +From 360f2513ab12a9bf1e262d388dd2ea8a566590a3 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Sat, 7 Mar 2015 18:28:06 +0000 +Subject: [PATCH 57/57] Tweak DNSSEC timestamp code to create file later, + removing need to chown it. + +--- + man/dnsmasq.8 | 3 ++- + src/dnsmasq.c | 35 ++++++++++++++++++++++------------- + src/dnsmasq.h | 3 ++- + src/dnssec.c | 18 ++++++++++-------- + 4 files changed, 36 insertions(+), 23 deletions(-) + +diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 +index 097e7d75145c..2db780d90987 100644 +--- a/man/dnsmasq.8 ++++ b/man/dnsmasq.8 +@@ -678,7 +678,8 @@ which have not been throughly checked. + Enables an alternative way of checking the validity of the system time for DNSSEC (see --dnssec-no-timecheck). In this case, the + system time is considered to be valid once it becomes later than the timestamp on the specified file. The file is created and + its timestamp set automatically by dnsmasq. The file must be stored on a persistent filesystem, so that it and its mtime are carried +-over system restarts. ++over system restarts. The timestamp file is created after dnsmasq has dropped root, so it must be in a location writable by the ++unprivileged user that dnsmasq runs as. + .TP + .B --proxy-dnssec + Copy the DNSSEC Authenticated Data bit from upstream servers to downstream clients and cache it. This is an +diff --git a/src/dnsmasq.c b/src/dnsmasq.c +index 9e05c0e31569..f3e5bcffec4f 100644 +--- a/src/dnsmasq.c ++++ b/src/dnsmasq.c +@@ -58,9 +58,6 @@ int main (int argc, char **argv) + struct dhcp_context *context; + struct dhcp_relay *relay; + #endif +-#ifdef HAVE_DNSSEC +- int badtime; +-#endif + + #ifdef LOCALEDIR + setlocale(LC_ALL, ""); +@@ -156,10 +153,10 @@ int main (int argc, char **argv) + { + #ifdef HAVE_DNSSEC + if (!daemon->ds) +- die(_("No trust anchors provided for DNSSEC"), NULL, EC_BADCONF); ++ die(_("no trust anchors provided for DNSSEC"), NULL, EC_BADCONF); + + if (daemon->cachesize < CACHESIZ) +- die(_("Cannot reduce cache size from default when DNSSEC enabled"), NULL, EC_BADCONF); ++ die(_("cannot reduce cache size from default when DNSSEC enabled"), NULL, EC_BADCONF); + #else + die(_("DNSSEC not available: set HAVE_DNSSEC in src/config.h"), NULL, EC_BADCONF); + #endif +@@ -172,10 +169,10 @@ int main (int argc, char **argv) + + #ifdef HAVE_CONNTRACK + if (option_bool(OPT_CONNTRACK) && (daemon->query_port != 0 || daemon->osport)) +- die (_("Cannot use --conntrack AND --query-port"), NULL, EC_BADCONF); ++ die (_("cannot use --conntrack AND --query-port"), NULL, EC_BADCONF); + #else + if (option_bool(OPT_CONNTRACK)) +- die(_("Conntrack support not available: set HAVE_CONNTRACK in src/config.h"), NULL, EC_BADCONF); ++ die(_("conntrack support not available: set HAVE_CONNTRACK in src/config.h"), NULL, EC_BADCONF); + #endif + + #ifdef HAVE_SOLARIS_NETWORK +@@ -195,7 +192,7 @@ int main (int argc, char **argv) + + #ifndef HAVE_LOOP + if (option_bool(OPT_LOOP_DETECT)) +- die(_("Loop detection not available: set HAVE_LOOP in src/config.h"), NULL, EC_BADCONF); ++ die(_("loop detection not available: set HAVE_LOOP in src/config.h"), NULL, EC_BADCONF); + #endif + + now = dnsmasq_time(); +@@ -373,10 +370,6 @@ int main (int argc, char **argv) + if (baduser) + die(_("unknown user or group: %s"), baduser, EC_BADCONF); + +-#ifdef HAVE_DNSSEC +- badtime = setup_timestamp(ent_pw); +-#endif +- + /* implement group defaults, "dip" if available, or group associated with uid */ + if (!daemon->group_set && !gp) + { +@@ -693,10 +686,23 @@ int main (int argc, char **argv) + #ifdef HAVE_DNSSEC + if (option_bool(OPT_DNSSEC_VALID)) + { ++ int rc; ++ ++ /* Delay creating the timestamp file until here, after we've changed user, so that ++ it has the correct owner to allow updating the mtime later. ++ This means we have to report fatal errors via the pipe. */ ++ if ((rc = setup_timestamp()) == -1) ++ { ++ send_event(err_pipe[1], EVENT_TIME_ERR, errno, daemon->timestamp_file); ++ _exit(0); ++ } ++ + my_syslog(LOG_INFO, _("DNSSEC validation enabled")); ++ + if (option_bool(OPT_DNSSEC_TIME)) + my_syslog(LOG_INFO, _("DNSSEC signature timestamps not checked until first cache reload")); +- if (badtime) ++ ++ if (rc == 1) + my_syslog(LOG_INFO, _("DNSSEC signature timestamps not checked until system time valid")); + } + #endif +@@ -1170,6 +1176,9 @@ static void fatal_event(struct event_desc *ev, char *msg) + + case EVENT_TFTP_ERR: + die(_("TFTP directory %s inaccessible: %s"), msg, EC_FILE); ++ ++ case EVENT_TIME_ERR: ++ die(_("cannot create timestamp file %s: %s" ), msg, EC_BADCONF); + } + } + +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index a451cb4dd03c..fc7259881358 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -167,6 +167,7 @@ struct event_desc { + #define EVENT_INIT 21 + #define EVENT_NEWADDR 22 + #define EVENT_NEWROUTE 23 ++#define EVENT_TIME_ERR 24 + + /* Exit codes. */ + #define EC_GOOD 0 +@@ -1152,7 +1153,7 @@ int dnssec_chase_cname(time_t now, struct dns_header *header, size_t plen, char + int dnskey_keytag(int alg, int flags, unsigned char *rdata, int rdlen); + size_t filter_rrsigs(struct dns_header *header, size_t plen); + unsigned char* hash_questions(struct dns_header *header, size_t plen, char *name); +-int setup_timestamp(struct passwd *ent_pw); ++int setup_timestamp(void); + + /* util.c */ + void rand_init(void); +diff --git a/src/dnssec.c b/src/dnssec.c +index c60eacf73c6b..ad0d6f072ba2 100644 +--- a/src/dnssec.c ++++ b/src/dnssec.c +@@ -397,18 +397,21 @@ static int serial_compare_32(unsigned long s1, unsigned long s2) + + /* Called at startup. If the timestamp file is configured and exists, put its mtime on + timestamp_time. If it doesn't exist, create it, and set the mtime to 1-1-2015. +- Change the ownership to the user we'll be running as, so that we can update the mtime. ++ return -1 -> Cannot create file. ++ 0 -> not using timestamp, or timestamp exists and is in past. ++ 1 -> timestamp exists and is in future. + */ ++ + static time_t timestamp_time; + static int back_to_the_future; + +-int setup_timestamp(struct passwd *ent_pw) ++int setup_timestamp(void) + { + struct stat statbuf; + + back_to_the_future = 0; + +- if (!option_bool(OPT_DNSSEC_VALID) || !daemon->timestamp_file) ++ if (!daemon->timestamp_file) + return 0; + + if (stat(daemon->timestamp_file, &statbuf) != -1) +@@ -428,7 +431,8 @@ int setup_timestamp(struct passwd *ent_pw) + + if (errno == ENOENT) + { +- int fd = open(daemon->timestamp_file, O_WRONLY | O_CREAT | O_NONBLOCK, 0666); ++ /* NB. for explanation of O_EXCL flag, see comment on pidfile in dnsmasq.c */ ++ int fd = open(daemon->timestamp_file, O_WRONLY | O_CREAT | O_NONBLOCK | O_EXCL, 0666); + if (fd != -1) + { + struct utimbuf timbuf; +@@ -436,14 +440,12 @@ int setup_timestamp(struct passwd *ent_pw) + close(fd); + + timestamp_time = timbuf.actime = timbuf.modtime = 1420070400; /* 1-1-2015 */ +- if (utime(daemon->timestamp_file, &timbuf) == 0 && +- (!ent_pw || getuid() != 0 || chown(daemon->timestamp_file, ent_pw->pw_uid, -1) == 0)) ++ if (utime(daemon->timestamp_file, &timbuf) == 0) + goto check_and_exit; + } + } + +- die(_("Cannot create timestamp file %s: %s" ), daemon->timestamp_file, EC_BADCONF); +- return 0; ++ return -1; + } + + /* Check whether today/now is between date_start and date_end */ +-- +2.1.0 + diff --git a/src/patches/openssl-disable-sslv2-sslv3.patch b/src/patches/openssl-disable-sslv2-sslv3.patch new file mode 100644 index 0000000..ebf5429 --- /dev/null +++ b/src/patches/openssl-disable-sslv2-sslv3.patch @@ -0,0 +1,13 @@ +diff -up openssl-1.0.1h/ssl/ssl_lib.c.v2v3 openssl-1.0.1h/ssl/ssl_lib.c +--- openssl-1.0.1h/ssl/ssl_lib.c.v2v3 2014-06-11 16:02:52.000000000 +0200 ++++ openssl-1.0.1h/ssl/ssl_lib.c 2014-06-30 14:18:04.290248080 +0200 +@@ -1875,6 +1875,9 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *m + */ + ret->options |= SSL_OP_LEGACY_SERVER_CONNECT; + ++ /* Disable SSLv2 and SSLv3 by default (affects the SSLv23_method() only) */ ++ ret->options |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; ++ + return(ret); + err: + SSLerr(SSL_F_SSL_CTX_NEW,ERR_R_MALLOC_FAILURE); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dfea4f86c22c83e07d0f4a6f2a02166229ecb120
by git＠ipfire.org 11 Mar '15

11 Mar '15

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 dfea4f86c22c83e07d0f4a6f2a02166229ecb120 (commit) from 2d0c7a9f7b8f830a5e2b193ffea4334409e25bf1 (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 dfea4f86c22c83e07d0f4a6f2a02166229ecb120 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 11 18:13:25 2015 +0100 strongswan: Allow using AES-GCM in various configurations ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/strongswan | 3 ++ html/cgi-bin/vpnmain.cgi | 88 +++++++++++++++++++++++++------------- lfs/strongswan | 1 + 3 files changed, 62 insertions(+), 30 deletions(-) Difference in files: diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index e55c43c..a26a86c 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -30,6 +30,7 @@ etc/strongswan.d/charon/eap-tls.conf etc/strongswan.d/charon/eap-ttls.conf etc/strongswan.d/charon/farp.conf etc/strongswan.d/charon/fips-prf.conf +etc/strongswan.d/charon/gcm.conf etc/strongswan.d/charon/gcrypt.conf etc/strongswan.d/charon/gmp.conf etc/strongswan.d/charon/hmac.conf @@ -107,6 +108,7 @@ usr/lib/ipsec/plugins/libstrongswan-eap-tls.so usr/lib/ipsec/plugins/libstrongswan-eap-ttls.so usr/lib/ipsec/plugins/libstrongswan-farp.so usr/lib/ipsec/plugins/libstrongswan-fips-prf.so +usr/lib/ipsec/plugins/libstrongswan-gcm.so usr/lib/ipsec/plugins/libstrongswan-gcrypt.so usr/lib/ipsec/plugins/libstrongswan-gmp.so usr/lib/ipsec/plugins/libstrongswan-hmac.so @@ -187,6 +189,7 @@ usr/sbin/ipsec #usr/share/strongswan/templates/config/plugins/eap-ttls.conf #usr/share/strongswan/templates/config/plugins/farp.conf #usr/share/strongswan/templates/config/plugins/fips-prf.conf +#usr/share/strongswan/templates/config/plugins/gcm.conf #usr/share/strongswan/templates/config/plugins/gcrypt.conf #usr/share/strongswan/templates/config/plugins/gmp.conf #usr/share/strongswan/templates/config/plugins/hmac.conf diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index a6d7056..26f6f53 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -437,14 +437,6 @@ sub writeipsecfiles { } print CONF "\n"; }#foreach key - - # Add post user includes to config file - # After the GUI-connections allows to patch connections. - if (-e "/etc/ipsec.user-post.conf") { - print CONF "include /etc/ipsec.user-post.conf\n"; - print CONF "\n"; - } - print SECRETS $last_secrets if ($last_secrets); close(CONF); close(SECRETS); @@ -1886,12 +1878,12 @@ END $cgiparams{'REMOTE_ID'} = ''; #use default advanced value - $cgiparams{'IKE_ENCRYPTION'} = 'aes256|aes192|aes128|3des'; #[18]; - $cgiparams{'IKE_INTEGRITY'} = 'sha2_256|sha|md5'; #[19]; + $cgiparams{'IKE_ENCRYPTION'} = 'aes256|aes192|aes128|aes256gcm128|aes192gcm128|aes128gcm128|aes256gcm96|aes192gcm96|aes128gcm96|aes256gcm64|aes192gcm64|aes128gcm64'; #[18]; + $cgiparams{'IKE_INTEGRITY'} = 'sha2_512|sha2_256|sha'; #[19]; $cgiparams{'IKE_GROUPTYPE'} = '4096|3072|2048|1536|1024'; #[20]; $cgiparams{'IKE_LIFETIME'} = '3'; #[16]; - $cgiparams{'ESP_ENCRYPTION'} = 'aes256|aes192|aes128|3des'; #[21]; - $cgiparams{'ESP_INTEGRITY'} = 'sha2_256|sha1|md5'; #[22]; + $cgiparams{'ESP_ENCRYPTION'} = 'aes256|aes192|aes128|aes256gcm128|aes192gcm128|aes128gcm128|aes256gcm96|aes192gcm96|aes128gcm96|aes256gcm64|aes192gcm64|aes128gcm64'; #[21]; + $cgiparams{'ESP_INTEGRITY'} = 'sha2_512|sha2_256|sha1'; #[22]; $cgiparams{'ESP_GROUPTYPE'} = ''; #[23]; $cgiparams{'ESP_KEYLIFE'} = '1'; #[17]; $cgiparams{'COMPRESSION'} = 'on'; #[13]; @@ -2145,7 +2137,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || goto ADVANCED_ERROR; } foreach my $val (@temp) { - if ($val !~ /^(aes256|aes192|aes128|3des|camellia256|camellia192|camellia128)$/) { + if ($val !~ /^(aes(256|192|128)(gcm(128|96|64))?|3des|camellia(256|192|128))$/) { $errormessage = $Lang::tr{'invalid input'}; goto ADVANCED_ERROR; } @@ -2176,8 +2168,8 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $errormessage = $Lang::tr{'invalid input for ike lifetime'}; goto ADVANCED_ERROR; } - if ($cgiparams{'IKE_LIFETIME'} < 1 || $cgiparams{'IKE_LIFETIME'} > 24) { - $errormessage = $Lang::tr{'ike lifetime should be between 1 and 24 hours'}; + if ($cgiparams{'IKE_LIFETIME'} < 1 || $cgiparams{'IKE_LIFETIME'} > 8) { + $errormessage = $Lang::tr{'ike lifetime should be between 1 and 8 hours'}; goto ADVANCED_ERROR; } @temp = split('\|', $cgiparams{'ESP_ENCRYPTION'}); @@ -2186,7 +2178,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || goto ADVANCED_ERROR; } foreach my $val (@temp) { - if ($val !~ /^(aes256|aes192|aes128|3des|camellia256|camellia192|camellia128)$/) { + if ($val !~ /^(aes(256|192|128)(gcm(128|96|64))?|3des|camellia(256|192|128))$/) { $errormessage = $Lang::tr{'invalid input'}; goto ADVANCED_ERROR; } @@ -2297,6 +2289,15 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $checked{'IKE_ENCRYPTION'}{'aes256'} = ''; $checked{'IKE_ENCRYPTION'}{'aes192'} = ''; $checked{'IKE_ENCRYPTION'}{'aes128'} = ''; + $checked{'IKE_ENCRYPTION'}{'aes256gcm128'} = ''; + $checked{'IKE_ENCRYPTION'}{'aes192gcm128'} = ''; + $checked{'IKE_ENCRYPTION'}{'aes128gcm128'} = ''; + $checked{'IKE_ENCRYPTION'}{'aes256gcm96'} = ''; + $checked{'IKE_ENCRYPTION'}{'aes192gcm96'} = ''; + $checked{'IKE_ENCRYPTION'}{'aes128gcm96'} = ''; + $checked{'IKE_ENCRYPTION'}{'aes256gcm64'} = ''; + $checked{'IKE_ENCRYPTION'}{'aes192gcm64'} = ''; + $checked{'IKE_ENCRYPTION'}{'aes128gcm64'} = ''; $checked{'IKE_ENCRYPTION'}{'3des'} = ''; $checked{'IKE_ENCRYPTION'}{'camellia256'} = ''; $checked{'IKE_ENCRYPTION'}{'camellia192'} = ''; @@ -2328,6 +2329,15 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $checked{'ESP_ENCRYPTION'}{'aes256'} = ''; $checked{'ESP_ENCRYPTION'}{'aes192'} = ''; $checked{'ESP_ENCRYPTION'}{'aes128'} = ''; + $checked{'ESP_ENCRYPTION'}{'aes256gcm128'} = ''; + $checked{'ESP_ENCRYPTION'}{'aes192gcm128'} = ''; + $checked{'ESP_ENCRYPTION'}{'aes128gcm128'} = ''; + $checked{'ESP_ENCRYPTION'}{'aes256gcm96'} = ''; + $checked{'ESP_ENCRYPTION'}{'aes192gcm96'} = ''; + $checked{'ESP_ENCRYPTION'}{'aes128gcm96'} = ''; + $checked{'ESP_ENCRYPTION'}{'aes256gcm64'} = ''; + $checked{'ESP_ENCRYPTION'}{'aes192gcm64'} = ''; + $checked{'ESP_ENCRYPTION'}{'aes128gcm64'} = ''; $checked{'ESP_ENCRYPTION'}{'3des'} = ''; $checked{'ESP_ENCRYPTION'}{'camellia256'} = ''; $checked{'ESP_ENCRYPTION'}{'camellia192'} = ''; @@ -2406,24 +2416,42 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || <td class='boldbase' width="15%">$Lang::tr{'encryption'}</td> <td class='boldbase'> <select name='IKE_ENCRYPTION' multiple='multiple' size='6' style='width: 100%'> - <option value='aes256' $checked{'IKE_ENCRYPTION'}{'aes256'}>AES (256 bit)</option> - <option value='aes192' $checked{'IKE_ENCRYPTION'}{'aes192'}>AES (192 bit)</option> - <option value='aes128' $checked{'IKE_ENCRYPTION'}{'aes128'}>AES (128 bit)</option> - <option value='3des' $checked{'IKE_ENCRYPTION'}{'3des'}>3DES</option> - <option value='camellia256' $checked{'IKE_ENCRYPTION'}{'camellia256'}>Camellia (256 bit)</option> - <option value='camellia192' $checked{'IKE_ENCRYPTION'}{'camellia192'}>Camellia (192 bit)</option> - <option value='camellia128' $checked{'IKE_ENCRYPTION'}{'camellia128'}>Camellia (128 bit)</option> + <option value='aes256' $checked{'IKE_ENCRYPTION'}{'aes256'}>256 bit AES-CBC</option> + <option value='aes192' $checked{'IKE_ENCRYPTION'}{'aes192'}>192 bit AES-CBC</option> + <option value='aes128' $checked{'IKE_ENCRYPTION'}{'aes128'}>128 bit AES-CBC</option> + <option value='aes256gcm128' $checked{'IKE_ENCRYPTION'}{'aes256gcm128'}>256 bit AES-GCM/128 bit ICV</option> + <option value='aes192gcm128' $checked{'IKE_ENCRYPTION'}{'aes192gcm128'}>192 bit AES-GCM/128 bit ICV</option> + <option value='aes128gcm128' $checked{'IKE_ENCRYPTION'}{'aes128gcm128'}>128 bit AES-GCM/128 bit ICV</option> + <option value='aes256gcm96' $checked{'IKE_ENCRYPTION'}{'aes256gcm96'}>256 bit AES-GCM/96 bit ICV</option> + <option value='aes192gcm96' $checked{'IKE_ENCRYPTION'}{'aes192gcm96'}>192 bit AES-GCM/96 bit ICV</option> + <option value='aes128gcm96' $checked{'IKE_ENCRYPTION'}{'aes128gcm96'}>128 bit AES-GCM/96 bit ICV</option> + <option value='aes256gcm64' $checked{'IKE_ENCRYPTION'}{'aes256gcm64'}>256 bit AES-GCM/64 bit ICV</option> + <option value='aes192gcm64' $checked{'IKE_ENCRYPTION'}{'aes192gcm64'}>192 bit AES-GCM/64 bit ICV</option> + <option value='aes128gcm64' $checked{'IKE_ENCRYPTION'}{'aes128gcm64'}>128 bit AES-GCM/64 bit ICV</option> + <option value='3des' $checked{'IKE_ENCRYPTION'}{'3des'}>168 bit 3DES-EDE-CBC</option> + <option value='camellia256' $checked{'IKE_ENCRYPTION'}{'camellia256'}>256 bit Camellia-CBC</option> + <option value='camellia192' $checked{'IKE_ENCRYPTION'}{'camellia192'}>192 bit Camellia-CBC</option> + <option value='camellia128' $checked{'IKE_ENCRYPTION'}{'camellia128'}>128 bit Camellia-CBC</option> </select> </td> <td class='boldbase'> <select name='ESP_ENCRYPTION' multiple='multiple' size='6' style='width: 100%'> - <option value='aes256' $checked{'ESP_ENCRYPTION'}{'aes256'}>AES (256 bit)</option> - <option value='aes192' $checked{'ESP_ENCRYPTION'}{'aes192'}>AES (192 bit)</option> - <option value='aes128' $checked{'ESP_ENCRYPTION'}{'aes128'}>AES (128 bit)</option> - <option value='3des' $checked{'ESP_ENCRYPTION'}{'3des'}>3DES</option> - <option value='camellia256' $checked{'ESP_ENCRYPTION'}{'camellia256'}>Camellia (256 bit)</option> - <option value='camellia192' $checked{'ESP_ENCRYPTION'}{'camellia192'}>Camellia (192 bit)</option> - <option value='camellia128' $checked{'ESP_ENCRYPTION'}{'camellia128'}>Camellia (128 bit)</option> + <option value='aes256' $checked{'ESP_ENCRYPTION'}{'aes256'}>256 bit AES-CBC</option> + <option value='aes192' $checked{'ESP_ENCRYPTION'}{'aes192'}>192 bit AES-CBC</option> + <option value='aes128' $checked{'ESP_ENCRYPTION'}{'aes128'}>128 bit AES-CBC</option> + <option value='aes256gcm128' $checked{'ESP_ENCRYPTION'}{'aes256gcm128'}>256 bit AES-GCM/128 bit ICV</option> + <option value='aes192gcm128' $checked{'ESP_ENCRYPTION'}{'aes192gcm128'}>192 bit AES-GCM/128 bit ICV</option> + <option value='aes128gcm128' $checked{'ESP_ENCRYPTION'}{'aes128gcm128'}>128 bit AES-GCM/128 bit ICV</option> + <option value='aes256gcm96' $checked{'ESP_ENCRYPTION'}{'aes256gcm96'}>256 bit AES-GCM/96 bit ICV</option> + <option value='aes192gcm96' $checked{'ESP_ENCRYPTION'}{'aes192gcm96'}>192 bit AES-GCM/96 bit ICV</option> + <option value='aes128gcm96' $checked{'ESP_ENCRYPTION'}{'aes128gcm96'}>128 bit AES-GCM/96 bit ICV</option> + <option value='aes256gcm64' $checked{'ESP_ENCRYPTION'}{'aes256gcm64'}>256 bit AES-GCM/64 bit ICV</option> + <option value='aes192gcm64' $checked{'ESP_ENCRYPTION'}{'aes192gcm64'}>192 bit AES-GCM/64 bit ICV</option> + <option value='aes128gcm64' $checked{'ESP_ENCRYPTION'}{'aes128gcm64'}>128 bit AES-GCM/64 bit ICV</option> + <option value='3des' $checked{'ESP_ENCRYPTION'}{'3des'}>168 bit 3DES-EDE-CBC</option> + <option value='camellia256' $checked{'ESP_ENCRYPTION'}{'camellia256'}>256 bit Camellia-CBC</option> + <option value='camellia192' $checked{'ESP_ENCRYPTION'}{'camellia192'}>192 bit Camellia-CBC</option> + <option value='camellia128' $checked{'ESP_ENCRYPTION'}{'camellia128'}>128 bit Camellia-CBC</option> </select> </td> </tr> diff --git a/lfs/strongswan b/lfs/strongswan index 43995b5..77c287a 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -93,6 +93,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-farp \ --enable-openssl \ --enable-gcrypt \ + --enable-gcm \ --enable-xauth-eap \ --enable-xauth-noauth \ --enable-eap-radius \ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2d0c7a9f7b8f830a5e2b193ffea4334409e25bf1
by git＠ipfire.org 11 Mar '15

11 Mar '15

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 2d0c7a9f7b8f830a5e2b193ffea4334409e25bf1 (commit) from becbf67de73290f43fd6658c2c66c6e174d6afe2 (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 2d0c7a9f7b8f830a5e2b193ffea4334409e25bf1 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Mar 11 14:26:55 2015 +0100 BUG10620: move reload of firewall.local to main() ----------------------------------------------------------------------- Summary of changes: config/firewall/rules.pl | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) Difference in files: diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 97b8897..8abc675 100755 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -88,14 +88,27 @@ sub main { # Flush all chains. &flush(); - # Reload firewall rules. - &preparerules(); + # Prepare firewall rules. + if (! -z "${General::swroot}/firewall/input"){ + &buildrules(\%configinputfw); + } + if (! -z "${General::swroot}/firewall/outgoing"){ + &buildrules(\%configoutgoingfw); + } + if (! -z "${General::swroot}/firewall/config"){ + &buildrules(\%configfwdfw); + } # Load P2P block rules. &p2pblock(); # Reload firewall policy. run("/usr/sbin/firewall-policy"); + + #Reload firewall.local if present + if ( -f '/etc/sysconfig/firewall.local'){ + run("/etc/sysconfig/firewall.local reload"); + } } sub run { @@ -146,18 +159,6 @@ sub flush { run("$IPTABLES -t mangle -F $CHAIN_MANGLE_NAT_DESTINATION_FIX"); } -sub preparerules { - if (! -z "${General::swroot}/firewall/input"){ - &buildrules(\%configinputfw); - } - if (! -z "${General::swroot}/firewall/outgoing"){ - &buildrules(\%configoutgoingfw); - } - if (! -z "${General::swroot}/firewall/config"){ - &buildrules(\%configfwdfw); - } -} - sub buildrules { my $hash = shift; @@ -512,10 +513,6 @@ sub buildrules { } } } - #Reload firewall.local if present - if ( -f '/etc/sysconfig/firewall.local'){ - run("/etc/sysconfig/firewall.local reload"); - } } # Formats the given timestamp into the iptables format which is "hh:mm" UTC. hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. becbf67de73290f43fd6658c2c66c6e174d6afe2
by git＠ipfire.org 11 Mar '15

11 Mar '15

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 becbf67de73290f43fd6658c2c66c6e174d6afe2 (commit) from ea40188f66d78c16956cdeb6d5c806bb7117c7f1 (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 becbf67de73290f43fd6658c2c66c6e174d6afe2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 11 15:42:08 2015 +0100 apache: Do not show loaded modules The server header will show less information about the modules of the apache daemon. Fixes #10671 ----------------------------------------------------------------------- Summary of changes: config/httpd/global.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/httpd/global.conf b/config/httpd/global.conf index a977026..3fbd5e2 100644 --- a/config/httpd/global.conf +++ b/config/httpd/global.conf @@ -1,7 +1,7 @@ Timeout 300 ServerSignature on UseCanonicalName off -ServerTokens Full +ServerTokens Prod LogLevel warn CustomLog /var/log/httpd/access_log combined Include /etc/httpd/conf/hostname.conf hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM March 2015