Skip to content

Prepare MariaDB Server 1:11.4.4-1 minor maintenance release for Debian unstable

Otto Kekäläinen requested to merge otto/mariadb-server:dev-otto into debian/latest

Similar to !93 (merged), !69 (merged) and !59 (merged), this Merge Request contains the import of a new upstream version of MariaDB.

Do not review merge commits or upstream commits, but focus on the ones that are made only on the proposed debian/latest branch update in this MR:

git log --first-parent --reverse --format='format:* %C(yellow)%h%C(reset) %s' origin/debian/latest...

  • 62dd4734 Update upstream source from tag 'upstream/11.4.4'
  • 0a5abea3 Update changelog and refresh patches after 11.4.4 import
  • 7104a2ce Update Lintian overrides for libmariadb-dev regarding man page syntax
  • 68f12455 Add patch to fix Lintian nag about spelling of 'allows one to'
  • e2851fcf Update server trace to include new parameters and values
  • e1c9861e Salsa CI: Temporarily allow Buster and Bullseye upgrade tests to fail
  • e1c657db Apply debputy reformat --style black
  • a67b79d5 Allow use of patched libfmt-dev with thousands separator fixed
  • 11e68629 Update changelog for 1:11.4.4-1 release

See also the debian/changelog.

This import was done essentially by running these commands:

# Create the patch branch so that it is later easy to rebase
gbp pq rebase
# Switch back to branch debian/latest
gbp pq switch
# Get upstream tags as gbp-import-orig will need them
git fetch --verbose upstreamvcs --tags
# Get upstream tarball and do the import
gbp import-orig --uscan
# Commit what we have a this point
gbp dch --distribution=UNRELEASED --commit --commit-msg="Update changelog and refresh patches after %(version)s import" -- debian
# With all changes comitted, rebase patches
gbp pq rebase
# One patch failed to apply. After investigating decided correct solution is to drop it.
git rebase --skip
# Export patches back to debian/patches and switch branch to debian/latest
gbp pq export
# Commit refreshed patches
git commit -a --amend
# Review upstream changes in case anything needs to be cherry-picked
git difftool --dir-diff mariadb-11.4.3..mariadb-11.4.4 -- debian/ &
# Build locally
debcraft build
# Local build passed, build remotely
DEBCRAFT_PPA=ppa:mysql-ubuntu/mariadb debcraft release --clean
# Push new branches to my own fork
gbp push --verbose otto
# Switch to my development branch to avoid accidentally pushing debian/latest to the real repository
git checkout dev-otto
git rebase -i debian/latest
# Push to my fork
git push -fv otto
# ..and then open this MR

I did not identify any bugs at https://bugs.debian.org/cgi-bin/pkgreport.cgi?repeatmerged=no&src=mariadb that the new upstream would close, thus I did not add any new Closes: entries.

I did not spot any new CVEs at https://mariadb.com/kb/en/security/ that would apply for this version, thus there are no CVE entries in the changelog either. Neither did I spot in https://mariadb.com/kb/en/mariadb-11-4-4-release-notes/ anything else that would require changes in the Debian packaging, nor otherwise be highlighted.

Note also test builds on multiple architectures at https://launchpad.net/~mysql-ubuntu/+archive/ubuntu/mariadb/+builds?build_text=&build_state=all

Diffs from Debcraft that compare the Lintian logs, file lists etc of this commit to the build of the previous upload did not show any new changes that would require Debian packaging changes.

Edited by Otto Kekäläinen

Merge request reports