Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Aug 2018 12:05:39 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r477498 - in head/net/csocks: . files
Message-ID:  <201808181205.w7IC5d39030836@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Sat Aug 18 12:05:39 2018
New Revision: 477498
URL: https://svnweb.freebsd.org/changeset/ports/477498

Log:
  net/csocks: Update to 1.7
  
  - Add LICENSE
  
  PR:		230362
  Submitted by:	Nathan <ndowens@yahoo.com> (based on)
  Approved by:	maintainer timeout (2 weeks)

Modified:
  head/net/csocks/Makefile
  head/net/csocks/distinfo
  head/net/csocks/files/patch-Makefile
  head/net/csocks/pkg-descr

Modified: head/net/csocks/Makefile
==============================================================================
--- head/net/csocks/Makefile	Sat Aug 18 11:46:07 2018	(r477497)
+++ head/net/csocks/Makefile	Sat Aug 18 12:05:39 2018	(r477498)
@@ -2,15 +2,16 @@
 # $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
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 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

Modified: head/net/csocks/distinfo
==============================================================================
--- head/net/csocks/distinfo	Sat Aug 18 11:46:07 2018	(r477497)
+++ head/net/csocks/distinfo	Sat Aug 18 12:05:39 2018	(r477498)
@@ -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

Modified: head/net/csocks/files/patch-Makefile
==============================================================================
--- head/net/csocks/files/patch-Makefile	Sat Aug 18 11:46:07 2018	(r477497)
+++ head/net/csocks/files/patch-Makefile	Sat Aug 18 12:05:39 2018	(r477498)
@@ -1,15 +1,28 @@
---- Makefile.orig	2014-04-11 23:48:26.646982600 +0200
-+++ Makefile	2014-04-11 23:49:46.629977600 +0200
-@@ -1,9 +1,9 @@
- # Compiler/Linker/dynamic linker
+--- Makefile.orig	2008-02-20 13:32:02 UTC
++++ Makefile
+@@ -1,14 +1,10 @@
+-# Compiler/Linker/dynamic linker
 -CC = gcc
 -LD = gcc
-+CC ?= gcc
-+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 -std=c99 -fno-strict-aliasing -D'LINUX' -D'CSOCKS_PATH_LIBC="libc.so.7"' -D'CSOCKS_LIBCONNECT="libc.so.7"' -D'CSOCKS_CONF="${PREFIX}/etc/csocks.conf"'
+ 
  # on some platforms, use '-fpic' instead.
  
  # Flags to create a dynamic library.
+-DYNLINKFLAGS = -Wall -fPIC -O2 -shared -rdynamic -std=c99 -nostdlib
++DYNLINKFLAGS = -Wall -fPIC -shared -rdynamic -std=c99 -nostdlib
+ # on some platforms, use '-G' instead.
+ 
+ # files removal
+@@ -31,7 +27,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
++	$(CC) $(DYNLINKFLAGS) $(LDFLAGS) -Wl,-soname,$(LIB_FILE) -o $(LIB_FILE) $(LIB_OBJS) -lc -lgcc
+ 
+ # compile C source files into object files.
+ %.o: %.c

Modified: head/net/csocks/pkg-descr
==============================================================================
--- head/net/csocks/pkg-descr	Sat Aug 18 11:46:07 2018	(r477497)
+++ head/net/csocks/pkg-descr	Sat Aug 18 12:05:39 2018	(r477498)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808181205.w7IC5d39030836>