monkeysphere: upgrade

4 files changed, 68 insertions, 20 deletions

diff --git a/pcr/monkeysphere/PKGBUILD b/pcr/monkeysphere/PKGBUILD
index 48f55dbfd..67a6e5a09 100644
--- a/pcr/monkeysphere/PKGBUILD
+++ b/pcr/monkeysphere/PKGBUILD
@@ -1,44 +1,50 @@
+# Maintainer: svalo <valo@eigenlab.org>
+# Contributor: David Costa <david@zarel.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Based on monkeysphere-git from
 # Contributor: Olivier Mehani <shtrom-arch@ssji.net>
-# $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $
 pkgname=monkeysphere
 pkgver=0.37
-pkgrel=1
+pkgrel=2
 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
 arch=('any')
 url="http://web.monkeysphere.info/"
 license=('GPL3')
-depends=('gnupg' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1')
-checkdepends=('socat' 'openssh' 'cpio')
+depends=('gnupg1' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1')
+checkdepends=('socat' 'openssh' 'cpio' 'gnupg')
 source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz
-        binmerge.patch)
+        binmerge.patch
+	ms.patch
+	mshost.patch
+	msauth.patch)
+
+sha256sums=('b510b8a414fb400356e80f1f882488785df72ac54078410b54d4c50a84686e59'
+            'e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7'
+            'ce490eebfbf92b9a9abaf77d43489b0cdd7ebab427262e9eb7fbefdb67cdf289'
+            '4ddad85f6a9998f8f8869cef4f2f6d7bf9f04171fb3b5ae6c6621bfc8dc2bcbe'
+            'bcad168603c2afd4db6b54edd61c8c9cdd1e08bcea7de3b936a3269f271e3de6')
+
 install=monkeysphere.install
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   patch -Ni "${srcdir}/binmerge.patch"
+  patch -p1 -Ni "${srcdir}/ms.patch"
+  patch -p1 -Ni "${srcdir}/msauth.patch"
+  patch -p1 -Ni "${srcdir}/mshost.patch"
 }
 
-# Checks fail
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make test || true
-}
+# Checks fail 
+#check() {
+#  cd "$srcdir/$pkgname-$pkgver"
+#
+#  make test
+#}
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir/" install
-  mkdir -p $pkgdir/var/lib/monkeysphere
+  mkdir -p "$pkgdir/var/lib/monkeysphere"
 }
-sha1sums=('c4f950346040f7703cb4c6e8b32022f4361d0c9d'
-          '780c2e203980558316b0714c4b2a3ad49be3ea27')
-sha256sums=('6ae4edeff2cc29b6913346e15b61500ea7cc06d761a9f42e67de83b7d2607be7'
-            'e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7')
-sha1sums=('1fab51ae4c1a19d8bbc358db8e2ce7df337cc93e'
-          '780c2e203980558316b0714c4b2a3ad49be3ea27')
-sha256sums=('b510b8a414fb400356e80f1f882488785df72ac54078410b54d4c50a84686e59'
-            'e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7')
diff --git a/pcr/monkeysphere/ms.patch b/pcr/monkeysphere/ms.patch
new file mode 100644
index 000000000..99af937cc
--- /dev/null
+++ b/pcr/monkeysphere/ms.patch
@@ -0,0 +1,11 @@
+--- a/src/monkeysphere	2014-08-06 19:27:38.000000000 +0200
++++ b/src/monkeysphere	2014-12-07 23:22:52.903467885 +0100
+@@ -62,7 +62,7 @@
+ 
+ # user gpg command to define common options
+ gpg_user() {
+-    LC_ALL=C gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@"
++    LC_ALL=C gpg1 --fixed-list-mode --no-greeting --quiet --no-tty "$@"
+ }
+ 
+ # output the ssh fingerprint of a gpg key
diff --git a/pcr/monkeysphere/msauth.patch b/pcr/monkeysphere/msauth.patch
new file mode 100644
index 000000000..b426101b9
--- /dev/null
+++ b/pcr/monkeysphere/msauth.patch
@@ -0,0 +1,20 @@
+--- a/src/monkeysphere-authentication	2014-08-06 19:27:38.000000000 +0200
++++ b/src/monkeysphere-authentication	2014-12-07 23:23:37.770134940 +0100
+@@ -73,7 +73,7 @@
+     GNUPGHOME="$GNUPGHOME_CORE"
+     export GNUPGHOME
+ 
+-    gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@"
++    gpg1 --fixed-list-mode --no-greeting --quiet --no-tty "$@"
+ }
+ 
+ # function to interact with the gpg sphere keyring
+@@ -81,7 +81,7 @@
+     GNUPGHOME="$GNUPGHOME_SPHERE"
+     export GNUPGHOME
+  
+-    su_monkeysphere_user gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@"
++    su_monkeysphere_user gpg1 --fixed-list-mode --no-greeting --quiet --no-tty "$@"
+ }
+ 
+ check_openpgp2ssh_sanity() {
diff --git a/pcr/monkeysphere/mshost.patch b/pcr/monkeysphere/mshost.patch
new file mode 100644
index 000000000..c8c6e2859
--- /dev/null
+++ b/pcr/monkeysphere/mshost.patch
@@ -0,0 +1,11 @@
+--- a/src/monkeysphere-host	2014-08-06 19:27:38.000000000 +0200
++++ b/src/monkeysphere-host.new	2014-12-07 23:23:07.306801343 +0100
+@@ -71,7 +71,7 @@
+ 
+ # function to interact with the gpg keyring
+ gpg_host() {
+-    GNUPGHOME="$GNUPGHOME_HOST" LC_ALL=C gpg --no-auto-check-trustdb --trust-model=always --no-greeting --quiet --no-tty --fixed-list-mode "$@"
++    GNUPGHOME="$GNUPGHOME_HOST" LC_ALL=C gpg1 --no-auto-check-trustdb --trust-model=always --no-greeting --quiet --no-tty --fixed-list-mode "$@"
+ }
+ 
+ # list the info about the a key, in colon format, to stdout