Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 1D2CD7A217 for ; Sat, 18 Feb 2017 05:59:25 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 8BE268556F; Sat, 18 Feb 2017 05:59:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1BFC784CEF for ; Sat, 18 Feb 2017 05:59:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id cOGcqTonNbVE for ; Sat, 18 Feb 2017 05:59:23 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7341C84CE0 for ; Sat, 18 Feb 2017 05:59:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6A163FBE4; Sat, 18 Feb 2017 05:59:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1487397563163670" MIME-Version: 1.0 Date: Sat, 18 Feb 2017 05:59:23 +0000 From: "NONAKA Kimihiro" Subject: CVS commit: pkgsrc/www/tinyproxy To: pkgsrc-changes@NetBSD.org Reply-To: nonaka@netbsd.org X-Mailer: log_accum Message-Id: <20170218055923.6A163FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1487397563163670 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nonaka Date: Sat Feb 18 05:59:23 UTC 2017 Modified Files: pkgsrc/www/tinyproxy: Makefile PLIST distinfo pkgsrc/www/tinyproxy/files: tinyproxy.sh Added Files: pkgsrc/www/tinyproxy/patches: patch-etc_tinyproxy.conf.in Log Message: fixup tinyproxy.conf To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 pkgsrc/www/tinyproxy/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/tinyproxy/PLIST cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/tinyproxy/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/tinyproxy/files/tinyproxy.sh cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1487397563163670 Content-Disposition: inline Content-Length: 5349 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/tinyproxy/Makefile diff -u pkgsrc/www/tinyproxy/Makefile:1.36 pkgsrc/www/tinyproxy/Makefile:1.37 --- pkgsrc/www/tinyproxy/Makefile:1.36 Sat Mar 5 11:29:40 2016 +++ pkgsrc/www/tinyproxy/Makefile Sat Feb 18 05:59:23 2017 @@ -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=${TINYPRO 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@,${VARBA 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 Index: pkgsrc/www/tinyproxy/PLIST diff -u pkgsrc/www/tinyproxy/PLIST:1.6 pkgsrc/www/tinyproxy/PLIST:1.7 --- pkgsrc/www/tinyproxy/PLIST:1.6 Tue Mar 11 14:05:18 2014 +++ pkgsrc/www/tinyproxy/PLIST Sat Feb 18 05:59:23 2017 @@ -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. 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} Index: pkgsrc/www/tinyproxy/distinfo diff -u pkgsrc/www/tinyproxy/distinfo:1.10 pkgsrc/www/tinyproxy/distinfo:1.11 --- pkgsrc/www/tinyproxy/distinfo:1.10 Wed Nov 4 02:47:40 2015 +++ pkgsrc/www/tinyproxy/distinfo Sat Feb 18 05:59:23 2017 @@ -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) = f446276a457c915 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 Index: pkgsrc/www/tinyproxy/files/tinyproxy.sh diff -u pkgsrc/www/tinyproxy/files/tinyproxy.sh:1.2 pkgsrc/www/tinyproxy/files/tinyproxy.sh:1.3 --- pkgsrc/www/tinyproxy/files/tinyproxy.sh:1.2 Thu Feb 3 19:27:55 2011 +++ pkgsrc/www/tinyproxy/files/tinyproxy.sh Sat Feb 18 05:59:23 2017 @@ -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" Added files: Index: pkgsrc/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in diff -u /dev/null pkgsrc/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in:1.1 --- /dev/null Sat Feb 18 05:59:23 2017 +++ pkgsrc/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in Sat Feb 18 05:59:23 2017 @@ -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 --_----------=_1487397563163670--