diff -u ssh-import-id-5.5/debian/changelog ssh-import-id-5.5/debian/changelog --- ssh-import-id-5.5/debian/changelog +++ ssh-import-id-5.5/debian/changelog @@ -1,3 +1,15 @@ +ssh-import-id (5.5-0ubuntu2) yakkety; urgency=medium + + * debian/control debian/patches/fix-1565275.patch: + - add support multiple keys (LP: #1565275) + - add quilt package to Build-Depends + * debian/control: + - bumped Standards-Version to 3.9.8 + * ssh_import_id.egg-info/ + - removed no upstreamed files + + -- Mitsuya Shibata Thu, 15 Sep 2016 21:10:02 +0900 + ssh-import-id (5.5-0ubuntu1) xenial; urgency=medium * debian/control, debian/rules, setup.py, ssh_import_id/__init__.py: diff -u ssh-import-id-5.5/debian/control ssh-import-id-5.5/debian/control --- ssh-import-id-5.5/debian/control +++ ssh-import-id-5.5/debian/control @@ -8,8 +8,9 @@ python3-all, python3-pep8, python3-requests (>= 1.1.0), - python3-setuptools -Standards-Version: 3.9.6 + python3-setuptools, + quilt +Standards-Version: 3.9.8 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 reverted: --- ssh-import-id-5.5/ssh_import_id.egg-info/PKG-INFO +++ ssh-import-id-5.5.orig/ssh_import_id.egg-info/PKG-INFO @@ -1,81 +0,0 @@ -Metadata-Version: 1.0 -Name: ssh-import-id -Version: 5.5 -Summary: Authorize SSH public keys from trusted online identities -Home-page: https://launchpad.net/ssh-import-id -Author: Dustin Kirkland, Casey Marshall -Author-email: dustin.kirkland@gmail.com, casey.marshall@gmail.com -License: GPLv3 -Description: - ssh-import-id - =========== - - You're logged onto a cloud instance working on a problem with your fellow devs, and you want to invite them to log in and take a look at these crazy log messages. What do? - - Oh. You have to ask them to cat their public SSH key, paste it into IRC (wait, no, it's id\_rsa.pub, not id\_rsa silly!) then you copy it and cat it to the end of authorized\_hosts. - - That's where ssh-import-id comes in. With ssh-import-id, you can add the public SSH keys from a known, trusted online identity to grant SSH access. - - Currently supported identities include Github and Launchpad. - - Usage - ----- - - ssh-import-id uses short prefix to indicate the location of the online identity. For now, these are: - - 'gh:' for Github - 'lp:' for Launchpad - - Command line help: - - usage: ssh-import-id [-h] [-o FILE] USERID [USERID ...] - - Authorize SSH public keys from trusted online identities. - - positional arguments: - USERID User IDs to import - - optional arguments: - -h, --help show this help message and exit - -o FILE, --output FILE - Write output to file (default ~/.ssh/authorized_keys) - - Example - ------- - - If you wanted me to be able to ssh into your server, as the desired user on that machine you would use: - - $ ssh-import-id gh:cmars - - You can also import multiple users on the same line, even from different key services, like so: - - $ ssh-import-id gh:cmars lp:kirkland - - Used with care, it's a great collaboration tool! - - Installing - ---------- - - ssh-import-id can be installed on Python >= 2.6 with a recent version of pip: - - $ pip install ssh-import-id - - ssh-import-id requires a recent version of Requests (>=1.1.0) for verified SSL/TLS connections. - - Extending - --------- - - You can add support for your own SSH public key providers by creating a script named ssh-import-id-*prefix*. Make the script executable and place it in the same bin directory as ssh-import-id. - - The script should accept the identity username for the service it connects to, and output lines in the same format as an ~/.ssh/authorized\_keys file. - - If you do develop such a handler, I recommend that you connect to the service with SSL/TLS, and require a valid certificate and matching hostname. Use Requests.get(url, verify=True), for example. - - Credits - ------- - - This project is authored and maintained by Dustin Kirkland, Scott Moser, and Casey Marshall. - - -Keywords: ssh public key -Platform: any reverted: --- ssh-import-id-5.5/ssh_import_id.egg-info/SOURCES.txt +++ ssh-import-id-5.5.orig/ssh_import_id.egg-info/SOURCES.txt @@ -1,11 +0,0 @@ -README -setup.py -ssh_import_id/__init__.py -ssh_import_id.egg-info/PKG-INFO -ssh_import_id.egg-info/SOURCES.txt -ssh_import_id.egg-info/dependency_links.txt -ssh_import_id.egg-info/requires.txt -ssh_import_id.egg-info/top_level.txt -usr/bin/ssh-import-id -usr/bin/ssh-import-id-gh -usr/bin/ssh-import-id-lp \ No newline at end of file reverted: --- ssh-import-id-5.5/ssh_import_id.egg-info/dependency_links.txt +++ ssh-import-id-5.5.orig/ssh_import_id.egg-info/dependency_links.txt @@ -1 +0,0 @@ - reverted: --- ssh-import-id-5.5/ssh_import_id.egg-info/requires.txt +++ ssh-import-id-5.5.orig/ssh_import_id.egg-info/requires.txt @@ -1 +0,0 @@ -Requests>=1.1.0 reverted: --- ssh-import-id-5.5/ssh_import_id.egg-info/top_level.txt +++ ssh-import-id-5.5.orig/ssh_import_id.egg-info/top_level.txt @@ -1 +0,0 @@ -ssh_import_id only in patch2: unchanged: --- ssh-import-id-5.5.orig/debian/patches/fix-1565275.patch +++ ssh-import-id-5.5/debian/patches/fix-1565275.patch @@ -0,0 +1,25 @@ +Description: add support multiple keys +Bug-Ubuntu: #1565275 +Forwarded: yes +Author: Mitsuya Shibata +Index: ssh-import-id-5.5/ssh_import_id/__init__.py +=================================================================== +--- ssh-import-id-5.5.orig/ssh_import_id/__init__.py ++++ ssh-import-id-5.5/ssh_import_id/__init__.py +@@ -284,6 +284,7 @@ def fetch_keys_lp(lpid, useragent): + def fetch_keys_gh(ghid, useragent): + x_ratelimit_remaining = 'x-ratelimit-remaining' + help_url = 'https://developer.github.com/v3/#rate-limiting' ++ keys = "" + try: + url = "https://api.github.com/users/%s/keys" % (quote_plus(ghid)) + headers = {'User-Agent': user_agent()} +@@ -297,7 +298,7 @@ def fetch_keys_gh(ghid, useragent): + print('GitHub REST API rate-limited this IP address. See %s' % help_url) + os._exit(1) + for keyobj in data: +- keys = "%s %s@github/%s\n" % (keyobj['key'], ghid, keyobj['id']) ++ keys += "%s %s@github/%s\n" % (keyobj['key'], ghid, keyobj['id']) + except (Exception,): + e = sys.exc_info()[1] + sys.stderr.write("ERROR: %s\n" % (str(e))) only in patch2: unchanged: --- ssh-import-id-5.5.orig/debian/patches/series +++ ssh-import-id-5.5/debian/patches/series @@ -0,0 +1 @@ +fix-1565275.patch