Skip to content
Snippets Groups Projects

Draft: Prepare upload to Galera 26.4.20 to Ubuntu 24.04 "Noble"

Open Otto Kekäläinen requested to merge otto/galera:ubuntu/24.04-noble into ubuntu/24.04-noble
galera-4 (26.4.20-0ubuntu0.24.04.1) noble; urgency=medium

  * New upstream release 26.4.20. Includes multiple bug fixes, see
    https://github.com/codership/documentation/blob/master/release-notes/release-notes-galera-26.4.20.txt
    https://github.com/codership/documentation/blob/master/release-notes/release-notes-galera-26.4.19.txt
    https://github.com/codership/documentation/blob/master/release-notes/release-notes-galera-26.4.18.txt
    https://github.com/codership/documentation/blob/master/release-notes/release-notes-galera-26.4.17.txt
  * Drop build issue patch that was merged into upstream release 20.4.18
  * New upstream signing key 3D53839A70BC938B08CDD47F45460A518DA84635,
    verified from 26.4.17 release notes

There are zero bugs in Ubuntu, so no additional fixes are needed in this release: https://launchpad.net/ubuntu/+source/galera-4

This is a pure upstream minor/micro release bugfix import.

Uploads to Debian unstable and stable-proposed have already been done, and no regressions have been reported so far.

Imported with commands:

(on new ubuntu/24.04-noble branch with gbp.conf etc configured)

± git cherry-pick -x fc471c0f
[ubuntu/24.04-noble 922d736b] New upstream signing key 3D53839A70BC938B08CDD47F45460A518DA84635
 Date: Sat Apr 13 17:19:42 2024 -0700
 1 file changed, 52 insertions(+), 30 deletions(-)
 rewrite debian/upstream/signing-key.asc (94%)

± gbp import-ref --upstream-version=26.4.20
gbp:warning: This script is experimental, it might change incompatibly between versions.
gbp:info: Replacing upstream source on 'ubuntu/24.04-noble'
gbp:info: Running Postimport hook
gbp:info: Successfully imported version 26.4.20

± gbp dch  --commit --commit-msg="Update changelog and refresh patches after %(version)s import" \
>       -- debian
gbp:info: Changelog last touched at 'c5929f4df685c2b3252ed5e5d0205d7d43a4a08b'
gbp:info: Continuing from commit 'c5929f4df685c2b3252ed5e5d0205d7d43a4a08b'
gbp:info: Only looking for changes on 'debian'
gbp:info: Changelog committed for version 26.4.20-0ubuntu0.24.04.1

(dropped patch manually and polished changelog manually)

± while quilt push; do quilt refresh; done; quilt pop -a
Applying patch rename-daemon-user.patch
patching file garb/files/garb.service
patching file garb/files/garb.sh

Now at patch rename-daemon-user.patch
Patch rename-daemon-user.patch is unchanged
Applying patch small_gcache_size_for_salsa.patch
patching file galera/tests/defaults_check.cpp

Now at patch small_gcache_size_for_salsa.patch
Patch small_gcache_size_for_salsa.patch is unchanged
File series fully applied, ends at patch small_gcache_size_for_salsa.patch
Removing patch small_gcache_size_for_salsa.patch
Restoring galera/tests/defaults_check.cpp

Removing patch rename-daemon-user.patch
Restoring garb/files/garb.sh
Restoring garb/files/garb.service

No patches applied

± git citool --amend

Git history view: image

See commits for more details. Due to how GitLab works, the Commits tab shows a large amount of upstream commits which can be disregarded. The version control changes are probably easiest to review locally with the command git difftool --dir-diff ubuntu/26.4.16-2build4:

image

Test builds at https://launchpad.net/~mysql-ubuntu/+archive/ubuntu/mariadb/+builds?build_text=&build_state=all passed:

image

Draft

This is a draft, as it uses an experimental ubuntu branch of Salsa CI in @ahmedsiam's account.

