From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5e1ee0e6e688da9623c27e27574395fefe8a33e3 Date: Wed, 19 Feb 2014 20:50:21 +0100 Message-ID: <20140219195021.9640D2028D@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6062547589112528283==" List-Id: --===============6062547589112528283== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 5e1ee0e6e688da9623c27e27574395fefe8a33e3 (commit) via 2f65e28425ca2a446cfb1ab511ae1e1546a4031c (commit) via 3fb3a3b02188ac7e74bbbb882083f6aeba1923f0 (commit) via 1271a8b45eb8ed3970beabba33fd4b0519db3565 (commit) via bbb3a931fa3b11a0d2374595cbe0d1c981e9b5e4 (commit) via f8aa06792fde9b29e0c81c1ce2fb4490e9b645a8 (commit) via a636a76016fe214e840cce8856a4fc8a74fba8a7 (commit) via db3096173d9118718c6191c48f581f1c0076dc2a (commit) via 153cf6406ccff186696926d3ad84103a4b496ba8 (commit) via bc05155ac099925796a862e1a1cd1b50ff9e6b1d (commit) via 1235b1f144bc93676acf3e8703bb308a3c60629e (commit) via 5e4262245e8166717b7d44dedebbf1c903d03181 (commit) via 77fa792f93c8363d8199c02ec0b752639fe3ecec (commit) from b21d47c804407458aee20b5609ca99ec63f710f8 (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 5e1ee0e6e688da9623c27e27574395fefe8a33e3 Merge: 2f65e28 f8aa067 Author: Michael Tremer Date: Wed Feb 19 20:49:38 2014 +0100 Merge remote-tracking branch 'alfh/bugfix_htmlclean' into next commit 2f65e28425ca2a446cfb1ab511ae1e1546a4031c Merge: 3fb3a3b a636a76 Author: Michael Tremer Date: Wed Feb 19 20:48:12 2014 +0100 Merge remote-tracking branch 'alfh/bugfix_missing_swapvisibility' into ne= xt commit 3fb3a3b02188ac7e74bbbb882083f6aeba1923f0 Merge: 1271a8b db30961 Author: Michael Tremer Date: Wed Feb 19 20:47:54 2014 +0100 Merge remote-tracking branch 'alfh/bugfix_menu_touch' into next commit 1271a8b45eb8ed3970beabba33fd4b0519db3565 Author: Michael Tremer Date: Wed Feb 19 20:47:12 2014 +0100 core76: Add update accelerator script to updater. commit bbb3a931fa3b11a0d2374595cbe0d1c981e9b5e4 Merge: bc05155 1235b1f Author: Michael Tremer Date: Wed Feb 19 20:46:21 2014 +0100 Merge remote-tracking branch 'alfh/feature_updxlrator' into next commit f8aa06792fde9b29e0c81c1ce2fb4490e9b645a8 Author: Alf H=C3=B8gemark Date: Wed Feb 19 18:31:02 2014 +0100 cgi-bin: Add title attribute to input type image where missing =20 Almost all of Date: Wed Feb 19 18:05:55 2014 +0100 ipfire theme: Add missing swapVisibility javascript function =20 qos.cgi and media.cgi depend on swapVisibility function, this is defined in each theme, but was missing from the new theme. =20 Add the function, and implement it using jquery, since jquery is always present in the new theme. commit db3096173d9118718c6191c48f581f1c0076dc2a Author: Alf H=C3=B8gemark Date: Wed Feb 19 17:30:49 2014 +0100 webgui menus: Make top menu item clickable on mobile safari =20 The menus in the new default theme does not work properly on ipad and I guess other devices using mobile safari. =20 The reason is that tags without href is not marked as clickable by ios, and therefore no css hover effect is applied. =20 The fix is either to add a href=3D"#" attribute or a onclick=3D"return true;" atribute on the tag. I prefer the href solution, since it is a no javascript solution. commit 153cf6406ccff186696926d3ad84103a4b496ba8 Author: Alf H=C3=B8gemark Date: Tue Feb 18 18:48:57 2014 +0100 cgi-bin: Use readonly=3D"readonly" attribute on html input elements =20 The proper way to mark readonly is to use readonly=3D"readonly", not readonly=3D"true", like it was done some places. commit bc05155ac099925796a862e1a1cd1b50ff9e6b1d Author: Michael Tremer Date: Tue Feb 18 15:16:08 2014 +0100 strongswan: Update to 5.1.2rc1. commit 1235b1f144bc93676acf3e8703bb308a3c60629e Author: Alf H=C3=B8gemark Date: Sat Feb 15 10:01:51 2014 +0100 updxlrator: Add support for tar.xz files commit 5e4262245e8166717b7d44dedebbf1c903d03181 Author: Alf H=C3=B8gemark Date: Wed Feb 5 20:02:44 2014 +0100 updxlrator: Handle colon in filenames in updatexlrator.cgi =20 The updatexlrator.cgi is assuming that colon is not part of any filenames downloaded by updxlrator. Fix this by fixing regular expression used for listing pending download files, and by fixing regular expression used to listing files in maintenance view. =20 The fix for listing in maintenance is not very nice, I just use ":separator:" as field separator instead of just ":", which was used earlier. This should make it very unlikely to collide with a part of the filename. =20 Also make the files in download be sorted using lower case, like it is done for files in the vendor path. =20 The problem can be reproduced by downloading http://mirror.us.leaseweb.net/archlinux/community/os/x86_64/ docker-1:0.7.6-1-x86_64.pkg.tar.xz, after pkg.tar.xz files support has been added to updxlrator. commit 77fa792f93c8363d8199c02ec0b752639fe3ecec Author: Alf H=C3=B8gemark Date: Wed Feb 5 19:03:35 2014 +0100 updxlrator: Add support for ArchLinux pkg.tar.xz files =20 Add support for caching package files for ArchLinux in updxlrator, by adding pkg.tar.xz to the regular expression for Linux vendor. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/strongswan | 106 +++++++++++++++++++++++++= ++ config/rootfiles/core/76/filelists/files | 1 + config/updxlrator/updxlrator | 4 +- html/cgi-bin/extrahd.cgi | 4 +- html/cgi-bin/fireinfo.cgi | 2 +- html/cgi-bin/fwhosts.cgi | 24 +++--- html/cgi-bin/gpl.cgi | 2 +- html/cgi-bin/ids.cgi | 2 +- html/cgi-bin/mdstat.cgi | 2 +- html/cgi-bin/ovpnmain.cgi | 6 +- html/cgi-bin/pakfire.cgi | 18 ++--- html/cgi-bin/proxy.cgi | 2 +- html/cgi-bin/qos.cgi | 26 +++---- html/cgi-bin/samba.cgi | 8 +- html/cgi-bin/tripwire.cgi | 8 +- html/cgi-bin/updatexlrator.cgi | 9 ++- html/cgi-bin/upnp.cgi | 2 +- html/html/themes/ipfire/include/functions.pl | 8 +- lfs/strongswan | 4 +- 19 files changed, 176 insertions(+), 62 deletions(-) Difference in files: diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/str= ongswan index c33769f..f507495 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 a6f5e7c..fcd2804 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 cdfce26..91ff8a9 100644 --- a/config/updxlrator/updxlrator +++ b/config/updxlrator/updxlrator @@ -108,8 +108,8 @@ while (<>) { # ----------------------------------------------------------- =20 if ( - ($source_url =3D~ m@^[h|f]t?tp://[^?]+\.(deb|rpm)$@i) || - ($source_url =3D~ m@^[h|f]t?tp://[^?]+/distfiles/[^?]+\.(tar\.gz|tar\.bz2|= tgz|zip|patch\.bz2|gz|docx|patch|pdf|exe)$@i) + ($source_url =3D~ m@^[h|f]t?tp://[^?]+\.(pkg\.tar\.xz|deb|rpm)$@i) || + ($source_url =3D~ m@^[h|f]t?tp://[^?]+/distfiles/[^?]+\.(tar\.gz|tar\.bz2|= tar\.xz|tgz|zip|patch\.bz2|gz|docx|patch|pdf|exe)$@i) ) { $xlrator_url =3D &check_cache($source_url,$hostaddr,$username,"Linux",$mir= ror); diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index 0bff591..5a6fbce 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -152,7 +152,7 @@ END - + END ; @@ -224,7 +224,7 @@ END - + END ; diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi index 5eec4ba..0060a11 100644 --- a/html/cgi-bin/fireinfo.cgi +++ b/html/cgi-bin/fireinfo.cgi @@ -156,7 +156,7 @@ print < - + '; } diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index bd3a9dc..55e2645 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -472,7 +472,7 @@ if ($return) { $Lang::tr{'snort working'}
- + 
 END
