From bc051eac54375a7f90b1d157414610f58de8c34a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 14 Jun 2019 06:22:52 +0100 Subject: [PATCH 1/2] core133: Ship jansson in update Signed-off-by: Michael Tremer --- config/rootfiles/core/133/filelists/jansson | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/133/filelists/jansson diff --git a/config/rootfiles/core/133/filelists/jansson b/config/rootfiles/core/133/filelists/jansson new file mode 120000 index 000000000..21f73bd0c --- /dev/null +++ b/config/rootfiles/core/133/filelists/jansson @@ -0,0 +1 @@ +../../../common/jansson \ No newline at end of file From faec909e1aa3d164739a8740d0958cc8e420a6a7 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 15 Jun 2019 17:38:47 +0200 Subject: [PATCH 2/2] vpnmain.cgi: remove wrongh "shift-space" Signed-off-by: Arne Fitzenreiter --- html/cgi-bin/vpnmain.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 4b737b3a8..fbc274919 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2019 IPFire Team info@ipfire.org # # # # 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 # @@ -3338,7 +3338,7 @@ sub make_algos($$$$$) { push(@algo, $int); } - if ($pfs || $grp eq "none") { + if ($pfs || $grp eq "none") { # noop } elsif ($grp =~ m/^e(.*)$/) { push(@algo, "ecp$1");