Attachment #160619 for bug #202825

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





PORTNAME=	3proxy
PORTVERSION=	0.7.1.2
PORTREVISION=	1
DISTVERSIONPREFIX=	v
PORTREVISION=	2
CATEGORIES=	net

MAINTAINER=	ports@FreeBSD.org

post-build:
	${MV} ${WRKSRC}/src/proxy ${WRKSRC}/src/httppr
	${MV} ${WRKSRC}/man/proxy.8 ${WRKSRC}/man/httppr.8

do-install:
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ ${STAGEDIR}${DOCSDIR}/
	cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy countersutil dighosts ftppr icqpr msnpr mycrypt pop3p httppr smtpp socks tcppm udppm ${STAGEDIR}${PREFIX}/bin/

Lines 1-5 Link Here

(-)3proxy/files/patch-Makefile.unix (-2 / +2 lines)
1	--- Makefile.unix.orig 2007-04-10 20:29:25.000000000 +0400	1	--- Makefile.unix.orig 2015-02-17 13:09:13 UTC
2	+++ Makefile.unix 2009-03-23 13:53:24.000000000 +0300	2	+++ Makefile.unix
3	@@ -9,18 +9,18 @@	3	@@ -9,18 +9,18 @@
4	# library support. Add -DSAFESQL for poorely written ODBC library / drivers.	4	# library support. Add -DSAFESQL for poorely written ODBC library / drivers.
5		5

Lines 1-6 Link Here

(-)3proxy/files/patch-cfg-3proxy.cfg.sample (-3 / +3 lines)
1	--- cfg/3proxy.cfg.sample.orig Mon May 30 11:16:19 2005	1	--- cfg/3proxy.cfg.sample.orig 2015-02-17 13:09:13 UTC
2	+++ cfg/3proxy.cfg.sample Mon May 30 11:17:18 2005	2	+++ cfg/3proxy.cfg.sample
3	@@ -30,15 +30,15 @@	3	@@ -30,15 +30,15 @@ users 3APA3A:CL:3apa3a "test:CR:$1$qwer$
4	# this example shows you how to include passwd file. For included files	4	# this example shows you how to include passwd file. For included files
5	# <CR> and <LF> are treated as field separators.	5	# <CR> and <LF> are treated as field separators.
6		6




--- man/3proxy.8.orig	2015-02-17 13:09:13 UTC
+++ man/3proxy.8
@@ -26,7 +26,7 @@ It can establish multiple
@@ -26,7 +26,7 @@
 gateways with HTTP and HTTPS proxy with FTP over HTTP support, SOCKS v4,
 v4.5 and v5, POP3 proxy, UDP and TCP portmappers. Each gateway is started
 from configuration file like independant service 

 .BR socks (8)
 .BR pop3p (8)
 .BR tcppm (8)
@@ -84,7 +84,7 @@ directory). Under Unix, if no config fil
 configuration from stdin. It makes it possible to use 3proxy.cfg file as
 executable script just by setting +x mode and adding
 .br

 .br
 as a first line in 3proxy.cfg
 .TP
@@ -133,14 +133,14 @@ Web admin service can also be used to re
 wget to automate this task.
 .SH FILES
 .TP

 kill(1), syslogd(8),
 .br
 http://3proxy.ru/
