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 b7981215da3482d3b9370cff4f19ed73ef24180d (commit) via 0e6e5d46c16c98d4fcdf5c277bf234d95593244d (commit) via 6ae884e5f9e8d2e6f0a71163d1a2e595942b35ce (commit) from d71bcfce59ceac8c5cb9d96ef33de10742d161aa (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 b7981215da3482d3b9370cff4f19ed73ef24180d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Sep 27 20:43:49 2014 +0200

core84: Add changed urlfilter.cgi

commit 0e6e5d46c16c98d4fcdf5c277bf234d95593244d Merge: d71bcfc 6ae884e Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Sep 27 20:43:23 2014 +0200

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

commit 6ae884e5f9e8d2e6f0a71163d1a2e595942b35ce Author: Timo Eissler timo@eissler.pro Date: Fri Sep 26 22:15:13 2014 +0200

urlfilter.cgi: safe search enhancements

Fixes: #10415

Activate bing safe search. Add nwshp to google url patterns.

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

Summary of changes: config/rootfiles/core/84/filelists/files | 1 + html/cgi-bin/urlfilter.cgi | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/84/filelists/files b/config/rootfiles/core/84/filelists/files index 85bca99..359fbe0 100644 --- a/config/rootfiles/core/84/filelists/files +++ b/config/rootfiles/core/84/filelists/files @@ -3,6 +3,7 @@ etc/issue etc/rc.d/init.d/firewall srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/urlfilter.cgi usr/lib/firewall/firewall-lib.pl usr/lib/firewall/rules.pl var/ipfire/langs diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi index 78f7b32..82d9d71 100644 --- a/html/cgi-bin/urlfilter.cgi +++ b/html/cgi-bin/urlfilter.cgi @@ -2854,11 +2854,13 @@ sub writeconfigfile if ($filtersettings{'ENABLE_SAFESEARCH'} eq 'on') { print FILE " # rewrite safesearch\n"; - print FILE " s@(.*\Wgoogle\.\w+/(webhp|search|imghp|images|grphp|groups|frghp|froogle)\?)(.*)(\bsafe=\w+)(.*)@\1\3safe=strict\5@i\n"; - print FILE " s@(.*\Wgoogle\.\w+/(webhp|search|imghp|images|grphp|groups|frghp|froogle)\?)(.*)@\1safe=strict\&\3@i\n"; + print FILE " s@(.*\Wgoogle\.\w+/(webhp|search|imghp|images|grphp|groups|nwshp|frghp|froogle)\?)(.*)(\bsafe=\w+)(.*)@\1\3safe=strict\5@i\n"; + print FILE " s@(.*\Wgoogle\.\w+/(webhp|search|imghp|images|grphp|groups|nwshp|frghp|froogle)\?)(.*)@\1safe=strict\&\3@i\n"; print FILE " s@(.*\Wsearch\.yahoo\.\w+/search\W)(.*)(\bvm=\w+)(.*)@\1\2vm=r\4@i\n"; print FILE " s@(.*\Wsearch\.yahoo\.\w+/search\W.*)@\1\&vm=r@i\n"; print FILE " s@(.*\Walltheweb\.com/customize\?)(.*)(\bcopt_offensive=\w+)(.*)@\1\2copt_offensive=on\4@i\n"; + print FILE " s@(.*\Wbing\.\w+/)(.*)(\badlt=\w+)(.*)@\1\2adlt=strict\4@i\n"; + print FILE " s@(.*\Wbing\.\w+/.*)@\1\&adlt=strict@i\n"; }

print FILE "}\n\n";

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