Attachment #95369 for bug #133741

View | Details | Raw Unified | Return to bug 133741
Collapse All | Expand All




# $FreeBSD: ports/www/ziproxy/Makefile,v 1.13 2008/11/29 20:58:44 miwi Exp $

PORTNAME=		ziproxy
PORTVERSION=		2.7.0
CATEGORIES=		www
MASTER_SITES=		SF



CFLAGS+=		-I${LOCALBASE}/include
LDFLAGS+=		-L${LOCALBASE}/lib
ERRORFILES=		400.html 403.html 404.html 407.html 408.html 409.html 500.html 503.html

CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"


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 ; \

Lines 1-3 Link Here

(-)ports/www/ziproxy/distinfo (-3 / +3 lines)
1	MD5 (ziproxy-2.6.0.tar.bz2) = b7d57ace56a3be34446ef1b68ac85205	1	MD5 (ziproxy-2.7.0.tar.bz2) = cfc7d59d31bb889121dd9f1e77bc0124
2	SHA256 (ziproxy-2.6.0.tar.bz2) = 9f0c1f0cd5f424631c55e1e51a49562c50ca8d79ae108e337cd3ef5d32260289	2	SHA256 (ziproxy-2.7.0.tar.bz2) = cd3e7cf6d4ca1faaf82867024486c72091968b9b9bd9ca41dac76fd76ad00d7a
3	SIZE (ziproxy-2.6.0.tar.bz2) = 262943	3	SIZE (ziproxy-2.7.0.tar.bz2) = 239929




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




--- 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.

 
 ## Inactivity timeout before closing the daemon (0 = no timeout)
 ## default: 0 (no timeout)
@@ -82,7 +82,7 @@
 ## HTTP auth file
 ## Should contain user:pass pairs, lines no longer than 128 chars
 ## Password is unencrypted

 
 ## Forward everything to another proxy server.
 ## Modifications/compression is still applied.
@@ -120,7 +120,7 @@
 ## This option has no effect if BindOutgoing is not used.
 ## Default: empty, no hosts are exempted.
 ## See also: BindOutgoingExAddr

 
 ## 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.
@@ -429,7 +429,7 @@
 ## *** THIS IS NOT SUPPOSED TO BE A DEFINITIVE SOLUTION TO INCOMPATIBILITIES ***
 ##
 ## Default: empty (no file specified, inactive)

 
 ## This option specifies a file containing a list of URLs which its
 ## data should be intercepted and replaced by another.
@@ -448,7 +448,7 @@
 ## and cookies are transported) -- a stealthy ad-blocker, if you like.
 ##
 ## 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
@@ -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"

Return to bug 133741

Lines 5-11 Link Here

(-)ports/www/ziproxy/Makefile (-2 / +4 lines)
5	# $FreeBSD: ports/www/ziproxy/Makefile,v 1.13 2008/11/29 20:58:44 miwi Exp $	5	# $FreeBSD: ports/www/ziproxy/Makefile,v 1.13 2008/11/29 20:58:44 miwi Exp $
6		6
7	PORTNAME= ziproxy	7	PORTNAME= ziproxy
8	PORTVERSION= 2.6.0	8	PORTVERSION= 2.7.0
9	CATEGORIES= www	9	CATEGORIES= www
10	MASTER_SITES= SF	10	MASTER_SITES= SF
11		11
Lines 20-26 Link Here
20		20
21	CFLAGS+= -I${LOCALBASE}/include	21	CFLAGS+= -I${LOCALBASE}/include
22	LDFLAGS+= -L${LOCALBASE}/lib	22	LDFLAGS+= -L${LOCALBASE}/lib
23	ERRORFILES= 400.html 404.html 407.html 408.html 409.html 500.html 503.html	23	ERRORFILES= 400.html 403.html 404.html 407.html 408.html 409.html 500.html 503.html
24		24
25	CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"	25	CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
26		26
Lines 47-55 Link Here
47	post-install:	47	post-install:
48	@${MKDIR} ${PREFIX}/etc/ziproxy	48	@${MKDIR} ${PREFIX}/etc/ziproxy
49	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/bo_exception.list ${PREFIX}/etc/ziproxy/bo_exception.list	49	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/bo_exception.list ${PREFIX}/etc/ziproxy/bo_exception.list
		50	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/deny.list ${PREFIX}/etc/ziproxy/deny.list
50	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/http.passwd ${PREFIX}/etc/ziproxy/http.passwd	51	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/http.passwd ${PREFIX}/etc/ziproxy/http.passwd
51	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/noprocess.list ${PREFIX}/etc/ziproxy/noprocess.list	52	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/noprocess.list ${PREFIX}/etc/ziproxy/noprocess.list
52	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/replace.list ${PREFIX}/etc/ziproxy/replace.list	53	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/replace.list ${PREFIX}/etc/ziproxy/replace.list
		54	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/replace_ct.list ${PREFIX}/etc/ziproxy/replace_ct.list
