pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/squidGuard Apply content of squidGuard-1.4-patch-2...

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fd1f2710c393
branches:  trunk
changeset: 364196:fd1f2710c393
user:      taca <taca%pkgsrc.org@localhost>
date:      Wed Jun 21 15:11:10 2017 +0000

description:
Apply content of squidGuard-1.4-patch-20150201 via patches.

Bump PKGREVISION.

diffstat:

 www/squidGuard/Makefile                                |   4 +-
 www/squidGuard/distinfo                                |   4 +-
 www/squidGuard/patches/patch-samples_babel.ro          |  27 +++++++
 www/squidGuard/patches/patch-samples_squidGuard.cgi.in |  67 ++++++++++++++++++
 4 files changed, 99 insertions(+), 3 deletions(-)

diffs (130 lines):

diff -r 4b45d1b5c301 -r fd1f2710c393 www/squidGuard/Makefile
--- a/www/squidGuard/Makefile   Wed Jun 21 15:07:33 2017 +0000
+++ b/www/squidGuard/Makefile   Wed Jun 21 15:11:10 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2017/01/19 18:52:29 agc Exp $
+# $NetBSD: Makefile,v 1.35 2017/06/21 15:11:10 taca Exp $
 
 DISTNAME=      squidGuard-1.4
-PKGREVISION=   12
+PKGREVISION=   13
 CATEGORIES=    www
 MASTER_SITES=  http://www.squidguard.org/Downloads/
 MASTER_SITES+= http://www.squidguard.org/Downloads/Patches/1.4/
diff -r 4b45d1b5c301 -r fd1f2710c393 www/squidGuard/distinfo
--- a/www/squidGuard/distinfo   Wed Jun 21 15:07:33 2017 +0000
+++ b/www/squidGuard/distinfo   Wed Jun 21 15:11:10 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 02:47:39 agc Exp $
+$NetBSD: distinfo,v 1.11 2017/06/21 15:11:10 taca Exp $
 
 SHA1 (squidGuard-1.4-patch-20091015.tar.gz) = b6ad4c67222463e6bafa002593e947d73929db18
 RMD160 (squidGuard-1.4-patch-20091015.tar.gz) = 08991337d2966d44dbe2a9a131b26fa881e1e807
@@ -16,3 +16,5 @@
 RMD160 (squidGuard-1.4_upgrade.patch) = 9a4bf9c52cec21ddb12a310c2436974faedb5b70
 SHA512 (squidGuard-1.4_upgrade.patch) = 9f7dc291d1a91b027856b4b9c5a16a46cca4558018e63c4afffef1ab39bd5ed9eefe72871b5a14328681e2aa9053789c8ac01a7b657f9de387581af29cdf93cf
 Size (squidGuard-1.4_upgrade.patch) = 2619 bytes
