Attachment #165857 for bug #206423

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

Lines 2-8 Link Here

(-)3proxy/Makefile (-2 / +2 lines)
2	# $FreeBSD: head/net/3proxy/Makefile 399259 2015-10-14 12:55:09Z koobs $	2	# $FreeBSD: head/net/3proxy/Makefile 399259 2015-10-14 12:55:09Z koobs $
3		3
4	PORTNAME= 3proxy	4	PORTNAME= 3proxy
5	PORTVERSION= 0.7.1.3	5	PORTVERSION= 0.8.0
6	DISTVERSIONPREFIX= ${PORTNAME}-	6	DISTVERSIONPREFIX= ${PORTNAME}-
7	CATEGORIES= net	7	CATEGORIES= net
8		8
Lines 31-37 Link Here
31		31
32	do-install:	32	do-install:
33	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ ${STAGEDIR}${DOCSDIR}/	33	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ ${STAGEDIR}${DOCSDIR}/
34	cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy countersutil dighosts ftppr icqpr msnpr mycrypt pop3p httppr smtpp socks tcppm udppm ${STAGEDIR}${PREFIX}/bin/	34	cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy dighosts ftppr icqpr mycrypt pop3p httppr smtpp socks tcppm udppm ${STAGEDIR}${PREFIX}/bin/
35	cd ${WRKSRC}/cfg/ && ${INSTALL_DATA} 3proxy.cfg.sample ${STAGEDIR}${PREFIX}/etc/	35	cd ${WRKSRC}/cfg/ && ${INSTALL_DATA} 3proxy.cfg.sample ${STAGEDIR}${PREFIX}/etc/
36	cd ${WRKSRC}/src/ && ${INSTALL_LIB} PCREPlugin.so StringsPlugin.so TrafficPlugin.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/	36	cd ${WRKSRC}/src/ && ${INSTALL_LIB} PCREPlugin.so StringsPlugin.so TrafficPlugin.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
37	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.cfg.3 ${STAGEDIR}${PREFIX}/man/man3/	37	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.cfg.3 ${STAGEDIR}${PREFIX}/man/man3/

Lines 1-2 Link Here

(-)3proxy/distinfo (-2 / +2 lines)
1	SHA256 (z3APA3A-3proxy-3proxy-0.7.1.3_GH0.tar.gz) = 4d1f3cf539c8a32f5845b54e8a3fdbabef6fe8a6bbb06dfc80f7361804f6cb60	1	SHA256 (z3APA3A-3proxy-3proxy-0.8.0_GH0.tar.gz) = 16a8dabe117142e5707367885d40ec3fe6edcf608e3602bee594158182aae522
2	SIZE (z3APA3A-3proxy-3proxy-0.7.1.3_GH0.tar.gz) = 468638	2	SIZE (z3APA3A-3proxy-3proxy-0.8.0_GH0.tar.gz) = 483764




--- Makefile.unix.orig	2016-01-19 22:20:05 UTC
+++ Makefile.unix
@@ -8,18 +8,18 @@
 # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
 
 BUILDDIR =

+CC ?= gcc
 
 # you may need -L/usr/pkg/lib for older NetBSD versions
-CFLAGS = -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
+CFLAGS = -c %%CFLAGS%% -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
 COUT = -o 
-LN = gcc
-LDFLAGS = -O2 -pthread
+LN ?= ${CC}
+LDFLAGS = -pthread
 # -lpthreads may be reuqired on some platforms instead of -pthreads
 # -ldl or -lld may be required for some platforms
 DCFLAGS = -fpic

Lines 1-4 Link Here

(-)3proxy/files/patch-cfg-3proxy.cfg.sample (-1 / +1 lines)
1	--- cfg/3proxy.cfg.sample.orig 2015-02-17 13:09:13 UTC	1	--- cfg/3proxy.cfg.sample.orig 2016-01-19 22:20:05 UTC
2	+++ cfg/3proxy.cfg.sample	2	+++ cfg/3proxy.cfg.sample
3	@@ -30,15 +30,15 @@ users 3APA3A:CL:3apa3a "test:CR:$1$qwer$	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




