Attachment 187206 Details for Bug 218294 – diff to upgrade to 3.1.0 based on 2.4.7

[patch] diff to upgrade to 3.1.0 based on 2.4.7

shadowsocks-libev-2.4.7-3.1.0-r2.diff (text/plain), 3.23 KB, created by Sutra on 2017-10-16 04:43:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sutra

Created: 2017-10-16 04:43:39 UTC

Size: 3.23 KB

patch

obsolete

>Index: net/shadowsocks-libev/Makefile
>===================================================================
>--- net/shadowsocks-libev/Makefile	(revision 451065)
>+++ net/shadowsocks-libev/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	shadowsocks-libev
>-PORTVERSION=	2.4.7
>+PORTVERSION=	3.1.0
> DISTVERSIONPREFIX=	v
> CATEGORIES=	net
> 
>@@ -11,18 +11,25 @@
> 
> LICENSE=	GPLv3
> 
>+BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
>+		xmlto:textproc/xmlto
>+LIB_DEPENDS=	libev.so:devel/libev \
>+		libmbedcrypto.so:security/mbedtls \
>+		libpcre.so:devel/pcre \
>+		libsodium.so:security/libsodium \
>+		libcares.so:dns/c-ares
>+
>+USES=		autoreconf gmake libtool:keepla pathfix
>+
> # fetch from github repo
> USE_GITHUB=	yes
> GH_ACCOUNT=	shadowsocks
>+GH_TUPLE=	shadowsocks:libcork:0220aa5:libcork/libcork \
>+		shadowsocks:ipset:3ea7fe3:libipset/libipset \
>+		shadowsocks:libbloom:7a9deb8:libbloom/libbloom
> 
> GNU_CONFIGURE=	yes
>-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
> 
> post-patch:
>@@ -31,6 +38,6 @@
> 
> post-install:
> 	${MKDIR} ${STAGEDIR}${ETCDIR}
>-	${CP} ${WRKSRC}/debian/config.json  ${STAGEDIR}${ETCDIR}/config.json.sample
>+	${CP} ${WRKSRC}/debian/config.json ${STAGEDIR}${ETCDIR}/config.json.sample
> 
> .include <bsd.port.mk>
>Index: net/shadowsocks-libev/distinfo
>===================================================================
>--- net/shadowsocks-libev/distinfo	(revision 451065)
>+++ net/shadowsocks-libev/distinfo	(working copy)
>@@ -1,3 +1,9 @@
>-TIMESTAMP = 1503421104
>-SHA256 (shadowsocks-shadowsocks-libev-v2.4.7_GH0.tar.gz) = 957265cc5339e020d8c8bb7414ab14936e3939dc7355f334aec896ec9b03c6ed
>-SIZE (shadowsocks-shadowsocks-libev-v2.4.7_GH0.tar.gz) = 1485472
>+TIMESTAMP = 1506953360
>+SHA256 (shadowsocks-shadowsocks-libev-v3.1.0_GH0.tar.gz) = 305e29bbd67c8cac4b244352e1ef804cb3801f501aae12bec0fe42708d7ff8a2
>+SIZE (shadowsocks-shadowsocks-libev-v3.1.0_GH0.tar.gz) = 260649
>+SHA256 (shadowsocks-libcork-0220aa5_GH0.tar.gz) = 95d6e1a09695329ea03734a8e4f75e8a726fd2a6b6baa6b0d28eabc299c5a168
>+SIZE (shadowsocks-libcork-0220aa5_GH0.tar.gz) = 184195
>+SHA256 (shadowsocks-ipset-3ea7fe3_GH0.tar.gz) = e7b487c21a5352a3c9faef3256ed1a539f7ee46f38bf57922340c125c720da61
>+SIZE (shadowsocks-ipset-3ea7fe3_GH0.tar.gz) = 64895
>+SHA256 (shadowsocks-libbloom-7a9deb8_GH0.tar.gz) = 726469328f0288c1ecb87b244a8978d471316f04e1234417ac4669bc16c8b4b0
>+SIZE (shadowsocks-libbloom-7a9deb8_GH0.tar.gz) = 1208059
>Index: net/shadowsocks-libev/pkg-plist
>===================================================================
>--- net/shadowsocks-libev/pkg-plist	(revision 451065)
>+++ net/shadowsocks-libev/pkg-plist	(working copy)
>@@ -13,4 +13,11 @@
> 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
>+@sample %%ETCDIR%%/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 218294: 181389 | 184755 | 186858 | 186865 | 187206 | 187427