CVS commit: pkgsrc/www/tinyproxy

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Oct 12 13:57:46 UTC 2018

Modified Files:
        pkgsrc/www/tinyproxy: Makefile PLIST distinfo
        pkgsrc/www/tinyproxy/files: tinyproxy.sh
        pkgsrc/www/tinyproxy/patches: patch-etc_Makefile.in
            patch-etc_tinyproxy.conf.in
Removed Files:
        pkgsrc/www/tinyproxy/patches: patch-configure

Log Message:
tinyproxy: updated to 1.10.0

Tinyproxy version 1.10.0

Major changes in this release
-----------------------------
Add support for basic HTTP authentication
Add socks upstream support
Log to stdout if no logfile is specified
Activate reverse proxy by default
Support bind with transparent mode
Install tinyproxy to bin/ instead of sbin/
Ship manpages as part of distribution tarball
Allow multiple listen statements in the configuration
Coverity fixes
Simplified configure and build
Improved selftest environment

Included security fixes
-----------------------
Fix CVE-2017-11747: Create PID file before dropping privileges.
Fix CVE-2012-3505: algorithmic complexity DoS in hashmap

Bugfixes
--------
fix algorithmic complexity DoS in hashmap
fix CONNECT requests with IPv6 literal addresses as host
fix invalid free for GET requests to ipv6 literal address
conf: Allow multiple Listen statements in the config
allow listening on multiple families when no Listen is provided in config
Drop supplementary groups
build: fix build with autoconf >= 2.69
Move files installed in /etc/ to /etc/tinyproxy/
Fix crash (infinite loop) when writing to log file fails
Fix bug in ACL netmask generation
Fix FilterURLs with transparent proxy support
Fix upstream proxy support
Create log and pid files after we drop privs
Don't recompile regular expressions
Use output of id instead of $USER
keep track of error codes in return codes in tests


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/www/tinyproxy/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/tinyproxy/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/tinyproxy/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/tinyproxy/files/tinyproxy.sh
cvs rdiff -u -r1.2 -r0 pkgsrc/www/tinyproxy/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/tinyproxy/patches/patch-etc_Makefile.in
cvs rdiff -u -r1.2 -r1.3 \
    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.

Modified files:

Index: pkgsrc/www/tinyproxy/Makefile
diff -u pkgsrc/www/tinyproxy/Makefile:1.38 pkgsrc/www/tinyproxy/Makefile:1.39
--- pkgsrc/www/tinyproxy/Makefile:1.38  Thu Jun 21 11:31:33 2018
+++ pkgsrc/www/tinyproxy/Makefile       Fri Oct 12 13:57:46 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2018/06/21 11:31:33 adam Exp $
+# $NetBSD: Makefile,v 1.39 2018/10/12 13:57:46 adam Exp $
 
-DISTNAME=      tinyproxy-1.8.4
+DISTNAME=      tinyproxy-1.10.0
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=tinyproxy/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -46,7 +46,7 @@ SUBST_SED.docs+=      -e 's,@VARBASE@,${VARBA
 
 INSTALLATION_DIRS=     ${EGDIR} share/doc/tinyproxy
 
-PLIST_SUBST+=          VARBASE=${VARBASE:Q}
+PLIST_SUBST+=          VARBASE=${VARBASE}
 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}

Index: pkgsrc/www/tinyproxy/PLIST
diff -u pkgsrc/www/tinyproxy/PLIST:1.7 pkgsrc/www/tinyproxy/PLIST:1.8
--- pkgsrc/www/tinyproxy/PLIST:1.7      Sat Feb 18 05:59:23 2017
+++ pkgsrc/www/tinyproxy/PLIST  Fri Oct 12 13:57:46 2018
@@ -1,7 +1,11 @@
-@comment $NetBSD: PLIST,v 1.7 2017/02/18 05:59:23 nonaka Exp $
+@comment $NetBSD: PLIST,v 1.8 2018/10/12 13:57:46 adam Exp $
+bin/tinyproxy
 man/man5/tinyproxy.conf.5
 man/man8/tinyproxy.8
-sbin/tinyproxy
+share/doc/tinyproxy/AUTHORS
+share/doc/tinyproxy/NEWS
+share/doc/tinyproxy/README
+share/doc/tinyproxy/README.md
 share/doc/tinyproxy/filter-howto.txt
 share/examples/tinyproxy/tinyproxy.conf.default
 share/tinyproxy/debug.html

Index: pkgsrc/www/tinyproxy/distinfo
diff -u pkgsrc/www/tinyproxy/distinfo:1.12 pkgsrc/www/tinyproxy/distinfo:1.13
--- pkgsrc/www/tinyproxy/distinfo:1.12  Thu Jun 21 11:31:33 2018
+++ pkgsrc/www/tinyproxy/distinfo       Fri Oct 12 13:57:46 2018
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.12 2018/06/21 11:31:33 adam Exp $
+$NetBSD: distinfo,v 1.13 2018/10/12 13:57:46 adam Exp $
 
