Attachment #184755 for bug #218294




# $FreeBSD$
# $FreeBSD: head/net/shadowsocks-libev/Makefile 424427 2016-10-21 15:21:13Z mat $

PORTNAME=	shadowsocks-libev
PORTVERSION=	3.0.7
MASTER_SITES=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v${PORTVERSION}/
CATEGORIES=	net

CATEGORIES=	net
MAINTAINER= yp2008cn@gmail.com
COMMENT=    Lightweight tunnel proxy which can help you get through firewalls

LICENSE=	GPLv3

LIB_DEPENDS= libudns.so:dns/udns \
	libev.so:devel/libev \
	libsodium.so:security/libsodium \
	libmbedcrypto.so:security/mbedtls \
	libpcre.so:devel/pcre
USES=		gmake libtool:keepla pathfix ssl
CPPFLAGS+=	-I${OPENSSLINC}
CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}

# Help solve building error since the integrated libsodium enables this option.
CFLAGS+=	-fstack-protector

USE_RC_SUBR=	shadowsocks_libev

HAS_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-documentation
		${WRKSRC}/src/local.c ${WRKSRC}/src/server.c

post-install:
	${MKDIR} ${STAGEDIR}${ETCDIR}
	${CP} ${WRKSRC}/debian/config.json ${STAGEDIR}${ETCDIR}/config.json.sample

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)shadowsocks-libev/distinfo (-2 / +2 lines)
1	SHA256 (madeye-shadowsocks-libev-v1.6.4_GH0.tar.gz) = 517b92e69e371efac4a9ca76e78095e3e866149a484ec4c88589dd4a3bdbb7b7	1	SHA256 (shadowsocks-libev-3.0.7.tar.gz) = 024f2ff501e15ad0cd03dcbac5ca1842aad13dbd51788e522818ff4c129dee18
2	SIZE (madeye-shadowsocks-libev-v1.6.4_GH0.tar.gz) = 2404815	2	SIZE (shadowsocks-libev-3.0.7.tar.gz) = 1903218




--- libev/ev.c.orig	2015-01-07 13:54:19.000000000 +0100
+++ libev/ev.c	2015-03-02 20:39:18.150956000 +0100
@@ -1022,12 +1022,12 @@
   }
 #endif
 
-#if ECB_GCC_VERSION(4,5)
+#if ECB_GCC_VERSION(4,5) || defined __clang__
   #define ecb_unreachable() __builtin_unreachable ()
 #else
   /* this seems to work fine, but gcc always emits a warning for it :/ */
-  ecb_inline void ecb_unreachable (void) ecb_noreturn;
-  ecb_inline void ecb_unreachable (void) { }
+  ecb_inline ecb_noreturn void ecb_unreachable (void);
+  ecb_inline ecb_noreturn void ecb_unreachable (void) { }
 #endif
 
 /* try to tell the compiler that some condition is definitely true */

Lines 1-5 Link Here

(-)shadowsocks-libev/files/shadowsocks_libev.in (-2 / +2 lines)
1	#!/bin/sh	1	#!/bin/sh
2	# $FreeBSD: head/net/shadowsocks-libev/files/shadowsocks_libev.in 335066 2013-11-27 22:04:32Z delphij $	2	# $FreeBSD$
3		3
4	# PROVIDE: shadowsocks-libev	4	# PROVIDE: shadowsocks-libev
5	# REQUIRE: LOGIN cleanvar	5	# REQUIRE: LOGIN cleanvar
Lines 23-29 Link Here
23	: ${shadowsocks_libev_enable:="NO"}	23	: ${shadowsocks_libev_enable:="NO"}
24	: ${shadowsocks_libev_config="%%PREFIX%%/etc/shadowsocks-libev/config.json"}	24	: ${shadowsocks_libev_config="%%PREFIX%%/etc/shadowsocks-libev/config.json"}
25		25
26	command="%%PREFIX%%/bin/ss-server"	26	command="%%PREFIX%%/bin/ss-server"
27	pidfile="/var/run/shadowsocks-libev.pid"	27	pidfile="/var/run/shadowsocks-libev.pid"
28	required_files="${shadowsocks_libev_config}"	28	required_files="${shadowsocks_libev_config}"
29		29

Lines 4-7 Link Here

(-)shadowsocks-libev/pkg-descr (-1 / +1 lines)
4	Shadowsocks-libuv is a C implentment based on libuv. It targets mainly on	4	Shadowsocks-libuv is a C implentment based on libuv. It targets mainly on
5	embedded devices and low end boxes.	5	embedded devices and low end boxes.
6		6
7	WWW: https://github.com/madeye/shadowsocks-libev	7	WWW: https://github.com/shadowsocks/shadowsocks-libev

