ControL: tag -1 - moreinfo On Thu, Apr 22, 2021 at 11:32:07AM +0200, Paul Gevers wrote: > tags -1 confirmed moreinfo > > Hi Julian, > > On 15-04-2021 18:28, Julian Andres Klode wrote: > > Want to bump version number to stable series versioning, mostly, > > update the mirror list, and remove invalid PIE disablement which > > triggers build failures in downstreams (it fails with LTO; I think > > it's a no-op without LTO either way, or at least supposed to be, > > given that we link with -fPIC). > > > > Don't really care much about the build dependency !nocheck > > annotations, but they were already queued. Could revert > > them if needed. > > Please go ahead and remove the moreinfo once the package landed in the > archive.
I had to add another bugfix to the release. It turns out we passed
c->Binary to ExtractTar instead of c->Name; so what happens is that
if you don't have a binary for a given compressor, e.g. /usr/bin/zstd,
Binary becomes false, and then stuff fails:
$ python3 -c 'import apt_inst, apt_pkg; apt_pkg.init();
apt_inst.DebFile("glibc-doc-reference_2.33-0ubuntu2~zstd1_all.deb").control.extractall()'
Traceback (most recent call last):
File "<string>", line 1, in <module>
apt_pkg.Error: E:Cannot find a configured compressor for 'false'
I added the full debdiff against 2.1.7 again, as well as the added
changes against the pre-approved version.
--
debian developer - deb.li/jak | jak-linux.org - free software dev
ubuntu core developer i speak de, en
diff -Nru python-apt-2.1.7/data/templates/Debian.mirrors python-apt-2.2.0/data/templates/Debian.mirrors --- python-apt-2.1.7/data/templates/Debian.mirrors 2020-12-10 15:35:32.000000000 +0100 +++ python-apt-2.2.0/data/templates/Debian.mirrors 2021-04-29 09:49:08.000000000 +0200 @@ -6,7 +6,6 @@ http://mirror.sitsa.com.ar/debian/ #LOC:AT http://debian.anexia.at/debian/ -http://debian.inode.at/debian/ http://debian.lagis.at/debian/ http://debian.mur.at/debian/ http://debian.sil.at/debian/ @@ -28,13 +27,14 @@ http://ftp.belnet.be/debian/ http://mirror.as35701.net/debian/ #LOC:BG +http://debian.a1.bg/debian/ http://debian.ipacct.com/debian/ http://debian.ludost.net/debian/ http://debian.mnet.bg/debian/ -http://debian.mobiltel.bg/debian/ http://debian.telecoms.bg/debian/ http://ftp.bg.debian.org/debian/ http://ftp.uni-sofia.bg/debian/ +http://mirror.telepoint.bg/debian/ http://mirrors.netix.net/debian/ #LOC:BR http://alcateia.ufscar.br/debian/ @@ -63,6 +63,8 @@ http://mirror.init7.net/debian/ http://mirror.iway.ch/debian/ http://mirror.sinavps.ch/debian/ +http://mirror1.infomaniak.com/debian/ +http://mirror2.infomaniak.com/debian/ http://pkg.adfinis-sygroup.ch/debian/ #LOC:CL http://debian.netlinux.cl/debian/ @@ -74,9 +76,11 @@ http://ftp.cn.debian.org/debian/ http://ftp2.cn.debian.org/debian/ http://mirror.lzu.edu.cn/debian/ +http://mirror.sjtu.edu.cn/debian/ http://mirrors.163.com/debian/ http://mirrors.bfsu.edu.cn/debian/ http://mirrors.huaweicloud.com/debian/ +http://mirrors.nju.edu.cn/debian/ http://mirrors.tuna.tsinghua.edu.cn/debian/ http://mirrors.ustc.edu.cn/debian/ #LOC:CR @@ -119,6 +123,7 @@ http://ftp.uni-kl.de/debian/ http://ftp.uni-mainz.de/debian/ http://ftp.uni-stuttgart.de/debian/ +http://ftp.wrz.de/debian/ http://ftp2.de.debian.org/debian/ http://mirror.23media.de/debian/ http://mirror.de.leaseweb.net/debian/ @@ -292,7 +297,6 @@ http://ftp.debian.org/debian/ http://ftp.debian.xs4all.net/debian/ http://ftp.nl.debian.org/debian/ -http://ftp.nluug.nl/debian/ http://mirror.dataone.nl/debian/ http://mirror.duocast.net/debian/ http://mirror.i3d.net/debian/ @@ -331,6 +335,8 @@ #LOC:RE http://depot-debian.univ-reunion.fr/debian/ #LOC:RO +http://mirror.linux.ro/debian/ +http://mirrors.hostico.ro/debian/ http://mirrors.nav.ro/debian/ http://mirrors.nxthost.com/debian/ http://mirrors.pidginhost.com/debian/ @@ -344,6 +350,7 @@ http://mirror.corbina.net/debian/ http://mirror.docker.ru/debian/ http://mirror.mephi.ru/debian/ +http://mirror.surf/debian/ http://mirror.truenetwork.ru/debian/ http://mirrors.powernet.com.ru/debian/ #LOC:SE @@ -378,6 +385,7 @@ http://ftp.tr.debian.org/debian/ #LOC:TW http://debian.cs.nctu.edu.tw/debian/ +http://debian.csie.ncku.edu.tw/debian/ http://debian.csie.ntu.edu.tw/debian/ http://ftp.ntou.edu.tw/debian/ http://ftp.tku.edu.tw/debian/ diff -Nru python-apt-2.1.7/data/templates/Ubuntu.mirrors python-apt-2.2.0/data/templates/Ubuntu.mirrors --- python-apt-2.1.7/data/templates/Ubuntu.mirrors 2020-12-10 15:35:32.000000000 +0100 +++ python-apt-2.2.0/data/templates/Ubuntu.mirrors 2021-04-29 09:49:08.000000000 +0200 @@ -8,9 +8,7 @@ http://ubuntu.unc.edu.ar/ubuntu/ #LOC:AT http://mirror.easyname.at/ubuntu-archive/ -http://mirror.reismil.ch/ubuntu/ http://ubuntu.anexia.at/ubuntu/ -http://ubuntu.inode.at/ubuntu/ http://ubuntu.lagis.at/ubuntu/ http://ubuntu.uni-klu.ac.at/ubuntu/ https://mirror.kumi.systems/ubuntu-ports/ @@ -45,15 +43,16 @@ http://ftp.belnet.be/ubuntu/ http://mirror.unix-solutions.be/ubuntu/ #LOC:BG +http://mirror.bg.host.ag/ubuntu/ http://mirrors.daticum.com/ubuntu/archive/ http://mirrors.neterra.net/ubuntu/ http://ubuntu.ipacct.com/ubuntu/ http://ubuntu.uni-sofia.bg/ubuntu/ +https://mirror.telepoint.bg/ubuntu/ #LOC:BR -http://mirror.globo.com/ubuntu/archive/ http://mirror.ufam.edu.br/ubuntu/ http://mirror.ufscar.br/ubuntu/ -http://repositorio.nti.ufal.br/ubuntu/ +http://sft.if.usp.br/ubuntu/ http://ubuntu-archive.locaweb.com.br/ubuntu/ http://ubuntu.c3sl.ufpr.br/ubuntu/ https://ubuntu.itsbrasil.net/ubuntu/ @@ -81,15 +80,17 @@ http://ubuntu.mirror.globo.tech/ http://ubuntu.mirror.iweb.ca/ http://ubuntu.mirror.rafal.ca/ubuntu/ +https://mirror.0xem.ma/ubuntu/ https://mirror.esecuredata.com/ubuntu-archive/ https://mirror.reenigne.net/ubuntu/ https://mirrors.switch.ca/ubuntu/ #LOC:CH http://archive.ubuntu.csg.uzh.ch/ubuntu/ http://mirror.init7.net/ubuntu/ -http://pkg.adfinis-sygroup.ch/ubuntu/ +http://pkg.adfinis.com/ubuntu/ http://ubuntu.ethz.ch/ubuntu/ https://mirror.solnet.ch/ubuntu/ +https://ubuntu.ch.altushost.com/ #LOC:CL http://mirror.uchile.cl/ubuntu/ http://mirror1.cl.netactuate.com/ubuntu/ @@ -97,10 +98,8 @@ https://mirror.ufro.cl/ubuntu/ #LOC:CN http://ftp.sjtu.edu.cn/ubuntu/ -http://linux.xjtuns.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.dgut.edu.cn/ubuntu/ http://mirrors.huaweicloud.com/repository/ubuntu/ @@ -113,8 +112,6 @@ https://mirror.bjtu.edu.cn/ubuntu/ https://mirrors.bfsu.edu.cn/ubuntu/ https://mirrors.hit.edu.cn/ubuntu/ -#LOC:CO -http://mirror.unimagdalena.edu.co/ubuntu/ #LOC:CR http://ubuntu.ucr.ac.cr/ubuntu/ #LOC:CY @@ -162,7 +159,6 @@ http://mirror2.tuxinator.org/ubuntu/ http://packages.oth-regensburg.de/ubuntu/ http://suse.uni-leipzig.de/pub/releases.ubuntu.com/ubuntu/ -http://ubuntu.cybertips.info/ubuntu/ http://ubuntu.mirror.lrz.de/ubuntu/ http://ubuntu.mirror.tudos.de/ubuntu/ http://ubuntu.unitedcolo.de/ubuntu/ @@ -170,6 +166,7 @@ https://files.tux-users.net/ubuntu/ https://ftp.uni-stuttgart.de/ubuntu/ https://mirror.de.leaseweb.net/ubuntu/ +https://mirror.de.vangus.co.il/ubuntu/ https://mirror.dogado.de/ubuntu/ https://mirror.scaleuptech.com/ubuntu/ #LOC:DK @@ -196,11 +193,9 @@ http://ubuntu.uc3m.es/ubuntu/ https://ftp.csuc.cat/ubuntu/archieve/ #LOC:FI -http://mirror.hosthink.net/ubuntu/ http://mirrors.nic.funet.fi/ubuntu/ #LOC:FR http://distrib-coffee.ipsl.jussieu.fr/pub/linux/ubuntu/ -http://ftp.oleane.net/ubuntu/ http://ftp.rezopole.net/ubuntu/ http://miroir.univ-lorraine.fr/ubuntu/ http://mirror.plusserver.com/ubuntu/ubuntu/ @@ -249,18 +244,18 @@ http://mirror.as.kamatera.com/ubuntu/ http://mirror.xtom.com.hk/ubuntu/ http://www.ubuntu.org.tw/ +https://ubuntu.01link.hk/ubuntu/ #LOC:HR http://ubuntu.grad.hr/ubuntu/ https://hr.mirror.kumi.systems/ubuntu/ #LOC:HU http://ftp.fsn.hu/ubuntu/ -http://mirrors.sth.sze.hu/ubuntu/ http://repo.jztkft.hu/ubuntu/ https://mirror.niif.hu/ubuntu/ +https://mirrors.sth.sze.hu/ubuntu/ https://quantum-mirror.hu/mirrors/pub/ubuntu/ #LOC:ID http://buaya.klas.or.id/ubuntu/ -http://kambing.ui.ac.id/ubuntu/ http://kartolo.sby.datautama.net.id/ubuntu/ http://kebo.pens.ac.id/ubuntu/ http://kebo.vlsm.org/ubuntu/ @@ -271,10 +266,10 @@ http://mirror.telkomuniversity.ac.id/ubuntu/ http://mirror.unej.ac.id/ubuntu/ http://suro.ubaya.ac.id/ubuntu/ +https://mirror.amscloud.co.id/ubuntu/ +https://mirror.faizuladib.com/ubuntu/ https://mirror.gi.co.id/ubuntu/ https://mirror.papua.go.id/ubuntu/ -https://pinguin.dinus.ac.id/iso/ubuntu/repo/ -https://repo.dinamika.ac.id/ubuntu/ #LOC:IE http://ftp.heanet.ie/pub/ubuntu/ #LOC:IL @@ -290,18 +285,23 @@ http://mirrors.piconets.webwerks.in/ubuntu-mirror/ubuntu/ http://repos.del.extreme-ix.org/ubuntu/ http://ubuntu-archive.mirrors.estointernet.in/ +http://ubuntu.hbcse.tifr.res.in/ubuntu/ http://ubuntu.mirror.snu.edu.in/ubuntu/ #LOC:IR -http://archive.ubuntu.petiak.ir/ubuntu/ +http://archive.ubuntu.asiatech.ir/ http://ir.ubuntu.sindad.cloud/ubuntu/ +http://mirror.0-1.cloud/ubuntu/ http://mirror.aminidc.com/ubuntu/ +http://mirror.faraso.org/ubuntu/ http://mirror.rasanegar.com/ubuntu/archive/ http://repo.iut.ac.ir/repo/Ubuntu/ +https://archive.ubuntu.petiak.ir/ubuntu/ +https://mirror.famaserver.com/ubuntu/archive/ https://mirror.iranserver.com/ubuntu/ https://ubuntu.shatel.ir/ubuntu/ #LOC:IS -http://speglar.simnet.is/ubuntu/ http://ubuntu.hysing.is/ubuntu/ +https://mirrors.opensource.is/ubuntu/ #LOC:IT http://giano.com.dist.unige.it/ubuntu/ http://it-mirrors.evowise.com/ubuntu/ @@ -320,18 +320,17 @@ http://ubuntu.mirror.ac.ke/ubuntu/ #LOC:KH http://mirror.telcotech.com.kh/Linux/ubuntu-releases/ +https://mirror.sabay.com.kh/ubuntu/ #LOC:KR http://ftp.daum.net/ubuntu/ -http://ftp.lanet.kr/ubuntu/ -http://mirror.anigil.com/ubuntu/ http://mirror.kakao.com/ubuntu/ https://ftp.harukasan.org/ubuntu-ports/ https://ftp.harukasan.org/ubuntu/ +https://ftp.lanet.kr/ubuntu/ +https://mirror.anigil.com/ubuntu/ https://mirror.misakamikoto.network/ubuntu-ports/ https://mirror.misakamikoto.network/ubuntu/ https://mirror.yongbok.net/ubuntu/ -https://twitchdarkbot.com/ubuntu-ports/ -https://twitchdarkbot.com/ubuntu/ #LOC:KZ http://mirror.hoster.kz/ubuntu/ http://mirror.neolabs.kz/ubuntu/ @@ -363,6 +362,7 @@ http://my.mirrors.thegigabit.com/ubuntu/ http://ubuntu.mirror.myduniahost.com/ubuntu/ http://ubuntu.tuxuri.com/ubuntu/ +https://ubuntu.gbnetwork.com/ubuntu/ https://ubuntu.ipserverone.com/ubuntu/ #LOC:NA http://download.nust.na/pub/ubuntu/ubuntu/ @@ -394,6 +394,7 @@ http://osmirror.rug.nl/ubuntu/ http://ubuntu.mirror.cambrium.nl/ubuntu/ http://ubuntu.mirror.true.nl/ubuntu/ +https://mirror.nl.bontekoe.technology/ubuntu/ https://mirror.nl.leaseweb.net/ubuntu/ https://nl.mirrors.clouvider.net/ubuntu/ #LOC:NO @@ -403,7 +404,6 @@ http://ubuntu.uib.no/archive/ #LOC:NP http://ntc.net.np/ubuntu/ -http://ubuntu.ntc.net.np/ubuntu/ #LOC:NZ http://mirror.fsmg.org.nz/ubuntu/ http://ubuntu.mirrors.theom.nz/ @@ -414,7 +414,6 @@ #LOC:PK http://mirrors.nayatel.com/ubuntu/ http://repo.inara.pk/ubuntu/ -http://repo.isra.edu.pk/ubuntu/ #LOC:PL ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu/ http://ftp.agh.edu.pl/ubuntu/ @@ -434,17 +433,18 @@ http://mirrors.up.pt/ubuntu/ https://mirrors.ptisp.pt/ubuntu/ #LOC:RO -http://mirror.efect.ro/ubuntu/archive/ http://mirrors.nav.ro/ubuntu/ http://mirrors.nxthost.com/ubuntu/ http://mirrors.pidginhost.com/ubuntu/ http://mirrors.xservers.ro/ubuntu/ http://ro-mirrors.evowise.com/ubuntu/ http://ubuntu.mirrors.linux.ro/archive/ +https://mirror.efect.ro/ubuntu/archive/ https://mirrors.chroot.ro/ubuntu/ #LOC:RS http://ubuntu.mirror.ftn.uns.ac.rs/archive/ https://rs.mirror.kumi.systems/ubuntu/ +https://ubuntu.unlimited.rs/ #LOC:RU http://mirror.corbina.net/ubuntu/ http://mirror.docker.ru/ubuntu/ @@ -491,7 +491,6 @@ http://ubuntu.saglayici.com/ubuntu/ http://ubuntu.turhost.com/ubuntu/ http://ubuntu.vargonen.com/ubuntu/ -https://mirror.provider.com.tr/ubuntu/ https://mirror.sh.com.tr/ubuntu/ #LOC:TW http://free.nchc.org.tw/ubuntu/ @@ -503,15 +502,14 @@ http://mirror01.idc.hinet.net/ubuntu/ http://ubuntu.cs.nctu.edu.tw/ubuntu/ http://ubuntu.stu.edu.tw/ubuntu/ +https://ubuntu.ccns.ncku.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.colocall.net/ubuntu/ http://ubuntu.mirrors.omnilance.com/ubuntu/ http://ubuntu.netforce.hosting/ubuntu/ -http://ubuntu.volia.net/ubuntu-archive/ +http://ubuntu.org.ua/ubuntu/ https://ubuntu.ip-connect.vn.ua/ #LOC:UG http://mirror.renu.ac.ug/ubuntu/ @@ -524,7 +522,6 @@ http://mirror.ancl.hawaii.edu/linux/ubuntu/ http://mirror.arizona.edu/ubuntu/ http://mirror.brightridge.com/ubuntuarchive/ -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/ @@ -539,6 +536,7 @@ http://mirror.math.ucdavis.edu/ubuntu/ http://mirror.metrocast.net/ubuntu/ http://mirror.mrjester.net/ubuntu/archive/ +http://mirror.nodesdirect.com/ubuntu/ http://mirror.pit.teraswitch.com/ubuntu/ http://mirror.pnl.gov/ubuntu/ http://mirror.siena.edu/ubuntu/ @@ -558,7 +556,7 @@ http://mirrors.advancedhosters.com/ubuntu/ http://mirrors.arpnetworks.com/Ubuntu/ http://mirrors.cat.pdx.edu/ubuntu/ -http://mirrors.easynews.com/linux/ubuntu/ +http://mirrors.cmich.edu/ubuntu/ http://mirrors.gigenet.com/ubuntuarchive/ http://mirrors.liquidweb.com/ubuntu/ http://mirrors.lug.mtu.edu/ubuntu/ @@ -586,7 +584,6 @@ http://ubuntu.cs.utah.edu/ubuntu/ http://ubuntu.mirror.constant.com/ http://ubuntu.mirror.frontiernet.net/ubuntu/ -http://ubuntu.mirror.vio.sh/ubuntu/ http://ubuntu.mirrors.pair.com/archive/ http://ubuntu.mirrors.tds.net/pub/ubuntu/ http://ubuntu.osuosl.org/ubuntu/ @@ -594,13 +591,14 @@ http://us.mirror.nsec.pt/ubuntu/ http://www.club.cc.cmu.edu/pub/ubuntu/ http://www.gtlib.gatech.edu/pub/ubuntu/ -https://archive.ubuntu.thomas-ward-consulting.llc/ubuntu/ https://atl.mirrors.clouvider.net/ubuntu/ https://la.mirrors.clouvider.net/ubuntu/ +https://mirror.clt.pvps.io/ubuntu/ https://mirror.os6.org/ubuntu/ https://mirror.us.leaseweb.net/ubuntu/ https://mirrors.bloomu.edu/ubuntu/ https://nyc.mirrors.clouvider.net/ubuntu/ +https://ubuntu.mirror.shastacoe.net/ubuntu/ #LOC:UY http://repos.interior.edu.uy/ubuntu/ http://ubuntu.repo.cure.edu.uy/mirror/ @@ -614,6 +612,7 @@ http://mirrors.vhost.vn/ubuntu/ http://opensource.xtdv.net/ubuntu/ https://mirrors.bkns.vn/ubuntu/ +https://mirrors.cloudfly.vn/ubuntu/ https://mirrors.inet.vn/ubuntu/ #LOC:ZA http://ftp.leg.uct.ac.za/ubuntu/ diff -Nru python-apt-2.1.7/debian/changelog python-apt-2.2.0/debian/changelog --- python-apt-2.1.7/debian/changelog 2020-12-10 15:35:32.000000000 +0100 +++ python-apt-2.2.0/debian/changelog 2021-04-29 09:49:08.000000000 +0200 @@ -1,3 +1,19 @@ +python-apt (2.2.0) unstable; urgency=medium + + [ Helmut Grohne ] + * Annotate test dependencies with <!nocheck> (Closes: #980719) + + [ Julian Andres Klode ] + * debian/rules: Re-enable PIE hardening + * Mirror list updates + * debfile: Pass `Name` instead of `Binary` to ExtractTar. + Passing the binary causes it to fail trying to find the `false` + compressor when a binary for a given compressor is not installed. + (LP: #1926437) + * debian/gbp.conf: Branch name is main + + -- Julian Andres Klode <j...@debian.org> Thu, 29 Apr 2021 09:49:08 +0200 + python-apt (2.1.7) unstable; urgency=medium * SECURITY UPDATE: various memory and file descriptor leaks (LP: #1899193) diff -Nru python-apt-2.1.7/debian/control python-apt-2.2.0/debian/control --- python-apt-2.1.7/debian/control 2020-12-10 15:35:32.000000000 +0100 +++ python-apt-2.2.0/debian/control 2021-04-29 09:49:08.000000000 +0200 @@ -6,10 +6,10 @@ Rules-Requires-Root: no Standards-Version: 4.5.0 Build-Depends: apt (>= 1.0.9.4), - apt-utils, + apt-utils <!nocheck>, debhelper-compat (= 12), dh-python, - distro-info-data, + distro-info-data <!nocheck>, fakeroot, libapt-pkg-dev (>= 1.9.11~), python3-all (>= 3.3), @@ -19,10 +19,10 @@ python3-distutils-extra (>= 2.0), python3-setuptools, python3-sphinx (>= 0.5), - gnupg, - dirmngr | gnupg (<< 2), - pycodestyle, - pyflakes3 + gnupg <!nocheck>, + dirmngr <!nocheck> | gnupg (<< 2) <!nocheck>, + pycodestyle <!nocheck>, + pyflakes3 <!nocheck>, Vcs-Git: https://salsa.debian.org/apt-team/python-apt.git Vcs-Browser: https://salsa.debian.org/apt-team/python-apt diff -Nru python-apt-2.1.7/debian/gbp.conf python-apt-2.2.0/debian/gbp.conf --- python-apt-2.1.7/debian/gbp.conf 2020-12-10 15:35:32.000000000 +0100 +++ python-apt-2.2.0/debian/gbp.conf 2021-04-29 09:49:08.000000000 +0200 @@ -1,7 +1,7 @@ [DEFAULT] prebuild = ./pre-build.sh export-dir = ../build-area -debian-branch = master +debian-branch = main debian-tag = %(version)s sign-tags = True multimaint-merge = True diff -Nru python-apt-2.1.7/debian/rules python-apt-2.2.0/debian/rules --- python-apt-2.1.7/debian/rules 2020-12-10 15:35:32.000000000 +0100 +++ python-apt-2.2.0/debian/rules 2021-04-29 09:49:08.000000000 +0200 @@ -8,7 +8,7 @@ export DEB_CFLAGS_MAINT_APPEND=-Wno-write-strings \ -DDATE=\""$(DATE)"\" \ -DTIME=\""$(TIME)"\" -export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie +export DEB_BUILD_MAINT_OPTIONS=hardening=+all export PYBUILD_NAME=apt BUILDDIR3 := $(shell pybuild --print build_dir --interpreter python3) diff -Nru python-apt-2.1.7/python/arfile.cc python-apt-2.2.0/python/arfile.cc --- python-apt-2.1.7/python/arfile.cc 2020-12-10 15:35:32.000000000 +0100 +++ python-apt-2.2.0/python/arfile.cc 2021-04-29 09:49:08.000000000 +0200 @@ -600,7 +600,7 @@ Member = AR.FindMember(std::string(Name).append(c->Extension).c_str()); if (Member == NULL) continue; - Compressor = c->Binary; + Compressor = c->Name; break; }
diff -Nru python-apt-2.2.0/data/templates/Ubuntu.mirrors python-apt-2.2.0/data/templates/Ubuntu.mirrors --- python-apt-2.2.0/data/templates/Ubuntu.mirrors 2021-04-15 18:15:22.000000000 +0200 +++ python-apt-2.2.0/data/templates/Ubuntu.mirrors 2021-04-29 09:49:08.000000000 +0200 @@ -10,6 +10,7 @@ http://mirror.easyname.at/ubuntu-archive/ http://ubuntu.anexia.at/ubuntu/ http://ubuntu.lagis.at/ubuntu/ +http://ubuntu.uni-klu.ac.at/ubuntu/ https://mirror.kumi.systems/ubuntu-ports/ https://mirror.kumi.systems/ubuntu/ #LOC:AU @@ -54,6 +55,7 @@ http://sft.if.usp.br/ubuntu/ http://ubuntu-archive.locaweb.com.br/ubuntu/ http://ubuntu.c3sl.ufpr.br/ubuntu/ +https://ubuntu.itsbrasil.net/ubuntu/ https://ubuntu.letscloud.io/ubuntu/ #LOC:BW http://mirror.retentionrange.co.bw/ubuntu/ @@ -107,6 +109,7 @@ http://mirrors.tuna.tsinghua.edu.cn/ubuntu/ http://mirrors.ustc.edu.cn/ubuntu/ http://mirrors.yun-idc.com/ubuntu/ +https://mirror.bjtu.edu.cn/ubuntu/ https://mirrors.bfsu.edu.cn/ubuntu/ https://mirrors.hit.edu.cn/ubuntu/ #LOC:CR @@ -187,6 +190,7 @@ http://softlibre.unizar.es/ubuntu/archive/ http://ubuntu.cica.es/ubuntu/ http://ubuntu.grn.cat/ubuntu/ +http://ubuntu.uc3m.es/ubuntu/ https://ftp.csuc.cat/ubuntu/archieve/ #LOC:FI http://mirrors.nic.funet.fi/ubuntu/ @@ -223,6 +227,7 @@ http://uk-mirrors.evowise.com/ubuntu/ http://uk.mirror.worldbus.ge/ubuntu/ http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ +https://mirrors.gethosted.online/ubuntu/ https://uk.mirrors.clouvider.net/ubuntu/ #LOC:GE http://ubuntu.grena.ge/ubuntu/ @@ -245,9 +250,9 @@ https://hr.mirror.kumi.systems/ubuntu/ #LOC:HU http://ftp.fsn.hu/ubuntu/ -http://mirrors.sth.sze.hu/ubuntu/ http://repo.jztkft.hu/ubuntu/ https://mirror.niif.hu/ubuntu/ +https://mirrors.sth.sze.hu/ubuntu/ https://quantum-mirror.hu/mirrors/pub/ubuntu/ #LOC:ID http://buaya.klas.or.id/ubuntu/ @@ -265,7 +270,6 @@ https://mirror.faizuladib.com/ubuntu/ https://mirror.gi.co.id/ubuntu/ https://mirror.papua.go.id/ubuntu/ -https://repo.dinamika.ac.id/ubuntu/ #LOC:IE http://ftp.heanet.ie/pub/ubuntu/ #LOC:IL @@ -288,6 +292,7 @@ http://ir.ubuntu.sindad.cloud/ubuntu/ http://mirror.0-1.cloud/ubuntu/ http://mirror.aminidc.com/ubuntu/ +http://mirror.faraso.org/ubuntu/ http://mirror.rasanegar.com/ubuntu/archive/ http://repo.iut.ac.ir/repo/Ubuntu/ https://archive.ubuntu.petiak.ir/ubuntu/ @@ -321,6 +326,7 @@ http://mirror.kakao.com/ubuntu/ https://ftp.harukasan.org/ubuntu-ports/ https://ftp.harukasan.org/ubuntu/ +https://ftp.lanet.kr/ubuntu/ https://mirror.anigil.com/ubuntu/ https://mirror.misakamikoto.network/ubuntu-ports/ https://mirror.misakamikoto.network/ubuntu/ @@ -501,11 +507,9 @@ http://mirror.aptus.co.tz/pub/ubuntuarchive/ #LOC:UA http://mirror.mirohost.net/ubuntu/ -http://ubuntu.colocall.net/ubuntu/ http://ubuntu.mirrors.omnilance.com/ubuntu/ http://ubuntu.netforce.hosting/ubuntu/ http://ubuntu.org.ua/ubuntu/ -http://ubuntu.volia.net/ubuntu-archive/ https://ubuntu.ip-connect.vn.ua/ #LOC:UG http://mirror.renu.ac.ug/ubuntu/ @@ -514,6 +518,7 @@ http://ftp.usf.edu/pub/ubuntu/ http://ftp.ussg.iu.edu/linux/ubuntu/ http://la-mirrors.evowise.com/ubuntu/ +http://lug.mtu.edu/ubuntu/ http://mirror.ancl.hawaii.edu/linux/ubuntu/ http://mirror.arizona.edu/ubuntu/ http://mirror.brightridge.com/ubuntuarchive/ @@ -554,6 +559,7 @@ http://mirrors.cmich.edu/ubuntu/ http://mirrors.gigenet.com/ubuntuarchive/ http://mirrors.liquidweb.com/ubuntu/ +http://mirrors.lug.mtu.edu/ubuntu/ http://mirrors.maine.edu/ubuntu/ http://mirrors.mit.edu/ubuntu/ http://mirrors.namecheap.com/ubuntu/ @@ -584,6 +590,7 @@ http://ubuntu.securedservers.com/ http://us.mirror.nsec.pt/ubuntu/ http://www.club.cc.cmu.edu/pub/ubuntu/ +http://www.gtlib.gatech.edu/pub/ubuntu/ https://atl.mirrors.clouvider.net/ubuntu/ https://la.mirrors.clouvider.net/ubuntu/ https://mirror.clt.pvps.io/ubuntu/ @@ -591,7 +598,6 @@ https://mirror.us.leaseweb.net/ubuntu/ https://mirrors.bloomu.edu/ubuntu/ https://nyc.mirrors.clouvider.net/ubuntu/ -https://repos.eggycrew.com/ubuntu/ https://ubuntu.mirror.shastacoe.net/ubuntu/ #LOC:UY http://repos.interior.edu.uy/ubuntu/ diff -Nru python-apt-2.2.0/debian/changelog python-apt-2.2.0/debian/changelog --- python-apt-2.2.0/debian/changelog 2021-04-15 18:15:22.000000000 +0200 +++ python-apt-2.2.0/debian/changelog 2021-04-29 09:49:08.000000000 +0200 @@ -6,8 +6,13 @@ [ Julian Andres Klode ] * debian/rules: Re-enable PIE hardening * Mirror list updates + * debfile: Pass `Name` instead of `Binary` to ExtractTar. + Passing the binary causes it to fail trying to find the `false` + compressor when a binary for a given compressor is not installed. + (LP: #1926437) + * debian/gbp.conf: Branch name is main - -- Julian Andres Klode <j...@debian.org> Thu, 15 Apr 2021 18:15:22 +0200 + -- Julian Andres Klode <j...@debian.org> Thu, 29 Apr 2021 09:49:08 +0200 python-apt (2.1.7) unstable; urgency=medium diff -Nru python-apt-2.2.0/debian/gbp.conf python-apt-2.2.0/debian/gbp.conf --- python-apt-2.2.0/debian/gbp.conf 2021-04-15 18:15:22.000000000 +0200 +++ python-apt-2.2.0/debian/gbp.conf 2021-04-29 09:49:08.000000000 +0200 @@ -1,7 +1,7 @@ [DEFAULT] prebuild = ./pre-build.sh export-dir = ../build-area -debian-branch = master +debian-branch = main debian-tag = %(version)s sign-tags = True multimaint-merge = True diff -Nru python-apt-2.2.0/python/arfile.cc python-apt-2.2.0/python/arfile.cc --- python-apt-2.2.0/python/arfile.cc 2021-04-15 18:15:22.000000000 +0200 +++ python-apt-2.2.0/python/arfile.cc 2021-04-29 09:49:08.000000000 +0200 @@ -600,7 +600,7 @@ Member = AR.FindMember(std::string(Name).append(c->Extension).c_str()); if (Member == NULL) continue; - Compressor = c->Binary; + Compressor = c->Name; break; }
signature.asc
Description: PGP signature
