[arch-commits] Commit in shadowsocks-libev/repos (26 files)

Felix Yan felixonmars at archlinux.org
Thu Mar 16 07:54:25 UTC 2017


    Date: Thursday, March 16, 2017 @ 07:54:24
  Author: felixonmars
Revision: 216615

archrelease: copy trunk to community-i686, community-x86_64

Added:
  shadowsocks-libev/repos/community-i686/PKGBUILD
    (from rev 216614, shadowsocks-libev/trunk/PKGBUILD)
  shadowsocks-libev/repos/community-i686/shadowsocks-libev-redir at .service
    (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev-redir at .service)
  shadowsocks-libev/repos/community-i686/shadowsocks-libev-server at .service
    (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev-server at .service)
  shadowsocks-libev/repos/community-i686/shadowsocks-libev-tunnel at .service
    (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev-tunnel at .service)
  shadowsocks-libev/repos/community-i686/shadowsocks-libev.install
    (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev.install)
  shadowsocks-libev/repos/community-i686/shadowsocks-libev at .service
    (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev at .service)
  shadowsocks-libev/repos/community-i686/shared-bloom.patch
    (from rev 216614, shadowsocks-libev/trunk/shared-bloom.patch)
  shadowsocks-libev/repos/community-x86_64/PKGBUILD
    (from rev 216614, shadowsocks-libev/trunk/PKGBUILD)
  shadowsocks-libev/repos/community-x86_64/shadowsocks-libev-redir at .service
    (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev-redir at .service)
  shadowsocks-libev/repos/community-x86_64/shadowsocks-libev-server at .service
    (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev-server at .service)
  shadowsocks-libev/repos/community-x86_64/shadowsocks-libev-tunnel at .service
    (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev-tunnel at .service)
  shadowsocks-libev/repos/community-x86_64/shadowsocks-libev.install
    (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev.install)
  shadowsocks-libev/repos/community-x86_64/shadowsocks-libev at .service
    (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev at .service)
  shadowsocks-libev/repos/community-x86_64/shared-bloom.patch
    (from rev 216614, shadowsocks-libev/trunk/shared-bloom.patch)
Deleted:
  shadowsocks-libev/repos/community-i686/PKGBUILD
  shadowsocks-libev/repos/community-i686/shadowsocks-libev-redir at .service
  shadowsocks-libev/repos/community-i686/shadowsocks-libev-server at .service
  shadowsocks-libev/repos/community-i686/shadowsocks-libev-tunnel at .service
  shadowsocks-libev/repos/community-i686/shadowsocks-libev.install
  shadowsocks-libev/repos/community-i686/shadowsocks-libev at .service
  shadowsocks-libev/repos/community-x86_64/PKGBUILD
  shadowsocks-libev/repos/community-x86_64/shadowsocks-libev-redir at .service
  shadowsocks-libev/repos/community-x86_64/shadowsocks-libev-server at .service
  shadowsocks-libev/repos/community-x86_64/shadowsocks-libev-tunnel at .service
  shadowsocks-libev/repos/community-x86_64/shadowsocks-libev.install
  shadowsocks-libev/repos/community-x86_64/shadowsocks-libev at .service

----------------------------------------------------+
 /PKGBUILD                                          |  100 +++++++++++++++++++
 /shadowsocks-libev-redir at .service                  |   26 ++++
 /shadowsocks-libev-server at .service                 |   26 ++++
 /shadowsocks-libev-tunnel at .service                 |   26 ++++
 /shadowsocks-libev.install                         |   20 +++
 /shadowsocks-libev at .service                        |   26 ++++
 community-i686/PKGBUILD                            |   53 ----------
 community-i686/shadowsocks-libev-redir at .service    |   13 --
 community-i686/shadowsocks-libev-server at .service   |   13 --
 community-i686/shadowsocks-libev-tunnel at .service   |   13 --
 community-i686/shadowsocks-libev.install           |   10 -
 community-i686/shadowsocks-libev at .service          |   13 --
 community-i686/shared-bloom.patch                  |   77 ++++++++++++++
 community-x86_64/PKGBUILD                          |   53 ----------
 community-x86_64/shadowsocks-libev-redir at .service  |   13 --
 community-x86_64/shadowsocks-libev-server at .service |   13 --
 community-x86_64/shadowsocks-libev-tunnel at .service |   13 --
 community-x86_64/shadowsocks-libev.install         |   10 -
 community-x86_64/shadowsocks-libev at .service        |   13 --
 community-x86_64/shared-bloom.patch                |   77 ++++++++++++++
 20 files changed, 378 insertions(+), 230 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-03-16 07:52:12 UTC (rev 216614)
