Bug 51410 - docker.io: merge patches to UCS 5
docker.io: 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
Philipp Hahn
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2020-06-02 17:25 CEST by Florian Best
Modified: 2021-05-25 16:02 CEST (History)
1 user (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:32 CEST
The patches of docker.io have to be cherry-picked and rebased to UCS 5.0.
Comment 1 Florian Best univentionstaff 2020-06-08 15:44:57 CEST
cherry-picked the version from UCS 4.4 which is slightly greater than the one in debian buster:

 *** 18.09.7-0ubuntu1~19.04.4A~4.4.0.201909101118 500
        500 http://updates.knut.univention.de/4.4/maintained 4.4-2/amd64/ Packages
     18.09.1+dfsg1-7.1+deb10u1 500
        500 http://omar.knut.univention.de/build2 ucs_5.0-0/amd64/ Packages

r18956 | Bug #51410: fix fuzzy matching
r18933 | Bug #51410: cherry-pick patches to UCS 5.0

Package: docker.io
Version: 18.09.7-0ubuntu1~19.04.4A~5.0.0.202006081537
Comment 2 Philipp Hahn univentionstaff 2020-06-12 13:25:41 CEST
This is not strictly docker.io related, but the old golang-1.10 was cherry-picked to build docker.io while Debian-10-Buster already has 1.11 and 1.10 is not used anyway:

docker.io/debian/control: Build-Depends: … golang-any (>= 2:1.10~), 

$ grep golang-1.1 source/docker.io_18.09.7-0ubuntu1~19.04.4A~5.0.0.202006081537_amd64.buildinfo 
 golang-1.11-go (= 1.11.6-1+deb10u3),
 golang-1.11-src (= 1.11.6-1+deb10u3),

$ repo_admin.py 
$rm sr
From which source package do you want to remove a revision?
>golang-1.10
Which source revision should be removed> 1.10.4-2ubuntu1
1.10.4-2ubuntu1
Which source revision should be removed> 1.10.4-2ubuntu1
Available: 4.4-0-errata4.4-1, 5.0-0
Selected: 
Select reltag to toggle. 'done' when done> 5.0-0
Available: 4.4-0-errata4.4-1
Selected: 5.0-0
Select reltag to toggle. 'done' when done> done
Removing binary versions
Removing: /var/univention/buildsystem2/apt/ucs_5.0-0/amd64/golang-1.10-go_1.10.4-2ubuntu1A~5.0.0.202006051732_amd64.deb
Removing: /var/univention/buildsystem2/apt/ucs_5.0-0/source/golang-1.10_1.10.4.orig.tar.gz
Removing: /var/univention/buildsystem2/apt/ucs_5.0-0/amd64/golang-1.10-src_1.10.4-2ubuntu1A~5.0.0.202006051732_amd64.deb
Removing: /var/univention/buildsystem2/apt/ucs_5.0-0/source/golang-1.10_1.10.4-2ubuntu1A~5.0.0.202006051732.dsc
Removing: /var/univention/buildsystem2/apt/ucs_5.0-0/all/golang-1.10_1.10.4-2ubuntu1A~5.0.0.202006051732_all.deb
Removing: /var/univention/buildsystem2/apt/ucs_5.0-0/source/golang-1.10_1.10.4-2ubuntu1A~5.0.0.202006051732.debian.tar.xz
Removing: /var/univention/buildsystem2/apt/ucs_5.0-0/all/golang-1.10-doc_1.10.4-2ubuntu1A~5.0.0.202006051732_all.deb


r19049 'Bug #51410: Remove old golang-1.10; Buster has 1.11; used by docker.io' golang-1.10

OK: # SELECT * FROM binpkg WHERE major=5 AND site='apt' AND srcpkg='golang-1.10';
 binpkg | binver | arch | srcpkg | srcver | major | minor | patch | scope | site | maintained | id 
--------+--------+------+--------+--------+-------+-------+-------+-------+------+------------+----
(0 Zeilen)
Comment 3 Philipp Hahn univentionstaff 2020-06-12 17:49:07 CEST
OK: diff -ur docker.io/4.4-0-0-ucs/18.09.7-0ubuntu1~19.04.4-errata4.4-1 docker.io/5.0-0-0-ucs/18.09.7-0ubuntu1~19.04.4
OK: # SELECT * FROM binpkg WHERE major=5 AND site='apt' AND srcpkg='docker.io';
             binpkg              |                    binver                    | arch  |  srcpkg   |                    srcver                    | major | minor | patch | scope | site | maintained |    id    
---------------------------------+----------------------------------------------+-------+-----------+----------------------------------------------+-------+-------+-------+-------+------+------------+----------
 docker-doc                      | 18.09.7-0ubuntu1~19.04.4A~5.0.0.202006081537 | all   | docker.io | 18.09.7-0ubuntu1~19.04.4A~5.0.0.202006081537 |     5 |     0 |     0 |       | apt  |            | 17812969
 golang-docker-dev               | 18.09.7-0ubuntu1~19.04.4A~5.0.0.202006081537 | all   | docker.io | 18.09.7-0ubuntu1~19.04.4A~5.0.0.202006081537 |     5 |     0 |     0 |       | apt  |            | 17812970
 golang-github-docker-docker-dev | 18.09.7-0ubuntu1~19.04.4A~5.0.0.202006081537 | all   | docker.io | 18.09.7-0ubuntu1~19.04.4A~5.0.0.202006081537 |     5 |     0 |     0 |       | apt  |            | 17812971
 vim-syntax-docker               | 18.09.7-0ubuntu1~19.04.4A~5.0.0.202006081537 | all   | docker.io | 18.09.7-0ubuntu1~19.04.4A~5.0.0.202006081537 |     5 |     0 |     0 |       | apt  |            | 17812972
 docker.io                       | 18.09.7-0ubuntu1~19.04.4A~5.0.0.202006081537 | amd64 | docker.io | 18.09.7-0ubuntu1~19.04.4A~5.0.0.202006081537 |     5 |     0 |     0 |       | apt  |            | 17755397
OK: python -m univention.repong.dchdiff -l 1 amd64/docker.io_18.09.7-0ubuntu1~19.04.4A~5.0.0.202006081537_amd64.deb
Comment 4 Florian Best univentionstaff 2021-05-25 16:02:50 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".