diff options
author | taca <taca> | 2006-05-16 05:47:53 +0000 |
---|---|---|
committer | taca <taca> | 2006-05-16 05:47:53 +0000 |
commit | 2b473755a5145dd8e93d85f30112826384a2083b (patch) | |
tree | 9529143439d39a43bad4699e557dfaa197f8c7c3 /www/squid | |
parent | 09c7888cd8191194a8505f468852a290a334942a (diff) | |
download | pkgsrc-2b473755a5145dd8e93d85f30112826384a2083b.tar.gz |
Correct default value (in comment) of cache_effective_user in squid.conf.
Based on PR pkg/33458 from david l goodrich.
I won't bump PKGREVISION since this is very trivial change and I'll commit
another changes soon.
Diffstat (limited to 'www/squid')
-rw-r--r-- | www/squid/Makefile | 20 | ||||
-rw-r--r-- | www/squid/distinfo | 3 | ||||
-rw-r--r-- | www/squid/patches/patch-aq | 19 |
3 files changed, 34 insertions, 8 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index 3ecd9297e3d..7b14452c0d3 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.175 2006/04/23 00:12:42 jlam Exp $ +# $NetBSD: Makefile,v 1.176 2006/05/16 05:47:53 taca Exp $ DISTNAME= squid-2.5.STABLE13 PKGNAME= squid-2.5.13 @@ -89,24 +89,30 @@ OPTIONAL_FILES+= libexec/wb_ntlmauth man/man8/squid_unix_group.8 # OPTIONAL_FILES+= libexec/ip_user_check libexec/squid_unix_group +SUBST_CLASSES+= confs +SUBST_STAGE.confs= pre-configure +SUBST_FILES.confs= src/cf.data.pre +SUBST_SED.confs= -e "s/@USER@/${SQUID_USER}/" +SUBST_MESSAGE.confs= Fixing configuration files. + pre-install: - @${INSTALL_DATA_DIR} ${PREFIX}/share/squid - @${INSTALL_DATA_DIR} ${PREFIX}/share/squid/errors - @${INSTALL_DATA_DIR} ${PREFIX}/share/squid/icons + ${INSTALL_DATA_DIR} ${PREFIX}/share/squid + ${INSTALL_DATA_DIR} ${PREFIX}/share/squid/errors + ${INSTALL_DATA_DIR} ${PREFIX}/share/squid/icons post-install: - @${INSTALL_DATA_DIR} ${EXAMPLESDIR} + ${INSTALL_DATA_DIR} ${EXAMPLESDIR} .for f in ${EXAMPLES_FILES} cd ${WRKSRC} && \ ${INSTALL_DATA} ${f} ${EXAMPLESDIR}/`basename ${f} .default` .endfor - @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} + ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} ${INSTALL_DATA_DIR} ${DOCDIR} @cd ${WRKSRC}; \ for i in ${DOCFILES}; do \ ${INSTALL_DATA} $$i ${DOCDIR}; \ done - @( \ + ( \ for i in ${OPTIONAL_FILES}; do \ ${TEST} ! -r ${PREFIX}/$$i || ${ECHO} $$i; \ done; \ diff --git a/www/squid/distinfo b/www/squid/distinfo index dcfe657df55..a97ad9fb22b 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.114 2006/03/12 12:12:19 taca Exp $ +$NetBSD: distinfo,v 1.115 2006/05/16 05:47:53 taca Exp $ SHA1 (squid-2.5.13/squid-2.5.STABLE13.tar.bz2) = b28320d22e17524d2a8442317394f667e108ade7 RMD160 (squid-2.5.13/squid-2.5.STABLE13.tar.bz2) = 53649274787a6c1157dc0e465637b3371c5cec12 @@ -15,5 +15,6 @@ SHA1 (patch-ak) = 590fc6e981c3b95e1a77a2d801747f328ca31a2e SHA1 (patch-al) = 931108431486868cdb714dd9fb1f11b27d092b20 SHA1 (patch-an) = e96eaf094579208da58e3777dfad7e58b5933101 SHA1 (patch-ap) = e0b7a203f6e299c6e103aaf50aed611a0670bb14 +SHA1 (patch-aq) = c3cd4f6b8da435912e1054cd47161cab8260344d SHA1 (patch-bb) = dd9de273a1c1d49ec64ad79c49fad9ac862650d7 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35 diff --git a/www/squid/patches/patch-aq b/www/squid/patches/patch-aq new file mode 100644 index 00000000000..bc3c55f9974 --- /dev/null +++ b/www/squid/patches/patch-aq @@ -0,0 +1,19 @@ +$NetBSD: patch-aq,v 1.1 2006/05/16 05:47:53 taca Exp $ + +--- src/cf.data.pre.orig 2006-05-16 12:31:15.000000000 +0900 ++++ src/cf.data.pre +@@ -2499,12 +2499,12 @@ DOC_END + + NAME: cache_effective_user + TYPE: string +-DEFAULT: nobody ++DEFAULT: @USER@ + LOC: Config.effectiveUser + DOC_START + If you start Squid as root, it will change its effective/real + UID/GID to the user specified below. The default is to change +- to UID to nobody. If you define cache_effective_user, but not ++ to UID to @USER@. If you define cache_effective_user, but not + cache_effective_group, Squid sets the GID to the effective + user's default group ID (taken from the password file) and + supplementary group list from the from groups membership of |