-SHA1 (tinyproxy-1.8.4.tar.xz) = 2ecc31268b386c282f4c9f4ed53dd9b76f3c3aee
-RMD160 (tinyproxy-1.8.4.tar.xz) = 5fd68912b1977badf261756b34a1de7efc183a72
-SHA512 (tinyproxy-1.8.4.tar.xz) = 23398a2c8a6d926b371086ba96032d0fd8dd06d114edf24950b868f53bb6b4235cd0f5d6b9a0131879fcc16bbe6b71142a6855de593a937ef7b0c323b50e0aec
-Size (tinyproxy-1.8.4.tar.xz) = 192300 bytes
-SHA1 (patch-configure) = c0d7af647d06eac76835506823a8df4f1bd7bd49
+SHA1 (tinyproxy-1.10.0.tar.xz) = c69fccde7aabd89434f94789a156847edde9aa28
+RMD160 (tinyproxy-1.10.0.tar.xz) = 8c22dadf2b50dbb841fb730395fd33244f5f2d33
+SHA512 (tinyproxy-1.10.0.tar.xz) = 8d82598c5f9c89bc672f4632139ac52696d5c7788963de51688a8aeb576c69004f8338fe1e1897bf704a21dfd25ab1effb092003b6afaa9a88c2b5d0608310f5
+Size (tinyproxy-1.10.0.tar.xz) = 176060 bytes
 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) = 2694a3f4cd1c2481eb765c8c9a26a58ac94f2574
+SHA1 (patch-etc_Makefile.in) = 05586bae07900c24dd418bddcbf0157ba2b302ef
+SHA1 (patch-etc_tinyproxy.conf.in) = 19481a177119b266034280d8923ea855021d8663

Index: pkgsrc/www/tinyproxy/files/tinyproxy.sh
diff -u pkgsrc/www/tinyproxy/files/tinyproxy.sh:1.3 pkgsrc/www/tinyproxy/files/tinyproxy.sh:1.4
--- pkgsrc/www/tinyproxy/files/tinyproxy.sh:1.3 Sat Feb 18 05:59:23 2017
+++ pkgsrc/www/tinyproxy/files/tinyproxy.sh     Fri Oct 12 13:57:46 2018
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: tinyproxy.sh,v 1.3 2017/02/18 05:59:23 nonaka Exp $
+# $NetBSD: tinyproxy.sh,v 1.4 2018/10/12 13:57:46 adam Exp $
 #
 
 # PROVIDE: tinyproxy
@@ -10,7 +10,7 @@
 
 name="tinyproxy"
 rcvar=$name
-command="@PREFIX@/sbin/${name}"
+command="@PREFIX@/bin/${name}"
 pidfile="@VARBASE@/run/tinyproxy/${name}.pid"
 required_files="@PKG_SYSCONFDIR@/${name}.conf"
 

Index: pkgsrc/www/tinyproxy/patches/patch-etc_Makefile.in
diff -u pkgsrc/www/tinyproxy/patches/patch-etc_Makefile.in:1.1 pkgsrc/www/tinyproxy/patches/patch-etc_Makefile.in:1.2
--- pkgsrc/www/tinyproxy/patches/patch-etc_Makefile.in:1.1      Wed Dec 12 13:01:23 2012
+++ pkgsrc/www/tinyproxy/patches/patch-etc_Makefile.in  Fri Oct 12 13:57:46 2018
@@ -1,15 +1,15 @@
-$NetBSD: patch-etc_Makefile.in,v 1.1 2012/12/12 13:01:23 wiz Exp $
+$NetBSD: patch-etc_Makefile.in,v 1.2 2018/10/12 13:57:46 adam Exp $
 
 Use pkgsrc framework for config files.
 
---- etc/Makefile.in.orig       2012-10-04 23:12:45.697375000 +0000
+--- etc/Makefile.in.orig       2018-10-12 13:51:26.000000000 +0000
 +++ etc/Makefile.in
-@@ -355,7 +355,7 @@ install-dvi: install-dvi-am
+@@ -424,7 +424,7 @@ info: info-am
  
- install-dvi-am:
+ info-am:
  
--install-exec-am: install-sysconfDATA
-+install-exec-am:
+-install-data-am: install-pkgsysconfDATA
++install-data-am:
  
- install-html: install-html-am
+ install-dvi: install-dvi-am
  

Index: pkgsrc/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in
diff -u pkgsrc/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in:1.2 pkgsrc/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in:1.3
--- pkgsrc/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in:1.2        Thu Jun 21 11:31:33 2018
+++ pkgsrc/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in    Fri Oct 12 13:57:46 2018
@@ -1,9 +1,9 @@
-$NetBSD: patch-etc_tinyproxy.conf.in,v 1.2 2018/06/21 11:31:33 adam Exp $
+$NetBSD: patch-etc_tinyproxy.conf.in,v 1.3 2018/10/12 13:57:46 adam Exp $
 
 Customize settings.
 
---- 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
+--- etc/tinyproxy.conf.in.orig 2018-08-31 23:03:36.000000000 +0000
++++ etc/tinyproxy.conf.in
 @@ -12,8 +12,8 @@
  # as the root user. Either the user or group name or the UID or GID
  # number may be used.
@@ -15,9 +15,9 @@ Customize settings.
  
  #
  # 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
+@@ -124,7 +124,7 @@ LogLevel Info
  # can be used for signalling purposes.
+ # If not specified, no pidfile will be written.
  #
 -#PidFile "@localstatedir@/run/tinyproxy/tinyproxy.pid"
 +PidFile "@localstatedir@/run/tinyproxy/tinyproxy.pid"