Bug 51407 - apt: merge patches to UCS 5
apt: merge patches to UCS 5
Status: CLOSED FIXED
Product: UCS
Classification: Unclassified
Component: General
UCS 5.0
Other Linux
: P5 normal (vote)
: UCS 5.0
Assigned To: Florian Best
Sönke Schwardt-Krummrich
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2020-06-02 17:25 CEST by Florian Best
Modified: 2021-05-25 16:03 CEST (History)
3 users (show)

See Also:
What kind of report is it?: Development Internal
What type of bug is this?: ---
Who will be affected by this bug?: ---
How will those affected feel about the bug?: ---
User Pain:
Enterprise Customer affected?:
School Customer affected?:
ISV affected?:
Waiting Support:
Flags outvoted (downgraded) after PO Review:
Ticket number:
Bug group (optional):
Max CVSS v3 score:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Florian Best univentionstaff 2020-06-02 17:25:16 CEST
The patches of apt have to be cherry-picked and rebased to UCS 5.0.
Comment 1 Florian Best univentionstaff 2020-06-02 18:03:57 CEST
11-silence-warning.patch: Bug #9475:
New code to that if-block was vastly added.
Maybe the patch is obsolete? Or I suggest to patch just the if-call to "if (false)"
Comment 2 Florian Best univentionstaff 2020-06-03 10:54:24 CEST
r18944 | Bug #51407: rebase patches
r18930 | Bug #51407: cherry-pick patches to UCS 5.0

Package: apt
Version: 1.8.2A~5.0.0.202006021808
Comment 3 Philipp Hahn univentionstaff 2020-06-09 15:03:08 CEST
Please drop apt/5.0-0-0-ucs/1.8.2/01-fix-ftbfs.patch
Comment 4 Florian Best univentionstaff 2020-06-09 18:20:06 CEST
OK, dropped:

Package: apt
Version: 1.8.2A~5.0.0.202006091707
Comment 5 Sönke Schwardt-Krummrich univentionstaff 2020-06-10 14:35:32 CEST
$ grep univention-archive-key-ucs-4x.gpg apt/5.0-0-0-ucs/1.8.2/13-use-ucs-keyring.patch 
+<!ENTITY keyring-filename "<filename>/usr/share/keyrings/univention-archive-key-ucs-4x.gpg</filename>">

Do we have to adopt to the new keyring right now or is the new keyring not yet available/in use?
Comment 6 Arvid Requate univentionstaff 2020-06-11 12:00:58 CEST
univention-archive-key now installs the keyring to /etc/apt/trusted.gpg.d/ instead,
(Bug 51250 Comment 3). As far as I see, the "keyring-filename" configured by patch 13-use-ucs-keyring.patch ends up in /usr/bin/apt-key to define 'ARCHIVE_KEYRING', which is used as default for 'apt-key update', which states that it's deprecated. So, I'm not sure if this patch is required any longer at all, but I didn't check all the things it touches.
Comment 7 Florian Best univentionstaff 2020-06-11 12:06:54 CEST
r19034 | Bug #51407: use UCS 5.x archive signing key

Package: apt
Version: 1.8.2A~5.0.0.202006111148
Comment 8 Sönke Schwardt-Krummrich univentionstaff 2020-06-12 17:01:26 CEST
OK: apt/5.0-0-0-ucs/1.8.2/10_ignore_debian.patch
apt/5.0-0-0-ucs/1.8.2/11-silence-warning.patch
apt/5.0-0-0-ucs/1.8.2/13-use-ucs-keyring.patch
OK: diff -ur apt/4.4-0-0-ucs/1.4.10-errata4.4-4/ apt/5.0-0-0-ucs/1.8.2/
python -m univention.repong.dchdiff -l 1 amd64/apt_1.8.2A~5.0.0.202006111148_amd64.deb

OK
        binpkg         |          binver           | arch  | srcpkg |          srcver           | major | minor | patch | scope | site | maintained |    id    
-----------------------+---------------------------+-------+--------+---------------------------+-------+-------+-------+-------+------+------------+----------
 apt-doc               | 1.8.2A~5.0.0.202006111148 | all   | apt    | 1.8.2A~5.0.0.202006111148 |     5 |     0 |     0 |       | apt  |            | 17726809
 apt-transport-https   | 1.8.2A~5.0.0.202006111148 | all   | apt    | 1.8.2A~5.0.0.202006111148 |     5 |     0 |     0 |       | apt  |            | 17726810
 libapt-pkg-doc        | 1.8.2A~5.0.0.202006111148 | all   | apt    | 1.8.2A~5.0.0.202006111148 |     5 |     0 |     0 |       | apt  |            | 17726811
 apt-dbgsym            | 1.8.2A~5.0.0.202006111148 | amd64 | apt    | 1.8.2A~5.0.0.202006111148 |     5 |     0 |     0 |       | apt  |            | 17755476
 apt-utils-dbgsym      | 1.8.2A~5.0.0.202006111148 | amd64 | apt    | 1.8.2A~5.0.0.202006111148 |     5 |     0 |     0 |       | apt  |            | 17755477
 apt-utils             | 1.8.2A~5.0.0.202006111148 | amd64 | apt    | 1.8.2A~5.0.0.202006111148 |     5 |     0 |     0 |       | apt  |            | 17755478
 apt                   | 1.8.2A~5.0.0.202006111148 | amd64 | apt    | 1.8.2A~5.0.0.202006111148 |     5 |     0 |     0 |       | apt  |            | 17755479
 libapt-inst2.0-dbgsym | 1.8.2A~5.0.0.202006111148 | amd64 | apt    | 1.8.2A~5.0.0.202006111148 |     5 |     0 |     0 |       | apt  |            | 17755480
 libapt-inst2.0        | 1.8.2A~5.0.0.202006111148 | amd64 | apt    | 1.8.2A~5.0.0.202006111148 |     5 |     0 |     0 |       | apt  |            | 17755481
 libapt-pkg-dev        | 1.8.2A~5.0.0.202006111148 | amd64 | apt    | 1.8.2A~5.0.0.202006111148 |     5 |     0 |     0 |       | apt  |            | 17755482
 libapt-pkg5.0-dbgsym  | 1.8.2A~5.0.0.202006111148 | amd64 | apt    | 1.8.2A~5.0.0.202006111148 |     5 |     0 |     0 |       | apt  |            | 17755483
 libapt-pkg5.0         | 1.8.2A~5.0.0.202006111148 | amd64 | apt    | 1.8.2A~5.0.0.202006111148 |     5 |     0 |     0 |       | apt  |            | 17755484
Comment 9 Florian Best univentionstaff 2021-05-25 16:03:36 CEST
UCS 5.0 has been released:
 https://docs.software-univention.de/release-notes-5.0-0-en.html
 https://docs.software-univention.de/release-notes-5.0-0-de.html

If this error occurs again, please use "Clone This Bug".