CVS commit: pkgsrc/www/tinyproxy

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jun 21 11:31:34 UTC 2018

Modified Files:
        pkgsrc/www/tinyproxy: Makefile distinfo
        pkgsrc/www/tinyproxy/patches: patch-configure
            patch-etc_tinyproxy.conf.in
Removed Files:
        pkgsrc/www/tinyproxy/patches: patch-src_hashmap.c patch-src_reqs.c

Log Message:
tinyproxy: updated to 1.8.4

Tinyproxy version 1.8.4

Most notably, this release removes the limitation of a single Listen address of not listening on the wildcard address and a DoS (CVE-2012-3505).
Among several other bug fixes, this release fixes a bunch of issues found by coverity (scan.coverity.com).

Bugs resolved since version 1.8.3
fix algorithmic complexity DoS in hashmap
fix failing CONNECT requests with IPv6 literal addresses
fix invalid free for GET requests to IPv6 literal addresses
support multiple Listen statements in configuration
support listening on ipv4 and ipv6 wildcard if no Listen specified
fix crash when writing to log file fails
fix build with autoconf >= 2.69


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/www/tinyproxy/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/tinyproxy/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/tinyproxy/patches/patch-configure \
    pkgsrc/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in
cvs rdiff -u -r1.1 -r0 pkgsrc/www/tinyproxy/patches/patch-src_hashmap.c \
    pkgsrc/www/tinyproxy/patches/patch-src_reqs.c

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.37 pkgsrc/www/tinyproxy/Makefile:1.38
--- pkgsrc/www/tinyproxy/Makefile:1.37  Sat Feb 18 05:59:23 2017
+++ pkgsrc/www/tinyproxy/Makefile       Thu Jun 21 11:31:33 2018
@@ -1,42 +1,39 @@
-# $NetBSD: Makefile,v 1.37 2017/02/18 05:59:23 nonaka Exp $
-#
+# $NetBSD: Makefile,v 1.38 2018/06/21 11:31:33 adam Exp $
 
-DISTNAME=      tinyproxy-1.8.3
-PKGREVISION=   6
+DISTNAME=      tinyproxy-1.8.4
 CATEGORIES=    www
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tinyproxy/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=tinyproxy/}
+GITHUB_RELEASE=        ${PKGVERSION_NOREV}
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://tinyproxy.sourceforge.net/
+HOMEPAGE=      https://tinyproxy.github.io/
 COMMENT=       Lightweight HTTP/SSL proxy
 LICENSE=       gnu-gpl-v2
 
-GNU_CONFIGURE= YES
+BUILD_DEPENDS+=                asciidoc-[0-9]*:../../textproc/asciidoc
+BUILD_DEFS+=           VARBASE
+
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-config=${PKG_SYSCONFDIR}/tinyproxy.conf
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
+CONFIGURE_ARGS+=       --enable-transparent-proxy
 
 RCD_SCRIPTS=           tinyproxy
-PKG_SYSCONFSUBDIR=     tinyproxy
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEPENDS+=                asciidoc-[0-9]*:../../textproc/asciidoc
-BUILD_DEFS+=           VARBASE
-
 TINYPROXY_USER?=       tinyproxy
 TINYPROXY_GROUP?=      tinyproxy
 PKG_GROUPS=            ${TINYPROXY_GROUP}
 PKG_USERS=             ${TINYPROXY_USER}:${TINYPROXY_GROUP}
 PKG_GROUPS_VARS+=      TINYPROXY_GROUP
-PKG_USERS_VARS+=       TINYPROXY_USER
+PKG_USERS_VARS=                TINYPROXY_USER
 FILES_SUBST+=          TINYPROXY_USER=${TINYPROXY_USER:Q}
 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
-
 CONF_FILES=    ${EGDIR}/tinyproxy.conf.default ${PKG_SYSCONFDIR}/tinyproxy.conf
 
 SUBST_CLASSES+=                docs

Index: pkgsrc/www/tinyproxy/distinfo
diff -u pkgsrc/www/tinyproxy/distinfo:1.11 pkgsrc/www/tinyproxy/distinfo:1.12
--- pkgsrc/www/tinyproxy/distinfo:1.11  Sat Feb 18 05:59:23 2017
+++ pkgsrc/www/tinyproxy/distinfo       Thu Jun 21 11:31:33 2018
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.11 2017/02/18 05:59:23 nonaka Exp $
+$NetBSD: distinfo,v 1.12 2018/06/21 11:31:33 adam Exp $
 
-SHA1 (tinyproxy-1.8.3.tar.gz) = ebf4bda60ff2d0fdf1846467f07b3bbd9ef90faf
-RMD160 (tinyproxy-1.8.3.tar.gz) = 41cae4c8fcc99650a76d7bed52a379a9dd0faef0
-SHA512 (tinyproxy-1.8.3.tar.gz) = 4f58830f386abc1eaa5d9ec0deb3d5611345cda4346f146565c929695755670fb7159aea4e51edd827d0292cb0d65f2caaae02d00bac204397ff0c3a1eb1b90b
-Size (tinyproxy-1.8.3.tar.gz) = 266744 bytes
-SHA1 (patch-configure) = f446276a457c915fd2155bbe5bb1c4aa4b88c9d7
+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 (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
+SHA1 (patch-etc_tinyproxy.conf.in) = 2694a3f4cd1c2481eb765c8c9a26a58ac94f2574

Index: pkgsrc/www/tinyproxy/patches/patch-configure
diff -u pkgsrc/www/tinyproxy/patches/patch-configure:1.1 pkgsrc/www/tinyproxy/patches/patch-configure:1.2
--- pkgsrc/www/tinyproxy/patches/patch-configure:1.1    Thu Aug 13 20:30:47 2015
+++ pkgsrc/www/tinyproxy/patches/patch-configure        Thu Jun 21 11:31:33 2018
@@ -1,14 +1,14 @@
-$NetBSD: patch-configure,v 1.1 2015/08/13 20:30:47 jperkin Exp $
+$NetBSD: patch-configure,v 1.2 2018/06/21 11:31:33 adam Exp $
 
 Remove non-portable ld argument.
 
---- configure.orig     2011-08-16 12:27:59.000000000 +0000
+--- configure.orig     2018-06-21 11:03:35.000000000 +0000
 +++ configure
-@@ -6744,7 +6744,6 @@ if test x"$debug_enabled" != x"yes" ; th
+@@ -7036,7 +7036,6 @@ if test x"$debug_enabled" != x"yes" ; th
      CFLAGS="-DNDEBUG $CFLAGS"
  fi
  
--LDFLAGS="-Wl,-z,defs"
+-LDFLAGS="-Wl,-z,defs $LDFLAGS"
  
  
  if test x"$ac_cv_func_regexec" != x"yes"; then
Index: pkgsrc/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in
diff -u pkgsrc/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in:1.1 pkgsrc/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in:1.2
--- pkgsrc/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in:1.1        Sat Feb 18 05:59:23 2017
+++ pkgsrc/www/tinyproxy/patches/patch-etc_tinyproxy.conf.in    Thu Jun 21 11:31:33 2018
@@ -1,4 +1,6 @@
-$NetBSD: patch-etc_tinyproxy.conf.in,v 1.1 2017/02/18 05:59:23 nonaka Exp $
+$NetBSD: patch-etc_tinyproxy.conf.in,v 1.2 2018/06/21 11:31:33 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