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

2024-06-22 Thread Sam James
commit: 6a5553077fca71de242a578977390447d39cc623
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 23 01:43:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 23 01:49:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a555307

app-crypt/monkeysphere: subscribe to libassuan subslot

Signed-off-by: Sam James  gentoo.org>

 ...onkeysphere-0.44-r1.ebuild => monkeysphere-0.44-r2.ebuild} | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app-crypt/monkeysphere/monkeysphere-0.44-r1.ebuild 
b/app-crypt/monkeysphere/monkeysphere-0.44-r2.ebuild
similarity index 85%
rename from app-crypt/monkeysphere/monkeysphere-0.44-r1.ebuild
rename to app-crypt/monkeysphere/monkeysphere-0.44-r2.ebuild
index 2b85c2210dac..a90ced11fe37 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.44-r1.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.44-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,13 +20,18 @@ DOCS=( README Changelog )
 # Tests fail upstream for SSH connection. Issue has been reported.
 RESTRICT="test"
 
-DEPEND="acct-group/monkeysphere
+DEPEND="
+   acct-group/monkeysphere
acct-user/monkeysphere
>=app-crypt/gnupg-2.1.17:0=
net-misc/socat:0=
+   dev-libs/libassuan:=
+   dev-libs/libgcrypt:=
+   dev-libs/libgpg-error:=
dev-perl/Crypt-OpenSSL-RSA:0=
dev-perl/Digest-SHA1:0=
-   app-misc/lockfile-progs:0="
+   app-misc/lockfile-progs:0=
+"
 RDEPEND="${DEPEND}
virtual/openssh"
 



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

2022-06-10 Thread Sam James
commit: 58d764319f83a36cf82020433f5bac7b30105573
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 11 05:24:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 11 05:24:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d76431

app-crypt/monkeysphere: respect CC; no Werror

Closes: https://bugs.gentoo.org/832365
Closes: https://bugs.gentoo.org/744430
Bug: https://bugs.gentoo.org/744454
Signed-off-by: Sam James  gentoo.org>

 .../files/monkeysphere-0.44-no-werror.patch| 12 ++
 app-crypt/monkeysphere/monkeysphere-0.44.ebuild| 26 --
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.44-no-werror.patch 
b/app-crypt/monkeysphere/files/monkeysphere-0.44-no-werror.patch
new file mode 100644
index ..671045d7c385
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.44-no-werror.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/832365
+--- a/Makefile
 b/Makefile
+@@ -17,7 +17,7 @@ LOCALSTATEDIR ?= /var/lib
+ 
+ CFLAGS += $(shell libassuan-config --cflags)
+ CFLAGS += $(shell libgcrypt-config --cflags)
+-CFLAGS += --pedantic -Wall -Werror -std=c99
++CFLAGS += --pedantic -Wall -std=c99
+ LIBS += $(shell libassuan-config --libs)
+ LIBS += $(shell libgcrypt-config --libs)
+ 

diff --git a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild 
b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
index c22ae2b8f88c..f8a6c908946d 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 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";
+
+LICENSE="GPL-3"
+SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 
 DOCS=( README Changelog )
 
-## Tests fail upstream for SSH connection. Issue has been reported.
+# Tests fail upstream for SSH connection. Issue has been reported.
 RESTRICT="test"
 
 DEPEND="acct-group/monkeysphere
@@ -26,19 +27,20 @@ DEPEND="acct-group/monkeysphere
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 )
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.44-install-uncompressed-man-pages.patch
+   "${FILESDIR}"/${PN}-0.44-no-werror.patch
+)
 
 src_prepare() {
default
 
-   sed -i \
-   -e "s#share/doc/monkeysphere#share/doc/${PF}#" \
-   Makefile \
-   || die
+   sed -i -e "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
+
+   tc-export CC
 }
 
 pkg_postinst() {



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

2021-03-16 Thread Sam James
commit: f23b2db970b5d8ed265c496bed138db712f86cfa
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 17 02:24:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 17 02:25:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23b2db9

app-crypt/monkeysphere: drop 0.41

Bug: https://bugs.gentoo.org/776739
Signed-off-by: Sam James  gentoo.org>

 app-crypt/monkeysphere/Manifest|  1 -
 .../files/monkeysphere-0.36_default_shell.patch| 12 -
 .../files/monkeysphere-0.36_hd_od.patch| 14 --
 .../files/monkeysphere-0.36_non_default_port.patch | 14 --
 ...onkeysphere-0.36_openpgp2ssh_sanity_check.patch | 34 --
 .../files/monkeysphere-0.36_tests_gnupg2.patch | 50 
 .../monkeysphere-0.36_userid_empty_line.patch  | 12 -
 app-crypt/monkeysphere/monkeysphere-0.41.ebuild| 54 --
 8 files changed, 191 deletions(-)

diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index e1759b11374..25bcb7d3b9e 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -1,2 +1 @@
-DIST monkeysphere_0.41.orig.tar.gz 109040 BLAKE2B 
dadbd65c879bc8e73e7dd1360ebe7f7242aef125af3907d4487f8d0711afda6d87736ab82938867201eead5c1008d192dbd90602eff5a4843d990b3c87ee2949
 SHA512 
fcc3dd6c191635ed7ef27a8219d4c9d7043629dc8a02de947fcc4dfc8e612ec767f68d4e4c41252a0c0fc80e4184018e53991d85fcde50cb5def75b925341962
 DIST monkeysphere_0.44.orig.tar.gz 110289 BLAKE2B 
8a067035d3a40436fd5c27291ab25f15d475d9a0f17b51259c0431c77841807af93cb04d045b77c5f5dda3cd0061ab52561fdb62a704715d0d8cbbf96cb43259
 SHA512 
cb3c655a08b1c0a382502f8609f57d0c870fe4491b1b967e9931bdfd146b3926470496577949630452e073f04442b91a1ef679254c0f3091a834f3429e0f8e93

diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch 
b/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch
deleted file mode 100644
index f979114181d..000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r d0c02fe6a949 src/share/common
 a/src/share/common Sun Oct 06 19:21:18 2013 +0200
-+++ b/src/share/common Sun Oct 06 19:21:49 2013 +0200
-@@ -108,7 +108,7 @@
-  # if root, su command as monkeysphere user
-   'root')
- # requote arguments using bash builtin feature (see "help 
printf"):
--  su "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
-+  su -s /bin/bash "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
-   ;;
- 
-   # otherwise, fail

diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch 
b/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch
deleted file mode 100644
index 7cdaa74b573..000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 6150774ec7f4 tests/keytrans
 a/tests/keytrans   Sun Feb 16 20:11:02 2014 +0100
-+++ b/tests/keytrans   Sun Feb 16 20:11:40 2014 +0100
-@@ -104,8 +104,8 @@
- <(gpg --list-packets < "$TEMPDIR"/converted.secret.key)
- 
- diff -u \
--<(hd "$TEMPDIR"/secret.key) \
--<(hd "$TEMPDIR"/converted.secret.key)
-+<(od -xc "$TEMPDIR"/secret.key) \
-+<(od -xc "$TEMPDIR"/converted.secret.key)
- 
- KEYFPR=$(gpg --fingerprint --with-colons --list-keys | grep ^fpr | cut -f10 
-d:)
- KEYID=$(printf "%s" "$KEYFPR" | cut -b25-40)

diff --git 
a/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch 
b/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch
deleted file mode 100644
index f14550280fc..000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 5f7ee764ec1f src/share/common
 a/src/share/common Mon Oct 07 19:22:36 2013 +0200
-+++ b/src/share/common Mon Oct 07 19:22:58 2013 +0200
-@@ -863,6 +863,10 @@
-   ;;
-   ('known_hosts')
-   host=${userID#ssh://}
-+  if [[ "${host}" == *:* ]]; then
-+  IFS=':' read -a ARR <<< "${host}"
-+  host="[${ARR[0]}]:${ARR[1]}"
-+  fi
-   remove_line "$keyFile" "$host" "$sshKey"
-   ;;
-   esac

diff --git 
a/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch 
b/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch
deleted file mode 100644
index aec90eb0766..000
--- 
a/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
-index edc7995..2711ff2 100755
 a/src/monkeysphere-authentication
-+++ b/src/monkeysphere-authentication
-@@ -84,6 +84,13 @@ gpg_sphere() {
- su_monkeysphere_user gpg --fixed-list-mode --no-greeting --quiet --no-tty 
"$@

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

2021-03-16 Thread Sam James
commit: 0de9b58e9bfe40d35de92b8f2b84919e2f7c7d52
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 17 02:19:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 17 02:19:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de9b58e

app-crypt/monkeysphere: Stabilize 0.44 x86, #776739

Signed-off-by: Sam James  gentoo.org>

 app-crypt/monkeysphere/monkeysphere-0.44.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild 
b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
index a57bfd0de98..c22ae2b8f88 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm x86"
 
 DOCS=( README Changelog )
 



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

2021-03-16 Thread Sam James
commit: a3d0235b6ab81f636202efdfcc45de44e7935b7f
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 17 02:15:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 17 02:15:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3d0235b

app-crypt/monkeysphere: Stabilize 0.44 amd64, #776739

Signed-off-by: Sam James  gentoo.org>

 app-crypt/monkeysphere/monkeysphere-0.44.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild 
b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
index 63b1bd885e7..a57bfd0de98 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~x86"
 
 DOCS=( README Changelog )
 



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

2021-03-16 Thread Sam James
commit: 528a1608f9d53a1ce5402ea97c7949f7eb031706
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 16 19:21:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 16 19:22:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528a1608

app-crypt/monkeysphere: drop 0.36-r2

Signed-off-by: Sam James  gentoo.org>

 app-crypt/monkeysphere/Manifest|  1 -
 app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild | 67 --
 2 files changed, 68 deletions(-)

diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index 4057543c956..e1759b11374 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -1,3 +1,2 @@
-DIST monkeysphere_0.36.orig.tar.gz 98876 BLAKE2B 
5f8dcd5349cd038208fcc00dff19c7d001ca8b763f223e832c820bc4f09391ff78667f80af691c0234aed810f4d5aa77d26a378a88b41a4b115ab528e0cdd9ed
 SHA512 
eb6776bd9996db8a5d6a1d16b5b06e6733069cbb3cb35f4e3965508575e084c6f08576f31c71429432daf93910d145804ecf155c3d7550a0f4550a056cb4f0c8
 DIST monkeysphere_0.41.orig.tar.gz 109040 BLAKE2B 
dadbd65c879bc8e73e7dd1360ebe7f7242aef125af3907d4487f8d0711afda6d87736ab82938867201eead5c1008d192dbd90602eff5a4843d990b3c87ee2949
 SHA512 
fcc3dd6c191635ed7ef27a8219d4c9d7043629dc8a02de947fcc4dfc8e612ec767f68d4e4c41252a0c0fc80e4184018e53991d85fcde50cb5def75b925341962
 DIST monkeysphere_0.44.orig.tar.gz 110289 BLAKE2B 
8a067035d3a40436fd5c27291ab25f15d475d9a0f17b51259c0431c77841807af93cb04d045b77c5f5dda3cd0061ab52561fdb62a704715d0d8cbbf96cb43259
 SHA512 
cb3c655a08b1c0a382502f8609f57d0c870fe4491b1b967e9931bdfd146b3926470496577949630452e073f04442b91a1ef679254c0f3091a834f3429e0f8e93

diff --git a/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild 
b/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild
deleted file mode 100644
index 63a671e3e58..000
--- a/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web 
authentication"
-HOMEPAGE="http://web.monkeysphere.info/";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-SRC_URI="mirror://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="app-crypt/gnupg
-   net-misc/socat
-   dev-perl/Crypt-OpenSSL-RSA
-   dev-perl/Digest-SHA1
-   app-misc/lockfile-progs"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup()
-{
-   einfo "Creating named group and user"
-   enewgroup monkeysphere
-   enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
-   # Using fperms and fowner in src_install leave unusable config with 
error
-   # Authentication refused: bad ownership or modes for directory 
/var/lib/monkeysphere
-   chown root:monkeysphere /var/lib/monkeysphere
-   chmod 751 /var/lib/monkeysphere
-}
-
-src_prepare()
-{
-   epatch "${FILESDIR}/${P}_default_shell.patch"\
-  "${FILESDIR}/${P}_non_default_port.patch"\
-  "${FILESDIR}/${P}_userid_empty_line.patch"\
-  "${FILESDIR}/${P}_openpgp2ssh_sanity_check.patch"\
-  "${FILESDIR}/${P}_hd_od.patch"
-
-   sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
-
-   # Output format of gpg --check-sigs differ between 1.4 and 2.0 so test
-   # needs to be updated if 2.0 is used
-   if has_version '>=app-crypt/gnupg-2.0.0:0'; then
-   epatch "${FILESDIR}/${P}_tests_gnupg2.patch"
-   fi;
-}
-
-src_install()
-{
-   default
-   dodir /var/lib/monkeysphere
-}
-
-pkg_postinst()
-{
-   #This function is idempotent, make sure it is run at least once.
-   monkeysphere-authentication setup || die
-}



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

2020-09-26 Thread Conrad Kostecki
commit: 789799cad385d9036ff428a5940cf38cc362476d
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Sep 26 14:34:57 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Sep 27 00:14:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=789799ca

app-crypt/monkeysphere: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/17682
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/monkeysphere-0.37_default_shell.patch| 12 ---
 .../files/monkeysphere-0.37_hd_od.patch| 14 
 .../files/monkeysphere-0.38-asprintf.patch | 45 --
 ...monkeysphere-0.38-revert-executable-patch.patch | 98 --
 .../monkeysphere-0.38-syssharedir-whitespace.patch | 53 
 ...re-0.39-make-tests-work-with-gnupg-2.1.15.patch | 45 --
 6 files changed, 267 deletions(-)

diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch 
b/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch
deleted file mode 100644
index f979114181d..000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r d0c02fe6a949 src/share/common
 a/src/share/common Sun Oct 06 19:21:18 2013 +0200
-+++ b/src/share/common Sun Oct 06 19:21:49 2013 +0200
-@@ -108,7 +108,7 @@
-  # if root, su command as monkeysphere user
-   'root')
- # requote arguments using bash builtin feature (see "help 
printf"):
--  su "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
-+  su -s /bin/bash "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
-   ;;
- 
-   # otherwise, fail

diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch 
b/app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch
deleted file mode 100644
index 7cdaa74b573..000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 6150774ec7f4 tests/keytrans
 a/tests/keytrans   Sun Feb 16 20:11:02 2014 +0100
-+++ b/tests/keytrans   Sun Feb 16 20:11:40 2014 +0100
-@@ -104,8 +104,8 @@
- <(gpg --list-packets < "$TEMPDIR"/converted.secret.key)
- 
- diff -u \
--<(hd "$TEMPDIR"/secret.key) \
--<(hd "$TEMPDIR"/converted.secret.key)
-+<(od -xc "$TEMPDIR"/secret.key) \
-+<(od -xc "$TEMPDIR"/converted.secret.key)
- 
- KEYFPR=$(gpg --fingerprint --with-colons --list-keys | grep ^fpr | cut -f10 
-d:)
- KEYID=$(printf "%s" "$KEYFPR" | cut -b25-40)

diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch 
b/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch
deleted file mode 100644
index dbf9d5f590c..000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b756fd2e58ab013b5c9bfc2658ed9ad48868067c Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor 
-Date: Sun, 7 Aug 2016 18:24:47 -0400
-Subject: [PATCH] avoid warning about unused asprintf return value
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-some versions of gcc produce this warning, which is treated as an
-error due to our conservative defaults in Makefile:
-
-src/agent-transfer/main.c: In function ‘main’:
-src/agent-transfer/main.c:676:5: error: ignoring return value of ‘asprintf’, 
declared with attribute warn_unused_result [-Werror=unused-result]
- asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip);
- ^
-cc1: all warnings being treated as errors
-
-this patch avoids the warning.

- src/agent-transfer/main.c | 9 +++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/agent-transfer/main.c b/src/agent-transfer/main.c
-index 406aaa3..3038f5c 100644
 a/src/agent-transfer/main.c
-+++ b/src/agent-transfer/main.c
-@@ -672,8 +672,13 @@ int main (int argc, const char* argv[]) {
- return 1;
-   }
- 
--  if (!args.comment)
--asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip);
-+  if (!args.comment) {
-+err = asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip);
-+if (err < 0) {
-+  fprintf (stderr, "failed to generate key comment\n");
-+  return 1;
-+}
-+  }
-   
-   err = send_to_ssh_agent (&e, ssh_sock_fd, args.seconds, args.confirm,
-args.comment ? args.comment : alt_comment);
--- 
-2.7.3
-

diff --git 
a/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch 
b/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch
deleted file mode 100644
index 4d98c0a7cf5..000
--- 
a/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From c75c7553a88e387013e2b4310f4c4956adfd8a98 Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor 
-Date: Mon, 8 Aug 2016 20:45:07 -0400

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

2020-09-23 Thread Aaron Bauman
commit: 3689cc74fe543ae6aee1b07832548dbdfaac0635
Author: Aaron Bauman  gentoo  org>
AuthorDate: Thu Sep 24 00:39:37 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Sep 24 01:05:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3689cc74

