Attachment 181096 Details for Bug 210090 – Patch from 1.6.4 to 2.4.7, revision 2

[patch] Patch from 1.6.4 to 2.4.7, revision 2

1.6.4-2.4.7_2.diff (text/plain), 3.29 KB, created by Sergey Kostrukov on 2017-03-23 12:34:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Kostrukov

Created: 2017-03-23 12:34:43 UTC

Size: 3.29 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 436705)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	shadowsocks-libev
>-PORTVERSION=	1.6.4
>+PORTVERSION=	2.4.7
> DISTVERSIONPREFIX=	v
> CATEGORIES=	net
> 
>@@ -13,7 +13,7 @@
> 
> # fetch from github repo
> USE_GITHUB=	yes
>-GH_ACCOUNT=	madeye
>+GH_ACCOUNT=	shadowsocks
> 
> GNU_CONFIGURE=	yes
> USES=		gmake libtool:keepla pathfix ssl
>Index: distinfo
>===================================================================
>--- distinfo	(revision 436705)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (madeye-shadowsocks-libev-v1.6.4_GH0.tar.gz) = 517b92e69e371efac4a9ca76e78095e3e866149a484ec4c88589dd4a3bdbb7b7
>-SIZE (madeye-shadowsocks-libev-v1.6.4_GH0.tar.gz) = 2404815
>+SHA256 (shadowsocks-shadowsocks-libev-v2.4.7_GH0.tar.gz) = 957265cc5339e020d8c8bb7414ab14936e3939dc7355f334aec896ec9b03c6ed
>+SIZE (shadowsocks-shadowsocks-libev-v2.4.7_GH0.tar.gz) = 1485472
>Index: files/patch-libev__ev.c
>===================================================================
>--- files/patch-libev__ev.c	(revision 436705)
>+++ 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-descr
>===================================================================
>--- pkg-descr	(revision 436705)
>+++ pkg-descr	(working copy)
>@@ -1,7 +1,7 @@
> Shadowsocks is a lightweight tunnel proxy which can help you get through
> firewalls.
> 
>-Shadowsocks-libuv is a C implentment based on libuv. It targets mainly on
>+Shadowsocks-libev is a C implentment based on libev. It targets mainly on
> embedded devices and low end boxes.
> 
>-WWW: https://github.com/madeye/shadowsocks-libev
>+WWW: https://github.com/shadowsocks/shadowsocks-libev
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 436705)
>+++ pkg-plist	(working copy)
>@@ -1,9 +1,16 @@
> bin/ss-local
>+bin/ss-manager
> bin/ss-server
> bin/ss-tunnel
> include/shadowsocks.h
>-lib/libshadowsocks.a
>-lib/libshadowsocks.la
>+lib/libshadowsocks-libev.a
>+lib/libshadowsocks-libev.la
> libdata/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

Actions: View | Diff

Attachments on bug 210090: 171125 | 181096