net/3proxy: 0.8.6 -> 0.8.7

- remove patches, now included upstream

PR:		212403
Submitted by:	Pavel Timofeev <timp87@gmail.com> (maintainer)

4 files changed, 4 insertions, 56 deletions

diff --git a/net/3proxy/Makefile b/net/3proxy/Makefile
index 01f48aa907da..71741efedb25 100644
--- a/net/3proxy/Makefile
+++ b/net/3proxy/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	3proxy
-PORTVERSION=	0.8.6
+PORTVERSION=	0.8.7
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	timp87@gmail.com
diff --git a/net/3proxy/distinfo b/net/3proxy/distinfo
index a03acb3aaa14..94d2b97ddb6e 100644
--- a/net/3proxy/distinfo
+++ b/net/3proxy/distinfo
@@ -1,2 +1,3 @@
-SHA256 (z3APA3A-3proxy-3proxy-0.8.6_GH0.tar.gz) = f706df25bb061a669b13ff76c121a8d72140406c7b0930bae5dcf713f9520a56
-SIZE (z3APA3A-3proxy-3proxy-0.8.6_GH0.tar.gz) = 496098
+TIMESTAMP = 1473183946
+SHA256 (z3APA3A-3proxy-3proxy-0.8.7_GH0.tar.gz) = 09a633ece5b2d7b077044bdd58291b7066b7f83e7ae62492f837ca13afb5eacf
+SIZE (z3APA3A-3proxy-3proxy-0.8.7_GH0.tar.gz) = 496653
diff --git a/net/3proxy/files/patch-src_common.c b/net/3proxy/files/patch-src_common.c
deleted file mode 100644
index 1cfaa16d09f8..000000000000
--- a/net/3proxy/files/patch-src_common.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/common.c.orig	2016-08-24 03:41:59 UTC
-+++ src/common.c
-@@ -692,8 +692,8 @@ int doconnect(struct clientparam * param
- #else
- 		fcntl(param->remsock,F_SETFL,O_NONBLOCK);
- #endif
--		size = sizeof(param->sinsl);
- 	}
-+	size = sizeof(param->sinsl);
- 	if(so._getsockname(param->remsock, (struct sockaddr *)&param->sinsl, &size)==-1) {return (15);}
-  }
-  return 0;
diff --git a/net/3proxy/files/patch-src_ftp.c b/net/3proxy/files/patch-src_ftp.c
deleted file mode 100644
index 86c1a2d0bcc5..000000000000
--- a/net/3proxy/files/patch-src_ftp.c
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/ftp.c.orig	2016-08-24 03:43:37 UTC
-+++ src/ftp.c
-@@ -174,6 +174,7 @@ SOCKET ftpdata(struct clientparam *param
- 	SOCKET s = INVALID_SOCKET, rem;
- 	unsigned long b1, b2, b3, b4;
- 	unsigned short b5, b6;
-+	SASIZETYPE sasize;
- 
- 	if(socksend(param->remsock, (unsigned char *)"PASV\r\n", 6, conf.timeouts[STRING_S]) != 6){
- 		return INVALID_SOCKET;
-@@ -187,15 +188,27 @@ SOCKET ftpdata(struct clientparam *param
- 	buf[i-2] = 0;
- 	if(!(sb = strchr(buf+4, '(')) || !(se= strchr(sb, ')'))) return INVALID_SOCKET;
- 	if(sscanf(sb+1, "%lu,%lu,%lu,%lu,%hu,%hu", &b1, &b2, &b3, &b4, &b5, &b6)!=6) return INVALID_SOCKET;
-+	sasize = sizeof(param->sinsl);
-+ 	if(so._getsockname(param->remsock, (struct sockaddr *)&param->sinsl, &sasize)){return INVALID_SOCKET;}
-+	sasize = sizeof(param->sinsr);
-+	if(so._getpeername(param->remsock, (struct sockaddr *)&param->sinsr, &sasize)){return INVALID_SOCKET;}
- 	rem = param->remsock;
- 	param->remsock = INVALID_SOCKET;
- 	param->req = param->sinsr;
- 	*SAPORT(&param->req) = *SAPORT(&param->sinsr) = htons((unsigned short)((b5<<8)^b6));
-+	*SAPORT(&param->sinsl) = 0;
- 	i = param->operation;
- 	param->operation = FTP_DATA;
- 	if((param->res = (*param->srv->authfunc)(param))) {
--		param->remsock = rem;
--		return INVALID_SOCKET;
-+		if(param->remsock != INVALID_SOCKET) {
-+			so._closesocket(param->remsock);
-+			param->remsock = INVALID_SOCKET;
-+		}
-+		memset(&param->sinsl, 0, sizeof(param->sinsl));
-+		if((param->res = (*param->srv->authfunc)(param))) {
-+			param->remsock = rem;
-+			return INVALID_SOCKET;
-+		}
- 	}
- 	param->operation = i;
- 	s = param->remsock;