53	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/ziproxy.conf ${PREFIX}/etc/ziproxy/ziproxy.conf.sample	55	@${INSTALL_DATA} ${WRKSRC}/etc/ziproxy/ziproxy.conf ${PREFIX}/etc/ziproxy/ziproxy.conf.sample
54	@if [ ! -f ${PREFIX}/etc/ziproxy/ziproxy.conf ]; then \	56	@if [ ! -f ${PREFIX}/etc/ziproxy/ziproxy.conf ]; then \
55	${CP} -p ${WRKSRC}/etc/ziproxy/ziproxy.conf ${PREFIX}/etc/ziproxy/ziproxy.conf ; \	57	${CP} -p ${WRKSRC}/etc/ziproxy/ziproxy.conf ${PREFIX}/etc/ziproxy/ziproxy.conf ; \

Lines 3-16 Link Here

(-)ports/www/ziproxy/pkg-plist (+3 lines)
3	bin/ziproxy_genhtml_stats.sh	3	bin/ziproxy_genhtml_stats.sh
4	@exec mkdir -p %D/etc/ziproxy	4	@exec mkdir -p %D/etc/ziproxy
5	etc/ziproxy/bo_exception.list	5	etc/ziproxy/bo_exception.list
		6	etc/ziproxy/deny.list
6	etc/ziproxy/http.passwd	7	etc/ziproxy/http.passwd
7	etc/ziproxy/noprocess.list	8	etc/ziproxy/noprocess.list
8	etc/ziproxy/replace.list	9	etc/ziproxy/replace.list
		10	etc/ziproxy/replace_ct.list
9	@unexec if cmp -s %D/etc/ziproxy/ziproxy.conf.sample %D/etc/ziproxy/ziproxy.conf; then rm -f %D/etc/ziproxy/ziproxy.conf; fi	11	@unexec if cmp -s %D/etc/ziproxy/ziproxy.conf.sample %D/etc/ziproxy/ziproxy.conf; then rm -f %D/etc/ziproxy/ziproxy.conf; fi
10	@exec if [ ! -f %D/etc/ziproxy/ziproxy.conf ] ; then cp -p %D/%F %B/ziproxy.conf; fi	12	@exec if [ ! -f %D/etc/ziproxy/ziproxy.conf ] ; then cp -p %D/%F %B/ziproxy.conf; fi
11	etc/ziproxy/ziproxy.conf.sample	13	etc/ziproxy/ziproxy.conf.sample
12	@dirrmtry etc/ziproxy	14	@dirrmtry etc/ziproxy
13	%%DATADIR%%/error/400.html	15	%%DATADIR%%/error/400.html
		16	%%DATADIR%%/error/403.html
14	%%DATADIR%%/error/404.html	17	%%DATADIR%%/error/404.html
15	%%DATADIR%%/error/407.html	18	%%DATADIR%%/error/407.html
16	%%DATADIR%%/error/408.html	19	%%DATADIR%%/error/408.html

Lines 1-5 Link Here

