ports/116371: [maintainer update][patch]Update port: www/ziproxy to 2.3.0

[Pankov Pavel]

>Number:         116371
>Category:       ports
>Synopsis:       [maintainer update][patch]Update port: www/ziproxy to 2.3.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 15 14:00:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Pankov Pavel
>Release:        7.0-CURRENT
>Organization:
MPEI
>Environment:
FreeBSD pankbook 7.0-CURRENT FreeBSD 7.0-CURRENT #3: Sat Sep 15 00:48:47 MSD 2007     pankovpv at pankbook:/usr/obj/usr/src/sys/U200  i386
>Description:
- Update to 2.3.0
- Fix stop command in rc(8) script
- Catch up upstream config file changes
>How-To-Repeat:

>Fix:
Apply the following patch.

Patch attached with submission follows:

Index: www/ziproxy/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/ziproxy/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- www/ziproxy/Makefile	4 Aug 2007 11:41:30 -0000	1.6
+++ www/ziproxy/Makefile	15 Sep 2007 13:46:46 -0000
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/www/ziproxy/Makefile,v 1.6 2007/08/04 11:41:30 gabor Exp $
 
 PORTNAME=		ziproxy
-PORTVERSION=		2.2.2
+PORTVERSION=		2.3.0
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -29,7 +29,7 @@
 CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-shared-confuse --with-cfgfile=${PREFIX}/etc/ziproxy.conf
+CONFIGURE_ARGS+=	--enable-shared-confuse --with-cfgfile="${PREFIX}/etc/ziproxy.conf"
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=		README
@@ -43,8 +43,7 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/etc/ziproxy.conf
-	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \
+	                  -e 's|%%DATADIR%%|${DATADIR}|g' \
 		${WRKSRC}/etc/ziproxy.conf
 
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
Index: www/ziproxy/distinfo
===================================================================
RCS file: /home/ncvs/ports/www/ziproxy/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- www/ziproxy/distinfo	27 May 2007 09:30:06 -0000	1.4
+++ www/ziproxy/distinfo	15 Sep 2007 13:46:46 -0000
@@ -1,3 +1,3 @@
-MD5 (ziproxy-2.2.2.tar.bz2) = b2c1e1b7efa4db50b97d69b126815bba
-SHA256 (ziproxy-2.2.2.tar.bz2) = 6fbf4134e84311d4590f907b37b5ae2ee0af5dc5d8fc6457edf4129635dc7bb9
-SIZE (ziproxy-2.2.2.tar.bz2) = 145733
+MD5 (ziproxy-2.3.0.tar.bz2) = 2733c117e819c5000d898456388922ba
+SHA256 (ziproxy-2.3.0.tar.bz2) = e69e179304498e0c4dcaf19dd2b4dd3be76ad9a09c68fe58c4004780a8598894
+SIZE (ziproxy-2.3.0.tar.bz2) = 152058
Index: www/ziproxy/files/patch-ziproxy.conf
===================================================================
RCS file: /home/ncvs/ports/www/ziproxy/files/patch-ziproxy.conf,v
retrieving revision 1.2
diff -u -r1.2 patch-ziproxy.conf
--- www/ziproxy/files/patch-ziproxy.conf	13 Sep 2006 08:48:48 -0000	1.2
+++ www/ziproxy/files/patch-ziproxy.conf	15 Sep 2007 13:46:46 -0000
@@ -1,15 +1,30 @@
---- etc/ziproxy.conf.orig      Wed Jul 26 09:01:36 2006
-+++ etc/ziproxy.conf   Mon Jul 31 01:07:02 2006
-@@ -36,7 +36,7 @@
+--- etc/ziproxy.conf.orig	2007-09-06 07:51:42.000000000 +0400
++++ etc/ziproxy.conf	2007-09-15 13:31:16.000000000 +0400
+@@ -11,12 +11,12 @@
+ ## If you have more than one network interface,
+ ## it's useful for restricting to which interface you want to bind to.
+ ## By default Ziproxy binds to all interfaces.
+-# Address = "127.0.0.1"
++Address = "127.0.0.1"
+ 
+ ## Accepts conections only from that address.
+ ## WARNING: Remember to restrict the access to Ziproxy
+ ## if your machine is directly connected to the Internet.
+-# OnlyFrom = "127.0.0.1"
++OnlyFrom = "127.0.0.1"
+ 
+ # Inactivity timeout before closing the daemon (0 = no timeout)
+ NetdTimeout = 0
+@@ -50,7 +50,7 @@
  ## HTTP auth file
  ## Should contain user:pass pairs, lines no longer than 128 chars
  ## Password is unencrypted
 -# PasswdFile="/usr/local/ziproxy/ziproxy.passwd"
-+# PasswdFile="/usr/local/etc/ziproxy.passwd"
-
++# PasswdFile="%%PREFIX%%/etc/ziproxy.passwd"
+ 
  ## Forward everything to another proxy server.
  ## Modifications/compression is still applied.
-@@ -151,13 +151,12 @@
+@@ -263,13 +263,13 @@
  ## Note: The internal defaults give more precise error messages.
  ##
  ## 400 - Bad request (malformed URL, or unknown URL type)
@@ -26,5 +41,5 @@
 +# CustomError500="%%DATADIR%%/error/500.html"
  ## 503 - Connection refused (or service unavailable)
 -# CustomError503="/var/ziproxy/error/503.html"
--
 +# CustomError503="%%DATADIR%%/error/503.html"
+ 
Index: www/ziproxy/files/ziproxy.in
===================================================================
RCS file: /home/ncvs/ports/www/ziproxy/files/ziproxy.in,v
retrieving revision 1.1
diff -u -r1.1 ziproxy.in
--- www/ziproxy/files/ziproxy.in	1 Aug 2006 01:20:33 -0000	1.1
+++ www/ziproxy/files/ziproxy.in	15 Sep 2007 13:46:46 -0000
@@ -25,6 +25,6 @@
 : ${ziproxy_enable="NO"}
 : ${ziproxy_config="%%PREFIX%%/etc/ziproxy.conf"}
 
-command_args="-d -c ${ziproxy_config}"
+command_args="-d -c ${ziproxy_config} > ${pidfile}"
 
 run_rc_command "$1"


>Release-Note:
>Audit-Trail:
>Unformatted: