[gentoo-commits] repo/gentoo:master commit in: app-crypt/monkeysphere/, app-crypt/monkeysphere/files/

[Thomas Deutschmann]

commit:     c0835fe69e815ab450e08e837deaa2919e7af317
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 15:52:22 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 15:52:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0835fe6

app-crypt/monkeysphere: bump to v0.44

Closes: https://bugs.gentoo.org/732998
Closes: https://bugs.gentoo.org/732990
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-crypt/monkeysphere/Manifest                    |  1 +
 ...phere-0.44-install-uncompressed-man-pages.patch | 28 +++++++++++++
 app-crypt/monkeysphere/monkeysphere-0.44.ebuild    | 46 ++++++++++++++++++++++
 3 files changed, 75 insertions(+)

diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index f2646a3d4ed..d145b893007 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -4,3 +4,4 @@ DIST monkeysphere_0.38.orig.tar.gz 107546 BLAKE2B 627b0fbed52e651d57fd359e79b916
 DIST monkeysphere_0.39.orig.tar.gz 107735 BLAKE2B 5e4df72c8c78f6325f79c93b7de1407af2ceb1d2b6be43476d3e0dc5b2505ae97c589deec2bcb64a7dbb3a661221891b89e126086d08df09aef07b07452344f7 SHA512 069acbc3e4f1409a130d4efc95875c72b9e4c55af6ff211fb954a90ff26605ecf9cdbbe7d7f7849de479cafaab7957a33fccefd5f2d54a2317f18bc5454190c2
 DIST monkeysphere_0.41.orig.tar.gz 109040 BLAKE2B dadbd65c879bc8e73e7dd1360ebe7f7242aef125af3907d4487f8d0711afda6d87736ab82938867201eead5c1008d192dbd90602eff5a4843d990b3c87ee2949 SHA512 fcc3dd6c191635ed7ef27a8219d4c9d7043629dc8a02de947fcc4dfc8e612ec767f68d4e4c41252a0c0fc80e4184018e53991d85fcde50cb5def75b925341962
 DIST monkeysphere_0.42.orig.tar.gz 110415 BLAKE2B 281ce2841b9f088f632aa6f487dc6b669911dc343bd2cbbe3dddfcc2ace9a1f2f747bfbb6d831c071a5ebae9c34d4809b1b1f90277e7d3fe1e8f0d42f363f52f SHA512 82e3b0f5f5532c75c1ccf2bd6269f7f4292f38956236fdb7813117a85ef36852b7d7c000552555ab0e233df9a84d7f4e5e86edd007bfcebdd6cde2e808f489f5
+DIST monkeysphere_0.44.orig.tar.gz 110289 BLAKE2B 8a067035d3a40436fd5c27291ab25f15d475d9a0f17b51259c0431c77841807af93cb04d045b77c5f5dda3cd0061ab52561fdb62a704715d0d8cbbf96cb43259 SHA512 cb3c655a08b1c0a382502f8609f57d0c870fe4491b1b967e9931bdfd146b3926470496577949630452e073f04442b91a1ef679254c0f3091a834f3429e0f8e93

diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.44-install-uncompressed-man-pages.patch b/app-crypt/monkeysphere/files/monkeysphere-0.44-install-uncompressed-man-pages.patch
new file mode 100644
index 00000000000..c26f3d4ea90
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.44-install-uncompressed-man-pages.patch
@@ -0,0 +1,28 @@
+--- a/Makefile
++++ b/Makefile
+@@ -27,7 +27,7 @@ src/transitions/*)
+ 
+ REPLACED_COMPRESSED_MANPAGES = $(addsuffix .gz,$(addprefix replaced/,$(wildcard man/*/*)))
+ 
+-all: src/agent-transfer/agent-transfer $(addprefix replaced/,$(REPLACEMENTS)) $(REPLACED_COMPRESSED_MANPAGES)
++all: src/agent-transfer/agent-transfer $(addprefix replaced/,$(REPLACEMENTS)) $(addprefix replaced/,$(wildcard man/*/*))
+ 
+ src/agent-transfer/agent-transfer: src/agent-transfer/main.c src/agent-transfer/ssh-agent-proto.h
+ 	$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< $(LIBS)
+@@ -91,13 +91,13 @@ install: all installman
+ 	install -m 0644 etc/monkeysphere-host.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-host.conf$(ETCSUFFIX)
+ 	install -m 0644 etc/monkeysphere-authentication.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-authentication.conf$(ETCSUFFIX)
+ 
+-installman: $(REPLACED_COMPRESSED_MANPAGES)
++installman:
+ 	mkdir -p $(DESTDIR)$(MANPREFIX)/man1 $(DESTDIR)$(MANPREFIX)/man7 $(DESTDIR)$(MANPREFIX)/man8
+ 	install replaced/man/man1/* $(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
+-	ln -sf openpgp2ssh.1.gz $(DESTDIR)$(MANPREFIX)/man1/openpgp2spki.1.gz
++	ln -sf openpgp2ssh.1 $(DESTDIR)$(MANPREFIX)/man1/openpgp2pem.1
++	ln -sf openpgp2ssh.1 $(DESTDIR)$(MANPREFIX)/man1/openpgp2spki.1
+ 
+ # this target depends on you having the monkeysphere-docs
+ # repo checked out as a peer of your monkeysphere repo.

diff --git a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
new file mode 100644
index 00000000000..63b1bd885e7
--- /dev/null
+++ b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
+HOMEPAGE="http://web.monkeysphere.info/"
+
+LICENSE="GPL-3"
+SLOT="0/0"
+IUSE=""
+SRC_URI="
+	mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz
+	http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DOCS=( README Changelog )
+
+## Tests fail upstream for SSH connection. Issue has been reported.
+RESTRICT="test"
+
+DEPEND="acct-group/monkeysphere
+	acct-user/monkeysphere
+	>=app-crypt/gnupg-2.1.17:0=
+	net-misc/socat:0=
+	dev-perl/Crypt-OpenSSL-RSA:0=
+	dev-perl/Digest-SHA1:0=
+	app-misc/lockfile-progs:0="
+
+RDEPEND="${DEPEND}
+	net-misc/openssh"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.44-install-uncompressed-man-pages.patch )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s#share/doc/monkeysphere#share/doc/${PF}#" \
+		Makefile \
+		|| die
+}
+
+pkg_postinst() {
+	monkeysphere-authentication setup
+}