-
-
Notifications
You must be signed in to change notification settings - Fork 3.9k
[DO NOT MERGE] [TRACKER] Apt 3.1.x #24212
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
|
That part of @@ -611,8 +619,27 @@ struct pkgCache::DescFile
map_pointer<DescFile> NextFile;
/** \brief position in the file */
map_filesize_t Offset; // File offset
- /** @TODO document pkgCache::DescFile::Size */
- map_filesize_t Size;
+};
+ /*}}}*/
+// SourceVersion structure /*{{{*/
+/** \brief information for a single version of a source package
+
+ The version list is always sorted from highest version to lowest
+ version by the generator. Equal version numbers are either merged
+ or handled as separate versions based on the Hash value. */
+struct pkgCache::SourceVersion
+{
+ /** \brief unique sequel ID */
+ map_id_t ID;
+ /** \brief Group the source package belongs too */
+ map_pointer<pkgCache::Group> Group;
+ /** \brief complete version string */
+ map_stringitem_t VerStr;
+ map_pointer<Version> VersionList [[gnu::unavailable("not yet available")]];
+ map_pointer<SourceVersion> NextSourceVersion [[gnu::unavailable("not yet available")]];
+
+ /** \brief Private pointer */
+ map_pointer<void> d;https://salsa.debian.org/apt-team/apt/-/blob/3.0.0/apt-pkg/pkgcache.h?ref_type=tags#L638 |
|
Thanks for the help @licy183, I just saw this now. |
|
I'm doing on-device testing with the DEBs from this PR now. I have already encountered one issue. Warning: Could not execute pager - PagerSetup (2: No such file or directory)Edit: Okay this is "newly" introduced in 2.9.181, and defaults to Footnotes |
|
Okay, that fixed ~$ pkg up
Checking availability of current mirror:
[*] https://packages-cf.termux.dev/apt/termux-main: ok
CANNOT LINK EXECUTABLE "/data/data/com.termux/files/usr/lib/apt/methods/https": library "libseccomp.so" not found: needed by main executable
CANNOT LINK EXECUTABLE "/data/data/com.termux/files/usr/lib/apt/methods/https": library "libseccomp.so" not found: needed by main executable
CANNOT LINK EXECUTABLE "/data/data/com.termux/files/usr/lib/apt/methods/https": library "libseccomp.so" not found: needed by main executable
CANNOT LINK EXECUTABLE "/data/data/com.termux/files/usr/lib/apt/methods/https": library "libseccomp.so" not found: needed by main executable
Error: Method https has died unexpectedly!
Error: Sub-process https returned an error code (1)
Error: Method /data/data/com.termux/files/usr/lib/apt/methods/https did not start correctly
Error: Method https has died unexpectedly!
Error: Sub-process https returned an error code (1)
Error: Method /data/data/com.termux/files/usr/lib/apt/methods/https did not start correctly
Error: Method https has died unexpectedly!
Error: Sub-process https returned an error code (1)
Error: Method /data/data/com.termux/files/usr/lib/apt/methods/https did not start correctly
Error: Method https has died unexpectedly!
Error: Sub-process https returned an error code (1)
Error: Method /data/data/com.termux/files/usr/lib/apt/methods/https did not start correctly
Error: Failed to fetch https://packages-cf.termux.dev/apt/termux-main/dists/stable/InRelease
Error: Failed to fetch https://packages-cf.termux.dev/apt/termux-root/dists/root/InRelease
Error: Failed to fetch https://tur.kcubeterm.com/dists/tur-packages/InRelease
Error: Failed to fetch https://packages-cf.termux.dev/apt/termux-x11/dists/x11/InRelease
Error: Some index files failed to download. They have been ignored, or old ones used instead.
Notice: Some sources can be modernized. Run 'apt modernize-sources' to do so.Edit: looks like a missing dependency. ~$ apt modernize-sources
The following files need modernizing:
- /data/data/com.termux/files/usr/etc/apt/sources.list
- /data/data/com.termux/files/usr/etc/apt/sources.list.d/root.list
- /data/data/com.termux/files/usr/etc/apt/sources.list.d/tur.list
- /data/data/com.termux/files/usr/etc/apt/sources.list.d/x11.list
Modernizing will replace .list files with the new .sources format,
add Signed-By values where they can be determined automatically,
and save the old files into .list.bak files.
This command supports the 'signed-by' and 'trusted' options. If you
have specified other options inside [] brackets, please transfer them
manually to the output files; see sources.list(5) for a mapping.
For a simulation, respond N in the following prompt.
Rewrite 4 sources? [Y/n] N
Simulating only...
Modernizing /data/data/com.termux/files/usr/etc/apt/sources.list...
# Would write to: /data/data/com.termux/files/usr/etc/apt/sources.list.d/termux-main-stable.sources
# Modernized from /data/data/com.termux/files/usr/etc/apt/sources.list
Types: deb
URIs: https://packages-cf.termux.dev/apt/termux-main/
Suites: stable
Components: main
Signed-By:
Warning: Could not determine Signed-By for URIs: https://packages-cf.termux.dev/apt/termux-main/, Suites: stable
Modernizing /data/data/com.termux/files/usr/etc/apt/sources.list.d/root.list...
# Would write to: /data/data/com.termux/files/usr/etc/apt/sources.list.d/root.sources
Types: deb
URIs: https://packages-cf.termux.dev/apt/termux-root/
Suites: root
Components: stable
Signed-By:
Warning: Could not determine Signed-By for URIs: https://packages-cf.termux.dev/apt/termux-root/, Suites: root
Modernizing /data/data/com.termux/files/usr/etc/apt/sources.list.d/tur.list...
# Would write to: /data/data/com.termux/files/usr/etc/apt/sources.list.d/tur.sources
Types: deb
URIs: https://tur.kcubeterm.com/
Suites: tur-packages
Components: tur tur-on-device tur-continuous
Signed-By: /data/data/com.termux/files/usr/etc/apt/trusted.gpg.d/tur.gpg
Modernizing /data/data/com.termux/files/usr/etc/apt/sources.list.d/x11.list...
# Would write to: /data/data/com.termux/files/usr/etc/apt/sources.list.d/x11.sources
Types: deb
URIs: https://packages-cf.termux.dev/apt/termux-x11/
Suites: x11
Components: main
Signed-By:
Warning: Could not determine Signed-By for URIs: https://packages-cf.termux.dev/apt/termux-x11/, Suites: x11Edit: gonna have to look into that, we'll probably wanna migrate the repo files. |
Probably, seccomp need to be removed from cmake https://salsa.debian.org/apt-team/apt/-/blob/3.0.0/CMakeLists.txt?ref_type=tags#L137 |
It was missing as a dependency. |
libseccomp is still downloaded in CI and cmake picks it up. |
Yes. I force pushed the branch to fix that. |
|
I'm having some trouble wrapping my head around the new deb822 format for package sources (e.g. repos). If I run # ~$ tree $TERMUX__PREFIX/etc/apt
/data/data/com.termux/files/usr/etc/apt
├── apt.conf.d
│ └── 50apt-file.conf
├── preferences.d
├── sources.list
├── sources.list.bak
├── sources.list.d
│ ├── root.list.bak
│ ├── root.sources
│ ├── termux-main-stable.sources
│ ├── tur.list.bak
│ ├── tur.sources
│ ├── x11.list.bak
│ └── x11.sources
├── sources.list.dpkg-old
├── trusted.gpg
└── trusted.gpg.d
├── 2096779623.gpg -> /data/data/com.termux/files/usr/share/termux-keyring/2096779623.gpg
├── agnostic-apollo.gpg -> /data/data/com.termux/files/usr/share/termux-keyring/agnostic-apollo.gpg
├── grimler.gpg -> /data/data/com.termux/files/usr/share/termux-keyring/grimler.gpg
├── kcubeterm.gpg -> /data/data/com.termux/files/usr/share/termux-keyring/kcubeterm.gpg
├── landfillbaby.gpg -> /data/data/com.termux/files/usr/share/termux-keyring/landfillbaby.gpg
├── mradityaalok.gpg -> /data/data/com.termux/files/usr/share/termux-keyring/mradityaalok.gpg
├── termux-autobuilds.gpg -> /data/data/com.termux/files/usr/share/termux-keyring/termux-autobuilds.gpg
└── tur.gpg
5 directories, 20 filesAnd it's complaining about duplicates and missing Checking availability of current mirror:
[*] https://packages-cf.termux.dev/apt/termux-main: ok
Hit:1 https://turdl.kcubeterm.com tur-packages InRelease
Hit:2 https://packages-cf.termux.dev/apt/termux-main stable InRelease
Hit:3 https://packages-cf.termux.dev/apt/termux-root root InRelease
Hit:4 https://packages-cf.termux.dev/apt/termux-x11 x11 InRelease
All packages are up to date.
Warning: Target Packages (main/binary-aarch64/Packages) is configured multiple times in /data/data/com.termux/files/usr/etc/apt/sources.list:1 and /data/data/com.termux/files/usr/etc/apt/sources.list.d/termux-main-stable.sources:1
Warning: Target Packages (main/binary-all/Packages) is configured multiple times in /data/data/com.termux/files/usr/etc/apt/sources.list:1 and /data/data/com.termux/files/usr/etc/apt/sources.list.d/termux-main-stable.sources:1
Warning: Target Contents-deb (main/Contents-aarch64) is configured multiple times in /data/data/com.termux/files/usr/etc/apt/sources.list:1 and /data/data/com.termux/files/usr/etc/apt/sources.list.d/termux-main-stable.sources:1
Warning: Target Contents-deb (main/Contents-all) is configured multiple times in /data/data/com.termux/files/usr/etc/apt/sources.list:1 and /data/data/com.termux/files/usr/etc/apt/sources.list.d/termux-main-stable.sources:1
Warning: Target Packages (main/binary-aarch64/Packages) is configured multiple times in /data/data/com.termux/files/usr/etc/apt/sources.list:1 and /data/data/com.termux/files/usr/etc/apt/sources.list.d/termux-main-stable.sources:1
Warning: Target Packages (main/binary-all/Packages) is configured multiple times in /data/data/com.termux/files/usr/etc/apt/sources.list:1 and /data/data/com.termux/files/usr/etc/apt/sources.list.d/termux-main-stable.sources:1
Warning: Target Contents-deb (main/Contents-aarch64) is configured multiple times in /data/data/com.termux/files/usr/etc/apt/sources.list:1 and /data/data/com.termux/files/usr/etc/apt/sources.list.d/termux-main-stable.sources:1
Warning: Target Contents-deb (main/Contents-all) is configured multiple times in /data/data/com.termux/files/usr/etc/apt/sources.list:1 and /data/data/com.termux/files/usr/etc/apt/sources.list.d/termux-main-stable.sources:1
Notice: Missing Signed-By in the sources.list(5) entry for 'https://packages-cf.termux.dev/apt/termux-main'
Notice: Missing Signed-By in the sources.list(5) entry for 'https://packages-cf.termux.dev/apt/termux-root'
Notice: Missing Signed-By in the sources.list(5) entry for 'https://packages-cf.termux.dev/apt/termux-x11'
Summary:
Upgrading: 0, Installing: 0, Removing: 0, Not Upgrading: 0 |
|
We'll probably need to change the apt sources handling in:
I'll prep a PR for |
|
That's the repos moved over to |
2ef3a0d to
d45e3d3
Compare
|
Also updated |
|
|
See termux#24212 Fixes x86-64 issues
Historically there was a license incompatibility problem, but that was fixed by the openssl 3.0 relicensing: - FFmpeg/FFmpeg@1d23e12 The apt package has also switched from gnutls to openssl: - https://salsa.debian.org/apt-team/apt/-/merge_requests/412 - Coming in #24212 So it probably makes sense to align on openssl as much as possible, to decrease duplication and behaviour spread.
Historically there was a license incompatibility problem, but that was fixed by the openssl 3.0 relicensing: - FFmpeg/FFmpeg@1d23e12 The apt package has also switched from gnutls to openssl: - https://salsa.debian.org/apt-team/apt/-/merge_requests/412 - Coming in #24212 So it probably makes sense to align on openssl as much as possible, to decrease duplication and behaviour spread.
Historically there was a license incompatibility problem, but that was fixed by the openssl 3.0 relicensing: - FFmpeg/FFmpeg@1d23e12 The apt package has also switched from gnutls to openssl: - https://salsa.debian.org/apt-team/apt/-/merge_requests/412 - Coming in termux/termux-packages#24212 So it probably makes sense to align on openssl as much as possible, to decrease duplication and behaviour spread.
Co-authored-by: Jia Yuan Lo <jylo06g@gmail.com> Co-authored-by: Robert Kirkman <rkirkman@termux.dev> Co-authored-by: Twaik Yont <9674930+twaik@users.noreply.github.com>
Co-authored-by: Jia Yuan Lo <jylo06g@gmail.com>
Co-authored-by: Chongyun Lee <45286352+licy183@users.noreply.github.com> Co-authored-by: Biswapriyo Nath <nathbappai@gmail.com>
Co-authored-by: Robert Kirkman <rkirkman@termux.dev>
|
1 eternity later (or about 3 months standard earth time) I finally have the time and energy to get back to the Apt 3 bump. Not a great sign that I had to regenerate most the This PR is now up to date with cc5c3c1, I tried applying the method used by termux-packages/packages/lux-cli/build.sh Lines 70 to 75 in cc5c3c1
If we can convert it to termux_download_ubuntu_packages though we can drop nettle-dev from scripts/setup-ubuntu.sh.Which I believe would be preferable. Maybe @robertkirkman has some idea what I missed, I reverted out my experimentation with it for now to focus on regenerating patches for the newest apt and dpkg versions.
|
|
@TomJo2000 Sorry for delay, I was doing a lot of things. Here are
|
Currently fails with: