Mon Feb 2 20:00:41 2009 UTC ()
PR/40532 - Cem Kayali -- group permissions too broad
Just fixing security issue, will leave pkg update for MAINTAINER for now.


(jnemeth)
diff -r1.34 -r1.35 pkgsrc/www/privoxy/Makefile
diff -r1.3 -r1.4 pkgsrc/www/privoxy/files/privoxy.sh
cvs diff -r1.34 -r1.35 pkgsrc/www/privoxy/Makefile (expand / switch to unified diff)

--- pkgsrc/www/privoxy/Makefile 2008/03/12 21:35:03 1.34
+++ pkgsrc/www/privoxy/Makefile 2009/02/02 20:00:40 1.35
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.34 2008/03/12 21:35:03 drochner Exp $ 1# $NetBSD: Makefile,v 1.35 2009/02/02 20:00:40 jnemeth Exp $
2# 2#
3 3
4DISTNAME= ${PKGNAME_NOREV}-stable-src 4DISTNAME= ${PKGNAME_NOREV}-stable-src
5PKGNAME= privoxy-3.0.8 5PKGNAME= privoxy-3.0.8
 6PKGREVISION= 1
6CATEGORIES= www 7CATEGORIES= www
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ijbswa/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ijbswa/}
8 9
9MAINTAINER= kim@tac.nyc.ny.us 10MAINTAINER= kim@tac.nyc.ny.us
10HOMEPAGE= http://www.privoxy.org/ 11HOMEPAGE= http://www.privoxy.org/
11COMMENT= Web proxy with advanced filtering capabilities 12COMMENT= Web proxy with advanced filtering capabilities
12 13
13.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
14 15
15PRIVOXY_USER?= privoxy 16PRIVOXY_USER?= privoxy
16PRIVOXY_GROUP?= privoxy 17PRIVOXY_GROUP?= privoxy
17PKG_GROUPS_VARS+= PRIVOXY_GROUP 18PKG_GROUPS_VARS+= PRIVOXY_GROUP
18PKG_USERS_VARS+= PRIVOXY_USER 19PKG_USERS_VARS+= PRIVOXY_USER
@@ -44,26 +45,27 @@ CONFIGURE_ARGS+= --sysconfdir=${EGDIR:Q} @@ -44,26 +45,27 @@ CONFIGURE_ARGS+= --sysconfdir=${EGDIR:Q}
44CONFIGURE_ARGS+= --with-user=${PRIVOXY_USER:Q} 45CONFIGURE_ARGS+= --with-user=${PRIVOXY_USER:Q}
45CONFIGURE_ARGS+= --with-group=${PRIVOXY_GROUP:Q} 46CONFIGURE_ARGS+= --with-group=${PRIVOXY_GROUP:Q}
46 47
47USER_GROUP= ${PRIVOXY_USER} ${PRIVOXY_GROUP} 48USER_GROUP= ${PRIVOXY_USER} ${PRIVOXY_GROUP}
48 49
49.for i in \ 50.for i in \
50 config trust default.action standard.action user.action default.filter 51 config trust default.action standard.action user.action default.filter
51CONF_FILES_PERMS+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i} ${USER_GROUP} 0660 52CONF_FILES_PERMS+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i} ${USER_GROUP} 0660
52.endfor 53.endfor
53 54
54OWN_DIRS_PERMS+= /var/log/privoxy ${USER_GROUP} 0775 55OWN_DIRS_PERMS+= /var/log/privoxy ${USER_GROUP} 0775
55 56
56FILES_SUBST+= PRIVOXY_USER=${PRIVOXY_USER:Q} 57FILES_SUBST+= PRIVOXY_USER=${PRIVOXY_USER:Q}
 58FILES_SUBST+= PRIVOXY_USER=${PRIVOXY_GROUP:Q}
57 59
58SUBST_CLASSES+= paths 60SUBST_CLASSES+= paths
59SUBST_FILES.paths= config 61SUBST_FILES.paths= config
60SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' 62SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
61SUBST_STAGE.paths= post-patch 63SUBST_STAGE.paths= post-patch
62 64
63pre-configure: 65pre-configure:
64 @cd ${WRKSRC} && autoheader && autoconf 66 @cd ${WRKSRC} && autoheader && autoconf
65 67
66post-install: 68post-install:
67 ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${EGDIR} 69 ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${EGDIR}
68 ${CHMOD} -R a+r ${EGDIR} 70 ${CHMOD} -R a+r ${EGDIR}
69 71
cvs diff -r1.3 -r1.4 pkgsrc/www/privoxy/files/privoxy.sh (expand / switch to unified diff)

--- pkgsrc/www/privoxy/files/privoxy.sh 2003/07/12 15:11:39 1.3
+++ pkgsrc/www/privoxy/files/privoxy.sh 2009/02/02 20:00:40 1.4
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: privoxy.sh,v 1.3 2003/07/12 15:11:39 salo Exp $ 3# $NetBSD: privoxy.sh,v 1.4 2009/02/02 20:00:40 jnemeth Exp $
4# 4#
5 5
6# PROVIDE: privoxy 6# PROVIDE: privoxy
7# REQUIRE: DAEMON 7# REQUIRE: DAEMON
8 8
9. /etc/rc.subr 9. /etc/rc.subr
10 10
11name="privoxy" 11name="privoxy"
12rcvar=$name 12rcvar=$name
13command="/usr/pkg/sbin/${name}" 13command="/usr/pkg/sbin/${name}"
14pidfile="/var/run/${name}.pid" 14pidfile="/var/run/${name}.pid"
15pconfig="@PKG_SYSCONFDIR@/config" 15pconfig="@PKG_SYSCONFDIR@/config"
16puser="@PRIVOXY_USER@" 16puser="@PRIVOXY_USER@"
 17pgroup="@PRIVOXY_GROUP@"
17required_files="$pconfig" 18required_files="$pconfig"
18command_args="--pidfile ${pidfile} --user ${puser} ${pconfig} 2>/dev/null" 19command_args="--pidfile ${pidfile} --user ${puser}.${pgroup} ${pconfig} 2>/dev/null"
19 20
20load_rc_config $name 21load_rc_config $name
21run_rc_command "$1" 22run_rc_command "$1"