+++ community-i686/PKGBUILD	2017-03-16 07:54:24 UTC (rev 216615)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: jiangxq <jiangxueqian at gmail dot com>
-# Contributor: zh99998 <zh99998 at gmail.com>
-# Contributor: 4679kun <admin at 4679 dot us>
-
-pkgname=shadowsocks-libev
-pkgver=3.0.3
-pkgrel=1
-pkgdesc='A lightweight secured socks5 proxy for embedded devices and low end boxes'
-arch=('i686' 'x86_64')
-url='https://github.com/shadowsocks/shadowsocks-libev'
-license=('GPL3')
-depends=('libcap' 'mbedtls' 'libsodium' 'libev' 'udns' 'pcre' 'libcorkipset' 'libbloom')
-makedepends=('git' 'asciidoc' 'xmlto')
-install=${pkgname}.install
-source=("git+https://github.com/shadowsocks/$pkgname.git#tag=v$pkgver"
-        shared-bloom.patch
-        'shadowsocks-libev at .service'
-        'shadowsocks-libev-server at .service'
-        'shadowsocks-libev-redir at .service'
-        'shadowsocks-libev-tunnel at .service')
-
-sha512sums=('SKIP'
-            'd980c0f8307f0d4402a72508eb8bd12b88f25485086e4ca108936b6f6229d3319c28f0d981f42569ca63eeca97962ab9cd15bce68dba7638a0a18ab0a935bc66'
-            '92186a3baf340e3e3b7e8893b01bbf29356d0111ea7ecc10bb6a31278a834a7c428c501b0bb15fc1e983c6dab74a7094deae2c5972a4b3e6807ece668944d321'
-            '4e7d22145af1e2ac65bfa0d8883c3b30a6ac726728265a782519ab3912d6e3034861e19b411b54aa1cdbf999b1758584f6452d9c98afb72b71f3a0b215813317'
-            'e233c0f67843509f542c25d6fc39fe6992571b7cd0ae75e3c9573a8cd6f9a72748b5c4d09914a6d9402bfe379db487c628b39c44cc165f71e48e874a56922b82'
-            'b8de1cc489a1feb8c0ca59fef8abf6c524343483563462a167cb4a5bed5e9605fe76e4fdc71a248a8a5fc882032737a02747916f79043d50f850645067ed38eb')
-
-prepare() {
-  cd "$srcdir/$pkgname"
-  patch -p1 -i ../shared-bloom.patch
-
-  sed -i 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' configure.ac
-}
-
-build() {
-  cd "$srcdir/$pkgname"
-
-  ./autogen.sh
-  ./configure --prefix=/usr --enable-shared --enable-system-shared-lib
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  make DESTDIR="$pkgdir/" install
-  install -Dm644 "$srcdir/shadowsocks-libev at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev at .service"
-  install -Dm644 "$srcdir/shadowsocks-libev-server at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev-server at .service"
-  install -Dm644 "$srcdir/shadowsocks-libev-redir at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev-redir at .service"
-  install -Dm644 "$srcdir/shadowsocks-libev-tunnel at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev-tunnel at .service"
-}

Copied: shadowsocks-libev/repos/community-i686/PKGBUILD (from rev 216614, shadowsocks-libev/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-03-16 07:54:24 UTC (rev 216615)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: jiangxq <jiangxueqian at gmail dot com>
+# Contributor: zh99998 <zh99998 at gmail.com>
+# Contributor: 4679kun <admin at 4679 dot us>
+
+pkgname=shadowsocks-libev
+pkgver=3.0.4
+pkgrel=1
+pkgdesc='A lightweight secured socks5 proxy for embedded devices and low end boxes'
+arch=('i686' 'x86_64')
+url='https://github.com/shadowsocks/shadowsocks-libev'
+license=('GPL3')
+depends=('libcap' 'mbedtls' 'libsodium' 'libev' 'udns' 'pcre' 'libcorkipset' 'libbloom')
+makedepends=('asciidoc' 'xmlto')
+install=${pkgname}.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/shadowsocks/$pkgname/archive/v$pkgver.tar.gz"
+        'shadowsocks-libev at .service'
+        'shadowsocks-libev-server at .service'
+        'shadowsocks-libev-redir at .service'
+        'shadowsocks-libev-tunnel at .service')
+
+sha512sums=('da8617df539197ee80c2cf654536e621daa561cd33b1c5a5a1181577b1db7c375bc399592c050bab3425245cd7f5047cc7702e67426d00626fefd1b51a603225'
+            '92186a3baf340e3e3b7e8893b01bbf29356d0111ea7ecc10bb6a31278a834a7c428c501b0bb15fc1e983c6dab74a7094deae2c5972a4b3e6807ece668944d321'
+            '4e7d22145af1e2ac65bfa0d8883c3b30a6ac726728265a782519ab3912d6e3034861e19b411b54aa1cdbf999b1758584f6452d9c98afb72b71f3a0b215813317'
+            'e233c0f67843509f542c25d6fc39fe6992571b7cd0ae75e3c9573a8cd6f9a72748b5c4d09914a6d9402bfe379db487c628b39c44cc165f71e48e874a56922b82'
+            'b8de1cc489a1feb8c0ca59fef8abf6c524343483563462a167cb4a5bed5e9605fe76e4fdc71a248a8a5fc882032737a02747916f79043d50f850645067ed38eb')
+
+prepare() {
+  cd "$srcdir"/$pkgname-$pkgver
+
+  sed -i 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' configure.ac
+}
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+
+  ./autogen.sh
+  ./configure --prefix=/usr --enable-shared --enable-system-shared-lib
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir/" install
+  install -Dm644 "$srcdir/shadowsocks-libev at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev at .service"
+  install -Dm644 "$srcdir/shadowsocks-libev-server at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev-server at .service"
+  install -Dm644 "$srcdir/shadowsocks-libev-redir at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev-redir at .service"
+  install -Dm644 "$srcdir/shadowsocks-libev-tunnel at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev-tunnel at .service"
+}

