diff -Nru python-apt-1.9.0/apt/package.py python-apt-1.9.0ubuntu1/apt/package.py --- python-apt-1.9.0/apt/package.py 2019-06-24 13:54:56.000000000 +0000 +++ python-apt-1.9.0ubuntu1/apt/package.py 2019-08-06 12:34:24.000000000 +0000 @@ -94,12 +94,12 @@ unicode = str -def _file_is_same(path, size, md5): - # type: (str, int, str) -> bool +def _file_is_same(path, size, hashes): + # type: (str, int, apt_pkg.HashStringList) -> bool """Return ``True`` if the file is the same.""" if os.path.exists(path) and os.path.getsize(path) == size: with open(path) as fobj: - return apt_pkg.md5sum(fobj) == md5 + return apt_pkg.Hashes(fobj).hashes == hashes return False @@ -909,16 +909,16 @@ if not source_lookup: raise ValueError("No source for %r" % self) files = list() - for md5, size, path, type_ in src.files: - base = os.path.basename(path) + for fil in src.files: + base = os.path.basename(fil.path) destfile = os.path.join(destdir, base) - if type_ == 'dsc': + if fil.type == 'dsc': dsc = destfile - if _file_is_same(destfile, size, md5): + if _file_is_same(destfile, fil.size, fil.hashes): logging.debug('Ignoring already existing file: %s' % destfile) continue - files.append(apt_pkg.AcquireFile(acq, src.index.archive_uri(path), - md5, size, base, destfile=destfile)) + files.append(apt_pkg.AcquireFile(acq, src.index.archive_uri(fil.path), + str(fil.hashes.find("SHA256")), fil.size, base, destfile=destfile)) acq.run() if dsc is None: diff -Nru python-apt-1.9.0/data/templates/Debian.mirrors python-apt-1.9.0ubuntu1/data/templates/Debian.mirrors --- python-apt-1.9.0/data/templates/Debian.mirrors 2019-06-24 13:54:56.000000000 +0000 +++ python-apt-1.9.0ubuntu1/data/templates/Debian.mirrors 2019-08-06 12:34:24.000000000 +0000 @@ -97,6 +97,7 @@ http://debian.mirror.iphh.net/debian/ http://debian.mirror.lrz.de/debian/ http://debian.mirror.net-d-sign.de/debian/ +http://debian.tu-bs.de/debian/ http://debian.uni-duisburg-essen.de/debian/ http://ftp-stud.hs-esslingen.de/debian/ http://ftp.de.debian.org/debian/ @@ -293,6 +294,7 @@ http://mirror.nl.leaseweb.net/debian/ http://mirror.novg.net/debian/ http://mirror.proserve.nl/debian/ +http://mirror.schoemaker.systems/debian/ http://mirror.seedvps.com/debian/ http://mirror.serverius.net/debian/ http://mirror.vpgrp.io/debian/ diff -Nru python-apt-1.9.0/data/templates/Ubuntu.mirrors python-apt-1.9.0ubuntu1/data/templates/Ubuntu.mirrors --- python-apt-1.9.0/data/templates/Ubuntu.mirrors 2019-06-24 13:54:56.000000000 +0000 +++ python-apt-1.9.0ubuntu1/data/templates/Ubuntu.mirrors 2019-08-06 12:34:24.000000000 +0000 @@ -70,7 +70,6 @@ http://mirror.it.ubc.ca/ubuntu/ http://mirror.its.dal.ca/ubuntu/ http://mirror.its.sfu.ca/mirror/ubuntu/ -http://mirrors.fastdns.ca/ubuntu/ http://mirrors.layeronline.com/ubuntu/ http://muug.ca/mirror/ubuntu/ http://ubuntu.bhs.mirrors.ovh.net/ubuntu/ @@ -88,13 +87,12 @@ http://mirror.uchile.cl/ubuntu/ http://mirrors.cloud.linets.cl/ubuntu/ #LOC:CN -ftp://mirrors.fnl.bupt.maojianwei.com/Ubuntu_apt_mirror/ http://ftp.sjtu.edu.cn/ubuntu/ http://mirror.lzu.edu.cn/ubuntu/ http://mirrors.aliyun.com/ubuntu/ http://mirrors.cn99.com/ubuntu/ http://mirrors.cqu.edu.cn/ubuntu/ -http://mirrors.huaweicloud.com/repository/ubuntu/ +http://mirrors.dgut.edu.cn/ubuntu/ http://mirrors.nju.edu.cn/ubuntu/ http://mirrors.njupt.edu.cn/ubuntu/ http://mirrors.nwafu.edu.cn/ubuntu/ @@ -141,12 +139,13 @@ http://ftp5.gwdg.de/pub/linux/debian/ubuntu/ http://mirror.23media.com/ubuntu/ http://mirror.de.leaseweb.net/ubuntu/ +http://mirror.funkfreundelandshut.de/ubuntu/ +http://mirror.ipb.de/ubuntu/ http://mirror.kamp.de/ubuntu/ http://mirror.netcologne.de/ubuntu/ http://mirror.ratiokontakt.de/mirror/ubuntu/ http://mirror.serverloft.eu/ubuntu/ubuntu/ http://mirror.stw-aachen.de/ubuntu/ -http://mirror.tuxcall.de/ubuntu-archive/ http://mirror.wtnet.de/ubuntu/ http://mirror2.tuxinator.org/ubuntu/ http://packages.oth-regensburg.de/ubuntu/ @@ -158,6 +157,7 @@ http://ubuntu.unitedcolo.de/ubuntu/ #LOC:DK http://mirror.easyspeedy.com/ubuntu/ +http://mirror.iodc.dk/ubuntu/ http://mirror.netsite.dk/ubuntu/archive/ http://mirror.one.com/ubuntu/ http://mirrors.dotsrc.org/ubuntu/ @@ -172,7 +172,6 @@ ftp://ftp.csuc.cat/ubuntu/archieve/ http://dafi.inf.um.es/ubuntu/ http://es-mirrors.evowise.com/ubuntu/ -http://ftp.caliu.cat/pub/distribucions/ubuntu/archive/ http://ftp.udc.es/ubuntu/ http://linuxmirror.es/ubuntu/ http://mirror.tedra.es/ubuntu/ @@ -185,7 +184,9 @@ #LOC:FR http://distrib-coffee.ipsl.jussieu.fr/pub/linux/ubuntu/ http://fr.archive.ubuntu.com/ubuntu/ +http://ftp.oleane.net/ubuntu/ http://ftp.rezopole.net/ubuntu/ +http://ftp.u-picardie.fr/mirror/ubuntu/ubuntu/ http://miroir.univ-lorraine.fr/ubuntu/ http://mirror.plusserver.com/ubuntu/ubuntu/ http://mirror.ubuntu.ikoula.com/ @@ -231,7 +232,6 @@ http://hr.archive.ubuntu.com/ubuntu/ #LOC:HU http://ftp.fsn.hu/ubuntu/ -http://hu.archive.ubuntu.com/ubuntu/ http://mirror.niif.hu/ubuntu/ http://mirrors.sth.sze.hu/ubuntu/ http://quantum-mirror.hu/mirrors/pub/ubuntu/ @@ -245,22 +245,22 @@ http://mirror.unej.ac.id/ubuntu/ http://repo.unpatti.ac.id/ubuntu/ http://suro.ubaya.ac.id/ubuntu/ -#LOC:IE -http://ftp.heanet.ie/pub/ubuntu/ #LOC:IL http://mirror.isoc.org.il/pub/ubuntu/ http://rep-ubuntu-il.upress.io/ubuntu/ #LOC:IN -http://ftp.iitm.ac.in/ubuntu/ http://mirror.cse.iitk.ac.in/ubuntu/ http://mirrors.piconets.webwerks.in/ubuntu-mirror/ubuntu/ http://repos.del.extreme-ix.org/ubuntu/ http://ubuntu-archive.mirrors.estointernet.in/ http://ubuntu.mirror.snu.edu.in/ubuntu/ #LOC:IR +http://archive.ubuntu.petiak.ir/ubuntu/ http://ir.ubuntu.sindad.cloud/ubuntu/ +http://mirror.0-1.cloud/ubuntu/ http://mirror.aminidc.com/ubuntu/ http://mirror.armaghan.net/ubuntu/ +http://mirror.iranserver.com/ubuntu/ http://mirror.rasanegar.com/ubuntu/archive/ http://mirror.xaas.ir/ubuntu/ http://repo.iut.ac.ir/repo/Ubuntu/ @@ -285,6 +285,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.mirror.ac.ke/ubuntu/ #LOC:KR @@ -309,6 +310,8 @@ #LOC:LV http://ubuntu-arch.linux.edu.lv/ubuntu/ http://ubuntu.koyanet.lv/ubuntu/ +#LOC:MA +http://mirror.marwan.ma/ubuntu/ #LOC:MD http://mirror.as43289.net/ubuntu/ http://mirrors.mivocloud.com/ubuntu/ @@ -335,16 +338,19 @@ http://ftp.tudelft.nl/archive.ubuntu.com/ http://mirror.1000mbps.com/ubuntu/ http://mirror.amsiohosting.net/archive.ubuntu.com/ +http://mirror.dataone.nl/ubuntu-archive/ http://mirror.hostnet.nl/ubuntu/archive/ http://mirror.i3d.net/pub/ubuntu/ http://mirror.nforce.com/pub/linux/ubuntu/ http://mirror.nl.datapacket.com/ubuntu/ http://mirror.nl.leaseweb.net/ubuntu/ http://mirror.previder.nl/ubuntu/ +http://mirror.redium.net/pub/linux/ubuntu/ http://mirror.serverion.com/ubuntu/ http://mirror.serverius.net/ubuntu/ http://mirror.transip.net/ubuntu/ubuntu/ http://mirror.vpgrp.io/ubuntu/ +http://mirrors.xtom.nl/ubuntu/ http://nl.archive.ubuntu.com/ubuntu/ http://nl3.archive.ubuntu.com/ubuntu/ http://osmirror.rug.nl/ubuntu/ @@ -392,7 +398,6 @@ http://mirrors.nav.ro/ubuntu/ http://mirrors.nxthost.com/ubuntu/ http://mirrors.pidginhost.com/ubuntu/ -http://mirrors.ulbsibiu.ro/ubuntu/ http://mirrors.xservers.ro/ubuntu/ http://ro-mirrors.evowise.com/ubuntu/ http://ubuntu.mirrors.linux.ro/archive/ @@ -419,7 +424,7 @@ http://mirror.zetup.net/ubuntu/ http://ubuntu.mirror.su.se/ubuntu/ #LOC:SG -http://download.nus.edu.sg/mirror/ubuntu/ +http://mirror.0x.sg/ubuntu/ http://mirror.aktkn.sg/ubuntu/ http://mirror.nus.edu.sg/ubuntu/ #LOC:SI @@ -432,6 +437,7 @@ http://mirror.kku.ac.th/ubuntu/ http://mirror.thaidns.co.th/ubuntu/ http://mirror1.ku.ac.th/ubuntu/ +http://mirror1.totbb.net/ubuntu/ http://mirrors.bangmod.cloud/ubuntu/ http://mirrors.psu.ac.th/ubuntu/ #LOC:TN @@ -492,7 +498,6 @@ http://mirror.mrjester.net/ubuntu/archive/ http://mirror.nodesdirect.com/ubuntu/ http://mirror.os6.org/ubuntu/ -http://mirror.picosecond.org/ubuntu/ http://mirror.pit.teraswitch.com/ubuntu/ http://mirror.pnl.gov/ubuntu/ http://mirror.siena.edu/ubuntu/ @@ -542,12 +547,11 @@ http://ubuntu.mirrors.tds.net/pub/ubuntu/ http://ubuntu.osuosl.org/ubuntu/ http://ubuntu.securedservers.com/ -http://ubuntu.whats-in.space/ubuntu/ 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/ +http://ubuntu.repo.cure.edu.uy/mirror/ #LOC:UZ http://ubuntu.snet.uz/ubuntu/ #LOC:VN diff -Nru python-apt-1.9.0/debian/changelog python-apt-1.9.0ubuntu1/debian/changelog --- python-apt-1.9.0/debian/changelog 2019-06-24 13:54:56.000000000 +0000 +++ python-apt-1.9.0ubuntu1/debian/changelog 2019-08-06 12:34:24.000000000 +0000 @@ -1,3 +1,11 @@ +python-apt (1.9.0ubuntu1) eoan; urgency=medium + + * apt/package.py: Use SHA256 instead of MD5 for fetching checks. + This should unbreak snapd, but should really be cleaned up more + and use the entire HashStringList (LP: #1837926) + + -- Julian Andres Klode Tue, 06 Aug 2019 14:34:24 +0200 + python-apt (1.9.0) experimental; urgency=medium * python/pkgsrcrecords.cc: Improve readability of ...BuildDepends @@ -23,6 +31,13 @@ -- Julian Andres Klode Mon, 24 Jun 2019 15:54:56 +0200 +python-apt (1.9.0~alpha0~ubuntu1) eoan; urgency=medium + + * data/templates/Ubuntu.info.in: Add eoan (adjective only so far) + * Automatic mirror list update + + -- Julian Andres Klode Mon, 22 Apr 2019 12:42:37 +0200 + python-apt (1.8.4) unstable; urgency=medium * apt.Cache: Fix (un)locking in various places diff -Nru python-apt-1.9.0/debian/control python-apt-1.9.0ubuntu1/debian/control --- python-apt-1.9.0/debian/control 2019-06-24 13:54:56.000000000 +0000 +++ python-apt-1.9.0ubuntu1/debian/control 2019-08-06 12:34:24.000000000 +0000 @@ -1,7 +1,8 @@ Source: python-apt Section: python Priority: optional -Maintainer: APT Development Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: APT Development Team Uploaders: Michael Vogt , Julian Andres Klode Standards-Version: 3.9.8 X-Python-Version: >= 2.7