Attachment #175497 for bug #213229




# $FreeBSD$

PORTNAME=	shadowsocks-libev
PORTVERSION=	2.5.3
DISTVERSIONPREFIX=	v
CATEGORIES=	net



LICENSE=	GPLv3

BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
		xmlto:textproc/xmlto

# fetch from github repo
USE_GITHUB=	yes
GH_ACCOUNT=	shadowsocks

GNU_CONFIGURE=	yes
USES=		gmake libtool:keepla
CPPFLAGS+=	-I${OPENSSLINC}
CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}

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

OPTIONS_SINGLE=		SSL
OPTIONS_SINGLE_SSL=	OPENSSL POLARSSL MBEDTLS
OPTIONS_DEFAULT=	OPENSSL
OPENSSL_USES=		ssl
OPENSSL_CONFIGURE_ON=	--with-crypto-library=openssl
POLARSSL_CONFIGURE_ON=	--with-crypto-library=polarssl
POLARSSL_LIB_DEPENDS=	libmbedtls.so.9:security/polarssl13
MBEDTLS_CONFIGURE_ON=	--with-crypto-library=mbedtls
MBEDTLS_LIB_DEPENDS=	libmbedcrypto.so.0:security/mbedtls

USE_RC_SUBR=	shadowsocks_libev

LIB_DEPENDS+=	libpcre.so:devel/pcre

post-patch:
	${REINPLACE_CMD} -e 's|^pkgconfiglibdir.*|pkgconfiglibdir = ${PREFIX}/libdata/pkgconfig|g' \
		${WRKSRC}/Makefile.in
	${REINPLACE_CMD} -e 's|^#ifdef TCP_FASTOPEN|#if defined(TCP_FASTOPEN) \&\& defined(__linux)|' \
		${WRKSRC}/src/local.c ${WRKSRC}/src/server.c

post-install:
	${MKDIR} ${STAGEDIR}${ETCDIR}

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (madeye-shadowsocks-libev-v1.6.4_GH0.tar.gz) = 517b92e69e371efac4a9ca76e78095e3e866149a484ec4c88589dd4a3bdbb7b7	1	TIMESTAMP = 1475672907
2	SIZE (madeye-shadowsocks-libev-v1.6.4_GH0.tar.gz) = 2404815	2	SHA256 (shadowsocks-shadowsocks-libev-v2.5.3_GH0.tar.gz) = 4abd07b10476039190a6a60e822370d16750cb046f0bcb4877501e7d042c39e5
		3	SIZE (shadowsocks-shadowsocks-libev-v2.5.3_GH0.tar.gz) = 1533607




--- 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 4-7 Link Here

(-)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

(-)pkg-plist (-3 / +17 lines)
1	bin/ss-local	1	bin/ss-local
		2	bin/ss-manager
2	bin/ss-server	3	bin/ss-server
3	bin/ss-tunnel	4	bin/ss-tunnel
		5	@sample %%ETCDIR%%/config.json.sample
4	include/shadowsocks.h	6	include/shadowsocks.h
5	lib/libshadowsocks.a	7	lib/libshadowsocks-libev.a
6	lib/libshadowsocks.la	8	lib/libshadowsocks-libev.la
7	libdata/pkgconfig/shadowsocks-libev.pc	9	libdata/pkgconfig/shadowsocks-libev.pc
		10	man/man1/ss-local.1.gz
		11	man/man1/ss-manager.1.gz
		12	man/man1/ss-nat.1.gz
		13	man/man1/ss-redir.1.gz
		14	man/man1/ss-server.1.gz
		15	man/man1/ss-tunnel.1.gz
8	man/man8/shadowsocks-libev.8.gz	16	man/man8/shadowsocks-libev.8.gz
9	@sample etc/shadowsocks-libev/config.json.sample	17	%%PORTDOCS%%%%DOCSDIR%%/shadowsocks-libev.html
		18	%%PORTDOCS%%%%DOCSDIR%%/ss-local.html
		19	%%PORTDOCS%%%%DOCSDIR%%/ss-manager.html
		20	%%PORTDOCS%%%%DOCSDIR%%/ss-nat.html
		21	%%PORTDOCS%%%%DOCSDIR%%/ss-redir.html
		22	%%PORTDOCS%%%%DOCSDIR%%/ss-server.html
		23	%%PORTDOCS%%%%DOCSDIR%%/ss-tunnel.html

Return to bug 213229

Lines 2-8 Link Here

(-)Makefile (-7 / +18 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= shadowsocks-libev	4	PORTNAME= shadowsocks-libev
5	PORTVERSION= 1.6.4	5	PORTVERSION= 2.5.3
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= net	7	CATEGORIES= net
8		8
Lines 11-35 Link Here
11		11
12	LICENSE= GPLv3	12	LICENSE= GPLv3
13		13
		14	BUILD_DEPENDS= asciidoc:textproc/asciidoc \
		15	xmlto:textproc/xmlto
		16
14	# fetch from github repo	17	# fetch from github repo
15	USE_GITHUB= yes	18	USE_GITHUB= yes
16	GH_ACCOUNT= madeye	19	GH_ACCOUNT= shadowsocks
17		20
18	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
19	USES= gmake libtool:keepla ssl	22	USES= gmake libtool:keepla
20	CPPFLAGS+= -I${OPENSSLINC}
21	CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
22		23
23	# Help solve building error since the integrated libsodium enables this option.	24	# Help solve building error since the integrated libsodium enables this option.
24	CFLAGS+= -fstack-protector	25	CFLAGS+= -fstack-protector
25		26
		27	OPTIONS_SINGLE= SSL
		28	OPTIONS_SINGLE_SSL= OPENSSL POLARSSL MBEDTLS
		29	OPTIONS_DEFAULT= OPENSSL
		30	OPENSSL_USES= ssl
		31	OPENSSL_CONFIGURE_ON= --with-crypto-library=openssl
		32	POLARSSL_CONFIGURE_ON= --with-crypto-library=polarssl
		33	POLARSSL_LIB_DEPENDS= libmbedtls.so.9:security/polarssl13
		34	MBEDTLS_CONFIGURE_ON= --with-crypto-library=mbedtls
		35	MBEDTLS_LIB_DEPENDS= libmbedcrypto.so.0:security/mbedtls
		36
26	USE_RC_SUBR= shadowsocks_libev	37	USE_RC_SUBR= shadowsocks_libev
27		38
		39	LIB_DEPENDS+= libpcre.so:devel/pcre
		40
28	post-patch:	41	post-patch:
29	${REINPLACE_CMD} -e 's\|^pkgconfiglibdir.*\|pkgconfiglibdir = ${PREFIX}/libdata/pkgconfig\|g' \	42	${REINPLACE_CMD} -e 's\|^pkgconfiglibdir.*\|pkgconfiglibdir = ${PREFIX}/libdata/pkgconfig\|g' \
30	${WRKSRC}/Makefile.in	43	${WRKSRC}/Makefile.in
31	${REINPLACE_CMD} -e 's\|^#ifdef TCP_FASTOPEN\|#if defined(TCP_FASTOPEN) \&\& defined(__linux)\|' \
32	${WRKSRC}/src/local.c ${WRKSRC}/src/server.c
33		44
34	post-install:	45	post-install:
35	${MKDIR} ${STAGEDIR}${ETCDIR}	46	${MKDIR} ${STAGEDIR}${ETCDIR}

Lines 1-18 Link Here

(-)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 */