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.diff -r1.28 -r1.29 pkgsrc/www/tinyproxy/Makefile
(wiz)
@@ -1,58 +1,59 @@ | @@ -1,58 +1,59 @@ | |||
1 | # $NetBSD: Makefile,v 1.28 2012/10/28 06:31:06 asau Exp $ | 1 | # $NetBSD: Makefile,v 1.29 2012/12/12 13:01:23 wiz Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= tinyproxy-1.6.2 | 4 | DISTNAME= tinyproxy-1.8.3 | |
5 | PKGREVISION= 6 | |||
6 | CATEGORIES= www | 5 | CATEGORIES= www | |
7 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tinyproxy/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tinyproxy/} | |
8 | 7 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://tinyproxy.sourceforge.net/ | 9 | HOMEPAGE= http://tinyproxy.sourceforge.net/ | |
11 | COMMENT= Lightweight HTTP/SSL proxy | 10 | COMMENT= Lightweight HTTP/SSL proxy | |
11 | LICENSE= gnu-gpl-v2 | |||
12 | 12 | |||
13 | GNU_CONFIGURE= YES | 13 | GNU_CONFIGURE= YES | |
14 | 14 | |||
15 | RCD_SCRIPTS= tinyproxy | 15 | RCD_SCRIPTS= tinyproxy | |
16 | PKG_SYSCONFSUBDIR= tinyproxy | 16 | PKG_SYSCONFSUBDIR= tinyproxy | |
17 | 17 | |||
18 | .include "../../mk/bsd.prefs.mk" | 18 | .include "../../mk/bsd.prefs.mk" | |
19 | 19 | |||
20 | BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc | |||
20 | BUILD_DEFS+= VARBASE | 21 | BUILD_DEFS+= VARBASE | |
21 | 22 | |||
22 | TINYPROXY_USER?= tinyproxy | 23 | TINYPROXY_USER?= tinyproxy | |
23 | TINYPROXY_GROUP?= tinyproxy | 24 | TINYPROXY_GROUP?= tinyproxy | |
24 | PKG_GROUPS= ${TINYPROXY_GROUP} | 25 | PKG_GROUPS= ${TINYPROXY_GROUP} | |
25 | PKG_USERS= ${TINYPROXY_USER}:${TINYPROXY_GROUP} | 26 | PKG_USERS= ${TINYPROXY_USER}:${TINYPROXY_GROUP} | |
26 | PKG_GROUPS_VARS+= TINYPROXY_GROUP | 27 | PKG_GROUPS_VARS+= TINYPROXY_GROUP | |
27 | PKG_USERS_VARS+= TINYPROXY_USER | 28 | PKG_USERS_VARS+= TINYPROXY_USER | |
28 | FILES_SUBST+= TINYPROXY_USER=${TINYPROXY_USER:Q} | 29 | FILES_SUBST+= TINYPROXY_USER=${TINYPROXY_USER:Q} | |
29 | FILES_SUBST+= TINYPROXY_GROUP=${TINYPROXY_GROUP:Q} | 30 | FILES_SUBST+= TINYPROXY_GROUP=${TINYPROXY_GROUP:Q} | |
30 | 31 | |||
31 | CONFIGURE_ARGS+= --with-config=${PKG_SYSCONFDIR}/tinyproxy.conf | 32 | CONFIGURE_ARGS+= --with-config=${PKG_SYSCONFDIR}/tinyproxy.conf | |
33 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | |||
32 | CONFIGURE_ARGS+= --enable-transparent-proxy | 34 | CONFIGURE_ARGS+= --enable-transparent-proxy | |
33 | 35 | |||
34 | .include "options.mk" | 36 | .include "options.mk" | |
35 | 37 | |||
36 | EGDIR= ${PREFIX}/share/examples/tinyproxy | 38 | EGDIR= ${PREFIX}/share/examples/tinyproxy | |
37 | 39 | |||
38 | CONF_FILES= ${EGDIR}/tinyproxy.conf.default ${PKG_SYSCONFDIR}/tinyproxy.conf | 40 | CONF_FILES= ${EGDIR}/tinyproxy.conf.default ${PKG_SYSCONFDIR}/tinyproxy.conf | |
39 | 41 | |||
40 | SUBST_CLASSES+= docs | 42 | SUBST_CLASSES+= docs | |
41 | SUBST_STAGE.docs= pre-configure | 43 | SUBST_STAGE.docs= pre-configure | |
42 | SUBST_FILES.docs= doc/tinyproxy.8 doc/tinyproxy.conf | 44 | SUBST_FILES.docs= docs/man5/tinyproxy.conf.txt.in docs/man8/tinyproxy.txt.in etc/tinyproxy.conf.in | |
43 | SUBST_SED.docs+= -e 's,@TINYPROXY_USER@,${TINYPROXY_USER},g' | 45 | SUBST_SED.docs+= -e 's,@TINYPROXY_USER@,${TINYPROXY_USER},g' | |
44 | SUBST_SED.docs+= -e 's,@TINYPROXY_GROUP@,${TINYPROXY_GROUP},g' | 46 | SUBST_SED.docs+= -e 's,@TINYPROXY_GROUP@,${TINYPROXY_GROUP},g' | |
45 | SUBST_SED.docs+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' | 47 | SUBST_SED.docs+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' | |
46 | SUBST_SED.docs+= -e 's,@DATADIR@,${PREFIX}/share/tinyproxy,g' | |||
47 | SUBST_SED.docs+= -e 's,@VARBASE@,${VARBASE},g' | 48 | SUBST_SED.docs+= -e 's,@VARBASE@,${VARBASE},g' | |
48 | 49 | |||
49 | INSTALLATION_DIRS= ${EGDIR} share/doc/tinyproxy | 50 | INSTALLATION_DIRS= ${EGDIR} share/doc/tinyproxy | |
50 | 51 | |||
51 | post-install: | 52 | post-install: | |
52 | ${INSTALL_DATA} ${WRKSRC}/doc/tinyproxy.conf \ | 53 | ${INSTALL_DATA} ${WRKSRC}/etc/tinyproxy.conf \ | |
53 | ${DESTDIR}${EGDIR}/tinyproxy.conf.default | 54 | ${DESTDIR}${EGDIR}/tinyproxy.conf.default | |
54 | ${INSTALL_DATA} ${WRKSRC}/doc/filter-howto.txt \ | 55 | ${INSTALL_DATA} ${WRKSRC}/docs/filter-howto.txt \ | |
55 | ${DESTDIR}${PREFIX}/share/doc/tinyproxy/ | 56 | ${DESTDIR}${PREFIX}/share/doc/tinyproxy/ | |
56 | 57 | |||
57 | .include "../../security/openssl/buildlink3.mk" | 58 | .include "../../security/openssl/buildlink3.mk" | |
58 | .include "../../mk/bsd.pkg.mk" | 59 | .include "../../mk/bsd.pkg.mk" |
@@ -1,6 +1,10 @@ | @@ -1,6 +1,10 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.4 2009/06/14 22:00:37 joerg Exp $ | 1 | @comment $NetBSD: PLIST,v 1.5 2012/12/12 13:01:23 wiz Exp $ | |
2 | man/man5/tinyproxy.conf.5 | |||
2 | man/man8/tinyproxy.8 | 3 | man/man8/tinyproxy.8 | |
3 | sbin/tinyproxy | 4 | sbin/tinyproxy | |
4 | share/doc/tinyproxy/filter-howto.txt | 5 | share/doc/tinyproxy/filter-howto.txt | |
5 | share/examples/rc.d/tinyproxy | 6 | share/examples/rc.d/tinyproxy | |
6 | share/examples/tinyproxy/tinyproxy.conf.default | 7 | share/examples/tinyproxy/tinyproxy.conf.default | |
8 | share/tinyproxy/debug.html | |||
9 | share/tinyproxy/default.html | |||
10 | share/tinyproxy/stats.html |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.6 2006/09/19 08:31:18 rillig Exp $ | 1 | $NetBSD: distinfo,v 1.7 2012/12/12 13:01:23 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (tinyproxy-1.6.2.tar.gz) = b305ebdef29de19e0c2c74efcd4a2acd8caa9018 | 3 | SHA1 (tinyproxy-1.8.3.tar.gz) = ebf4bda60ff2d0fdf1846467f07b3bbd9ef90faf | |
4 | RMD160 (tinyproxy-1.6.2.tar.gz) = a85ebc7ebdc353df7ef5a09b3502df6046054531 | 4 | RMD160 (tinyproxy-1.8.3.tar.gz) = 41cae4c8fcc99650a76d7bed52a379a9dd0faef0 | |
5 | Size (tinyproxy-1.6.2.tar.gz) = 463274 bytes | 5 | Size (tinyproxy-1.8.3.tar.gz) = 266744 bytes | |
6 | SHA1 (patch-aa) = e94f2410ae2b5dd94a1039e96635b32505de9f5d | 6 | SHA1 (patch-docs_man5_tinyproxy.conf.txt.in) = 1641f7c44ce84f2ebac6e945760af3ba77976f31 | |
7 | SHA1 (patch-ab) = b6a18b859cb3260c237a98745ca9e2d0e1a1b486 | 7 | SHA1 (patch-docs_man8_tinyproxy.txt.in) = 12c43d0f874a8794cbe8da7c702e406e8b10a99b | |
8 | SHA1 (patch-ac) = 12ebe959c626c14a8294a7d919eba6df8cf3e95b | 8 | SHA1 (patch-etc_Makefile.in) = 34ab3402bf11be5d2c1521f8ca0254ecbf19fc3c |
$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.
$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
----
$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