Attachment 175449 Details for Bug 213229 – svn diff

[patch] svn diff

shadowsocks-libev.diff (text/plain), 4.26 KB, created by csosstudy on 2016-10-05 16:01:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: csosstudy

Created: 2016-10-05 16:01:40 UTC

Size: 4.26 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 423352)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	shadowsocks-libev
>-PORTVERSION=	1.6.4
>+PORTVERSION=	2.5.3
> DISTVERSIONPREFIX=	v
> CATEGORIES=	net
> 
>@@ -11,26 +11,31 @@
> 
> LICENSE=	GPLv3
> 
>+BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
>+		xmlto:textproc/xmlto
>+
> # fetch from github repo
> USE_GITHUB=	yes
>-GH_ACCOUNT=	madeye
>+GH_ACCOUNT=	shadowsocks
> 
> GNU_CONFIGURE=	yes
>-USES=		gmake libtool:keepla ssl
>-CPPFLAGS+=	-I${OPENSSLINC}
>-CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
>+USES=		gmake libtool:keepla
> 
> # 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
> 
>-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}
> 	${CP} ${WRKSRC}/debian/config.json  ${STAGEDIR}${ETCDIR}/config.json.sample
>Index: distinfo
>===================================================================
>--- distinfo	(revision 423352)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (madeye-shadowsocks-libev-v1.6.4_GH0.tar.gz) = 517b92e69e371efac4a9ca76e78095e3e866149a484ec4c88589dd4a3bdbb7b7
>-SIZE (madeye-shadowsocks-libev-v1.6.4_GH0.tar.gz) = 2404815
>+TIMESTAMP = 1475672907
>+SHA256 (shadowsocks-shadowsocks-libev-v2.5.3_GH0.tar.gz) = 4abd07b10476039190a6a60e822370d16750cb046f0bcb4877501e7d042c39e5
>+SIZE (shadowsocks-shadowsocks-libev-v2.5.3_GH0.tar.gz) = 1533607
>Index: files/patch-libev__ev.c
>===================================================================
>--- files/patch-libev__ev.c	(revision 423352)
>+++ files/patch-libev__ev.c	(nonexistent)
>@@ -1,18 +0,0 @@
>---- 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 */
>
>Property changes on: files/patch-libev__ev.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: pkg-plist
>===================================================================
>--- pkg-plist	(revision 423352)
>+++ pkg-plist	(working copy)
>@@ -1,9 +1,24 @@
> bin/ss-local
>+bin/ss-manager
> bin/ss-server
> bin/ss-tunnel
>+etc/rc.d/shadowsocks_libev
>+%%ETCDIR%%/config.json.sample
> include/shadowsocks.h
>-lib/libshadowsocks.a
>-lib/libshadowsocks.la
>-libdata/pkgconfig/shadowsocks-libev.pc
>+lib/libshadowsocks-libev.a
>+lib/libshadowsocks-libev.la
>+lib/pkgconfig/shadowsocks-libev.pc
>+man/man1/ss-local.1.gz
>+man/man1/ss-manager.1.gz
>+man/man1/ss-nat.1.gz
>+man/man1/ss-redir.1.gz
>+man/man1/ss-server.1.gz
>+man/man1/ss-tunnel.1.gz
> man/man8/shadowsocks-libev.8.gz
>-@sample etc/shadowsocks-libev/config.json.sample
>+%%PORTDOCS%%%%DOCSDIR%%/shadowsocks-libev.html
>+%%PORTDOCS%%%%DOCSDIR%%/ss-local.html
>+%%PORTDOCS%%%%DOCSDIR%%/ss-manager.html
>+%%PORTDOCS%%%%DOCSDIR%%/ss-nat.html
>+%%PORTDOCS%%%%DOCSDIR%%/ss-redir.html
>+%%PORTDOCS%%%%DOCSDIR%%/ss-server.html
>+%%PORTDOCS%%%%DOCSDIR%%/ss-tunnel.html

Actions: View | Diff

Attachments on bug 213229: 175449 | 175497 | 175556 | 175919 | 175952