--- man/3proxy.8.orig	2016-01-19 22:20:05 UTC
+++ man/3proxy.8
@@ -26,7 +26,7 @@ It can establish multiple
 gateways with HTTP and HTTPS proxy with FTP over HTTP support, SOCKS v4,

 configuration file
 .SH BUGS
 Report all bugs to
 .BR 3proxy@3proxy.ru
+.BR 3proxy@3proxy.ru
 .SH SEE ALSO
-3proxy.cfg(3), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
+3proxy.cfg(3), httppr(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
 kill(1), syslogd(8),
 .br
 http://3proxy.ru/
--- man/3proxy.cfg.3.orig	2016-01-19 22:20:05 UTC
 3APA3A is pronounced as \`\`zaraza\'\'.
 .SH AUTHORS
 3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 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
@@ -153,7 +153,7 @@ listen on given local HOST:port for inco
 connect to given remote HOST:port instead of listening local connection on -p or default port. Can be used with another 3proxy service running -R option for connect back functionality. Most commonly used with proxy or socks. HOST can be given as IP or hostname, useful in case of dynamic DNS.
 .br
  Also, all options mentioned for 
-.BR proxy (8)

 .BR socks (8)
 .BR pop3p (8)
 .BR tcppm (8)
@@ -927,7 +927,7 @@ corruption and/or Content-Length chaging
 Report all bugs to
 .BR 3proxy@3proxy.ru
 .SH SEE ALSO
-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
 .br
 http://3proxy.ru/
 .SH TRIVIA
--- man/ftppr.8.orig	2016-01-19 22:20:05 UTC
 .SH AUTHORS
 3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 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,7 +75,7 @@ Only cleartext authentication is current
 Report all bugs to
 .BR 3proxy@3proxy.ru
 .SH SEE ALSO
-3proxy(8), proxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
+3proxy(8), httppr(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
 .br
 http://3proxy.ru/
 .SH AUTHORS
--- man/icqpr.8.orig	2016-01-19 22:20:05 UTC
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 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,7 +68,7 @@ as a destination in client application. 
 Report all bugs to
 .BR 3proxy@3proxy.ru
 .SH SEE ALSO
-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
 .br
 http://3proxy.ru/
 .SH AUTHORS
--- man/pop3p.8.orig	2016-01-19 22:20:05 UTC
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 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,7 +71,7 @@ we know which server to connect.
 Report all bugs to
 .BR 3proxy@3proxy.ru
 .SH SEE ALSO
-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
+3proxy(8), ftppr(8), httppr(8), socks(8), tcppm(8), udppm(8), syslogd(8),
 .br
 http://3proxy.ru/
 .SH AUTHORS
--- man/proxy.8.orig	2016-01-19 22:20:05 UTC
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
--- man/proxy.8.orig	2015-02-17 13:09:13 UTC
+++ man/proxy.8
@@ -1,15 +1,15 @@
-.TH proxy "8" "January 2016" "3proxy 0.8" "Universal proxy server"
+.TH httppr "8" "July 2009" "3proxy 0.7" "Universal proxy server"
 .SH NAME
-.B proxy

 is HTTP gateway service with HTTPS and FTP over HTTPS support.
 .SH OPTIONS
 .TP
--- man/smtpp.8.orig	2016-01-19 22:20:05 UTC
 http://3proxy.ru/
 .SH AUTHORS
 3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 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,7 +72,7 @@ we know which server to connect.
 Report all bugs to
 .BR 3proxy@3proxy.ru
 .SH SEE ALSO
-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
+3proxy(8), ftppr(8), httppr(8), socks(8), tcppm(8), udppm(8), syslogd(8),
 .br
 http://3proxy.ru/
 .SH AUTHORS
--- man/socks.8.orig	2016-01-19 22:20:05 UTC
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 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,7 +67,7 @@ instead.
 Report all bugs to
 .BR 3proxy@3proxy.ru
 .SH SEE ALSO
-3proxy(8), proxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
+3proxy(8), httppr(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
 .br
 http://3proxy.ru/
 .SH AUTHORS
--- man/tcppm.8.orig	2016-01-19 22:20:05 UTC
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 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,7 +61,7 @@ as a destination in client application. 
 Report all bugs to
 .BR 3proxy@3proxy.ru
 .SH SEE ALSO
-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
 .br
 http://3proxy.ru/
 .SH AUTHORS
--- man/udppm.8.orig	2016-01-19 22:20:05 UTC
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 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,7 +67,7 @@ as a destination in client application. 
 Report all bugs to
 .BR 3proxy@3proxy.ru
 .SH SEE ALSO
-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
 .br
 http://3proxy.ru/
 .SH AUTHORS
 3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )

Lines 1-9 Link Here

(-)3proxy/pkg-plist (-2 lines)
1	bin/3proxy	1	bin/3proxy
2	bin/countersutil
3	bin/dighosts	2	bin/dighosts
4	bin/ftppr	3	bin/ftppr
5	bin/icqpr	4	bin/icqpr
6	bin/msnpr
7	bin/mycrypt	5	bin/mycrypt
8	bin/pop3p	6	bin/pop3p
9	bin/httppr	7	bin/httppr

Return to bug 206423

Lines 1-6 Link Here

(-)3proxy/files/patch-Makefile.unix (-6 / +6 lines)
1	--- Makefile.unix.orig 2015-02-17 13:09:13 UTC	1	--- Makefile.unix.orig 2016-01-19 22:20:05 UTC
2	+++ Makefile.unix	2	+++ Makefile.unix
3	@@ -9,18 +9,18 @@	3	@@ -8,18 +8,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
6	BUILDDIR =	6	BUILDDIR =
Lines 8-20 Link Here
8	+CC ?= gcc	8	+CC ?= gcc
9		9
10	# you may need -L/usr/pkg/lib for older NetBSD versions	10	# you may need -L/usr/pkg/lib for older NetBSD versions
11	-CFLAGS = -Wall -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL	11	-CFLAGS = -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
12	+CFLAGS = -Wall -c %%CFLAGS%% -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL	12	+CFLAGS = -c %%CFLAGS%% -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
13	COUT = -o	13	COUT = -o
14	-LN = gcc	14	-LN = gcc
15	-LDFLAGS = -Wall -O2 -pthread	15	-LDFLAGS = -O2 -pthread
16	+LN ?= ${CC}	16	+LN ?= ${CC}
17	+LDFLAGS = -Wall -lpthread	17	+LDFLAGS = -pthread
18	# -lpthreads may be reuqired on some platforms instead of -pthreads	18	# -lpthreads may be reuqired on some platforms instead of -pthreads
19	# -ldl or -lld may be required for some platforms	19	# -ldl or -lld may be required for some platforms
20	DCFLAGS = -fpic	20	DCFLAGS = -fpic

Lines 1-4 Link Here

(-)3proxy/files/patch-man (-100 / +31 lines)
1	--- man/3proxy.8.orig 2015-02-17 13:09:13 UTC	1	--- man/3proxy.8.orig 2016-01-19 22:20:05 UTC
2	+++ man/3proxy.8	2	+++ man/3proxy.8
3	@@ -26,7 +26,7 @@ It can establish multiple	3	@@ -26,7 +26,7 @@ It can establish multiple
4	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,
Lines 28-54 Link Here
28	configuration file	28	configuration file
29	.SH BUGS	29	.SH BUGS
30	Report all bugs to	30	Report all bugs to
31	-.BR 3proxy@security.nnov.ru	31	.BR 3proxy@3proxy.ru
32	+.BR 3proxy@3proxy.ru
33	.SH SEE ALSO	32	.SH SEE ALSO
34	-3proxy.cfg(3), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),	33	-3proxy.cfg(3), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
35	+3proxy.cfg(3), httppr(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),	34	+3proxy.cfg(3), httppr(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
36	kill(1), syslogd(8),	35	kill(1), syslogd(8),
37	.br	36	.br
38	http://3proxy.ru/	37	http://3proxy.ru/
39	@@ -148,6 +148,6 @@ http://3proxy.ru/	38	--- man/3proxy.cfg.3.orig 2016-01-19 22:20:05 UTC
40	3APA3A is pronounced as \`\`zaraza\'\'.
41	.SH AUTHORS
42	3proxy is designed by 3APA3A
43	-.RI ( 3APA3A@security.nnov.ru ),
44	+.RI ( 3APA3A@3proxy.ru ),
45	Vladimir Dubrovin
46	-.RI ( vlad@sandy.ru )
47	+.RI ( vlad@securityvulns.ru )
48	--- man/3proxy.cfg.3.orig 2015-02-17 13:09:13 UTC
49	+++ man/3proxy.cfg.3	39	+++ man/3proxy.cfg.3
50	@@ -114,7 +114,7 @@ view without ability to reset).	40	@@ -153,7 +153,7 @@ listen on given local HOST:port for inco
51	(for proxy) - anonymous proxy (random client information reported)	41	connect to given remote HOST:port instead of listening local connection on -p or default port. Can be used with another 3proxy service running -R option for connect back functionality. Most commonly used with proxy or socks. HOST can be given as IP or hostname, useful in case of dynamic DNS.
52	.br	42	.br
53	Also, all options mentioned for	43	Also, all options mentioned for
54	-.BR proxy (8)	44	-.BR proxy (8)
Lines 56-133 Link Here
56	.BR socks (8)	46	.BR socks (8)
57	.BR pop3p (8)	47	.BR pop3p (8)
58	.BR tcppm (8)	48	.BR tcppm (8)
59	@@ -884,13 +884,13 @@ corruption and/or Content-Length chaging	49	@@ -927,7 +927,7 @@ corruption and/or Content-Length chaging
60		50	Report all bugs to
61		51	.BR 3proxy@3proxy.ru
62	.SH SEE ALSO	52	.SH SEE ALSO
63	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),	53	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
64	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),	54	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
65	.br	55	.br
66	http://3proxy.ru/	56	http://3proxy.ru/
67	.SH TRIVIA	57	.SH TRIVIA
68	3APA3A is pronounced as \`\`zaraza\'\'.	58	--- man/ftppr.8.orig 2016-01-19 22:20:05 UTC
69	.SH AUTHORS
70	3proxy is designed by 3APA3A
71	-.RI ( 3APA3A@security.nnov.ru ),
72	+.RI ( 3APA3A@3proxy.ru ),
73	Vladimir Dubrovin
74	-.RI ( vlad@sandy.ru )
75	+.RI ( vlad@securityvulns.ru )
76	--- man/ftppr.8.orig 2015-02-17 13:09:13 UTC
77	+++ man/ftppr.8	59	+++ man/ftppr.8
78	@@ -75,11 +75,11 @@ Only cleartext authentication is current	60	@@ -75,7 +75,7 @@ Only cleartext authentication is current
79	Report all bugs to	61	Report all bugs to
80	.BR 3proxy@security.nnov.ru	62	.BR 3proxy@3proxy.ru
81	.SH SEE ALSO	63	.SH SEE ALSO
82	-3proxy(8), proxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),	64	-3proxy(8), proxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
83	+3proxy(8), httppr(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),	65	+3proxy(8), httppr(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
84	.br	66	.br
85	http://3proxy.ru/	67	http://3proxy.ru/
86	.SH AUTHORS	68	.SH AUTHORS
87	3proxy is designed by 3APA3A	69	--- man/icqpr.8.orig 2016-01-19 22:20:05 UTC
88	-.RI ( 3APA3A@security.nnov.ru ),
89	+.RI ( 3APA3A@3proxy.ru ),
90	Vladimir Dubrovin
91	-.RI ( vlad@sandy.ru )
92	+.RI ( vlad@securityvulns.ru )
93	--- man/icqpr.8.orig 2015-02-17 13:09:13 UTC
94	+++ man/icqpr.8	70	+++ man/icqpr.8
95	@@ -68,11 +68,11 @@ as a destination in client application.	71	@@ -68,7 +68,7 @@ as a destination in client application.
96	Report all bugs to	72	Report all bugs to
97	.BR 3proxy@security.nnov.ru	73	.BR 3proxy@3proxy.ru
98	.SH SEE ALSO	74	.SH SEE ALSO
99	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),	75	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
100	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),	76	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
101	.br	77	.br
102	http://3proxy.ru/	78	http://3proxy.ru/
103	.SH AUTHORS	79	.SH AUTHORS
104	3proxy is designed by 3APA3A	80	--- man/pop3p.8.orig 2016-01-19 22:20:05 UTC
105	-.RI ( 3APA3A@security.nnov.ru ),
106	+.RI ( 3APA3A@3proxy.ru ),
107	Vladimir Dubrovin
108	-.RI ( vlad@sandy.ru )
109	+.RI ( vlad@securityvulns.ru )
110	--- man/pop3p.8.orig 2015-02-17 13:09:13 UTC
111	+++ man/pop3p.8	81	+++ man/pop3p.8
112	@@ -71,11 +71,11 @@ we know which server to connect.	82	@@ -71,7 +71,7 @@ we know which server to connect.
113	Report all bugs to	83	Report all bugs to
114	.BR 3proxy@security.nnov.ru	84	.BR 3proxy@3proxy.ru
115	.SH SEE ALSO	85	.SH SEE ALSO
116	-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),	86	-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
117	+3proxy(8), ftppr(8), httppr(8), socks(8), tcppm(8), udppm(8), syslogd(8),	87	+3proxy(8), ftppr(8), httppr(8), socks(8), tcppm(8), udppm(8), syslogd(8),
118	.br	88	.br
119	http://3proxy.ru/	89	http://3proxy.ru/
120	.SH AUTHORS	90	.SH AUTHORS
121	3proxy is designed by 3APA3A	91	--- man/proxy.8.orig 2016-01-19 22:20:05 UTC
122	-.RI ( 3APA3A@security.nnov.ru ),
123	+.RI ( 3APA3A@3proxy.ru ),
124	Vladimir Dubrovin
125	-.RI ( vlad@sandy.ru )
126	+.RI ( vlad@securityvulns.ru )
127	--- man/proxy.8.orig 2015-02-17 13:09:13 UTC
128	+++ man/proxy.8	92	+++ man/proxy.8
129	@@ -1,15 +1,15 @@	93	@@ -1,15 +1,15 @@
130	-.TH proxy "8" "July 2009" "3proxy 0.7" "Universal proxy server"	94	-.TH proxy "8" "January 2016" "3proxy 0.8" "Universal proxy server"
131	+.TH httppr "8" "July 2009" "3proxy 0.7" "Universal proxy server"	95	+.TH httppr "8" "July 2009" "3proxy 0.7" "Universal proxy server"
132	.SH NAME	96	.SH NAME
133	-.B proxy	97	-.B proxy
Lines 146-225 Link Here
146	is HTTP gateway service with HTTPS and FTP over HTTPS support.	110	is HTTP gateway service with HTTPS and FTP over HTTPS support.
147	.SH OPTIONS	111	.SH OPTIONS
148	.TP	112	.TP
149	@@ -71,6 +71,6 @@ Report all bugs to	113	--- man/smtpp.8.orig 2016-01-19 22:20:05 UTC
150	http://3proxy.ru/
151	.SH AUTHORS
152	3proxy is designed by 3APA3A
153	-.RI ( 3APA3A@security.nnov.ru ),
154	+.RI ( 3APA3A@3proxy.ru ),
155	Vladimir Dubrovin
156	-.RI ( vlad@sandy.ru )
157	+.RI ( vlad@securityvulns.ru )
158	--- man/smtpp.8.orig 2015-02-17 13:09:13 UTC
159	+++ man/smtpp.8	114	+++ man/smtpp.8
160	@@ -72,11 +72,11 @@ we know which server to connect.	115	@@ -72,7 +72,7 @@ we know which server to connect.
161	Report all bugs to	116	Report all bugs to
162	.BR 3proxy@security.nnov.ru	117	.BR 3proxy@3proxy.ru
163	.SH SEE ALSO	118	.SH SEE ALSO
164	-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),	119	-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
165	+3proxy(8), ftppr(8), httppr(8), socks(8), tcppm(8), udppm(8), syslogd(8),	120	+3proxy(8), ftppr(8), httppr(8), socks(8), tcppm(8), udppm(8), syslogd(8),
166	.br	121	.br
167	http://3proxy.ru/	122	http://3proxy.ru/
168	.SH AUTHORS	123	.SH AUTHORS
169	3proxy is designed by 3APA3A	124	--- man/socks.8.orig 2016-01-19 22:20:05 UTC
170	-.RI ( 3APA3A@security.nnov.ru ),
171	+.RI ( 3APA3A@3proxy.ru ),
172	Vladimir Dubrovin
173	-.RI ( vlad@sandy.ru )
174	+.RI ( vlad@securityvulns.ru )
175	--- man/socks.8.orig 2015-02-17 13:09:13 UTC
176	+++ man/socks.8	125	+++ man/socks.8
177	@@ -67,11 +67,11 @@ instead.	126	@@ -67,7 +67,7 @@ instead.
178	Report all bugs to	127	Report all bugs to
179	.BR 3proxy@security.nnov.ru	128	.BR 3proxy@3proxy.ru
180	.SH SEE ALSO	129	.SH SEE ALSO
181	-3proxy(8), proxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),	130	-3proxy(8), proxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
182	+3proxy(8), httppr(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),	131	+3proxy(8), httppr(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
183	.br	132	.br
184	http://3proxy.ru/	133	http://3proxy.ru/
185	.SH AUTHORS	134	.SH AUTHORS
186	3proxy is designed by 3APA3A	135	--- man/tcppm.8.orig 2016-01-19 22:20:05 UTC
187	-.RI ( 3APA3A@security.nnov.ru ),
188	+.RI ( 3APA3A@3proxy.ru ),
189	Vladimir Dubrovin
190	-.RI ( vlad@sandy.ru )
191	+.RI ( vlad@securityvulns.ru )
192	--- man/tcppm.8.orig 2015-02-17 13:09:13 UTC
193	+++ man/tcppm.8	136	+++ man/tcppm.8
194	@@ -61,11 +61,11 @@ as a destination in client application.	137	@@ -61,7 +61,7 @@ as a destination in client application.
195	Report all bugs to	138	Report all bugs to
196	.BR 3proxy@security.nnov.ru	139	.BR 3proxy@3proxy.ru
197	.SH SEE ALSO	140	.SH SEE ALSO
198	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),	141	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
199	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),	142	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
200	.br	143	.br
201	http://3proxy.ru/	144	http://3proxy.ru/
202	.SH AUTHORS	145	.SH AUTHORS
203	3proxy is designed by 3APA3A	146	--- man/udppm.8.orig 2016-01-19 22:20:05 UTC
204	-.RI ( 3APA3A@security.nnov.ru ),
205	+.RI ( 3APA3A@3proxy.ru ),
206	Vladimir Dubrovin
207	-.RI ( vlad@sandy.ru )
208	+.RI ( vlad@securityvulns.ru )
209	--- man/udppm.8.orig 2015-02-17 13:09:13 UTC
210	+++ man/udppm.8	147	+++ man/udppm.8
211	@@ -67,11 +67,11 @@ as a destination in client application.	148	@@ -67,7 +67,7 @@ as a destination in client application.
212	Report all bugs to	149	Report all bugs to
213	.BR 3proxy@security.nnov.ru	150	.BR 3proxy@3proxy.ru
214	.SH SEE ALSO	151	.SH SEE ALSO
215	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),	152	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
216	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),	153	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
217	.br	154	.br
218	http://3proxy.ru/	155	http://3proxy.ru/
219	.SH AUTHORS	156	.SH AUTHORS
220	3proxy is designed by 3APA3A
221	-.RI ( 3APA3A@security.nnov.ru ),
222	+.RI ( 3APA3A@3proxy.ru ),
223	Vladimir Dubrovin
224	-.RI ( vlad@sandy.ru )
225	+.RI ( vlad@securityvulns.ru )