app-crypt/monkeysphere: drop old

Signed-off-by: Aaron Bauman  gentoo.org>

 app-crypt/monkeysphere/Manifest|  4 --
 app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild | 57 
 app-crypt/monkeysphere/monkeysphere-0.37.ebuild| 57 
 app-crypt/monkeysphere/monkeysphere-0.38.ebuild| 61 --
 app-crypt/monkeysphere/monkeysphere-0.39.ebuild| 56 
 app-crypt/monkeysphere/monkeysphere-0.42.ebuild| 54 ---
 6 files changed, 289 deletions(-)

diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index d145b893007..4057543c956 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -1,7 +1,3 @@
 DIST monkeysphere_0.36.orig.tar.gz 98876 BLAKE2B 
5f8dcd5349cd038208fcc00dff19c7d001ca8b763f223e832c820bc4f09391ff78667f80af691c0234aed810f4d5aa77d26a378a88b41a4b115ab528e0cdd9ed
 SHA512 
eb6776bd9996db8a5d6a1d16b5b06e6733069cbb3cb35f4e3965508575e084c6f08576f31c71429432daf93910d145804ecf155c3d7550a0f4550a056cb4f0c8
-DIST monkeysphere_0.37.orig.tar.gz 99557 BLAKE2B 
d32d127927bcf3494933282fcc343ffd32841a8afe84c78b9b29ae30fa374328295d3610475aacd8e2cf0962130c2a73b338c702dff4f904b6fd23b33ad0331b
 SHA512 
ebf636caaa0985a2495314375a9d78d131173ccedc116993e02b7bbc0ddc8c43c718dc65cb725619ecf7e72e0b7e11b941f3eb342d7c23d17ca0507b2ab28512
-DIST monkeysphere_0.38.orig.tar.gz 107546 BLAKE2B 
627b0fbed52e651d57fd359e79b91689eeca47ea58335125061cba72f863a582d39536504124e18805c39b3c43e5096edb6db0e32c5c80570689bd55e2936a3b
 SHA512 
