Commit 903a7c75 authored by Valo's avatar Valo Committed by Valo

Updates monkeysphere to 0.41

parent fc4c71be
# Generated by mksrcinfo v8
# Sat Sep 17 14:32:12 UTC 2016
# Fri Dec 9 17:01:33 UTC 2016
pkgbase = monkeysphere
pkgdesc = Leverage the OpenPGP web of trust for OpenSSH and Web authentication
pkgver = 0.39
pkgrel = 2
pkgver = 0.41
pkgrel = 1
url = http://web.monkeysphere.info/
install = monkeysphere.install
arch = any
......@@ -17,14 +17,12 @@ pkgbase = monkeysphere
depends = perl-crypt-openssl-rsa
depends = perl-digest-sha1
depends = gnupg>=2.1.13
source = http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.39.orig.tar.gz
source = test-keytrans.patch
source = http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.41.orig.tar.gz
source = binmerge.patch
source = exclude-agent.patch
sha256sums = 73331e2df361b22e1dc6445a7d2b0b2c5a124daa4d850c2ecce721579592c29f
sha256sums = f0c90bd5ffd06b54457b6d0ccf9456bcc7899ab8362d31416cce2d7f982760d0
sha256sums = e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7
sha256sums = ee2d4942918a464216b7bde5ad6585441237d2a6235fa795a24a14e0d9962cad
sha256sums = 911a2f1622ddb81151b0f41cf569ccf2154d10a09b2f446dbe98fac7279fe74b
sha256sums = e0cdadd4f01deab281cb66543eef19216bd762cb41774d3b498bd2e7c17816e4
sha256sums = 90c3fcc64cbd2329489225af39afa52dc8ebeb6ad0877532c2842ccf616df4ea
pkgname = monkeysphere
......@@ -4,8 +4,8 @@
# Based on monkeysphere-git from
# Contributor: Olivier Mehani <shtrom-arch@ssji.net>
pkgname=monkeysphere
pkgver=0.39
pkgrel=2
pkgver=0.41
pkgrel=1
pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
arch=('any')
url="http://web.monkeysphere.info/"
......@@ -13,21 +13,18 @@ license=('GPL3')
depends=('agent-transfer' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1' 'gnupg>=2.1.13')
checkdepends=('socat' 'openssh' 'cpio' 'gnupg>=2.1.13')
source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz
test-keytrans.patch
binmerge.patch
exclude-agent.patch
)
sha256sums=('73331e2df361b22e1dc6445a7d2b0b2c5a124daa4d850c2ecce721579592c29f'
'f0c90bd5ffd06b54457b6d0ccf9456bcc7899ab8362d31416cce2d7f982760d0'
'e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7'
'ee2d4942918a464216b7bde5ad6585441237d2a6235fa795a24a14e0d9962cad')
sha256sums=('911a2f1622ddb81151b0f41cf569ccf2154d10a09b2f446dbe98fac7279fe74b'
'e0cdadd4f01deab281cb66543eef19216bd762cb41774d3b498bd2e7c17816e4'
'90c3fcc64cbd2329489225af39afa52dc8ebeb6ad0877532c2842ccf616df4ea')
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"
}
......
--- Makefile.orig 2013-06-07 13:02:23.123944233 -0300
+++ Makefile 2013-06-07 13:02:43.351065809 -0300
@@ -36,17 +36,17 @@
--- Makefile.orig 2016-12-03 12:01:26.072614797 +0100
+++ Makefile 2016-12-03 12:04:36.739352722 +0100
@@ -62,14 +62,14 @@
# this target is to be called from the tarball, not from the git
# working dir!
install: all installman
......@@ -10,16 +10,11 @@
mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION
install src/monkeysphere $(DESTDIR)$(PREFIX)/bin
sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
- install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin
- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
- install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
+ install src/monkeysphere-host $(DESTDIR)$(PREFIX)/bin
+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-host
+ install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/bin
+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-authentication
install replaced/src/monkeysphere $(DESTDIR)$(PREFIX)/bin
- install replaced/src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin
- install replaced/src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
+ install replaced/src/monkeysphere-host $(DESTDIR)$(PREFIX)/bin
+ install replaced/src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/bin
install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere
install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
install -m 0644 replaced/src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
--- Makefile.orig 2016-06-22 10:28:31.839738730 +0200
+++ Makefile 2016-06-22 10:29:10.636809346 +0200
@@ -65,7 +65,6 @@
--- Makefile.old 2016-12-09 17:41:06.744056816 +0100
+++ Makefile 2016-12-09 17:47:12.430739851 +0100
@@ -79,7 +79,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:
install -m 0744 replaced/src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
install -m 0644 src/transitions/README.txt $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m
@@ -94,7 +93,9 @@
installman: $(REPLACED_COMPRESSED_MANPAGES)
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
- install replaced/man/man1/* $(DESTDIR)$(MANPREFIX)/man1
+ install replaced/man/man1/monkeysphere.1.gz $(DESTDIR)$(MANPREFIX)/man1
+ install replaced/man/man1/openpgp2ssh.1.gz $(DESTDIR)$(MANPREFIX)/man1
+ install replaced/man/man1/pem2openpgp.1.gz $(DESTDIR)$(MANPREFIX)/man1
install replaced/man/man7/* $(DESTDIR)$(MANPREFIX)/man7
install replaced/man/man8/* $(DESTDIR)$(MANPREFIX)/man8
ln -sf openpgp2ssh.1.gz $(DESTDIR)$(MANPREFIX)/man1/openpgp2pem.1.gz
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment