Squashes all branch 0.38 commits together

Full history is available https://git.eigenlab.org/svalo/monkeysphere

.SRCINFO

+# Generated by mksrcinfo v8
+# Thu Jun 23 14:40:23 UTC 2016
 pkgbase = monkeysphere
 	pkgdesc = Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-	pkgver = 0.37
-	pkgrel = 2
+	pkgver = 0.38
+	pkgrel = 1
 	url = http://web.monkeysphere.info/
 	install = monkeysphere.install
 	arch = any
 	license = GPL3
+	checkdepends = agent-transfer
 	checkdepends = socat
 	checkdepends = openssh
 	checkdepends = cpio
-	checkdepends = gnupg
-	depends = gnupg1
+	checkdepends = gnupg>=2.1.13
 	depends = lockfile-progs
 	depends = perl-crypt-openssl-rsa
 	depends = perl-digest-sha1
-	source = http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.37.orig.tar.gz
+	depends = gnupg>=2.1.13
+	optdepends = agent-transfer
+	source = http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.38.orig.tar.gz
 	source = binmerge.patch
-	source = ms.patch
-	source = mshost.patch
-	source = msauth.patch
-	sha256sums = b510b8a414fb400356e80f1f882488785df72ac54078410b54d4c50a84686e59
+	source = exclude-agent.patch
+	sha256sums = 6951821d11ad646e6e7651d677bfab8f800fbc52703a0ab9942d03cd13959073
 	sha256sums = e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7
-	sha256sums = ce490eebfbf92b9a9abaf77d43489b0cdd7ebab427262e9eb7fbefdb67cdf289
-	sha256sums = 4ddad85f6a9998f8f8869cef4f2f6d7bf9f04171fb3b5ae6c6621bfc8dc2bcbe
-	sha256sums = bcad168603c2afd4db6b54edd61c8c9cdd1e08bcea7de3b936a3269f271e3de6
+	sha256sums = ee2d4942918a464216b7bde5ad6585441237d2a6235fa795a24a14e0d9962cad
 
 pkgname = monkeysphere
 

PKGBUILD

@@ -4,47 +4,40 @@
 # Based on monkeysphere-git from
 # Contributor: Olivier Mehani <shtrom-arch@ssji.net>
 pkgname=monkeysphere
-pkgver=0.37
-pkgrel=2
+pkgver=0.38
+pkgrel=1
 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
 arch=('any')
 url="http://web.monkeysphere.info/"
 license=('GPL3')
-depends=('gnupg1' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1')
-checkdepends=('socat' 'openssh' 'cpio' 'gnupg')
+depends=('lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1' 'gnupg>=2.1.13')
+checkdepends=('agent-transfer' 'socat' 'openssh' 'cpio' 'gnupg>=2.1.13')
+optdepends=('agent-transfer')
 source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz
     binmerge.patch
-	ms.patch
-	mshost.patch
-	msauth.patch)
+    exclude-agent.patch
+    )
 
-sha256sums=('b510b8a414fb400356e80f1f882488785df72ac54078410b54d4c50a84686e59'
+sha256sums=('6951821d11ad646e6e7651d677bfab8f800fbc52703a0ab9942d03cd13959073'
             'e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7'
-            'ce490eebfbf92b9a9abaf77d43489b0cdd7ebab427262e9eb7fbefdb67cdf289'
-            '4ddad85f6a9998f8f8869cef4f2f6d7bf9f04171fb3b5ae6c6621bfc8dc2bcbe'
-            'bcad168603c2afd4db6b54edd61c8c9cdd1e08bcea7de3b936a3269f271e3de6')
+            'ee2d4942918a464216b7bde5ad6585441237d2a6235fa795a24a14e0d9962cad')
 
 install=monkeysphere.install
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  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"
+  patch -Ni "${srcdir}/exclude-agent.patch"
 }
 
-# Checks fail 
-#check() {
-#  cd "$srcdir/$pkgname-$pkgver"
-#
-#  make test
-#}
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make test
+}
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-  mkdir -p "$pkgdir/var/lib/monkeysphere"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}/" install
+  mkdir -p "${pkgdir}/var/lib/monkeysphere"
+  chown root:root "${pkgdir}/var/lib/monkeysphere"
 }

exclude-agent.patch

+--- Makefile.orig	2016-06-22 10:28:31.839738730 +0200
++++ Makefile	2016-06-22 10:29:10.636809346 +0200
+@@ -65,7 +65,6 @@
+ 	ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2ssh
+ 	ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2pem
+ 	ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2spki
+-	install -m 0755 src/agent-transfer/agent-transfer $(DESTDIR)$(PREFIX)/bin
+ 	install -m 0744 src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
+ 	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23
+ 	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28
+@@ -83,7 +82,9 @@
+ installman:
+ 	mkdir -p $(DESTDIR)$(MANPREFIX)/man1 $(DESTDIR)$(MANPREFIX)/man7 $(DESTDIR)$(MANPREFIX)/man8
+ 	gzip -n man/*/*
+-	install man/man1/* $(DESTDIR)$(MANPREFIX)/man1
++	install man/man1/monkeysphere.1.gz $(DESTDIR)$(MANPREFIX)/man1
++	install man/man1/openpgp2ssh.1.gz $(DESTDIR)$(MANPREFIX)/man1
++	install man/man1/openpgp2ssh.1.gz $(DESTDIR)$(MANPREFIX)/man1
+ 	install man/man7/* $(DESTDIR)$(MANPREFIX)/man7
+ 	install man/man8/* $(DESTDIR)$(MANPREFIX)/man8
+ 	ln -s openpgp2ssh.1.gz $(DESTDIR)$(MANPREFIX)/man1/openpgp2pem.1.gz

monkeysphere.install

@@ -5,22 +5,20 @@
 # arg 1:  the new package version
 post_install() {
   echo ">>> Creating monkeysphere user and group and setting permissions..."
-  getent group monkeysphere >/dev/null || groupadd monkeysphere
-  getent passwd monkeysphere >/dev/null ||useradd -c 'Monkeysphere WoT server identification tool' -g monkeysphere -d '/var/lib/monkeysphere' -s /bin/bash monkeysphere
+    getent group monkeysphere >/dev/null || groupadd -r monkeysphere
+    getent passwd monkeysphere >/dev/null ||useradd -r -c 'Monkeysphere WoT server identification tool' -g monkeysphere -d '/var/lib/monkeysphere' -s /bin/bash monkeysphere
+	echo ">>> Trying all available transitions..."
+    for trans in 0.23 0.28 ; do
+        /usr/share/monkeysphere/transitions/$trans || { \
+            RET=$?
+            echo "Failed running transition script /usr/share/monkeysphere/transitions/$trans" >&2
+            exit $RET
+        }
+    done
 
-# Should be root:root for sshd to work
-  chown root:root /var/lib/monkeysphere
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-# Should be root:root for sshd to work
-  chown root:root /var/lib/monkeysphere
-}
-
-# arg 1:  the old package version
 pre_remove() {
-  userdel monkeysphere &>/dev/null
-  (getent group monkeysphere >/dev/null && groupdel monkeysphere &>/dev/null) || /bin/true
-}
+  echo ">>> /var/lib/monkeysphere files and folder will be left in place,
+    remove any reference to them from openssh-server config file to avoid being locked outside"
+ }

ms.patch

---- 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

msauth.patch

---- 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() {

mshost.patch

---- 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