mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-crypt/monkeysphere: drop 0.41
Bug: https://bugs.gentoo.org/776739 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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)
|
||||
@@ -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
|
||||
@@ -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 "$@"
|
||||
}
|
||||
|
||||
+check_openpgp2ssh_sanity() {
|
||||
+ if [[ `su_monkeysphere_user openpgp2ssh ABC &>/dev/null || echo $?` != "255" ]]; then
|
||||
+ echo "openpgp2ssh command gives unexpected return code. This can lead to a scenario where no authorized keys are populated, even though they are otherwise valid. Aborting!"
|
||||
+ exit 1
|
||||
+ fi;
|
||||
+}
|
||||
+
|
||||
# output to stdout the core fingerprint from the gpg core secret
|
||||
# keyring
|
||||
core_fingerprint() {
|
||||
@@ -163,6 +170,7 @@ case $COMMAND in
|
||||
'update-users'|'update-user'|'update'|'u')
|
||||
source "${MASHAREDIR}/setup"
|
||||
setup
|
||||
+ check_openpgp2ssh_sanity
|
||||
source "${MASHAREDIR}/update_users"
|
||||
OUTPUT_STDOUT= update_users "$@"
|
||||
;;
|
||||
@@ -171,6 +179,7 @@ case $COMMAND in
|
||||
(( $# > 0 )) || failure "Must specify user."
|
||||
source "${MASHAREDIR}/setup"
|
||||
setup
|
||||
+ check_openpgp2ssh_sanity
|
||||
source "${MASHAREDIR}/update_users"
|
||||
OUTPUT_STDOUT=true update_users "$1"
|
||||
;;
|
||||
@@ -1,50 +0,0 @@
|
||||
diff -r c13f4b11061e tests/keytrans
|
||||
--- a/tests/keytrans Sun Feb 16 19:24:08 2014 +0100
|
||||
+++ b/tests/keytrans Sun Feb 16 19:27:42 2014 +0100
|
||||
@@ -131,9 +131,9 @@
|
||||
cat >"$TEMPDIR"/expectedout <<EOF
|
||||
pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
|
||||
uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
|
||||
-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
|
||||
+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
|
||||
uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
|
||||
-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
|
||||
+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
|
||||
EOF
|
||||
|
||||
diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru)
|
||||
@@ -159,10 +159,10 @@
|
||||
cat >"$TEMPDIR"/expectedout <<EOF
|
||||
pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
|
||||
uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
|
||||
-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
|
||||
+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
|
||||
uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
|
||||
-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
|
||||
-rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
|
||||
+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
|
||||
+rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8:
|
||||
EOF
|
||||
|
||||
|
||||
@@ -190,15 +190,15 @@
|
||||
cat >"$TEMPDIR"/expectedout <<EOF
|
||||
pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
|
||||
uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
|
||||
-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
|
||||
+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
|
||||
uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
|
||||
-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
|
||||
-rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
|
||||
+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
|
||||
+rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8:
|
||||
uid:u::::$timestamp::EDDC32D783E7F4C7B6982D9AE5DC4A61000648BA::baz:
|
||||
-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
|
||||
+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
|
||||
pub:-:1024:1:$NEWKEYID:$(($timestamp + 1)):::-:::caCA:
|
||||
uid:-::::$(($timestamp + 1))::A0D708F51CC257DEFC01AEDE1E0A5F329DFD8F16::fubar:
|
||||
-sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:
|
||||
+sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:::::8:
|
||||
EOF
|
||||
|
||||
echo "test: diff expected gpg list output"
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -r 2315bb7781c6 src/share/common
|
||||
--- a/src/share/common Thu Oct 10 19:25:10 2013 +0200
|
||||
+++ b/src/share/common Thu Oct 10 19:25:50 2013 +0200
|
||||
@@ -917,7 +917,7 @@
|
||||
IFS=$'\n'
|
||||
while read line ; do
|
||||
case "$line" in
|
||||
- ("#"*)
|
||||
+ ("#"*|"")
|
||||
continue
|
||||
;;
|
||||
(" "*|$'\t'*)
|
||||
@@ -1,54 +0,0 @@
|
||||
# Copyright 1999-2018 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/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
|
||||
}
|
||||
Reference in New Issue
Block a user