diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-crypt/monkeysphere | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-crypt/monkeysphere')
13 files changed, 356 insertions, 0 deletions
diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest new file mode 100644 index 000000000000..e905342e9707 --- /dev/null +++ b/app-crypt/monkeysphere/Manifest @@ -0,0 +1,2 @@ +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 diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch new file mode 100644 index 000000000000..f979114181d1 --- /dev/null +++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000000..7cdaa74b5735 --- /dev/null +++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch @@ -0,0 +1,14 @@ +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 new file mode 100644 index 000000000000..f14550280fcf --- /dev/null +++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch @@ -0,0 +1,14 @@ +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 new file mode 100644 index 000000000000..aec90eb07661 --- /dev/null +++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch @@ -0,0 +1,34 @@ +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" + ;; diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch new file mode 100644 index 000000000000..712734459054 --- /dev/null +++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch @@ -0,0 +1,50 @@ +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" diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch new file mode 100644 index 000000000000..70c7cffe7dc4 --- /dev/null +++ b/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch @@ -0,0 +1,12 @@ +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'*) diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch b/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch new file mode 100644 index 000000000000..f979114181d1 --- /dev/null +++ b/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000000..7cdaa74b5735 --- /dev/null +++ b/app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch @@ -0,0 +1,14 @@ +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/metadata.xml b/app-crypt/monkeysphere/metadata.xml new file mode 100644 index 000000000000..fc6ccc280409 --- /dev/null +++ b/app-crypt/monkeysphere/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>k_f@gentoo.org</email> + <name>Kristian Fiskerstrand</name> + </maintainer> +</pkgmetadata> diff --git a/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild b/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild new file mode 100644 index 000000000000..962b46e6c56e --- /dev/null +++ b/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2014 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/" +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.36-r2.ebuild b/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild new file mode 100644 index 000000000000..fc78d127ba42 --- /dev/null +++ b/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2014 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" +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 +} diff --git a/app-crypt/monkeysphere/monkeysphere-0.37.ebuild b/app-crypt/monkeysphere/monkeysphere-0.37.ebuild new file mode 100644 index 000000000000..a06860bbd94b --- /dev/null +++ b/app-crypt/monkeysphere/monkeysphere-0.37.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2014 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() +{ + epatch "${FILESDIR}/${P}_default_shell.patch"\ + "${FILESDIR}/${P}_hd_od.patch" + + sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die +} + +src_install() +{ + default + dodir /var/lib/monkeysphere +} + +pkg_postinst() +{ + monkeysphere-authentication setup || die +} |