[arch-commits] Commit in sshuttle/repos/community-any (5 files)

Felix Yan fyan at archlinux.org
Tue Jul 14 07:30:02 UTC 2015


    Date: Tuesday, July 14, 2015 @ 09:30:01
  Author: fyan
Revision: 136819

archrelease: copy trunk to community-any

Added:
  sshuttle/repos/community-any/PKGBUILD
    (from rev 136818, sshuttle/trunk/PKGBUILD)
  sshuttle/repos/community-any/arch-install.patch
    (from rev 136818, sshuttle/trunk/arch-install.patch)
  sshuttle/repos/community-any/sshuttle.service
    (from rev 136818, sshuttle/trunk/sshuttle.service)
Deleted:
  sshuttle/repos/community-any/PKGBUILD
  sshuttle/repos/community-any/arch-install.patch

--------------------+
 PKGBUILD           |   89 ++++++++++++++++++++++++++-------------------------
 arch-install.patch |   38 ++++++++++-----------
 sshuttle.service   |    8 ++++
 3 files changed, 74 insertions(+), 61 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-14 07:29:22 UTC (rev 136818)
+++ PKGBUILD	2015-07-14 07:30:01 UTC (rev 136819)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: alphazo <alphazo at gmail.com>
-
-pkgname=sshuttle
-pkgver=0.61
-pkgrel=6
-pkgdesc="Transparent proxy server that works as a poor man's VPN. Forwards all TCP packets over ssh (and even DNS requests when using --dns option). Doesn't require admin privileges on the server side"
-arch=('any')
-url="https://github.com/apenwarr/sshuttle"
-license=('GPL2')
-depends=('python2' 'iptables' 'openssh' 'net-tools')
-makedepends=('python2-markdown' 'python2-beautifulsoup3' 'git')
-source=("git+https://github.com/apenwarr/$pkgname.git#tag=$pkgname-$pkgver"
-        "arch-install.patch")
-md5sums=('SKIP'
-         '15ed72e2b68dd07ef97abfdcb828d188')
-
-prepare() {
-  cd $pkgname
-  patch -p1 -i "$srcdir/arch-install.patch"
-
-  sed -i 's#/usr/bin/env python#/usr/bin/env python2#' stresstest.py Documentation/md2man.py
-}
-
-build() {
-  cd $pkgname
-  make
-}
-
-package() {
-  cd $pkgname
-  install -Dm755 sshuttle "$pkgdir/usr/bin/sshuttle"
-
-  install -d "$pkgdir/usr/share/sshuttle"
-  cp -r *.py compat "$pkgdir/usr/share/sshuttle"/
-
-  install -d "$pkgdir/usr/share/sshuttle/version"
-  cp -r version/*.py "$pkgdir/usr/share/sshuttle/version"
-
-  install -Dm644 Documentation/sshuttle.8 "$pkgdir/usr/share/man/man8/sshuttle.8"
-}

Copied: sshuttle/repos/community-any/PKGBUILD (from rev 136818, sshuttle/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-07-14 07:30:01 UTC (rev 136819)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: alphazo <alphazo at gmail.com>
+
+pkgname=sshuttle
+pkgver=0.71
+pkgrel=1
+pkgdesc="Transparent proxy server that works as a poor man's VPN. Forwards all TCP packets over ssh (and even DNS requests when using --dns option). Doesn't require admin privileges on the server side"
+arch=('any')
+url="https://github.com/apenwarr/sshuttle"
+license=('GPL2')
+depends=('python2' 'iptables' 'openssh' 'net-tools')
+makedepends=('git')
+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"/
+
+  # pandoc not present, so manpage was not built
+  # 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"
+}

Deleted: arch-install.patch
===================================================================
--- arch-install.patch	2015-07-14 07:29:22 UTC (rev 136818)
+++ arch-install.patch	2015-07-14 07:30:01 UTC (rev 136819)
@@ -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/arch-install.patch (from rev 136818, sshuttle/trunk/arch-install.patch)
===================================================================
--- arch-install.patch	                        (rev 0)
+++ arch-install.patch	2015-07-14 07:30:01 UTC (rev 136819)
@@ -0,0 +1,19 @@
+*** 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/sshuttle.service (from rev 136818, sshuttle/trunk/sshuttle.service)
===================================================================
--- sshuttle.service	                        (rev 0)
+++ sshuttle.service	2015-07-14 07:30:01 UTC (rev 136819)
@@ -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



More information about the arch-commits mailing list