5 files changed, 61 insertions, 51 deletions

diff --git a/net/3proxy/Makefile b/net/3proxy/Makefile
index bf5f399f40d6..bc37070389a2 100644
--- a/net/3proxy/Makefile
+++ b/net/3proxy/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	3proxy
 PORTVERSION=	0.7.1.2
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	ports@FreeBSD.org
@@ -29,7 +29,7 @@ post-patch:
 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/
diff --git a/net/3proxy/files/patch-Makefile.unix b/net/3proxy/files/patch-Makefile.unix
index cad6c7a15006..c433140d1eaa 100644
--- a/net/3proxy/files/patch-Makefile.unix
+++ b/net/3proxy/files/patch-Makefile.unix
@@ -1,5 +1,5 @@
---- Makefile.unix.orig	2007-04-10 20:29:25.000000000 +0400
-+++ Makefile.unix	2009-03-23 13:53:24.000000000 +0300
+--- Makefile.unix.orig	2015-02-17 13:09:13 UTC
++++ Makefile.unix
 @@ -9,18 +9,18 @@
  # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
  
diff --git a/net/3proxy/files/patch-cfg-3proxy.cfg.sample b/net/3proxy/files/patch-cfg-3proxy.cfg.sample
index cfa23df4daca..3b3f793e6dcb 100644
--- a/net/3proxy/files/patch-cfg-3proxy.cfg.sample
+++ b/net/3proxy/files/patch-cfg-3proxy.cfg.sample
@@ -1,6 +1,6 @@
---- cfg/3proxy.cfg.sample.orig	Mon May 30 11:16:19 2005
-+++ cfg/3proxy.cfg.sample	Mon May 30 11:17:18 2005
-@@ -30,15 +30,15 @@
+--- cfg/3proxy.cfg.sample.orig	2015-02-17 13:09:13 UTC
++++ cfg/3proxy.cfg.sample
+@@ -30,15 +30,15 @@ users 3APA3A:CL:3apa3a "test:CR:$1$qwer$
  # this example shows you how to include passwd file. For included files
  # <CR> and <LF> are treated as field separators.
  
diff --git a/net/3proxy/files/patch-man b/net/3proxy/files/patch-man
index 1e77247b1d28..b1385adc84eb 100644
--- a/net/3proxy/files/patch-man
+++ b/net/3proxy/files/patch-man
@@ -1,7 +1,6 @@
-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 @@
+--- man/3proxy.8.orig	2015-02-17 13:09:13 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,
  v4.5 and v5, POP3 proxy, UDP and TCP portmappers. Each gateway is started
  from configuration file like independant service 
@@ -10,7 +9,7 @@ diff -urN man/3proxy.8 man-httppr/3proxy.8
  .BR socks (8)
  .BR pop3p (8)
  .BR tcppm (8)
-@@ -84,7 +84,7 @@
+@@ -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
@@ -19,7 +18,7 @@ diff -urN man/3proxy.8 man-httppr/3proxy.8
  .br
  as a first line in 3proxy.cfg
  .TP
-@@ -133,14 +133,14 @@
+@@ -133,14 +133,14 @@ Web admin service can also be used to re
  wget to automate this task.
  .SH FILES
  .TP
@@ -37,7 +36,7 @@ diff -urN man/3proxy.8 man-httppr/3proxy.8
  kill(1), syslogd(8),
  .br
  http://3proxy.ru/
