summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlphazo2015-12-17 12:59:47 +0100
committerAlphazo2015-12-17 12:59:47 +0100
commit3595bde32518c005dcbea42040da02c861d81ab1 (patch)
tree6a8a68feab69ef3868860319bcd516e314d8394f
parenta1d860a78a896cee1b1c722060bc1cb795d970bb (diff)
downloadaur-3595bde32518c005dcbea42040da02c861d81ab1.tar.gz
Synced with git repo used by [Community]
-rw-r--r--.SRCINFO27
-rw-r--r--PKGBUILD99
-rw-r--r--prefixes.conf5
-rw-r--r--sshuttle.service8
-rw-r--r--tunnel.conf19
5 files changed, 90 insertions, 68 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 230c72507d1..ec2bcc423e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,29 @@
pkgbase = sshuttle-git
- 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.
- pkgver = 20150104
+ pkgdesc = Transparent proxy server that forwards all TCP packets over ssh
+ pkgver = v0.73+51_ge433c59
pkgrel = 1
- url = https://github.com/apenwarr/sshuttle
+ url = https://github.com/sshuttle/sshuttle
arch = any
- license = GPL
+ license = GPL2
+ checkdepends = python-pytest-runner
+ checkdepends = python-mock
makedepends = git
- depends = python2
+ makedepends = pandoc
+ depends = python-setuptools
depends = iptables
+ depends = openssh
+ depends = net-tools
conflicts = sshuttle
- source = arch-install.patch
- md5sums = 15ed72e2b68dd07ef97abfdcb828d188
+ backup = etc/sshuttle/tunnel.conf
+ backup = etc/sshuttle/prefixes.conf
+ source = git+https://github.com/sshuttle/sshuttle.git
+ source = sshuttle.service
+ source = prefixes.conf
+ source = tunnel.conf
+ md5sums = SKIP
+ md5sums = f2cd1660dcdb4e24b45b71e589da73f3
+ md5sums = e780f69851445f739ea76774bb3a3b17
+ md5sums = 4137f5e6d5dd92b7f7f34a1bfdbda45c
pkgname = sshuttle-git
diff --git a/PKGBUILD b/PKGBUILD
index 8f58e03121c..a04f8c92318 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,74 +1,51 @@
# Contributor: alphazo <alphazo@gmail.com>
-# This version fetches and install master branch from Git repo.
+# This version fetches and install master branch from Git repo (now using the same repo as [Community] version).
+
pkgname=sshuttle-git
-pkgver=20150104
+_gitname=sshuttle
+pkgver=v0.73+51_ge433c59
+#_commit=e433c599e40bc47c7b0e4d16934815c84b26eea8
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."
+pkgdesc='Transparent proxy server that forwards all TCP packets over ssh'
arch=('any')
-url="https://github.com/apenwarr/sshuttle"
-license=('GPL')
-groups=()
-depends=('python2' 'iptables')
-makedepends=('git')
-optdepends=()
-provides=()
+url="https://github.com/sshuttle/sshuttle"
+license=('GPL2')
+depends=('python-setuptools' 'iptables' 'openssh' 'net-tools')
+makedepends=('git' 'pandoc')
+checkdepends=('python-pytest-runner' 'python-mock')
conflicts=('sshuttle')
-replaces=()
-backup=()
-options=()
+backup=('etc/sshuttle/tunnel.conf' 'etc/sshuttle/prefixes.conf')
+source=("git+https://github.com/sshuttle/sshuttle.git"
+ 'sshuttle.service' 'prefixes.conf' 'tunnel.conf')
+md5sums=('SKIP'
+ 'f2cd1660dcdb4e24b45b71e589da73f3'
+ 'e780f69851445f739ea76774bb3a3b17'
+ '4137f5e6d5dd92b7f7f34a1bfdbda45c')
+
+pkgver() {
+ cd "$_gitname"
+ git describe | sed 's|sshuttle-||;s|-|+|;s|-|_|'
+}
-source=(arch-install.patch)
-md5sums=('15ed72e2b68dd07ef97abfdcb828d188')
+build() {
+ cd "$_gitname"
+ python setup.py build
+ pandoc -s -r markdown -w man -o sshuttle.8 sshuttle/sshuttle.md
+}
-_gitroot="git://github.com/apenwarr/sshuttle.git"
-_gitname="sshuttle"
+check() {
+ cd "$_gitname"
+ python setup.py ptr
+}
package() {
- cd "$srcdir"
- msg "Connecting to GIT server...."
-
- if [ -d $_gitname ] ; then
- cd $_gitname && git pull origin
- msg "The local files are updated."
- else
- git clone $_gitroot $_gitname
- fi
-
- msg "GIT checkout done or server timeout"
- msg "Starting make..."
-
- rm -rf "$srcdir/$_gitname-build"
- git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
- cd "$srcdir/$_gitname-build"
-
- # Patch launcher with files location (/usr/share/sshuttle)
- patch -p1 -i "${srcdir}/arch-install.patch"
-
- #
- # BUILD HERE
- #
- # Original build
- #install -Dm755 $srcdir/$_gitname-build/sshuttle $pkgdir/usr/bin/sshuttle || return 1
- #mkdir -p $pkgdir/usr/share/sshuttle
- #cp -r $srcdir/$_gitname-build/* $pkgdir/usr/share/sshuttle || return 1
- #
+ cd "$_gitname"
+ python setup.py install --root="$pkgdir" -O1
- # Modification proposed by bladud
- cd "$srcdir/$_gitname-build/Documentation"
- sed -i 's/python/python2/' md2man.py
- cd ..
- make #Make the manpage
- cd "$srcdir/$_gitname-build"
- install -Dm755 $srcdir/$_gitname-build/sshuttle $pkgdir/usr/bin/sshuttle || return 1
- mkdir -p $pkgdir/usr/share/sshuttle
+ install -Dm644 sshuttle.8 "$pkgdir/usr/share/man/man8/sshuttle.8"
- cp $srcdir/$_gitname-build/LICENSE $pkgdir/usr/share/sshuttle || return 1
- cp $srcdir/$_gitname-build/README.md $pkgdir/usr/share/sshuttle || return 1
- cp $srcdir/$_gitname-build/Documentation/sshuttle.md $pkgdir/usr/share/sshuttle || return 1
- cp $srcdir/$_gitname-build/*.py $pkgdir/usr/share/sshuttle || return 1
- mkdir $pkgdir/usr/share/sshuttle/version
- mkdir $pkgdir/usr/share/sshuttle/compat
- cp -R $srcdir/$_gitname-build/version/*.py $pkgdir/usr/share/sshuttle/version || return 1
- cp -R $srcdir/$_gitname-build/compat/*.py $pkgdir/usr/share/sshuttle/compat || return 1
+ 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"
}
diff --git a/prefixes.conf b/prefixes.conf
new file mode 100644
index 00000000000..ca472b9a148
--- /dev/null
+++ b/prefixes.conf
@@ -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
diff --git a/sshuttle.service b/sshuttle.service
new file mode 100644
index 00000000000..27828a6fb39
--- /dev/null
+++ b/sshuttle.service
@@ -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
diff --git a/tunnel.conf b/tunnel.conf
new file mode 100644
index 00000000000..64fb54edb7f
--- /dev/null
+++ b/tunnel.conf
@@ -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