aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorrene <rene@FreeBSD.org>2015-03-16 02:15:26 +0800
committerrene <rene@FreeBSD.org>2015-03-16 02:15:26 +0800
commitba9c04ff0507b0b6022bc378441922d1af224b0a (patch)
tree58a2de60690f7ff8773b4eb83edab8f4e979a21e /www
parentf76f53eaf759fe2eae9ea106ac3f6dbc96a95108 (diff)
downloadfreebsd-ports-gnome-ba9c04ff0507b0b6022bc378441922d1af224b0a.tar.gz
freebsd-ports-gnome-ba9c04ff0507b0b6022bc378441922d1af224b0a.tar.zst
freebsd-ports-gnome-ba9c04ff0507b0b6022bc378441922d1af224b0a.zip
www/squidguard: remove optional dependency on expired www/squid33
Since there is only one squid version left, always depend on www/squid34 [1] Differential Revision: https://reviews.freebsd.org/D2067 Submitted by: myself, madpilot [1] Approved by: maintainer (madpilot)
Diffstat (limited to 'www')
-rw-r--r--www/squidguard/Makefile10
-rw-r--r--www/squidguard/files/extrapatch-squid3476
-rw-r--r--www/squidguard/files/patch-src__main.c55
-rw-r--r--www/squidguard/files/patch-src__sgDiv.c11
-rw-r--r--www/squidguard/files/patch-src__sgDiv.c.in9
5 files changed, 74 insertions, 87 deletions
diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile
index 4a8aa15eb060..f1b658376f0d 100644
--- a/www/squidguard/Makefile
+++ b/www/squidguard/Makefile
@@ -17,6 +17,8 @@ COMMENT= Fast redirector for squid
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
+
USE_BDB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-db-inc=${BDB_INCLUDE_DIR} \
@@ -42,20 +44,12 @@ SUB_FILES= pkg-deinstall pkg-message
SUB_LIST= PORTNAME=${PORTNAME}
OPTIONS_DEFINE= DNS_BL DOCS EXAMPLES LDAP QUOTE_STRING
-OPTIONS_SINGLE= SV
-OPTIONS_SINGLE_SV= SQUID34 SQUID33
-OPTIONS_DEFAULT= SQUID34
EXAMPLES_DESC= Install sample blacklists
DNS_BL_DESC= Enable DNS based blacklists
QUOTE_STRING_DESC= Add quoted string patch
-SQUID33_DESC= Depend on Squid 3.3 (DEPERCATED)
-SQUID34_DESC= Depend on Squid 3.4
OPTIONS_SUB= yes
-SQUID33_RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid33
-SQUID34_RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
-SQUID34_EXTRA_PATCHES= ${FILESDIR}/extrapatch-squid34:-p1
QUOTE_STRING_EXTRA_PATCHES= ${DISTDIR}/squidGuard-1.4-quoted_string_support.diff:-p2
DNS_BL_EXTRA_PATCHES= ${DISTDIR}/squidGuard-1.4-dnsbl.patch:-p1
LDAP_CONFIGURE_ON= --with-ldap
diff --git a/www/squidguard/files/extrapatch-squid34 b/www/squidguard/files/extrapatch-squid34
deleted file mode 100644
index a9ef0681ab22..000000000000
--- a/www/squidguard/files/extrapatch-squid34
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -urN squidGuard-1.4.orig/src/main.c squidGuard-1.4.upgraded/src/main.c
---- squidGuard-1.4.orig/src/main.c 2013-12-11 17:42:15.000000000 +1300
-+++ squidGuard-1.4.upgraded/src/main.c 2013-12-11 19:04:09.000000000 +1300
-@@ -175,7 +175,7 @@
- sgReloadConfig();
- }
- if(failsafe_mode) {
-- puts("");
-+ puts("ERR message=\"squidGuard failsafe mode\"");
- fflush(stdout);
- if(sig_hup){
- sgReloadConfig();
-@@ -184,7 +184,7 @@
- }
- if(parseLine(buf,&squidInfo) != 1){
- sgLogError("Error parsing squid line: %s",buf);
-- puts("");
-+ puts("BH message=\"squidGuard error parsing squid line\"");
- }
- else {
- src = Source;
-@@ -196,14 +196,14 @@
- acl = sgAclCheckSource(src);
- if((redirect = sgAclAccess(src,acl,&squidInfo)) == NULL){
- if(src == NULL || src->cont_search == 0){
-- puts("");
-+ puts("ERR");
- break;
- } else
- if(src->next != NULL){
- src = src->next;
- continue;
- } else {
-- puts("");
-+ puts("ERR");
- break;
- }
- } else {
-@@ -215,9 +215,10 @@
- squidInfo.ident[0] = '-';
- squidInfo.ident[1] = '\0';
- }
-- fprintf(stdout,"%s %s/%s %s %s\n",redirect,squidInfo.src,
-- squidInfo.srcDomain,squidInfo.ident,
-- squidInfo.method);
-+ if (isdigit(redirect[0]) && isdigit(redirect[1]) && isdigit(redirect[2]) && redirect[3]==':') {
-+ fprintf(stdout,"OK status=%c%c%c url=\"%s\"\n", redirect[0], redirect[1], redirect[2], &redirect[4]);
-+ } else
-+ fprintf(stdout,"OK rewrite-url=\"%s\"\n",redirect);
- /* sgLogError("%s %s/%s %s %s\n",redirect,squidInfo.src,squidInfo.srcDomain,squidInfo.ident,squidInfo.method); */
- break;
- }
-diff -urN squidGuard-1.4.orig/src/sgDiv.c squidGuard-1.4.upgraded/src/sgDiv.c
---- squidGuard-1.4.orig/src/sgDiv.c 2013-12-11 17:42:15.000000000 +1300
-+++ squidGuard-1.4.upgraded/src/sgDiv.c 2013-12-11 18:58:33.000000000 +1300
-@@ -771,7 +771,7 @@
- }
- sgLogError("Going into emergency mode");
- while(fgets(buf, MAX_BUF, stdin) != NULL){
-- puts("");
-+ puts("ERR");
- fflush(stdout);
- }
- sgLogError("ending emergency mode, stdin empty");
-diff -urN squidGuard-1.4.orig/src/sgDiv.c.in squidGuard-1.4.upgraded/src/sgDiv.c.in
---- squidGuard-1.4.orig/src/sgDiv.c.in 2013-12-11 17:42:15.000000000 +1300
-+++ squidGuard-1.4.upgraded/src/sgDiv.c.in 2013-12-11 18:58:40.000000000 +1300
-@@ -782,7 +782,7 @@
- }
- sgLogError("Going into emergency mode");
- while(fgets(buf, MAX_BUF, stdin) != NULL){
-- puts("");
-+ puts("ERR");
- fflush(stdout);
- }
- sgLogError("ending emergency mode, stdin empty");
diff --git a/www/squidguard/files/patch-src__main.c b/www/squidguard/files/patch-src__main.c
index 29e243171aa8..54b88b3f207c 100644
--- a/www/squidguard/files/patch-src__main.c
+++ b/www/squidguard/files/patch-src__main.c
@@ -1,6 +1,6 @@
---- src/main.c.orig Thu Jun 14 01:56:54 2001
-+++ src/main.c Sun Jan 1 17:04:13 2006
-@@ -108,7 +108,11 @@
+--- src/main.c.orig 2008-08-30 10:27:41 UTC
++++ src/main.c
+@@ -114,7 +114,11 @@ int main(argc, argv, envp)
globalUpdate = 1;
break;
case 'v':
@@ -12,3 +12,52 @@
exit(0);
break;
case 't':
+@@ -175,7 +179,7 @@ int main(argc, argv, envp)
+ sgReloadConfig();
+ }
+ if(failsafe_mode) {
+- puts("");
++ puts("ERR message=\"squidGuard failsafe mode\"");
+ fflush(stdout);
+ if(sig_hup){
+ sgReloadConfig();
+@@ -184,7 +188,7 @@ int main(argc, argv, envp)
+ }
+ if(parseLine(buf,&squidInfo) != 1){
+ sgLogError("Error parsing squid line: %s",buf);
+- puts("");
++ puts("BH message=\"squidGuard error parsing squid line\"");
+ }
+ else {
+ src = Source;
+@@ -196,14 +200,14 @@ int main(argc, argv, envp)
+ acl = sgAclCheckSource(src);
+ if((redirect = sgAclAccess(src,acl,&squidInfo)) == NULL){
+ if(src == NULL || src->cont_search == 0){
+- puts("");
++ puts("ERR");
+ break;
+ } else
+ if(src->next != NULL){
+ src = src->next;
+ continue;
+ } else {
+- puts("");
++ puts("ERR");
+ break;
+ }
+ } else {
+@@ -215,9 +219,10 @@ int main(argc, argv, envp)
+ squidInfo.ident[0] = '-';
+ squidInfo.ident[1] = '\0';
+ }
+- fprintf(stdout,"%s %s/%s %s %s\n",redirect,squidInfo.src,
+- squidInfo.srcDomain,squidInfo.ident,
+- squidInfo.method);
++ if (isdigit(redirect[0]) && isdigit(redirect[1]) && isdigit(redirect[2]) && redirect[3]==':') {
++ fprintf(stdout,"OK status=%c%c%c url=\"%s\"\n", redirect[0], redirect[1], redirect[2], &redirect[4]);
++ } else
++ fprintf(stdout,"OK rewrite-url=\"%s\"\n",redirect);
+ /* sgLogError("%s %s/%s %s %s\n",redirect,squidInfo.src,squidInfo.srcDomain,squidInfo.ident,squidInfo.method); */
+ break;
+ }
diff --git a/www/squidguard/files/patch-src__sgDiv.c b/www/squidguard/files/patch-src__sgDiv.c
new file mode 100644
index 000000000000..7fcec6a6dc82
--- /dev/null
+++ b/www/squidguard/files/patch-src__sgDiv.c
@@ -0,0 +1,11 @@
+--- src/sgDiv.c.orig 2008-03-12 20:41:53 UTC
++++ src/sgDiv.c
+@@ -771,7 +771,7 @@ void sgEmergency ()
+ }
+ sgLogError("Going into emergency mode");
+ while(fgets(buf, MAX_BUF, stdin) != NULL){
+- puts("");
++ puts("ERR");
+ fflush(stdout);
+ }
+ sgLogError("ending emergency mode, stdin empty");
diff --git a/www/squidguard/files/patch-src__sgDiv.c.in b/www/squidguard/files/patch-src__sgDiv.c.in
index 2a7a855ba54b..a9989309454d 100644
--- a/www/squidguard/files/patch-src__sgDiv.c.in
+++ b/www/squidguard/files/patch-src__sgDiv.c.in
@@ -9,3 +9,12 @@
p++;
break;
default:
+@@ -782,7 +782,7 @@ void sgEmergency ()
+ }
+ sgLogError("Going into emergency mode");
+ while(fgets(buf, MAX_BUF, stdin) != NULL){
+- puts("");
++ puts("ERR");
+ fflush(stdout);
+ }
+ sgLogError("ending emergency mode, stdin empty");
generated by cgit (git 2.34.1) at 2025-03-10 11:52:49 +0800