Date: Thu, 31 Jan 2008 23:26:21 GMT From: Pankov Pavel <pankov_p@mail.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/120196: [patch][maintainer update]Update port www/ziproxy to 2.5.0 Message-ID: <200801312326.m0VNQLXV062169@www.freebsd.org> Resent-Message-ID: <200801312330.m0VNU1VQ023006@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 120196
>Category: ports
>Synopsis: [patch][maintainer update]Update port www/ziproxy to 2.5.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: Thu Jan 31 23:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Pankov Pavel
>Release: 7.0-BETA2
>Organization:
MPEI
>Environment:
FreeBSD pankbook 7.0-BETA2 FreeBSD 7.0-BETA2 #12: Fri Nov 9 12:54:45 MSK 2007 pankovpv@pankbook:/usr/obj/usr/src/sys/U200 i386
>Description:
- Update www/ziproxy to 2.5.0
- Handle default configuration file path
- Update pkg-descr
>How-To-Repeat:
>Fix:
Apply the attached patch.
Patch attached with submission follows:
Index: ports/UPDATING
===================================================================
RCS file: /home/ncvs/ports/UPDATING,v
retrieving revision 1.580
diff -u -r1.580 UPDATING
--- ports/UPDATING 26 Jan 2008 16:44:43 -0000 1.580
+++ ports/UPDATING 31 Jan 2008 23:18:13 -0000
@@ -6,6 +6,13 @@
time you update your ports collection, before attempting any port
upgrades.
+20080201:
+ AFFECTS: users of www/ziproxy
+ AUTHOR: pankov_p@mail.ru
+
+ The configuration file was moved from /usr/local/etc to
+ /usr/local/etc/ziproxy.
+
20080126:
AFFECTS: users of net-p2p/deluge
AUTHOR: mezz@FreeBSD.org
Index: ports/www/ziproxy/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/ziproxy/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- ports/www/ziproxy/Makefile 27 Dec 2007 22:49:39 -0000 1.9
+++ ports/www/ziproxy/Makefile 31 Jan 2008 23:18:13 -0000
@@ -5,7 +5,7 @@
# $FreeBSD: ports/www/ziproxy/Makefile,v 1.9 2007/12/27 22:49:39 miwi Exp $
PORTNAME= ziproxy
-PORTVERSION= 2.4.3
+PORTVERSION= 2.5.0
CATEGORIES= www
MASTER_SITES= SF
@@ -26,12 +26,15 @@
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-cfgfile="${PREFIX}/etc/ziproxy.conf"
+CONFIGURE_ARGS+= --with-cfgfile="${PREFIX}/etc/ziproxy/ziproxy.conf"
.if !defined(NOPORTDOCS)
PORTDOCS= README
.endif
+MAN1= ziproxy.1 ziproxylogtool.1
+MANCOMPRESSED= no
+
USE_RC_SUBR= ziproxy
SUB_FILES+= pkg-message
@@ -41,16 +44,13 @@
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-e 's|%%DATADIR%%|${DATADIR}|g' \
- ${WRKSRC}/etc/ziproxy.conf
-
- @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
- ${WRKSRC}/configure
+ ${WRKSRC}/etc/ziproxy/ziproxy.conf
post-install:
- @${MKDIR} ${PREFIX}/etc
- @${INSTALL_DATA} ${WRKSRC}/etc/ziproxy.conf ${PREFIX}/etc/ziproxy.conf.sample
- @if [ ! -f ${PREFIX}/etc/ziproxy.conf ]; then \
- ${CP} -p ${WRKSRC}/etc/ziproxy.conf ${PREFIX}/etc/ziproxy.conf ; \
+ @${MKDIR} ${PREFIX}/etc/ziproxy
+ @${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 ; \
fi
.if !defined(NOPORTDOCS)
Index: ports/www/ziproxy/distinfo
===================================================================
RCS file: /home/ncvs/ports/www/ziproxy/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- ports/www/ziproxy/distinfo 27 Dec 2007 22:49:39 -0000 1.7
+++ ports/www/ziproxy/distinfo 31 Jan 2008 23:18:13 -0000
@@ -1,3 +1,3 @@
-MD5 (ziproxy-2.4.3.tar.bz2) = ae174253ac582f6e2554b9325849de02
-SHA256 (ziproxy-2.4.3.tar.bz2) = 784cf1bc95190383af698719f505716f6bc66f8548011ac80460364d59231cfc
-SIZE (ziproxy-2.4.3.tar.bz2) = 177422
+MD5 (ziproxy-2.5.0.tar.bz2) = fc923195ef8dbb199d0d4b7e6061cf99
+SHA256 (ziproxy-2.5.0.tar.bz2) = 498fccdcdaa368a707b5f9780350db016a3dba90b4c1f764b0d00e0ae84d5765
+SIZE (ziproxy-2.5.0.tar.bz2) = 211216
Index: ports/www/ziproxy/pkg-descr
===================================================================
RCS file: /home/ncvs/ports/www/ziproxy/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- ports/www/ziproxy/pkg-descr 1 Aug 2006 01:20:33 -0000 1.1
+++ ports/www/ziproxy/pkg-descr 31 Jan 2008 23:18:13 -0000
@@ -1,6 +1,7 @@
-Ziproxy is forwarding, non-caching, compressing proxy server. It
-squeezes images by converting them to low quality jpegs and
-optionally can also gzip HTML and other text-like data. It is
-intended to free bandwidth on dialup connections.
+Ziproxy is forwarding, non-caching, compressing HTTP proxy server.
+Basically it squeezes images by converting them to lower quality JPEGs or
+JPEG 2000 and compresses (gzip) HTML and other text-like data.
+It also provides other features such as: HTML/JS/CSS optimization, preemptive
+hostname resolution, transparent proxying and more.
WWW: http://ziproxy.sourceforge.net/
Index: ports/www/ziproxy/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/ziproxy/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- ports/www/ziproxy/pkg-plist 21 Dec 2006 22:13:25 -0000 1.2
+++ ports/www/ziproxy/pkg-plist 31 Jan 2008 23:18:13 -0000
@@ -1,9 +1,11 @@
bin/ziproxy
bin/ziproxylogtool
bin/ziproxy_genhtml_stats.sh
-@unexec if cmp -s %D/etc/ziproxy.conf.sample %D/etc/ziproxy.conf; then rm -f %D/etc/ziproxy.conf; fi
-@exec if [ ! -f %D/etc/ziproxy.conf ] ; then cp -p %D/%F %B/ziproxy.conf; fi
-etc/ziproxy.conf.sample
+@exec mkdir -p %D/etc/ziproxy
+@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/404.html
%%DATADIR%%/error/408.html
Index: ports/www/ziproxy/files/patch-ziproxy.conf
===================================================================
RCS file: /home/ncvs/ports/www/ziproxy/files/patch-ziproxy.conf,v
retrieving revision 1.3
diff -u -r1.3 patch-ziproxy.conf
--- ports/www/ziproxy/files/patch-ziproxy.conf 20 Sep 2007 01:01:27 -0000 1.3
+++ ports/www/ziproxy/files/patch-ziproxy.conf 31 Jan 2008 23:18:13 -0000
@@ -1,6 +1,6 @@
---- 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 @@
+--- etc/ziproxy/ziproxy.conf.orig Thu Jan 24 20:41:01 2008
++++ etc/ziproxy/ziproxy.conf Fri Feb 1 00:34:04 2008
+@@ -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.
## By default Ziproxy binds to all interfaces.
@@ -13,18 +13,27 @@
-# 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 @@
+ ## Inactivity timeout before closing the daemon (0 = no timeout)
+ ## default: 0 (no timeout)
+@@ -67,7 +67,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="%%PREFIX%%/etc/ziproxy.passwd"
+-# PasswdFile="/etc/ziproxy/http.passwd"
++# PasswdFile="%%PREFIX%%/etc/ziproxy/http.passwd"
## Forward everything to another proxy server.
## Modifications/compression is still applied.
-@@ -263,13 +263,13 @@
+@@ -371,7 +371,7 @@
+ ## *** THIS IS NOT SUPPOSED TO BE A DEFINITIVE SOLUTION TO INCOMPATIBILITIES ***
+ ##
+ ## Defauly: empty (no file specified, inactive)
+-# URLNoProcessing = "/etc/ziproxy/noprocess.list"
++# URLNoProcessing = "%%PREFIX%%/etc/ziproxy/noprocess.list"
+
+ ## Custom HTTP Error Messages
+ ## Define here the full path to the HTML file which should be
+@@ -379,15 +379,15 @@
## Note: The internal defaults give more precise error messages.
##
## 400 - Bad request (malformed URL, or unknown URL type)
@@ -42,4 +51,6 @@
## 503 - Connection refused (or service unavailable)
-# CustomError503="/var/ziproxy/error/503.html"
+# CustomError503="%%DATADIR%%/error/503.html"
+
+
Index: ports/www/ziproxy/files/pkg-message.in
===================================================================
RCS file: /home/ncvs/ports/www/ziproxy/files/pkg-message.in,v
retrieving revision 1.2
diff -u -r1.2 pkg-message.in
--- ports/www/ziproxy/files/pkg-message.in 27 May 2007 09:30:06 -0000 1.2
+++ ports/www/ziproxy/files/pkg-message.in 31 Jan 2008 23:18:14 -0000
@@ -1,14 +1,2 @@
By default ziproxy is configured to accept connections on localhost only.
-Edit %%PREFIX%%/etc/ziproxy.conf to allow remote access.
-
-There is no man page yet, but information can be found in
-%%DOCSDIR%%/README.
-
-ziproxy can be started the following ways:
-o daemon mode:
- * add ziproxy_enable="YES" to your /etc/rc.conf
- * use rc(8) script %%PREFIX%%/etc/rc.d/ziproxy.sh
-o inetd mode:
- * add ``http-proxy 8080/tcp #HTTP Proxy'' to /etc/services
- * add ``http-proxy stream tcp nowait nobody /usr/local/bin/ziproxy ziproxy -i'' to your /etc/inetd.conf
- * reload inetd(8) config files by doing `/etc/rc.d/inetd reload`
+Edit %%PREFIX%%/etc/ziproxy/ziproxy.conf to allow remote access.
Index: ports/www/ziproxy/files/ziproxy.in
===================================================================
RCS file: /home/ncvs/ports/www/ziproxy/files/ziproxy.in,v
retrieving revision 1.2
diff -u -r1.2 ziproxy.in
--- ports/www/ziproxy/files/ziproxy.in 20 Sep 2007 01:01:27 -0000 1.2
+++ ports/www/ziproxy/files/ziproxy.in 31 Jan 2008 23:18:14 -0000
@@ -8,7 +8,7 @@
#
# ziproxy_enable (bool): Set to NO by default.
# Set it to YES to enable ziproxy.
-# ziproxy_config (path): Set to %%PREFIX%%/etc/ziproxy.conf
+# ziproxy_config (path): Set to %%PREFIX%%/etc/ziproxy/ziproxy.conf
# by default.
#
@@ -23,7 +23,7 @@
load_rc_config $name
: ${ziproxy_enable="NO"}
-: ${ziproxy_config="%%PREFIX%%/etc/ziproxy.conf"}
+: ${ziproxy_config="%%PREFIX%%/etc/ziproxy/ziproxy.conf"}
command_args="-d -c ${ziproxy_config} > ${pidfile}"
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801312326.m0VNQLXV062169>