From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- net-misc/keychain/Manifest | 3 ++ .../files/keychain-2.7.1-openssh-6.8.patch | 47 ++++++++++++++++++++++ .../keychain/files/keychain-2.8.0-posix-sh.patch | 35 ++++++++++++++++ net-misc/keychain/keychain-2.7.1-r1.ebuild | 26 ++++++++++++ net-misc/keychain/keychain-2.7.1-r2.ebuild | 32 +++++++++++++++ net-misc/keychain/keychain-2.8.0.ebuild | 29 +++++++++++++ net-misc/keychain/keychain-2.8.1.ebuild | 23 +++++++++++ net-misc/keychain/metadata.xml | 14 +++++++ 8 files changed, 209 insertions(+) create mode 100644 net-misc/keychain/Manifest create mode 100644 net-misc/keychain/files/keychain-2.7.1-openssh-6.8.patch create mode 100644 net-misc/keychain/files/keychain-2.8.0-posix-sh.patch create mode 100644 net-misc/keychain/keychain-2.7.1-r1.ebuild create mode 100644 net-misc/keychain/keychain-2.7.1-r2.ebuild create mode 100644 net-misc/keychain/keychain-2.8.0.ebuild create mode 100644 net-misc/keychain/keychain-2.8.1.ebuild create mode 100644 net-misc/keychain/metadata.xml (limited to 'net-misc/keychain') diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest new file mode 100644 index 000000000000..f70bb94cdf4c --- /dev/null +++ b/net-misc/keychain/Manifest @@ -0,0 +1,3 @@ +DIST keychain-2.7.1.tar.bz2 51379 SHA256 1107fe3f78f6429d4861d64c5666f068f159326d22ab80a8ed0948cb25375191 SHA512 03cbf86d39964266c0ad53cec6ac48ecb478b49b3b9a1de7c29ec13179af8dc0f4679a5ed6e52ed1fbe087d4d3a5d31174f7f793aa23c3c04fce8a3f51d13168 WHIRLPOOL 3b2051f695e888419596b352e8bad6e986d2088d651f260d63abf3ff7da2e116aee6fb8c1d6036780e6dca9be951b2c4ac122f715ed4c1b1f93547971cdece2f +DIST keychain-2.8.0.tar.gz 43855 SHA256 f6cc957b7a2942fb3975383f4bb97311956db586502fe4deb39b0a8cf0652ced SHA512 229c8fd417ba7d41f8c0310ab6a60e11978852046c36431bbd9a6587d50f1daec9550a02e6bcd82ddfde6bfeb929d10985f5041e30ec2e18b6f0138d526c24c9 WHIRLPOOL 699457c878eaf197e43f979c17ebcb415618fdf207a40fd3152156261ddbc881c3c340d8e8ff233540aea72c436e156ced4bef9c7fe47af3ad7018f20fd43919 +DIST keychain-2.8.1.tar.gz 43866 SHA256 2ef5a85479783b80a52308dcd25c8f9c365e67699828ead95d4418bed399be95 SHA512 d04868f66e3dd3f75a550a261b3ee0dcc1e2f1dfa058f673305bc60c20eda867099d6ae53f4e92be521a66c630ca3e585bc1a19f58eaadad1441ad5ebe27f926 WHIRLPOOL 64d39f06eb9fd5ca36b4e2981c462509537c5561d4c0de88e0c6d8192703def2c73765fe7f102439265656bb6e586bd3ecfe59b8f1f4225f09f3d4ebe3cce91a diff --git a/net-misc/keychain/files/keychain-2.7.1-openssh-6.8.patch b/net-misc/keychain/files/keychain-2.7.1-openssh-6.8.patch new file mode 100644 index 000000000000..6b652a02927e --- /dev/null +++ b/net-misc/keychain/files/keychain-2.7.1-openssh-6.8.patch @@ -0,0 +1,47 @@ +Backported from d76c2e9aa1c05ceac1c2d06a29783ee95e876a37 upstream commit + +OpenSSH 6.8, which was just released, includes the following change: + +http://www.openssh.com/txt/release-6.8 + +Fingerprints now have the hash algorithm prepended. An example of +the new format: SHA256:mVPwvezndPv/ARoIadVY98vAC0g+P/5633yTC4d/wXE +Please note that visual host keys will also be different. + +(Previous versions always dumped in MD5 with no prefix.) + +The pattern match that keychain uses doesn't work with the new +fingerprint format. The patch below takes care of it. + +I used shopt extglob so I could use @( ) for the alternative. I'm not +a bash pattern whiz; there may be a better way to do that. + +Upstream commit by Daniel Robbins +Link: https://github.com/funtoo/keychain/commit/d76c2e9aa1c05ceac1c2d06a29783ee95e876a37 +Signed-off-by: Markos Chandras + +Index: keychain-2.7.1/keychain +=================================================================== +--- keychain-2.7.1.orig/keychain ++++ keychain-2.7.1/keychain +@@ -50,6 +50,8 @@ confirmopt=false + unset ssh_confirm + unset GREP_OPTIONS + ++shopt -s extglob ++ + BLUE="" + CYAN="" + CYANN="" +@@ -671,6 +673,11 @@ extract_fingerprints() { + # 1024 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 /home/barney/.ssh/id_dsa (DSA) + echo "$ef_line" | cut -f2 -d' ' + ;; ++ *\ @(SHA256|MD5):[0-9a-zA-Z\+\/=]*) ++ # The new OpenSSH 6.8+ format, ++ # 1024 SHA256:mVPwvezndPv/ARoIadVY98vAC0g+P/5633yTC4d/wXE /home/barney/.ssh/id_dsa (DSA) ++ echo "$ef_line" | cut -f2 -d' ' ++ ;; + *) + # Fall back to filename. Note that commercial ssh is handled + # explicitly in ssh_l and ssh_f, so hopefully this rule will diff --git a/net-misc/keychain/files/keychain-2.8.0-posix-sh.patch b/net-misc/keychain/files/keychain-2.8.0-posix-sh.patch new file mode 100644 index 000000000000..70b093b923cc --- /dev/null +++ b/net-misc/keychain/files/keychain-2.8.0-posix-sh.patch @@ -0,0 +1,35 @@ +From 6052ce29af20d237f6fe6f044e9f4110e053c763 Mon Sep 17 00:00:00 2001 +From: vaeth +Date: Sat, 21 Mar 2015 20:14:13 +0100 +Subject: [PATCH] Re-introduce POSIX compatibility + +By making the openssh 6.8 format match slightly more verbose, one can make it POSIX compatible again and remove the bashism "shopt". This way, the script works (again) if /bin/sh is a symlink to dash. +--- + keychain.sh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/keychain.sh b/keychain.sh +index 6dae912..1ab79ba 100755 +--- a/keychain.sh ++++ b/keychain.sh +@@ -56,8 +56,6 @@ unset ssh_confirm + unset GREP_OPTIONS + realpath_bin="`command -v realpath`" + +-shopt -s extglob +- + BLUE="" + CYAN="" + CYANN="" +@@ -683,7 +681,7 @@ extract_fingerprints() { + # 1024 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 /home/barney/.ssh/id_dsa (DSA) + echo "$ef_line" | cut -f2 -d' ' + ;; +- *\ @(SHA256|MD5):[0-9a-zA-Z\+\/=]*) ++ *\ SHA256:[0-9a-zA-Z\+\/=]*|*\ MD5:[0-9a-zA-Z\+\/=]*) + # The new OpenSSH 6.8+ format, + # 1024 SHA256:mVPwvezndPv/ARoIadVY98vAC0g+P/5633yTC4d/wXE /home/barney/.ssh/id_dsa (DSA) + echo "$ef_line" | cut -f2 -d' ' +-- +2.3.5 + diff --git a/net-misc/keychain/keychain-2.7.1-r1.ebuild b/net-misc/keychain/keychain-2.7.1-r1.ebuild new file mode 100644 index 000000000000..9a381e47ece9 --- /dev/null +++ b/net-misc/keychain/keychain-2.7.1-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 + +DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner. Frontend for ssh-agent/ssh-add" +HOMEPAGE="http://www.funtoo.org/wiki/Keychain" +SRC_URI="http://www.funtoo.org/archive/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND="" +RDEPEND="app-shells/bash + virtual/ssh" + +src_compile() { :; } + +src_install() { + dobin ${PN} + doman ${PN}.1 + dodoc ChangeLog README.rst +} diff --git a/net-misc/keychain/keychain-2.7.1-r2.ebuild b/net-misc/keychain/keychain-2.7.1-r2.ebuild new file mode 100644 index 000000000000..cee0b6475168 --- /dev/null +++ b/net-misc/keychain/keychain-2.7.1-r2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils + +DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner. Frontend for ssh-agent/ssh-add" +HOMEPAGE="http://www.funtoo.org/wiki/Keychain" +SRC_URI="http://www.funtoo.org/archive/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND="" +RDEPEND="app-shells/bash + virtual/ssh" + +src_prepare() { + epatch "${FILESDIR}"/${P}-openssh-6.8.patch +} + +src_compile() { :; } + +src_install() { + dobin ${PN} + doman ${PN}.1 + dodoc ChangeLog README.rst +} diff --git a/net-misc/keychain/keychain-2.8.0.ebuild b/net-misc/keychain/keychain-2.8.0.ebuild new file mode 100644 index 000000000000..e7850196ee87 --- /dev/null +++ b/net-misc/keychain/keychain-2.8.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils + +DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner" +HOMEPAGE="http://www.funtoo.org/Keychain" +SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND="dev-lang/perl" +RDEPEND="" + +src_prepare() { + epatch "${FILESDIR}"/${P}-posix-sh.patch +} + +src_install() { + dobin ${PN} + doman ${PN}.1 + dodoc ChangeLog README.md +} diff --git a/net-misc/keychain/keychain-2.8.1.ebuild b/net-misc/keychain/keychain-2.8.1.ebuild new file mode 100644 index 000000000000..2349e533ecb2 --- /dev/null +++ b/net-misc/keychain/keychain-2.8.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="manage ssh and GPG keys in a convenient and secure manner" +HOMEPAGE="http://www.funtoo.org/Keychain" +SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND="dev-lang/perl" +RDEPEND="" + +src_install() { + dobin ${PN} + doman ${PN}.1 + dodoc ChangeLog README.md +} diff --git a/net-misc/keychain/metadata.xml b/net-misc/keychain/metadata.xml new file mode 100644 index 000000000000..373a5008f7c7 --- /dev/null +++ b/net-misc/keychain/metadata.xml @@ -0,0 +1,14 @@ + + + + base-system + proxy-maintainers + + drobbins@funtoo.org + Daniel Robbins + Upstream contact, please CC on bugs + + + funtoo/keychain + + -- cgit v1.2.3-65-gdbad