Attachment 174405 Details for Bug 212403 – port patch

[patch] port patch

3proxy.patch (text/plain), 3.51 KB, created by Pavel Timofeev on 2016-09-06 05:39:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Timofeev

Created: 2016-09-06 05:39:57 UTC

Size: 3.51 KB

patch

obsolete

>Files /home/timp/3proxy.orig/3proxy-0.8.7.txz and 3proxy/3proxy-0.8.7.txz differ
>diff -ruN /home/timp/3proxy.orig/Makefile 3proxy/Makefile
>--- /home/timp/3proxy.orig/Makefile	2016-09-05 21:45:10.869193000 +0300
>+++ 3proxy/Makefile	2016-09-05 21:45:59.295476000 +0300
>@@ -2,9 +2,8 @@
> # $FreeBSD: head/net/3proxy/Makefile 420760 2016-08-24 04:43:11Z pi $
> 
> PORTNAME=	3proxy
>-PORTVERSION=	0.8.6
>+PORTVERSION=	0.8.7
> DISTVERSIONPREFIX=	${PORTNAME}-
>-PORTREVISION=	1
> CATEGORIES=	net
> 
> MAINTAINER=	timp87@gmail.com
>diff -ruN /home/timp/3proxy.orig/distinfo 3proxy/distinfo
>--- /home/timp/3proxy.orig/distinfo	2016-09-05 21:45:10.869396000 +0300
>+++ 3proxy/distinfo	2016-09-05 21:48:08.375403000 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (z3APA3A-3proxy-3proxy-0.8.6_GH0.tar.gz) = f706df25bb061a669b13ff76c121a8d72140406c7b0930bae5dcf713f9520a56
>-SIZE (z3APA3A-3proxy-3proxy-0.8.6_GH0.tar.gz) = 496098
>+SHA256 (z3APA3A-3proxy-3proxy-0.8.7_GH0.tar.gz) = 09a633ece5b2d7b077044bdd58291b7066b7f83e7ae62492f837ca13afb5eacf
>+SIZE (z3APA3A-3proxy-3proxy-0.8.7_GH0.tar.gz) = 496653
>diff -ruN /home/timp/3proxy.orig/files/patch-src_common.c 3proxy/files/patch-src_common.c
>--- /home/timp/3proxy.orig/files/patch-src_common.c	2016-09-05 21:45:10.870796000 +0300
>+++ 3proxy/files/patch-src_common.c	1970-01-01 03:00:00.000000000 +0300
>@@ -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 -ruN /home/timp/3proxy.orig/files/patch-src_ftp.c 3proxy/files/patch-src_ftp.c
>--- /home/timp/3proxy.orig/files/patch-src_ftp.c	2016-09-05 21:45:10.870956000 +0300
>+++ 3proxy/files/patch-src_ftp.c	1970-01-01 03:00:00.000000000 +0300
>@@ -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;

Flags:

timp87: maintainer-approval+

Actions: View | Diff

Attachments on bug 212403: 174405 | 174406