Deleted: community-i686/shadowsocks-libev-redir at .service
===================================================================
--- community-i686/shadowsocks-libev-redir at .service	2017-03-16 07:52:12 UTC (rev 216614)
+++ community-i686/shadowsocks-libev-redir at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Client Service Redir Mode
-After=network.target
-
-[Service]
-Type=simple
-User=nobody
-CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-redir -c /etc/shadowsocks/%i.json
-
-[Install]
-WantedBy=multi-user.target
-

Copied: shadowsocks-libev/repos/community-i686/shadowsocks-libev-redir at .service (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev-redir at .service)
===================================================================
--- community-i686/shadowsocks-libev-redir at .service	                        (rev 0)
+++ community-i686/shadowsocks-libev-redir at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Shadowsocks-Libev Client Service Redir Mode
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE
+ExecStart=/usr/bin/ss-redir -c /etc/shadowsocks/%i.json
+
+[Install]
+WantedBy=multi-user.target
+

Deleted: community-i686/shadowsocks-libev-server at .service
===================================================================
--- community-i686/shadowsocks-libev-server at .service	2017-03-16 07:52:12 UTC (rev 216614)
+++ community-i686/shadowsocks-libev-server at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Server Service
-After=network.target
-
-[Service]
-Type=simple
-User=nobody
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-server -c /etc/shadowsocks/%i.json
-
-[Install]
-WantedBy=multi-user.target
-

Copied: shadowsocks-libev/repos/community-i686/shadowsocks-libev-server at .service (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev-server at .service)
===================================================================
--- community-i686/shadowsocks-libev-server at .service	                        (rev 0)
+++ community-i686/shadowsocks-libev-server at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Shadowsocks-Libev Server Service
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+ExecStart=/usr/bin/ss-server -c /etc/shadowsocks/%i.json
+
+[Install]
+WantedBy=multi-user.target
+

Deleted: community-i686/shadowsocks-libev-tunnel at .service
===================================================================
--- community-i686/shadowsocks-libev-tunnel at .service	2017-03-16 07:52:12 UTC (rev 216614)
+++ community-i686/shadowsocks-libev-tunnel at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Client Service Tunnel Mode
-After=network.target
-
-[Service]
-Type=simple
-User=nobody
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-tunnel -c /etc/shadowsocks/%i.json
-
-[Install]
-WantedBy=multi-user.target
-

Copied: shadowsocks-libev/repos/community-i686/shadowsocks-libev-tunnel at .service (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev-tunnel at .service)
===================================================================
--- community-i686/shadowsocks-libev-tunnel at .service	                        (rev 0)
+++ community-i686/shadowsocks-libev-tunnel at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Shadowsocks-Libev Client Service Tunnel Mode
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+ExecStart=/usr/bin/ss-tunnel -c /etc/shadowsocks/%i.json
+
+[Install]
+WantedBy=multi-user.target
+

