[arch-commits] Commit in sshuttle/repos/community-any (7 files)
Felix Yan
fyan at archlinux.org
Fri Nov 27 05:20:56 UTC 2015
Date: Friday, November 27, 2015 @ 06:20:56
Author: fyan
Revision: 147866
archrelease: copy trunk to community-any
Added:
sshuttle/repos/community-any/PKGBUILD
(from rev 147865, sshuttle/trunk/PKGBUILD)
sshuttle/repos/community-any/prefixes.conf
(from rev 147865, sshuttle/trunk/prefixes.conf)
sshuttle/repos/community-any/sshuttle.service
(from rev 147865, sshuttle/trunk/sshuttle.service)
sshuttle/repos/community-any/tunnel.conf
(from rev 147865, sshuttle/trunk/tunnel.conf)
Deleted:
sshuttle/repos/community-any/PKGBUILD
sshuttle/repos/community-any/arch-install.patch
sshuttle/repos/community-any/sshuttle.service
--------------------+
PKGBUILD | 90 ++++++++++++++++++++++++---------------------------
arch-install.patch | 19 ----------
prefixes.conf | 5 ++
sshuttle.service | 16 ++++-----
tunnel.conf | 19 ++++++++++
5 files changed, 76 insertions(+), 73 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-11-27 05:20:06 UTC (rev 147865)
+++ PKGBUILD 2015-11-27 05:20:56 UTC (rev 147866)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: alphazo <alphazo at gmail.com>
-
-pkgname=sshuttle
-pkgver=0.72
-pkgrel=1
-pkgdesc='Transparent proxy server that forwards all TCP packets over ssh'
-arch=('any')
-url="https://github.com/sshuttle/sshuttle"
-license=('GPL2')
-depends=('python2' 'iptables' 'openssh' 'net-tools')
-makedepends=('git' 'pandoc')
-backup=('etc/sshuttle/tunnel.conf' 'etc/sshuttle/prefixes.conf')
-source=("git+https://github.com/sshuttle/$pkgname.git#tag=$pkgname-$pkgver"
- 'sshuttle.service' 'arch-install.patch')
-md5sums=('SKIP'
- 'f2cd1660dcdb4e24b45b71e589da73f3'
- '15ed72e2b68dd07ef97abfdcb828d188')
-
-prepare() {
- cd $pkgname/src
- patch -p1 -i "$srcdir/arch-install.patch"
-
- sed -i 's#/usr/bin/env python#/usr/bin/env python2#' stresstest.py
-}
-
-build() {
- cd $pkgname/src
- make
-}
-
-package() {
- cd $pkgname/src
- install -Dm755 sshuttle "$pkgdir/usr/bin/sshuttle"
-
- install -d "$pkgdir/usr/share/sshuttle"
- cp -r *.py compat "$pkgdir/usr/share/sshuttle"/
-
- install -Dm644 sshuttle.8 "$pkgdir/usr/share/man/man8/sshuttle.8"
-
- cd ..
- install -d "$pkgdir/etc/sshuttle"
- install -Dm644 packaging/{tunnel.conf,prefixes.conf} "$pkgdir/etc/sshuttle"
- install -Dm644 "$srcdir/sshuttle.service" "$pkgdir/usr/lib/systemd/system/sshuttle.service"
-}
Copied: sshuttle/repos/community-any/PKGBUILD (from rev 147865, sshuttle/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-11-27 05:20:56 UTC (rev 147866)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: alphazo <alphazo at gmail.com>
+
+pkgname=sshuttle
+pkgver=0.73
+pkgrel=1
+pkgdesc='Transparent proxy server that forwards all TCP packets over ssh'
+arch=('any')
+url="https://github.com/sshuttle/sshuttle"
+license=('GPL2')
+depends=('python-setuptools' 'iptables' 'openssh' 'net-tools')
+makedepends=('git' 'pandoc')
+checkdepends=('python-pytest-runner' 'python-mock')
+backup=('etc/sshuttle/tunnel.conf' 'etc/sshuttle/prefixes.conf')
+source=("git+https://github.com/sshuttle/$pkgname.git#tag=v$pkgver"
+ 'sshuttle.service' 'prefixes.conf' 'tunnel.conf')
+md5sums=('SKIP'
+ 'f2cd1660dcdb4e24b45b71e589da73f3'
+ 'e780f69851445f739ea76774bb3a3b17'
+ '4137f5e6d5dd92b7f7f34a1bfdbda45c')
+
+build() {
+ cd $pkgname
+ python setup.py build
+
+ pandoc -s -r markdown -w man -o sshuttle.8 sshuttle/sshuttle.md
+}
+
+check() {
+ cd $pkgname
+ python setup.py ptr
+}
+
+package() {
+ cd $pkgname
+ python setup.py install --root="$pkgdir" -O1
+
+ install -Dm644 sshuttle.8 "$pkgdir/usr/share/man/man8/sshuttle.8"
+
+ install -d "$pkgdir/etc/sshuttle"
+ install -m644 "$srcdir"/{tunnel.conf,prefixes.conf} "$pkgdir/etc/sshuttle"
+ install -Dm644 "$srcdir/sshuttle.service" "$pkgdir/usr/lib/systemd/system/sshuttle.service"
+}
Deleted: arch-install.patch
===================================================================
--- arch-install.patch 2015-11-27 05:20:06 UTC (rev 147865)
+++ arch-install.patch 2015-11-27 05:20:56 UTC (rev 147866)
@@ -1,19 +0,0 @@
-*** sshuttleORIGIN/sshuttle 2011-05-21 22:58:24.156725075 +0200
---- sshuttle 2011-05-21 22:59:16.354698468 +0200
-***************
-*** 4,10 ****
- [ -L "$EXE" ] || break
- EXE=$(readlink "$EXE")
- done
-! DIR=$(dirname "$EXE")
- if python2 -V 2>/dev/null; then
- exec python2 "$DIR/main.py" python2 "$@"
- else
---- 4,10 ----
- [ -L "$EXE" ] || break
- EXE=$(readlink "$EXE")
- done
-! DIR=/usr/share/sshuttle
- if python2 -V 2>/dev/null; then
- exec python2 "$DIR/main.py" python2 "$@"
- else
Copied: sshuttle/repos/community-any/prefixes.conf (from rev 147865, sshuttle/trunk/prefixes.conf)
===================================================================
--- prefixes.conf (rev 0)
+++ prefixes.conf 2015-11-27 05:20:56 UTC (rev 147866)
@@ -0,0 +1,5 @@
+# Output prefixes here, one per line. Prefix is in:
+# prefix/netmask format
+# Like this:
+# 192.168.0.0/16
+# 192.0.43.10/32
Deleted: sshuttle.service
===================================================================
--- sshuttle.service 2015-11-27 05:20:06 UTC (rev 147865)
+++ sshuttle.service 2015-11-27 05:20:56 UTC (rev 147866)
@@ -1,8 +0,0 @@
-[Unit]
-Description=Create a transparent proxy over SSH
-
-[Service]
-ExecStart=/usr/bin/sshuttle --dns --listen 0.0.0.0 --remote sshuttle_tunnel -s /etc/sshuttle/prefixes.conf -e "ssh -F /etc/sshuttle/tunnel.conf"
-
-[Install]
-WantedBy=multi-user.target
Copied: sshuttle/repos/community-any/sshuttle.service (from rev 147865, sshuttle/trunk/sshuttle.service)
===================================================================
--- sshuttle.service (rev 0)
+++ sshuttle.service 2015-11-27 05:20:56 UTC (rev 147866)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Create a transparent proxy over SSH
+
+[Service]
+ExecStart=/usr/bin/sshuttle --dns --listen 0.0.0.0 --remote sshuttle_tunnel -s /etc/sshuttle/prefixes.conf -e "ssh -F /etc/sshuttle/tunnel.conf"
+
+[Install]
+WantedBy=multi-user.target
Copied: sshuttle/repos/community-any/tunnel.conf (from rev 147865, sshuttle/trunk/tunnel.conf)
===================================================================
--- tunnel.conf (rev 0)
+++ tunnel.conf 2015-11-27 05:20:56 UTC (rev 147866)
@@ -0,0 +1,19 @@
+# Here is where you can specify any SSH tunnel options See ssh_config(5) for
+# details. You need to leave the Host line intact, but everything else can
+# specify whatever you want
+Host sshuttle_tunnel
+
+# REQUIRED: Set this to be the host to which you would like to connect your
+# tunnel
+#Hostname localhost
+
+# REQUIRED: Set this to be the target SSH user on the remote system
+#User foo
+
+# ---------------------------------------------------------------------------
+# The rest are all optional; see ssh_config(5) for the full list of what can
+# be specified. Some very commonly needed ones are below.
+# ---------------------------------------------------------------------------
+
+# SSH key used for connecting
+#IdentityFile /path/to/key
More information about the arch-commits
mailing list