fixup tinyproxy.conf

5 files changed, 46 insertions, 6 deletions

diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index 4872d9123d1..432ecd85316 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2016/03/05 11:29:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2017/02/18 05:59:23 nonaka Exp $
 #
 
 DISTNAME=	tinyproxy-1.8.3
@@ -32,6 +32,7 @@ FILES_SUBST+=		TINYPROXY_GROUP=${TINYPROXY_GROUP:Q}
 
 CONFIGURE_ARGS+=	--with-config=${PKG_SYSCONFDIR}/tinyproxy.conf
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--enable-transparent-proxy
 
 EGDIR=		${PREFIX}/share/examples/tinyproxy
@@ -48,6 +49,12 @@ SUBST_SED.docs+=	-e 's,@VARBASE@,${VARBASE},g'
 
 INSTALLATION_DIRS=	${EGDIR} share/doc/tinyproxy
 
+PLIST_SUBST+=		VARBASE=${VARBASE:Q}
+PLIST_SUBST+=		TINYPROXY_USER=${TINYPROXY_USER:Q}
+PLIST_SUBST+=		TINYPROXY_GROUP=${TINYPROXY_GROUP:Q}
+PLIST_SUBST+=		MKDIR=${MKDIR:Q} RMDIR=${RMDIR:Q} TRUE=${TRUE:Q}
+PLIST_SUBST+=		CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q}
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/tinyproxy.conf \
 		${DESTDIR}${EGDIR}/tinyproxy.conf.default
diff --git a/www/tinyproxy/PLIST b/www/tinyproxy/PLIST
index d8a330a4d85..de638dab098 100644
--- a/www/tinyproxy/PLIST
+++ b/www/tinyproxy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2014/03/11 14:05:18 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.7 2017/02/18 05:59:23 nonaka Exp $
 man/man5/tinyproxy.conf.5
 man/man8/tinyproxy.8
 sbin/tinyproxy
@@ -7,3 +7,11 @@ share/examples/tinyproxy/tinyproxy.conf.default
 share/tinyproxy/debug.html
 share/tinyproxy/default.html
 share/tinyproxy/stats.html
+@exec ${MKDIR} ${VARBASE}/log/tinyproxy || ${TRUE}
+@exec ${CHOWN} ${TINYPROXY_USER}:${TINYPROXY_GROUP} ${VARBASE}/log/tinyproxy || ${TRUE}
+@exec ${CHMOD} 755 ${VARBASE}/log/tinyproxy || ${TRUE}
+@exec ${MKDIR} ${VARBASE}/run/tinyproxy || ${TRUE}
+@exec ${CHOWN} ${TINYPROXY_USER}:${TINYPROXY_GROUP} ${VARBASE}/run/tinyproxy || ${TRUE}
+@exec ${CHMOD} 755 ${VARBASE}/run/tinyproxy || ${TRUE}
+@unexec ${RMDIR} ${VARBASE}/log/tinyproxy 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} ${VARBASE}/run/tinyproxy 2>/dev/null || ${TRUE}
diff --git a/www/tinyproxy/distinfo b/www/tinyproxy/distinfo
index 04a77e58d73..37fe68afa42 100644
--- a/www/tinyproxy/distinfo
+++ b/www/tinyproxy/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 02:47:40 agc Exp $
+$NetBSD: distinfo,v 1.11 2017/02/18 05:59:23 nonaka Exp $
 
 SHA1 (tinyproxy-1.8.3.tar.gz) = ebf4bda60ff2d0fdf1846467f07b3bbd9ef90faf
 RMD160 (tinyproxy-1.8.3.tar.gz) = 41cae4c8fcc99650a76d7bed52a379a9dd0faef0
@@ -8,6 +8,7 @@ SHA1 (patch-configure) = f446276a457c915fd2155bbe5bb1c4aa4b88c9d7
 SHA1 (patch-docs_man5_tinyproxy.conf.txt.in) = 1641f7c44ce84f2ebac6e945760af3ba77976f31
 SHA1 (patch-docs_man8_tinyproxy.txt.in) = 12c43d0f874a8794cbe8da7c702e406e8b10a99b
 SHA1 (patch-etc_Makefile.in) = 34ab3402bf11be5d2c1521f8ca0254ecbf19fc3c
+SHA1 (patch-etc_tinyproxy.conf.in) = d15ffe67b6ee86d4db41a6661d6d731c1ef149cc
 SHA1 (patch-src_child.c) = 2263f1aa7edbc31a7b31343487afa4be4fb30405
 SHA1 (patch-src_hashmap.c) = 92234430d31cd97620038a268ffd813344b262ba
 SHA1 (patch-src_reqs.c) = 9a1186ab9ebe71009384ec12aa56aff86f3a1007
diff --git a/www/tinyproxy/files/tinyproxy.sh b/www/tinyproxy/files/tinyproxy.sh
index 761723057eb..d9b28aa846d 100755
--- a/www/tinyproxy/files/tinyproxy.sh
+++ b/www/tinyproxy/files/tinyproxy.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: tinyproxy.sh,v 1.2 2011/02/03 19:27:55 shattered Exp $
+# $NetBSD: tinyproxy.sh,v 1.3 2017/02/18 05:59:23 nonaka Exp $
 #
 
 # PROVIDE: tinyproxy
@@ -11,8 +11,8 @@
 name="tinyproxy"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="@PKG_SYSCONFDIR@/$name.conf"
+pidfile="@VARBASE@/run/tinyproxy/${name}.pid"
+required_files="@PKG_SYSCONFDIR@/${name}.conf"
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in b/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in
new file mode 100644
index 00000000000..f44394bb35b
--- /dev/null
+++ b/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in
@@ -0,0 +1,24 @@
+$NetBSD: patch-etc_tinyproxy.conf.in,v 1.1 2017/02/18 05:59:23 nonaka Exp $
+
+--- etc/tinyproxy.conf.in.orig	2010-03-03 18:37:24.000000000 +0900
++++ etc/tinyproxy.conf.in	2016-12-15 11:05:42.000000000 +0900
+@@ -12,8 +12,8 @@
+ # as the root user. Either the user or group name or the UID or GID
+ # number may be used.
+ #
+-User nobody
+-Group nobody
++User @TINYPROXY_USER@
++Group @TINYPROXY_GROUP@
+ 
+ #
+ # Port: Specify the port which tinyproxy will listen on.  Please note
+@@ -122,7 +122,7 @@ LogLevel Info
+ # PidFile: Write the PID of the main tinyproxy thread to this file so it
+ # can be used for signalling purposes.
+ #
+-#PidFile "@localstatedir@/run/tinyproxy/tinyproxy.pid"
++PidFile "@localstatedir@/run/tinyproxy/tinyproxy.pid"
+ 
+ #
+ # XTinyproxy: Tell Tinyproxy to include the X-Tinyproxy header, which