Edited by Otto Kekäläinen

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • added 1 commit

    Compare with previous version

  • added 1 commit

    • 2b4e107a - Salsa CI: Turn off jobs that are irrelevant for stable updates

    Compare with previous version

  • Otto Kekäläinen changed title from Draft: Prepare upload to Galera 26.4.20 to Ubuntu 24.04 "noble" to Draft: Prepare upload to Galera 26.4.20 to Ubuntu 24.04 "Noble"

    changed title from Draft: Prepare upload to Galera 26.4.20 to Ubuntu 24.04 "noble" to Draft: Prepare upload to Galera 26.4.20 to Ubuntu 24.04 "Noble"

  • added 2 commits

    • fa3459f1 - Start new git branch for Ubuntu 24.04 (Noble Numbat) maintenance
    • 27ef45ad - Salsa CI: Update to use Ubuntu 24.04 Noble as RELEASE

    Compare with previous version

  • Otto Kekäläinen added 4882 commits

    added 4882 commits

    • 27ef45ad...99003b4e - 4870 commits from branch mariadb-team:debian/latest
    • 99003b4e...e89a0fbd - 2 earlier commits
    • 63e1ddc1 - Add format conversion checks for C logging interface
    • 6a60ee45 - Fix C logging format errors
    • f12ff7e6 - Improve error and warning messages from Galera library
    • fed86127 - Bump Galera version to 26.4.20
    • 0ca81475 - New upstream version 26.4.20
    • c5929f4d - Start new git branch for Ubuntu 24.04 (Noble Numbat) maintenance
    • b01069b6 - Salsa CI: Update to use Ubuntu 24.04 Noble as RELEASE
    • 922d736b - New upstream signing key 3D53839A70BC938B08CDD47F45460A518DA84635
    • dc356cf3 - Update upstream source from tag 'upstream/26.4.20'
    • 266d94df - Update changelog and refresh patches after 26.4.20-0ubuntu0.24.04.1 import

    Compare with previous version

  • Otto Kekäläinen changed the description

    changed the description

  • Otto Kekäläinen changed the description

    changed the description

  • Otto Kekäläinen mentioned in merge request !27 (merged)

    mentioned in merge request !27 (merged)

  • Otto Kekäläinen mentioned in merge request !26 (closed)

    mentioned in merge request !26 (closed)

  • Otto Kekäläinen mentioned in merge request !24

    mentioned in merge request !24

  • Otto Kekäläinen changed target branch from debian/latest to ubuntu/24.04-noble

    changed target branch from debian/latest to ubuntu/24.04-noble

  • added 1 commit

    • cdeccfbb - Update changelog and refresh patches after 26.4.20 import

    Compare with previous version

  • Otto Kekäläinen mentioned in merge request !23

    mentioned in merge request !23

  • Otto Kekäläinen changed the description

    changed the description

  • I built both old and new Galera version in Debcraft and compared the diffs of the build logs:

    ==> buildinfo.log.last-tagged.diff <==
    --- last-tagged/buildinfo.log	2024-09-07 19:28:35.321367703 +0000
    +++ buildinfo.log	2024-09-07 19:48:53.123973255 +0000
    @@ -2,19 +2,19 @@
     Source: galera-4
     Binary: galera-4 galera-arbitrator-4
     Architecture: amd64
    -Version: 26.4.16-2build4
    +Version: 26.4.20-0ubuntu0.24.04.1
     Checksums-Md5:
    - 3e442fa0132d9b67bfb586ab1cf77b70 736178 galera-4_26.4.16-2build4_amd64.deb
    - 8791fc9fbbe86ac8f457cafdd3891d83 575116 galera-arbitrator-4_26.4.16-2build4_amd64.deb
    + 02944e5cbb88a50c457cf1421cde9b49 741842 galera-4_26.4.20-0ubuntu0.24.04.1_amd64.deb
    + ae5690fcca659071b4dd1ebdaa9add5f 581846 galera-arbitrator-4_26.4.20-0ubuntu0.24.04.1_amd64.deb
     Checksums-Sha1:
    - 21d590efdfed01e1a22bac9e2d6ef79f44a01023 736178 galera-4_26.4.16-2build4_amd64.deb
    - 786fe777bc155746930a08ff6b1f7a0d9447c236 575116 galera-arbitrator-4_26.4.16-2build4_amd64.deb
    + c4c925aebe1598caba05e8961d1daccce39c7043 741842 galera-4_26.4.20-0ubuntu0.24.04.1_amd64.deb
    + 795a633731ceb3ce2fa7d77fa15761964871a277 581846 galera-arbitrator-4_26.4.20-0ubuntu0.24.04.1_amd64.deb
     Checksums-Sha256:
    - 60a1036742f688ebb510c2e0d2592dffdd6afa55e8921eed6cbb6d27d83b74f4 736178 galera-4_26.4.16-2build4_amd64.deb
    - e187d1f2f3df5a98ae93e305bbf4bc742a2d64093850895760617919c443c4e6 575116 galera-arbitrator-4_26.4.16-2build4_amd64.deb
    + cd9f81b75079a8a58922a066249df95e57d59fb7eb2c9e9493b72027d73d2f95 741842 galera-4_26.4.20-0ubuntu0.24.04.1_amd64.deb
    + 24d068e9c3ca9079a4cf22e38023aefffbaa0a118547495849b47babe16f8442 581846 galera-arbitrator-4_26.4.20-0ubuntu0.24.04.1_amd64.deb
     Build-Origin: Ubuntu
     Build-Architecture: amd64
    -Build-Date: Sat, 07 Sep 2024 19:28:27 +0000
    +Build-Date: Sat, 07 Sep 2024 19:48:48 +0000
     Build-Tainted-By:
      merged-usr-via-aliased-dirs
      usr-local-has-programs
    @@ -214,4 +214,4 @@
      DEB_BUILD_OPTIONS="noautodbgsym nocheck parallel=4"
      DEB_BUILD_PROFILES="noudeb"
      LC_CTYPE="C.UTF-8"
    - SOURCE_DATE_EPOCH="1713176083"
    + SOURCE_DATE_EPOCH="1725084695"
    
    ==> changes.log.last-tagged.diff <==
    --- last-tagged/changes.log	2024-09-07 19:28:35.321367703 +0000
    +++ changes.log	2024-09-07 19:48:53.123973255 +0000
    @@ -1,31 +1,38 @@
     Format: 1.8
    -Date: Mon, 15 Apr 2024 11:14:43 +0100
    +Date: Fri, 30 Aug 2024 23:11:35 -0700
     Source: galera-4
     Binary: galera-4 galera-arbitrator-4
     Built-For-Profiles: noudeb
     Architecture: amd64
    -Version: 26.4.16-2build4
    +Version: 26.4.20-0ubuntu0.24.04.1
     Distribution: noble
     Urgency: medium
     Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
    -Changed-By: Colin Watson <cjwatson@ubuntu.com>
    +Changed-By: Otto Kekäläinen <otto@debian.org>
     Description:
      galera-4   - Replication framework for transactional applications
      galera-arbitrator-4 - Galera arbitrator daemon
     Changes:
    - galera-4 (26.4.16-2build4) noble; urgency=medium
    + galera-4 (26.4.20-0ubuntu0.24.04.1) noble; urgency=medium
      .
    -   * No-change rebuild against libssl3t64.
    +   * New upstream release 26.4.20. Includes multiple bug fixes, see
    +     https://github.com/codership/documentation/blob/master/release-notes/release-notes-galera-26.4.20.txt
    +     https://github.com/codership/documentation/blob/master/release-notes/release-notes-galera-26.4.19.txt
    +     https://github.com/codership/documentation/blob/master/release-notes/release-notes-galera-26.4.18.txt
    +     https://github.com/codership/documentation/blob/master/release-notes/release-notes-galera-26.4.17.txt
    +   * Drop build issue patch that was merged into upstream release 20.4.18
    +   * New upstream signing key 3D53839A70BC938B08CDD47F45460A518DA84635,
    +     verified from 26.4.17 release notes
     Checksums-Sha1:
    - 928a396379dda91a20c443c301d0ed111fed4c02 7369 galera-4_26.4.16-2build4_amd64.buildinfo
    - 21d590efdfed01e1a22bac9e2d6ef79f44a01023 736178 galera-4_26.4.16-2build4_amd64.deb
    - 786fe777bc155746930a08ff6b1f7a0d9447c236 575116 galera-arbitrator-4_26.4.16-2build4_amd64.deb
    + 3a55b8ba2a46b51575047e17a18221bfa995f9a1 7432 galera-4_26.4.20-0ubuntu0.24.04.1_amd64.buildinfo
    + c4c925aebe1598caba05e8961d1daccce39c7043 741842 galera-4_26.4.20-0ubuntu0.24.04.1_amd64.deb
    + 795a633731ceb3ce2fa7d77fa15761964871a277 581846 galera-arbitrator-4_26.4.20-0ubuntu0.24.04.1_amd64.deb
     Checksums-Sha256:
    - 911fb952b64ea6d1ded4fc1e5d8faf01d9951c3846ac7b180de8fb229406b141 7369 galera-4_26.4.16-2build4_amd64.buildinfo
    - 60a1036742f688ebb510c2e0d2592dffdd6afa55e8921eed6cbb6d27d83b74f4 736178 galera-4_26.4.16-2build4_amd64.deb
    - e187d1f2f3df5a98ae93e305bbf4bc742a2d64093850895760617919c443c4e6 575116 galera-arbitrator-4_26.4.16-2build4_amd64.deb
    + a942b5c1551e95855146093bd6ed4e749f9a2a39b501c3b7ea04aea5409e103f 7432 galera-4_26.4.20-0ubuntu0.24.04.1_amd64.buildinfo
    + cd9f81b75079a8a58922a066249df95e57d59fb7eb2c9e9493b72027d73d2f95 741842 galera-4_26.4.20-0ubuntu0.24.04.1_amd64.deb
    + 24d068e9c3ca9079a4cf22e38023aefffbaa0a118547495849b47babe16f8442 581846 galera-arbitrator-4_26.4.20-0ubuntu0.24.04.1_amd64.deb
     Files:
    - 02e37c744d9ed1176f31910d01a77eb5 7369 database optional galera-4_26.4.16-2build4_amd64.buildinfo
    - 3e442fa0132d9b67bfb586ab1cf77b70 736178 libs optional galera-4_26.4.16-2build4_amd64.deb
    - 8791fc9fbbe86ac8f457cafdd3891d83 575116 database optional galera-arbitrator-4_26.4.16-2build4_amd64.deb
    + 926bdea406228b3a3d7c814ef7f857ac 7432 database optional galera-4_26.4.20-0ubuntu0.24.04.1_amd64.buildinfo
    + 02944e5cbb88a50c457cf1421cde9b49 741842 libs optional galera-4_26.4.20-0ubuntu0.24.04.1_amd64.deb
    + ae5690fcca659071b4dd1ebdaa9add5f 581846 database optional galera-arbitrator-4_26.4.20-0ubuntu0.24.04.1_amd64.deb
     Original-Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
    
    ==> control.log.last-tagged.diff <==
    --- last-tagged/control.log	2024-09-07 19:28:35.321367703 +0000
    +++ control.log	2024-09-07 19:48:53.123973255 +0000
    @@ -1,9 +1,9 @@
     ==> galera-4/control <==
     Package: galera-4
    -Version: 26.4.16-2build4
    +Version: 26.4.20-0ubuntu0.24.04.1
     Architecture: amd64
     Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
    -Installed-Size: 1843
    +Installed-Size: 1856
     Pre-Depends: adduser
     Depends: libc6 (>= 2.38), libgcc-s1 (>= 3.3.1), libssl3t64 (>= 3.0.0), libstdc++6 (>= 13.1)
     Conflicts: garbd-2, garbd-3, garbd2, garbd3, percona-galera-3, percona-galera-4, percona-xtradb-cluster-galera, percona-xtradb-cluster-galera-2.x, percona-xtradb-cluster-galera-3.x, percona-xtradb-cluster-galera-4.x, percona-xtradb-cluster-garbd-2.x, percona-xtradb-cluster-garbd-3.x
    @@ -24,10 +24,10 @@
     ==> galera-arbitrator-4/control <==
     Package: galera-arbitrator-4
     Source: galera-4
    -Version: 26.4.16-2build4
    +Version: 26.4.20-0ubuntu0.24.04.1
     Architecture: amd64
     Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
    -Installed-Size: 1548
    +Installed-Size: 1561
     Depends: libboost-program-options1.83.0 (>= 1.83.0), libc6 (>= 2.38), libgcc-s1 (>= 3.3.1), libssl3t64 (>= 3.0.0), libstdc++6 (>= 13.1)
     Conflicts: galera-arbitrator-3, garbd-2, garbd2, percona-galera-arbitrator-3, percona-galera-arbitrator-4, percona-xtradb-cluster-garbd-2.x
     Breaks: percona-xtradb-cluster-galera-2.x
    
    ==> lintian.log.last-tagged.diff <==
    --- last-tagged/lintian.log	2024-09-07 19:28:35.321367703 +0000
    +++ lintian.log	2024-09-07 19:48:53.123973255 +0000
    @@ -1,10 +0,0 @@
    -N:
    -E: galera-arbitrator-4: service-file-is-not-a-file [lib/systemd/system/garbd.service]
    -N: 
    -N:   The package contains a service file that is not a regular file or
    -N:   resolvable symlink.
    -N: 
    -N:   Visibility: error
    -N:   Show-Always: no
    -N:   Check: systemd
    -N: 
    Edited by Otto Kekäläinen
  • added 1 commit

    • d96af897 - Add Lintian override to be able to use Lintian in Ubuntu 24.04

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
Please register or sign in to reply
Loading