@@ -148,6 +148,6 @@ http://3proxy.ru/
 3APA3A is pronounced as \`\`zaraza\'\'.
 .SH AUTHORS
 3proxy is designed by 3APA3A

 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
--- man/3proxy.cfg.3.orig	2015-02-17 13:09:13 UTC
+++ man/3proxy.cfg.3
@@ -114,7 +114,7 @@ view without ability to reset).
@@ -114,7 +114,7 @@
 (for proxy) - anonymous proxy (random client information reported)
 .br
  Also, all options mentioned for 

 .BR socks (8)
 .BR pop3p (8)
 .BR tcppm (8)
@@ -884,13 +884,13 @@ corruption and/or Content-Length chaging
 
 
 .SH SEE ALSO

 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
--- man/ftppr.8.orig	2015-02-17 13:09:13 UTC
+++ man/ftppr.8
@@ -75,11 +75,11 @@ Only cleartext authentication is current
@@ -75,11 +75,11 @@
 Report all bugs to
 .BR 3proxy@security.nnov.ru
 .SH SEE ALSO

 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
--- man/icqpr.8.orig	2015-02-17 13:09:13 UTC
+++ man/icqpr.8
@@ -68,11 +68,11 @@ as a destination in client application. 
@@ -68,11 +68,11 @@
 Report all bugs to
 .BR 3proxy@security.nnov.ru
 .SH SEE ALSO

 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
--- man/pop3p.8.orig	2015-02-17 13:09:13 UTC
+++ man/pop3p.8
@@ -71,11 +71,11 @@ we know which server to connect.
@@ -71,11 +71,11 @@
 Report all bugs to
 .BR 3proxy@security.nnov.ru
 .SH SEE ALSO

 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
--- man/proxy.8.orig	2015-02-17 13:09:13 UTC
+++ man/proxy.8
+++ man-httppr/proxy.8	2015-06-14 15:17:24.000000000 +0300
@@ -1,15 +1,15 @@
-.TH proxy "8" "July 2009" "3proxy 0.7" "Universal proxy server"
+.TH httppr "8" "July 2009" "3proxy 0.7" "Universal proxy server"

 is HTTP gateway service with HTTPS and FTP over HTTPS support.
 .SH OPTIONS
 .TP
@@ -71,6 +71,6 @@ Report all bugs to
 http://3proxy.ru/
 .SH AUTHORS
 3proxy is designed by 3APA3A

 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
--- man/smtpp.8.orig	2015-02-17 13:09:13 UTC
+++ man/smtpp.8
@@ -72,11 +72,11 @@ we know which server to connect.
@@ -72,11 +72,11 @@
 Report all bugs to
 .BR 3proxy@security.nnov.ru
 .SH SEE ALSO

 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
--- man/socks.8.orig	2015-02-17 13:09:13 UTC
+++ man/socks.8
@@ -67,11 +67,11 @@ instead.
@@ -67,11 +67,11 @@
 Report all bugs to
 .BR 3proxy@security.nnov.ru
 .SH SEE ALSO

 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
--- man/tcppm.8.orig	2015-02-17 13:09:13 UTC
+++ man/tcppm.8
@@ -61,11 +61,11 @@ as a destination in client application. 
@@ -61,11 +61,11 @@
 Report all bugs to
 .BR 3proxy@security.nnov.ru
 .SH SEE ALSO

 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
--- man/udppm.8.orig	2015-02-17 13:09:13 UTC
+++ man/udppm.8
@@ -67,11 +67,11 @@ as a destination in client application. 
@@ -67,11 +67,11 @@
 Report all bugs to
 .BR 3proxy@security.nnov.ru
 .SH SEE ALSO




--- src/proxy.c.orig	2015-09-01 18:49:36 UTC
+++ src/proxy.c
@@ -119,7 +119,7 @@ char * proxy_stringtable[] = {
 	"<body><h2>503 Service Unavailable</h2><h3>Your request violates configured policy</h3></body></html>\r\n",
 
 /* 16*/	"HTTP/1.0 401 Authentication Required\r\n"
-	"Proxy-Authenticate: basic realm=\"FTP Server\"\r\n"
+	"WWW-Authenticate: basic realm=\"FTP Server\"\r\n"
 	"Proxy-Connection: close\r\n"
 	"Content-type: text/html; charset=us-ascii\r\n"
 	"\r\n"
@@ -464,7 +464,7 @@ for(;;){
 		}
 		if(se)*se = '\r';
 	}
-	if(ftp && i > 19 && (!strncasecmp((char *)(buf+inbuf), "authorization", 19))){
+	if(ftp && i > 13 && (!strncasecmp((char *)(buf+inbuf), "authorization", 13))){
 		sb = (unsigned char *)strchr((char *)(buf+inbuf), ':');
 		if(!sb)continue;
 		++sb;

Return to bug 202825

Lines 3-10 Link Here

(-)3proxy/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= 3proxy	4	PORTNAME= 3proxy
5	PORTVERSION= 0.7.1.2	5	PORTVERSION= 0.7.1.2
6	PORTREVISION= 1
7	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
		7	PORTREVISION= 2
8	CATEGORIES= net	8	CATEGORIES= net
9		9
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
Lines 29-35 Link Here
29	post-build:	29	post-build:
30	${MV} ${WRKSRC}/src/proxy ${WRKSRC}/src/httppr	30	${MV} ${WRKSRC}/src/proxy ${WRKSRC}/src/httppr
31	${MV} ${WRKSRC}/man/proxy.8 ${WRKSRC}/man/httppr.8	31	${MV} ${WRKSRC}/man/proxy.8 ${WRKSRC}/man/httppr.8
32		32
33	do-install:	33	do-install:
34	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ ${STAGEDIR}${DOCSDIR}/	34	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ ${STAGEDIR}${DOCSDIR}/
35	cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy countersutil dighosts ftppr icqpr msnpr mycrypt pop3p httppr smtpp socks tcppm udppm ${STAGEDIR}${PREFIX}/bin/	35	cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy countersutil dighosts ftppr icqpr msnpr mycrypt pop3p httppr smtpp socks tcppm udppm ${STAGEDIR}${PREFIX}/bin/

Lines 1-7 Link Here

(-)3proxy/files/patch-man (-44 / +34 lines)
1	diff -urN man/3proxy.8 man-httppr/3proxy.8	1	--- man/3proxy.8.orig 2015-02-17 13:09:13 UTC
2	--- man/3proxy.8 2015-02-17 16:09:13.000000000 +0300	2	+++ man/3proxy.8
3	+++ man-httppr/3proxy.8 2015-06-14 15:13:08.000000000 +0300	3	@@ -26,7 +26,7 @@ It can establish multiple
4	@@ -26,7 +26,7 @@
5	gateways with HTTP and HTTPS proxy with FTP over HTTP support, SOCKS v4,	4	gateways with HTTP and HTTPS proxy with FTP over HTTP support, SOCKS v4,
6	v4.5 and v5, POP3 proxy, UDP and TCP portmappers. Each gateway is started	5	v4.5 and v5, POP3 proxy, UDP and TCP portmappers. Each gateway is started
7	from configuration file like independant service	6	from configuration file like independant service
Lines 10-16 Link Here
10	.BR socks (8)	9	.BR socks (8)
11	.BR pop3p (8)	10	.BR pop3p (8)
12	.BR tcppm (8)	11	.BR tcppm (8)
13	@@ -84,7 +84,7 @@	12	@@ -84,7 +84,7 @@ directory). Under Unix, if no config fil
14	configuration from stdin. It makes it possible to use 3proxy.cfg file as	13	configuration from stdin. It makes it possible to use 3proxy.cfg file as
15	executable script just by setting +x mode and adding	14	executable script just by setting +x mode and adding
16	.br	15	.br
Lines 19-25 Link Here
19	.br	18	.br
20	as a first line in 3proxy.cfg	19	as a first line in 3proxy.cfg
21	.TP	20	.TP
22	@@ -133,14 +133,14 @@	21	@@ -133,14 +133,14 @@ Web admin service can also be used to re
23	wget to automate this task.	22	wget to automate this task.
24	.SH FILES	23	.SH FILES
25	.TP	24	.TP
Lines 37-43 Link Here
37	kill(1), syslogd(8),	36	kill(1), syslogd(8),
38	.br	37	.br
39	http://3proxy.ru/	38	http://3proxy.ru/
40	@@ -148,6 +148,6 @@	39	@@ -148,6 +148,6 @@ http://3proxy.ru/
41	3APA3A is pronounced as \`\`zaraza\'\'.	40	3APA3A is pronounced as \`\`zaraza\'\'.
42	.SH AUTHORS	41	.SH AUTHORS
43	3proxy is designed by 3APA3A	42	3proxy is designed by 3APA3A
Lines 46-55 Link Here
46	Vladimir Dubrovin	45	Vladimir Dubrovin
47	-.RI ( vlad@sandy.ru )	46	-.RI ( vlad@sandy.ru )
48	+.RI ( vlad@securityvulns.ru )	47	+.RI ( vlad@securityvulns.ru )
49	diff -urN man/3proxy.cfg.3 man-httppr/3proxy.cfg.3	48	--- man/3proxy.cfg.3.orig 2015-02-17 13:09:13 UTC
50	--- man/3proxy.cfg.3 2015-02-17 16:09:13.000000000 +0300	49	+++ man/3proxy.cfg.3
51	+++ man-httppr/3proxy.cfg.3 2015-06-14 15:15:00.000000000 +0300	50	@@ -114,7 +114,7 @@ view without ability to reset).
52	@@ -114,7 +114,7 @@
53	(for proxy) - anonymous proxy (random client information reported)	51	(for proxy) - anonymous proxy (random client information reported)
54	.br	52	.br
55	Also, all options mentioned for	53	Also, all options mentioned for
Lines 58-64 Link Here
58	.BR socks (8)	56	.BR socks (8)
59	.BR pop3p (8)	57	.BR pop3p (8)
60	.BR tcppm (8)	58	.BR tcppm (8)
61	@@ -884,13 +884,13 @@	59	@@ -884,13 +884,13 @@ corruption and/or Content-Length chaging
62		60
63		61
64	.SH SEE ALSO	62	.SH SEE ALSO
Lines 75-84 Link Here
75	Vladimir Dubrovin	73	Vladimir Dubrovin
76	-.RI ( vlad@sandy.ru )	74	-.RI ( vlad@sandy.ru )
77	+.RI ( vlad@securityvulns.ru )	75	+.RI ( vlad@securityvulns.ru )
78	diff -urN man/ftppr.8 man-httppr/ftppr.8	76	--- man/ftppr.8.orig 2015-02-17 13:09:13 UTC
79	--- man/ftppr.8 2015-02-17 16:09:13.000000000 +0300	77	+++ man/ftppr.8
80	+++ man-httppr/ftppr.8 2015-06-14 15:20:21.000000000 +0300	78	@@ -75,11 +75,11 @@ Only cleartext authentication is current
81	@@ -75,11 +75,11 @@
82	Report all bugs to	79	Report all bugs to
83	.BR 3proxy@security.nnov.ru	80	.BR 3proxy@security.nnov.ru
84	.SH SEE ALSO	81	.SH SEE ALSO
Lines 93-102 Link Here
93	Vladimir Dubrovin	90	Vladimir Dubrovin
94	-.RI ( vlad@sandy.ru )	91	-.RI ( vlad@sandy.ru )
95	+.RI ( vlad@securityvulns.ru )	92	+.RI ( vlad@securityvulns.ru )
96	diff -urN man/icqpr.8 man-httppr/icqpr.8	93	--- man/icqpr.8.orig 2015-02-17 13:09:13 UTC
97	--- man/icqpr.8 2015-02-17 16:09:13.000000000 +0300	94	+++ man/icqpr.8
98	+++ man-httppr/icqpr.8 2015-06-14 15:20:25.000000000 +0300	95	@@ -68,11 +68,11 @@ as a destination in client application.
99	@@ -68,11 +68,11 @@
100	Report all bugs to	96	Report all bugs to
101	.BR 3proxy@security.nnov.ru	97	.BR 3proxy@security.nnov.ru
102	.SH SEE ALSO	98	.SH SEE ALSO
Lines 111-120 Link Here
111	Vladimir Dubrovin	107	Vladimir Dubrovin
112	-.RI ( vlad@sandy.ru )	108	-.RI ( vlad@sandy.ru )
113	+.RI ( vlad@securityvulns.ru )	109	+.RI ( vlad@securityvulns.ru )
114	diff -urN man/pop3p.8 man-httppr/pop3p.8	110	--- man/pop3p.8.orig 2015-02-17 13:09:13 UTC
115	--- man/pop3p.8 2015-02-17 16:09:13.000000000 +0300	111	+++ man/pop3p.8
116	+++ man-httppr/pop3p.8 2015-06-14 15:20:29.000000000 +0300	112	@@ -71,11 +71,11 @@ we know which server to connect.
117	@@ -71,11 +71,11 @@
118	Report all bugs to	113	Report all bugs to
119	.BR 3proxy@security.nnov.ru	114	.BR 3proxy@security.nnov.ru
120	.SH SEE ALSO	115	.SH SEE ALSO
Lines 129-137 Link Here
129	Vladimir Dubrovin	124	Vladimir Dubrovin
130	-.RI ( vlad@sandy.ru )	125	-.RI ( vlad@sandy.ru )
131	+.RI ( vlad@securityvulns.ru )	126	+.RI ( vlad@securityvulns.ru )
132	diff -urN man/proxy.8 man-httppr/proxy.8	127	--- man/proxy.8.orig 2015-02-17 13:09:13 UTC
133	--- man/proxy.8 2015-02-17 16:09:13.000000000 +0300	128	+++ man/proxy.8
134	+++ man-httppr/proxy.8 2015-06-14 15:17:24.000000000 +0300
135	@@ -1,15 +1,15 @@	129	@@ -1,15 +1,15 @@
136	-.TH proxy "8" "July 2009" "3proxy 0.7" "Universal proxy server"	130	-.TH proxy "8" "July 2009" "3proxy 0.7" "Universal proxy server"
137	+.TH httppr "8" "July 2009" "3proxy 0.7" "Universal proxy server"	131	+.TH httppr "8" "July 2009" "3proxy 0.7" "Universal proxy server"
Lines 152-158 Link Here
152	is HTTP gateway service with HTTPS and FTP over HTTPS support.	146	is HTTP gateway service with HTTPS and FTP over HTTPS support.
153	.SH OPTIONS	147	.SH OPTIONS
154	.TP	148	.TP
155	@@ -71,6 +71,6 @@	149	@@ -71,6 +71,6 @@ Report all bugs to
156	http://3proxy.ru/	150	http://3proxy.ru/
157	.SH AUTHORS	151	.SH AUTHORS
158	3proxy is designed by 3APA3A	152	3proxy is designed by 3APA3A
Lines 161-170 Link Here
161	Vladimir Dubrovin	155	Vladimir Dubrovin
162	-.RI ( vlad@sandy.ru )	156	-.RI ( vlad@sandy.ru )
163	+.RI ( vlad@securityvulns.ru )	157	+.RI ( vlad@securityvulns.ru )
164	diff -urN man/smtpp.8 man-httppr/smtpp.8	158	--- man/smtpp.8.orig 2015-02-17 13:09:13 UTC
165	--- man/smtpp.8 2015-02-17 16:09:13.000000000 +0300	159	+++ man/smtpp.8
166	+++ man-httppr/smtpp.8 2015-06-14 15:20:33.000000000 +0300	160	@@ -72,11 +72,11 @@ we know which server to connect.
167	@@ -72,11 +72,11 @@
168	Report all bugs to	161	Report all bugs to
169	.BR 3proxy@security.nnov.ru	162	.BR 3proxy@security.nnov.ru
170	.SH SEE ALSO	163	.SH SEE ALSO
Lines 179-188 Link Here
179	Vladimir Dubrovin	172	Vladimir Dubrovin
180	-.RI ( vlad@sandy.ru )	173	-.RI ( vlad@sandy.ru )
181	+.RI ( vlad@securityvulns.ru )	174	+.RI ( vlad@securityvulns.ru )
182	diff -urN man/socks.8 man-httppr/socks.8	175	--- man/socks.8.orig 2015-02-17 13:09:13 UTC
183	--- man/socks.8 2015-02-17 16:09:13.000000000 +0300	176	+++ man/socks.8
184	+++ man-httppr/socks.8 2015-06-14 15:20:38.000000000 +0300	177	@@ -67,11 +67,11 @@ instead.
185	@@ -67,11 +67,11 @@
186	Report all bugs to	178	Report all bugs to
187	.BR 3proxy@security.nnov.ru	179	.BR 3proxy@security.nnov.ru
188	.SH SEE ALSO	180	.SH SEE ALSO
Lines 197-206 Link Here
197	Vladimir Dubrovin	189	Vladimir Dubrovin
198	-.RI ( vlad@sandy.ru )	190	-.RI ( vlad@sandy.ru )
199	+.RI ( vlad@securityvulns.ru )	191	+.RI ( vlad@securityvulns.ru )
200	diff -urN man/tcppm.8 man-httppr/tcppm.8	192	--- man/tcppm.8.orig 2015-02-17 13:09:13 UTC
201	--- man/tcppm.8 2015-02-17 16:09:13.000000000 +0300	193	+++ man/tcppm.8
202	+++ man-httppr/tcppm.8 2015-06-14 15:20:47.000000000 +0300	194	@@ -61,11 +61,11 @@ as a destination in client application.
203	@@ -61,11 +61,11 @@
204	Report all bugs to	195	Report all bugs to
205	.BR 3proxy@security.nnov.ru	196	.BR 3proxy@security.nnov.ru
206	.SH SEE ALSO	197	.SH SEE ALSO
Lines 215-224 Link Here
215	Vladimir Dubrovin	206	Vladimir Dubrovin
216	-.RI ( vlad@sandy.ru )	207	-.RI ( vlad@sandy.ru )
217	+.RI ( vlad@securityvulns.ru )	208	+.RI ( vlad@securityvulns.ru )
218	diff -urN man/udppm.8 man-httppr/udppm.8	209	--- man/udppm.8.orig 2015-02-17 13:09:13 UTC
219	--- man/udppm.8 2015-02-17 16:09:13.000000000 +0300	210	+++ man/udppm.8
220	+++ man-httppr/udppm.8 2015-06-14 15:20:57.000000000 +0300	211	@@ -67,11 +67,11 @@ as a destination in client application.
221	@@ -67,11 +67,11 @@
222	Report all bugs to	212	Report all bugs to
223	.BR 3proxy@security.nnov.ru	213	.BR 3proxy@security.nnov.ru
224	.SH SEE ALSO	214	.SH SEE ALSO

Line 0 Link Here

(-)3proxy/files/patch-src_proxy.c (+20 lines)
	1	--- src/proxy.c.orig 2015-09-01 18:49:36 UTC
	2	+++ src/proxy.c
	3	@@ -119,7 +119,7 @@ char * proxy_stringtable[] = {
	4	"<body><h2>503 Service Unavailable</h2><h3>Your request violates configured policy</h3></body></html>\r\n",
	5
	6	/* 16*/ "HTTP/1.0 401 Authentication Required\r\n"
	7	- "Proxy-Authenticate: basic realm=\"FTP Server\"\r\n"
	8	+ "WWW-Authenticate: basic realm=\"FTP Server\"\r\n"
	9	"Proxy-Connection: close\r\n"
	10	"Content-type: text/html; charset=us-ascii\r\n"
	11	"\r\n"
	12	@@ -464,7 +464,7 @@ for(;;){
	13	}
	14	if(se)*se = '\r';
	15	}
	16	- if(ftp && i > 19 && (!strncasecmp((char *)(buf+inbuf), "authorization", 19))){
	17	+ if(ftp && i > 13 && (!strncasecmp((char *)(buf+inbuf), "authorization", 13))){
	18	sb = (unsigned char )strchr((char )(buf+inbuf), ':');
	19	if(!sb)continue;
	20	++sb;