Attachment #195859 for bug #230362




# $FreeBSD$

PORTNAME=	csocks
PORTVERSION=	1.7
PORTREVISION=	1
CATEGORIES=	net security
MASTER_SITES=	http://csocks.altervista.org/download/
		http://csocks.virtuale.org/download/
DISTNAME=	${PORTNAME}_${PORTVERSION}

MAINTAINER=	raffaele.delorenzo@libero.it

PLIST_FILES=	etc/csocks.conf.sample lib/libcsocks.so lib/libcsocks.so.1 \
		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


do-install:
	${INSTALL_SCRIPT} ${WRKDIR}/freebsd/csocks ${STAGEDIR}${PREFIX}/bin
	${INSTALL_LIB} ${WRKDIR}/src/libcsocks.so.1 ${STAGEDIR}${PREFIX}/lib/libcsocks.so.1
	${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

Lines 1-2 Link Here

(-)net/csocks/distinfo (-2 / +3 lines)
1	SHA256 (csocks_1.5.tar.gz) = 1708876017790bd62c8485d95d61dc85d1f9cbf4dcde6d0bc72a8c8968a8adf1	1	TIMESTAMP = 1533405039
2	SIZE (csocks_1.5.tar.gz) = 28604	2	SHA256 (csocks_1.7.tar.gz) = 088837d2eee7e8a4d2da66fa74d06f7a6452ba5337e92004c83708b2b36792d6
		3	SIZE (csocks_1.7.tar.gz) = 29859




--- Makefile.orig	2018-08-04 19:54:02 UTC
+++ Makefile
@@ -1,9 +1,9 @@
 # Compiler/Linker/dynamic linker
-CC = gcc

+LD = $(CC)
 
 # flags to compile object files that can be used in a dynamic library
-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.
 
@@ -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




--- 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");




--- 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;
 	}

Lines 1-3 Link Here

(-)net/csocks/pkg-descr (-1 / +1 lines)
1	This is a port of csocks, A socks client with many features	1	This is a port of csocks, A socks client with many features
2		2
3	WWW: http://csocks.virtuale.org	3	WWW: http://csocks.altervista.org

Return to bug 230362

Lines 2-12 Link Here

