IPFire-SCM October 2015

ipfire-scm@lists.ipfire.org

1 participants
51 discussions

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4cdcf12702ac05a3ba368f0667fe7daf2e5dbd78
by git＠ipfire.org 16 Oct '15

16 Oct '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 3.x development tree". The branch, master has been updated via 4cdcf12702ac05a3ba368f0667fe7daf2e5dbd78 (commit) via 549db1aec915296cb7b528d087399135847b5f36 (commit) via 542adc2e14ef98079d1806b8d3e0ae0285f9f790 (commit) via 15ded0e1a142c21ee3c7a55717a85677db64fe62 (commit) from e78194361bad619058031f571105c3f71f07600f (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 4cdcf12702ac05a3ba368f0667fe7daf2e5dbd78 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Oct 16 17:35:34 2015 +0200 systemd: Enable build of compat libs. Some software out there is still linking against the old systemd libraries which now are shipped in an own package. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 549db1aec915296cb7b528d087399135847b5f36 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Oct 16 23:20:04 2015 +0200 strongswan: Update to 5.3.3 This is a minor update to the latest stable version of strongswan. The support and usage of systemd explicitly has been enabled and the dependency to systemd has been updated because the configure script of strongswan is looking for the systemd compat libraries which are provided by systemd 221-2 and later versions. There was the requirement to move some libraries to %{libdir} because of a hard-coded RPATH, which is against our release policy. Fixes #10896. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 542adc2e14ef98079d1806b8d3e0ae0285f9f790 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Oct 16 20:12:53 2015 +0200 ddns: Update to 009 This is a major update to the latest available version of ddns, which mainly includes a better SSL error handling and support for desec.io. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 15ded0e1a142c21ee3c7a55717a85677db64fe62 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 16 21:46:33 2015 +0100 openvpn: Drop package The IPFire Developer Summit decided to drop OpenVPN support from IPFire 3 since it has many issues that don't seem to get solved in the near future and nobody volunteered to maintain this package. Development is focussing on IPsec for now and OpenVPN may come back later when resources have been freed or there is enough demand (including volunteers to work on it). Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: ddns/ddns.nm | 4 +- openvpn/openvpn.nm | 53 ---------------------- .../patches/strongswan-swanctl-1193106.patch | 10 ++++ strongswan/strongswan.nm | 19 ++++++-- systemd/systemd.nm | 24 +++++++++- 5 files changed, 51 insertions(+), 59 deletions(-) delete mode 100644 openvpn/openvpn.nm create mode 100644 strongswan/patches/strongswan-swanctl-1193106.patch Difference in files: diff --git a/ddns/ddns.nm b/ddns/ddns.nm index 5c17119..c19411b 100644 --- a/ddns/ddns.nm +++ b/ddns/ddns.nm @@ -4,8 +4,8 @@ ############################################################################### name = ddns -version = 008 -release = 2 +version = 009 +release = 1 arch = noarch groups = System/Tools diff --git a/openvpn/openvpn.nm b/openvpn/openvpn.nm deleted file mode 100644 index ca6e961..0000000 --- a/openvpn/openvpn.nm +++ /dev/null @@ -1,53 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = openvpn -version = 2.3.6 -release = 1 - -groups = Networking/VPN -url = http://openvpn.net/ -license = GPLv2 -summary = A full-featured SSL VPN solution. - -description - OpenVPN is a robust and highly flexible tunneling application that uses all - of the encryption, authentication, and certification features of the - OpenSSL library to securely tunnel IP networks over a single UDP or TCP - port. It can use the Marcus Franz Xaver Johannes Oberhumer's LZO library - for compression. -end - -source_dl = http://swupdate.openvpn.org/community/releases/ - -PLUGINS = auth-pam down-root - -build - requires - iproute2 - libselinux-devel - lzo-devel - openssl-devel - pam-devel - systemd-devel - end - - configure_options += \ - --enable-password-save \ - --enable-iproute2 \ - --enable-systemd -end - -packages - package %{name} - requires - iproute2 - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/strongswan/patches/strongswan-swanctl-1193106.patch b/strongswan/patches/strongswan-swanctl-1193106.patch new file mode 100644 index 0000000..cecef1f --- /dev/null +++ b/strongswan/patches/strongswan-swanctl-1193106.patch @@ -0,0 +1,10 @@ +diff -urNp strongswan-5.2.2/init/systemd-swanctl/strongswan-swanctl.service.in strongswan-5.2.2-patched/init/systemd-swanctl/strongswan-swanctl.service.in +--- strongswan-5.2.2/init/systemd-swanctl/strongswan-swanctl.service.in 2014-09-26 09:04:24.000000000 -0400 ++++ strongswan-5.2.2-patched/init/systemd-swanctl/strongswan-swanctl.service.in 2015-02-20 09:42:17.822480297 -0500 +@@ -7,3 +7,6 @@ Type=notify + ExecStart=@SBINDIR@/charon-systemd + ExecStartPost=@SBINDIR@/swanctl --load-all --noprompt + ExecReload=@SBINDIR@/swanctl --reload ++ ++[Install] ++WantedBy=multi-user.target diff --git a/strongswan/strongswan.nm b/strongswan/strongswan.nm index b386083..3eb1462 100644 --- a/strongswan/strongswan.nm +++ b/strongswan/strongswan.nm @@ -4,7 +4,7 @@ ############################################################################### name = strongswan -version = 5.3.2 +version = 5.3.3 release = 1 groups = Networking/VPN @@ -38,11 +38,12 @@ build openssl-devel perl sqlite-devel - systemd-devel - systemd-units + systemd-devel >= 221-2 end configure_options += \ + --disable-static \ + --with-ipseclibdir=%{libdir}/ipsec \ --enable-curl \ --enable-ldap \ --enable-openssl \ @@ -61,6 +62,7 @@ build --enable-eap-identity \ --with-capabilities=libcap \ --enable-swanctl \ + --enable-systemd \ --enable-kernel-libipsec if "%{DISTRO_ARCH}" == "i686" @@ -72,6 +74,14 @@ build #test # make check #end + + install_cmds + # Drop unneeded files. + rm -rvf %{BUILDROOT}%{libdir}/ipsec/lib*.so + + # Move libraries to libdir. + mv %{BUILDROOT}%{libdir}/ipsec/lib*.so.* %{BUILDROOT}%{libdir} + end end packages @@ -83,11 +93,14 @@ packages script postup systemctl daemon-reload >/dev/null 2>&1 || : systemctl reload-or-try-restart strongswan.service >/dev/null 2>&1 || : + systemctl reload-or-try-restart strongswan-swanctl.service >/dev/null 2>&1 || : end script preun systemctl disable --no-reload strongswan.service >/dev/null 2>&1 || : + systemctl disable --no-reload strongswan-swanctl.service >/dev/null 2>&1 || : systemctl stop strongswan.service >/dev/null 2>&1 || : + systemctl stop strongswan-swanctl.service >/dev/null 2>&1 || : end script postun diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 7112a3c..7346c09 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@ name = systemd version = 221 -release = 1 +release = 2 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -60,6 +60,7 @@ build --with-sysvrcnd-path= \ --enable-introspection \ --enable-zlib \ + --enable-compat-libs \ --disable-smack \ --disable-backlight \ --disable-firstboot \ @@ -358,9 +359,30 @@ packages end end + package %{name}-compat-libs + summary = systemd compatibility libraries. + description + Compatibility libraries for systemd. If your package requires this + package, you need to update your link options and build. + end + + requires + %{name}-libs = %{thisver} + end + + files + %{libdir}/libsystemd-daemon.so.* + %{libdir}/libsystemd-login.so.* + %{libdir}/libsystemd-journal.so.* + %{libdir}/libsystemd-id128.so.* + end + end + package %{name}-devel template DEVEL + requires += %{name}-compat-libs = %{thisver} + files += %{prefix}/lib/pakfire/macros/ end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 075b6e10db482dd77ec2634f707634e895610941
by git＠ipfire.org 15 Oct '15

