[arch-commits] Commit in shadowsocks/repos/community-any (8 files)
Felix Yan
felixonmars at archlinux.org
Mon Nov 12 20:08:45 UTC 2018
Date: Monday, November 12, 2018 @ 20:08:45
Author: felixonmars
Revision: 406459
archrelease: copy trunk to community-any
Added:
shadowsocks/repos/community-any/PKGBUILD
(from rev 406458, shadowsocks/trunk/PKGBUILD)
shadowsocks/repos/community-any/shadowsocks-server at .service
(from rev 406458, shadowsocks/trunk/shadowsocks-server at .service)
shadowsocks/repos/community-any/shadowsocks.install
(from rev 406458, shadowsocks/trunk/shadowsocks.install)
shadowsocks/repos/community-any/shadowsocks at .service
(from rev 406458, shadowsocks/trunk/shadowsocks at .service)
Deleted:
shadowsocks/repos/community-any/PKGBUILD
shadowsocks/repos/community-any/shadowsocks-server at .service
shadowsocks/repos/community-any/shadowsocks.install
shadowsocks/repos/community-any/shadowsocks at .service
-----------------------------+
PKGBUILD | 98 +++++++++++++++++++++++++-----------------
shadowsocks-server at .service | 24 +++++-----
shadowsocks.install | 10 ++--
shadowsocks at .service | 24 +++++-----
4 files changed, 88 insertions(+), 68 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-12 20:08:20 UTC (rev 406458)
+++ PKGBUILD 2018-11-12 20:08:45 UTC (rev 406459)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=shadowsocks
-pkgver=2.9.1
-pkgrel=2
-pkgdesc="A lightweight tunnel proxy"
-license=('Apache')
-url="http://pypi.python.org/pypi/shadowsocks"
-arch=('any')
-depends=('python' 'python-setuptools')
-makedepends=('git')
-optdepends=('libsodium: For salsa20 and chacha20 support')
-checkdepends=('python-coverage' 'python-pyflakes' 'libsodium' 'python-nose' 'dante' 'procps-ng' 'util-linux')
-install=${pkgname}.install
-source=("git+https://github.com/shadowsocks/shadowsocks.git#tag=$pkgver"
- "shadowsocks at .service"
- "shadowsocks-server at .service")
-sha512sums=('SKIP'
- '96ecb174a476f64dec3ec086732d93a76d27e9a1cc56b1dc3fa87bf8e00d4b3c44076a01a0d525e42174cacc58fd5c16d5c8af5d4636dae13df549dec8204f7d'
- 'f2f8240c18a4483bf3e03b3a5ac8822c3deae713224f732bf28f7fddfcc5d0b02aa91652665ff93f05731e162a9407109c18f43d732a3a9b19d9eacfc806a4df')
-
-check() {
- cd shadowsocks
- tests/jenkins.sh || warning "Tests failed"
-}
-
-package() {
- cd shadowsocks
-
- python setup.py install -O1 --root="$pkgdir"
-
- install -dm755 "$pkgdir/usr/share/man/man1"
- install -m644 debian/{ssserver.1,sslocal.1} "$pkgdir/usr/share/man/man1"
- install -Dm644 debian/config.json "$pkgdir/etc/shadowsocks/example.json"
-
- install -Dm644 "$srcdir/shadowsocks at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks at .service"
- install -Dm644 "$srcdir/shadowsocks-server at .service" "$pkgdir/usr/lib/systemd/system/shadowsocks-server at .service"
-}
Copied: shadowsocks/repos/community-any/PKGBUILD (from rev 406458, shadowsocks/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-11-12 20:08:45 UTC (rev 406459)
@@ -0,0 +1,59 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=shadowsocks
+pkgver=3.0.0a.20180219
+_commit=e332ec93e9c90f1cbee676b022bf2c5d5b7b1239
+pkgrel=1
+pkgdesc="A lightweight tunnel proxy"
+license=('Apache')
+url="http://pypi.python.org/pypi/shadowsocks"
+arch=('any')
+depends=('python-setuptools')
+makedepends=('git')
+optdepends=('libsodium: For salsa20 and chacha20 support'
+ 'mbedtls: Optional mbedtls modes')
+checkdepends=('bc' 'bind-tools' 'dante' 'libsodium' 'mbedtls' 'procps-ng' 'python-coverage' 'python-nose'
+ 'python-pycodestyle' 'python-pyflakes' 'python-pysocks')
+install=$pkgname.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/shadowsocks/shadowsocks/archive/$_commit.tar.gz"
+ pycodestyle.patch
+ "shadowsocks at .service"
+ "shadowsocks-server at .service")
+sha512sums=('d3370cedffed385ad9cf1e0390edb535d2d7f949fc79b77875a78cac5bad7b601a5605063e130416a7871a0b7798d4c088c08b2d472570a6429f59d38091e5a7'
+ '89d8d984d9f1c20c020e619b8c22315737e1f53e42caf41643232997b7862b92bc3295985b7ddc4a3f3e0c29d962c2f1ee97b8dd6409be82cb93c09d5df1f7ff'
+ '96ecb174a476f64dec3ec086732d93a76d27e9a1cc56b1dc3fa87bf8e00d4b3c44076a01a0d525e42174cacc58fd5c16d5c8af5d4636dae13df549dec8204f7d'
+ 'f2f8240c18a4483bf3e03b3a5ac8822c3deae713224f732bf28f7fddfcc5d0b02aa91652665ff93f05731e162a9407109c18f43d732a3a9b19d9eacfc806a4df')
+
+prepare() {
+ mv shadowsocks-{$_commit,$pkgver}
+
+ cd shadowsocks-$pkgver
+ patch -p1 -i ../pycodestyle.patch
+}
+
+check() {
+ cd shadowsocks-$pkgver
+ export SOCKS_CONF=tests/socksify/socks.conf
+
+ # No local http server running, point to a random site
+ sed -i "s|default_url = 'http://localhost/'|default_url = 'https://www.gstatic.com/generate_204'|" tests/test.py
+ sed -i 's|http://127.0.0.1/|https://www.gstatic.com/generate_204|' tests/jenkins.sh
+
+ sed -i 's|/usr/local/lib/|/usr/lib/|g' tests/jenkins.sh tests/*.json
+
+ tests/jenkins.sh || warning "Tests failed"
+}
+
+package() {
+ cd shadowsocks-$pkgver
+
+ python setup.py install -O1 --root="$pkgdir"
+
+ install -dm755 "$pkgdir"/usr/share/man/man1
+ install -m644 debian/{ssserver.1,sslocal.1} "$pkgdir"/usr/share/man/man1/
+ install -Dm644 debian/config.json "$pkgdir"/etc/shadowsocks/example.json
+
+ install -Dm644 "$srcdir"/shadowsocks at .service "$pkgdir"/usr/lib/systemd/system/shadowsocks at .service
+ install -Dm644 "$srcdir"/shadowsocks-server at .service "$pkgdir"/usr/lib/systemd/system/shadowsocks-server at .service
+}
+
\ No newline at end of file
Deleted: shadowsocks-server at .service
===================================================================
--- shadowsocks-server at .service 2018-11-12 20:08:20 UTC (rev 406458)
+++ shadowsocks-server at .service 2018-11-12 20:08:45 UTC (rev 406459)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Shadowsocks Server Service
-After=network.target
-
-[Service]
-Type=simple
-User=nobody
-ExecStart=/usr/bin/ssserver -c /etc/shadowsocks/%i.json
-
-[Install]
-WantedBy=multi-user.target
-
Copied: shadowsocks/repos/community-any/shadowsocks-server at .service (from rev 406458, shadowsocks/trunk/shadowsocks-server at .service)
===================================================================
--- shadowsocks-server at .service (rev 0)
+++ shadowsocks-server at .service 2018-11-12 20:08:45 UTC (rev 406459)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Shadowsocks Server Service
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+ExecStart=/usr/bin/ssserver -c /etc/shadowsocks/%i.json
+
+[Install]
+WantedBy=multi-user.target
+
Deleted: shadowsocks.install
===================================================================
--- shadowsocks.install 2018-11-12 20:08:20 UTC (rev 406458)
+++ shadowsocks.install 2018-11-12 20:08:45 UTC (rev 406459)
@@ -1,5 +0,0 @@
-post_install() {
- echo "You can use profiled systemd units to start/stop shadowsocks: (Profiles are placed under /etc/shadowsocks/*.json)"
- echo "# systemctl start/stop shadowsocks[-server]@<conf-name>"
-}
-
Copied: shadowsocks/repos/community-any/shadowsocks.install (from rev 406458, shadowsocks/trunk/shadowsocks.install)
===================================================================
--- shadowsocks.install (rev 0)
+++ shadowsocks.install 2018-11-12 20:08:45 UTC (rev 406459)
@@ -0,0 +1,5 @@
+post_install() {
+ echo "You can use profiled systemd units to start/stop shadowsocks: (Profiles are placed under /etc/shadowsocks/*.json)"
+ echo "# systemctl start/stop shadowsocks[-server]@<conf-name>"
+}
+
Deleted: shadowsocks at .service
===================================================================
--- shadowsocks at .service 2018-11-12 20:08:20 UTC (rev 406458)
+++ shadowsocks at .service 2018-11-12 20:08:45 UTC (rev 406459)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Shadowsocks Client Service
-After=network.target
-
-[Service]
-Type=simple
-User=nobody
-ExecStart=/usr/bin/sslocal -c /etc/shadowsocks/%i.json
-
-[Install]
-WantedBy=multi-user.target
-
Copied: shadowsocks/repos/community-any/shadowsocks at .service (from rev 406458, shadowsocks/trunk/shadowsocks at .service)
===================================================================
--- shadowsocks at .service (rev 0)
+++ shadowsocks at .service 2018-11-12 20:08:45 UTC (rev 406459)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Shadowsocks Client Service
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+ExecStart=/usr/bin/sslocal -c /etc/shadowsocks/%i.json
+
+[Install]
+WantedBy=multi-user.target
+
More information about the arch-commits
mailing list