Update to 1.8.3, provided by Antonio Huete in PR 47034.

Version 1.8.3
-------------

This release mostly fixes support for IPv6, and also some security
bugs. Fixes to messages, etc. were also made.

Bugs resolved since version 1.8.2
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 * BB#91: Fix upstream proxy support
 * BB#95: Fix FilterURLs with transparent proxy support
 * BB#90: Fix bug in ACL netmask generation

Contributors
~~~~~~~~~~~~

Daniel Egger, John Horne, Michael Adam, Mukund Sivaraman.


Version 1.8.2
-------------

 * Minor formatting changes and typo fixes were made.

Bugs resolved since version 1.8.1
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 * BB#69: INET6 not available when configured to Listen and Bind in v4,
   and vice versa
 * BB#74: tinyproxy unable to reopen log files after receiving HUP
 * BB#78: Warn if configuration results in an open proxy
 * BB#82: https access not working
 * BB#83: run_tests.sh relies on $USER
 * BB#84: Unaligned access error on ia64 and alpha
 * BB#87: Unable to listen on ports less than 1024 (regression in 1.8.1)
 * BB#88: Crashes when reloading configuration
 * BB#89: tinyproxy leaks memory over time

Contributors
~~~~~~~~~~~~

Dmitry Semyonov, John van der Kamp, Jordi Mallach, Michael Adam,
Mukund Sivaraman.


Version 1.8.1
-------------

 * Tinyproxy now drops `root` user privileges more quickly.
 * The log and pid files are now stored in a sub-directory in `/var/`.
 * A format string vulnerability was fixed.
 * Minor formatting changes and typo fixes were made.

Bugs fixed since version 1.8.0
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 * BB#74: tinyproxy unable to reopen log files after receiving HUP
 * BB#79: Make the testsuite uninteractive
 * BB#80: Handle errors in testsuite
 * BB#81: Listen directive doesn't work as expected
 * BB#72: upstream support is not reported with tinyproxy -h
 * BB#73: generated tinyproxy.conf has the wrong location for the html
   file installation

Contributors
~~~~~~~~~~~~

Michael Adam, Mukund Sivaraman.


Version 1.8.0
-------------

 * Tinyproxy now reloads its configuration upon SIGHUP signal.
 * Tinyproxy reopens its log file (instead of truncation) upon SIGHUP
   signal. This is to play more nicely with logrotate.
 * File logging is now the default.
   Syslog is chosen if and only if "SysLog Yes" is in the config,
   i.e., a present "SysLog Yes" in the config file now overrides
   any LogFile setting.
 * The XTinyProxy option is now documented as a global boolean.
   Before it was documented to build a list of sites to add a
   X-Tinyproxy header for, but it was implemented as global boolean.
 * A new config option AddHeader allows the user to configure a list of
   custom headers to send in outgoing HTTP requests.
 * A new config option DisableViaHeader allows the user to disable
   sending of the "Via:" header.
 * Tinyproxy is now IPv6 capable.
 * The config option PidFile now has a compiled in default.

Bugs fixed since version 1.7.1
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 * BB#9: Add support for the IPv6 protocol
 * BB#17: Add support for custom headers
 * BB#55: Error message response omits body when request has a body
 * BB#60: Add config option to disable Via header
 * BB#61: SIGHUP does not refresh filter list
 * BB#62: Make tinyproxy reload the config upon SIGHUP
 * BB#64: Config parsing error with reverse proxy option
 * BB#65: Format string compile warnings
 * BB#67: ACL processing error with multiple Allow statements

Contributors
~~~~~~~~~~~~

David Shanks, Mathew Mrosko, Michael Adam, Mukund Sivaraman.


Version 1.7.1
-------------

 * Fixed all warnings reported by GCC.
 * The tinyproxy manpage has been extended and converted to asciidoc.
 * There is a new tinyproxy.conf manpage that describes all the options.
 * The build system has been considerably cleaned up.
 * Various other bugs have been fixed.

Bugs fixed since version 1.7.0
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 * BB#2: Fix Tinyproxy for requests like www.site.com:8001
 * BB#5: Move templates from the doc directory to its own directory
 * BB#8: Update README, INSTALL, NEWS and the manpage
 * BB#10: Do not filter out transfer-encoding header
 * BB#18: Fix pointer aliasing issues
 * BB#53: Add a GPLv2 COPYING file

Contributors
~~~~~~~~~~~~

Andrew Stribblehill, Jeremy Hinegardner, Matthew Dempsky, Michael Adam,
Mukund Sivaraman, Robert James Kaes.


