Merge remote-tracking branch 'origin/master' into next

Conflicts:
	config/rootfiles/packages/clamav
	lfs/clamav

diff --combined html/cgi-bin/vpnmain.cgi
index 380ae2686df12c6d94b42327abb9e9048ad196e9,d86a613d1ff3449010f83cecf606aec0f0b70a4d..a6d7056191a5024f414ed778e30beb34c17270e8
--- 1/html/cgi-bin/vpnmain.cgi
--- 2/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@@ -437,6 -437,14 +437,14 @@@ sub writeipsecfiles 
        }
        print CONF "\n";
      }#foreach key
+ 
+     # Add post user includes to config file
+     # After the GUI-connections allows to patch connections.
+     if (-e "/etc/ipsec.user-post.conf") {
+         print CONF "include /etc/ipsec.user-post.conf\n";
+         print CONF "\n";
+     }
+ 
      print SECRETS $last_secrets if ($last_secrets);
      close(CONF);
      close(SECRETS);
@@@ -2168,8 -2176,8 +2176,8 @@@ if(($cgiparams{'ACTION'} eq $Lang::tr{'
            $errormessage = $Lang::tr{'invalid input for ike lifetime'};
            goto ADVANCED_ERROR;
        }
 -      if ($cgiparams{'IKE_LIFETIME'} < 1 || $cgiparams{'IKE_LIFETIME'} > 8) {
 -          $errormessage = $Lang::tr{'ike lifetime should be between 1 and 8 hours'};
 +      if ($cgiparams{'IKE_LIFETIME'} < 1 || $cgiparams{'IKE_LIFETIME'} > 24) {
 +          $errormessage = $Lang::tr{'ike lifetime should be between 1 and 24 hours'};
            goto ADVANCED_ERROR;
        }
        @temp = split('\|', $cgiparams{'ESP_ENCRYPTION'});