diff --git a/html/cgi-bin/mdstat.cgi b/html/cgi-bin/mdstat.cgi
index 35c7deb..e22856f 100644
--- a/html/cgi-bin/mdstat.cgi
+++ b/html/cgi-bin/mdstat.cgi
@@ -41,7 +41,7 @@ my %mainsettings =3D ();
=20
 &Header::openbox('100%', 'left',"MD Raid State");
=20
-print '';
=20
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 1ff2bf9..fa801a9 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2488,7 +2488,7 @@ if ($cgiparams{'ACTION'} eq "edit"){
     
-	
+	
@@ -2548,7 +2548,7 @@ END
 		print"
+		
 END
 ;
 	}=09
diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 5903d85..2a7ca84 100644
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -81,12 +81,12 @@ END
 							
-							
+							

     

 	$Lang::tr{'ccd name'}:$Lang::tr{'ccd subnet'}:
$Lang::tr{'ccd subnet'}:

 	

 	
 	
$ccdconf[0]$ccdconf[1]$ccdhosts/".(&ccdmaxclients($ccdconf[1])+1)."";
 print <
-		
+		
 		
 		
 		
@@ -2557,7 +2557,7 @@ print <
 		
 		
-		

 							
 							
 						
 				

 						

 							
-							
+							
 						

 		

 END
