Added recent changes to core25

diff --git a/config/rootfiles/core/25/files b/config/rootfiles/core/25/files
index 076a4d0330f7243412f6207b273f9aa84e3128a4..ca886376d45f204a607192870eb5a3ca745b81b8 100644 (file)
--- a/config/rootfiles/core/25/files
+++ b/config/rootfiles/core/25/files
@@ -1 +1,77 @@
 srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+etc/httpd/conf/magic
+etc/httpd/conf/mime.types
+usr/lib/apache/mod_actions.so
+usr/lib/apache/mod_alias.so
+usr/lib/apache/mod_asis.so
+usr/lib/apache/mod_auth_basic.so
+usr/lib/apache/mod_auth_digest.so
+usr/lib/apache/mod_authn_anon.so
+usr/lib/apache/mod_authn_dbd.so
+usr/lib/apache/mod_authn_dbm.so
+usr/lib/apache/mod_authn_default.so
+usr/lib/apache/mod_authn_file.so
+usr/lib/apache/mod_authz_dbm.so
+usr/lib/apache/mod_authz_default.so
+usr/lib/apache/mod_authz_groupfile.so
+usr/lib/apache/mod_authz_host.so
+usr/lib/apache/mod_authz_owner.so
+usr/lib/apache/mod_authz_user.so
+usr/lib/apache/mod_autoindex.so
+usr/lib/apache/mod_cern_meta.so
+usr/lib/apache/mod_cgi.so
+usr/lib/apache/mod_dav.so
+usr/lib/apache/mod_dav_fs.so
+usr/lib/apache/mod_dbd.so
+usr/lib/apache/mod_deflate.so
+usr/lib/apache/mod_dir.so
+usr/lib/apache/mod_dumpio.so
+usr/lib/apache/mod_env.so
+usr/lib/apache/mod_expires.so
+usr/lib/apache/mod_ext_filter.so
+usr/lib/apache/mod_filter.so
+usr/lib/apache/mod_headers.so
+usr/lib/apache/mod_ident.so
+usr/lib/apache/mod_imagemap.so
+usr/lib/apache/mod_include.so
+usr/lib/apache/mod_info.so
+usr/lib/apache/mod_log_config.so
+usr/lib/apache/mod_log_forensic.so
+usr/lib/apache/mod_logio.so
+usr/lib/apache/mod_mime.so
+usr/lib/apache/mod_mime_magic.so
+usr/lib/apache/mod_negotiation.so
+usr/lib/apache/mod_rewrite.so
+usr/lib/apache/mod_setenvif.so
+usr/lib/apache/mod_speling.so
+usr/lib/apache/mod_ssl.so
+usr/lib/apache/mod_status.so
+usr/lib/apache/mod_substitute.so
+usr/lib/apache/mod_unique_id.so
+usr/lib/apache/mod_userdir.so
+usr/lib/apache/mod_usertrack.so
+usr/lib/apache/mod_version.so
+usr/lib/apache/mod_vhost_alias.so
+usr/lib/libapr-1.so
+usr/lib/libapr-1.so.0
+usr/lib/libapr-1.so.0.3.3
+usr/lib/libaprutil-1.so
+usr/lib/libaprutil-1.so.0
+usr/lib/libaprutil-1.so.0.3.4
+usr/sbin/apachectl
+usr/sbin/htpasswd
+usr/sbin/httpd
+var/log/httpd
+etc/httpd/conf/conf.d
+etc/httpd/conf/default-server.conf
+etc/httpd/conf/global.conf
+etc/httpd/conf/hostname.conf
+etc/httpd/conf/listen.conf
+etc/httpd/conf/loadmodule.conf
+etc/httpd/conf/mod_log_config.conf
+etc/httpd/conf/server-tuning.conf
+etc/httpd/conf/ssl-global.conf
+etc/httpd/conf/uid.conf
+etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
+etc/httpd/conf/vhosts.d/ipfire-interface.conf
\ No newline at end of file

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index c9c73274e7a395a620bb75e4e7e71d118dadc165..49563faab4a12f23a6cc4daf0660f42aed687e4f 100644 (file)
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -2266,12 +2266,6 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
     $checked{'ESP_INTEGRITY'}{'md5'} = '';
     @temp = split('\|', $cgiparams{'ESP_INTEGRITY'});
     foreach my $key (@temp) {$checked{'ESP_INTEGRITY'}{$key} = "selected='selected'"; }
-    $checked{'ESP_GROUPTYPE'}{'modp768'} = '';
-    $checked{'ESP_GROUPTYPE'}{'modp1024'} = '';
-    $checked{'ESP_GROUPTYPE'}{'modp1536'} = '';
-    $checked{'ESP_GROUPTYPE'}{'modp2048'} = '';
-    $checked{'ESP_GROUPTYPE'}{'modp3072'} = '';
-    $checked{'ESP_GROUPTYPE'}{'modp4096'} = '';
     $checked{'ESP_GROUPTYPE'}{$cgiparams{'ESP_GROUPTYPE'}} = "selected='selected'";
 
     $checked{'AGGRMODE'} = $cgiparams{'AGGRMODE'} eq 'on' ? "checked='checked'" : '' ;