(-)ports/www/ziproxy/files/patch-ziproxy.conf (-8 / +29 lines)
1	--- etc/ziproxy/ziproxy.conf.orig 2008-11-18 00:28:03.000000000 +0300	1	--- etc/ziproxy/ziproxy.conf.orig 2009-03-13 17:41:27.000000000 +0300
2	+++ etc/ziproxy/ziproxy.conf 2008-11-18 00:29:22.000000000 +0300	2	+++ etc/ziproxy/ziproxy.conf 2009-04-15 10:41:25.000000000 +0400
3	@@ -12,12 +12,12 @@	3	@@ -12,12 +12,12 @@
4	## If you have more than one network interface,	4	## If you have more than one network interface,
5	## it's useful for restricting to which interface you want to bind to.	5	## it's useful for restricting to which interface you want to bind to.
Lines 15-21 Link Here
15		15
16	## Inactivity timeout before closing the daemon (0 = no timeout)	16	## Inactivity timeout before closing the daemon (0 = no timeout)
17	## default: 0 (no timeout)	17	## default: 0 (no timeout)
18	@@ -67,7 +67,7 @@	18	@@ -82,7 +82,7 @@
19	## HTTP auth file	19	## HTTP auth file
20	## Should contain user:pass pairs, lines no longer than 128 chars	20	## Should contain user:pass pairs, lines no longer than 128 chars
21	## Password is unencrypted	21	## Password is unencrypted
Lines 24-30 Link Here
24		24
25	## Forward everything to another proxy server.	25	## Forward everything to another proxy server.
26	## Modifications/compression is still applied.	26	## Modifications/compression is still applied.
27	@@ -105,7 +105,7 @@	27	@@ -120,7 +120,7 @@
28	## This option has no effect if BindOutgoing is not used.	28	## This option has no effect if BindOutgoing is not used.
29	## Default: empty, no hosts are exempted.	29	## Default: empty, no hosts are exempted.
30	## See also: BindOutgoingExAddr	30	## See also: BindOutgoingExAddr
Lines 33-39 Link Here
33		33
34	## Defines a specific IP to be bound to for hosts specified in BindOutgoingExList.	34	## Defines a specific IP to be bound to for hosts specified in BindOutgoingExList.
35	## As with BindOutgoing, this IP must be a local IP from the server running Ziproxy.	35	## As with BindOutgoing, this IP must be a local IP from the server running Ziproxy.
36	@@ -391,7 +391,7 @@	36	@@ -429,7 +429,7 @@
37	## * THIS IS NOT SUPPOSED TO BE A DEFINITIVE SOLUTION TO INCOMPATIBILITIES *	37	## * THIS IS NOT SUPPOSED TO BE A DEFINITIVE SOLUTION TO INCOMPATIBILITIES *
38	##	38	##
39	## Default: empty (no file specified, inactive)	39	## Default: empty (no file specified, inactive)
Lines 42-62 Link Here
42		42
43	## This option specifies a file containing a list of URLs which its	43	## This option specifies a file containing a list of URLs which its
44	## data should be intercepted and replaced by another.	44	## data should be intercepted and replaced by another.
45	@@ -409,7 +409,7 @@	45	@@ -448,7 +448,7 @@
46	## and cookies are transported) -- a stealthy ad-blocker, if you like.
47	##	46	##
48	## Default: empty (no file specified, inactive)	47	## Default: empty (no file specified, inactive)
		48	## See also: URLReplaceDataCT
49	-# URLReplaceData = "/etc/ziproxy/replace.list"	49	-# URLReplaceData = "/etc/ziproxy/replace.list"
50	+# URLReplaceData = "%%PREFIX%%/etc/ziproxy/replace.list"	50	+# URLReplaceData = "%%PREFIX%%/etc/ziproxy/replace.list"
51		51
		52	## Same as URLReplaceData, except it will only replace the data
		53	## from matching URLs if the content-type matches
		54	@@ -462,7 +462,7 @@
		55	##
		56	## Default: empty (no file specified, inactive)
		57	## See also: URLReplaceDataCTList, URLReplaceData
		58	-# URLReplaceDataCT = "/etc/ziproxy/replace_ct.list"
		59	+# URLReplaceDataCT = "%%PREFIX%%/etc/ziproxy/replace_ct.list"
		60
		61	## List of content-types to use with the URLReplaceDataCT option.
		62	## Default: empty (no content-type specified, inactive)
		63	@@ -474,7 +474,7 @@
		64	## A "access denied" 403 error will be returned when trying to access
		65	## one of those URLs.
		66	## Default: empty (no file specified, inactive)
		67	-# URLDeny = "/etc/ziproxy/deny.list"
		68	+# URLDeny = "%%PREFIX%%/etc/ziproxy/deny.list"
		69
52	## Custom HTTP Error Messages	70	## Custom HTTP Error Messages
53	## Define here the full path to the HTML file which should be	71	## Define here the full path to the HTML file which should be
54	@@ -417,19 +417,19 @@	72	@@ -482,21 +482,21 @@
55	## Note: The internal defaults give more precise error messages.	73	## Note: The internal defaults give more precise error messages.
56	##	74	##
57	## 400 - Bad request (malformed URL, or unknown URL type)	75	## 400 - Bad request (malformed URL, or unknown URL type)
58	-# CustomError400="/var/ziproxy/error/400.html"	76	-# CustomError400="/var/ziproxy/error/400.html"
59	+# CustomError400="%%DATADIR%%/error/400.html"	77	+# CustomError400="%%DATADIR%%/error/400.html"
		78	## 403 - Forbidden
		79	-# CustomError403="/var/ziproxy/error/403.html"
		80	+# CustomError403="%%DATADIR%%/error/403.html"
60	## 404 - Unknown host (Ziproxy will not issue 'page not found' errors itself)	81	## 404 - Unknown host (Ziproxy will not issue 'page not found' errors itself)
61	-# CustomError404="/var/ziproxy/error/404.html"	82	-# CustomError404="/var/ziproxy/error/404.html"
62	+# CustomError404="%%DATADIR%%/error/404.html"	83	+# CustomError404="%%DATADIR%%/error/404.html"