diffstat for ubuntu-keyring-2012.05.19 ubuntu-keyring-2011.11.21 debian/changelog | 27 ------------ debian/compat | 1 debian/control | 20 ++++++--- debian/copyright | 58 ++++++++++---------------- debian/docs | 1 debian/install | 1 debian/postinst | 22 +++++++-- debian/postrm | 27 ------------ debian/rules | 80 +++++++++++++++++++++++++++++++++--- debian/source/format | 1 debian/ubuntu-keyring-udeb.postinst | 6 ++ keyrings/ubuntu-archive-keyring.gpg |binary md5sums.txt | 23 ++-------- 13 files changed, 140 insertions(+), 127 deletions(-) diff -Nru ubuntu-keyring-2012.05.19/debian/changelog ubuntu-keyring-2011.11.21/debian/changelog --- ubuntu-keyring-2012.05.19/debian/changelog 2013-12-23 03:47:58.000000000 +0000 +++ ubuntu-keyring-2011.11.21/debian/changelog 2011-11-21 12:26:38.000000000 +0000 @@ -1,30 +1,3 @@ -ubuntu-keyring (2012.05.19-1) unstable; urgency=medium - - * Imported to Debian (Closes: #457899) - - not make udeb package, remove ubuntu-keyring-udeb.postinst and more. - - set binary package name as ubuntu-archive-keyring - - rewrite debian/rules to modern dh style - + add debian/compat and debian/source/format - - debian/postinst - + fix lintian warning: hardcoded path - + don't touch /etc/apt/trusted.gpg permission - + add debhelper token - + set -e - - add debian/postrm - - debian/copyright - + format it as Machine-readable debian/copyright file 1.0 - - -- Hideki Yamane Mon, 23 Dec 2013 11:54:55 +0900 - -ubuntu-keyring (2012.05.19) quantal; urgency=low - - * Add 4096R/C0B21F32 Ubuntu Archive Automatic Signing Key (2012) - to ubuntu-archive-keyring. - * Add 4096R/EFE21092 Ubuntu CD Image Automatic Signing Key (2012) - to ubuntu-archive-keyring. - - -- Colin Watson Sat, 19 May 2012 02:31:51 +0100 - ubuntu-keyring (2011.11.21) precise; urgency=low * Mark ubuntu-keyring Multi-Arch: foreign. diff -Nru ubuntu-keyring-2012.05.19/debian/compat ubuntu-keyring-2011.11.21/debian/compat --- ubuntu-keyring-2012.05.19/debian/compat 2013-12-23 03:04:35.000000000 +0000 +++ ubuntu-keyring-2011.11.21/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru ubuntu-keyring-2012.05.19/debian/control ubuntu-keyring-2011.11.21/debian/control --- ubuntu-keyring-2012.05.19/debian/control 2013-12-23 03:14:54.000000000 +0000 +++ ubuntu-keyring-2011.11.21/debian/control 2011-11-21 12:26:03.000000000 +0000 @@ -1,16 +1,24 @@ Source: ubuntu-keyring Section: misc Priority: optional -Maintainer: Hideki Yamane -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.5 -Homepage: https://launchpad.net/ubuntu/+source/ubuntu-keyring +Maintainer: Michael Vogt +Standards-Version: 3.8.3 -Package: ubuntu-archive-keyring +Package: ubuntu-keyring +Priority: important Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends} Recommends: gpgv Description: GnuPG keys of the Ubuntu archive The Ubuntu project digitally signs its Release files. This package contains the archive keys used for that. + +Package: ubuntu-keyring-udeb +Priority: optional +Architecture: all +Section: debian-installer +Recommends: gpgv-udeb +Description: GnuPG keys of the Ubuntu archive + The Ubuntu project digitally signs its Release files. This package + contains the archive keys used for that, in a minimal form for use + in the installer. diff -Nru ubuntu-keyring-2012.05.19/debian/copyright ubuntu-keyring-2011.11.21/debian/copyright --- ubuntu-keyring-2012.05.19/debian/copyright 2013-12-23 03:35:13.000000000 +0000 +++ ubuntu-keyring-2011.11.21/debian/copyright 2010-05-27 16:53:12.000000000 +0000 @@ -1,35 +1,25 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: ubuntu-keyring -Upstream-Contact: michael.vogt@canonical.com -Source: https://launchpad.net/ubuntu/+source/ubuntu-keyring - -Files: keyring/* -Copyright: no copyright (it's just a archive of GPG public keys) -License: public domain - The keys in the keyrings don't fall under any copyright. - -Files: * -Copyright: 1998-2004 James Troup - 2004-2012 Michael Vogt - 2013 Hideki Yamane -License: GPL-2+ - 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; either - version 2 (or later) 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 package; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA - . - On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. +This is Ubuntu GNU's GnuPG keyrings of archive keys. +This package was originally put together by Michael Vogt + + +The keys in the keyrings don't fall under any copyright. Everything +else in the package is covered by the GNU GPL. + +Ubuntu support files Copyright (C) 2004 Michael Vogt based on the debian-keyring package maintained by James Troup + +Ubuntu support files for ubuntu-keyring are free software; you can +redistribute them and/or modify them under the terms of the GNU +General Public License as published by the Free Software Foundation; +either version 2, or (at your option) any later version. + +Ubuntu support files for ubuntu-keyring are distributed in the hope +that they 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 with +your Ubuntu system, in /usr/share/common-licenses/GPL, or with the +Ubuntu GNU ubuntu-keyring source package as the file COPYING. If not, +write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth +Floor, Boston, MA 02110-1301 USA. diff -Nru ubuntu-keyring-2012.05.19/debian/docs ubuntu-keyring-2011.11.21/debian/docs --- ubuntu-keyring-2012.05.19/debian/docs 2013-12-23 03:23:09.000000000 +0000 +++ ubuntu-keyring-2011.11.21/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -md5sums.txt diff -Nru ubuntu-keyring-2012.05.19/debian/install ubuntu-keyring-2011.11.21/debian/install --- ubuntu-keyring-2012.05.19/debian/install 2013-12-23 03:17:31.000000000 +0000 +++ ubuntu-keyring-2011.11.21/debian/install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -keyrings/*.gpg usr/share/keyrings/ diff -Nru ubuntu-keyring-2012.05.19/debian/postinst ubuntu-keyring-2011.11.21/debian/postinst --- ubuntu-keyring-2012.05.19/debian/postinst 2013-12-23 03:10:55.000000000 +0000 +++ ubuntu-keyring-2011.11.21/debian/postinst 2010-09-30 13:41:21.000000000 +0000 @@ -1,7 +1,5 @@ #!/bin/sh -set -e - # the keyring in /var that gets fetched by apt-key net-update # if it does not yet exist, copy it to avoid uneeded net copy KEYRINGDIR="/var/lib/apt/keyrings" @@ -16,11 +14,23 @@ touch $KEYRING fi +# sensible default permissions if there is no keyring yet +# (gpg will use 0600 otherwise and that will break release-upgrades later) +ETC_KEYRING="/etc/apt/trusted.gpg" +if [ ! -f $ETC_KEYRING ]; then + touch $ETC_KEYRING + chmod 0644 $ETC_KEYRING +fi + +# during maverick we had keyrings created with mode 0600 +# but this will break tools like update-managers release-downloader +# because it uses the trusted.gpg keyring to verify the signature (as user) +if dpkg --compare-versions "$2" lt-nl "2010.+09.30"; then + chmod 0644 $ETC_KEYRING +fi + # make sure apt knows about the new keys if [ -x /usr/bin/apt-key ]; then - apt-key update + /usr/bin/apt-key update fi -#DEBHELPER# - -exit 0 diff -Nru ubuntu-keyring-2012.05.19/debian/postrm ubuntu-keyring-2011.11.21/debian/postrm --- ubuntu-keyring-2012.05.19/debian/postrm 2013-12-23 03:50:09.000000000 +0000 +++ ubuntu-keyring-2011.11.21/debian/postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -#!/bin/sh - -set -e - -KEYDIR="/var/lib/apt/keyrings" -KEYRING="$KEYDIR/ubuntu-archive-keyring.gpg" - -case "$1" in - purge|remove|failed-upgrade|abort-install|abort-upgrade|disappear) - if [ -f $KEYRING ]; then - rm $KEYRING - fi - - if [ -d $KEYDIR -a ! -f $KEYDIR/* ]; then - rmdir $KEYDIR - fi - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff -Nru ubuntu-keyring-2012.05.19/debian/rules ubuntu-keyring-2011.11.21/debian/rules --- ubuntu-keyring-2012.05.19/debian/rules 2013-12-23 03:23:49.000000000 +0000 +++ ubuntu-keyring-2011.11.21/debian/rules 2010-05-27 16:53:12.000000000 +0000 @@ -1,9 +1,77 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +# debian/rules file - for debian/keyring +# Based on sample debian/rules file - for GNU Hello (1.3). +# Copyright 1994,1995 by Ian Jackson. +# Copyright 1998-2003 James Troup +# I hereby give you perpetual unlimited permission to copy, +# modify and relicense this file, provided that you do not remove +# my name from the file itself. (I assert my moral right of +# paternity under the Copyright, Designs and Patents Act 1988.) +# This file may have to be extensively modified -%: - dh $@ +install_dir=install -d -m 755 +install_file=install -m 644 +install_script=install -m 755 +install_binary=install -m 755 -s -override_dh_installchangelogs: - dh_installchangelogs -Xchangelog +VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) + +build: + +clean: + $(checkdir) + -rm -f foo foo.asc *.bak *~ */*~ debian/files* debian/*substvars + -rm -rf debian/tmp debian/ubuntu-keyring-udeb + +binary-indep: checkroot + $(checkdir) + -rm -rf debian/tmp + $(install_dir) debian/tmp/DEBIAN/ + $(install_script) debian/postinst debian/tmp/DEBIAN/ + + $(install_dir) debian/tmp/usr/share/keyrings/ + $(install_file) keyrings/ubuntu-archive-keyring.gpg debian/tmp/usr/share/keyrings/ + $(install_file) keyrings/ubuntu-archive-removed-keys.gpg debian/tmp/usr/share/keyrings/ + $(install_file) keyrings/ubuntu-master-keyring.gpg debian/tmp/usr/share/keyrings/ + + $(install_dir) debian/tmp/usr/share/doc/ubuntu-keyring/ + $(install_file) README debian/tmp/usr/share/doc/ubuntu-keyring/ + $(install_file) debian/changelog debian/tmp/usr/share/doc/ubuntu-keyring/changelog + gzip -9v debian/tmp/usr/share/doc/ubuntu-keyring/* + $(install_file) debian/copyright debian/tmp/usr/share/doc/ubuntu-keyring/ + cd debian/tmp; find -type f \! -regex '.*/DEBIAN/.*' -printf '%P\0' | xargs -r0 md5sum >DEBIAN/md5sums + + dpkg-gencontrol -pubuntu-keyring -isp + chown -R root.root debian/tmp + chmod -R go=rX debian/tmp + dpkg --build debian/tmp .. + + -rm -rf debian/ubuntu-keyring-udeb + $(install_dir) debian/ubuntu-keyring-udeb/DEBIAN/ + + $(install_dir) debian/ubuntu-keyring-udeb/usr/share/keyrings/ + $(install_file) keyrings/ubuntu-archive-keyring.gpg debian/ubuntu-keyring-udeb/usr/share/keyrings/ + install -m 755 debian/ubuntu-keyring-udeb.postinst debian/ubuntu-keyring-udeb/DEBIAN/postinst + + # Don't let dpkg-gencontrol write incorrect guesses to debian/files. + # Instead, register the udeb manually. + dpkg-gencontrol -nubuntu-keyring-udeb_$(VERSION)_all.udeb -pubuntu-keyring-udeb -Tdebian/ubuntu-keyring-udeb.substvars -Pdebian/ubuntu-keyring-udeb -isp + chown -R root.root debian/ubuntu-keyring-udeb + chmod -R go=rX debian/ubuntu-keyring-udeb + dpkg --build debian/ubuntu-keyring-udeb ../ubuntu-keyring-udeb_$(VERSION)_all.udeb + +binary-arch: + +define checkdir + test -f keyrings/ubuntu-archive-keyring.gpg +endef + +# Below here is fairly generic really + +binary: binary-indep binary-arch + +checkroot: + $(checkdir) + test root = "`whoami`" + +.PHONY: binary binary-arch binary-indep clean checkroot build diff -Nru ubuntu-keyring-2012.05.19/debian/source/format ubuntu-keyring-2011.11.21/debian/source/format --- ubuntu-keyring-2012.05.19/debian/source/format 2013-12-23 03:05:05.000000000 +0000 +++ ubuntu-keyring-2011.11.21/debian/source/format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3.0 (quilt) diff -Nru ubuntu-keyring-2012.05.19/debian/ubuntu-keyring-udeb.postinst ubuntu-keyring-2011.11.21/debian/ubuntu-keyring-udeb.postinst --- ubuntu-keyring-2012.05.19/debian/ubuntu-keyring-udeb.postinst 1970-01-01 00:00:00.000000000 +0000 +++ ubuntu-keyring-2011.11.21/debian/ubuntu-keyring-udeb.postinst 2010-05-27 16:53:12.000000000 +0000 @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +DIR=/usr/share/keyrings +if [ ! -e $DIR/archive.gpg ]; then + ln -s ubuntu-archive-keyring.gpg $DIR/archive.gpg +fi Binary files /tmp/derivs-cmp-srcpkg-Ubuntu-g2hmgr_3/QCYaaRwQV5/ubuntu-keyring-2012.05.19/keyrings/ubuntu-archive-keyring.gpg and /tmp/derivs-cmp-srcpkg-Ubuntu-g2hmgr_3/XGM2iiC6Gu/ubuntu-keyring-2011.11.21/keyrings/ubuntu-archive-keyring.gpg differ diff -Nru ubuntu-keyring-2012.05.19/md5sums.txt ubuntu-keyring-2011.11.21/md5sums.txt --- ubuntu-keyring-2012.05.19/md5sums.txt 2012-05-19 01:30:17.000000000 +0000 +++ ubuntu-keyring-2011.11.21/md5sums.txt 2010-05-27 16:53:12.000000000 +0000 @@ -1,22 +1,11 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 -274895dfe6dd331fa1ae109c14745907 keyrings/ubuntu-archive-keyring.gpg +26d5b86887c146abaa99e9691691373d keyrings/ubuntu-archive-keyring.gpg -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) -Comment: Colin Watson -- Debian developer +Version: GnuPG v1.2.5 (GNU/Linux) -iQIVAwUBT7b3pTk1h9l9hlALAQggjg/9GXnlz3nz0t1ndnYXWSKdR++mVaelRHBo -3oUbeo88TV1k/jkEFYNxmmoXOIvwKTXF6gmj5Am9R5qZ1QhrpJVci8KOx68EQ9LI -plOMZ+l3zCF1v/eENOiyCziNjHn1oMPlEdEu/b00YSWlSjafKRoTzRIv2bj4xJBj -s1tr8C7IquYFjnlmwyBBno2V+hELiA+1iocltoevuG7wgNAEYWviZ800p65oWrju -6BCIfmJVX0UgTEFEF23UbRzRFbIyJEmd2l6ML6lL8ipSZTkTWBAFpE4bXLBqI+pW -TVt1B9Y3zFkN7AM/b+mXv4WYSf7og/D+XPCAvLYH//3fbcMl2o0PMQctj7zNWG33 -qiLpb52qsNVJNnOuUmgs+HthMWqSa9EGwN+C4mnhA2LqUkNchZhV+0QrEOD/YdPn -t0XrsIXQlNg1abYTqw0OWDmpFWHlWJBQnv2f8M3NHkSnetrfvK67CvQ6DuScDKr5 -15Hi+1LkeX0PK3LOQt66l3EYmjGJ+Ua0emv52c3EjzEDdR6lQM6DuSu9ftGsmeRH -QvQm7J/koUJIXJG8X9nEoHVYF6MwwMulLpCkIGhd9WHOXIoRYz85dSpc+yWl9Bqe -sJcjuETNOAXDqKnyto6RK67Ch4QGH2DRIDG8KOVYVyUDIeNpn4udxjJCglGmpovw -eyR/+tFl6ZI= -=ZdJk +iD8DBQFB2y7n9t0zAhD6TNERAuOlAJ9cPimHztfAA/4UzpVv4i+NlVGNlQCggjxr +GOXMIeEh1NRnFVjFPkykm7o= +=FCV9 -----END PGP SIGNATURE-----