Version 1.7.0
-------------

 * There is now support for reverse proxying.
 * Tinyproxy does not bundle a vendor regular expressions library
   anymore. It uses the system installed regular expressions library.
 * The documentation has been updated.
 * Tinyproxy now contains some code optimizations such as the use of a
   hashmap internally for looking up error pages.
 * Various other bugs have been fixed.

Contributors
~~~~~~~~~~~~

Kim Holviala, Marc Silver, Robert James Kaes, Steven Young.

9 files changed, 65 insertions, 114 deletions

diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index e358c2808df..987397539ba 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.28 2012/10/28 06:31:06 asau Exp $
+# $NetBSD: Makefile,v 1.29 2012/12/12 13:01:23 wiz Exp $
 #
 
-DISTNAME=	tinyproxy-1.6.2
-PKGREVISION=	6
+DISTNAME=	tinyproxy-1.8.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tinyproxy/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tinyproxy.sourceforge.net/
 COMMENT=	Lightweight HTTP/SSL proxy
+LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	YES
 
@@ -17,6 +17,7 @@ PKG_SYSCONFSUBDIR=	tinyproxy
 
 .include "../../mk/bsd.prefs.mk"
 
+BUILD_DEPENDS+=		asciidoc-[0-9]*:../../textproc/asciidoc
 BUILD_DEFS+=		VARBASE
 
 TINYPROXY_USER?=	tinyproxy
@@ -29,6 +30,7 @@ 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+=	--enable-transparent-proxy
 
 .include "options.mk"
@@ -39,19 +41,18 @@ CONF_FILES=	${EGDIR}/tinyproxy.conf.default ${PKG_SYSCONFDIR}/tinyproxy.conf
 
 SUBST_CLASSES+=		docs
 SUBST_STAGE.docs=	pre-configure
-SUBST_FILES.docs=	doc/tinyproxy.8 doc/tinyproxy.conf
+SUBST_FILES.docs=	docs/man5/tinyproxy.conf.txt.in docs/man8/tinyproxy.txt.in etc/tinyproxy.conf.in
 SUBST_SED.docs+=	-e 's,@TINYPROXY_USER@,${TINYPROXY_USER},g'
 SUBST_SED.docs+=	-e 's,@TINYPROXY_GROUP@,${TINYPROXY_GROUP},g'
 SUBST_SED.docs+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.docs+=	-e 's,@DATADIR@,${PREFIX}/share/tinyproxy,g'
 SUBST_SED.docs+=	-e 's,@VARBASE@,${VARBASE},g'
 
 INSTALLATION_DIRS=	${EGDIR} share/doc/tinyproxy
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/tinyproxy.conf \
+	${INSTALL_DATA} ${WRKSRC}/etc/tinyproxy.conf \
 		${DESTDIR}${EGDIR}/tinyproxy.conf.default
-	${INSTALL_DATA} ${WRKSRC}/doc/filter-howto.txt \
+	${INSTALL_DATA} ${WRKSRC}/docs/filter-howto.txt \
 		${DESTDIR}${PREFIX}/share/doc/tinyproxy/
 
 .include "../../security/openssl/buildlink3.mk"
diff --git a/www/tinyproxy/PLIST b/www/tinyproxy/PLIST
index 17191f96ea5..d6bd60ba3c2 100644
--- a/www/tinyproxy/PLIST
+++ b/www/tinyproxy/PLIST
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 22:00:37 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/12/12 13:01:23 wiz Exp $
+man/man5/tinyproxy.conf.5
 man/man8/tinyproxy.8
 sbin/tinyproxy
 share/doc/tinyproxy/filter-howto.txt
 share/examples/rc.d/tinyproxy
 share/examples/tinyproxy/tinyproxy.conf.default
+share/tinyproxy/debug.html
+share/tinyproxy/default.html
+share/tinyproxy/stats.html
diff --git a/www/tinyproxy/distinfo b/www/tinyproxy/distinfo
index 8e88a34ba5e..815f863fa9b 100644
--- a/www/tinyproxy/distinfo
+++ b/www/tinyproxy/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2006/09/19 08:31:18 rillig Exp $
+$NetBSD: distinfo,v 1.7 2012/12/12 13:01:23 wiz Exp $
 
