Attachment #157726 for bug #188374





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


post-patch:
	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/${MAKEFILE}

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/
	cd ${WRKSRC}/cfg/ && ${INSTALL_DATA} 3proxy.cfg.sample ${STAGEDIR}${PREFIX}/etc/
	cd ${WRKSRC}/src/ && ${INSTALL_LIB} PCREPlugin.so StringsPlugin.so TrafficPlugin.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.cfg.3 ${STAGEDIR}${PREFIX}/man/man3/
	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.8 ftppr.8 pop3p.8 httppr.8 socks.8 tcppm.8 udppm.8 ${STAGEDIR}${PREFIX}/man/man8/
	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/

.include <bsd.port.mk>




diff -urN man/3proxy.8 man-httppr/3proxy.8
--- man/3proxy.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/3proxy.8	2015-06-14 15:42:09.000000000 +0300
@@ -26,7 +26,7 @@
 It can establish multiple
 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 proxy (8)
+.BR httppr (8)
 .BR socks (8)
 .BR pop3p (8)
 .BR tcppm (8)
@@ -84,7 +84,7 @@
-.BR dnspr
-but
-.BR 3proxy
-is not a kind of wrapper or superserver for this daemons. It just has same
-code compiled in, but provides much more functionality. SOCKSv5
+from configuration file like independant service. SOCKSv5
 implementatation allows to use 3proxy with any UDP or TCP based client
 applications designed without
 proxy support (with
@@ -84,7 +73,7 @@
 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 @@
 wget to automate this task.
 .SH FILES
 .TP

+.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/
@@ -148,6 +148,6 @@
 3APA3A is pronounced as \`\`zaraza\'\'.
 .SH AUTHORS
 3proxy is designed by 3APA3A

 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
diff -urN man/3proxy.cfg.3 man-httppr/3proxy.cfg.3
--- man/3proxy.cfg.3	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/3proxy.cfg.3	2015-06-14 15:42:09.000000000 +0300
@@ -114,7 +114,7 @@
 .B -a1
 (for proxy) - anonymous proxy (random client information reported)
 .br
  Also, all options mentioned for 
-.BR proxy (8)
+.BR httppr (8)
 .BR socks (8)
 .BR pop3p (8)
 .BR tcppm (8)
@@ -884,13 +884,13 @@
- are also supported.
-.br
  Portmapping services listen at SRCPORT and connect to DSTADDR:DSTPORT
 HTTP and SOCKS proxies are standard. 
 .br
@@ -884,13 +875,13 @@
 
 
 .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

 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
diff -urN man/ftppr.8 man-httppr/ftppr.8
--- man/ftppr.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/ftppr.8	2015-06-14 15:43:15.000000000 +0300
@@ -73,13 +73,13 @@
 Only cleartext authentication is currently supported.
 .SH BUGS
 Report all bugs to
-.BR 3proxy@security.nnov.ru
+.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
 3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
diff -urN man/icqpr.8 man-httppr/icqpr.8
--- man/icqpr.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/icqpr.8	2015-06-14 15:43:39.000000000 +0300
@@ -66,13 +66,13 @@
 .IR remote_host : remote_port
 .SH BUGS
 Report all bugs to
-.BR 3proxy@security.nnov.ru
+.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 )
diff -urN man/pop3p.8 man-httppr/pop3p.8
--- man/pop3p.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/pop3p.8	2015-06-14 15:43:44.000000000 +0300
@@ -69,13 +69,13 @@
 we know which server to connect.
 .SH BUGS
 Report all bugs to
-.BR 3proxy@security.nnov.ru
+.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
 3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
diff -urN man/proxy.8 man-httppr/proxy.8
--- man/proxy.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/proxy.8	2015-06-14 15:43:48.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"
 .SH NAME
-.B proxy
+.B httppr
 \- HTTP proxy gateway service
 .SH SYNOPSIS
-.BR "proxy " [ -d ][ -a ]
+.BR "httppr " [ -d ][ -a ]
 .IB \fR[ -l \fR[ \fR[ @ \fR] logfile \fR]]
 .IB \fR[ -p port\fR]
 .IB \fR[ -i internal_ip\fR]
 .IB \fR[ -e external_ip\fR]
 .SH DESCRIPTION
-.B proxy
+.B httppr
 is HTTP gateway service with HTTPS and FTP over HTTPS support.
 .SH OPTIONS
 .TP
@@ -64,13 +64,13 @@
 instead.
 .SH BUGS
 Report all bugs to
-.BR 3proxy@security.nnov.ru
+.BR 3proxy@3proxy.ru
 .SH SEE ALSO
 3proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(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 )
diff -urN man/smtpp.8 man-httppr/smtpp.8
--- man/smtpp.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/smtpp.8	2015-06-14 15:43:52.000000000 +0300
@@ -70,13 +70,13 @@
 we know which server to connect.
 .SH BUGS
 Report all bugs to
-.BR 3proxy@security.nnov.ru
+.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
 3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
diff -urN man/socks.8 man-httppr/socks.8
--- man/socks.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/socks.8	2015-06-14 15:43:56.000000000 +0300
@@ -65,13 +65,13 @@
 instead.
 .SH BUGS
 Report all bugs to
-.BR 3proxy@security.nnov.ru
+.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
 3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
diff -urN man/tcppm.8 man-httppr/tcppm.8
--- man/tcppm.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/tcppm.8	2015-06-14 15:44:00.000000000 +0300
@@ -59,13 +59,13 @@
 .IR remote_host : remote_port
 .SH BUGS
 Report all bugs to
-.BR 3proxy@security.nnov.ru
+.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 )
diff -urN man/udppm.8 man-httppr/udppm.8
--- man/udppm.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/udppm.8	2015-06-14 15:44:05.000000000 +0300
@@ -65,13 +65,13 @@
 .IR remote_host : remote_port
 .SH BUGS
 Report all bugs to
-.BR 3proxy@security.nnov.ru
+.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 )




diff -urN man/3proxy.8 man-httppr/3proxy.8
--- man/3proxy.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/3proxy.8	2015-06-14 15:13:08.000000000 +0300
@@ -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 proxy (8)
+.BR httppr (8)
 .BR socks (8)
 .BR pop3p (8)
 .BR tcppm (8)
@@ -84,7 +84,7 @@
 configuration from stdin. It makes it possible to use 3proxy.cfg file as
 executable script just by setting +x mode and adding
 .br
-#!/usr/local/3proxy/3proxy
+#!/usr/local/bin/3proxy
 .br
 as a first line in 3proxy.cfg
 .TP
@@ -133,14 +133,14 @@
 wget to automate this task.
 .SH FILES
 .TP
-.I "/usr/local/3proxy/3proxy.cfg (3proxy.cfg)"
+.I "/usr/local/etc/3proxy.cfg (3proxy.cfg)"
 .BR 3proxy
 configuration file
 .SH BUGS
 Report all bugs to
-.BR 3proxy@security.nnov.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/
@@ -148,6 +148,6 @@
 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 )
diff -urN man/3proxy.cfg.3 man-httppr/3proxy.cfg.3
--- man/3proxy.cfg.3	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/3proxy.cfg.3	2015-06-14 15:15:00.000000000 +0300
@@ -114,7 +114,7 @@
 (for proxy) - anonymous proxy (random client information reported)
 .br
  Also, all options mentioned for 
-.BR proxy (8)
+.BR httppr (8)
 .BR socks (8)
 .BR pop3p (8)
 .BR tcppm (8)
@@ -884,13 +884,13 @@
 
 
 .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
 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 )
diff -urN man/ftppr.8 man-httppr/ftppr.8
--- man/ftppr.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/ftppr.8	2015-06-14 15:20:21.000000000 +0300
@@ -75,11 +75,11 @@
 Report all bugs to
 .BR 3proxy@security.nnov.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
 3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
diff -urN man/icqpr.8 man-httppr/icqpr.8
--- man/icqpr.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/icqpr.8	2015-06-14 15:20:25.000000000 +0300
@@ -68,11 +68,11 @@
 Report all bugs to
 .BR 3proxy@security.nnov.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 )
diff -urN man/pop3p.8 man-httppr/pop3p.8
--- man/pop3p.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/pop3p.8	2015-06-14 15:20:29.000000000 +0300
@@ -71,11 +71,11 @@
 Report all bugs to
 .BR 3proxy@security.nnov.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
 3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
diff -urN man/proxy.8 man-httppr/proxy.8
--- man/proxy.8	2015-02-17 16:09:13.000000000 +0300
+++ 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"
 .SH NAME
-.B proxy
+.B httppr
 \- HTTP proxy gateway service
 .SH SYNOPSIS
-.BR "proxy " [ -d ][ -a ]
+.BR "httppr " [ -d ][ -a ]
 .IB \fR[ -l \fR[ \fR[ @ \fR] logfile \fR]]
 .IB \fR[ -p port\fR]
 .IB \fR[ -i internal_ip\fR]
 .IB \fR[ -e external_ip\fR]
 .SH DESCRIPTION
-.B proxy
+.B httppr
 is HTTP gateway service with HTTPS and FTP over HTTPS support.
 .SH OPTIONS
 .TP
@@ -71,6 +71,6 @@
 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 )
diff -urN man/smtpp.8 man-httppr/smtpp.8
--- man/smtpp.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/smtpp.8	2015-06-14 15:20:33.000000000 +0300
@@ -72,11 +72,11 @@
 Report all bugs to
 .BR 3proxy@security.nnov.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
 3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
diff -urN man/socks.8 man-httppr/socks.8
--- man/socks.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/socks.8	2015-06-14 15:20:38.000000000 +0300
@@ -67,11 +67,11 @@
 Report all bugs to
 .BR 3proxy@security.nnov.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
 3proxy is designed by 3APA3A
-.RI ( 3APA3A@security.nnov.ru ),
+.RI ( 3APA3A@3proxy.ru ),
 Vladimir Dubrovin
-.RI ( vlad@sandy.ru )
+.RI ( vlad@securityvulns.ru )
diff -urN man/tcppm.8 man-httppr/tcppm.8
--- man/tcppm.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/tcppm.8	2015-06-14 15:20:47.000000000 +0300
@@ -61,11 +61,11 @@
 Report all bugs to
 .BR 3proxy@security.nnov.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 )
diff -urN man/udppm.8 man-httppr/udppm.8
--- man/udppm.8	2015-02-17 16:09:13.000000000 +0300
+++ man-httppr/udppm.8	2015-06-14 15:20:57.000000000 +0300
@@ -67,11 +67,11 @@
 Report all bugs to
 .BR 3proxy@security.nnov.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-10 Link Here

(-)3proxy_mv/pkg-plist (+15 lines)
1	bin/3proxy	1	bin/3proxy
2	bin/countersutil	2	bin/countersutil
3	bin/dighosts	3	bin/dighosts
		4	bin/ftppr
		5	bin/icqpr
		6	bin/msnpr
4	bin/mycrypt	7	bin/mycrypt
		8	bin/pop3p
		9	bin/httppr
		10	bin/smtpp
		11	bin/socks
		12	bin/tcppm
		13	bin/udppm
5	@sample etc/3proxy.cfg.sample	14	@sample etc/3proxy.cfg.sample
6	lib/3proxy/PCREPlugin.so	15	lib/3proxy/PCREPlugin.so
7	lib/3proxy/StringsPlugin.so	16	lib/3proxy/StringsPlugin.so
8	lib/3proxy/TrafficPlugin.so	17	lib/3proxy/TrafficPlugin.so
9	man/man3/3proxy.cfg.3.gz	18	man/man3/3proxy.cfg.3.gz
10	man/man8/3proxy.8.gz	19	man/man8/3proxy.8.gz
		20	man/man8/ftppr.8.gz
		21	man/man8/pop3p.8.gz
		22	man/man8/httppr.8.gz
		23	man/man8/socks.8.gz
		24	man/man8/tcppm.8.gz
		25	man/man8/udppm.8.gz

Return to bug 188374

Lines 3-8 Link Here

(-)3proxy_mv/Makefile (-2 / +7 lines)
3		3
4	PORTNAME= 3proxy	4	PORTNAME= 3proxy
5	PORTVERSION= 0.7.1.2	5	PORTVERSION= 0.7.1.2
		6	PORTREVISION= 1
6	DISTVERSIONPREFIX= v	7	DISTVERSIONPREFIX= v
7	CATEGORIES= net	8	CATEGORIES= net
8		9
Lines 25-37 Link Here
25	post-patch:	26	post-patch:
26	@${REINPLACE_CMD} -e 's\|%%CFLAGS%%\|${CFLAGS}\|' ${WRKSRC}/${MAKEFILE}	27	@${REINPLACE_CMD} -e 's\|%%CFLAGS%%\|${CFLAGS}\|' ${WRKSRC}/${MAKEFILE}
27		28
		29	post-build:
		30	${MV} ${WRKSRC}/src/proxy ${WRKSRC}/src/httppr
		31	${MV} ${WRKSRC}/man/proxy.8 ${WRKSRC}/man/httppr.8
		32
28	do-install:	33	do-install:
29	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ ${STAGEDIR}${DOCSDIR}/	34	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ ${STAGEDIR}${DOCSDIR}/
30	cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy countersutil dighosts mycrypt ${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/
31	cd ${WRKSRC}/cfg/ && ${INSTALL_DATA} 3proxy.cfg.sample ${STAGEDIR}${PREFIX}/etc/	36	cd ${WRKSRC}/cfg/ && ${INSTALL_DATA} 3proxy.cfg.sample ${STAGEDIR}${PREFIX}/etc/
32	cd ${WRKSRC}/src/ && ${INSTALL_LIB} PCREPlugin.so StringsPlugin.so TrafficPlugin.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/	37	cd ${WRKSRC}/src/ && ${INSTALL_LIB} PCREPlugin.so StringsPlugin.so TrafficPlugin.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
33	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.cfg.3 ${STAGEDIR}${PREFIX}/man/man3/	38	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.cfg.3 ${STAGEDIR}${PREFIX}/man/man3/
34	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.8 ${STAGEDIR}${PREFIX}/man/man8/	39	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.8 ftppr.8 pop3p.8 httppr.8 socks.8 tcppm.8 udppm.8 ${STAGEDIR}${PREFIX}/man/man8/
35	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/	40	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
36		41
37	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Lines 1-27 Link Here

(-)3proxy_mv/files/patch-man (-40 / +209 lines)
1	diff -urN man/3proxy.8 man-bin/3proxy.8	1	diff -urN man/3proxy.8 man-httppr/3proxy.8
2	--- man/3proxy.8 2015-02-17 16:09:13.000000000 +0300	2	--- man/3proxy.8 2015-02-17 16:09:13.000000000 +0300
3	+++ man-bin/3proxy.8 2015-05-28 11:58:00.543952000 +0300	3	+++ man-httppr/3proxy.8 2015-06-14 15:42:09.000000000 +0300
4	@@ -25,18 +25,7 @@	4	@@ -26,7 +26,7 @@
5	It can establish multiple
6	gateways with HTTP and HTTPS proxy with FTP over HTTP support, SOCKS v4,	5	gateways with HTTP and HTTPS proxy with FTP over HTTP support, SOCKS v4,
7	v4.5 and v5, POP3 proxy, UDP and TCP portmappers. Each gateway is started	6	v4.5 and v5, POP3 proxy, UDP and TCP portmappers. Each gateway is started
8	-from configuration file like independant service	7	from configuration file like independant service
9	-.BR proxy (8)	8	-.BR proxy (8)
10	-.BR socks (8)	9	+.BR httppr (8)
11	-.BR pop3p (8)	10	.BR socks (8)
12	-.BR tcppm (8)	11	.BR pop3p (8)
13	-.BR udppm (8)	12	.BR tcppm (8)
14	-.BR ftppr (8)	13	@@ -84,7 +84,7 @@
15	-.BR dnspr
16	-but
17	-.BR 3proxy
18	-is not a kind of wrapper or superserver for this daemons. It just has same
19	-code compiled in, but provides much more functionality. SOCKSv5
20	+from configuration file like independant service. SOCKSv5
21	implementatation allows to use 3proxy with any UDP or TCP based client
22	applications designed without
23	proxy support (with
24	@@ -84,7 +73,7 @@
25	configuration from stdin. It makes it possible to use 3proxy.cfg file as	14	configuration from stdin. It makes it possible to use 3proxy.cfg file as
26	executable script just by setting +x mode and adding	15	executable script just by setting +x mode and adding
27	.br	16	.br
Lines 30-36 Link Here
30	.br	19	.br
31	as a first line in 3proxy.cfg	20	as a first line in 3proxy.cfg
32	.TP	21	.TP
33	@@ -133,14 +122,14 @@	22	@@ -133,14 +133,14 @@
34	wget to automate this task.	23	wget to automate this task.
35	.SH FILES	24	.SH FILES
36	.TP	25	.TP
Lines 44-54 Link Here
44	+.BR 3proxy@3proxy.ru	33	+.BR 3proxy@3proxy.ru
45	.SH SEE ALSO	34	.SH SEE ALSO
46	-3proxy.cfg(3), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),	35	-3proxy.cfg(3), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
47	+3proxy.cfg(3),	36	+3proxy.cfg(3), httppr(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
48	kill(1), syslogd(8),	37	kill(1), syslogd(8),
49	.br	38	.br
50	http://3proxy.ru/	39	http://3proxy.ru/
51	@@ -148,6 +137,6 @@	40	@@ -148,6 +148,6 @@
52	3APA3A is pronounced as \`\`zaraza\'\'.	41	3APA3A is pronounced as \`\`zaraza\'\'.
53	.SH AUTHORS	42	.SH AUTHORS
54	3proxy is designed by 3APA3A	43	3proxy is designed by 3APA3A
Lines 57-87 Link Here
57	Vladimir Dubrovin	46	Vladimir Dubrovin
58	-.RI ( vlad@sandy.ru )	47	-.RI ( vlad@sandy.ru )
59	+.RI ( vlad@securityvulns.ru )	48	+.RI ( vlad@securityvulns.ru )
60	diff -urN man/3proxy.cfg.3 man-bin/3proxy.cfg.3	49	diff -urN man/3proxy.cfg.3 man-httppr/3proxy.cfg.3
61	--- man/3proxy.cfg.3 2015-02-17 16:09:13.000000000 +0300	50	--- man/3proxy.cfg.3 2015-02-17 16:09:13.000000000 +0300
62	+++ man-bin/3proxy.cfg.3 2015-05-28 11:55:28.565596000 +0300	51	+++ man-httppr/3proxy.cfg.3 2015-06-14 15:42:09.000000000 +0300
63	@@ -113,15 +113,6 @@	52	@@ -114,7 +114,7 @@
64	.B -a1
65	(for proxy) - anonymous proxy (random client information reported)	53	(for proxy) - anonymous proxy (random client information reported)
66	.br	54	.br
67	- Also, all options mentioned for	55	Also, all options mentioned for
68	-.BR proxy (8)	56	-.BR proxy (8)
69	-.BR socks (8)	57	+.BR httppr (8)
70	-.BR pop3p (8)	58	.BR socks (8)
71	-.BR tcppm (8)	59	.BR pop3p (8)
72	-.BR udppm (8)	60	.BR tcppm (8)
73	-.BR ftppr (8)	61	@@ -884,13 +884,13 @@
74	- are also supported.
75	-.br
76	Portmapping services listen at SRCPORT and connect to DSTADDR:DSTPORT
77	HTTP and SOCKS proxies are standard.
78	.br
79	@@ -884,13 +875,13 @@
80		62
81		63
82	.SH SEE ALSO	64	.SH SEE ALSO
83	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),	65	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
84	+3proxy(8), syslogd(8),	66	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
85	.br	67	.br
86	http://3proxy.ru/	68	http://3proxy.ru/
87	.SH TRIVIA	69	.SH TRIVIA
Lines 93-95 Link Here
93	Vladimir Dubrovin	75	Vladimir Dubrovin
94	-.RI ( vlad@sandy.ru )	76	-.RI ( vlad@sandy.ru )
95	+.RI ( vlad@securityvulns.ru )	77	+.RI ( vlad@securityvulns.ru )
		78	diff -urN man/ftppr.8 man-httppr/ftppr.8
		79	--- man/ftppr.8 2015-02-17 16:09:13.000000000 +0300
		80	+++ man-httppr/ftppr.8 2015-06-14 15:43:15.000000000 +0300
		81	@@ -73,13 +73,13 @@
		82	Only cleartext authentication is currently supported.
		83	.SH BUGS
		84	Report all bugs to
		85	-.BR 3proxy@security.nnov.ru
		86	+.BR 3proxy@3proxy.ru
		87	.SH SEE ALSO
		88	-3proxy(8), proxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
		89	+3proxy(8), httppr(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
		90	.br
		91	http://3proxy.ru/
		92	.SH AUTHORS
		93	3proxy is designed by 3APA3A
		94	-.RI ( 3APA3A@security.nnov.ru ),
		95	+.RI ( 3APA3A@3proxy.ru ),
		96	Vladimir Dubrovin
		97	-.RI ( vlad@sandy.ru )
		98	+.RI ( vlad@securityvulns.ru )
		99	diff -urN man/icqpr.8 man-httppr/icqpr.8
		100	--- man/icqpr.8 2015-02-17 16:09:13.000000000 +0300
		101	+++ man-httppr/icqpr.8 2015-06-14 15:43:39.000000000 +0300
		102	@@ -66,13 +66,13 @@
		103	.IR remote_host : remote_port
		104	.SH BUGS
		105	Report all bugs to
		106	-.BR 3proxy@security.nnov.ru
		107	+.BR 3proxy@3proxy.ru
		108	.SH SEE ALSO
		109	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
		110	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
		111	.br
		112	http://3proxy.ru/
		113	.SH AUTHORS
		114	3proxy is designed by 3APA3A
		115	-.RI ( 3APA3A@security.nnov.ru ),
		116	+.RI ( 3APA3A@3proxy.ru ),
		117	Vladimir Dubrovin
		118	-.RI ( vlad@sandy.ru )
		119	+.RI ( vlad@securityvulns.ru )
		120	diff -urN man/pop3p.8 man-httppr/pop3p.8
		121	--- man/pop3p.8 2015-02-17 16:09:13.000000000 +0300
		122	+++ man-httppr/pop3p.8 2015-06-14 15:43:44.000000000 +0300
		123	@@ -69,13 +69,13 @@
		124	we know which server to connect.
		125	.SH BUGS
		126	Report all bugs to
		127	-.BR 3proxy@security.nnov.ru
		128	+.BR 3proxy@3proxy.ru
		129	.SH SEE ALSO
		130	-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
		131	+3proxy(8), ftppr(8), httppr(8), socks(8), tcppm(8), udppm(8), syslogd(8),
		132	.br
		133	http://3proxy.ru/
		134	.SH AUTHORS
		135	3proxy is designed by 3APA3A
		136	-.RI ( 3APA3A@security.nnov.ru ),
		137	+.RI ( 3APA3A@3proxy.ru ),
		138	Vladimir Dubrovin
		139	-.RI ( vlad@sandy.ru )
		140	+.RI ( vlad@securityvulns.ru )
		141	diff -urN man/proxy.8 man-httppr/proxy.8
142	--- man/proxy.8 2015-02-17 16:09:13.000000000 +0300
143	+++ man-httppr/proxy.8 2015-06-14 15:43:48.000000000 +0300
144	@@ -1,15 +1,15 @@
145	-.TH proxy "8" "July 2009" "3proxy 0.7" "Universal proxy server"
146	+.TH httppr "8" "July 2009" "3proxy 0.7" "Universal proxy server"
147	.SH NAME
148	-.B proxy
149	+.B httppr
150	\- HTTP proxy gateway service
151	.SH SYNOPSIS
152	-.BR "proxy " [ -d ][ -a ]
153	+.BR "httppr " [ -d ][ -a ]
154	.IB \fR[ -l \fR[ \fR[ @ \fR] logfile \fR]]
155	.IB \fR[ -p port\fR]
156	.IB \fR[ -i internal_ip\fR]
157	.IB \fR[ -e external_ip\fR]
158	.SH DESCRIPTION
159	-.B proxy
160	+.B httppr
161	is HTTP gateway service with HTTPS and FTP over HTTPS support.
162	.SH OPTIONS
163	.TP
164	@@ -64,13 +64,13 @@
165	instead.
166	.SH BUGS
167	Report all bugs to
168	-.BR 3proxy@security.nnov.ru
169	+.BR 3proxy@3proxy.ru
170	.SH SEE ALSO
171	3proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
172	.br
173	http://3proxy.ru/
174	.SH AUTHORS
175	3proxy is designed by 3APA3A
176	-.RI ( 3APA3A@security.nnov.ru ),
177	+.RI ( 3APA3A@3proxy.ru ),
178	Vladimir Dubrovin
179	-.RI ( vlad@sandy.ru )
180	+.RI ( vlad@securityvulns.ru )
181	diff -urN man/smtpp.8 man-httppr/smtpp.8
182	--- man/smtpp.8 2015-02-17 16:09:13.000000000 +0300
183	+++ man-httppr/smtpp.8 2015-06-14 15:43:52.000000000 +0300
184	@@ -70,13 +70,13 @@
185	we know which server to connect.
186	.SH BUGS
187	Report all bugs to
188	-.BR 3proxy@security.nnov.ru
189	+.BR 3proxy@3proxy.ru
190	.SH SEE ALSO
191	-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
192	+3proxy(8), ftppr(8), httppr(8), socks(8), tcppm(8), udppm(8), syslogd(8),
193	.br
194	http://3proxy.ru/
195	.SH AUTHORS
196	3proxy is designed by 3APA3A
197	-.RI ( 3APA3A@security.nnov.ru ),
198	+.RI ( 3APA3A@3proxy.ru ),
199	Vladimir Dubrovin
200	-.RI ( vlad@sandy.ru )
201	+.RI ( vlad@securityvulns.ru )
202	diff -urN man/socks.8 man-httppr/socks.8
203	--- man/socks.8 2015-02-17 16:09:13.000000000 +0300
204	+++ man-httppr/socks.8 2015-06-14 15:43:56.000000000 +0300
205	@@ -65,13 +65,13 @@
206	instead.
207	.SH BUGS
208	Report all bugs to
209	-.BR 3proxy@security.nnov.ru
210	+.BR 3proxy@3proxy.ru
211	.SH SEE ALSO
212	-3proxy(8), proxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
213	+3proxy(8), httppr(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
214	.br
215	http://3proxy.ru/
216	.SH AUTHORS
217	3proxy is designed by 3APA3A
218	-.RI ( 3APA3A@security.nnov.ru ),
219	+.RI ( 3APA3A@3proxy.ru ),
220	Vladimir Dubrovin
221	-.RI ( vlad@sandy.ru )
222	+.RI ( vlad@securityvulns.ru )
223	diff -urN man/tcppm.8 man-httppr/tcppm.8
224	--- man/tcppm.8 2015-02-17 16:09:13.000000000 +0300
225	+++ man-httppr/tcppm.8 2015-06-14 15:44:00.000000000 +0300
226	@@ -59,13 +59,13 @@
227	.IR remote_host : remote_port
228	.SH BUGS
229	Report all bugs to
230	-.BR 3proxy@security.nnov.ru
231	+.BR 3proxy@3proxy.ru
232	.SH SEE ALSO
233	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
234	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
235	.br
236	http://3proxy.ru/
237	.SH AUTHORS
238	3proxy is designed by 3APA3A
239	-.RI ( 3APA3A@security.nnov.ru ),
240	+.RI ( 3APA3A@3proxy.ru ),
241	Vladimir Dubrovin
242	-.RI ( vlad@sandy.ru )
243	+.RI ( vlad@securityvulns.ru )
244	diff -urN man/udppm.8 man-httppr/udppm.8
245	--- man/udppm.8 2015-02-17 16:09:13.000000000 +0300
246	+++ man-httppr/udppm.8 2015-06-14 15:44:05.000000000 +0300
247	@@ -65,13 +65,13 @@
248	.IR remote_host : remote_port
249	.SH BUGS
250	Report all bugs to
251	-.BR 3proxy@security.nnov.ru
252	+.BR 3proxy@3proxy.ru
253	.SH SEE ALSO
254	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
255	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
256	.br
257	http://3proxy.ru/
258	.SH AUTHORS
259	3proxy is designed by 3APA3A
260	-.RI ( 3APA3A@security.nnov.ru ),
261	+.RI ( 3APA3A@3proxy.ru ),
262	Vladimir Dubrovin
263	-.RI ( vlad@sandy.ru )
264	+.RI ( vlad@securityvulns.ru )

Line 0 Link Here

(-)3proxy_mv/patch-man (+235 lines)
		1	diff -urN man/3proxy.8 man-httppr/3proxy.8
		2	--- man/3proxy.8 2015-02-17 16:09:13.000000000 +0300
		3	+++ man-httppr/3proxy.8 2015-06-14 15:13:08.000000000 +0300
		4	@@ -26,7 +26,7 @@
		5	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
		7	from configuration file like independant service
		8	-.BR proxy (8)
		9	+.BR httppr (8)
		10	.BR socks (8)
		11	.BR pop3p (8)
		12	.BR tcppm (8)
		13	@@ -84,7 +84,7 @@
		14	configuration from stdin. It makes it possible to use 3proxy.cfg file as
		15	executable script just by setting +x mode and adding
		16	.br
		17	-#!/usr/local/3proxy/3proxy
		18	+#!/usr/local/bin/3proxy
		19	.br
		20	as a first line in 3proxy.cfg
		21	.TP
		22	@@ -133,14 +133,14 @@
		23	wget to automate this task.
		24	.SH FILES
		25	.TP
		26	-.I "/usr/local/3proxy/3proxy.cfg (3proxy.cfg)"
		27	+.I "/usr/local/etc/3proxy.cfg (3proxy.cfg)"
		28	.BR 3proxy
		29	configuration file
		30	.SH BUGS
		31	Report all bugs to
		32	-.BR 3proxy@security.nnov.ru
		33	+.BR 3proxy@3proxy.ru
		34	.SH SEE ALSO
		35	-3proxy.cfg(3), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
		36	+3proxy.cfg(3), httppr(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
		37	kill(1), syslogd(8),
		38	.br
		39	http://3proxy.ru/
		40	@@ -148,6 +148,6 @@
		41	3APA3A is pronounced as \`\`zaraza\'\'.
		42	.SH AUTHORS
		43	3proxy is designed by 3APA3A
		44	-.RI ( 3APA3A@security.nnov.ru ),
		45	+.RI ( 3APA3A@3proxy.ru ),
		46	Vladimir Dubrovin
		47	-.RI ( vlad@sandy.ru )
		48	+.RI ( vlad@securityvulns.ru )
		49	diff -urN man/3proxy.cfg.3 man-httppr/3proxy.cfg.3
		50	--- man/3proxy.cfg.3 2015-02-17 16:09:13.000000000 +0300
		51	+++ man-httppr/3proxy.cfg.3 2015-06-14 15:15:00.000000000 +0300
		52	@@ -114,7 +114,7 @@
		53	(for proxy) - anonymous proxy (random client information reported)
		54	.br
		55	Also, all options mentioned for
		56	-.BR proxy (8)
		57	+.BR httppr (8)
		58	.BR socks (8)
		59	.BR pop3p (8)
		60	.BR tcppm (8)
		61	@@ -884,13 +884,13 @@
		62
		63
		64	.SH SEE ALSO
65	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
66	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
67	.br
68	http://3proxy.ru/
69	.SH TRIVIA
70	3APA3A is pronounced as \`\`zaraza\'\'.
71	.SH AUTHORS
72	3proxy is designed by 3APA3A
73	-.RI ( 3APA3A@security.nnov.ru ),
74	+.RI ( 3APA3A@3proxy.ru ),
75	Vladimir Dubrovin
76	-.RI ( vlad@sandy.ru )
77	+.RI ( vlad@securityvulns.ru )
78	diff -urN man/ftppr.8 man-httppr/ftppr.8
79	--- man/ftppr.8 2015-02-17 16:09:13.000000000 +0300
80	+++ man-httppr/ftppr.8 2015-06-14 15:20:21.000000000 +0300
81	@@ -75,11 +75,11 @@
82	Report all bugs to
83	.BR 3proxy@security.nnov.ru
84	.SH SEE ALSO
85	-3proxy(8), proxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
86	+3proxy(8), httppr(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
87	.br
88	http://3proxy.ru/
89	.SH AUTHORS
90	3proxy is designed by 3APA3A
91	-.RI ( 3APA3A@security.nnov.ru ),
92	+.RI ( 3APA3A@3proxy.ru ),
93	Vladimir Dubrovin
94	-.RI ( vlad@sandy.ru )
95	+.RI ( vlad@securityvulns.ru )
96	diff -urN man/icqpr.8 man-httppr/icqpr.8
97	--- man/icqpr.8 2015-02-17 16:09:13.000000000 +0300
98	+++ man-httppr/icqpr.8 2015-06-14 15:20:25.000000000 +0300
99	@@ -68,11 +68,11 @@
100	Report all bugs to
101	.BR 3proxy@security.nnov.ru
102	.SH SEE ALSO
103	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
104	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
105	.br
106	http://3proxy.ru/
107	.SH AUTHORS
108	3proxy is designed by 3APA3A
109	-.RI ( 3APA3A@security.nnov.ru ),
110	+.RI ( 3APA3A@3proxy.ru ),
111	Vladimir Dubrovin
112	-.RI ( vlad@sandy.ru )
113	+.RI ( vlad@securityvulns.ru )
114	diff -urN man/pop3p.8 man-httppr/pop3p.8
115	--- man/pop3p.8 2015-02-17 16:09:13.000000000 +0300
116	+++ man-httppr/pop3p.8 2015-06-14 15:20:29.000000000 +0300
117	@@ -71,11 +71,11 @@
118	Report all bugs to
119	.BR 3proxy@security.nnov.ru
120	.SH SEE ALSO
121	-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
122	+3proxy(8), ftppr(8), httppr(8), socks(8), tcppm(8), udppm(8), syslogd(8),
123	.br
124	http://3proxy.ru/
125	.SH AUTHORS
126	3proxy is designed by 3APA3A
127	-.RI ( 3APA3A@security.nnov.ru ),
128	+.RI ( 3APA3A@3proxy.ru ),
129	Vladimir Dubrovin
130	-.RI ( vlad@sandy.ru )
131	+.RI ( vlad@securityvulns.ru )
132	diff -urN man/proxy.8 man-httppr/proxy.8
133	--- man/proxy.8 2015-02-17 16:09:13.000000000 +0300
134	+++ man-httppr/proxy.8 2015-06-14 15:17:24.000000000 +0300
135	@@ -1,15 +1,15 @@
136	-.TH proxy "8" "July 2009" "3proxy 0.7" "Universal proxy server"
137	+.TH httppr "8" "July 2009" "3proxy 0.7" "Universal proxy server"
138	.SH NAME
139	-.B proxy
140	+.B httppr
141	\- HTTP proxy gateway service
142	.SH SYNOPSIS
143	-.BR "proxy " [ -d ][ -a ]
144	+.BR "httppr " [ -d ][ -a ]
145	.IB \fR[ -l \fR[ \fR[ @ \fR] logfile \fR]]
146	.IB \fR[ -p port\fR]
147	.IB \fR[ -i internal_ip\fR]
148	.IB \fR[ -e external_ip\fR]
149	.SH DESCRIPTION
150	-.B proxy
151	+.B httppr
152	is HTTP gateway service with HTTPS and FTP over HTTPS support.
153	.SH OPTIONS
154	.TP
155	@@ -71,6 +71,6 @@
156	http://3proxy.ru/
157	.SH AUTHORS
158	3proxy is designed by 3APA3A
159	-.RI ( 3APA3A@security.nnov.ru ),
160	+.RI ( 3APA3A@3proxy.ru ),
161	Vladimir Dubrovin
162	-.RI ( vlad@sandy.ru )
163	+.RI ( vlad@securityvulns.ru )
164	diff -urN man/smtpp.8 man-httppr/smtpp.8
165	--- man/smtpp.8 2015-02-17 16:09:13.000000000 +0300
166	+++ man-httppr/smtpp.8 2015-06-14 15:20:33.000000000 +0300
167	@@ -72,11 +72,11 @@
168	Report all bugs to
169	.BR 3proxy@security.nnov.ru
170	.SH SEE ALSO
171	-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
172	+3proxy(8), ftppr(8), httppr(8), socks(8), tcppm(8), udppm(8), syslogd(8),
173	.br
174	http://3proxy.ru/
175	.SH AUTHORS
176	3proxy is designed by 3APA3A
177	-.RI ( 3APA3A@security.nnov.ru ),
178	+.RI ( 3APA3A@3proxy.ru ),
179	Vladimir Dubrovin
180	-.RI ( vlad@sandy.ru )
181	+.RI ( vlad@securityvulns.ru )
182	diff -urN man/socks.8 man-httppr/socks.8
183	--- man/socks.8 2015-02-17 16:09:13.000000000 +0300
184	+++ man-httppr/socks.8 2015-06-14 15:20:38.000000000 +0300
185	@@ -67,11 +67,11 @@
186	Report all bugs to
187	.BR 3proxy@security.nnov.ru
188	.SH SEE ALSO
189	-3proxy(8), proxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
190	+3proxy(8), httppr(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
191	.br
192	http://3proxy.ru/
193	.SH AUTHORS
194	3proxy is designed by 3APA3A
195	-.RI ( 3APA3A@security.nnov.ru ),
196	+.RI ( 3APA3A@3proxy.ru ),
197	Vladimir Dubrovin
198	-.RI ( vlad@sandy.ru )
199	+.RI ( vlad@securityvulns.ru )
200	diff -urN man/tcppm.8 man-httppr/tcppm.8
201	--- man/tcppm.8 2015-02-17 16:09:13.000000000 +0300
202	+++ man-httppr/tcppm.8 2015-06-14 15:20:47.000000000 +0300
203	@@ -61,11 +61,11 @@
204	Report all bugs to
205	.BR 3proxy@security.nnov.ru
206	.SH SEE ALSO
207	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
208	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
209	.br
210	http://3proxy.ru/
211	.SH AUTHORS
212	3proxy is designed by 3APA3A
213	-.RI ( 3APA3A@security.nnov.ru ),
214	+.RI ( 3APA3A@3proxy.ru ),
215	Vladimir Dubrovin
216	-.RI ( vlad@sandy.ru )
217	+.RI ( vlad@securityvulns.ru )
218	diff -urN man/udppm.8 man-httppr/udppm.8
219	--- man/udppm.8 2015-02-17 16:09:13.000000000 +0300
220	+++ man-httppr/udppm.8 2015-06-14 15:20:57.000000000 +0300
221	@@ -67,11 +67,11 @@
222	Report all bugs to
223	.BR 3proxy@security.nnov.ru
224	.SH SEE ALSO
225	-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
226	+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
227	.br
228	http://3proxy.ru/
229	.SH AUTHORS
230	3proxy is designed by 3APA3A
231	-.RI ( 3APA3A@security.nnov.ru ),
232	+.RI ( 3APA3A@3proxy.ru ),
233	Vladimir Dubrovin
234	-.RI ( vlad@sandy.ru )
235	+.RI ( vlad@securityvulns.ru )