+SHA1 (patch-samples_babel.ro) = 90a8602b88052084dade6bc5b012804df29540e0
+SHA1 (patch-samples_squidGuard.cgi.in) = 06d0f01d5e8412fc4192e37c265761d49b77d9f7
diff -r 4b45d1b5c301 -r fd1f2710c393 www/squidGuard/patches/patch-samples_babel.ro
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squidGuard/patches/patch-samples_babel.ro     Wed Jun 21 15:11:10 2017 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-samples_babel.ro,v 1.1 2017/06/21 15:11:10 taca Exp $
+
+* Apply content of squidGuard-1.4-patch-20150201.
+
+--- samples/babel.ro.orig      2017-04-17 01:37:49.000000000 +0000
++++ samples/babel.ro
+@@ -0,0 +1,20 @@
++Unknown=неизвеÑ?Ñ?нÑ?й
++Title=403  Ð?оÑ?Ñ?Ñ?п запÑ?еÑ?ен
++Msg=Ð?оÑ?Ñ?Ñ?п к данномÑ? Ñ?айÑ?Ñ? заблокиÑ?ован
++Tabclientname=Ð?мÑ? клиенÑ?а
++Tabcaption=Ð?ополниÑ?елÑ?наÑ? инÑ?оÑ?маÑ?иÑ?
++TabIP=Ð?дÑ?еÑ? клиенÑ?а
++Tabclientuser=Ð?олÑ?зоваÑ?елÑ? клиенÑ?а
++Tabclientgroup=Ð?Ñ?Ñ?ппа клиенÑ?а
++Taburl=URL
++Tabtargetgroup=Ð?аÑ?егоÑ?иÑ? заблокиÑ?ованного Ñ?айÑ?а
++msgproxymaster=Ð?Ñ?ли Ð?Ñ? Ñ?Ñ?иÑ?аеÑ?е, Ñ?Ñ?о Ñ?Ñ?о оÑ?ибка, оÑ?пÑ?авÑ?Ñ?е <U>Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ?</U> на
++msgrefresh=Ð?озможно, Ð?ам пÑ?идеÑ?Ñ?Ñ? нажаÑ?Ñ? кнопкÑ?&lt;Ð?бновиÑ?Ñ?&gt; Ð?аÑ?его бÑ?аÑ?зеÑ?а<BR> или кнопкÑ? &lt;Shift&gt;+&lt;Browser Reload&gt;<BR> 
длÑ? Ñ?ого, Ñ?Ñ?обÑ? полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п к нÑ?жной Ñ?Ñ?Ñ?аниÑ?е поÑ?ле обновлениÑ? пÑ?авил блокиÑ?ованиÑ?
++msgtimerefresh=Ð?озможно, Ð?ам пÑ?идеÑ?Ñ?Ñ? нажаÑ?Ñ? кнопкÑ?&lt;Ð?бновиÑ?Ñ?&gt; Ð?аÑ?его бÑ?аÑ?зеÑ?а<BR> или кнопкÑ? &lt;Shift&gt;+&lt;Browser 
Reload&gt;<BR> Ð?лÑ? Ñ?ого, Ñ?Ñ?обÑ? полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п к нÑ?жной Ñ?Ñ?Ñ?аниÑ?е поÑ?ле вÑ?Ñ?ода<BR> из вÑ?еменного оÑ?Ñ?езка Ñ? 
огÑ?аниÑ?ениÑ?ми доÑ?Ñ?Ñ?па
++msgunknown=Ð?оÑ?Ñ?Ñ?п запÑ?еÑ?ен поÑ?омÑ?,<BR> Ñ?Ñ?о Ð?аÑ? клиенÑ?<BR> неизвеÑ?Ñ?ен на
++msginaddr=Ð?оÑ?Ñ?Ñ?п к Ñ?айÑ?ам по <U>IP-адÑ?еÑ?ам</U><BR> запÑ?еÑ?ен длÑ? Ð?аÑ?его клиенÑ?а<BR> из Ñ?ообÑ?ажений безопаÑ?ноÑ?Ñ?и
++msgalternatives=Ð?айденÑ? Ñ?ледÑ?Ñ?Ñ?ие возможнÑ?е алÑ?Ñ?еÑ?наÑ?ивÑ?:
++msgnoalternatives=Ð?е найдено алÑ?Ñ?еÑ?нÑ?ивнÑ?Ñ? доменнÑ?Ñ? имен<BR> длÑ? Ñ?еÑ?веÑ?а <U>$address</U>
++msgreferermaster=Ð?Ñ?иÑ?Ñ?лайÑ?е Ð?аÑ?и жалобÑ? на webmaster </A><BR> of <A HREF="$referer">$referer</A><BR> и попÑ?оÑ?иÑ?е его иÑ?пÑ?авиÑ?Ñ? Ñ?Ñ?Ñ?лкÑ?(и), 
коÑ?оÑ?Ñ?е Ñ?казÑ?ваÑ?Ñ? на $url<BR> in <A HREF="$referer">$referer</A>,<BR> Ñ? пÑ?едположиÑ?елÑ?но пÑ?авилÑ?ной алÑ?Ñ?еÑ?наÑ?ивой вÑ?Ñ?е
++msgwebmaster= Ð?Ñ?иÑ?Ñ?лайÑ?е Ð?аÑ?и жалобÑ? на <U>webmaster</U> for <U>$protocol://$address</U><BR> Ñ? запÑ?оÑ?ом на <EM>доменное имÑ?</EM> длÑ? Ñ?еÑ?веÑ?а
++msgdeflang=ЭÑ?о Ñ?ообÑ?ение вÑ?водиÑ?Ñ?Ñ? на Ñ?Ñ?Ñ?Ñ?ком Ñ?зÑ?ке поÑ?омÑ?, Ñ?Ñ?о "ru" - Ñ?Ñ?о пеÑ?вÑ?й из поддеÑ?живаемÑ?Ñ? Ñ?зÑ?ков<BR> Ñ?Ñ?еди 
Ñ?еÑ?, на коÑ?оÑ?Ñ?е наÑ?Ñ?Ñ?оен Ð?аÑ? бÑ?аÑ?зеÑ?<BR> Ð?оддеÑ?живаемÑ?е Ñ?зÑ?ки
diff -r 4b45d1b5c301 -r fd1f2710c393 www/squidGuard/patches/patch-samples_squidGuard.cgi.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squidGuard/patches/patch-samples_squidGuard.cgi.in    Wed Jun 21 15:11:10 2017 +0000
@@ -0,0 +1,67 @@
+$NetBSD: patch-samples_squidGuard.cgi.in,v 1.1 2017/06/21 15:11:10 taca Exp $
+
+* Apply content of squidGuard-1.4-patch-20150201.
+
+--- samples/squidGuard.cgi.in.orig     2008-12-23 21:08:35.000000000 +0000
++++ samples/squidGuard.cgi.in
+@@ -57,14 +57,15 @@ sub showinaddr($$$$$);
+ #
+ # CONFIGURABLE OPTIONS:
+ #
+-# (Currently: "en", "fr", "de", "es", "nl", "no")
++# (Currently: "en", "fr", "de", "es", "nl", "no", "ru")
+ @supported   = (
+               "en (English), ",
+-              "fr (Français), ",
++              "fr (Fran&#231;ais), ",
+               "de (Deutsch), ",
+-              "es (Español), ",
++              "es (Espa&#241;ol), ",
+               "nl (Nederlands), ",
+-              "no (Norsk)."
++              "no (Norsk), ",
++              "ru (Russian)."
+              );
+ #
+ # Modifiy the values below to reflect you environment
+@@ -142,7 +143,7 @@ sub parsequery($) {
+ }
+ 
+ #
+-# PRINT HTTP STATUS HEARER:
++# PRINT HTTP STATUS HEADER:
+ #
+ sub status($) {
+   my $status = shift;
+@@ -150,7 +151,7 @@ sub status($) {
+ }
+ 
+ #
+-# PRINT HTTP LOCATION HEARER:
++# PRINT HTTP LOCATION HEADER:
+ #
+ sub redirect($) {
+   my $location = shift;
+@@ -249,7 +250,7 @@ sub showinaddr($$$$$) {
+     status("404 Not Found");
+   }
+   if (@names) {
+-    print "Content-type: text/html\n\n";
++    print "Content-type: text/html\n\n\n";
+     print "<!DOCTYPE html PUBLIC \"-//W3C//DTD  HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\";>\n";
+     print "<html><head>\n";
+     print "<title>$Babel{Title}</title>\n";
+@@ -317,9 +318,12 @@ if ($targetgroup eq "in-addr") {
+    showinaddr($targetgroup,$protocol,$address,$port,$path);
+ }
+ 
++$url =~ s/</&lt;/g ;
++$url =~ s/>/&gt;/g ;
++
+ status("403 Forbidden");
+ expires(0);
+-print "Content-type: text/html\n\n";
++print "Content-type: text/html\n\n\n";
+ print "<!DOCTYPE html PUBLIC \"-//W3C//DTD  HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\";>\n";
+ print "<html><head>\n";
+ print "<title>$Babel{Title}</title>\n";
Home | Main Index | Thread Index | Old Index