@@ -121,12 +121,12 @@ END
 							
 							
 							
-							
+							
 						
 				
 						

 							
-							
+							
 						

 		
 END
@@ -184,12 +184,12 @@ if ($return) {
 	print <
 		
-				3D'$Lang::tr{'aktiv'}' 
+				3D'$Lang::tr{'aktiv'}' 
 			
 				$Lang::tr{'pakfire working'}
 		
 			

-				
+				
 			

 		
 END
@@ -245,7 +245,7 @@ END
 					
 					

 					
-					
+					
 				 
=20
 		 
@@ -262,7 +262,7 @@ print <
 				

 				
-				
+				
 			
=20
 		
@@ -277,7 +277,7 @@ print <
 			

 			
-			
+			
 		
 	
 END
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index c8f0dca..c4cff47 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -2236,7 +2236,7 @@ print <
 	$Lang::tr{'advproxy NCSA group'}:
diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 8b96731..f3539cd 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -1209,22 +1209,22 @@ sub showclasses {
 					

 						
 						
-						
+						
 					

 					

 						
 						
-						
+						
 					

 					

 						
 						
-						
+						
 					

 					

 						
 						
-						
+						
 					

 					
 				    
@@ -1249,13 +1249,13 @@ END
 						
 						
 						
-						
+						
 					
 					

 						
 						
 						
-						
+						
 					

 					
 END
@@ -1314,7 +1314,7 @@ END
 						
 						
 						
-						
+						
 					
 					

 						
@@ -1324,7 +1324,7 @@ END
 						
 						
 						
-						
+						
 					

 				    
 END
@@ -1372,14 +1372,14 @@ END
 								
 								
 								
-								
+								
 							
 							

 								
 								
 								
 								
-								
+								
 							

 				    		
 END
@@ -1407,17 +1407,17 @@ END
 						

 							
 							
+							
 						

 						

 							
 							
-							
+							
 						

 						

 							
 							
-							
+							
 						

 						
 END
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index d48edf8..bfa0b89 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -816,10 +816,10 @@ END
 		

 		
-		
+		
+			

 		
$Lan=
g::tr{'change passwords'}
$Lang::tr{'username'}
$Lang::tr{'username'}

 		
$Lang::tr{'password'}

 		

-																				

 		

 		

 END
@@ -844,7 +844,7 @@ END
 		$Lang::tr{'unix group'}
 		$Lang::tr{'unix shell'}
 		
-																				
+			
 		
 		
 END
@@ -865,7 +865,7 @@ END
 		$Lang::tr{'unix group'}
 		$Lang::tr{'unix shell'}
 		
-																				
+			
 		
 		
 END
diff --git a/html/cgi-bin/tripwire.cgi b/html/cgi-bin/tripwire.cgi
index 170bd66..fb48a27 100644
--- a/html/cgi-bin/tripwire.cgi
+++ b/html/cgi-bin/tripwire.cgi
@@ -167,7 +167,7 @@ if ($tripwiresettings{'ACTION'} eq 'generatepolicypw')
 	
$Lang::tr{'sitekey'}=

 	$Lang::tr{'localkey'}


 	
-					 $Lang::tr{'ok'} 
+					 $Lang::tr{'ok'} 
 					
 			
 					 $Lang::tr{'cancel'}=20
@@ -506,17 +506,17 @@ END
 #

 #END
 #;
-#foreach my $cronjob (@cronjobs) {chomp $cronjob;my $time=3D$cronjob; $time=
=3D~s/\/etc\/fcron.daily\/tripwire//g;print"$cronjob at $time d=
aily";}
+#foreach my $cronjob (@cronjobs) {chomp $cronjob;my $time=3D$cronjob; $time=
=3D~s/\/etc\/fcron.daily\/tripwire//g;print"
$cronjob at $time d=
aily";}
 #print <
 #

 #
 #
+#												
 #
+#										
 #

 #												
-#												

 #										
-#										

 #END
 #;
diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi
index df77a86..6cd9668 100644
--- a/html/cgi-bin/updatexlrator.cgi
+++ b/html/cgi-bin/updatexlrator.cgi
@@ -517,7 +517,7 @@ END
 		$id =3D 0;
 		foreach $updatefile (@downloadfiles)
 		{
-			$updatefile =3D~ s/.*://;
+			$updatefile =3D~ s/.*:download/download/;
 			my $size_updatefile =3D 0;
 			my $mtime =3D 0;
 			if(-e "$repository/$updatefile") {
@@ -971,7 +971,8 @@ foreach (@sources)
 		{
 			next if(/\.info$/);
 			$updatefile =3D substr($_,rindex($_,"/")+1);
-			$updatefile .=3D ":download/$vendorid/$updatefile";
+			$_ =3D $updatefile; tr/[A-Z]/[a-z]/;
+			$updatefile =3D "$_:separator:download/$vendorid/$updatefile";
 			$updatefile =3D " ".$updatefile;
 			push(@repositoryfiles,$updatefile);
 		}
@@ -1002,7 +1003,7 @@ foreach (@sources)
 			chomp($sourceurl);
 			$updatefile =3D substr($sourceurl,rindex($sourceurl,'/')+1,length($source=
url));
 			$_ =3D $updatefile; tr/[A-Z]/[a-z]/;
-			$updatefile =3D "$_:$vendorid/$uuid/$updatefile";
+			$updatefile =3D "$_:separator:$vendorid/$uuid/$updatefile";
 			push(@repositoryfiles,$updatefile);
 		}
 	}
@@ -1145,7 +1146,7 @@ END
 	$id =3D 0;
 	foreach $updatefile (@files)
 	{
-		$updatefile =3D~ s/.*://;
+		$updatefile =3D~ s/.*:separator://;
 		my $size_updatefile =3D 0;
 		my $mtime =3D 0;
 		if(-e "$repository/$updatefile") {
diff --git a/html/cgi-bin/upnp.cgi b/html/cgi-bin/upnp.cgi
index 2b03eff..ee341e1 100644
--- a/html/cgi-bin/upnp.cgi
+++ b/html/cgi-bin/upnp.cgi
@@ -164,7 +164,7 @@ print <Upstream in KB:
 

 	
-																		
+
 
 END
 ;
diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/=
ipfire/include/functions.pl
index 44ed9b7..f354a45 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 =3D getlink($menu->{$k1});
 		next if (!is_menu_visible($link) or $link eq '');
-		print '
  • '.$menu->{$k1}->{'caption'}.'';
+		print '
  • '.$menu->{$k1}->{'captio=
n'}.'';
 		my $submenus =3D $menu->{$k1}->{'subMenu'};
 		&showsubmenu($submenus) if ($submenus);
 		print "
    • ";
@@ -128,6 +128,12 @@ print <
 	
 	
+
+	
 END
=20
 	foreach my $stylesheet (@stylesheets) {
diff --git a/lfs/strongswan b/lfs/strongswan
index 2c2c0d7..9ac94de 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 5.1.2dr3
+VER        =3D 5.1.2rc1
=20
 THISAPP    =3D strongswan-$(VER)
 DL_FILE    =3D $(THISAPP).tar.bz2
@@ -48,7 +48,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 0a2aba6b0682cc01eb4f9bbeb94bc481
+$(DL_FILE)_MD5 =3D d0508e262f2ec45ab5428bb080bc1b31
=20
 install : $(TARGET)
=20


hooks/post-receive
--
IPFire 2.x development tree

--===============6062547589112528283==--