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@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@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@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@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