Subject: Re: pkg/33458: pkgsrc/www/squid has incorrect user name in configuration file
To: None <gnats-bugs@netbsd.org>
From: david l goodrich <dlg@dorkzilla.org>
List: pkgsrc-bugs
Date: 05/10/2006 17:05:50
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--Apple-Mail-60--659656973
Content-Type: multipart/mixed; boundary=Apple-Mail-59--659657239


--Apple-Mail-59--659657239
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	delsp=yes;
	format=flowed


On 10 May 2006, at 3:40p, joerg@britannica.bec.de wrote:

>  On Wed, May 10, 2006 at 07:50:00PM +0000, dlg@dorkzilla.org wrote:
>> the cache_effective_user's default value, "nobody" in squid.conf is
>> incorrect for pkgsrc's build of squid, which uses the default user of
>> "squid".  The below patch will add an entry to the installed  
>> squid.conf
>> to make this change.
>
>  I don't want to take this, but whoever wants to deal with it  
> should keep
>  in mind that the user can be changed and should be patched via SUBST
>  framework.

That's true.  Attached is an updated patch.
   --david
--Apple-Mail-59--659657239
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
	x-unix-mode=0666;
	name="www_squid.diff"
Content-Disposition: attachment;
	filename=www_squid.diff

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/squid/Makefile,v
retrieving revision 1.175
diff -u -r1.175 Makefile
--- Makefile
+++ Makefile
@@ -89,6 +89,12 @@
 #
 OPTIONAL_FILES+= libexec/ip_user_check libexec/squid_unix_group
 
+SUBST_CLASSES+=		confs
+SUBST_STAGE.confs=	post-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
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/squid/distinfo,v
retrieving revision 1.114
diff -u -r1.114 distinfo
--- distinfo
+++ distinfo
@@ -17,3 +17,4 @@
 SHA1 (patch-ap) = e0b7a203f6e299c6e103aaf50aed611a0670bb14
 SHA1 (patch-bb) = dd9de273a1c1d49ec64ad79c49fad9ac862650d7
 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
+SHA1 (patch-bd) = 085305e8f12ecd63c8e575dd039867f32a025887
Index: patches/patch-bd
--- /dev/null
+++ patches/patch-bd
@@ -0,0 +1,13 @@
+--- src/cf.data.pre.orig	2006-05-10 13:24:41.000000000 -0500
++++ src/cf.data.pre
+@@ -2509,6 +2509,10 @@
+ 	user's default group ID (taken from the password file) and
+ 	supplementary group list from the from groups membership of
+ 	cache_effective_user.
++NOCOMMENT_START
++
++cache_effective_user @@USER@@
++NOCOMMENT_END
+ DOC_END
+ 
+ 

--Apple-Mail-59--659657239--

--Apple-Mail-60--659656973
content-type: application/pgp-signature; x-mac-type=70674453;
	name=PGP.sig
content-description: This is a digitally signed message part
content-disposition: inline; filename=PGP.sig
content-transfer-encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (Darwin)

iD8DBQFEYmPCHDmo5jqnP4QRAqngAJ92l892uQZicJWt3LclnUMPLt/0OACfZRJW
hVcxyUtoL9pt+L3Fx70C7LA=
=QU6/
-----END PGP SIGNATURE-----

--Apple-Mail-60--659656973--