diff -Nru python-apt-1.1.0~beta4ubuntu1/apt/auth.py python-apt-1.1.0~beta5/apt/auth.py --- python-apt-1.1.0~beta4ubuntu1/apt/auth.py 2016-07-28 11:27:39.000000000 +0000 +++ python-apt-1.1.0~beta5/apt/auth.py 2016-09-01 14:34:43.000000000 +0000 @@ -179,6 +179,7 @@ "--keyring", tmp_export_keyring, "--fingerprint", "--batch", + "--fixed-list-mode", "--with-colons", ], stdout=subprocess.PIPE, @@ -257,12 +258,16 @@ # The output of `apt-key list` is difficult to parse since the # --with-colons parameter isn't user output = _call_apt_key_script("adv", "--with-colons", "--batch", - "--list-keys") + "--fixed-list-mode", "--list-keys") res = [] for line in output.split("\n"): fields = line.split(":") if fields[0] == "pub": - key = TrustedKey(fields[9], fields[4][-8:], fields[5]) + keyid = fields[4] + if fields[0] == "uid": + uid = fields[9] + creation_date = fields[5] + key = TrustedKey(uid, keyid, creation_date) res.append(key) return res diff -Nru python-apt-1.1.0~beta4ubuntu1/data/templates/Debian.mirrors python-apt-1.1.0~beta5/data/templates/Debian.mirrors --- python-apt-1.1.0~beta4ubuntu1/data/templates/Debian.mirrors 2016-07-28 11:28:09.000000000 +0000 +++ python-apt-1.1.0~beta5/data/templates/Debian.mirrors 2016-09-01 14:34:43.000000000 +0000 @@ -216,6 +216,7 @@ http://debian.intergenia.de/debian/ http://debian.mirror.iphh.net/debian/ http://debian.mirror.lrz.de/debian/ +http://debian.mirror.net-d-sign.de/debian/ http://debian.netcologne.de/debian/ http://debian.tu-bs.de/debian/ http://debian.uni-duisburg-essen.de/debian/ @@ -240,7 +241,6 @@ http://ftp5.gwdg.de/pub/linux/debian/debian/ http://mirror.1und1.de/debian/ http://mirror.de.leaseweb.net/debian/ -http://mirror.fnkr.net/debian/ http://mirror.unitedcolo.de/debian/ http://packages.hs-regensburg.de/debian/ #LOC:DK @@ -507,11 +507,9 @@ #LOC:KR ftp://ftp.kr.debian.org/debian/ ftp://ftp.lanet.kr/debian/ -ftp://ftp.lecl.net/debian/ ftp://ftp.neowiz.com/debian/ http://ftp.kr.debian.org/debian/ http://ftp.lanet.kr/debian/ -http://ftp.lecl.net/debian/ http://ftp.neowiz.com/debian/ #LOC:KZ ftp://mirror.neolabs.kz/debian/ @@ -608,6 +606,7 @@ ftp://ftp.icm.edu.pl/pub/Linux/debian/ ftp://ftp.man.poznan.pl/pub/linux/debian/debian/ ftp://ftp.man.szczecin.pl/pub/Linux/debian/ +ftp://ftp.piotrkosoft.net/debian/ ftp://ftp.pl.debian.org/debian/ ftp://ftp.pwr.wroc.pl/debian/ ftp://ftp.task.gda.pl/debian/ @@ -616,6 +615,7 @@ http://ftp.agh.edu.pl/debian/ http://ftp.icm.edu.pl/pub/Linux/debian/ http://ftp.man.poznan.pl/pub/linux/debian/debian/ +http://ftp.piotrkosoft.net/debian/ http://ftp.pl.debian.org/debian/ http://ftp.pwr.wroc.pl/debian/ http://ftp.task.gda.pl/debian/ @@ -637,6 +637,7 @@ ftp://ftp.ro.debian.org/debian/ ftp://ftp.roedu.net/debian/ ftp://mirrors.xservers.ro/debian/ +http://debian.mirror.linux.ro/ http://ftp.lug.ro/debian/ http://ftp.ro.debian.org/debian/ http://ftp.roedu.net/debian/ @@ -679,7 +680,9 @@ http://ftp.ds.karen.hj.se/debian/ http://ftp.se.debian.org/debian/ #LOC:SG +ftp://ftp.sg.debian.org/debian/ ftp://mirror.0x.sg/debian/ +http://ftp.sg.debian.org/debian/ http://mirror.0x.sg/debian/ #LOC:SI ftp://debmirror.amis.net/debian/ @@ -847,12 +850,13 @@ http://noodle.portalus.net/debian/ http://pubmirrors.dal.corespace.com/debian/ http://reflector.westga.edu/repos/Debian/ +#LOC:UY +http://repo.cure.edu.uy/debian/ #LOC:UZ ftp://debian.stream.uz/debian/ http://debian.stream.uz/debian/ #LOC:VN http://debian.xtdv.net/debian/ -http://mirror.debian.vn/debian/ #LOC:VU ftp://debian.telsatbb.vu/debian/ http://debian.telsatbb.vu/debian/ diff -Nru python-apt-1.1.0~beta4ubuntu1/data/templates/Ubuntu.mirrors python-apt-1.1.0~beta5/data/templates/Ubuntu.mirrors --- python-apt-1.1.0~beta4ubuntu1/data/templates/Ubuntu.mirrors 2016-07-28 11:28:08.000000000 +0000 +++ python-apt-1.1.0~beta5/data/templates/Ubuntu.mirrors 2016-09-01 14:34:43.000000000 +0000 @@ -1,7 +1,8 @@ mirror://mirrors.ubuntu.com/mirrors.txt +#LOC:AM +http://mirrors.asnet.am/ubuntu/ #LOC:AR http://mirrors.coopvgg.com.ar/ubuntu/ -http://ubnt-archive.xfree.com.ar/ubuntu/ http://ubuntu.unc.edu.ar/ubuntu/ #LOC:AT http://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/ @@ -47,6 +48,7 @@ http://ubuntu-archive.locaweb.com.br/ubuntu/ http://ubuntu.c3sl.ufpr.br/ubuntu/ http://ubuntu.laps.ufpa.br/ubuntu/ +http://www.las.ic.unicamp.br/pub/ubuntu/ #LOC:BY http://ftp.byfly.by/ubuntu/ http://mirror.datacenter.by/ubuntu/ @@ -75,17 +77,14 @@ #LOC:CN http://archive.ubuntu.mirrors.opensource.ynu.edu.cn/ http://ftp.sjtu.edu.cn/ubuntu/ -http://mirror.lzu.edu.cn/ubuntu/ -http://mirror.neu.edu.cn/ubuntu/ http://mirrors.aliyun.com/ubuntu/ -http://mirrors.cqu.edu.cn/ubuntu/ http://mirrors.cug.edu.cn/ubuntu/ +http://mirrors.skyshe.cn/ubuntu/ http://mirrors.sohu.com/ubuntu/ http://mirrors.tuna.tsinghua.edu.cn/ubuntu/ http://mirrors.ustc.edu.cn/ubuntu/ http://mirrors.xjtu.edu.cn/ubuntu/ http://mirrors.yun-idc.com/ubuntu/ -http://run.hit.edu.cn/ubuntu/ http://ubuntu.cn99.com/ubuntu/ http://ubuntu.uestc.edu.cn/ubuntu/ #LOC:CO @@ -124,6 +123,7 @@ http://ftp.uni-stuttgart.de/ubuntu/ http://ftp5.gwdg.de/pub/linux/debian/ubuntu/ http://mirror.23media.de/ubuntu/ +http://mirror.daniel-jost.net/ubuntu/ http://mirror.de.leaseweb.net/ubuntu/ http://mirror.netcologne.de/ubuntu/ http://mirror.serverloft.eu/ubuntu/ubuntu/ @@ -206,9 +206,8 @@ #LOC:HU http://ftp.freepark.org/ubuntu/ http://ftp.kfki.hu/linux/ubuntu/ +http://mirror.atomki.mta.hu/ubuntu/ #LOC:ID -http://buaya.klas.or.id/ubuntu/ -http://jaran.undip.ac.id/ubuntu/ http://kambing.ui.ac.id/ubuntu/ http://kartolo.sby.datautama.net.id/ubuntu/ http://kebo.pens.ac.id/ubuntu/ @@ -229,7 +228,7 @@ #LOC:IR http://fastmirror.ir/ubuntu/ http://mirror.aminidc.com/ubuntu/ -http://mirror.armaghan.net/ubuntu/ +http://mirror.iranserver.com/ubuntu/ http://mirror.network32.net/ubuntu/ http://ubuntu-mirror.parsdev.net/ubuntu-archive/ http://ubuntu.parspack.com/ubuntu/ @@ -249,9 +248,7 @@ http://mirror.fairway.ne.jp/ubuntu/ http://ubuntu-ashisuto.ubuntulinux.jp/ubuntu/ http://ubuntutym.u-toyama.ac.jp/ubuntu/ -http://www.ftp.ne.jp/Linux/packages/ubuntu/archive/ #LOC:KE -http://ubuntu-archive.mirror.liquidtelecom.com/ubuntu/ http://ubuntu.mirror.ac.ke/ubuntu/ #LOC:KR http://ftp.neowiz.com/ubuntu/ @@ -263,7 +260,6 @@ http://mirror.neolabs.kz/ubuntu/ #LOC:LT http://ftp.litnet.lt/ubuntu/ -http://mirror.soften.ktu.lt/ubuntu/ http://ubuntu-archive.mirror.serveriai.lt/ http://ubuntu.mirror.vu.lt/ubuntu/ #LOC:LU @@ -334,17 +330,14 @@ #LOC:PT http://archive.ubuntumirror.dei.uc.pt/ubuntu/ http://mirrors.fe.up.pt/ubuntu/ -http://ubuntu.dcc.fc.up.pt/ #LOC:RO http://ftp.astral.ro/mirrors/ubuntu.com/ubuntu/ http://ftp.gts.lug.ro/ubuntu/ http://mirrors.evowise.com/ubuntu/ http://mirrors.pidginhost.com/ubuntu/ -http://mirrors.ulbsibiu.ro/ubuntu/ http://ubuntu.mirrors.linux.ro/archive/ #LOC:RU http://linux.nsu.ru/ubuntu/ -http://linux.psu.ru/ubuntu/ http://mirror.corbina.net/ubuntu/ http://mirror.logol.ru/ubuntu/ http://mirror.rol.ru/ubuntu/ @@ -352,7 +345,6 @@ http://mirror.yandex.ru/ubuntu/ #LOC:SE http://ftp.acc.umu.se/ubuntu/ -http://ftp.availo.se/ubuntu/ http://ftp.lysator.liu.se/ubuntu/ http://mirror.zetup.net/ubuntu/ http://mirrors.se.eu.kernel.org/ubuntu/ @@ -398,12 +390,12 @@ http://ubuntu.stu.edu.tw/ubuntu/ #LOC:TZ http://deb-mirror.habari.co.tz/ubuntu/ -http://mirror.aptus.co.tz/pub/ubuntuarchive/ #LOC:UA http://mirror.mirohost.net/ubuntu/ http://ubuntu-mirror.neocom.org.ua/ubuntu/ http://ubuntu-mirror.telesys.org.ua/ubuntu/ http://ubuntu.ip-connect.vn.ua/ +http://ubuntu.mirrors.omnilance.com/ubuntu/ http://ubuntu.org.ua/ubuntu/ http://ubuntu.volia.net/ubuntu-archive/ #LOC:US @@ -412,12 +404,12 @@ http://dist1.800hosting.com/ubuntu/ http://ftp.usf.edu/pub/ubuntu/ http://ftp.ussg.iu.edu/linux/ubuntu/ -http://ftp.utexas.edu/ubuntu/ http://lug.mtu.edu/ubuntu/ http://mirror.ancl.hawaii.edu/linux/ubuntu/ http://mirror.atlantic.net/ubuntu/ http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/ http://mirror.cc.vt.edu/pub2/ubuntu/ +http://mirror.clarkson.edu/ubuntu/ http://mirror.cogentco.com/pub/linux/ubuntu/ http://mirror.cs.pitt.edu/ubuntu/archive/ http://mirror.hmc.edu/ubuntu/ @@ -436,7 +428,6 @@ http://mirror.steadfast.net/ubuntu/ http://mirror.stjschools.org/public/ubuntu-archive/ http://mirror.symnds.com/ubuntu/ -http://mirror.team-cymru.org/ubuntu/ http://mirror.tocici.com/ubuntu/ http://mirror.umd.edu/ubuntu/ http://mirror.uoregon.edu/ubuntu/ @@ -455,6 +446,7 @@ http://mirrors.mit.edu/ubuntu/ http://mirrors.namecheap.com/ubuntu/ http://mirrors.ocf.berkeley.edu/ubuntu/ +http://mirrors.psychz.net/Ubuntu/ http://mirrors.rit.edu/ubuntu/ http://mirrors.sonic.net/ubuntu/ http://mirrors.syringanetworks.net/ubuntu-archive/ @@ -478,6 +470,8 @@ http://us.archive.ubuntu.com/ubuntu/ http://www.club.cc.cmu.edu/pub/ubuntu/ http://www.gtlib.gatech.edu/pub/ubuntu/ +#LOC:UY +http://repo.cure.edu.uy/ubuntu/archivos/ #LOC:UZ http://ubuntu.snet.uz/ubuntu/ #LOC:VN diff -Nru python-apt-1.1.0~beta4ubuntu1/debian/changelog python-apt-1.1.0~beta5/debian/changelog --- python-apt-1.1.0~beta4ubuntu1/debian/changelog 2016-07-28 11:27:39.000000000 +0000 +++ python-apt-1.1.0~beta5/debian/changelog 2016-09-01 14:34:43.000000000 +0000 @@ -1,8 +1,16 @@ -python-apt (1.1.0~beta4ubuntu1) yakkety; urgency=medium +python-apt (1.1.0~beta5) unstable; urgency=medium * apt.auth: Set APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE + NOTE: apt.auth is about to be deprecated, do not use it. It will + be removed in a later version. + * Fix gpg breakage (Closes: #835465) + - Use --fixed-list-mode for apt-key gpg invocations. + Thanks to Daniel Kahn Gillmor for the initial patch + - test_auth: Normalize public key blocks before comparing + - Adjust dependencies for apt.auth on gnupg and dirmngr + - Work around broken debfile multiarch test cases - -- Julian Andres Klode Thu, 28 Jul 2016 11:23:12 +0000 + -- Julian Andres Klode Thu, 01 Sep 2016 16:34:43 +0200 python-apt (1.1.0~beta4) unstable; urgency=medium diff -Nru python-apt-1.1.0~beta4ubuntu1/debian/control python-apt-1.1.0~beta5/debian/control --- python-apt-1.1.0~beta4ubuntu1/debian/control 2016-07-28 11:27:39.000000000 +0000 +++ python-apt-1.1.0~beta5/debian/control 2016-09-01 14:34:43.000000000 +0000 @@ -1,8 +1,7 @@ Source: python-apt Section: python Priority: standard -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: APT Development Team +Maintainer: APT Development Team Uploaders: Michael Vogt , Julian Andres Klode Standards-Version: 3.9.8 X-Python-Version: >= 2.7 @@ -19,6 +18,8 @@ python3-all-dbg (>= 3.3), python-distutils-extra (>= 2.0), python-sphinx (>= 0.5), + gnupg, + dirmngr | gnupg (<< 2), pep8, pyflakes Vcs-Git: https://anonscm.debian.org/git/apt/python-apt.git @@ -27,7 +28,8 @@ Package: python-apt Architecture: any Multi-Arch: allowed -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common, + gnupg, dirmngr | gnupg (<< 2), Recommends: lsb-release, iso-codes, xz-utils Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4), computer-janitor (<< 1.14.1-1+), diff -Nru python-apt-1.1.0~beta4ubuntu1/debian/tests/control python-apt-1.1.0~beta5/debian/tests/control --- python-apt-1.1.0~beta4ubuntu1/debian/tests/control 2016-07-28 11:27:39.000000000 +0000 +++ python-apt-1.1.0~beta5/debian/tests/control 2016-09-01 14:34:43.000000000 +0000 @@ -1,2 +1,2 @@ Tests: run-tests -Depends: @, apt-utils, python-debian, python-all, python3-all, fakeroot, intltool, pep8, pyflakes +Depends: @, apt-utils, python-debian, python-all, python3-all, fakeroot, intltool, pep8, pyflakes, gnupg, dirmngr | gnupg (<< 2) diff -Nru python-apt-1.1.0~beta4ubuntu1/tests/test_auth.py python-apt-1.1.0~beta5/tests/test_auth.py --- python-apt-1.1.0~beta4ubuntu1/tests/test_auth.py 2016-07-28 11:27:39.000000000 +0000 +++ python-apt-1.1.0~beta5/tests/test_auth.py 2016-09-01 14:34:43.000000000 +0000 @@ -27,6 +27,8 @@ import testcommon +WHEEZY_KEYID = "8B48AD6246925553" +WHEEZY_KEYDATE = "1335553717" WHEEZY_KEY = """-----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.12 (GNU/Linux) @@ -113,6 +115,14 @@ -----END PGP PUBLIC KEY BLOCK-----""" +def normalize_key(keystr): + """Remove the Version: header from a key block""" + lines = keystr.split("\n") + if lines[1].startswith("Version:"): + return lines[:1] + lines[2:] + return lines + + class TestAuthKeys(testcommon.TestCase): """Test handling of keys for signed repositories.""" @@ -153,8 +163,8 @@ # Strip the headers from the keys to avoid test errors because # the exported key used a differenct GnuPG version than the # original example key - self.assertEqual(apt.auth.export_key("46925553").split("\n")[2:], - WHEEZY_KEY.split("\n")[2:]) + self.assertEqual(normalize_key(apt.auth.export_key(WHEEZY_KEYID)), + normalize_key(WHEEZY_KEY)) def testAddAndListKey(self): """Add an example key and test if it is correctly returned by @@ -167,8 +177,8 @@ self.assertEqual(key.name, "Debian Archive Automatic Signing Key (7.0/wheezy) " "") - self.assertEqual(key.keyid, "46925553") - self.assertEqual(key.date, "2012-04-27") + self.assertEqual(key.keyid, WHEEZY_KEYID) + self.assertEqual(key.date, WHEEZY_KEYDATE) def testAddKeyFromFile(self): """Test adding a key from file.""" @@ -184,14 +194,14 @@ self.assertEqual(key.name, "Debian Archive Automatic Signing Key (7.0/wheezy) " "") - self.assertEqual(key.keyid, "46925553") - self.assertEqual(key.date, "2012-04-27") + self.assertEqual(key.keyid, WHEEZY_KEYID) + self.assertEqual(key.date, WHEEZY_KEYDATE) def test_add_key_from_keyserver_too_short(self): """Ensure that short keyids are not imported""" with self.assertRaises(apt.auth.AptKeyError): apt.auth.add_key_from_keyserver( - "46925553", "hkp://localhost:19191") + WHEEZY_KEYID, "hkp://localhost:19191") def test_add_key_from_server_mitm(self): """Verify that the key fingerprint is verified after download""" @@ -225,8 +235,8 @@ self.assertEqual(key.name, "Debian Archive Automatic Signing Key (7.0/wheezy) " "") - self.assertEqual(key.keyid, "46925553") - self.assertEqual(key.date, "2012-04-27") + self.assertEqual(key.keyid, WHEEZY_KEYID) + self.assertEqual(key.date, WHEEZY_KEYDATE) def _start_keyserver(self): """Start a fake keyserver on http://localhost:19191 diff -Nru python-apt-1.1.0~beta4ubuntu1/tests/test_debfile_multiarch.py python-apt-1.1.0~beta5/tests/test_debfile_multiarch.py --- python-apt-1.1.0~beta4ubuntu1/tests/test_debfile_multiarch.py 2016-07-28 11:27:39.000000000 +0000 +++ python-apt-1.1.0~beta5/tests/test_debfile_multiarch.py 2016-09-01 14:34:43.000000000 +0000 @@ -32,10 +32,12 @@ return deb = apt.debfile.DebPackage( "./data/test_debs/multiarch-test1_i386.deb") + deb.check() missing = deb.missing_deps #print missing self.assertFalse("dpkg:i386" in missing) + @unittest.skip("BROKEN, lib3ds-1-3 is m-a now") def test_multiarch_conflicts(self): cache = apt.Cache() # WARNING: this assumes that lib3ds-1-3 is a non-multiarch lib