Attachment 195856 Details for Bug 230362 – Update

[patch] Update

csocks (text/plain), 6.18 KB, created by Nathan on 2018-08-04 20:13:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan

Created: 2018-08-04 20:13:05 UTC

Size: 6.18 KB

patch

obsolete

>Index: net/csocks/Makefile
>===================================================================
>--- net/csocks/Makefile	(revision 476319)
>+++ net/csocks/Makefile	(working copy)
>@@ -2,19 +2,18 @@
> # $FreeBSD$
> 
> PORTNAME=	csocks
>-PORTVERSION=	1.5
>-PORTREVISION=	1
>+PORTVERSION=	1.7
> CATEGORIES=	net security
>-MASTER_SITES=	http://csocks.altervista.org/download/ \
>-		http://csocks.virtuale.org/download/
>+MASTER_SITES=	http://csocks.altervista.org/download/
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
> MAINTAINER=	raffaele.delorenzo@libero.it
> COMMENT=	SOCKS Client v4/v5 RFC Compliant with many features
> 
>-PLIST_FILES=	etc/csocks.conf.sample lib/libcsocks.so lib/libcsocks.so.1 \
>+PLIST_FILES=	etc/csocks.conf.sample lib/libcsocks.so \
> 		bin/csocks man/man1/csocks.1.gz man/man5/csocks.conf.5.gz
> 
>+USES=		compiler:gcc-c++11-lib
> USE_LDCONFIG=	yes
> 
> WRKSRC=		${WRKDIR}/src
>@@ -24,8 +23,8 @@
> 
> do-install:
> 	${INSTALL_SCRIPT} ${WRKDIR}/freebsd/csocks ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_LIB} ${WRKDIR}/src/libcsocks.so.1 ${STAGEDIR}${PREFIX}/lib
>-	${LN} -s libcsocks.so.1 ${STAGEDIR}${PREFIX}/lib/libcsocks.so
>+	${INSTALL_LIB} ${WRKDIR}/src/libcsocks.so.1 \
>+		${STAGEDIR}${PREFIX}/lib/libcsocks.so
> 	${INSTALL_DATA} ${WRKDIR}/csocks.conf ${STAGEDIR}${PREFIX}/etc/csocks.conf.sample
> 	${INSTALL_MAN} ${WRKDIR}/man/csocks.1.gz ${STAGEDIR}${MANPREFIX}/man/man1
> 	${INSTALL_MAN} ${WRKDIR}/man/csocks.conf.5.gz ${STAGEDIR}${MANPREFIX}/man/man5
>Index: net/csocks/distinfo
>===================================================================
>--- net/csocks/distinfo	(revision 476319)
>+++ net/csocks/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (csocks_1.5.tar.gz) = 1708876017790bd62c8485d95d61dc85d1f9cbf4dcde6d0bc72a8c8968a8adf1
>-SIZE (csocks_1.5.tar.gz) = 28604
>+TIMESTAMP = 1533405039
>+SHA256 (csocks_1.7.tar.gz) = 088837d2eee7e8a4d2da66fa74d06f7a6452ba5337e92004c83708b2b36792d6
>+SIZE (csocks_1.7.tar.gz) = 29859
>Index: net/csocks/files/patch-Makefile
>===================================================================
>--- net/csocks/files/patch-Makefile	(revision 476319)
>+++ net/csocks/files/patch-Makefile	(working copy)
>@@ -1,5 +1,5 @@
>---- Makefile.orig	2014-04-11 23:48:26.646982600 +0200
>-+++ Makefile	2014-04-11 23:49:46.629977600 +0200
>+--- Makefile.orig	2018-08-04 19:54:02 UTC
>++++ Makefile
> @@ -1,9 +1,9 @@
>  # Compiler/Linker/dynamic linker
> -CC = gcc
>@@ -8,8 +8,17 @@
> +LD = $(CC)
>  
>  # flags to compile object files that can be used in a dynamic library
>--CFLAGS = -fPIC -Wall -g -c -O2 -fno-strict-aliasing -pipe -Wall -std=c99 -D'CSOCKS_CONF="/usr/local/etc/csocks.conf"'
>-+CFLAGS += -fPIC -c -std=c99 -D'CSOCKS_CONF="$(PREFIX)/etc/csocks.conf"'
>+-CFLAGS = -Wall -fPIC -g -c -O2 -std=c99 -fno-strict-aliasing -D'LINUX' -D'CSOCKS_PATH_LIBC="libc.so.6"' -D'CSOCKS_LIBCONNECT="libc.so.6"' -D'CSOCKS_CONF="/etc/csocks.conf"'
>++CFLAGS = -fPIC -c -std=c99 -D'CSOCKS_CONF="${PREFIX}/etc/csocks.conf"'
>+ 
>  # on some platforms, use '-fpic' instead.
>  
>- # Flags to create a dynamic library.
>+@@ -31,7 +31,7 @@ all: $(LIB_FILE)
>+ 
>+ # create our library
>+ $(LIB_FILE): $(LIB_OBJS)
>+-	$(LD) $(DYNLINKFLAGS) -Wl,-soname,$(LIB_FILE) -o $(LIB_FILE) $(LIB_OBJS) -lc -lgcc -ldl
>++	$(LD) $(DYNLINKFLAGS) -Wl,-soname,$(LIB_FILE) -o $(LIB_FILE) $(LIB_OBJS) -lc -lgcc #-ldl
>+ 
>+ # compile C source files into object files.
>+ %.o: %.c
>Index: net/csocks/files/patch-csocks.c
>===================================================================
>--- net/csocks/files/patch-csocks.c	(nonexistent)
>+++ net/csocks/files/patch-csocks.c	(working copy)
>@@ -0,0 +1,30 @@
>+--- csocks.c.orig	2018-08-04 20:05:15 UTC
>++++ csocks.c
>+@@ -668,11 +668,10 @@ static int parse_config_file (struct cso
>+ 				struct in6_addr pluto6 = IN6ADDR_ANY_INIT;
>+ 				
>+ 				DEB_PRINTF("DEBUG - parse_config_file - find SOCKS_TYPE:");
>+-				if (p2 == NULL || p3 == NULL || p4 == NULL || p5 == NULL || p7 == NULL || p8 == NULL){
>+-					fprintf(stderr,"WARNING - parse_config_file - Bad socks type %s!" 
>++				fprintf(stderr,"WARNING - parse_config_file - Bad socks type %s!" 
>+ 						"ignoring rule..\n",p2);
>+-					continue;
>+-				}
>++				continue;
>++				
>+ #if 0
>+ 				fprintf(stderr,"DEBUG - Rule matched:\n %s %s %s %s %s \n",p1,p2,p3,p4,p5);
>+ #endif
>+@@ -730,9 +729,9 @@ static int parse_config_file (struct cso
>+ 					continue;
>+ 				}	
>+ 				n->dstport = htons(atoi (p4));
>+-				if (p6 != NULL){
>+-					n->socks_port = htons(atoi (p6));
>+-				}
>++				
>++				n->socks_port = htons(atoi (p6));
>++				
>+ 
>+ 				if (!strcmp(p7, "TCP") || !strcmp(p7, "tcp")){
>+ 					DEB_PRINTF("INFO - parse_config_file - Protocol TCP for rule\n");
>
>Property changes on: net/csocks/files/patch-csocks.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/csocks/files/patch-src_csocks.c
>===================================================================
>--- net/csocks/files/patch-src_csocks.c	(revision 476319)
>+++ net/csocks/files/patch-src_csocks.c	(nonexistent)
>@@ -1,14 +0,0 @@
>---- csocks.c.orig	2008-02-25 09:37:38.000000000 +0100
>-+++ csocks.c	2008-02-25 09:38:53.000000000 +0100
>-@@ -1537,11 +1537,7 @@
>- 		continue;
>- 	}while(1);
>- 
>--#if defined(DARWIN) || defined(NETBSD)
>- 	if ((rlen = send (sock, (void *) sen, lenght, 0)) <= 0){
>--#else
>--	if ((rlen = send (sock, (void *) sen, lenght, MSG_NOSIGNAL)) <= 0){
>--#endif
>- 		fprintf(stderr,"ERROR - socks_send - send - cannot send message!\n");
>- 		return CSOCKS_KO;
>- 	}
>
>Property changes on: net/csocks/files/patch-src_csocks.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net/csocks/pkg-descr
>===================================================================
>--- net/csocks/pkg-descr	(revision 476319)
>+++ net/csocks/pkg-descr	(working copy)
>@@ -1,3 +1,3 @@
> This is a port of csocks, A socks client with many features
> 
>-WWW: http://csocks.virtuale.org
>+WWW: http://csocks.altervista.org

Actions: View | Diff

Attachments on bug 230362: 195856 | 195857 | 195858 | 195859 | 195860 | 195868