[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 478d8bb5dae9ccecbe4b92e9b1837409bbae6ad9

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 478d8bb5dae9ccecbe4b92e9b1837409bbae6ad9

[git]

[-- Attachment #1: Type: text/plain, Size: 3676 bytes --]

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  478d8bb5dae9ccecbe4b92e9b1837409bbae6ad9 (commit)
       via  627fdda8e87fa266fb450938e7248ad190a03e55 (commit)
       via  1c4308c1f25a0618ca858920ecfe94f0675189c2 (commit)
      from  b7981215da3482d3b9370cff4f19ed73ef24180d (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 478d8bb5dae9ccecbe4b92e9b1837409bbae6ad9
Merge: 627fdda 1c4308c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Sep 27 23:00:05 2014 +0200

    Merge remote-tracking branch 'teissler/bug_10535' into next

commit 627fdda8e87fa266fb450938e7248ad190a03e55
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Sep 27 22:59:05 2014 +0200

    Fix wording. Remove "got".
    
    Fixes #10632

commit 1c4308c1f25a0618ca858920ecfe94f0675189c2
Author: Timo Eissler <timo(a)eissler.pro>
Date:   Sat Sep 27 22:24:26 2014 +0200

    urlfilter.cgi: enhance file extension blocking
    
    Fixes #10535
    
    Add flv, mkv and mp4 as audio/video file exentions.
    Add 7z as archive file extension.

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/urlfilter.cgi | 6 +++---
 langs/en/cgi-bin/en.pl     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index 82d9d71..1e50de9 100644
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -2722,9 +2722,9 @@ sub setpermissions
 
 sub writeconfigfile
 {
-	my $executables = "\\.\(ade|adp|asx|bas|bat|chm|com|cmd|cpl|crt|dll|eml|exe|hiv|hlp|hta|inc|inf|ins|isp|jse|jtd|lnk|msc|msh|msi|msp|mst|nws|ocx|oft|ops|pcd|pif|plx|reg|scr|sct|sha|shb|shm|shs|sys|tlb|tsp|url|vbe|vbs|vxd|wsc|wsf|wsh\)\$";
-	my $audiovideo = "\\.\(aiff|asf|avi|dif|divx|mov|movie|mp3|mpe?g?|mpv2|ogg|ra?m|snd|qt|wav|wma|wmf|wmv\)\$";
-	my $archives = "\\.\(bin|bz2|cab|cdr|dmg|gz|hqx|rar|smi|sit|sea|tar|tgz|zip\)\$";
+	my $executables = "/[^/]*\\.\(ade|adp|asx|bas|bat|chm|com|cmd|cpl|crt|dll|eml|exe|hiv|hlp|hta|inc|inf|ins|isp|jse|jtd|lnk|msc|msh|msi|msp|mst|nws|ocx|oft|ops|pcd|pif|plx|reg|scr|sct|sha|shb|shm|shs|sys|tlb|tsp|url|vbe|vbs|vxd|wsc|wsf|wsh\)\$";
+	my $audiovideo = "/[^/]*\\.\(aiff|asf|avi|dif|divx|flv|mkv|mov|movie|mp3|mp4|mpe?g?|mpv2|ogg|ra?m|snd|qt|wav|wma|wmf|wmv\)\$";
+	my $archives = "/[^/]*\\.\(7z|bin|bz2|cab|cdr|dmg|gz|hqx|rar|smi|sit|sea|tar|tgz|zip\)\$";
 
 	my $ident = " anonymous";
 
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index a15090a..1986409 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2114,8 +2114,8 @@
 'swap usage per' => 'Swap usage per',
 'system' => 'System',
 'system graphs' => 'System Graphs',
-'system has hwrng' => 'This system has got a hardware random number generator.',
-'system has rdrand' => 'This system has got support for Intel(R) RDRAND.',
+'system has hwrng' => 'This system has a hardware random number generator.',
+'system has rdrand' => 'This system has support for Intel(R) RDRAND.',
 'system information' => 'System Information',
 'system log viewer' => 'System Log Viewer',
 'system logs' => 'System Logs',


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