(-)net/csocks/Makefile (-6 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= csocks	4	PORTNAME= csocks
5	PORTVERSION= 1.5	5	PORTVERSION= 1.7
6	PORTREVISION= 1
7	CATEGORIES= net security	6	CATEGORIES= net security
8	MASTER_SITES= http://csocks.altervista.org/download/ \	7	MASTER_SITES= http://csocks.altervista.org/download/
9	http://csocks.virtuale.org/download/
10	DISTNAME= ${PORTNAME}_${PORTVERSION}	8	DISTNAME= ${PORTNAME}_${PORTVERSION}
11		9
12	MAINTAINER= raffaele.delorenzo@libero.it	10	MAINTAINER= raffaele.delorenzo@libero.it
Lines 15-20 Link Here
15	PLIST_FILES= etc/csocks.conf.sample lib/libcsocks.so lib/libcsocks.so.1 \	13	PLIST_FILES= etc/csocks.conf.sample lib/libcsocks.so lib/libcsocks.so.1 \
16	bin/csocks man/man1/csocks.1.gz man/man5/csocks.conf.5.gz	14	bin/csocks man/man1/csocks.1.gz man/man5/csocks.conf.5.gz
17		15
		16	USES= compiler:gcc-c++11-lib
18	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
19		18
20	WRKSRC= ${WRKDIR}/src	19	WRKSRC= ${WRKDIR}/src
Lines 24-31 Link Here
24		23
25	do-install:	24	do-install:
26	${INSTALL_SCRIPT} ${WRKDIR}/freebsd/csocks ${STAGEDIR}${PREFIX}/bin	25	${INSTALL_SCRIPT} ${WRKDIR}/freebsd/csocks ${STAGEDIR}${PREFIX}/bin
27	${INSTALL_LIB} ${WRKDIR}/src/libcsocks.so.1 ${STAGEDIR}${PREFIX}/lib	26	${INSTALL_LIB} ${WRKDIR}/src/libcsocks.so.1 ${STAGEDIR}${PREFIX}/lib/libcsocks.so.1
28	${LN} -s libcsocks.so.1 ${STAGEDIR}${PREFIX}/lib/libcsocks.so	27	${INSTALL_LIB} ${WRKDIR}/src/libcsocks.so.1 ${STAGEDIR}${PREFIX}/lib/libcsocks.so
29	${INSTALL_DATA} ${WRKDIR}/csocks.conf ${STAGEDIR}${PREFIX}/etc/csocks.conf.sample	28	${INSTALL_DATA} ${WRKDIR}/csocks.conf ${STAGEDIR}${PREFIX}/etc/csocks.conf.sample
30	${INSTALL_MAN} ${WRKDIR}/man/csocks.1.gz ${STAGEDIR}${MANPREFIX}/man/man1	29	${INSTALL_MAN} ${WRKDIR}/man/csocks.1.gz ${STAGEDIR}${MANPREFIX}/man/man1
31	${INSTALL_MAN} ${WRKDIR}/man/csocks.conf.5.gz ${STAGEDIR}${MANPREFIX}/man/man5	30	${INSTALL_MAN} ${WRKDIR}/man/csocks.conf.5.gz ${STAGEDIR}${MANPREFIX}/man/man5

Lines 1-5 Link Here

(-)net/csocks/files/patch-Makefile (-5 / +14 lines)
1	--- Makefile.orig 2014-04-11 23:48:26.646982600 +0200	1	--- Makefile.orig 2018-08-04 19:54:02 UTC
2	+++ Makefile 2014-04-11 23:49:46.629977600 +0200	2	+++ Makefile
3	@@ -1,9 +1,9 @@	3	@@ -1,9 +1,9 @@
4	# Compiler/Linker/dynamic linker	4	# Compiler/Linker/dynamic linker
5	-CC = gcc	5	-CC = gcc
Lines 8-15 Link Here
8	+LD = $(CC)	8	+LD = $(CC)
9		9
10	# flags to compile object files that can be used in a dynamic library	10	# flags to compile object files that can be used in a dynamic library
11	-CFLAGS = -fPIC -Wall -g -c -O2 -fno-strict-aliasing -pipe -Wall -std=c99 -D'CSOCKS_CONF="/usr/local/etc/csocks.conf"'	11	-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"'
12	+CFLAGS += -fPIC -c -std=c99 -D'CSOCKS_CONF="$(PREFIX)/etc/csocks.conf"'	12	+CFLAGS = -fPIC -c -std=c99 -D'CSOCKS_CONF="${PREFIX}/etc/csocks.conf"'
		13
13	# on some platforms, use '-fpic' instead.	14	# on some platforms, use '-fpic' instead.
14		15
15	# Flags to create a dynamic library.	16	@@ -31,7 +31,7 @@ all: $(LIB_FILE)
		17
		18	# create our library
		19	$(LIB_FILE): $(LIB_OBJS)
		20	- $(LD) $(DYNLINKFLAGS) -Wl,-soname,$(LIB_FILE) -o $(LIB_FILE) $(LIB_OBJS) -lc -lgcc -ldl
		21	+ $(LD) $(DYNLINKFLAGS) -Wl,-soname,$(LIB_FILE) -o $(LIB_FILE) $(LIB_OBJS) -lc -lgcc #-ldl
		22
		23	# compile C source files into object files.
		24	%.o: %.c

Line 0 Link Here

(-)net/csocks/files/patch-csocks.c (+30 lines)
	1	--- csocks.c.orig 2018-08-04 20:05:15 UTC
	2	+++ csocks.c
	3	@@ -668,11 +668,10 @@ static int parse_config_file (struct cso
	4	struct in6_addr pluto6 = IN6ADDR_ANY_INIT;
	5
	6	DEB_PRINTF("DEBUG - parse_config_file - find SOCKS_TYPE:");
	7	- if (p2 == NULL \|\| p3 == NULL \|\| p4 == NULL \|\| p5 == NULL \|\| p7 == NULL \|\| p8 == NULL){
	8	- fprintf(stderr,"WARNING - parse_config_file - Bad socks type %s!"
	9	+ fprintf(stderr,"WARNING - parse_config_file - Bad socks type %s!"
	10	"ignoring rule..\n",p2);
	11	- continue;
	12	- }
	13	+ continue;
	14	+
	15	#if 0
	16	fprintf(stderr,"DEBUG - Rule matched:\n %s %s %s %s %s \n",p1,p2,p3,p4,p5);
	17	#endif
	18	@@ -730,9 +729,9 @@ static int parse_config_file (struct cso
	19	continue;
	20	}
	21	n->dstport = htons(atoi (p4));
	22	- if (p6 != NULL){
	23	- n->socks_port = htons(atoi (p6));
	24	- }
	25	+
	26	+ n->socks_port = htons(atoi (p6));
	27	+
	28
	29	if (!strcmp(p7, "TCP") \|\| !strcmp(p7, "tcp")){
	30	DEB_PRINTF("INFO - parse_config_file - Protocol TCP for rule\n");

Lines 1-14 Link Here

(-)net/csocks/files/patch-src_csocks.c (-14 lines)
1	--- csocks.c.orig 2008-02-25 09:37:38.000000000 +0100
2	+++ csocks.c 2008-02-25 09:38:53.000000000 +0100
3	@@ -1537,11 +1537,7 @@
4	continue;
5	}while(1);
6
7	-#if defined(DARWIN) \|\| defined(NETBSD)
8	if ((rlen = send (sock, (void *) sen, lenght, 0)) <= 0){
9	-#else
10	- if ((rlen = send (sock, (void *) sen, lenght, MSG_NOSIGNAL)) <= 0){
11	-#endif
12	fprintf(stderr,"ERROR - socks_send - send - cannot send message!\n");
13	return CSOCKS_KO;
14	}