fd87460fe16b0133fd507ff93926a5dea6419343b45c3ba33e6e981333646f4fa840c127bb1f3e7750bc3ede66c5e07f417a8354cf38d89159422dca390f
-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/monkeysphere-0.36-r1.ebuild 
b/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild
deleted file mode 100644
index 953836fdace..000
--- a/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web 
authentication"
-HOMEPAGE="http://web.monkeysphere.info/";
-SRC_URI="http://archive.${PN}.info/debian/pool/${PN}/${PN::1}/${PN}/${PN}_${PV}.orig.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-# Tests do weird things with network and fail OOTB.
-RESTRICT="test"
-
-RDEPEND="
-   app-crypt/gnupg
-   app-misc/lockfile-progs
-   dev-perl/Crypt-OpenSSL-RSA
-   dev-perl/Digest-SHA1
-   || ( net-analyzer/netcat net-misc/socat )"
-DEPEND="${RDEPEND}
-   test? ( net-misc/socat )"
-
-pkg_setup()
-{
-   einfo "Creating named group and user"
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare()
-{
-   epatch "${FILESDIR}/${P}_default_shell.patch" \
-   "${FILESDIR}/${P}_non_default_port.patch" \
-   "${FILESDIR}/${P}_userid_empty_line.patch"
-
-   sed -i "s#share/doc/${PN}#share/doc/${PF}#" Makefile || die
-}
-
-src_install()
-{
-   default
-
-   dodir /var/lib/${PN}
-   fowners root:${PN} /var/lib/${PN}
-   fperms 751 /var/lib/${PN}
-}
-
-pkg_postinst()
-{
-   ${PN}-authentication setup || die
-}

diff --git a/app-crypt/monkeysphere/monkeysphere-0.37.ebuild 
b/app-cry

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

2020-08-19 Thread Thomas Deutschmann
commit: c0835fe69e815ab450e08e837deaa2919e7af317
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug 19 15:52:22 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug 19 15:52:45 2020 +
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  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 000..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 000..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
+   

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

2019-08-18 Thread David Seifert
commit: 4213e6c76f7cb2933d24347880b58ce7daafdb8a
Author: David Seifert  gentoo  org>
AuthorDate: Sun Aug 18 12:00:33 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Aug 18 12:36:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4213e6c7

app-crypt/monkeysphere: [QA] Fix leading whitespace

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: David Seifert  gentoo.org>

 app-crypt/monkeysphere/monkeysphere-0.38.ebuild | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app-crypt/monkeysphere/monkeysphere-0.38.ebuild 
b/app-crypt/monkeysphere/monkeysphere-0.38.ebuild
index 2d718ae60cd..a919d40924d 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.38.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -39,11 +39,12 @@ pkg_setup()
 
 src_prepare()
 {
-   epatch "${FILESDIR}/${P}-asprintf.patch" \
-   "${FILESDIR}/${P}-revert-executable-patch.patch"\
-   "${FILESDIR}/${P}-syssharedir-whitespace.patch"\
-  "${FILESDIR}/${PN}-0.37_default_shell.patch"\
-  "${FILESDIR}/${PN}-0.37_hd_od.patch"
+   epatch \
+   "${FILESDIR}/${P}-asprintf.patch" \
+   "${FILESDIR}/${P}-revert-executable-patch.patch" \
+   "${FILESDIR}/${P}-syssharedir-whitespace.patch" \
+   "${FILESDIR}/${PN}-0.37_default_shell.patch" \
+   "${FILESDIR}/${PN}-0.37_hd_od.patch"
 
sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
 }



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

2019-01-21 Thread Kristian Fiskerstrand
commit: 9103fbbb2b0244be8c3017a298641cbeb715
Author: Kristian Fiskerstrand  gentoo  org>
AuthorDate: Mon Jan 21 18:20:41 2019 +
Commit: Kristian Fiskerstrand  gentoo  org>
CommitDate: Mon Jan 21 18:26:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9103f777

app-crypt/monkeysphere: New upstream version 0.42

Signed-off-by: Kristian Fiskerstrand  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-crypt/monkeysphere/Manifest |  1 +
 app-crypt/monkeysphere/monkeysphere-0.42.ebuild | 54 +
 2 files changed, 55 insertions(+)

diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index f01f25f4390..f2646a3d4ed 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -3,3 +3,4 @@ DIST monkeysphere_0.37.orig.tar.gz 99557 BLAKE2B 
d32d127927bcf3494933282fcc343ff
 DIST monkeysphere_0.38.orig.tar.gz 107546 BLAKE2B 
627b0fbed52e651d57fd359e79b91689eeca47ea58335125061cba72f863a582d39536504124e18805c39b3c43e5096edb6db0e32c5c80570689bd55e2936a3b
 SHA512 
fd87460fe16b0133fd507ff93926a5dea6419343b45c3ba33e6e981333646f4fa840c127bb1f3e7750bc3ede66c5e07f417a8354cf38d89159422dca390f
 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

diff --git a/app-crypt/monkeysphere/monkeysphere-0.42.ebuild 
b/app-crypt/monkeysphere/monkeysphere-0.42.ebuild
new file mode 100644
index 000..4223ab8f987
--- /dev/null
+++ b/app-crypt/monkeysphere/monkeysphere-0.42.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+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="app-crypt/gnupg:0=
+   net-misc/socat:0=
+   dev-perl/Crypt-OpenSSL-RSA:0=
+   dev-perl/Digest-SHA1:0=
+   app-misc/lockfile-progs:0="
+
+RDEPEND="${DEPEND}"
+
+pkg_setup()
+{
+   einfo "Creating named group and user"
+   enewgroup monkeysphere
+   enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
+   # Using fperms and fowner in src_install leave unusable config with 
error
+   # Authentication refused: bad ownership or modes for directory 
/var/lib/monkeysphere
+   chown root:monkeysphere /var/lib/monkeysphere
+   chmod 751 /var/lib/monkeysphere
+}
+
+src_prepare()
+{
+   sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
+}
+
+src_install()
+{
+   default
+   dodir /var/lib/monkeysphere
+}
+
+pkg_postinst()
+{
+   monkeysphere-authentication setup || die
+}



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

2018-06-23 Thread Mikle Kolyada
commit: 987e71fe5f4e102e8f2322f216a819eda59687ad
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jun 23 13:53:48 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jun 23 13:53:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=987e71fe

app-crypt/monkeysphere: amd64 stable wrt bug #658560

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-crypt/monkeysphere/monkeysphere-0.41.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/monkeysphere/monkeysphere-0.41.ebuild 
b/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
index 6c792e15427..f760f6ac223 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~x86"
 
 DOCS=( README Changelog )
 



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

2016-12-03 Thread Kristian Fiskerstrand
commit: 6d8a2f19dd1eff4ef46211d3bad0b2167176b539
Author: Kristian Fiskerstrand  gentoo  org>
AuthorDate: Sat Dec  3 09:54:15 2016 +
Commit: Kristian Fiskerstrand  gentoo  org>
CommitDate: Sat Dec  3 09:54:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d8a2f19

app-crypt/monkeysphere: New upstream version 0.41

Package-Manager: portage-2.3.2

 app-crypt/monkeysphere/Manifest |  1 +
 app-crypt/monkeysphere/monkeysphere-0.41.ebuild | 55 +
 2 files changed, 56 insertions(+)

diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index 3077fd7..7c0c603 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -2,3 +2,4 @@ DIST monkeysphere_0.36.orig.tar.gz 98876 SHA256 
6ae4edeff2cc29b6913346e15b61500e
 DIST monkeysphere_0.37.orig.tar.gz 99557 SHA256 
b510b8a414fb400356e80f1f882488785df72ac54078410b54d4c50a84686e59 SHA512 
ebf636caaa0985a2495314375a9d78d131173ccedc116993e02b7bbc0ddc8c43c718dc65cb725619ecf7e72e0b7e11b941f3eb342d7c23d17ca0507b2ab28512
 WHIRLPOOL 
d27a3712ce4cd529986c4ac0af7398f8d69d66c1b5aed9842d3b21f417bab5d2b3afc7be9e069ce0e9f307b17ad33ef9e8d49d7624ec0d7d2aab60949982b9c1
 DIST monkeysphere_0.38.orig.tar.gz 107546 SHA256 
6951821d11ad646e6e7651d677bfab8f800fbc52703a0ab9942d03cd13959073 SHA512 
fd87460fe16b0133fd507ff93926a5dea6419343b45c3ba33e6e981333646f4fa840c127bb1f3e7750bc3ede66c5e07f417a8354cf38d89159422dca390f
 WHIRLPOOL 
26f96f1d845ce1178337cc23e50140576a785536f656e73ceaba4d64192106b2462bb046328758c2771b48de64abe1a3d866cfc2fadc7ac0d0e2341778cd9105
 DIST monkeysphere_0.39.orig.tar.gz 107735 SHA256 
73331e2df361b22e1dc6445a7d2b0b2c5a124daa4d850c2ecce721579592c29f SHA512 
069acbc3e4f1409a130d4efc95875c72b9e4c55af6ff211fb954a90ff26605ecf9cdbbe7d7f7849de479cafaab7957a33fccefd5f2d54a2317f18bc5454190c2
 WHIRLPOOL 
3b0b260e002e5bbc4f894f468da77c9b3eb0c020316ceed920663f66e0db525c2baea4d9be7a36e82544c02bc3ece3bb0bbfa455c47d8f89896de08e4ff7211f
+DIST monkeysphere_0.41.orig.tar.gz 109040 SHA256 
911a2f1622ddb81151b0f41cf569ccf2154d10a09b2f446dbe98fac7279fe74b SHA512 
fcc3dd6c191635ed7ef27a8219d4c9d7043629dc8a02de947fcc4dfc8e612ec767f68d4e4c41252a0c0fc80e4184018e53991d85fcde50cb5def75b925341962
 WHIRLPOOL 
3a71264e78a8b2fa5cde35167df219d6becb082d87dfd8dd22902e0091bbf5397c380c1b5609e79d8743219d948a4ee89b354907cc5aab95275bd805b6ebc223

diff --git a/app-crypt/monkeysphere/monkeysphere-0.41.ebuild 
b/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
new file mode 100644
index ..f92a46e
--- /dev/null
+++ b/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils user
+
+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="app-crypt/gnupg:0=
+   net-misc/socat:0=
+   dev-perl/Crypt-OpenSSL-RSA:0=
+   dev-perl/Digest-SHA1:0=
+   app-misc/lockfile-progs:0="
+
+RDEPEND="${DEPEND}"
+
+pkg_setup()
+{
+   einfo "Creating named group and user"
+   enewgroup monkeysphere
+   enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
+   # Using fperms and fowner in src_install leave unusable config with 
error
+   # Authentication refused: bad ownership or modes for directory 
/var/lib/monkeysphere
+   chown root:monkeysphere /var/lib/monkeysphere
+   chmod 751 /var/lib/monkeysphere
+}
+
+src_prepare()
+{
+   sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
+}
+
+src_install()
+{
+   default
+   dodir /var/lib/monkeysphere
+}
+
+pkg_postinst()
+{
+   monkeysphere-authentication setup || die
+}



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

2016-11-29 Thread Thomas Deutschmann
commit: fdacffd94b321675deabe61fb2ca958e46e7e12a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Nov 29 19:52:45 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Nov 29 19:53:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdacffd9

app-crypt/monkeysphere: x86 stable

Package-Manager: portage-2.3.2

 app-crypt/monkeysphere/monkeysphere-0.37.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/monkeysphere/monkeysphere-0.37.ebuild 
b/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
index 376b862..fd52509 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm x86"
 
 DOCS=( README Changelog )
 



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

2016-08-31 Thread Kristian Fiskerstrand
commit: db19bc9eb421753009d8e9392c014b46f0c3da48
Author: Kristian Fiskerstrand  gentoo  org>
AuthorDate: Wed Aug 31 19:38:24 2016 +
Commit: Kristian Fiskerstrand  gentoo  org>
CommitDate: Wed Aug 31 19:39:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db19bc9e

app-crypt/monkeysphere: New upstream version 0.39

Package-Manager: portage-2.3.0

 app-crypt/monkeysphere/Manifest|  1 +
 ...re-0.39-make-tests-work-with-gnupg-2.1.15.patch | 45 +
 app-crypt/monkeysphere/monkeysphere-0.39.ebuild| 57 ++
 3 files changed, 103 insertions(+)

diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index 44a78ab..3077fd7 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -1,3 +1,4 @@
 DIST monkeysphere_0.36.orig.tar.gz 98876 SHA256 
6ae4edeff2cc29b6913346e15b61500ea7cc06d761a9f42e67de83b7d2607be7 SHA512 
eb6776bd9996db8a5d6a1d16b5b06e6733069cbb3cb35f4e3965508575e084c6f08576f31c71429432daf93910d145804ecf155c3d7550a0f4550a056cb4f0c8
 WHIRLPOOL 
c163d0be77d3c6d838f752c8f53d967b17aeafd798e4fca694a31bf55628fb57d18b6a4664ca9552bd3daf3b89b6f86452d430529985ca0a31c3c4aa48470bc0
 DIST monkeysphere_0.37.orig.tar.gz 99557 SHA256 
b510b8a414fb400356e80f1f882488785df72ac54078410b54d4c50a84686e59 SHA512 
ebf636caaa0985a2495314375a9d78d131173ccedc116993e02b7bbc0ddc8c43c718dc65cb725619ecf7e72e0b7e11b941f3eb342d7c23d17ca0507b2ab28512
 WHIRLPOOL 
d27a3712ce4cd529986c4ac0af7398f8d69d66c1b5aed9842d3b21f417bab5d2b3afc7be9e069ce0e9f307b17ad33ef9e8d49d7624ec0d7d2aab60949982b9c1
 DIST monkeysphere_0.38.orig.tar.gz 107546 SHA256 
6951821d11ad646e6e7651d677bfab8f800fbc52703a0ab9942d03cd13959073 SHA512 
fd87460fe16b0133fd507ff93926a5dea6419343b45c3ba33e6e981333646f4fa840c127bb1f3e7750bc3ede66c5e07f417a8354cf38d89159422dca390f
 WHIRLPOOL 
26f96f1d845ce1178337cc23e50140576a785536f656e73ceaba4d64192106b2462bb046328758c2771b48de64abe1a3d866cfc2fadc7ac0d0e2341778cd9105
+DIST monkeysphere_0.39.orig.tar.gz 107735 SHA256 
73331e2df361b22e1dc6445a7d2b0b2c5a124daa4d850c2ecce721579592c29f SHA512 
069acbc3e4f1409a130d4efc95875c72b9e4c55af6ff211fb954a90ff26605ecf9cdbbe7d7f7849de479cafaab7957a33fccefd5f2d54a2317f18bc5454190c2
 WHIRLPOOL 
3b0b260e002e5bbc4f894f468da77c9b3eb0c020316ceed920663f66e0db525c2baea4d9be7a36e82544c02bc3ece3bb0bbfa455c47d8f89896de08e4ff7211f

diff --git 
a/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch
 
b/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch
new file mode 100644
index ..776e633
--- /dev/null
+++ 
b/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch
@@ -0,0 +1,45 @@
+From b1dd8fb1b84c6eea25523c3ea746852b3dce6034 Mon Sep 17 00:00:00 2001
+From: Valo 
+Date: Wed, 31 Aug 2016 14:00:05 -0400
+Subject: [PATCH] Make tests pass with GnuPG 2.1.15
+
+2.1.15 appears to always emit the fingerprint lines in these cases,
+while 2.1.14 did not.
+---
+ tests/keytrans | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/keytrans b/tests/keytrans
+index 3076e3f..5c7d2c8 100755
+--- a/tests/keytrans
 b/tests/keytrans
+@@ -140,7 +140,7 @@ 
uid:u$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest
+ sig:!::1:$KEYID:$timestampmonkeymonkey: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:$revtimemonkeymonkey: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 [gentoo-commits] repo/gentoo:master commit in: app-crypt/monkeysphere/, app-crypt/monkeysphere/files/

commit: 5ca3028d1a392aa98808a72b098651fe22e8493e
Author: Kristian Fiskerstrand  gentoo  org>
AuthorDate: Tue Aug  9 15:36:33 2016 +
Commit: Kristian Fiskerstrand  gentoo  org>
CommitDate: Tue Aug  9 15:37:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca3028d

app-crypt/monkeysphere: Version bump to 0.38

Package-Manager: portage-2.3.0

 app-crypt/monkeysphere/Manifest|  1 +
 .../files/monkeysphere-0.38-asprintf.patch | 45 ++
 ...monkeysphere-0.38-revert-executable-patch.patch | 98 ++
 .../monkeysphere-0.38-syssharedir-whitespace.patch | 53 
 app-crypt/monkeysphere/monkeysphere-0.38.ebuild| 61 ++
 5 files changed, 258 insertions(+)

diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index e905342..44a78ab 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -1,2 +1,3 @@
 DIST monkeysphere_0.36.orig.tar.gz 98876 SHA256 
6ae4edeff2cc29b6913346e15b61500ea7cc06d761a9f42e67de83b7d2607be7 SHA512 
eb6776bd9996db8a5d6a1d16b5b06e6733069cbb3cb35f4e3965508575e084c6f08576f31c71429432daf93910d145804ecf155c3d7550a0f4550a056cb4f0c8
 WHIRLPOOL 
c163d0be77d3c6d838f752c8f53d967b17aeafd798e4fca694a31bf55628fb57d18b6a4664ca9552bd3daf3b89b6f86452d430529985ca0a31c3c4aa48470bc0
 DIST monkeysphere_0.37.orig.tar.gz 99557 SHA256 
b510b8a414fb400356e80f1f882488785df72ac54078410b54d4c50a84686e59 SHA512 
ebf636caaa0985a2495314375a9d78d131173ccedc116993e02b7bbc0ddc8c43c718dc65cb725619ecf7e72e0b7e11b941f3eb342d7c23d17ca0507b2ab28512
 WHIRLPOOL 
d27a3712ce4cd529986c4ac0af7398f8d69d66c1b5aed9842d3b21f417bab5d2b3afc7be9e069ce0e9f307b17ad33ef9e8d49d7624ec0d7d2aab60949982b9c1
+DIST monkeysphere_0.38.orig.tar.gz 107546 SHA256 
6951821d11ad646e6e7651d677bfab8f800fbc52703a0ab9942d03cd13959073 SHA512 
fd87460fe16b0133fd507ff93926a5dea6419343b45c3ba33e6e981333646f4fa840c127bb1f3e7750bc3ede66c5e07f417a8354cf38d89159422dca390f
 WHIRLPOOL 
26f96f1d845ce1178337cc23e50140576a785536f656e73ceaba4d64192106b2462bb046328758c2771b48de64abe1a3d866cfc2fadc7ac0d0e2341778cd9105

diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch 
b/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch
new file mode 100644
index 000..dbf9d5f
--- /dev/null
+++ b/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch
@@ -0,0 +1,45 @@
+From b756fd2e58ab013b5c9bfc2658ed9ad48868067c Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor 
+Date: Sun, 7 Aug 2016 18:24:47 -0400
+Subject: [PATCH] avoid warning about unused asprintf return value
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+some versions of gcc produce this warning, which is treated as an
+error due to our conservative defaults in Makefile:
+
+src/agent-transfer/main.c: In function ‘main’:
+src/agent-transfer/main.c:676:5: error: ignoring return value of ‘asprintf’, 
declared with attribute warn_unused_result [-Werror=unused-result]
+ asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip);
+ ^
+cc1: all warnings being treated as errors
+
+this patch avoids the warning.
+---
+ src/agent-transfer/main.c | 9 +++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/agent-transfer/main.c b/src/agent-transfer/main.c
+index 406aaa3..3038f5c 100644
+--- a/src/agent-transfer/main.c
 b/src/agent-transfer/main.c
