- Update to 2.7.0

PR:		133741
Submitted by:	Pavel Pankov <pankov_p@mail.ru> (maintainer)
Approved by:	portmgr (flz)
Security:	http://www.vuxml.org/freebsd/872ae5be-29c0-11de-bdeb-0030843d3802.html

4 files changed, 39 insertions, 13 deletions

diff --git a/www/ziproxy/Makefile b/www/ziproxy/Makefile
index 997e67a00b6b..0bc7ab9b8830 100644
--- a/www/ziproxy/Makefile
+++ b/www/ziproxy/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		ziproxy
-PORTVERSION=		2.6.0
+PORTVERSION=		2.7.0
 CATEGORIES=		www
 MASTER_SITES=		SF
 
@@ -20,7 +20,7 @@ USE_BZIP2=		yes
 
 CFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
-ERRORFILES=		400.html 404.html 407.html 408.html 409.html 500.html 503.html
+ERRORFILES=		400.html 403.html 404.html 407.html 408.html 409.html 500.html 503.html
 
 CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
@@ -47,9 +47,11 @@ post-patch:
 post-install:
 	@${MKDIR} ${PREFIX}/etc/ziproxy
 	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/bo_exception.list ${PREFIX}/etc/ziproxy/bo_exception.list
+	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/deny.list ${PREFIX}/etc/ziproxy/deny.list
 	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/http.passwd ${PREFIX}/etc/ziproxy/http.passwd
 	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/noprocess.list ${PREFIX}/etc/ziproxy/noprocess.list
 	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/replace.list ${PREFIX}/etc/ziproxy/replace.list
+	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/replace_ct.list ${PREFIX}/etc/ziproxy/replace_ct.list
 	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/ziproxy.conf ${PREFIX}/etc/ziproxy/ziproxy.conf.sample
 	@if [ ! -f ${PREFIX}/etc/ziproxy/ziproxy.conf ]; then \
 		${CP} -p ${WRKSRC}/etc/ziproxy/ziproxy.conf ${PREFIX}/etc/ziproxy/ziproxy.conf ; \
diff --git a/www/ziproxy/distinfo b/www/ziproxy/distinfo
index 6a80ff95a2c6..088b9e7163b9 100644
--- a/www/ziproxy/distinfo
+++ b/www/ziproxy/distinfo
@@ -1,3 +1,3 @@
-MD5 (ziproxy-2.6.0.tar.bz2) = b7d57ace56a3be34446ef1b68ac85205
-SHA256 (ziproxy-2.6.0.tar.bz2) = 9f0c1f0cd5f424631c55e1e51a49562c50ca8d79ae108e337cd3ef5d32260289
-SIZE (ziproxy-2.6.0.tar.bz2) = 262943
+MD5 (ziproxy-2.7.0.tar.bz2) = cfc7d59d31bb889121dd9f1e77bc0124
+SHA256 (ziproxy-2.7.0.tar.bz2) = cd3e7cf6d4ca1faaf82867024486c72091968b9b9bd9ca41dac76fd76ad00d7a
+SIZE (ziproxy-2.7.0.tar.bz2) = 239929
diff --git a/www/ziproxy/files/patch-ziproxy.conf b/www/ziproxy/files/patch-ziproxy.conf
index 1d03cbc7b2c3..d4225c3764ff 100644
--- a/www/ziproxy/files/patch-ziproxy.conf
+++ b/www/ziproxy/files/patch-ziproxy.conf
@@ -1,5 +1,5 @@
---- etc/ziproxy/ziproxy.conf.orig	2008-11-18 00:28:03.000000000 +0300
-+++ etc/ziproxy/ziproxy.conf	2008-11-18 00:29:22.000000000 +0300
+--- etc/ziproxy/ziproxy.conf.orig	2009-03-13 17:41:27.000000000 +0300
++++ etc/ziproxy/ziproxy.conf	2009-04-15 10:41:25.000000000 +0400
 @@ -12,12 +12,12 @@
  ## If you have more than one network interface,
  ## it's useful for restricting to which interface you want to bind to.
@@ -15,7 +15,7 @@
  
  ## Inactivity timeout before closing the daemon (0 = no timeout)
  ## default: 0 (no timeout)
-@@ -67,7 +67,7 @@
+@@ -82,7 +82,7 @@
  ## HTTP auth file
  ## Should contain user:pass pairs, lines no longer than 128 chars
  ## Password is unencrypted