-@@ -148,6 +148,6 @@
+@@ -148,6 +148,6 @@ http://3proxy.ru/
  3APA3A is pronounced as \`\`zaraza\'\'.
  .SH AUTHORS
  3proxy is designed by 3APA3A
@@ -46,10 +45,9 @@ diff -urN man/3proxy.8 man-httppr/3proxy.8
  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 @@
+--- 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).
  (for proxy) - anonymous proxy (random client information reported)
  .br
   Also, all options mentioned for 
@@ -58,7 +56,7 @@ diff -urN man/3proxy.cfg.3 man-httppr/3proxy.cfg.3
  .BR socks (8)
  .BR pop3p (8)
  .BR tcppm (8)
-@@ -884,13 +884,13 @@
+@@ -884,13 +884,13 @@ corruption and/or Content-Length chaging
  
  
  .SH SEE ALSO
@@ -75,10 +73,9 @@ diff -urN man/3proxy.cfg.3 man-httppr/3proxy.cfg.3
  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 @@
+--- man/ftppr.8.orig	2015-02-17 13:09:13 UTC
++++ man/ftppr.8
+@@ -75,11 +75,11 @@ Only cleartext authentication is current
  Report all bugs to
  .BR 3proxy@security.nnov.ru
  .SH SEE ALSO
@@ -93,10 +90,9 @@ diff -urN man/ftppr.8 man-httppr/ftppr.8
  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 @@
+--- man/icqpr.8.orig	2015-02-17 13:09:13 UTC
++++ man/icqpr.8
+@@ -68,11 +68,11 @@ as a destination in client application. 
  Report all bugs to
  .BR 3proxy@security.nnov.ru
  .SH SEE ALSO
@@ -111,10 +107,9 @@ diff -urN man/icqpr.8 man-httppr/icqpr.8
  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 @@
+--- man/pop3p.8.orig	2015-02-17 13:09:13 UTC
++++ man/pop3p.8
+@@ -71,11 +71,11 @@ we know which server to connect.
  Report all bugs to
  .BR 3proxy@security.nnov.ru
  .SH SEE ALSO
@@ -129,9 +124,8 @@ diff -urN man/pop3p.8 man-httppr/pop3p.8
  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
+--- man/proxy.8.orig	2015-02-17 13:09:13 UTC
++++ man/proxy.8
 @@ -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"
@@ -152,7 +146,7 @@ diff -urN man/proxy.8 man-httppr/proxy.8
  is HTTP gateway service with HTTPS and FTP over HTTPS support.
  .SH OPTIONS
  .TP
-@@ -71,6 +71,6 @@
+@@ -71,6 +71,6 @@ Report all bugs to
  http://3proxy.ru/
  .SH AUTHORS
  3proxy is designed by 3APA3A
@@ -161,10 +155,9 @@ diff -urN man/proxy.8 man-httppr/proxy.8
  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 @@
+--- man/smtpp.8.orig	2015-02-17 13:09:13 UTC
++++ man/smtpp.8
+@@ -72,11 +72,11 @@ we know which server to connect.
  Report all bugs to
  .BR 3proxy@security.nnov.ru
  .SH SEE ALSO
@@ -179,10 +172,9 @@ diff -urN man/smtpp.8 man-httppr/smtpp.8
  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 @@
+--- man/socks.8.orig	2015-02-17 13:09:13 UTC
++++ man/socks.8
+@@ -67,11 +67,11 @@ instead.
  Report all bugs to
  .BR 3proxy@security.nnov.ru
  .SH SEE ALSO
@@ -197,10 +189,9 @@ diff -urN man/socks.8 man-httppr/socks.8
  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 @@
+--- man/tcppm.8.orig	2015-02-17 13:09:13 UTC
++++ man/tcppm.8
+@@ -61,11 +61,11 @@ as a destination in client application. 
  Report all bugs to
  .BR 3proxy@security.nnov.ru
  .SH SEE ALSO
@@ -215,10 +206,9 @@ diff -urN man/tcppm.8 man-httppr/tcppm.8
  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 @@
+--- man/udppm.8.orig	2015-02-17 13:09:13 UTC
++++ man/udppm.8
+@@ -67,11 +67,11 @@ as a destination in client application. 
  Report all bugs to
  .BR 3proxy@security.nnov.ru
  .SH SEE ALSO
diff --git a/net/3proxy/files/patch-src_proxy.c b/net/3proxy/files/patch-src_proxy.c
new file mode 100644
index 000000000000..284b165dda12
--- /dev/null
+++ b/net/3proxy/files/patch-src_proxy.c
@@ -0,0 +1,20 @@
+--- 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;