Deleted: community-i686/shadowsocks-libev.install
===================================================================
--- community-i686/shadowsocks-libev.install	2017-03-16 07:52:12 UTC (rev 216614)
+++ community-i686/shadowsocks-libev.install	2017-03-16 07:54:24 UTC (rev 216615)
@@ -1,10 +0,0 @@
-post_install() {
-	setcap cap_net_bind_service+ep usr/bin/ss-local  2>/dev/null
-	setcap cap_net_bind_service+ep usr/bin/ss-server 2>/dev/null
-	setcap cap_net_bind_service+ep usr/bin/ss-tunnel 2>/dev/null
-	setcap cap_net_bind_service+ep usr/bin/ss-redir  2>/dev/null
-}
-
-post_upgrade() {
-	post_install "$1"
-}

Copied: shadowsocks-libev/repos/community-i686/shadowsocks-libev.install (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev.install)
===================================================================
--- community-i686/shadowsocks-libev.install	                        (rev 0)
+++ community-i686/shadowsocks-libev.install	2017-03-16 07:54:24 UTC (rev 216615)
@@ -0,0 +1,10 @@
+post_install() {
+	setcap cap_net_bind_service+ep usr/bin/ss-local  2>/dev/null
+	setcap cap_net_bind_service+ep usr/bin/ss-server 2>/dev/null
+	setcap cap_net_bind_service+ep usr/bin/ss-tunnel 2>/dev/null
+	setcap cap_net_bind_service+ep usr/bin/ss-redir  2>/dev/null
+}
+
+post_upgrade() {
+	post_install "$1"
+}

Deleted: community-i686/shadowsocks-libev at .service
===================================================================
--- community-i686/shadowsocks-libev at .service	2017-03-16 07:52:12 UTC (rev 216614)
+++ community-i686/shadowsocks-libev at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Client Service
-After=network.target
-
-[Service]
-Type=simple
-User=nobody
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-local -c /etc/shadowsocks/%i.json
-
-[Install]
-WantedBy=multi-user.target
-

Copied: shadowsocks-libev/repos/community-i686/shadowsocks-libev at .service (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev at .service)
===================================================================
--- community-i686/shadowsocks-libev at .service	                        (rev 0)
+++ community-i686/shadowsocks-libev at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Shadowsocks-Libev Client Service
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+ExecStart=/usr/bin/ss-local -c /etc/shadowsocks/%i.json
+
+[Install]
+WantedBy=multi-user.target
+

