svn commit: r521961 - in head/www/squidguard: . files
Renato Botelho
garga at FreeBSD.org
Fri Jan 3 21:02:43 UTC 2020
Author: garga
Date: Fri Jan 3 21:02:41 2020
New Revision: 521961
URL: https://svnweb.freebsd.org/changeset/ports/521961
Log:
www/squidguard: Unbreak
* Host source files on my local area
* While here, re-generate patches with make makepatch
Sponsored by: Rubicon Communications, LLC (Netgate)
Modified:
head/www/squidguard/Makefile
head/www/squidguard/files/patch-Makefile.in
head/www/squidguard/files/patch-samples__sample.conf.in
head/www/squidguard/files/patch-src__sg.h.in
head/www/squidguard/files/patch-src__sgDb.c
head/www/squidguard/files/patch-src__sgDiv.c.in
head/www/squidguard/files/patch-src__sgLog.c
Modified: head/www/squidguard/Makefile
==============================================================================
--- head/www/squidguard/Makefile Fri Jan 3 20:41:43 2020 (r521960)
+++ head/www/squidguard/Makefile Fri Jan 3 21:02:41 2020 (r521961)
@@ -4,17 +4,14 @@ PORTNAME= squidGuard
PORTVERSION= 1.4
PORTREVISION= 15
CATEGORIES= www
-MASTER_SITES= http://www.squidguard.org/Downloads/:a \
- http://www.squidguard.org/Downloads/Contrib/:b
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:a \
- squidGuard-1.4-quoted_string_support.diff:b \
- squidGuard-1.4-dnsbl.patch:b
+MASTER_SITES= LOCAL/garga/squidguard/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ squidGuard-1.4-quoted_string_support.diff \
+ squidGuard-1.4-dnsbl.patch
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= garga at FreeBSD.org
COMMENT= Fast redirector for squid
-
-BROKEN= unfetchable
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
Modified: head/www/squidguard/files/patch-Makefile.in
==============================================================================
--- head/www/squidguard/files/patch-Makefile.in Fri Jan 3 20:41:43 2020 (r521960)
+++ head/www/squidguard/files/patch-Makefile.in Fri Jan 3 21:02:41 2020 (r521961)
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2008-05-17 20:36:44.000000000 +0200
-+++ Makefile.in 2014-08-22 19:47:56.566781181 +0200
-@@ -47,48 +47,31 @@
+--- Makefile.in.orig 2008-05-17 18:36:44 UTC
++++ Makefile.in
+@@ -47,48 +47,31 @@ install: install-build install-conf
install-conf:
@echo Installing configuration file ;
Modified: head/www/squidguard/files/patch-samples__sample.conf.in
==============================================================================
--- head/www/squidguard/files/patch-samples__sample.conf.in Fri Jan 3 20:41:43 2020 (r521960)
+++ head/www/squidguard/files/patch-samples__sample.conf.in Fri Jan 3 21:02:41 2020 (r521961)
@@ -1,6 +1,6 @@
---- samples/sample.conf.in.orig 2007-11-16 17:58:32.000000000 +0100
-+++ samples/sample.conf.in 2013-10-05 15:30:39.997329900 +0200
-@@ -53,9 +53,9 @@
+--- samples/sample.conf.in.orig 2007-11-16 16:58:32 UTC
++++ samples/sample.conf.in
+@@ -53,9 +53,9 @@ dest local {
}
dest adult {
Modified: head/www/squidguard/files/patch-src__sg.h.in
==============================================================================
--- head/www/squidguard/files/patch-src__sg.h.in Fri Jan 3 20:41:43 2020 (r521960)
+++ head/www/squidguard/files/patch-src__sg.h.in Fri Jan 3 21:02:41 2020 (r521961)
@@ -1,6 +1,6 @@
---- ./src/sg.h.in.orig 2007-11-16 08:58:32.000000000 -0800
-+++ ./src/sg.h.in 2009-10-19 12:25:23.000000000 -0700
-@@ -73,7 +73,7 @@
+--- src/sg.h.in.orig 2007-11-16 16:58:32 UTC
++++ src/sg.h.in
+@@ -73,7 +73,7 @@ int tolower();
#define REQUEST_TYPE_REDIRECT 2
#define REQUEST_TYPE_PASS 3
Modified: head/www/squidguard/files/patch-src__sgDb.c
==============================================================================
--- head/www/squidguard/files/patch-src__sgDb.c Fri Jan 3 20:41:43 2020 (r521960)
+++ head/www/squidguard/files/patch-src__sgDb.c Fri Jan 3 21:02:41 2020 (r521961)
@@ -1,6 +1,6 @@
---- src/sgDb.c.orig 2008-07-14 20:29:41.000000000 +0200
-+++ src/sgDb.c 2014-01-14 11:53:55.712138134 +0100
-@@ -119,14 +119,39 @@
+--- src/sgDb.c.orig 2008-07-14 18:29:41 UTC
++++ src/sgDb.c
+@@ -119,14 +119,39 @@ void sgDbInit(Db, file)
flag = DB_CREATE;
if(createdb)
flag = flag | DB_TRUNCATE;
@@ -11,10 +11,12 @@
+ NULL,
+#endif
+ dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
-+ (void) Db->dbp->close(Db->dbp, 0);
-+ sgLogFatalError("Error db_open: %s", strerror(ret));
-+ }
-+ } else {
+ (void) Db->dbp->close(Db->dbp, 0);
+ sgLogFatalError("Error db_open: %s", strerror(ret));
+ }
+ } else {
+- if ((ret =
+- Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
+ if ((ret = Db->dbp->open(Db->dbp,
+#if DB_VERSION_MINOR >= 1
+ NULL,
@@ -32,12 +34,10 @@
+ if ((ret = Db->dbp->open(Db->dbp,
+ NULL,
+ dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
- (void) Db->dbp->close(Db->dbp, 0);
- sgLogFatalError("Error db_open: %s", strerror(ret));
- }
- } else {
-- if ((ret =
-- Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
++ (void) Db->dbp->close(Db->dbp, 0);
++ sgLogFatalError("Error db_open: %s", strerror(ret));
++ }
++ } else {
+ if ((ret = Db->dbp->open(Db->dbp,
+ NULL,
+ dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
Modified: head/www/squidguard/files/patch-src__sgDiv.c.in
==============================================================================
--- head/www/squidguard/files/patch-src__sgDiv.c.in Fri Jan 3 20:41:43 2020 (r521960)
+++ head/www/squidguard/files/patch-src__sgDiv.c.in Fri Jan 3 21:02:41 2020 (r521961)
@@ -1,6 +1,6 @@
---- ./src/sgDiv.c.in.orig 2008-07-14 09:02:43.000000000 -0700
-+++ ./src/sgDiv.c.in 2009-10-19 12:26:04.000000000 -0700
-@@ -745,7 +745,7 @@
+--- src/sgDiv.c.in.orig 2008-07-14 16:02:43 UTC
++++ src/sgDiv.c.in
+@@ -745,7 +745,7 @@ char *sgParseRedirect(redirect, req, acl, aclpass)
p++;
break;
case 'u': /* Requested URL */
Modified: head/www/squidguard/files/patch-src__sgLog.c
==============================================================================
--- head/www/squidguard/files/patch-src__sgLog.c Fri Jan 3 20:41:43 2020 (r521960)
+++ head/www/squidguard/files/patch-src__sgLog.c Fri Jan 3 21:02:41 2020 (r521961)
@@ -1,5 +1,5 @@
---- ./src/sgLog.c.orig 2007-11-16 08:58:32.000000000 -0800
-+++ ./src/sgLog.c 2009-10-15 12:25:14.000000000 -0700
+--- src/sgLog.c.orig 2007-11-16 16:58:32 UTC
++++ src/sgLog.c
@@ -2,7 +2,7 @@
By accepting this notice, you agree to be bound by the following
agreements:
@@ -9,7 +9,7 @@
by Christine Kronberg, Shalla Secure Services. All rights reserved.
This program is free software; you can redistribute it and/or modify it
-@@ -55,8 +55,8 @@
+@@ -55,8 +55,8 @@ void sgLog(log, format, va_alist)
char msg[MAX_BUF];
va_list ap;
VA_START(ap, format);
@@ -20,7 +20,7 @@
va_end(ap);
date = niso(0);
if(globalDebug || log == NULL) {
-@@ -87,8 +87,8 @@
+@@ -87,8 +87,8 @@ void sgLogError(format, va_alist)
char msg[MAX_BUF];
va_list ap;
VA_START(ap, format);
@@ -31,7 +31,7 @@
va_end(ap);
sgLog(globalErrorLog,"%s",msg);
}
-@@ -104,8 +104,8 @@
+@@ -104,8 +104,8 @@ void sgLogFatalError(format, va_alist)
char msg[MAX_BUF];
va_list ap;
VA_START(ap, format);
More information about the svn-ports-all
mailing list