diff options
| author | tron <tron@pkgsrc.org> | 2008-10-26 14:42:30 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2008-10-26 14:42:30 +0000 |
| commit | dc00aa583810a49b9811f648684f7d2b07ec9a04 (patch) | |
| tree | 4bce26989b6ea1fceafe9ae4966ba960454b9dcf | |
| parent | 66d06316bcc3b39325914e2e6acb7743c287b55c (diff) | |
| download | pkgsrc-dc00aa583810a49b9811f648684f7d2b07ec9a04.tar.gz | |
Pullup ticket #2559 - requested by taca
squid26: Fix transparent proxy option
squid27: Fix transparent proxy option
squid30: Fix transparent proxy option
Revisions pulled up:
www/squid/options.mk 1.15 via patch
www/squid26/Makefile 1.3 via patch
www/squid27/Makefile 1.3 via patch
www/squid30/Makefile 1.3 via patch
---
Module Name: pkgsrc
Committed By: taca
Date: Fri Oct 24 14:14:53 UTC 2008
Modified Files:
pkgsrc/www/squid: options.mk
Log Message:
I forgot to update transparent proxy related options' processing and
these options were no effect. So, fix these options' processing.
Noted by Greg Kerr via private mail and much thanks to him.
---
Module Name: pkgsrc
Committed By: taca
Date: Fri Oct 24 14:15:49 UTC 2008
Modified Files:
pkgsrc/www/squid26: Makefile
pkgsrc/www/squid27: Makefile
pkgsrc/www/squid30: Makefile
Log Message:
Bump squid's PKGREVISION to reflect fix of transparent proxy package options.
| -rw-r--r-- | www/squid/options.mk | 12 | ||||
| -rw-r--r-- | www/squid26/Makefile | 4 | ||||
| -rw-r--r-- | www/squid27/Makefile | 3 | ||||
| -rw-r--r-- | www/squid30/Makefile | 3 |
4 files changed, 12 insertions, 10 deletions
diff --git a/www/squid/options.mk b/www/squid/options.mk index 13b2e8bd1e2..6315c8c55f5 100644 --- a/www/squid/options.mk +++ b/www/squid/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.14 2008/09/12 14:59:52 taca Exp $ +# $NetBSD: options.mk,v 1.14.4.1 2008/10/26 14:42:30 tron Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.squid PKG_SUPPORTED_OPTIONS= snmp ssl \ @@ -78,15 +78,15 @@ SQUID_EXTERNAL_ACL_HELPERS?= ip_user unix_group # # squid's code has preference as: -# ipf-transparent > pf-transparent > linux-netfilter +# squid-ipf > squid-pf > squid-netfilter # So, options.mk introduce preference as: -# linux-netfilter > pf-transparnet > ipf-transparent +# squid-netfilter > squid-pf > squid-ipf # -.if !empty(PKG_OPTIONS:Mlinux-netfilter) +.if !empty(PKG_OPTIONS:Msquid-netfilter) CONFIGURE_ARGS+= --enable-linux-netfilter -.elif !empty(PKG_OPTIONS:Mpf-transparent) +.elif !empty(PKG_OPTIONS:Msquid-pf) CONFIGURE_ARGS+= --enable-pf-transparent -.elif !empty(PKG_OPTIONS:Mipf-transparent) +.elif !empty(PKG_OPTIONS:Msquid-ipf) CONFIGURE_ARGS+= --enable-ipf-transparent .endif diff --git a/www/squid26/Makefile b/www/squid26/Makefile index f4d8baaf489..dc8e2408883 100644 --- a/www/squid26/Makefile +++ b/www/squid26/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $ +# $NetBSD: Makefile,v 1.1.1.1.4.1 2008/10/26 14:42:30 tron Exp $ DISTNAME= squid-2.6.STABLE21 PKGNAME= ${DISTNAME:S/STABLE//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.6/ EXTRACT_SUFX= .tar.bz2 diff --git a/www/squid27/Makefile b/www/squid27/Makefile index a0810cfaf56..b89c2764c9d 100644 --- a/www/squid27/Makefile +++ b/www/squid27/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $ +# $NetBSD: Makefile,v 1.1.1.1.4.1 2008/10/26 14:42:30 tron Exp $ DISTNAME= squid-2.7.STABLE4 +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/STABLE//} CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.7/ diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 07d48dab71b..94d9c6f0e0c 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/09/12 15:05:57 taca Exp $ +# $NetBSD: Makefile,v 1.1.1.1.4.1 2008/10/26 14:42:30 tron Exp $ DISTNAME= squid-3.0.STABLE9 +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/STABLE//} CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v3/3.0/ |