Update the source to a mirror of the original repo, use the included LICENSE, clean up the package and include a .gitignore

4 files changed, 23 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 40f5ee5467ea..8fabc3cba424 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,10 @@
+# Generated by mksrcinfo v8
+# Tue May 31 02:23:25 UTC 2016
 pkgbase = salsapipe-git
 	pkgdesc = Encrypted network tunneling using salsa20 from libnettle and GPG from libgpgme
 	pkgver = 20150727.r26.6d81ace
 	pkgrel = 1
-	url = https://github.com/0xcaca0/salsapipe
+	url = https://github.com/prurigro/salsapipe
 	arch = i686
 	arch = x86_64
 	arch = armv6h
@@ -12,11 +14,8 @@ pkgbase = salsapipe-git
 	license = GPL3
 	makedepends = git
 	depends = gpgme
-	depends = nettle
-	source = git://github.com/0xcaca0/salsapipe.git#branch=master
-	source = LICENSE
+	source = git+https://github.com/prurigro/salsapipe
 	sha512sums = SKIP
-	sha512sums = 98cb62428d5dd50917a5ce69ad4e7508b5447b1aba83080e2d870f3b410db3747d0ff31b142b9d1c3b8dab10fba028fb78962b23d02cd47352bc2f2cd7dd8620
 
 pkgname = salsapipe-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..285a04d0e3bb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.pkg.tar.xz
+pkg
+src
+salsapipe
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index c6ce271da71a..000000000000
--- a/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-There's literally no licensing so I've no objection to it being taken, forked, edited, or copied. Do with it as you please. (source: https://github.com/0xcaca0/salsapipe/issues/1)
diff --git a/PKGBUILD b/PKGBUILD
index 3b5e44b79d70..00e422562e15 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,32 @@
-# Maintainer: Kevin MacMartin <prurigro at gmail dot com>
+# Maintainer: Kevin MacMartin <prurigro@gmail.com>
 
 _pkgname=salsapipe
 pkgname=${_pkgname}-git
 pkgver=20150727.r26.6d81ace
-pkgrel=1
-pkgdesc="Encrypted network tunneling using salsa20 from libnettle and GPG from libgpgme"
-url="https://github.com/0xcaca0/${_pkgname}"
+pkgrel=2
+pkgdesc='Encrypted network tunneling using salsa20 from libnettle and GPG from libgpgme'
+url='https://github.com/prurigro/salsapipe'
 license=('GPL3')
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 groups=('archassault' 'archassault-networking')
-depends=('gpgme' 'nettle')
+depends=('gpgme')
 makedepends=('git')
-
-source=("git://github.com/0xcaca0/${_pkgname}.git#branch=master"
-        "LICENSE")
-sha512sums=('SKIP' '98cb62428d5dd50917a5ce69ad4e7508b5447b1aba83080e2d870f3b410db3747d0ff31b142b9d1c3b8dab10fba028fb78962b23d02cd47352bc2f2cd7dd8620')
+source=("git+$url")
+sha512sums=('SKIP')
 
 pkgver() {
-    cd $_pkgname
-    printf "%s.r%s.%s" "$(git show -s --format=%ci master | sed 's/\ .*//g;s/-//g')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd $_pkgname
+  printf "%s.r%s.%s" "$(git show -s --format=%ci master | sed 's/\ .*//g;s/-//g')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd $_pkgname
-    make
+  cd $_pkgname
+  make
 }
 
 package() {
-    install -Dm755 ${_pkgname}/salsamsg "${pkgdir}/usr/bin/salsamsg"
-    install -Dm644 ${_pkgname}/salsamsg.1 "${pkgdir}/usr/share/man/man1/salsamsg.1"
-    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+  cd $_pkgname
+  install -Dm755 salsamsg "$pkgdir/usr/bin/salsamsg"
+  install -Dm644 salsamsg.1 "$pkgdir/usr/share/man/man1/salsamsg.1"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
 }