diff options
| -rw-r--r-- | www/privoxy/Makefile | 4 | ||||
| -rwxr-xr-x | www/privoxy/files/privoxy.sh | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile index 39087012494..a115cc285dc 100644 --- a/www/privoxy/Makefile +++ b/www/privoxy/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.34 2008/03/12 21:35:03 drochner Exp $ +# $NetBSD: Makefile,v 1.35 2009/02/02 20:00:40 jnemeth Exp $ # DISTNAME= ${PKGNAME_NOREV}-stable-src PKGNAME= privoxy-3.0.8 +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ijbswa/} @@ -54,6 +55,7 @@ CONF_FILES_PERMS+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i} ${USER_GROUP} 0660 OWN_DIRS_PERMS+= /var/log/privoxy ${USER_GROUP} 0775 FILES_SUBST+= PRIVOXY_USER=${PRIVOXY_USER:Q} +FILES_SUBST+= PRIVOXY_USER=${PRIVOXY_GROUP:Q} SUBST_CLASSES+= paths SUBST_FILES.paths= config diff --git a/www/privoxy/files/privoxy.sh b/www/privoxy/files/privoxy.sh index 6650e25ad47..997b694d234 100755 --- a/www/privoxy/files/privoxy.sh +++ b/www/privoxy/files/privoxy.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: privoxy.sh,v 1.3 2003/07/12 15:11:39 salo Exp $ +# $NetBSD: privoxy.sh,v 1.4 2009/02/02 20:00:40 jnemeth Exp $ # # PROVIDE: privoxy @@ -14,8 +14,9 @@ command="/usr/pkg/sbin/${name}" pidfile="/var/run/${name}.pid" pconfig="@PKG_SYSCONFDIR@/config" puser="@PRIVOXY_USER@" +pgroup="@PRIVOXY_GROUP@" required_files="$pconfig" -command_args="--pidfile ${pidfile} --user ${puser} ${pconfig} 2>/dev/null" +command_args="--pidfile ${pidfile} --user ${puser}.${pgroup} ${pconfig} 2>/dev/null" load_rc_config $name run_rc_command "$1" |