15 Oct '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 075b6e10db482dd77ec2634f707634e895610941 (commit) via 80fbd8994934af3ac99d91a45ab1130e41a26ece (commit) from 2158e11ba983abbc747907d35d9fe36ca4295276 (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 075b6e10db482dd77ec2634f707634e895610941 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 15 22:46:33 2015 +0100 core95: Ship IPsec blocking changes Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 80fbd8994934af3ac99d91a45ab1130e41a26ece Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 3 22:31:53 2015 +0100 ipsec: Add block rules to avoid conntrack entries If an IPsec VPN connections is not established, there are rare cases when packets are supposed to be sent through that said tunnel and incorrectly handled. Those packets are sent to the default gateway an entry for this connection is created in the connection tracking table (usually only happens to UDP). All following packets are sent the same route even after the tunnel has been brought up. That leads to SIP phones not being able to register among other things. This patch adds firewall rules that these packets are rejected. That will sent a notification to the client that the tunnel is not up and avoid the connection to be added to the connection tracking table. Apart from a small performance penalty there should be no other side-effects. Fixes: #10908 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Cc: tomvend(a)rymes.com Cc: daniel.weismueller(a)ipfire.org Cc: morlix(a)morlix.de Reviewed-by: Timo Eissler <timo.eissler(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../firewall/ipsec-block | 66 +++++++++------------- config/rootfiles/common/stage2 | 1 + config/rootfiles/common/x86_64/stage2 | 1 + config/rootfiles/core/95/filelists/files | 3 + lfs/stage2 | 2 + src/initscripts/init.d/firewall | 8 +++ src/misc-progs/ipsecctrl.c | 4 ++ 7 files changed, 47 insertions(+), 38 deletions(-) copy src/installer/start-networking.sh => config/firewall/ipsec-block (58%) Difference in files: diff --git a/config/firewall/ipsec-block b/config/firewall/ipsec-block new file mode 100644 index 0000000..9fa8e1a --- /dev/null +++ b/config/firewall/ipsec-block @@ -0,0 +1,59 @@ +#!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2015 IPFire Team # +# # +# This program 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. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +VPN_CONFIG="/var/ipfire/vpn/config" + +block_subnet() { + local subnet="${1}" + + # Don't block a wildcard subnet + if [ "${subnet}" = "0.0.0.0/0" ] || [ "${subnet}" = "0.0.0.0/0.0.0.0" ]; then + return 0 + fi + + iptables -A IPSECBLOCK -d "${subnet}" -j REJECT --reject-with icmp-net-unreachable +} + +block_ipsec() { + # Flush all exists rules + iptables -F IPSECBLOCK + + local id status name lefthost type ctype unknown1 unknown2 unknown3 + local leftsubnets unknown4 righthost rightsubnets rest + while IFS="," read -r id status name lefthost type ctype unkown1 unknown2 unknown3 \ + leftsubnets unknown4 righthost rightsubnets rest; do + # Check if the connection is enabled + [ "${status}" = "on" ] || continue + + # Check if this a net-to-net connection + [ "${type}" = "net" ] || continue + + # Split multiple subnets + rightsubnets="${rightsubnets//\|/ }" + + local rightsubnet + for rightsubnet in ${rightsubnets}; do + block_subnet "${rightsubnet}" + done + done < "${VPN_CONFIG}" +} + +block_ipsec || exit $? diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 90e28d9..4021caf 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -73,6 +73,7 @@ run #usr/lib usr/lib/firewall usr/lib/firewall/firewall-lib.pl +usr/lib/firewall/ipsec-block usr/lib/firewall/rules.pl #usr/lib/libgcc_s.so usr/lib/libgcc_s.so.1 diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2 index 0ac9ab5..531daaa 100644 --- a/config/rootfiles/common/x86_64/stage2 +++ b/config/rootfiles/common/x86_64/stage2 @@ -74,6 +74,7 @@ run #usr/lib usr/lib/firewall usr/lib/firewall/firewall-lib.pl +usr/lib/firewall/ipsec-block usr/lib/firewall/rules.pl #usr/lib/libgcc_s.so usr/lib/libgcc_s.so.1 diff --git a/config/rootfiles/core/95/filelists/files b/config/rootfiles/core/95/filelists/files index 949c88b..91ce289 100644 --- a/config/rootfiles/core/95/filelists/files +++ b/config/rootfiles/core/95/filelists/files @@ -1,8 +1,11 @@ etc/system-release etc/issue +etc/rc.d/init.d/firewall lib/udev/network-hotplug-vlan lib/udev/rules.d/60-net.rules srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/lib/firewall/firewall-lib.pl +usr/lib/firewall/ipsec-block +usr/local/bin/ipsecctrl var/ipfire/langs diff --git a/lfs/stage2 b/lfs/stage2 index 3244fa3..ec5d117 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -114,6 +114,8 @@ endif /usr/lib/firewall/rules.pl install -m 644 $(DIR_SRC)/config/firewall/firewall-lib.pl \ /usr/lib/firewall/firewall-lib.pl + install -m 755 $(DIR_SRC)/config/firewall/ipsec-block \ + /usr/lib/firewall/ipsec-block # Nobody user -mkdir -p /home/nobody diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index 8ca02bc..2d462d7 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -115,6 +115,11 @@ iptables_init() { iptables -A INPUT -j GUARDIAN iptables -A FORWARD -j GUARDIAN + # Block non-established IPsec networks + iptables -N IPSECBLOCK + iptables -A FORWARD -m policy --dir out --pol none -j IPSECBLOCK + iptables -A OUTPUT -m policy --dir out --pol none -j IPSECBLOCK + # Block OpenVPN transfer networks iptables -N OVPNBLOCK iptables -A INPUT -i tun+ -j OVPNBLOCK @@ -270,6 +275,9 @@ iptables_init() { iptables -t nat -N REDNAT iptables -t nat -A POSTROUTING -j REDNAT + # Populate IPsec block chain + /usr/lib/firewall/ipsec-block + # Apply OpenVPN firewall rules /usr/local/bin/openvpnctrl --firewall-rules diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index e99202d..7499e94 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -144,6 +144,9 @@ void turn_connection_on(char *name, char *type) { "/usr/sbin/ipsec down %s >/dev/null", name); safe_system(command); + // Reload the IPsec block chain + safe_system("/usr/lib/firewall/ipsec-block >/dev/null"); + // Reload the configuration into the daemon (#10339). ipsec_reload(); @@ -302,6 +305,7 @@ int main(int argc, char *argv[]) { // start the system if ((argc == 2) && strcmp(argv[1], "S") == 0) { + safe_system("/usr/lib/firewall/ipsec-block >/dev/null"); safe_system("/usr/sbin/ipsec restart >/dev/null"); exit(0); } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2158e11ba983abbc747907d35d9fe36ca4295276
by git＠ipfire.org 15 Oct '15

15 Oct '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 2158e11ba983abbc747907d35d9fe36ca4295276 (commit) via cffa84a64e96766a849ef660cb4493069ad90f63 (commit) via a9a28430b5bce4f43fafd13f60b2e068eca1ea9a (commit) via a18b5b4f4d383aaf132ff9e10fd3c9345d74d933 (commit) via 4504c412af12293e1500217a87e530a1eaa6f224 (commit) from 01714866956b71bea0944cece60d2030861263f3 (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 2158e11ba983abbc747907d35d9fe36ca4295276 Author: Larsen <larsen007(a)web.de> Date: Sat Oct 10 23:24:16 2015 +0200 IPSec VPN: Add "required" marker for "organization name" IPSec VPN: Add "required" marker for "organization name" Fixes https://bugzilla.ipfire.org/show_bug.cgi?id=10846 Signed-off-by: Lars Schuhmacher <larsen007(a)web.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cffa84a64e96766a849ef660cb4493069ad90f63 Author: Larsen <larsen007(a)web.de> Date: Sat Oct 10 23:07:19 2015 +0200 Translation improvements Translation improvements Signed-off-by: Lars Schuhmacher <larsen007(a)web.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a9a28430b5bce4f43fafd13f60b2e068eca1ea9a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Oct 10 18:07:38 2015 +0200 tor.cgi: Fix missing country flag icons. The CGI now is using the GeoIP::get_flag_icon function provided by the geoip-functions.pl, which takes care of the changed flag icons shipped by core update 90. Fixes #10919. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Tested-by: Jan Paul Tuecking <jan.paul.tuecking(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a18b5b4f4d383aaf132ff9e10fd3c9345d74d933 Merge: 4504c41 0171486 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 15 11:59:44 2015 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 4504c412af12293e1500217a87e530a1eaa6f224 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 3 19:53:57 2015 +0100 procps: Ship pgrep Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/procps | 2 +- html/cgi-bin/tor.cgi | 11 ++++++++--- html/cgi-bin/vpnmain.cgi | 2 +- langs/de/cgi-bin/de.pl | 4 ++-- lfs/tor | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) Difference in files: diff --git a/config/rootfiles/common/procps b/config/rootfiles/common/procps index d5e5ad3..2863167 100644 --- a/config/rootfiles/common/procps +++ b/config/rootfiles/common/procps @@ -3,7 +3,7 @@ bin/ps lib/libproc-3.2.6.so sbin/sysctl usr/bin/free -#usr/bin/pgrep +usr/bin/pgrep #usr/bin/pkill #usr/bin/pmap #usr/bin/pwdx diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index 91f4b45..193e405 100644 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -27,6 +27,7 @@ use warnings; use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/geoip-functions.pl"; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; @@ -619,10 +620,14 @@ END END if (exists($node->{'country_code'})) { - if (!$node->{'country_code'} or $node->{'country_code'} eq '??') { - print "<img src='/images/flags/blank.png' border='0' align='absmiddle'/>"; + # Get the flag icon of the country. + my $flag_icon = &GeoIP::get_flag_icon($node->{'country_code'}); + + # Check if a flag for the given country is available. + if ($flag_icon) { + print "<a href='country.cgi#$node->{'country_code'}'><img src='$flag_icon' border='0' align='absmiddle' alt='$node->{'country_code'}'></a>"; } else { - print "<a href='country.cgi#$node->{'country_code'}'><img src='/images/flags/$node->{'country_code'}.png' border='0' align='absmiddle' alt='$node->{'country_code'}'></a>"; + print "<img src='/images/flags/blank.png' border='0' align='absmiddle'/>"; } } diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index b697b0a..f1cffb8 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2077,7 +2077,7 @@ END <td class='base'>$Lang::tr{'users department'}:</td> <td class='base' nowrap='nowrap'><input type='text' name='CERT_OU' value='$cgiparams{'CERT_OU'}' size='32' $cakeydisabled /></td></tr> <tr><td> </td> - <td class='base'>$Lang::tr{'organization name'}:</td> + <td class='base'>$Lang::tr{'organization name'}: <img src='/blob.gif' alt='*' /></td> <td class='base' nowrap='nowrap'><input type='text' name='CERT_ORGANIZATION' value='$cgiparams{'CERT_ORGANIZATION'}' size='32' $cakeydisabled /></td></tr> <tr><td> </td> <td class='base'>$Lang::tr{'city'}:</td> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index a3c8228..e952de2 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2569,11 +2569,11 @@ 'urlfilter whitelist always allowed' => 'Erlaube angepasste Whitelist für gesperrte Clients', 'urlfilter wrong filetype' => 'Die Datei hat nicht die Erweiterung .tar.gz', 'use' => 'Einsatz', -'use a pre-shared key' => 'Verwenden Sie einen Pre-Shared Schlüssel:', +'use a pre-shared key' => 'Pre-Shared-Key verwenden:', 'use dov' => 'DOV (Data Over Voice) benutzen:', 'use ibod' => 'Bandwidth on Demand (iBOD) benutzen:', 'use ipfire red ip' => 'Die klassische ROTE IP, welche von IPFire während der Verbindung verwendet wird', -'use only proposed settings' => 'Verwenden Sie nur die vorgeschlagenen Einstellungen.', +'use only proposed settings' => 'Nur die vorgeschlagenen Einstellungen verwenden', 'used' => 'Benutzt', 'used memory' => 'Genutzter Speicher', 'used swap' => 'Genutzter Swap', diff --git a/lfs/tor b/lfs/tor index c21e4b4..91eab09 100644 --- a/lfs/tor +++ b/lfs/tor @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 14 +PAK_VER = 15 DEPS = "" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. e78194361bad619058031f571105c3f71f07600f
by git＠ipfire.org 15 Oct '15

15 Oct '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 38b7997ffdb0b0257a6502e9e531874acd711539
by git＠ipfire.org 15 Oct '15

15 Oct '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 38b7997ffdb0b0257a6502e9e531874acd711539 (commit) via ee97ade8e40ece29913a2bd5af59cf94fe4941b1 (commit) via 13adb7aea82dca7002419517fea038d70f3defc0 (commit) from c5a5e4abb043abe1c5cecbdf15b28b03f74f4734 (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 38b7997ffdb0b0257a6502e9e531874acd711539 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 15 12:02:38 2015 +0100 core94: Adjust update.sh script if run multiple times Some changes cannot be executed again after the update was already installed. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ee97ade8e40ece29913a2bd5af59cf94fe4941b1 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Oct 15 12:18:28 2015 +0200 Core94: fix for dma when postfix is installed Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 13adb7aea82dca7002419517fea038d70f3defc0 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Oct 15 12:18:27 2015 +0200 Core94: fix update.sh for dma Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/94/update.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) Difference in files: diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh index 6560662..e6f9cf1 100644 --- a/config/rootfiles/core/94/update.sh +++ b/config/rootfiles/core/94/update.sh @@ -70,6 +70,17 @@ EOF fcrontab -z &>/dev/null +# DMA - reconfigure Postfix if exists +if [ -e /etc/postfix/main.cf ] && [ ! -e "/usr/sbin/sendmail.postfix" ]; then + mv /usr/sbin/sendmail /usr/sbin/sendmail.postfix + /usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.postfix 15 + sed -i 's/usr\/sbin\/sendmail/usr/sbin/sendmail.postfix/' /opt/pakfire/db/rootfiles/postfix +fi +# DMA - configure dma as default mta +mkdir -p /etc/alternatives +mkdir -p /var/lib/alternatives +/usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.dma 20 + # Start services /etc/init.d/dnsmasq start /etc/init.d/sshd start hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c3a471c095472630bb345646ee518341ded5c40b
by git＠ipfire.org 10 Oct '15

10 Oct '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 3.x development tree". The branch, master has been updated via c3a471c095472630bb345646ee518341ded5c40b (commit) from 550b132f81a934fac78c39bad50add195de48771 (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 c3a471c095472630bb345646ee518341ded5c40b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 10 16:26:14 2015 +0100 less: Update to version 481 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Reviewed-by: Timo Eissler <timo.eissler(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: less/less.nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/less/less.nm b/less/less.nm index aa28d8b..8e9d543 100644 --- a/less/less.nm +++ b/less/less.nm @@ -4,7 +4,7 @@ ############################################################################### name = less -version = 458 +version = 481 release = 1 groups = Applications/Text hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 550b132f81a934fac78c39bad50add195de48771
by git＠ipfire.org 09 Oct '15

09 Oct '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 3.x development tree". The branch, master has been updated via 550b132f81a934fac78c39bad50add195de48771 (commit) from 38e2df8c9b9a0687dcdc034413ffb1a8a20dcf34 (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 550b132f81a934fac78c39bad50add195de48771 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Oct 9 18:32:05 2015 +0200 tzdata: Update to version 2015g. Fixes #10777. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: tzdata/tzdata.nm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm index 8a5abd3..c1554c1 100644 --- a/tzdata/tzdata.nm +++ b/tzdata/tzdata.nm @@ -3,12 +3,12 @@ # Copyright (C) - IPFire Development Team <info(a)ipfire.org> # ############################################################################### -tzdata_version = 2014j -tzcode_version = 2014j +tzdata_version = 2015g +tzcode_version = 2015g name = tzdata version = %{tzdata_version} -release = 2 +release = 1 arch = noarch groups = System/Base hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 01714866956b71bea0944cece60d2030861263f3
by git＠ipfire.org 04 Oct '15

04 Oct '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 01714866956b71bea0944cece60d2030861263f3 (commit) from 8235f17df5bdc1d5131c10bdfd40b40741bdebce (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 01714866956b71bea0944cece60d2030861263f3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Oct 4 16:01:33 2015 +0200 sox: Disable parallel build Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/sox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/lfs/sox b/lfs/sox index 378429d..de60c90 100644 --- a/lfs/sox +++ b/lfs/sox @@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --disable-alsa-dsp --disable-oss-dsp \ --disable-sun-audio --disable-mad - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make $(EXTRA_MAKE) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8235f17df5bdc1d5131c10bdfd40b40741bdebce
by git＠ipfire.org 03 Oct '15

03 Oct '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 8235f17df5bdc1d5131c10bdfd40b40741bdebce (commit) from 75ccb6a6935506245f8957a386635b3db2e192fd (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 8235f17df5bdc1d5131c10bdfd40b40741bdebce Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 3 19:15:36 2015 +0100 strongswan: Update to 5.3.3 ChaCha is disabled since our kernel does not support it yet Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/strongswan | 1 + .../{oldcore/91 => core/95}/filelists/i586/strongswan-padlock | 0 config/rootfiles/{oldcore/91 => core/95}/filelists/strongswan | 0 config/rootfiles/core/95/update.sh | 4 ++++ lfs/strongswan | 5 +++-- 5 files changed, 8 insertions(+), 2 deletions(-) copy config/rootfiles/{oldcore/91 => core/95}/filelists/i586/strongswan-padlock (100%) copy config/rootfiles/{oldcore/91 => core/95}/filelists/strongswan (100%) Difference in files: diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index 7564d38..f51cc3a 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -153,6 +153,7 @@ usr/libexec/ipsec/starter usr/libexec/ipsec/stroke usr/sbin/ipsec #usr/share/man/man1/pki---acert.1 +#usr/share/man/man1/pki---dn.1 #usr/share/man/man1/pki---gen.1 #usr/share/man/man1/pki---issue.1 #usr/share/man/man1/pki---keyid.1 diff --git a/config/rootfiles/core/95/filelists/i586/strongswan-padlock b/config/rootfiles/core/95/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/core/95/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/95/filelists/strongswan b/config/rootfiles/core/95/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/95/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/95/update.sh b/config/rootfiles/core/95/update.sh index 388e18d..a34a3fe 100644 --- a/config/rootfiles/core/95/update.sh +++ b/config/rootfiles/core/95/update.sh @@ -36,6 +36,7 @@ rm -f /etc/rc.d/init.d/network-vlans rm -f /etc/rc.d/rcsysinit.d/S91network-vlans # Stop services +/etc/init.d/ipsec stop # Extract files extract_files @@ -44,6 +45,9 @@ extract_files /usr/local/bin/update-lang-cache # Start services +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi # This update need a reboot... #touch /var/run/need_reboot diff --git a/lfs/strongswan b/lfs/strongswan index b4438dd..2a181a3 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 5.3.2 +VER = 5.3.3 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fab014be1477ef4ebf9a765e10f8802c +$(DL_FILE)_MD5 = 5a25f3d1c31a77ef44d14a2e7b3eaad0 install : $(TARGET) @@ -99,6 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-eap-peap \ --enable-eap-mschapv2 \ --enable-eap-identity \ + --disable-chapoly \ $(CONFIGURE_OPTIONS) cd $(DIR_APP) && make $(MAKETUNING) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 75ccb6a6935506245f8957a386635b3db2e192fd
by git＠ipfire.org 02 Oct '15

02 Oct '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 75ccb6a6935506245f8957a386635b3db2e192fd (commit) from 1f011c6594fd416319e66e1a5c6a3877a517f2eb (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 75ccb6a6935506245f8957a386635b3db2e192fd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 2 19:00:13 2015 +0100 krb5: Disable parallel build Builds of this package crash randomly on all architectures which might be related to the parallel build. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/krb5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/krb5 b/lfs/krb5 index 68be46c..3011982 100644 --- a/lfs/krb5 +++ b/lfs/krb5 @@ -93,8 +93,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-dns-for-realm \ CPPFLAGS="-I/usr/include/et" - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make $(EXTRA_INSTALL) install + cd $(DIR_APP) && make #$(MAKETUNING) + cd $(DIR_APP) && make install for LIB in gssapi_krb5 gssrpc k5crypto kadm5clnt kadm5srv \ kdb5 kdb_ldap krad krb5 krb5support verto; do \ 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 October 2015