Commit 51afcf24 authored by Valo's avatar Valo
Browse files

Updates to 0.39 

New patch is needed as gnupg 2.1.15 outputs fingerprints when checking
signatures  and this breaks tests, fix already present in master, will
be included in next release

Agent transfer is not a checkdependency anymore as tests now compile it and
includes it in $PATH
parent 10516551

.SRCINFO

+6 −5
Changes for .SRCINFO: 6 added lines, 5 removed lines.
Original line number Diff line number Diff line 
# Generated by mksrcinfo v8

# Thu Jun 23 14:40:23 UTC 2016

# Fri Sep  2 18:25:13 UTC 2016

pkgbase = monkeysphere

	pkgdesc = Leverage the OpenPGP web of trust for OpenSSH and Web authentication

	pkgver = 0.38

	pkgver = 0.39

	pkgrel = 1

	url = http://web.monkeysphere.info/

	install = monkeysphere.install

	arch = any

	license = GPL3

	checkdepends = agent-transfer

	checkdepends = socat

	checkdepends = openssh

	checkdepends = cpio
@@ -18,10 +17,12 @@ pkgbase = monkeysphere 
	depends = perl-digest-sha1

	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 = http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.39.orig.tar.gz

	source = test-keytrans.patch

	source = binmerge.patch

	source = exclude-agent.patch

	sha256sums = 6951821d11ad646e6e7651d677bfab8f800fbc52703a0ab9942d03cd13959073

	sha256sums = 73331e2df361b22e1dc6445a7d2b0b2c5a124daa4d850c2ecce721579592c29f

	sha256sums = f0c90bd5ffd06b54457b6d0ccf9456bcc7899ab8362d31416cce2d7f982760d0

	sha256sums = e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7

	sha256sums = ee2d4942918a464216b7bde5ad6585441237d2a6235fa795a24a14e0d9962cad

PKGBUILD

+6 −3
Changes for PKGBUILD: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -4,21 +4,23 @@ 
# Based on monkeysphere-git from

# Contributor: Olivier Mehani <shtrom-arch@ssji.net>

pkgname=monkeysphere

pkgver=0.38

pkgver=0.39

pkgrel=1

pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"

arch=('any')

url="http://web.monkeysphere.info/"

license=('GPL3')

depends=('lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1' 'gnupg>=2.1.13')

checkdepends=('agent-transfer' 'socat' 'openssh' 'cpio' 'gnupg>=2.1.13')

checkdepends=('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

    test-keytrans.patch

    binmerge.patch

    exclude-agent.patch

    )



sha256sums=('6951821d11ad646e6e7651d677bfab8f800fbc52703a0ab9942d03cd13959073'

sha256sums=('73331e2df361b22e1dc6445a7d2b0b2c5a124daa4d850c2ecce721579592c29f'

            'f0c90bd5ffd06b54457b6d0ccf9456bcc7899ab8362d31416cce2d7f982760d0'

            'e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7'

            'ee2d4942918a464216b7bde5ad6585441237d2a6235fa795a24a14e0d9962cad')
@@ -26,6 +28,7 @@ install=monkeysphere.install 


prepare() {

  cd "${srcdir}/${pkgname}-${pkgver}"

  patch -p0 -i "${srcdir}/test-keytrans.patch"

  patch -Ni "${srcdir}/binmerge.patch"

  patch -Ni "${srcdir}/exclude-agent.patch"

}

test-keytrans.patch

0 → 100644
+31 −0
Changes for test-keytrans.patch: 31 added lines, 0 removed lines.
Original line number Diff line number Diff line 
diff --git tests/keytrans tests/keytrans

index 3076e3f..5c7d2c8 100755

--- tests/keytrans

+++ tests/keytrans

@@ -140,7 +140,7 @@ uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest

 sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8

 EOF

 

-diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//')

+diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')

 

 echo "##################################################"

 echo "### sleeping to avoid test suite breakage on fast"

@@ -170,7 +170,7 @@ rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8

 EOF

 

 

-diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//')

+diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')

 

 

 echo "##################################################"

@@ -206,7 +206,7 @@ sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:::::8

 EOF

 

 echo "test: diff expected gpg list output"

-diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//')

+diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')

 

 sort >"$TEMPDIR"/expectedout <<EOF

 $KEYFPR