-SHA1 (tinyproxy-1.6.2.tar.gz) = b305ebdef29de19e0c2c74efcd4a2acd8caa9018
-RMD160 (tinyproxy-1.6.2.tar.gz) = a85ebc7ebdc353df7ef5a09b3502df6046054531
-Size (tinyproxy-1.6.2.tar.gz) = 463274 bytes
-SHA1 (patch-aa) = e94f2410ae2b5dd94a1039e96635b32505de9f5d
-SHA1 (patch-ab) = b6a18b859cb3260c237a98745ca9e2d0e1a1b486
-SHA1 (patch-ac) = 12ebe959c626c14a8294a7d919eba6df8cf3e95b
+SHA1 (tinyproxy-1.8.3.tar.gz) = ebf4bda60ff2d0fdf1846467f07b3bbd9ef90faf
+RMD160 (tinyproxy-1.8.3.tar.gz) = 41cae4c8fcc99650a76d7bed52a379a9dd0faef0
+Size (tinyproxy-1.8.3.tar.gz) = 266744 bytes
+SHA1 (patch-docs_man5_tinyproxy.conf.txt.in) = 1641f7c44ce84f2ebac6e945760af3ba77976f31
+SHA1 (patch-docs_man8_tinyproxy.txt.in) = 12c43d0f874a8794cbe8da7c702e406e8b10a99b
+SHA1 (patch-etc_Makefile.in) = 34ab3402bf11be5d2c1521f8ca0254ecbf19fc3c
diff --git a/www/tinyproxy/patches/patch-aa b/www/tinyproxy/patches/patch-aa
deleted file mode 100644
index 9ae40ad6861..00000000000
--- a/www/tinyproxy/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/03/07 23:46:01 salo Exp $
-
---- Makefile.in.orig	2003-01-22 20:50:28.000000000 +0100
-+++ Makefile.in	2003-03-07 23:04:34.000000000 +0100
-@@ -298,7 +298,7 @@
- install-exec-am:
- install-exec: install-exec-recursive
- 
--install-data-am: install-data-local
-+install-data-am:
- install-data: install-data-recursive
- 
- install-am: all-am
diff --git a/www/tinyproxy/patches/patch-ab b/www/tinyproxy/patches/patch-ab
deleted file mode 100644
index 4cc8a652ad3..00000000000
--- a/www/tinyproxy/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/03/07 23:46:01 salo Exp $
-
---- doc/tinyproxy.8.orig	2001-08-27 17:45:31.000000000 +0200
-+++ doc/tinyproxy.8	2003-03-07 23:13:09.000000000 +0100
-@@ -41,7 +41,7 @@
- connections have been handled.
- .SH FILES
- .nf
--/etc/tinyproxy/tinyproxy.conf
-+@PKG_SYSCONFDIR@/tinyproxy.conf
- /var/run/tinyproxy.pid
- /var/log/tinyproxy.log
- .fi
diff --git a/www/tinyproxy/patches/patch-ac b/www/tinyproxy/patches/patch-ac
deleted file mode 100644
index 36cc666476d..00000000000
--- a/www/tinyproxy/patches/patch-ac
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2006/09/19 08:31:18 rillig Exp $
-
---- doc/tinyproxy.conf.orig	2003-06-23 23:14:32.000000000 +0200
-+++ doc/tinyproxy.conf	2006-09-19 10:15:24.000000000 +0200
-@@ -6,8 +6,8 @@
- # Name of the user the tinyproxy daemon should switch to after the port
- # has been bound.
- #
--User nobody
--Group nogroup
-+User @TINYPROXY_USER@
-+Group @TINYPROXY_GROUP@
- 
- #
- # Port to listen on.
-@@ -40,31 +40,31 @@ Timeout 600
- #   /usr/share/tinyproxy
- #   /etc/tinyproxy
- #
--# ErrorFile 404 "/usr/share/tinyproxy/404.html"
--# ErrorFile 400 "/usr/share/tinyproxy/400.html"
--# ErrorFile 503 "/usr/share/tinyproxy/503.html"
--# ErrorFile 403 "/usr/share/tinyproxy/403.html"
--# ErrorFile 408 "/usr/share/tinyproxy/408.html"
-+# ErrorFile 404 "@DATADIR@/404.html"
-+# ErrorFile 400 "@DATADIR@/400.html"
-+# ErrorFile 503 "@DATADIR@/503.html"
-+# ErrorFile 403 "@DATADIR@/403.html"
-+# ErrorFile 408 "@DATADIR@/408.html"
- 
- # 
- # DefaultErrorFile: The HTML file that gets sent if there is no
- # HTML file defined with an ErrorFile keyword for the HTTP error
- # that has occured.
- #
--DefaultErrorFile "/usr/share/tinyproxy/default.html"
-+DefaultErrorFile "@DATADIR@/default.html"
- 
- #
- # StatFile: The HTML file that gets sent when a request is made
- # for the stathost.  If this file doesn't exist a basic page is
- # hardcoded in tinyproxy.
- #
--StatFile "/usr/share/tinyproxy/stats.html"
-+StatFile "@DATADIR@/stats.html"
- 
- #
- # Where to log the information. Either LogFile or Syslog should be set,
- # but not both.
- #
--Logfile "/var/log/tinyproxy.log"
-+Logfile "@VARBASE@/log/tinyproxy.log"
- # Syslog On
- 
- #
-@@ -85,7 +85,7 @@ LogLevel Info
- # PidFile: Write the PID of the main tinyproxy thread to this file so it
- # can be used for signalling purposes.
- #
--PidFile "/var/run/tinyproxy.pid"
-+PidFile "@VARBASE@/run/tinyproxy.pid"
- 
- #
- # Include the X-Tinyproxy header, which has the client's IP address when
-@@ -180,7 +180,7 @@ ViaProxyName "tinyproxy"
- #
- # The location of the filter file.
- #
--#Filter "/etc/tinyproxy/filter"
-+#Filter "@PKG_SYSCONFDIR@/filter"
- 
- #
- # Filter based on URLs rather than domains.
diff --git a/www/tinyproxy/patches/patch-docs_man5_tinyproxy.conf.txt.in b/www/tinyproxy/patches/patch-docs_man5_tinyproxy.conf.txt.in
new file mode 100644
index 00000000000..312584c95b1
--- /dev/null
+++ b/www/tinyproxy/patches/patch-docs_man5_tinyproxy.conf.txt.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-docs_man5_tinyproxy.conf.txt.in,v 1.1 2012/12/12 13:01:23 wiz Exp $
+
+Adapt path for pkgsrc.
+
+--- docs/man5/tinyproxy.conf.txt.in.orig	2011-08-16 12:14:34.000000000 +0000
++++ docs/man5/tinyproxy.conf.txt.in
+@@ -19,7 +19,7 @@ DESCRIPTION
+ -----------
+ 
+ `tinyproxy(8)` reads its configuration file, typically stored in
+-`/etc/tinyproxy/tinyproxy.conf` (or passed to Tinyproxy with -c on the
++`@PKG_SYSCONFDIR@/tinyproxy.conf` (or passed to Tinyproxy with -c on the
+ command line). This manpage describes the syntax and contents of the
+ configuration file.
+ 
diff --git a/www/tinyproxy/patches/patch-docs_man8_tinyproxy.txt.in b/www/tinyproxy/patches/patch-docs_man8_tinyproxy.txt.in
new file mode 100644
index 00000000000..3ae9e48b12b
--- /dev/null
+++ b/www/tinyproxy/patches/patch-docs_man8_tinyproxy.txt.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-docs_man8_tinyproxy.txt.in,v 1.1 2012/12/12 13:01:23 wiz Exp $
+
+Adapt path for pkgsrc.
+
+--- docs/man8/tinyproxy.txt.in.orig	2012-10-04 11:35:55.807186000 +0000
++++ docs/man8/tinyproxy.txt.in
+@@ -130,7 +130,7 @@ configuration variable `StatFile`.
+ FILES
+ -----
+ 
+-`/etc/tinyproxy/tinyproxy.conf`, `/var/run/tinyproxy/tinyproxy.pid`, `/var/log/tinyproxy/tinyproxy.log`
++`@PKG_SYSCONFDIR@/tinyproxy.conf`, `@VARBASE@/run/tinyproxy/tinyproxy.pid`, `@VARBASE@/log/tinyproxy/tinyproxy.log`
+ 
+ BUGS
+ ----
diff --git a/www/tinyproxy/patches/patch-etc_Makefile.in b/www/tinyproxy/patches/patch-etc_Makefile.in
new file mode 100644
index 00000000000..6fb5fde072f
--- /dev/null
+++ b/www/tinyproxy/patches/patch-etc_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-etc_Makefile.in,v 1.1 2012/12/12 13:01:23 wiz Exp $
+
+Use pkgsrc framework for config files.
+
+--- etc/Makefile.in.orig	2012-10-04 23:12:45.697375000 +0000
++++ etc/Makefile.in
+@@ -355,7 +355,7 @@ install-dvi: install-dvi-am
+ 
+ install-dvi-am:
+ 
+-install-exec-am: install-sysconfDATA
++install-exec-am:
+ 
+ install-html: install-html-am
+