--- ssh-import-id-4.1.orig/debian/changelog +++ ssh-import-id-4.1/debian/changelog @@ -0,0 +1,406 @@ +ssh-import-id (4.1-0ubuntu1) vivid; urgency=medium + + * setup.py: + - clean up some whitespace and indenting issues + + -- Dustin Kirkland Mon, 28 Apr 2014 15:12:47 -0700 + +ssh-import-id (4.0-0ubuntu1) utopic; urgency=low + + [ Andrew Starr-Bochicchio ] + * Port to python3 (LP: #1252474). + + [ Dustin Kirkland ] + * setup.py: + - bump to 4.0, to note the significant change to python3 + + -- Dustin Kirkland Mon, 28 Apr 2014 15:12:44 -0700 + +ssh-import-id (3.21-0ubuntu1) trusty; urgency=low + + * bin/ssh-import-id: LP: #1285295 + - re-authorizing existing keys should exit 0 + - update logging + + -- Dustin Kirkland Thu, 27 Feb 2014 09:39:22 -0600 + +ssh-import-id (3.20-0ubuntu1) trusty; urgency=low + + * bin/ssh-import-id: LP: #1274426 + - ensure that we exit zero if any of the id's that we try to import + affect 0 keys (ie, if we fail to do something we were asked to do) + - however, we should continue to try to succeed, as much as possible, + even if one of the earlier accounts failed + + -- Dustin Kirkland Thu, 30 Jan 2014 09:22:45 +0000 + +ssh-import-id (3.19-0ubuntu1) saucy; urgency=low + + * debian/control: + - drop the breaks/replaces ssh-import; this package hasn't existed for + eons; we should never realistically encounter it any more + - add vcs-browser + + -- Dustin Kirkland Fri, 16 Aug 2013 15:33:24 -0500 + +ssh-import-id (3.18-0ubuntu1) saucy; urgency=low + + * attic/ssh-import-id, attic/ssh-import-id.py, === removed directory + attic: + - fully deprecate the old versions of these scripts; no longer necessary + * debian/control: + - bump standards + - merge some minor changes from Andrew Starr-Bochicchio + - add Andrew Starr-Bochicchio as an uploader + - adjust formatting and indentation to match Andrew's + * debian/copyright: + - update debian copyright file format + * debian/postinst: + - add inline comments for Debian + * debian/watch: + - add a debian watch file + + -- Dustin Kirkland Fri, 16 Aug 2013 15:17:16 -0500 + +ssh-import-id (3.17-0ubuntu1) saucy; urgency=low + + * Another no-change release for Ubuntu + + -- Dustin Kirkland Mon, 29 Apr 2013 09:49:51 -0500 + +ssh-import-id (3.16-0ubuntu1) saucy; urgency=low + + * Empty release for upload to Ubuntu saucy + - ssh-import-id 3.15 was released after raring closed, but before + saucy opened + + -- Dustin Kirkland Mon, 29 Apr 2013 09:40:34 -0500 + +ssh-import-id (3.15-0ubuntu1) sexy; urgency=low + + * bin/ssh-import-id: LP: #1172434 + - create the keyfile destination directory, if necessary + + -- Dustin Kirkland Wed, 24 Apr 2013 21:41:01 -0500 + +ssh-import-id (3.14-0ubuntu1) raring; urgency=low + + * bin/ssh-import-id-gh, bin/ssh-import-id-lp: LP: #1155252 + - python requests module must be >= 1.1.0, for ssl certificate + verification and proper quoting; fall back to wget if module + is available, but older + + -- Dustin Kirkland Fri, 15 Mar 2013 10:12:40 -0500 + +ssh-import-id (3.13-0ubuntu1) raring; urgency=low + + * debian/rules: + - fix FTBFS, no need to syntax check setup.py + + -- Dustin Kirkland Fri, 15 Feb 2013 16:58:04 -0600 + +ssh-import-id (3.12-0ubuntu1) raring; urgency=low + + * debian/control: + - note github.com in the package description + * bin/ssh-import-id, ssh-import-id.1: + - rename the --revoke option to --remove + - we're not really "revoking" keys, but rather just removing them + from the authorized_keys file + + -- Dustin Kirkland Fri, 15 Feb 2013 15:03:53 -0600 + +ssh-import-id (3.11-0ubuntu1) raring; urgency=low + + * bin/ssh-import-id: + - cleanup tempfiles left around in case we die() early + + -- Dustin Kirkland Fri, 08 Feb 2013 12:35:13 -0600 + +ssh-import-id (3.10-0ubuntu1) raring; urgency=low + + * bin/ssh-import-id: + - show key type in info messages + + -- Dustin Kirkland Thu, 07 Feb 2013 17:45:18 -0600 + +ssh-import-id (3.9-0ubuntu1) raring; urgency=low + + * bin/ssh-import-id-lp: + - ensure that URL is not None before using it + - fixes exception when URL is not defined in config file and not in + the environment + + -- Dustin Kirkland Thu, 07 Feb 2013 11:33:29 -0600 + +ssh-import-id (3.8-0ubuntu1) raring; urgency=low + + * No change release; our Python and Debian/Ubuntu version numbers got + out of sync due to a bug in my release script + + -- Dustin Kirkland Thu, 07 Feb 2013 11:20:40 -0600 + +ssh-import-id (3.7-0ubuntu1) raring; urgency=low + + * bin/ssh-import-id-lp: + - another fix for Mac OS X + + -- Dustin Kirkland Thu, 07 Feb 2013 10:16:59 -0600 + +ssh-import-id (3.6-0ubuntu1) raring; urgency=low + + * setup.py: + - fix pip install on Mac + + -- Dustin Kirkland Thu, 07 Feb 2013 09:52:36 -0600 + +ssh-import-id (3.5-0ubuntu1) raring; urgency=low + + * bin/ssh-import-id, ssh-import-id.1: + - support key revocation through a -r|--revoke option + - only revokes keys that we label as adding (starting with this release) + * debian/control, debian/rules, setup.py: + - fix lintian warnings + - clean up pypi pkginfo + + -- Dustin Kirkland Wed, 06 Feb 2013 16:39:54 -0600 + +ssh-import-id (3.4-0ubuntu1) raring; urgency=low + + * setup.py: + - bump version + * debian/control, debian/rules: + - run pep8 at build for python syntax checking + - still trying to fix 10.04 build + * bin/ssh-import-id-lp: + - fix pep8 warning + + -- Dustin Kirkland Tue, 05 Feb 2013 17:37:53 -0600 + +ssh-import-id (3.3-0ubuntu1) raring; urgency=low + + * debian/control, debian/rules: + - get this building on 10.04/lucid, borrowed build logic from swift + + -- Dustin Kirkland Tue, 05 Feb 2013 12:42:21 -0600 + +ssh-import-id (3.2-0ubuntu1) raring; urgency=low + + * debian/control: + - need setuptools for compilation + + -- Dustin Kirkland Tue, 05 Feb 2013 11:53:45 -0600 + +ssh-import-id (3.1-0ubuntu1) raring; urgency=low + + * debian/control: + - ensure we have python packaging build dependencies + * debian/control, debian/rules: + - clean up python build dependencies, fix problem where + dh_pysupport pulls in python-support as a dependency + + -- Dustin Kirkland Tue, 05 Feb 2013 10:05:21 -0600 + +ssh-import-id (3.0-0ubuntu1) raring; urgency=low + + [ Dustin Kirkland ] + * setup.py: + - bump major version to 3.x since this is a complete rewrite in Python + - add support for gh:username (github) as well as lp:username (launchpad) + * bin/ssh-auth-id => bin/ssh-import-id, bin/ssh-auth-id-gh => bin/ssh- + import-id-gh, bin/ssh-auth-id-lp => bin/ssh-import-id-lp, README.md, + setup.py: + - rename Casey's ssh-auth-id command to ssh-import-id with this merge + * bin/ssh-import-id, bin/ssh-import-id-gh, bin/ssh-import-id-lp, + setup.py: + - get these pep8 clean with + pep8 --verbose --repeat --ignore W191,E501 + * bin/ssh-import-id, bin/ssh-import-id-gh, bin/ssh-import-id-lp: + - drop the "starts with ssh-" check + - bad assumption, since my ecdsa key starts with "ecdsa-sha2-nistp256" + - if it's a bad key, then ssh-keygen -l -f will shake that out + - support wget as a fallback, when python requests module is not available + - loop over each id in argv + - import subprocess + * === added directory attic, debian/control, ssh-import-id => + attic/ssh-import-id, ssh-import-id.py => attic/ssh-import-id.py: + - relocate the old shell utility and the monolithic python utility to + the attic for now; these should be removed entirely from the source + tree in due time + * debian/install: + - remove binaries from the install, let setup.py handle these for us + * bin/ssh-import-id: + - support -o|--output - for stdout + - return all parts of the fingerprint on validation (size, hash, name, type) + - index into the fingerprint for the hash + - print all parts of the fingerprint in info messages + + this is essential to the security of ssh-import-id, for key fingerprint + collision avoidance + - use a helper function to print to stdout just as easily a filename + - identify keys by their tuple, [length, hash, type] + * debian/links, README.md, ssh-import-id.1: + - update documentation + * bin/ssh-import-id-lp, debian/postinst, ssh_import_id: + - support URL environment variable and system-wide URL definition in conf + file + - port conf file from shell to JSON syntax + - add a postinst script to smooth migration from ssh-import-id < 3.0 + - ignore errors in postinst script (nothing more we can do, really) + * bin/ssh-import-id-gh, bin/ssh-import-id-lp, debian/postinst, + ssh_import_id: + - use wget --no-verbose rather than --quiet, so that error messages from + wget (such as SSL cert errors) get propagated + - use json syntax for configuration file + * bin/ssh-import-id: + - stdout file descriptor cannot be opened multiple times cleanly + + [ Casey Marshall and Dustin Kirkland ] + * === added directory bin, bin/ssh-auth-id, bin/ssh-auth-id-gh, + bin/ssh-auth-id-lp, LICENSE, README.md, setup.py: + - import Casey's subcommands implementation from his ssh-auth-id fork + on github + + -- Dustin Kirkland Tue, 05 Feb 2013 01:38:31 -0600 + +ssh-import-id (2.13-0ubuntu1) raring; urgency=low + + * ssh-import-id: + - completely rewrite the validate_keys function + - fix our broken, crappy regular expressions, and instead, rely on + SSH's ssh-keygen -l to validate keys by calculating fingerprints + - display fingerprints on stderr, such that users can verify those + or discard it + * debian/control: + - depend on openssh-client, which provides the ssh-keygen command + - bump standards + + -- Dustin Kirkland Tue, 23 Oct 2012 17:31:55 -0500 + +ssh-import-id (2.12-0ubuntu1) quantal; urgency=low + + [ Jani Uusitalo ] + * ssh_import_id: LP: #997143 + - fix typo in comment + + -- Dustin Kirkland Sat, 12 May 2012 19:58:12 -0700 + +ssh-import-id (2.11-0ubuntu1) quantal; urgency=low + + [ Dražen Lučanin ] + * ssh-import-id: LP: #990501 + - ensure there are newlines at the end of keys + - add 2 blank lines between each key for readability + + -- Dustin Kirkland Sun, 06 May 2012 10:46:33 -0500 + +ssh-import-id (2.10-0ubuntu1) precise; urgency=low + + * === added directory img, img/ssh-import-id_14.png, img/ssh-import- + id_192.png, img/ssh-import-id_64.png, img/ssh-import-id.png: + - add logos to revision control + * ssh-import-id, ssh-import-id.1: LP: #944367 + - add -e parameter, which says "don't clean my environment" + - helps if someone needs to set $https_proxy + + -- Dustin Kirkland Sat, 03 Mar 2012 08:32:25 -0600 + +ssh-import-id (2.9-0ubuntu1) precise; urgency=low + + * debian/control: + - we don't technically break openssh-server; this could cause + openssh-server to be removed; that's bad + + -- Dustin Kirkland Tue, 31 Jan 2012 16:01:56 -0600 + +ssh-import-id (2.8-0ubuntu1) precise; urgency=low + + [ Soren Hansen ] + * ssh-import-id: LP: #918131 + - Sequences of a's were getting filtered from public keys + + -- Dustin Kirkland Wed, 18 Jan 2012 09:48:23 -0600 + +ssh-import-id (2.7-0ubuntu1) precise; urgency=low + + * ssh-import-id: LP: #885205, LP: #702932 + - fix bug where lines are merged if they don't include a "= " + - instead, check for lines that begin with "^ssh-" + * ssh-import-id: + - line up sed whitespace + + -- Dustin Kirkland Mon, 16 Jan 2012 17:42:51 -0600 + +ssh-import-id (2.6-0ubuntu1) precise; urgency=low + + * Revert the last commit, removing the ssh-import-lp-id link, as this + breaks tab completion. Instead, let's fix the ssh-import-lp-id + caller and SRU it; LP: #870112 + + -- Dustin Kirkland Wed, 14 Dec 2011 09:07:00 -0600 + +ssh-import-id (2.5-0ubuntu2) oneiric; urgency=low + + * provide a symlink so ssh-import-id can be invoked as + ssh-import-lp-id (LP: #870112) + + -- Scott Moser Fri, 07 Oct 2011 13:08:44 -0400 + +ssh-import-id (2.5-0ubuntu1) natty; urgency=low + + * ssh-import-id: enable users to override URL with a per-use + environment variable + + -- Dustin Kirkland Wed, 20 Apr 2011 15:38:50 -0400 + +ssh-import-id (2.4-0ubuntu1) natty; urgency=low + + [ Scott Moser ] + * ssh-import-id: + - fix import of users whose keys have blank lines and dos EOL + - do not require /etc/ssh/ssh_import_id to be present + + -- Dustin Kirkland Fri, 15 Apr 2011 09:48:30 -0500 + +ssh-import-id (2.3-0ubuntu1) natty; urgency=low + + * ssh-import-id: ensure that ~/.ssh is created, fix regression + introduced by smoser ;-) + + -- Dustin Kirkland Tue, 11 Jan 2011 11:12:40 -0600 + +ssh-import-id (2.2-0ubuntu1) natty; urgency=low + + [ Scott Moser ] + * use getopt, send 'info' to stderr, add '--output', LP: #688574 + - support '--help' + - add '--output' or '-o' option to write downloaded and + verified data to a named file (supporting '-' for stdout) rather + that writing to users .ssh/authorized_keys + - send 'info' output to standard error rather than standard out + This is required to deal with '--output -' + * remove carriage returns from key strings (LP: #651698) + + [ Dustin Kirkland ] + * ssh-import-id.1: updated to reflect smoser's changes + * debian/install, ssh_import_id, ssh-import-id: allow for URL to be + admin-configurable, to point to other SSH public key stores besides + Launchpad.net + * ssh-import-id.1: document /etc/ssh/ssh_import_id + + -- Dustin Kirkland Mon, 10 Jan 2011 12:56:32 -0600 + +ssh-import-id (2.1-0ubuntu1) natty; urgency=low + + * debian/control: change the Conflicts to a Breaks, as pointed out + by cjwatson, per Debian policy section 7.6 + + -- Dustin Kirkland Wed, 05 Jan 2011 08:59:24 -0600 + +ssh-import-id (2.0-0ubuntu1) natty; urgency=low + + * Split the ssh-import-id utility out of the openssh package; + cjwatson doesn't want to see bugs about the tool, nor be bothered + with the maintenance thereof, hence a new package + * Relicensing the code and documentation from BSD -> GPLv3 + + -- Dustin Kirkland Tue, 04 Jan 2011 16:16:30 -0600 --- ssh-import-id-4.1.orig/debian/compat +++ ssh-import-id-4.1/debian/compat @@ -0,0 +1 @@ +7 --- ssh-import-id-4.1.orig/debian/control +++ ssh-import-id-4.1/debian/control @@ -0,0 +1,29 @@ +Source: ssh-import-id +Section: misc +Priority: extra +Maintainer: Dustin Kirkland +Uploaders: Andrew Starr-Bochicchio +Build-Depends: debhelper (>= 8), + python3-pep8, + python3-all, + python3-setuptools +Standards-Version: 3.9.5 +X-Python3-Version: >= 3.2 +Homepage: http://launchpad.net/ssh-import-id +Vcs-Browser: http://bazaar.launchpad.net/~ssh-import-id/ssh-import-id/trunk/files +Vcs-Bzr: https://code.launchpad.net/~ssh-import-id/ssh-import-id/trunk + +Package: ssh-import-id +Architecture: all +Depends: ca-certificates, + openssh-client, + python3-requests (>= 1.1.0), + wget, + ${misc:Depends}, + ${python3:Depends} +Recommends: openssh-server +Description: securely retrieve an SSH public key and install it locally + This utility will securely contact a public keyserver (Launchpad.net by + default, but Github.com is also supported), retrieve one or more user's + public keys, and append these to the current user's ~/.ssh/authorized_keys + file. --- ssh-import-id-4.1.orig/debian/copyright +++ ssh-import-id-4.1/debian/copyright @@ -0,0 +1,24 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ssh-import-id +Source: http://launchpad.net/ssh-import-id +Upstream-Contact: Dustin Kirkland + +Files: * +Copyright: 2010, Canonical Ltd. + 2013, Casey Marshall + 2013, Dustin Kirkland +License: GPL-3 + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation version 3 of the License. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General Public + License, version 3, can be found in /usr/share/common-licenses/GPL-3. --- ssh-import-id-4.1.orig/debian/install +++ ssh-import-id-4.1/debian/install @@ -0,0 +1 @@ +ssh_import_id etc/ssh --- ssh-import-id-4.1.orig/debian/links +++ ssh-import-id-4.1/debian/links @@ -0,0 +1,2 @@ +usr/share/man/man1/ssh-import-id.1 usr/share/man/man1/ssh-import-id-lp.1 +usr/share/man/man1/ssh-import-id.1 usr/share/man/man1/ssh-import-id-gh.1 --- ssh-import-id-4.1.orig/debian/manpages +++ ssh-import-id-4.1/debian/manpages @@ -0,0 +1 @@ +ssh-import-id.1 --- ssh-import-id-4.1.orig/debian/postinst +++ ssh-import-id-4.1/debian/postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +# Migrate from shell syntax configuration file to JSON to +# smooth migration from ssh-import-id < 3.0. Though this was +# never in Debian, let's still provide this incase some had +# installed the package from Ubuntu. +sed -i -e "/^#/d" -e "s/^URL=\"\(.*\)\"/{\"URL\": \"\1\"}/" /etc/ssh/ssh_import_id || true + +#DEBHELPER# --- ssh-import-id-4.1.orig/debian/rules +++ ssh-import-id-4.1/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +override_dh_auto_build: + # Check syntax + python3 /usr/lib/python3/dist-packages/pep8.py \ + --verbose --repeat --ignore W191,E501,E121 bin/* + dh_auto_build + +%: + dh $@ --with python3 --buildsystem=pybuild --- ssh-import-id-4.1.orig/debian/watch +++ ssh-import-id-4.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://launchpad.net/ssh-import-id/+download https://launchpad.net/ssh-import-id/.*/ssh-import-id_(.*)\.orig\.tar\.gz