IPFire-SCM February 2017

ipfire-scm@lists.ipfire.org

1 participants
26 discussions

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. d7d685fc2ec7208a2e3da0126a55bee8c3740b01
by git＠ipfire.org 16 Feb '17

16 Feb '17

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 d7d685fc2ec7208a2e3da0126a55bee8c3740b01 (commit) via c8e7f1a7e0d8769ab2d116f629aada1f462bbe16 (commit) via 34fe2dc078c9f82b72e89be0e41198cf3d63b6a4 (commit) via a106383bf050c9a9e1e831e27319b6ae6a58af0e (commit) via 38f4d0ac761d5cbe9c973369d4ba9a64c933ae38 (commit) from 3ceb9ff3e92305ab92532347e81e8fc6df3fb8ce (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 d7d685fc2ec7208a2e3da0126a55bee8c3740b01 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 16 11:38:44 2017 +0000 glibc: Update to 2.25 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c8e7f1a7e0d8769ab2d116f629aada1f462bbe16 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Feb 16 09:56:22 2017 +0100 suricata: Update to 3.2.1 This is a major update to the latest stable version of suricata. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 34fe2dc078c9f82b72e89be0e41198cf3d63b6a4 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Feb 16 09:29:33 2017 +0100 libhtp: Update to 0.5.20 This is an update to the latest stable version of libhtp. * Adjust github URL to official ones. * Enable testsuite. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a106383bf050c9a9e1e831e27319b6ae6a58af0e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Feb 16 09:28:20 2017 +0100 guile: Update to 2.0.14 This is a minor update to the latest stable release of guile. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 38f4d0ac761d5cbe9c973369d4ba9a64c933ae38 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Feb 16 08:25:33 2017 +0100 wget: Update to 1.19.1 This is a minor update to the latest available version of wget. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: glibc/glibc.nm | 18 +---- ...rt-Avoid-an-extra-branch-to-PLT-for-z-now.patch | 84 ---------------------- guile/guile.nm | 2 +- libhtp/libhtp.nm | 24 ++++--- suricata/suricata.nm | 4 +- wget/wget.nm | 2 +- 6 files changed, 22 insertions(+), 112 deletions(-) delete mode 100644 glibc/patches/glibc-2.24-Revert-Avoid-an-extra-branch-to-PLT-for-z-now.patch Difference in files: diff --git a/glibc/glibc.nm b/glibc/glibc.nm index 0536639..9330640 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -4,8 +4,8 @@ ############################################################################### name = glibc -version = 2.24 -release = 3 +version = 2.25 +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Base @@ -91,6 +91,7 @@ build --enable-add-ons \ --enable-kernel=%{OPTIMIZED_KERNEL} \ --disable-werror \ + --enable-stack-protector=strong \ --enable-bind-now \ --enable-obsolete-rpc \ --with-bugurl=http://bugtracker.ipfire.org \ @@ -110,19 +111,6 @@ build ../%{thisapp}/configure \ %{configure_options} - # Our GCC is already passing -fPIC, and that's all we want for the libraries. - # LDFLAGS.so is appended to so we don't build shared libraries with - # DT_TEXTREL (and to tell us if something goes wrong). For now we only build - # the libraries, not the programs: - echo "build-programs=no" >> configparms - - make PARALLELMFLAGS=%{PARALLELISMFLAGS} \ - CFLAGS="%{CFLAGS} -fno-stack-protector -U_FORTIFY_SOURCE" \ - CXXFLAGS="%{CXXFLAGS} -fno-stack-protector -U_FORTIFY_SOURCE" - - # Then build the programs with hardening, so everything possible in - # is hardened: - echo "# Nothing in here :D" > configparms make PARALLELMFLAGS=%{PARALLELISMFLAGS} \ CFLAGS="%{CFLAGS}" CXXFLAGS="%{CXXFLAGS}" end diff --git a/glibc/patches/glibc-2.24-Revert-Avoid-an-extra-branch-to-PLT-for-z-now.patch b/glibc/patches/glibc-2.24-Revert-Avoid-an-extra-branch-to-PLT-for-z-now.patch deleted file mode 100644 index 102d385..0000000 --- a/glibc/patches/glibc-2.24-Revert-Avoid-an-extra-branch-to-PLT-for-z-now.patch +++ /dev/null @@ -1,84 +0,0 @@ -From f160cfff59261bb661cf829fdcb5a3f391996280 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Thu, 22 Sep 2016 16:33:43 +0100 -Subject: [PATCH] Revert "Avoid an extra branch to PLT for -z now" - -This reverts commit 6901def689b5c77465d34f07822989ec67e80c1e. - -glibc won't compile on x86_64 with PIC and BIND_NOW enabled -both at the same time. - -See: https://sourceware.org/bugzilla/show_bug.cgi?id=20621 ---- - config.h.in | 3 --- - configure | 4 ---- - configure.ac | 3 --- - sysdeps/x86_64/sysdep.h | 8 ++------ - 4 files changed, 2 insertions(+), 16 deletions(-) - -diff --git a/config.h.in b/config.h.in -index 8cd08b0..f4ec748 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -94,9 +94,6 @@ - include/libc-symbols.h that avoid PLT slots in the shared objects. */ - #undef NO_HIDDEN - --/* Define this to disable lazy relocations in DSOs. */ --#undef BIND_NOW -- - /* AArch64 big endian ABI */ - #undef HAVE_AARCH64_BE - -diff --git a/configure b/configure -index 6ff2527..46015c9 100755 ---- a/configure -+++ b/configure -@@ -3419,10 +3419,6 @@ else - fi - - --if test "x$bindnow" = xyes; then -- $as_echo "#define BIND_NOW 1" >>confdefs.h -- --fi - - # Check whether --enable-static-nss was given. - if test "${enable_static_nss+set}" = set; then : -diff --git a/configure.ac b/configure.ac -index 9938ab0..d255b57 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -231,9 +231,6 @@ AC_ARG_ENABLE([bind-now], - [bindnow=$enableval], - [bindnow=no]) - AC_SUBST(bindnow) --if test "x$bindnow" = xyes; then -- AC_DEFINE(BIND_NOW) --fi - - dnl On some platforms we cannot use dynamic loading. We must provide - dnl static NSS modules. -diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h -index 75ac747..fbe3560 100644 ---- a/sysdeps/x86_64/sysdep.h -+++ b/sysdeps/x86_64/sysdep.h -@@ -90,13 +90,9 @@ lose: \ - - #undef JUMPTARGET - #ifdef PIC --# ifdef BIND_NOW --# define JUMPTARGET(name) *name##@GOTPCREL(%rip) --# else --# define JUMPTARGET(name) name##@PLT --# endif -+#define JUMPTARGET(name) name##@PLT - #else --# define JUMPTARGET(name) name -+#define JUMPTARGET(name) name - #endif - - /* Local label name for asm code. */ --- -2.7.4 - diff --git a/guile/guile.nm b/guile/guile.nm index 61e491f..0219cfb 100644 --- a/guile/guile.nm +++ b/guile/guile.nm @@ -4,7 +4,7 @@ ############################################################################### name = guile -version = 2.0.11 +version = 2.0.14 release = 1 groups = Development/Tools diff --git a/libhtp/libhtp.nm b/libhtp/libhtp.nm index e6604ad..ce7e7f5 100644 --- a/libhtp/libhtp.nm +++ b/libhtp/libhtp.nm @@ -4,11 +4,11 @@ ############################################################################### name = libhtp -version = 0.5.10 +version = 0.5.20 release = 1 groups = System/Libraries -url = https://github.com/ironbee/libhtp +url = https://github.com/OISF/libhtp license = BSD summary = LibHTP is a security-aware parser. @@ -17,24 +17,30 @@ description related bits and pieces. end -thisapp = htp-%{version} - -source_dl = https://github.com/ironbee/%{name}/releases/download/%{version}/ -sources = %{thisapp}.tar.gz +source_dl = https://github.com/OISF/%{name}/archive/%{version}.tar.gz#/ build requires - gcc + autoconf + automake + libtool pkg-config zlib-devel end + export LD_LIBRARY_PATH = %{DIR_APP}/htp/.libs + configure_options += \ --disable-static -end - + prepare_cmds + ./autogen.sh + end + test + make check + end +end packages package %{name} diff --git a/suricata/suricata.nm b/suricata/suricata.nm index 035f9df..f3fe7f4 100644 --- a/suricata/suricata.nm +++ b/suricata/suricata.nm @@ -4,7 +4,7 @@ ############################################################################### name = suricata -version = 3.1 +version = 3.2.1 release = 1 groups = Networking/IDS @@ -29,7 +29,7 @@ build libnet-devel libpcap-devel libyaml-devel - libhtp-devel >= 0.5.5 + libhtp-devel >= 0.5.20 pcre-devel pkg-config zlib-devel >= 1.2.5-2 diff --git a/wget/wget.nm b/wget/wget.nm index 60309f5..4d6d722 100644 --- a/wget/wget.nm +++ b/wget/wget.nm @@ -4,7 +4,7 @@ ############################################################################### name = wget -version = 1.19 +version = 1.19.1 release = 1 groups = Applications/Internet hooks/post-receive -- IPFire 3.x development tree

1 0

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

15 Feb '17

1 0

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

15 Feb '17

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 8057ab15b9efeecf8eca7ad4ebba170f141bd3de (commit) via 1ee1666ee45268db405a66b8ec05501c718e7702 (commit) from dcb406cc675c42f9add4a41c8a1e07eea7c3ab08 (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 8057ab15b9efeecf8eca7ad4ebba170f141bd3de Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 15 12:15:42 2017 +0000 Show better connection information for on-demand IPsec connections Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1ee1666ee45268db405a66b8ec05501c718e7702 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 15 11:22:27 2017 +0000 IPsec: Close on-demand tunnels after 15 min of inactivity Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 4 ++++ html/cgi-bin/index.cgi | 3 +++ html/cgi-bin/vpnmain.cgi | 9 +++++++++ langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 12 files changed, 25 insertions(+) Difference in files: diff --git a/doc/language_issues.es b/doc/language_issues.es index 36d4a82..def789e 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1144,6 +1144,7 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start diff --git a/doc/language_issues.fr b/doc/language_issues.fr index b21c338..25ee841 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1161,6 +1161,7 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start diff --git a/doc/language_issues.it b/doc/language_issues.it index e723028..83268a3 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -819,6 +819,7 @@ WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 22a8934..5465372 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -867,6 +867,7 @@ WARNING: untranslated string: uncheck all WARNING: untranslated string: upload dh key WARNING: untranslated string: vendor WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 36d4a82..def789e 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1144,6 +1144,7 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start diff --git a/doc/language_issues.ru b/doc/language_issues.ru index fc727d6..3d2b356 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1139,6 +1139,7 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 59c9046..51ba00d 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -752,6 +752,7 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: vpn on-demand WARNING: untranslated string: vpn start action WARNING: untranslated string: vpn start action route WARNING: untranslated string: vpn start action start diff --git a/doc/language_missings b/doc/language_missings index 49def61..acec275 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -561,6 +561,7 @@ < vendor < visit us at < vpn keyexchange +< vpn on-demand < vpn start action < vpn start action route < vpn start action start @@ -1178,6 +1179,7 @@ < vendor < visit us at < vpn keyexchange +< vpn on-demand < vpn start action < vpn start action route < vpn start action start @@ -1760,6 +1762,7 @@ < vendor < visit us at < vpn keyexchange +< vpn on-demand < vpn start action < vpn start action route < vpn start action start @@ -2347,6 +2350,7 @@ < vendor < visit us at < vpn keyexchange +< vpn on-demand < vpn start action < vpn start action route < vpn start action start diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index c142a65..85a0c94 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -425,6 +425,9 @@ END if (($line =~ /\"$vpnconfig{$key}[1]\".*IPsec SA established/) || ($line =~/$vpnconfig{$key}[1]\{.*INSTALLED/ )){ $activecolor = $Header::colourgreen; $activestatus = $Lang::tr{'capsopen'}; + } elsif ($line =~ /$vpnconfig{$key}[1]\{.*ROUTED/) { + $activecolor = $Header::colourorange; + $activestatus = $Lang::tr{'vpn on-demand'}; } } } diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index b6469c0..f4eccb1 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -413,6 +413,12 @@ sub writeipsecfiles { print CONF "\trightsourceip=$lvpnsettings{'RW_NET'}\n"; } else { print CONF "\tauto=$start_action\n"; + + # If in on-demand mode, we terminate the tunnel + # after 15 min of no traffic + if ($start_action eq 'route') { + print CONF "\tinactivity=900\n"; + } } # Fragmentation @@ -2799,6 +2805,9 @@ END ($line =~ /$confighash{$key}[1]\{.*INSTALLED/)) { $col1="bgcolor='${Header::colourgreen}'"; $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>"; + } elsif ($line =~ /$confighash{$key}[1]\{.*ROUTED/) { + $col1="bgcolor='${Header::colourorange}'"; + $active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn on-demand'}</font></b>"; } } # move to blue if really down diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 867bff7..ad8db19 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2615,6 +2615,7 @@ 'vpn on blue' => 'VPN auf BLAU', 'vpn on green' => 'VPN auf GRÜN', 'vpn on orange' => 'VPN auf ORANGE', +'vpn on-demand' => 'ON DEMAND', 'vpn payload compression' => 'Datennutzlast-Kompression aushandeln', 'vpn red name' => 'Öffentliche IP oder FQDN für das rote Interface oder <%defaultroute>', 'vpn remote id' => 'Remote ID', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 5333c13..3deb4b5 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2660,6 +2660,7 @@ 'vpn on blue' => 'VPN on BLUE', 'vpn on green' => 'VPN on GREEN', 'vpn on orange' => 'VPN on ORANGE', +'vpn on-demand' => 'ON-DEMAND', 'vpn payload compression' => 'Negotiate payload compression', 'vpn red name' => 'Public IP or FQDN for RED interface or <%defaultroute>', 'vpn remote id' => 'Remote ID', hooks/post-receive -- IPFire 2.x development tree

1 0

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

15 Feb '17

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 dcb406cc675c42f9add4a41c8a1e07eea7c3ab08 (commit) from ef784313d101fee621e3273cf14eb59cf43bbb10 (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 dcb406cc675c42f9add4a41c8a1e07eea7c3ab08 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 15 10:11:58 2017 +0000 IPsec: Allow to create on-demand connections This will create IPsec VPN connections with auto=route set instead of auto=start which will cause the connection being created, but not brought up yet. As soon as the first packet is received, the connection will be established and data will be passed through it. This allows IPFire to handle more VPN connections on weaker systems and avoids negotiating many connections which are rarely used. Suggested-by: Tom Rymes <tomvend(a)rymes.com> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Fixes: #10733 ----------------------------------------------------------------------- Summary of changes: doc/language_issues.es | 3 +++ doc/language_issues.fr | 3 +++ doc/language_issues.it | 3 +++ doc/language_issues.nl | 3 +++ doc/language_issues.pl | 3 +++ doc/language_issues.ru | 3 +++ doc/language_issues.tr | 3 +++ doc/language_missings | 12 ++++++++++++ html/cgi-bin/vpnmain.cgi | 43 +++++++++++++++++++++++++++++++------------ langs/de/cgi-bin/de.pl | 3 +++ langs/en/cgi-bin/en.pl | 3 +++ 11 files changed, 70 insertions(+), 12 deletions(-) Difference in files: diff --git a/doc/language_issues.es b/doc/language_issues.es index 60ba499..36d4a82 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1144,6 +1144,9 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action route +WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 863b529..b21c338 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1161,6 +1161,9 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action route +WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.it b/doc/language_issues.it index 6efef40..e723028 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -819,6 +819,9 @@ WARNING: untranslated string: unblock WARNING: untranslated string: unblock all WARNING: untranslated string: uncheck all WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action route +WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.nl b/doc/language_issues.nl index c9b10dc..22a8934 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -867,6 +867,9 @@ WARNING: untranslated string: uncheck all WARNING: untranslated string: upload dh key WARNING: untranslated string: vendor WARNING: untranslated string: vpn force mobike +WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action route +WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 60ba499..36d4a82 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1144,6 +1144,9 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action route +WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 255df2f..fc727d6 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1139,6 +1139,9 @@ WARNING: untranslated string: vendor WARNING: untranslated string: visit us at WARNING: untranslated string: vpn force mobike WARNING: untranslated string: vpn keyexchange +WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action route +WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistic n2n WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 8cf2dfe..59c9046 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -752,4 +752,7 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: vpn start action +WARNING: untranslated string: vpn start action route +WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_missings b/doc/language_missings index 32e1e48..49def61 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -561,6 +561,9 @@ < vendor < visit us at < vpn keyexchange +< vpn start action +< vpn start action route +< vpn start action start < vpn statistic n2n < vpn statistic rw < wlanap access point @@ -1175,6 +1178,9 @@ < vendor < visit us at < vpn keyexchange +< vpn start action +< vpn start action route +< vpn start action start < vpn statistic n2n < vpn statistic rw < wlanap country @@ -1754,6 +1760,9 @@ < vendor < visit us at < vpn keyexchange +< vpn start action +< vpn start action route +< vpn start action start < vpn statistic n2n < vpn statistic rw < wlanap country @@ -2338,6 +2347,9 @@ < vendor < visit us at < vpn keyexchange +< vpn start action +< vpn start action route +< vpn start action start < vpn statistic n2n < vpn statistic rw < week-graph diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index f1cffb8..b6469c0 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -108,6 +108,7 @@ $cgiparams{'RW_NET'} = ''; $cgiparams{'DPD_DELAY'} = '30'; $cgiparams{'DPD_TIMEOUT'} = '120'; $cgiparams{'FORCE_MOBIKE'} = 'off'; +$cgiparams{'START_ACTION'} = 'start'; &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'}); ### @@ -401,12 +402,17 @@ sub writeipsecfiles { print CONF "\trightrsasigkey=%cert\n"; } + my $start_action = $lconfighash{$key}[33]; + if (!$start_action) { + $start_action = "start"; + } + # Automatically start only if a net-to-net connection if ($lconfighash{$key}[3] eq 'host') { print CONF "\tauto=add\n"; print CONF "\trightsourceip=$lvpnsettings{'RW_NET'}\n"; } else { - print CONF "\tauto=start\n"; + print CONF "\tauto=$start_action\n"; } # Fragmentation @@ -1778,7 +1784,7 @@ END my $key = $cgiparams{'KEY'}; if (! $key) { $key = &General::findhasharraykey (\%confighash); - foreach my $i (0 .. 32) { $confighash{$key}[$i] = "";} + foreach my $i (0 .. 33) { $confighash{$key}[$i] = "";} } $confighash{$key}[0] = $cgiparams{'ENABLED'}; $confighash{$key}[1] = $cgiparams{'NAME'}; @@ -2256,6 +2262,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $confighash{$cgiparams{'KEY'}}[30] = $cgiparams{'DPD_TIMEOUT'}; $confighash{$cgiparams{'KEY'}}[31] = $cgiparams{'DPD_DELAY'}; $confighash{$cgiparams{'KEY'}}[32] = $cgiparams{'FORCE_MOBIKE'}; + $confighash{$cgiparams{'KEY'}}[33] = $cgiparams{'START_ACTION'}; &General::writehasharray("${General::swroot}/vpn/config", \%confighash); &writeipsecfiles(); if (&vpnenabled) { @@ -2283,6 +2290,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $cgiparams{'DPD_TIMEOUT'} = $confighash{$cgiparams{'KEY'}}[30]; $cgiparams{'DPD_DELAY'} = $confighash{$cgiparams{'KEY'}}[31]; $cgiparams{'FORCE_MOBIKE'} = $confighash{$cgiparams{'KEY'}}[32]; + $cgiparams{'START_ACTION'} = $confighash{$cgiparams{'KEY'}}[33]; if (!$cgiparams{'DPD_DELAY'}) { $cgiparams{'DPD_DELAY'} = 30; @@ -2291,6 +2299,10 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || if (!$cgiparams{'DPD_TIMEOUT'}) { $cgiparams{'DPD_TIMEOUT'} = 120; } + + if (!$cgiparams{'START_ACTION'}) { + $cgiparams{'START_ACTION'} = "start"; + } } ADVANCED_ERROR: @@ -2387,6 +2399,10 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || $selected{'DPD_ACTION'}{'none'} = ''; $selected{'DPD_ACTION'}{$cgiparams{'DPD_ACTION'}} = "selected='selected'"; + $selected{'START_ACTION'}{'route'} = ''; + $selected{'START_ACTION'}{'start'} = ''; + $selected{'START_ACTION'}{$cgiparams{'START_ACTION'}} = "selected='selected'"; + &Header::showhttpheaders(); &Header::openpage($Lang::tr{'ipsec'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -2406,7 +2422,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || } &Header::openbox('100%', 'left', "$Lang::tr{'advanced'}:"); - print <<EOF + print <<EOF; <form method='post' enctype='multipart/form-data' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='ADVANCED' value='yes' /> <input type='hidden' name='KEY' value='$cgiparams{'KEY'}' /> @@ -2599,9 +2615,16 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || IKE+ESP: $Lang::tr{'use only proposed settings'} </label> </td> + <td> + <label>$Lang::tr{'vpn start action'}</label> + <select name="START_ACTION"> + <option value="route" $selected{'START_ACTION'}{'route'}>$Lang::tr{'vpn start action route'}</option> + <option value="start" $selected{'START_ACTION'}{'start'}>$Lang::tr{'vpn start action start'}</option> + </select> + </td> </tr> <tr> - <td> + <td colspan="2"> <label> <input type='checkbox' name='PFS' $checked{'PFS'} /> $Lang::tr{'pfs yes no'} @@ -2609,7 +2632,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || </td> </tr> <tr> - <td> + <td colspan="2"> <label> <input type='checkbox' name='COMPRESSION' $checked{'COMPRESSION'} /> $Lang::tr{'vpn payload compression'} @@ -2617,20 +2640,16 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) || </td> </tr> <tr> - <td> + <td colspan="2"> <label> <input type='checkbox' name='FORCE_MOBIKE' $checked{'FORCE_MOBIKE'} /> $Lang::tr{'vpn force mobike'} </label> </td> </tr> -EOF -; - - print <<EOF; <tr> - <td align='left' colspan='1'><img src='/blob.gif' align='top' alt='*' /> $Lang::tr{'required field'}</td> - <td align='right' colspan='2'> + <td align='left'><img src='/blob.gif' align='top' alt='*' /> $Lang::tr{'required field'}</td> + <td align='right'> <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /> <input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /> </td> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 54f3ae1..867bff7 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2618,6 +2618,9 @@ 'vpn payload compression' => 'Datennutzlast-Kompression aushandeln', 'vpn red name' => 'Öffentliche IP oder FQDN für das rote Interface oder <%defaultroute>', 'vpn remote id' => 'Remote ID', +'vpn start action' => 'Startaktion', +'vpn start action route' => 'On Demand', +'vpn start action start' => 'Immer An', 'vpn statistic n2n' => 'OpenVPN-Netz-zu-Netz-Statistik', 'vpn statistic rw' => 'OpenVPN-Roadwarrior-Statistik', 'vpn subjectaltname' => 'Subjekt Alternativer Name', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index a04d994..5333c13 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2663,6 +2663,9 @@ 'vpn payload compression' => 'Negotiate payload compression', 'vpn red name' => 'Public IP or FQDN for RED interface or <%defaultroute>', 'vpn remote id' => 'Remote ID', +'vpn start action' => 'Start Action', +'vpn start action route' => 'On Demand', +'vpn start action start' => 'Always On', 'vpn statistic n2n' => 'OpenVPN Net-to-Net Statistics', 'vpn statistic rw' => 'OpenVPN Roadwarrior Statistics', 'vpn subjectaltname' => 'Subject Alt Name', hooks/post-receive -- IPFire 2.x development tree

1 0

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

15 Feb '17

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c72bbdb029e24c366d75ecafea6a6c333b574ed2
by git＠ipfire.org 13 Feb '17

13 Feb '17

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c008a5a00e963796a11ea6e1f59f0e801fa1a088
by git＠ipfire.org 07 Feb '17

07 Feb '17

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 c008a5a00e963796a11ea6e1f59f0e801fa1a088 (commit) via d9dc3749190b9f372fd6eeb7324645dfe3de6fa2 (commit) from a0a33a8f104ca44195ec04528113373b54a4c735 (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 c008a5a00e963796a11ea6e1f59f0e801fa1a088 Author: Gabriel Rolland <rollopack(a)gmail.com> Date: Tue Feb 7 11:44:05 2017 +0100 Typo in it.pl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d9dc3749190b9f372fd6eeb7324645dfe3de6fa2 Author: Gabriel Rolland <rollopack(a)gmail.com> Date: Tue Feb 7 12:17:12 2017 +0100 Translation fixes in it.pl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: langs/it/cgi-bin/it.pl | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) Difference in files: diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 41a277d..36698fd 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -124,7 +124,7 @@ 'advproxy IDENT unauthorized users' => 'Gli utenti non autorizzati (uno per riga)', 'advproxy IDENT use negative access list' => 'Utilizzare il controllo degli accessi negativo', 'advproxy IDENT use positive access list' => 'Utilizzare il controllo degli accessi positivo', -'advproxy IDENT user based access restrictions' => 'Restrizioni di accesso basato sull utente', +'advproxy IDENT user based access restrictions' => 'Restrizioni di accesso basato sull\'utente', 'advproxy LDAP ADS' => 'Active Directory', 'advproxy LDAP NDS' => 'Novell eDirectory', 'advproxy LDAP V2' => 'LDAP versione 2', @@ -210,7 +210,7 @@ 'advproxy cre disabled' => 'The management interface has been disabled by the administrator', 'advproxy cre group definitions' => 'Definizioni del gruppo in classe', 'advproxy cre supervisors' => 'Indirizzi IP Supervisore (uno per riga)', -'advproxy destination ports' => 'Porte di destinatinazione', +'advproxy destination ports' => 'Porte di destinazione', 'advproxy download throttling' => 'Limiti Download', 'advproxy enabled' => 'Abilitato', 'advproxy enabled on' => 'Abilitato su', @@ -392,7 +392,7 @@ 'backup explain key no2' => 'legacy floppy backups are not concerned with this key.', 'backup export key' => 'Export key', 'backup extract key' => 'Extract key', -'backup from' => 'Backup from', +'backup from' => 'Backup del', 'backup generate key' => 'Generate key', 'backup import dat file' => 'Import a backup (.dat) file', 'backup import key' => 'Import key', @@ -407,7 +407,7 @@ 'backup to floppy' => 'Backup to floppy', 'backupaddon' => 'Addon Backup', 'backupprofile' => 'In case reconnection fails, switch to profile', -'backups' => 'backups', +'backups' => 'Backups', 'backupwarning' => 'Per favore prima di ripristinare il backup del sistema e/o il backup addon, Si prega di mantenere il nome del file originale, di quando é stato scaricato.', 'bad characters in' => 'Bad characters in ', 'bad characters in script field' => 'Bad characters in script field', @@ -923,7 +923,7 @@ 'fireinfo is disabled' => 'Fireinfo is disabled', 'fireinfo is enabled' => 'Fireinfo is enabled', 'fireinfo is submitted' => 'Your profile is submitted to the fireinfo service.', -'fireinfo is submitted button' => 'No, I do not want to send my profile anymore', +'fireinfo is submitted button' => 'No, non voglio più inviare il mio profilo', 'fireinfo kernel version' => 'Kernel version', 'fireinfo not submitted' => 'Your profile is not submitted to the fireinfo service.', 'fireinfo not submitted button' => 'Yes, I want to send my profile', @@ -1950,13 +1950,13 @@ 'server reserved' => 'The connection name server is reserved and not allowed', 'server restart' => 'You are not able to save any changes while the OpenVPN server is running.', 'server string' => 'Server String', -'service' => 'Service', +'service' => 'Servizio', 'service added' => 'Custom network service added', 'service name' => 'Service name:', 'service removed' => 'Custom network service removed', 'service updated' => 'Custom network service updated', 'servicename' => 'Service Name', -'services' => 'Servizio', +'services' => 'Servizi', 'services settings' => 'Firewall-Impostazioni Servizi', 'set' => 'set', 'set time now' => 'Set time now', @@ -1967,7 +1967,7 @@ 'shared' => 'shared', 'sharename' => 'Sharename', 'shares' => 'Shares', -'show ajax speedmeter in footer' => 'Mostra la velocita tramita Ajax', +'show ajax speedmeter in footer' => 'Mostra la velocità tramite Ajax', 'show areas' => 'show areas', 'show ca certificate' => 'Show CA certificate', 'show certificate' => 'Show file', @@ -2100,7 +2100,7 @@ 'test email was sent' => 'Testemail was send successfully', 'the following update was successfully installed' => 'The following update was successfully installed', 'the statistics were last updated at' => 'The statistics were last updated at', -'theme' => 'Teme Grafico', +'theme' => 'Tema grafico', 'there are updates' => 'There are updates available for your system. Please go to the "updates" section for more information.', 'there are updates available' => 'There are updates available for your system. It is strongly urged that you install them as soon as possible.', 'there was no file upload' => 'There was no file upload.', @@ -2601,7 +2601,7 @@ 'wireless' => 'Wireless', 'wireless config added' => 'Wireless config added', 'wireless config changed' => 'Wireless config changed', -'wireless configuration' => 'Configuratione Wireless', +'wireless configuration' => 'Configurazione Wireless', 'wlan client' => 'Wireless client', 'wlan client advanced settings' => 'impostazioni avanzate Wireless client', 'wlan client and' => 'and', @@ -2619,7 +2619,7 @@ 'wlan client group cipher' => 'Group cipher', 'wlan client group key algorithm' => 'GKA', 'wlan client invalid key length' => 'Invalid key length.', -'wlan client new entry' => 'Crea nuova configuratione wireless client', +'wlan client new entry' => 'Crea nuova configurazione wireless client', 'wlan client new network' => 'Nuovo network', 'wlan client pairwise cipher' => 'Pairwise cipher', 'wlan client pairwise key algorithm' => 'PKA', @@ -2642,7 +2642,7 @@ 'wlanap informations' => 'Informationi', 'wlanap interface' => 'Selezione interfaccia', 'wlanap invalid wpa' => 'Invalid length in WPA Passphrase. Deve contenere dai 6 ai 63 caratteri.', -'wlanap link dhcp' => 'Configuratione Wireless Lan DHCP', +'wlanap link dhcp' => 'Configurazione Wireless Lan DHCP', 'wlanap link wireless' => 'Activate Wireless Lan clients', 'wlanap no interface' => 'Selected interface is not a Wirless Lan card!', 'wlanap none' => 'none', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a0a33a8f104ca44195ec04528113373b54a4c735
by git＠ipfire.org 04 Feb '17

04 Feb '17

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3ceb9ff3e92305ab92532347e81e8fc6df3fb8ce
by git＠ipfire.org 04 Feb '17

04 Feb '17

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 3ceb9ff3e92305ab92532347e81e8fc6df3fb8ce (commit) from 9d0ed61c8c0bb9d197fc5c5844d77a92073906ee (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 3ceb9ff3e92305ab92532347e81e8fc6df3fb8ce Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Feb 4 08:32:52 2017 +0100 wget: Update to 1.19 This is a major update to the latest available version of wget. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: wget/wget.nm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/wget/wget.nm b/wget/wget.nm index 0b97b66..60309f5 100644 --- a/wget/wget.nm +++ b/wget/wget.nm @@ -4,8 +4,8 @@ ############################################################################### name = wget -version = 1.17 -release = 2 +version = 1.19 +release = 1 groups = Applications/Internet url = http://www.gnu.org/software/wget/ hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 40065ca77362f6191279331b18781ef64e3fb588
by git＠ipfire.org 04 Feb '17

04 Feb '17

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 40065ca77362f6191279331b18781ef64e3fb588 (commit) via 4b5952148cad19a2b4ad88fa96b558730964d2d6 (commit) from 6c31e0993c33155c8514b83a291f0772e021b402 (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 40065ca77362f6191279331b18781ef64e3fb588 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Feb 4 11:59:58 2017 +0100 BUG10972: Typo in 'de.pl' Second try... ;-) First: "Submitted by IT Superhack on Dec. 18, 2015, 5:48 p.m." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Timmothy Wilson <itsuperhack(a)web.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4b5952148cad19a2b4ad88fa96b558730964d2d6 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Feb 4 11:31:58 2017 +0100 BUG11284: Typo in 'it.pl' "On line 2380 'urlfilter configuration' => 'Configurazione filttri per URL' must be corrected in 'urlfilter configuration' => 'Configurazione filtri per URL'" Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: langs/de/cgi-bin/de.pl | 2 +- langs/it/cgi-bin/it.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 261b92f..54f3ae1 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1913,7 +1913,7 @@ 'red1' => 'ROT', 'references' => 'Referenzen', 'refresh' => 'Aktualisieren', -'refresh index page while connected' => 'Aktualisere index.cgi Seite während der Verbindung', +'refresh index page while connected' => 'Aktualisiere index.cgi Seite während der Verbindung', 'refresh update list' => 'Aktualisiere Update-Liste', 'registered user rules' => 'Sourcefire VRT Regeln für registrierte Benutzer', 'released' => 'Freigegeben', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index b039cdb..41a277d 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -2377,7 +2377,7 @@ 'urlfilter category log' => 'Dividere log per categorie', 'urlfilter category name error' => 'Blacklist category name required', 'urlfilter client' => 'Client', -'urlfilter configuration' => 'Configurazione filttri per URL', +'urlfilter configuration' => 'Configurazione filtri per URL', 'urlfilter constraint definition' => 'Impostazione', 'urlfilter constraint outside' => 'outside', 'urlfilter constraint within' => 'within', 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 February 2017