Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Feb 2018 05:09:48 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r460962 - head/net/shadowsocks-libev
Message-ID:  <201802050509.w1559msj092433@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Mon Feb  5 05:09:48 2018
New Revision: 460962
URL: https://svnweb.freebsd.org/changeset/ports/460962

Log:
  net/shadowsocks-libev: Update to 3.1.3
  
  Summary of change logs:
  * shadowsocks-libev (3.1.3-1)
    * Fix a bug in UDP relay.
  * shadowsocks-libev (3.1.2-1)
    * Fix a bug in DNS resolver.
    * Add new TFO API support.
  * shadowsocks-libev (3.1.1-1)
    * Fix a security issue in ss-manager. (CVE-2017-15924)
  
  Additional port changes:
  * Added LICENSE_FILE
  * Sorted GH_TUPLE
  * Changed static library to shared library
  * Added USE_LDCONFIG
  * Added INSTALL_TARGET=install-strip
  * Added optional shell completion files for BASH and ZSH
  
  PR:		225442
  Submitted by:	csosstudy@gmail.com (PORTVERSION line)
  Approved by:	xiaoding+freebsd@xiaoding.org (maintainer), adamw (mentor)
  MFH:		2018Q1
  Differential Revision:	https://reviews.freebsd.org/D14200

Modified:
  head/net/shadowsocks-libev/Makefile
  head/net/shadowsocks-libev/distinfo
  head/net/shadowsocks-libev/pkg-plist

Modified: head/net/shadowsocks-libev/Makefile
==============================================================================
--- head/net/shadowsocks-libev/Makefile	Mon Feb  5 05:07:24 2018	(r460961)
+++ head/net/shadowsocks-libev/Makefile	Mon Feb  5 05:09:48 2018	(r460962)
@@ -2,14 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	shadowsocks-libev
-PORTVERSION=	3.1.0
 DISTVERSIONPREFIX=	v
+DISTVERSION=	3.1.3
 CATEGORIES=	net
 
 MAINTAINER=	xiaoding+freebsd@xiaoding.org
 COMMENT=	Lightweight tunnel proxy which can help you get through firewalls
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libev.so:devel/libev \
 		libmbedcrypto.so:security/mbedtls \
@@ -18,17 +19,17 @@ LIB_DEPENDS=	libev.so:devel/libev \
 		libcares.so:dns/c-ares
 
 USES=		autoreconf gmake libtool:keepla pathfix
-
-# fetch from github repo
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-shared
 USE_GITHUB=	yes
 GH_ACCOUNT=	shadowsocks
-GH_TUPLE=	shadowsocks:libcork:0220aa5:libcork/libcork \
-		shadowsocks:ipset:3ea7fe3:libipset/libipset \
-		shadowsocks:libbloom:7a9deb8:libbloom/libbloom
+GH_TUPLE=	shadowsocks:libbloom:7a9deb8:libbloom/libbloom \
+		shadowsocks:libcork:0220aa5:libcork/libcork \
+		shadowsocks:ipset:3ea7fe3:libipset/libipset
+INSTALL_TARGET=	install-strip
+USE_LDCONFIG=	yes
 
-GNU_CONFIGURE=	yes
-
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	BASH DOCS ZSH
 OPTIONS_SUB=	yes
 
 DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
@@ -38,11 +39,23 @@ DOCS_CONFIGURE_OFF=	--disable-documentation
 USE_RC_SUBR=	shadowsocks_libev
 
 post-patch:
-	${REINPLACE_CMD} -e 's|^#ifdef TCP_FASTOPEN|#if defined(TCP_FASTOPEN) \&\& defined(__linux)|' \
+	@${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}
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/debian/config.json ${STAGEDIR}${ETCDIR}/config.json.sample
+
+post-install-BASH-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
+.for c in ss-local ss-manager ss-redir ss-server ss-tunnel
+	${INSTALL_DATA} ${WRKSRC}/completions/bash/${c} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/${c}
+.endfor
+
+post-install-ZSH-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+.for c in _ss-local _ss-manager _ss-redir _ss-server _ss-tunnel
+	${INSTALL_DATA} ${WRKSRC}/completions/zsh/${c} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/${c}
+.endfor
 
 .include <bsd.port.mk>

Modified: head/net/shadowsocks-libev/distinfo
==============================================================================
--- head/net/shadowsocks-libev/distinfo	Mon Feb  5 05:07:24 2018	(r460961)
+++ head/net/shadowsocks-libev/distinfo	Mon Feb  5 05:09:48 2018	(r460962)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1506953360
-SHA256 (shadowsocks-shadowsocks-libev-v3.1.0_GH0.tar.gz) = 305e29bbd67c8cac4b244352e1ef804cb3801f501aae12bec0fe42708d7ff8a2
-SIZE (shadowsocks-shadowsocks-libev-v3.1.0_GH0.tar.gz) = 260649
+TIMESTAMP = 1517786418
+SHA256 (shadowsocks-shadowsocks-libev-v3.1.3_GH0.tar.gz) = 285fa05bfb4ce65dd77d9a223749f3a625a97e6bc7d9c17af910701e1a00e06a
+SIZE (shadowsocks-shadowsocks-libev-v3.1.3_GH0.tar.gz) = 265286
 SHA256 (shadowsocks-libcork-0220aa5_GH0.tar.gz) = 95d6e1a09695329ea03734a8e4f75e8a726fd2a6b6baa6b0d28eabc299c5a168
 SIZE (shadowsocks-libcork-0220aa5_GH0.tar.gz) = 184195
 SHA256 (shadowsocks-ipset-3ea7fe3_GH0.tar.gz) = e7b487c21a5352a3c9faef3256ed1a539f7ee46f38bf57922340c125c720da61

Modified: head/net/shadowsocks-libev/pkg-plist
==============================================================================
--- head/net/shadowsocks-libev/pkg-plist	Mon Feb  5 05:07:24 2018	(r460961)
+++ head/net/shadowsocks-libev/pkg-plist	Mon Feb  5 05:09:48 2018	(r460962)
@@ -3,10 +3,22 @@ bin/ss-manager
 bin/ss-server
 bin/ss-tunnel
 include/shadowsocks.h
-lib/libshadowsocks-libev.a
 lib/libshadowsocks-libev.la
+lib/libshadowsocks-libev.so
+lib/libshadowsocks-libev.so.2
+lib/libshadowsocks-libev.so.2.0.0
 libdata/pkgconfig/shadowsocks-libev.pc
 @sample %%ETCDIR%%/config.json.sample
+%%BASH%%share/bash-completion/completions/ss-local
+%%BASH%%share/bash-completion/completions/ss-manager
+%%BASH%%share/bash-completion/completions/ss-redir
+%%BASH%%share/bash-completion/completions/ss-server
+%%BASH%%share/bash-completion/completions/ss-tunnel
+%%ZSH%%share/zsh/site-functions/_ss-local
+%%ZSH%%share/zsh/site-functions/_ss-manager
+%%ZSH%%share/zsh/site-functions/_ss-redir
+%%ZSH%%share/zsh/site-functions/_ss-server
+%%ZSH%%share/zsh/site-functions/_ss-tunnel
 %%DOCS%%man/man1/ss-local.1.gz
 %%DOCS%%man/man1/ss-manager.1.gz
 %%DOCS%%man/man1/ss-nat.1.gz



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