Copied: shadowsocks-libev/repos/community-i686/shared-bloom.patch (from rev 216614, shadowsocks-libev/trunk/shared-bloom.patch)
===================================================================
--- community-i686/shared-bloom.patch	                        (rev 0)
+++ community-i686/shared-bloom.patch	2017-03-16 07:54:24 UTC (rev 216615)
@@ -0,0 +1,77 @@
+commit 3c8ab9b46a5527bb309e30cfe51f84b84ccc591f
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Thu Mar 9 12:40:36 2017 +0800
+
+    Use system libbloom on USE_SYSTEM_SHARED_LIB
+
+diff --git a/Makefile.am b/Makefile.am
+index dc6ad6b..12a0b0b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,5 @@
+ if USE_SYSTEM_SHARED_LIB
+-SUBDIRS = src libbloom
++SUBDIRS = src
+ else
+ SUBDIRS = libcork libipset libbloom src
+ endif
+diff --git a/configure.ac b/configure.ac
+index 92b567d..a63d1ce 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,9 +46,9 @@ AM_CONDITIONAL([ENABLE_DOCUMENTATION], [test x$disable_documentation = xfalse])
+ 
+ AM_COND_IF([ENABLE_DOCUMENTATION], [
+   AC_PATH_PROG([ASCIIDOC], [asciidoc])
+-  test x"${ASCIIDOC}" != x || AC_MSG_ERROR([Cannot find `asciidoc` in PATH.]) 
++  test x"${ASCIIDOC}" != x || AC_MSG_ERROR([Cannot find `asciidoc` in PATH.])
+   AC_PATH_PROG([XMLTO], [xmlto])
+-  test x"$XMLTO" != x || AC_MSG_ERROR([Cannot find `xmlto` in PATH.]) 
++  test x"$XMLTO" != x || AC_MSG_ERROR([Cannot find `xmlto` in PATH.])
+   AC_PATH_PROG([GZIP], [gzip], [gzip])
+   AC_PATH_PROG([MV], [mv], [mv])
+   AC_PROG_SED
+@@ -231,12 +231,11 @@ AC_CHECK_LIB([ev], [ev_loop_destroy], [LIBS="-lev $LIBS"], [AC_MSG_ERROR([Couldn
+ 
+ AC_CONFIG_FILES([shadowsocks-libev.pc
+                  Makefile
+-                 src/Makefile
+-                 libbloom/Makefile])
++                 src/Makefile])
+ 
+ AM_COND_IF([USE_SYSTEM_SHARED_LIB],
+ 		   [AC_DEFINE([USE_SYSTEM_SHARED_LIB], [1], [Define if use system shared lib.])],
+-		   [AC_CONFIG_FILES([libcork/Makefile libipset/Makefile])])
++		   [AC_CONFIG_FILES([libbloom/Makefile libcork/Makefile libipset/Makefile])])
+ 
+ AM_COND_IF([ENABLE_DOCUMENTATION],
+   [AC_CONFIG_FILES([doc/Makefile])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 4d38318..1b77974 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,20 +2,20 @@ VERSION_INFO = 2:0:0
+ 
+ AM_CFLAGS = -g -O2 -Wall -Werror -Wno-deprecated-declarations -fno-strict-aliasing -std=gnu99 -D_GNU_SOURCE
+ AM_CFLAGS += $(PTHREAD_CFLAGS)
+-AM_CFLAGS += -I$(top_srcdir)/libbloom
+ if !USE_SYSTEM_SHARED_LIB
++AM_CFLAGS += -I$(top_srcdir)/libbloom
+ AM_CFLAGS += -I$(top_srcdir)/libipset/include
+ AM_CFLAGS += -I$(top_srcdir)/libcork/include
+ endif
+ AM_CFLAGS += $(LIBPCRE_CFLAGS)
+ 
+ SS_COMMON_LIBS = $(INET_NTOP_LIB) $(LIBPCRE_LIBS)
+-SS_COMMON_LIBS += $(top_builddir)/libbloom/libbloom.la
+ if !USE_SYSTEM_SHARED_LIB
+-SS_COMMON_LIBS += $(top_builddir)/libipset/libipset.la \
++SS_COMMON_LIBS += $(top_builddir)/libbloom/libbloom.la \
++                  $(top_builddir)/libipset/libipset.la \
+                   $(top_builddir)/libcork/libcork.la
+ else
+-SS_COMMON_LIBS += -lcork -lcorkipset
++SS_COMMON_LIBS += -lbloom -lcork -lcorkipset
+ endif
+ SS_COMMON_LIBS += -lev -lsodium -lm
+ 

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-03-16 07:52:12 UTC (rev 216614)
+++ community-x86_64/PKGBUILD	2017-03-16 07:54:24 UTC (rev 216615)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: jiangxq <jiangxueqian at gmail dot com>
-# Contributor: zh99998 <zh99998 at gmail.com>
-# Contributor: 4679kun <admin at 4679 dot us>
-
-pkgname=shadowsocks-libev
-pkgver=3.0.3
-pkgrel=1
-pkgdesc='A lightweight secured socks5 proxy for embedded devices and low end boxes'
-arch=('i686' 'x86_64')
-url='https://github.com/shadowsocks/shadowsocks-libev'
-license=('GPL3')
-depends=('libcap' 'mbedtls' 'libsodium' 'libev' 'udns' 'pcre' 'libcorkipset' 'libbloom')
-makedepends=('git' 'asciidoc' 'xmlto')
-install=${pkgname}.install
-source=("git+https://github.com/shadowsocks/$pkgname.git#tag=v$pkgver"
-        shared-bloom.patch
-        'shadowsocks-libev at .service'
-        'shadowsocks-libev-server at .service'
-        'shadowsocks-libev-redir at .service'
-        'shadowsocks-libev-tunnel at .service')
-
-sha512sums=('SKIP'
-            'd980c0f8307f0d4402a72508eb8bd12b88f25485086e4ca108936b6f6229d3319c28f0d981f42569ca63eeca97962ab9cd15bce68dba7638a0a18ab0a935bc66'
-            '92186a3baf340e3e3b7e8893b01bbf29356d0111ea7ecc10bb6a31278a834a7c428c501b0bb15fc1e983c6dab74a7094deae2c5972a4b3e6807ece668944d321'
-            '4e7d22145af1e2ac65bfa0d8883c3b30a6ac726728265a782519ab3912d6e3034861e19b411b54aa1cdbf999b1758584f6452d9c98afb72b71f3a0b215813317'
-            'e233c0f67843509f542c25d6fc39fe6992571b7cd0ae75e3c9573a8cd6f9a72748b5c4d09914a6d9402bfe379db487c628b39c44cc165f71e48e874a56922b82'
-            'b8de1cc489a1feb8c0ca59fef8abf6c524343483563462a167cb4a5bed5e9605fe76e4fdc71a248a8a5fc882032737a02747916f79043d50f850645067ed38eb')
-
-prepare() {
-  cd "$srcdir/$pkgname"
-  patch -p1 -i ../shared-bloom.patch
-
-  sed -i 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' configure.ac
-}
-
-build() {
-  cd "$srcdir/$pkgname"
-
-  ./autogen.sh
-  ./configure --prefix=/usr --enable-shared --enable-system-shared-lib
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  make DESTDIR="$pkgdir/" install
-  install -Dm644 "$srcdir/shadowsocks-libev at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev at .service"
-  install -Dm644 "$srcdir/shadowsocks-libev-server at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev-server at .service"
-  install -Dm644 "$srcdir/shadowsocks-libev-redir at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev-redir at .service"
-  install -Dm644 "$srcdir/shadowsocks-libev-tunnel at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev-tunnel at .service"
-}

Copied: shadowsocks-libev/repos/community-x86_64/PKGBUILD (from rev 216614, shadowsocks-libev/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-03-16 07:54:24 UTC (rev 216615)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: jiangxq <jiangxueqian at gmail dot com>
+# Contributor: zh99998 <zh99998 at gmail.com>
+# Contributor: 4679kun <admin at 4679 dot us>
+
+pkgname=shadowsocks-libev
+pkgver=3.0.4
+pkgrel=1
+pkgdesc='A lightweight secured socks5 proxy for embedded devices and low end boxes'
+arch=('i686' 'x86_64')
+url='https://github.com/shadowsocks/shadowsocks-libev'
+license=('GPL3')
+depends=('libcap' 'mbedtls' 'libsodium' 'libev' 'udns' 'pcre' 'libcorkipset' 'libbloom')
+makedepends=('asciidoc' 'xmlto')
+install=${pkgname}.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/shadowsocks/$pkgname/archive/v$pkgver.tar.gz"
+        'shadowsocks-libev at .service'
+        'shadowsocks-libev-server at .service'
+        'shadowsocks-libev-redir at .service'
+        'shadowsocks-libev-tunnel at .service')
+
+sha512sums=('da8617df539197ee80c2cf654536e621daa561cd33b1c5a5a1181577b1db7c375bc399592c050bab3425245cd7f5047cc7702e67426d00626fefd1b51a603225'
+            '92186a3baf340e3e3b7e8893b01bbf29356d0111ea7ecc10bb6a31278a834a7c428c501b0bb15fc1e983c6dab74a7094deae2c5972a4b3e6807ece668944d321'
+            '4e7d22145af1e2ac65bfa0d8883c3b30a6ac726728265a782519ab3912d6e3034861e19b411b54aa1cdbf999b1758584f6452d9c98afb72b71f3a0b215813317'
+            'e233c0f67843509f542c25d6fc39fe6992571b7cd0ae75e3c9573a8cd6f9a72748b5c4d09914a6d9402bfe379db487c628b39c44cc165f71e48e874a56922b82'
+            'b8de1cc489a1feb8c0ca59fef8abf6c524343483563462a167cb4a5bed5e9605fe76e4fdc71a248a8a5fc882032737a02747916f79043d50f850645067ed38eb')
+
+prepare() {
+  cd "$srcdir"/$pkgname-$pkgver
+
+  sed -i 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' configure.ac
+}
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+
+  ./autogen.sh
+  ./configure --prefix=/usr --enable-shared --enable-system-shared-lib
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir/" install
+  install -Dm644 "$srcdir/shadowsocks-libev at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev at .service"
+  install -Dm644 "$srcdir/shadowsocks-libev-server at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev-server at .service"
+  install -Dm644 "$srcdir/shadowsocks-libev-redir at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev-redir at .service"
+  install -Dm644 "$srcdir/shadowsocks-libev-tunnel at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-libev-tunnel at .service"
+}

Deleted: community-x86_64/shadowsocks-libev-redir at .service
===================================================================
--- community-x86_64/shadowsocks-libev-redir at .service	2017-03-16 07:52:12 UTC (rev 216614)
+++ community-x86_64/shadowsocks-libev-redir at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Client Service Redir Mode
-After=network.target
-
-[Service]
-Type=simple
-User=nobody
-CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-redir -c /etc/shadowsocks/%i.json
-
-[Install]
-WantedBy=multi-user.target
-

Copied: shadowsocks-libev/repos/community-x86_64/shadowsocks-libev-redir at .service (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev-redir at .service)
===================================================================
--- community-x86_64/shadowsocks-libev-redir at .service	                        (rev 0)
+++ community-x86_64/shadowsocks-libev-redir at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Shadowsocks-Libev Client Service Redir Mode
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE
+ExecStart=/usr/bin/ss-redir -c /etc/shadowsocks/%i.json
+
+[Install]
+WantedBy=multi-user.target
+

Deleted: community-x86_64/shadowsocks-libev-server at .service
===================================================================
--- community-x86_64/shadowsocks-libev-server at .service	2017-03-16 07:52:12 UTC (rev 216614)
+++ community-x86_64/shadowsocks-libev-server at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Server Service
-After=network.target
-
-[Service]
-Type=simple
-User=nobody
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-server -c /etc/shadowsocks/%i.json
-
-[Install]
-WantedBy=multi-user.target
-

Copied: shadowsocks-libev/repos/community-x86_64/shadowsocks-libev-server at .service (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev-server at .service)
===================================================================
--- community-x86_64/shadowsocks-libev-server at .service	                        (rev 0)
+++ community-x86_64/shadowsocks-libev-server at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Shadowsocks-Libev Server Service
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+ExecStart=/usr/bin/ss-server -c /etc/shadowsocks/%i.json
+
+[Install]
+WantedBy=multi-user.target
+

Deleted: community-x86_64/shadowsocks-libev-tunnel at .service
===================================================================
--- community-x86_64/shadowsocks-libev-tunnel at .service	2017-03-16 07:52:12 UTC (rev 216614)
+++ community-x86_64/shadowsocks-libev-tunnel at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Client Service Tunnel Mode
-After=network.target
-
-[Service]
-Type=simple
-User=nobody
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-tunnel -c /etc/shadowsocks/%i.json
-
-[Install]
-WantedBy=multi-user.target
-

Copied: shadowsocks-libev/repos/community-x86_64/shadowsocks-libev-tunnel at .service (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev-tunnel at .service)
===================================================================
--- community-x86_64/shadowsocks-libev-tunnel at .service	                        (rev 0)
+++ community-x86_64/shadowsocks-libev-tunnel at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Shadowsocks-Libev Client Service Tunnel Mode
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+ExecStart=/usr/bin/ss-tunnel -c /etc/shadowsocks/%i.json
+
+[Install]
+WantedBy=multi-user.target
+

Deleted: community-x86_64/shadowsocks-libev.install
===================================================================
--- community-x86_64/shadowsocks-libev.install	2017-03-16 07:52:12 UTC (rev 216614)
+++ community-x86_64/shadowsocks-libev.install	2017-03-16 07:54:24 UTC (rev 216615)
@@ -1,10 +0,0 @@
-post_install() {
-	setcap cap_net_bind_service+ep usr/bin/ss-local  2>/dev/null
-	setcap cap_net_bind_service+ep usr/bin/ss-server 2>/dev/null
-	setcap cap_net_bind_service+ep usr/bin/ss-tunnel 2>/dev/null
-	setcap cap_net_bind_service+ep usr/bin/ss-redir  2>/dev/null
-}
-
-post_upgrade() {
-	post_install "$1"
-}

Copied: shadowsocks-libev/repos/community-x86_64/shadowsocks-libev.install (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev.install)
===================================================================
--- community-x86_64/shadowsocks-libev.install	                        (rev 0)
+++ community-x86_64/shadowsocks-libev.install	2017-03-16 07:54:24 UTC (rev 216615)
@@ -0,0 +1,10 @@
+post_install() {
+	setcap cap_net_bind_service+ep usr/bin/ss-local  2>/dev/null
+	setcap cap_net_bind_service+ep usr/bin/ss-server 2>/dev/null
+	setcap cap_net_bind_service+ep usr/bin/ss-tunnel 2>/dev/null
+	setcap cap_net_bind_service+ep usr/bin/ss-redir  2>/dev/null
+}
+
+post_upgrade() {
+	post_install "$1"
+}

Deleted: community-x86_64/shadowsocks-libev at .service
===================================================================
--- community-x86_64/shadowsocks-libev at .service	2017-03-16 07:52:12 UTC (rev 216614)
+++ community-x86_64/shadowsocks-libev at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Client Service
-After=network.target
-
-[Service]
-Type=simple
-User=nobody
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-local -c /etc/shadowsocks/%i.json
-
-[Install]
-WantedBy=multi-user.target
-

Copied: shadowsocks-libev/repos/community-x86_64/shadowsocks-libev at .service (from rev 216614, shadowsocks-libev/trunk/shadowsocks-libev at .service)
===================================================================
--- community-x86_64/shadowsocks-libev at .service	                        (rev 0)
+++ community-x86_64/shadowsocks-libev at .service	2017-03-16 07:54:24 UTC (rev 216615)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Shadowsocks-Libev Client Service
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+ExecStart=/usr/bin/ss-local -c /etc/shadowsocks/%i.json
+
+[Install]
+WantedBy=multi-user.target
+

Copied: shadowsocks-libev/repos/community-x86_64/shared-bloom.patch (from rev 216614, shadowsocks-libev/trunk/shared-bloom.patch)
===================================================================
--- community-x86_64/shared-bloom.patch	                        (rev 0)
+++ community-x86_64/shared-bloom.patch	2017-03-16 07:54:24 UTC (rev 216615)
@@ -0,0 +1,77 @@
+commit 3c8ab9b46a5527bb309e30cfe51f84b84ccc591f
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Thu Mar 9 12:40:36 2017 +0800
+
+    Use system libbloom on USE_SYSTEM_SHARED_LIB
+
+diff --git a/Makefile.am b/Makefile.am
+index dc6ad6b..12a0b0b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,5 @@
+ if USE_SYSTEM_SHARED_LIB
+-SUBDIRS = src libbloom
++SUBDIRS = src
+ else
+ SUBDIRS = libcork libipset libbloom src
+ endif
+diff --git a/configure.ac b/configure.ac
+index 92b567d..a63d1ce 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,9 +46,9 @@ AM_CONDITIONAL([ENABLE_DOCUMENTATION], [test x$disable_documentation = xfalse])
+ 
+ AM_COND_IF([ENABLE_DOCUMENTATION], [
+   AC_PATH_PROG([ASCIIDOC], [asciidoc])
+-  test x"${ASCIIDOC}" != x || AC_MSG_ERROR([Cannot find `asciidoc` in PATH.]) 
++  test x"${ASCIIDOC}" != x || AC_MSG_ERROR([Cannot find `asciidoc` in PATH.])
+   AC_PATH_PROG([XMLTO], [xmlto])
+-  test x"$XMLTO" != x || AC_MSG_ERROR([Cannot find `xmlto` in PATH.]) 
++  test x"$XMLTO" != x || AC_MSG_ERROR([Cannot find `xmlto` in PATH.])
+   AC_PATH_PROG([GZIP], [gzip], [gzip])
+   AC_PATH_PROG([MV], [mv], [mv])
+   AC_PROG_SED
+@@ -231,12 +231,11 @@ AC_CHECK_LIB([ev], [ev_loop_destroy], [LIBS="-lev $LIBS"], [AC_MSG_ERROR([Couldn
+ 
+ AC_CONFIG_FILES([shadowsocks-libev.pc
+                  Makefile
+-                 src/Makefile
+-                 libbloom/Makefile])
++                 src/Makefile])
+ 
+ AM_COND_IF([USE_SYSTEM_SHARED_LIB],
+ 		   [AC_DEFINE([USE_SYSTEM_SHARED_LIB], [1], [Define if use system shared lib.])],
+-		   [AC_CONFIG_FILES([libcork/Makefile libipset/Makefile])])
++		   [AC_CONFIG_FILES([libbloom/Makefile libcork/Makefile libipset/Makefile])])
+ 
+ AM_COND_IF([ENABLE_DOCUMENTATION],
+   [AC_CONFIG_FILES([doc/Makefile])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 4d38318..1b77974 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,20 +2,20 @@ VERSION_INFO = 2:0:0
+ 
+ AM_CFLAGS = -g -O2 -Wall -Werror -Wno-deprecated-declarations -fno-strict-aliasing -std=gnu99 -D_GNU_SOURCE
+ AM_CFLAGS += $(PTHREAD_CFLAGS)
+-AM_CFLAGS += -I$(top_srcdir)/libbloom
+ if !USE_SYSTEM_SHARED_LIB
++AM_CFLAGS += -I$(top_srcdir)/libbloom
+ AM_CFLAGS += -I$(top_srcdir)/libipset/include
+ AM_CFLAGS += -I$(top_srcdir)/libcork/include
+ endif
+ AM_CFLAGS += $(LIBPCRE_CFLAGS)
+ 
+ SS_COMMON_LIBS = $(INET_NTOP_LIB) $(LIBPCRE_LIBS)
+-SS_COMMON_LIBS += $(top_builddir)/libbloom/libbloom.la
+ if !USE_SYSTEM_SHARED_LIB
+-SS_COMMON_LIBS += $(top_builddir)/libipset/libipset.la \
++SS_COMMON_LIBS += $(top_builddir)/libbloom/libbloom.la \
++                  $(top_builddir)/libipset/libipset.la \
+                   $(top_builddir)/libcork/libcork.la
+ else
+-SS_COMMON_LIBS += -lcork -lcorkipset
++SS_COMMON_LIBS += -lbloom -lcork -lcorkipset
+ endif
+ SS_COMMON_LIBS += -lev -lsodium -lm
+ 


More information about the arch-commits mailing list