+@@ -672,8 +672,13 @@ int main (int argc, const char* argv[]) {
+ return 1;
+   }
+ 
+-  if (!args.comment)
+-asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip);
++  if (!args.comment) {
++err = asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip);
++if (err < 0) {
++  fprintf (stderr, "failed to generate key comment\n");
++  return 1;
++}
++  }
+   
+   err = send_to_ssh_agent (&e, ssh_sock_fd, args.seconds, args.confirm,
+args.comment ? args.comment : alt_comment);
+-- 
+2.7.3
+

diff --git 
a/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch 
b/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch
new file mode 100644
index 000..4d98c0a
--- /dev/null
+++ 
b/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch
@@ -0,0 +1,98 @@
+From c75c7553a88e387013e2b4310f4c4956adfd8a98 Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor 
+Date: Mon, 8 Aug 2016 20:45:07 -0400
+Subject: [PATCH 1/2] avoid treating src/share/common as an executable
+
+having src/share/common treated as an executable (commit
+ed10318d3760b56e57d5e1bef04ab57761ab8bd1) was actually a terrible
+idea.
+
+In addition to causing "monkeysphere version" to print the version
+number twice, it meant that any invocation of a monkeysphere command
+that sourced src/share/common and had a first argument that happened
+to be a function name would accidentally invoke that function.
+
+This commit reverts that 

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

commit: 38e38ad1bfd0616980b0f9b3431753fb8f2e0e8b
Author: Kristian Fiskerstrand  gentoo  org>
AuthorDate: Mon Sep 21 19:47:19 2015 +
Commit: Kristian Fiskerstrand  gentoo  org>
CommitDate: Mon Sep 21 19:47:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e38ad1

app-crypt/monkeysphere-0.37: Stable for amd64

Package-Manager: portage-2.2.20.1

 app-crypt/monkeysphere/monkeysphere-0.37.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/monkeysphere/monkeysphere-0.37.ebuild 
b/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
index a06860b..376b862 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~x86"
 
 DOCS=( README Changelog )