Your message dated Sun, 08 Mar 2020 14:40:20 +0000
with message-id <e1jax6k-000avc...@fasolo.debian.org>
and subject line Bug#953306: fixed in aptitude 0.8.12-2
has caused the Debian Bug report #953306,
regarding aptitude: port to apt 1.9.11
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
953306: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=953306
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: aptitude
Version: 0.8.12-1
Severity: serious
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch
Control: user de...@lists.debian.org
Control: usertag -1 apt-1.9.11
In Ubuntu, the attached patch was applied to achieve the following:
* Update for apt 1.9.11
Thanks for considering the patch.
Note that if this gets uploaded before new apt lands in unstable,
the change from Index() to MapPointer() might need to be wrapped
inside an #if APT_PKG_ABI >= 600 so it can still build with apt in
unstable.
*** /tmp/tmp3dwel3so/aptitude_0.8.12-1ubuntu4.debdiff
diff -Nru aptitude-0.8.12/debian/control aptitude-0.8.12/debian/control
--- aptitude-0.8.12/debian/control 2020-02-19 13:51:33.000000000 +0100
+++ aptitude-0.8.12/debian/control 2020-02-27 09:14:00.000000000 +0100
@@ -1,15 +1,14 @@
Source: aptitude
Section: admin
Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
-XSBC-Original-Maintainer: Aptitude Development Team
<aptitude-de...@lists.alioth.debian.org>
+Maintainer: Aptitude Development Team <aptitude-de...@lists.alioth.debian.org>
Uploaders: Manuel A. Fernandez Montecelo <m...@debian.org>,
Axel Beckert <a...@debian.org>
Build-Depends: debhelper (>= 11~),
autoconf-archive,
dpkg-dev (>= 1.16.1),
gettext,
- libapt-pkg-dev (>= 1.1),
+ libapt-pkg-dev (>= 1.9.11~),
libboost-dev,
libboost-iostreams-dev,
libboost-system-dev,
diff -Nru aptitude-0.8.12/debian/patches/06_apt1.9.11
aptitude-0.8.12/debian/patches/06_apt1.9.11
--- aptitude-0.8.12/debian/patches/06_apt1.9.11 1970-01-01 01:00:00.000000000
+0100
+++ aptitude-0.8.12/debian/patches/06_apt1.9.11 2020-02-27 09:14:00.000000000
+0100
@@ -0,0 +1,50 @@
+Description: Adjust for apt 1.9.11
+ pkgDPkgPM should not be used directly, use _system->CreatePM() instead;
+ also compare map_pointer in cache against new MapPointer() method instead
+ of Index().
+Author: Julian Andres Klode <juli...@ubuntu.com>
+Last-Update: 2020-02-27
+
+--- a/src/generic/apt/apt.cc
++++ b/src/generic/apt/apt.cc
+@@ -1724,8 +1724,8 @@ namespace aptitude
+ return;
+ }
+
+- pkgDPkgPM pm(*apt_cache_file);
+- pm.GetArchives(&fetcher, &l, apt_package_records);
++ std::unique_ptr<pkgPackageManager>
pm(_system->CreatePM(*apt_cache_file));
++ pm->GetArchives(&fetcher, &l, apt_package_records);
+ if (_error->PendingError())
+ return;
+
+--- a/src/generic/apt/download_install_manager.cc
++++ b/src/generic/apt/download_install_manager.cc
+@@ -33,6 +33,7 @@
+ #include <apt-pkg/error.h>
+ #include <apt-pkg/install-progress.h>
+ #include <apt-pkg/sourcelist.h>
++#include <apt-pkg/pkgsystem.h>
+
+ #include <sigc++/bind.h>
+
+@@ -44,7 +45,7 @@ using namespace std;
+
+ download_install_manager::download_install_manager(bool _download_only,
+ const
run_dpkg_in_terminal_func &_run_dpkg_in_terminal)
+- : log(NULL), download_only(_download_only), pm(new
pkgDPkgPM(*apt_cache_file)),
++ : log(NULL), download_only(_download_only),
pm(_system->CreatePM(*apt_cache_file)),
+ run_dpkg_in_terminal(_run_dpkg_in_terminal)
+ {
+ }
+--- a/src/generic/apt/aptitude_resolver.cc
++++ b/src/generic/apt/aptitude_resolver.cc
+@@ -1085,7 +1085,7 @@ void aptitude_resolver::add_default_reso
+ pkgCache::VerIterator instVer(*cache, NULL);
+
+ // See if we have a match that's not through a Provides.
+- for( ; *curr != NULL && (*curr)->ParentPkg == p.Index(); ++curr)
++ for( ; *curr != NULL && (*curr)->ParentPkg == p.MapPointer(); ++curr)
+ {
+ pkgCache::PkgIterator currPkg(*cache, cache->GetCache().PkgP +
(*curr)->ParentPkg);
+ if((*cache)[currPkg].CandidateVer != *curr)
diff -Nru aptitude-0.8.12/debian/patches/series
aptitude-0.8.12/debian/patches/series
--- aptitude-0.8.12/debian/patches/series 2020-02-19 13:51:33.000000000
+0100
+++ aptitude-0.8.12/debian/patches/series 2020-02-27 09:14:00.000000000
+0100
@@ -1,3 +1,4 @@
03_branding
04_changelog
05_error
+06_apt1.9.11
-- System Information:
Debian Release: bullseye/sid
APT prefers focal
APT policy: (991, 'focal'), (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.4.0-17-generic (SMP w/8 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
--
debian developer - deb.li/jak | jak-linux.org - free software dev
ubuntu core developer i speak de, en
--- End Message ---
--- Begin Message ---
Source: aptitude
Source-Version: 0.8.12-2
Done: Julian Andres Klode <j...@debian.org>
We believe that the bug you reported is fixed in the latest version of
aptitude, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 953...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Julian Andres Klode <j...@debian.org> (supplier of updated aptitude package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sun, 08 Mar 2020 15:00:25 +0100
Source: aptitude
Architecture: source
Version: 0.8.12-2
Distribution: unstable
Urgency: medium
Maintainer: Aptitude Development Team <aptitude-de...@lists.alioth.debian.org>
Changed-By: Julian Andres Klode <j...@debian.org>
Closes: 953306
Changes:
aptitude (0.8.12-2) unstable; urgency=medium
.
* Team upload.
* d/patches:
- Add apt-1.9.11.patch to fix FTBFS with apt 2.0 (Closes: #953306)
Checksums-Sha1:
373bbcff2aa7be44a597b36b3f86abbd2d7767fd 3026 aptitude_0.8.12-2.dsc
ff7b56d13880588085ab17b1f88f69fd93c6afad 56788 aptitude_0.8.12-2.debian.tar.xz
b38d77bbe17c157ebed300dd9745cfd1f94a1ae9 5567
aptitude_0.8.12-2_source.buildinfo
Checksums-Sha256:
d8c49b0df2ca954cde2cfd608e36582c075eda1d9b2b2feb1c1b76a20e8083ca 3026
aptitude_0.8.12-2.dsc
cc55f1c806cf55f1012903864c84a39c7545e6d10eea9fbd34fcb941bb447d8b 56788
aptitude_0.8.12-2.debian.tar.xz
77be8a0c735ee1895289252d3333e566a297e3e48ee19478534990a69d69189c 5567
aptitude_0.8.12-2_source.buildinfo
Files:
4aaa2b1816729efc114538d78b55beb8 3026 admin optional aptitude_0.8.12-2.dsc
66ceee9deb228dd84be0b629cbdb24fc 56788 admin optional
aptitude_0.8.12-2.debian.tar.xz
e335b0efbeb93d6e68a67b9b76b0307c 5567 admin optional
aptitude_0.8.12-2_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJDBAEBCgAtFiEET7WIqEwt3nmnTHeHb6RY3R2wP3EFAl5k+wIPHGpha0BkZWJp
YW4ub3JnAAoJEG+kWN0dsD9xrZsP+gJJ6D7fNn/QQ/Oqv7a5ztY4w17o2ytpj9g/
4tjWHtZ7YJLR+DAWdlX8qNQey1qg3wnZzaa9/DGAg/GOqMDgtBknGjJspheCl3KR
MU57NfI3ddj/l9DK7CAM0keM8hsQidbAd8+Ow3HHWuCLdjQ2+F6GBv/JL5oael2b
ym7ggPNj92LPr9OrKM1Rx6S73mBP/clrADWlK+so6rzTrAeffj034K25CjytodAY
2k8J/W6rHu6t7NEgb9fpLHlq2xX60BzXrxkkxS+5hhexrMglTPfWQb+kHGTT76kF
GFreOoHfNA6tR+ucayaTJgK8EQcMjUkiDn7il6R3DItQYoPjQ/L+k/w2LEWFxru8
I+ychFZbb/UWvIwP2Rs2XocHwHFmKhRcq/8vAvpsABeG0GbyUkkaw0FGLIsLrWcG
XQ6d25r+mvpC045mHaguD9WDUU0J4RmWq0ufknPHSHFUA9VT34tupWpDZSCwsIXO
SyMoOenXVbkIqNs51EdtQ0nbLPYMhvZBO0DKQTWM6AKxvJAuXSeoMj1UMR5h6PZT
2MmNKLuUa0F4W4aAqub0EV5pG6JL75h79qz+rKvNaMy8nuPgAsRJwfAru0aYpJwV
oikKNHofKSuZ4kod9G4Rb6ayhCFfXRw5+3eihzTNvzM5yAqG6ntTnsuEu4YcRV+c
FPpCMe2S
=DUM1
-----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________
Aptitude-devel mailing list
Aptitude-devel@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/aptitude-devel