Lines 1-9 Link Here

(-)shadowsocks-libev/pkg-plist (-5 / +5 lines)
1	bin/ss-local
2	bin/ss-server	1	bin/ss-server
		2	bin/ss-manager
		3	bin/ss-local
3	bin/ss-tunnel	4	bin/ss-tunnel
4	include/shadowsocks.h	5	include/shadowsocks.h
5	lib/libshadowsocks.a	6	lib/pkgconfig/shadowsocks-libev.pc
6	lib/libshadowsocks.la	7	lib/libshadowsocks-libev.la
7	libdata/pkgconfig/shadowsocks-libev.pc	8	lib/libshadowsocks-libev.a
8	man/man8/shadowsocks-libev.8.gz
9	@sample etc/shadowsocks-libev/config.json.sample	9	@sample etc/shadowsocks-libev/config.json.sample

Return to bug 218294

Lines 1-36 Link Here

(-)shadowsocks-libev/Makefile (-22 / +14 lines)
1	# Created by: Xiaoding Liu <xiaoding+freebsd@xiaoding.org>	1	# $FreeBSD$
2	# $FreeBSD: head/net/shadowsocks-libev/Makefile 424427 2016-10-21 15:21:13Z mat $
3		2
4	PORTNAME= shadowsocks-libev	3	PORTNAME= shadowsocks-libev
5	PORTVERSION= 1.6.4	4	PORTVERSION= 3.0.7
6	DISTVERSIONPREFIX= v	5	MASTER_SITES=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v${PORTVERSION}/
7	CATEGORIES= net
8		6
9	MAINTAINER= xiaoding+freebsd@xiaoding.org	7	CATEGORIES= net
10	COMMENT= Lightweight tunnel proxy which can help you get through firewalls	8	MAINTAINER= yp2008cn@gmail.com
		9	COMMENT= Lightweight tunnel proxy which can help you get through firewalls
11		10
12	LICENSE= GPLv3	11	LICENSE= GPLv3
13		12
14	# fetch from github repo	13	LIB_DEPENDS= libudns.so:dns/udns \
15	USE_GITHUB= yes	14	libev.so:devel/libev \
16	GH_ACCOUNT= madeye	15	libsodium.so:security/libsodium \
17		16	libmbedcrypto.so:security/mbedtls \
18	GNU_CONFIGURE= yes	17	libpcre.so:devel/pcre
19	USES= gmake libtool:keepla pathfix ssl
20	CPPFLAGS+= -I${OPENSSLINC}
21	CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
22
23	# Help solve building error since the integrated libsodium enables this option.
24	CFLAGS+= -fstack-protector
25		18
26	USE_RC_SUBR= shadowsocks_libev	19	USE_RC_SUBR= shadowsocks_libev
27		20
28	post-patch:	21	HAS_CONFIGURE= yes
29	${REINPLACE_CMD} -e 's\|^#ifdef TCP_FASTOPEN\|#if defined(TCP_FASTOPEN) \&\& defined(__linux)\|' \	22	CONFIGURE_ARGS= --disable-documentation
30	${WRKSRC}/src/local.c ${WRKSRC}/src/server.c
31		23
32	post-install:	24	post-install:
33	${MKDIR} ${STAGEDIR}${ETCDIR}	25	${MKDIR} ${STAGEDIR}${ETCDIR}
34	${CP} ${WRKSRC}/debian/config.json ${STAGEDIR}${ETCDIR}/config.json.sample	26	${CP} ${WRKSRC}/debian/config.json ${STAGEDIR}${ETCDIR}/config.json.sample
35		27
36	.include <bsd.port.mk>	28	.include <bsd.port.mk>

Lines 1-18 Link Here

(-)shadowsocks-libev/files/patch-libev__ev.c (-18 lines)
1	--- libev/ev.c.orig 2015-01-07 13:54:19.000000000 +0100
2	+++ libev/ev.c 2015-03-02 20:39:18.150956000 +0100
3	@@ -1022,12 +1022,12 @@
4	}
5	#endif
6
7	-#if ECB_GCC_VERSION(4,5)
8	+#if ECB_GCC_VERSION(4,5) \|\| defined __clang__
9	#define ecb_unreachable() __builtin_unreachable ()
10	#else
11	/* this seems to work fine, but gcc always emits a warning for it :/ */
12	- ecb_inline void ecb_unreachable (void) ecb_noreturn;
13	- ecb_inline void ecb_unreachable (void) { }
14	+ ecb_inline ecb_noreturn void ecb_unreachable (void);
15	+ ecb_inline ecb_noreturn void ecb_unreachable (void) { }
16	#endif
17
18	/* try to tell the compiler that some condition is definitely true */