@@ -24,7 +24,7 @@
  
  ## Forward everything to another proxy server.
  ## Modifications/compression is still applied.
-@@ -105,7 +105,7 @@
+@@ -120,7 +120,7 @@
  ## This option has no effect if BindOutgoing is not used.
  ## Default: empty, no hosts are exempted.
  ## See also: BindOutgoingExAddr
@@ -33,7 +33,7 @@
  
  ## Defines a specific IP to be bound to for hosts specified in BindOutgoingExList.
  ## As with BindOutgoing, this IP must be a local IP from the server running Ziproxy.
-@@ -391,7 +391,7 @@
+@@ -429,7 +429,7 @@
  ## *** THIS IS NOT SUPPOSED TO BE A DEFINITIVE SOLUTION TO INCOMPATIBILITIES ***
  ##
  ## Default: empty (no file specified, inactive)
@@ -42,21 +42,42 @@
  
  ## This option specifies a file containing a list of URLs which its
  ## data should be intercepted and replaced by another.
-@@ -409,7 +409,7 @@
- ## and cookies are transported) -- a stealthy ad-blocker, if you like.
+@@ -448,7 +448,7 @@
  ##
  ## Default: empty (no file specified, inactive)
+ ## See also: URLReplaceDataCT
 -# URLReplaceData = "/etc/ziproxy/replace.list"
 +# URLReplaceData = "%%PREFIX%%/etc/ziproxy/replace.list"
  
+ ## Same as URLReplaceData, except it will only replace the data
+ ## from matching URLs if the content-type matches
+@@ -462,7 +462,7 @@
+ ##
+ ## Default: empty (no file specified, inactive)
+ ## See also: URLReplaceDataCTList, URLReplaceData
+-# URLReplaceDataCT = "/etc/ziproxy/replace_ct.list"
++# URLReplaceDataCT = "%%PREFIX%%/etc/ziproxy/replace_ct.list"
+ 
+ ## List of content-types to use with the URLReplaceDataCT option.
+ ## Default: empty (no content-type specified, inactive)
+@@ -474,7 +474,7 @@
+ ## A "access denied" 403 error will be returned when trying to access
+ ## one of those URLs.
+ ## Default: empty (no file specified, inactive)
+-# URLDeny = "/etc/ziproxy/deny.list"
++# URLDeny = "%%PREFIX%%/etc/ziproxy/deny.list"
+ 
  ## Custom HTTP Error Messages
  ## Define here the full path to the HTML file which should be
-@@ -417,19 +417,19 @@
+@@ -482,21 +482,21 @@
  ## Note: The internal defaults give more precise error messages.
  ##
  ## 400 - Bad request (malformed URL, or unknown URL type)
 -# CustomError400="/var/ziproxy/error/400.html"
 +# CustomError400="%%DATADIR%%/error/400.html"
+ ## 403 - Forbidden
+-# CustomError403="/var/ziproxy/error/403.html"
++# CustomError403="%%DATADIR%%/error/403.html"
  ## 404 - Unknown host (Ziproxy will not issue 'page not found' errors itself)
 -# CustomError404="/var/ziproxy/error/404.html"
 +# CustomError404="%%DATADIR%%/error/404.html"
diff --git a/www/ziproxy/pkg-plist b/www/ziproxy/pkg-plist
index ef5cf885af1e..5028043f6f8a 100644
--- a/www/ziproxy/pkg-plist
+++ b/www/ziproxy/pkg-plist
@@ -3,14 +3,17 @@ bin/ziproxylogtool
 bin/ziproxy_genhtml_stats.sh
 @exec mkdir -p %D/etc/ziproxy
 etc/ziproxy/bo_exception.list
+etc/ziproxy/deny.list
 etc/ziproxy/http.passwd
 etc/ziproxy/noprocess.list
 etc/ziproxy/replace.list
+etc/ziproxy/replace_ct.list
 @unexec if cmp -s %D/etc/ziproxy/ziproxy.conf.sample %D/etc/ziproxy/ziproxy.conf; then rm -f %D/etc/ziproxy/ziproxy.conf; fi
 @exec if [ ! -f %D/etc/ziproxy/ziproxy.conf ] ; then cp -p %D/%F %B/ziproxy.conf; fi
 etc/ziproxy/ziproxy.conf.sample
 @dirrmtry etc/ziproxy
 %%DATADIR%%/error/400.html
+%%DATADIR%%/error/403.html
 %%DATADIR%%/error/404.html
 %%DATADIR%%/error/407.html
 %%DATADIR%%/error/408.html