From: Michael Tremer Date: Wed, 19 Feb 2014 19:49:38 +0000 (+0100) Subject: Merge remote-tracking branch 'alfh/bugfix_htmlclean' into next X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=5e1ee0e6e688da9623c27e27574395fefe8a33e3;hp=f8aa06792fde9b29e0c81c1ce2fb4490e9b645a8 Merge remote-tracking branch 'alfh/bugfix_htmlclean' into next --- diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index c33769f79..f507495b6 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -10,6 +10,57 @@ etc/ipsec.d/private etc/ipsec.d/reqs etc/ipsec.secrets etc/strongswan.conf +etc/strongswan.d +etc/strongswan.d/charon +etc/strongswan.d/charon-logging.conf +etc/strongswan.d/charon.conf +etc/strongswan.d/charon/aes.conf +etc/strongswan.d/charon/attr.conf +etc/strongswan.d/charon/cmac.conf +etc/strongswan.d/charon/constraints.conf +etc/strongswan.d/charon/curl.conf +etc/strongswan.d/charon/des.conf +etc/strongswan.d/charon/dhcp.conf +etc/strongswan.d/charon/dnskey.conf +etc/strongswan.d/charon/eap-identity.conf +etc/strongswan.d/charon/eap-mschapv2.conf +etc/strongswan.d/charon/eap-peap.conf +etc/strongswan.d/charon/eap-radius.conf +etc/strongswan.d/charon/eap-tls.conf +etc/strongswan.d/charon/eap-ttls.conf +etc/strongswan.d/charon/farp.conf +etc/strongswan.d/charon/fips-prf.conf +etc/strongswan.d/charon/gmp.conf +etc/strongswan.d/charon/hmac.conf +etc/strongswan.d/charon/kernel-netlink.conf +etc/strongswan.d/charon/md5.conf +etc/strongswan.d/charon/nonce.conf +etc/strongswan.d/charon/openssl.conf +etc/strongswan.d/charon/padlock.conf +etc/strongswan.d/charon/pem.conf +etc/strongswan.d/charon/pgp.conf +etc/strongswan.d/charon/pkcs1.conf +etc/strongswan.d/charon/pkcs12.conf +etc/strongswan.d/charon/pkcs7.conf +etc/strongswan.d/charon/pkcs8.conf +etc/strongswan.d/charon/pubkey.conf +etc/strongswan.d/charon/random.conf +etc/strongswan.d/charon/rc2.conf +etc/strongswan.d/charon/resolve.conf +etc/strongswan.d/charon/revocation.conf +etc/strongswan.d/charon/sha1.conf +etc/strongswan.d/charon/sha2.conf +etc/strongswan.d/charon/socket-default.conf +etc/strongswan.d/charon/sshkey.conf +etc/strongswan.d/charon/stroke.conf +etc/strongswan.d/charon/unity.conf +etc/strongswan.d/charon/updown.conf +etc/strongswan.d/charon/x509.conf +etc/strongswan.d/charon/xauth-eap.conf +etc/strongswan.d/charon/xauth-generic.conf +etc/strongswan.d/charon/xcbc.conf +etc/strongswan.d/starter.conf +etc/strongswan.d/tools.conf usr/bin/pki #usr/lib/ipsec #usr/lib/ipsec/libcharon.a @@ -113,3 +164,58 @@ usr/sbin/ipsec #usr/share/man/man8/ipsec.8 #usr/share/man/man8/openac.8 #usr/share/man/man8/scepclient.8 +#usr/share/strongswan +#usr/share/strongswan/templates +#usr/share/strongswan/templates/config +#usr/share/strongswan/templates/config/plugins +#usr/share/strongswan/templates/config/plugins/aes.conf +#usr/share/strongswan/templates/config/plugins/attr.conf +#usr/share/strongswan/templates/config/plugins/cmac.conf +#usr/share/strongswan/templates/config/plugins/constraints.conf +#usr/share/strongswan/templates/config/plugins/curl.conf +#usr/share/strongswan/templates/config/plugins/des.conf +#usr/share/strongswan/templates/config/plugins/dhcp.conf +#usr/share/strongswan/templates/config/plugins/dnskey.conf +#usr/share/strongswan/templates/config/plugins/eap-identity.conf +#usr/share/strongswan/templates/config/plugins/eap-mschapv2.conf +#usr/share/strongswan/templates/config/plugins/eap-peap.conf +#usr/share/strongswan/templates/config/plugins/eap-radius.conf +#usr/share/strongswan/templates/config/plugins/eap-tls.conf +#usr/share/strongswan/templates/config/plugins/eap-ttls.conf +#usr/share/strongswan/templates/config/plugins/farp.conf +#usr/share/strongswan/templates/config/plugins/fips-prf.conf +#usr/share/strongswan/templates/config/plugins/gmp.conf +#usr/share/strongswan/templates/config/plugins/hmac.conf +#usr/share/strongswan/templates/config/plugins/kernel-netlink.conf +#usr/share/strongswan/templates/config/plugins/md5.conf +#usr/share/strongswan/templates/config/plugins/nonce.conf +#usr/share/strongswan/templates/config/plugins/openssl.conf +#usr/share/strongswan/templates/config/plugins/padlock.conf +#usr/share/strongswan/templates/config/plugins/pem.conf +#usr/share/strongswan/templates/config/plugins/pgp.conf +#usr/share/strongswan/templates/config/plugins/pkcs1.conf +#usr/share/strongswan/templates/config/plugins/pkcs12.conf +#usr/share/strongswan/templates/config/plugins/pkcs7.conf +#usr/share/strongswan/templates/config/plugins/pkcs8.conf +#usr/share/strongswan/templates/config/plugins/pubkey.conf +#usr/share/strongswan/templates/config/plugins/random.conf +#usr/share/strongswan/templates/config/plugins/rc2.conf +#usr/share/strongswan/templates/config/plugins/resolve.conf +#usr/share/strongswan/templates/config/plugins/revocation.conf +#usr/share/strongswan/templates/config/plugins/sha1.conf +#usr/share/strongswan/templates/config/plugins/sha2.conf +#usr/share/strongswan/templates/config/plugins/socket-default.conf +#usr/share/strongswan/templates/config/plugins/sshkey.conf +#usr/share/strongswan/templates/config/plugins/stroke.conf +#usr/share/strongswan/templates/config/plugins/unity.conf +#usr/share/strongswan/templates/config/plugins/updown.conf +#usr/share/strongswan/templates/config/plugins/x509.conf +#usr/share/strongswan/templates/config/plugins/xauth-eap.conf +#usr/share/strongswan/templates/config/plugins/xauth-generic.conf +#usr/share/strongswan/templates/config/plugins/xcbc.conf +#usr/share/strongswan/templates/config/strongswan.conf +#usr/share/strongswan/templates/config/strongswan.d +#usr/share/strongswan/templates/config/strongswan.d/charon-logging.conf +#usr/share/strongswan/templates/config/strongswan.d/charon.conf +#usr/share/strongswan/templates/config/strongswan.d/starter.conf +#usr/share/strongswan/templates/config/strongswan.d/tools.conf diff --git a/config/rootfiles/core/76/filelists/files b/config/rootfiles/core/76/filelists/files index a6f5e7c41..fcd2804b3 100644 --- a/config/rootfiles/core/76/filelists/files +++ b/config/rootfiles/core/76/filelists/files @@ -21,6 +21,7 @@ srv/web/ipfire/html/themes/maniac usr/lib/firewall usr/local/bin/timezone-transition usr/local/bin/setddns.pl +usr/sbin/updxlrator var/ipfire/backup/bin/backup.pl var/ipfire/backup/exclude var/ipfire/backup/include diff --git a/config/updxlrator/updxlrator b/config/updxlrator/updxlrator index cdfce26d8..91ff8a966 100644 --- a/config/updxlrator/updxlrator +++ b/config/updxlrator/updxlrator @@ -108,8 +108,8 @@ while (<>) { # ----------------------------------------------------------- if ( - ($source_url =~ m@^[h|f]t?tp://[^?]+\.(deb|rpm)$@i) || - ($source_url =~ m@^[h|f]t?tp://[^?]+/distfiles/[^?]+\.(tar\.gz|tar\.bz2|tgz|zip|patch\.bz2|gz|docx|patch|pdf|exe)$@i) + ($source_url =~ m@^[h|f]t?tp://[^?]+\.(pkg\.tar\.xz|deb|rpm)$@i) || + ($source_url =~ m@^[h|f]t?tp://[^?]+/distfiles/[^?]+\.(tar\.gz|tar\.bz2|tar\.xz|tgz|zip|patch\.bz2|gz|docx|patch|pdf|exe)$@i) ) { $xlrator_url = &check_cache($source_url,$hostaddr,$username,"Linux",$mirror); diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi index df77a86af..6cd9668db 100644 --- a/html/cgi-bin/updatexlrator.cgi +++ b/html/cgi-bin/updatexlrator.cgi @@ -517,7 +517,7 @@ END $id = 0; foreach $updatefile (@downloadfiles) { - $updatefile =~ s/.*://; + $updatefile =~ s/.*:download/download/; my $size_updatefile = 0; my $mtime = 0; if(-e "$repository/$updatefile") { @@ -971,7 +971,8 @@ foreach (@sources) { next if(/\.info$/); $updatefile = substr($_,rindex($_,"/")+1); - $updatefile .= ":download/$vendorid/$updatefile"; + $_ = $updatefile; tr/[A-Z]/[a-z]/; + $updatefile = "$_:separator:download/$vendorid/$updatefile"; $updatefile = " ".$updatefile; push(@repositoryfiles,$updatefile); } @@ -1002,7 +1003,7 @@ foreach (@sources) chomp($sourceurl); $updatefile = substr($sourceurl,rindex($sourceurl,'/')+1,length($sourceurl)); $_ = $updatefile; tr/[A-Z]/[a-z]/; - $updatefile = "$_:$vendorid/$uuid/$updatefile"; + $updatefile = "$_:separator:$vendorid/$uuid/$updatefile"; push(@repositoryfiles,$updatefile); } } @@ -1145,7 +1146,7 @@ END $id = 0; foreach $updatefile (@files) { - $updatefile =~ s/.*://; + $updatefile =~ s/.*:separator://; my $size_updatefile = 0; my $mtime = 0; if(-e "$repository/$updatefile") { diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index 44ed9b758..f354a45bf 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -80,7 +80,7 @@ EOF foreach my $k1 ( sort keys %$menu ) { $link = getlink($menu->{$k1}); next if (!is_menu_visible($link) or $link eq ''); - print '
  • '.$menu->{$k1}->{'caption'}.''; + print '
  • '.$menu->{$k1}->{'caption'}.''; my $submenus = $menu->{$k1}->{'subMenu'}; &showsubmenu($submenus) if ($submenus); print "
    • "; @@ -128,6 +128,12 @@ print < + + END foreach my $stylesheet (@stylesheets) { diff --git a/lfs/strongswan b/lfs/strongswan index 2c2c0d756..9ac94de75 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 5.1.2dr3 +VER = 5.1.2rc1 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0a2aba6b0682cc01eb4f9bbeb94bc481 +$(DL_FILE)_MD5 = d0508e262f2ec45ab5428bb080bc1b31 install : $(TARGET)