Your message dated Sat, 10 Feb 2024 04:25:35 +0000
with message-id <[email protected]>
and subject line Bug#1061348: fixed in mariadb 1:10.11.7-1
has caused the Debian Bug report #1061348,
regarding mariadb: install PAM modules and systemd unit files into /usr
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1061348: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061348
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: mariadb
Version: 1:10.11.6-2
Severity: normal
Tags: patch
User: [email protected]
Usertags: dep17m2
We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. mariadb installs the following files into /lib:
$ apt-file search -x ^/lib | grep mariadb
mariadb-server:
/lib/systemd/system/[email protected]/use_galera_new_cluster.conf
mariadb-server: /lib/systemd/system/mysql.service
mariadb-server: /lib/systemd/system/mysqld.service
mariadb-server: /lib/x86_64-linux-gnu/security/pam_user_map.so
These should be moved into the respective directories in /usr/
I notice, that some of the systemd unit files are already correctly
installed:
$ apt-file list mariadb-server | grep /usr/lib/systemd
mariadb-server: /usr/lib/systemd/system/mariadb.service
mariadb-server: /usr/lib/systemd/system/mariadb.socket
mariadb-server: /usr/lib/systemd/system/[email protected]
mariadb-server: /usr/lib/systemd/system/[email protected]
This discrepancy is probably a result of some files being installed by
debhelper and some by the upstream build system.
Eventually this would make sense to unify and maybe switch to
dh_installsystemd and a newer compat version.
I tried to keep the changes minimal for this patch though.
Please find it attached. It has been build-tested.
$ dpkg -c mariadb-server_10.11.6-2.1_amd64.deb | grep -E '(systemd|security)'
drwxr-xr-x root/root 0 2024-01-22 22:30 ./etc/security/
-rw-r--r-- root/root 247 2023-11-08 16:46 ./etc/security/user_map.conf
drwxr-xr-x root/root 0 2024-01-22 22:30 ./usr/lib/systemd/
drwxr-xr-x root/root 0 2024-01-22 22:30 ./usr/lib/systemd/system/
-rw-r--r-- root/root 5865 2024-01-22 22:30
./usr/lib/systemd/system/mariadb.service
-rw-r--r-- root/root 571 2024-01-22 22:30
./usr/lib/systemd/system/mariadb.socket
-rw-r--r-- root/root 10007 2024-01-22 22:30
./usr/lib/systemd/system/[email protected]
-rw-r--r-- root/root 578 2024-01-22 22:30
./usr/lib/systemd/system/[email protected]
drwxr-xr-x root/root 0 2024-01-22 22:30
./usr/lib/systemd/system/[email protected]/
-rw-r--r-- root/root 676 2023-11-08 16:46
./usr/lib/systemd/system/[email protected]/use_galera_new_cluster.conf
drwxr-xr-x root/root 0 2024-01-22 22:30
./usr/lib/x86_64-linux-gnu/security/
-rw-r--r-- root/root 14176 2024-01-22 22:30
./usr/lib/x86_64-linux-gnu/security/pam_user_map.so
lrwxrwxrwx root/root 0 2024-01-22 22:30
./usr/lib/systemd/system/mysql.service -> mariadb.service
lrwxrwxrwx root/root 0 2024-01-22 22:30
./usr/lib/systemd/system/mysqld.service -> mariadb.service
Note: this should not be backported to bookworm. If you intend to
backport, please revert this change or use dh_movetousr instead.
If your package will change for the t64 transition or otherwise
rename/split/move its binaries (packages) during trixie, please
then upload to experimental and get in touch with the UsrMerge
driver, please see the wiki [1].
Michael
[1] https://wiki.debian.org/UsrMerge
diff -Nru mariadb-10.11.6/debian/changelog mariadb-10.11.6/debian/changelog
--- mariadb-10.11.6/debian/changelog 2024-01-05 09:32:12.000000000 +0100
+++ mariadb-10.11.6/debian/changelog 2024-01-22 22:30:08.000000000 +0100
@@ -1,3 +1,10 @@
+mariadb (1:10.11.6-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install PAM module and systemd files into /usr. (Closes: #-1)
+
+ -- Michael Biebl <[email protected]> Mon, 22 Jan 2024 22:30:08 +0100
+
mariadb (1:10.11.6-2) unstable; urgency=medium
[ Otto Kekäläinen ]
diff -Nru mariadb-10.11.6/debian/mariadb-server.install
mariadb-10.11.6/debian/mariadb-server.install
--- mariadb-10.11.6/debian/mariadb-server.install 2024-01-04
11:36:14.000000000 +0100
+++ mariadb-10.11.6/debian/mariadb-server.install 2024-01-22
22:27:28.000000000 +0100
@@ -8,10 +8,10 @@
etc/apparmor.d/usr.sbin.mariadbd
etc/logrotate.d/mariadb
etc/security/user_map.conf
-lib/*/security/pam_user_map.so
-[linux-any]
lib/systemd/system/[email protected]/use_galera_new_cluster.conf
-[linux-any] lib/systemd/system/mysql.service
-[linux-any] lib/systemd/system/mysqld.service
+usr/lib/*/security/pam_user_map.so
+[linux-any]
usr/lib/systemd/system/[email protected]/use_galera_new_cluster.conf
+[linux-any] usr/lib/systemd/system/mysql.service
+[linux-any] usr/lib/systemd/system/mysqld.service
usr/bin/aria_chk
usr/bin/aria_dump_log
usr/bin/aria_ftdump
diff -Nru mariadb-10.11.6/debian/mariadb-server.lintian-overrides
mariadb-10.11.6/debian/mariadb-server.lintian-overrides
--- mariadb-10.11.6/debian/mariadb-server.lintian-overrides 2024-01-04
11:36:14.000000000 +0100
+++ mariadb-10.11.6/debian/mariadb-server.lintian-overrides 2024-01-22
22:30:08.000000000 +0100
@@ -9,8 +9,8 @@
# Intentional in-context documentation
package-contains-documentation-outside-usr-share-doc
[usr/share/mysql/errmsg-utf8.txt]
# mysql(d).service are symlinks to mariadb.service, and there is indeed a
init.d/mariadb shipped
-package-supports-alternative-init-but-no-init.d-script
[lib/systemd/system/mysql.service]
-package-supports-alternative-init-but-no-init.d-script
[lib/systemd/system/mysqld.service]
+package-supports-alternative-init-but-no-init.d-script
[usr/lib/systemd/system/mysql.service]
+package-supports-alternative-init-but-no-init.d-script
[usr/lib/systemd/system/mysqld.service]
# Intentionally symlinks mysql->mariadb
-service-file-is-not-a-file [lib/systemd/system/mysql.service]
-service-file-is-not-a-file [lib/systemd/system/mysqld.service]
+service-file-is-not-a-file [usr/lib/systemd/system/mysql.service]
+service-file-is-not-a-file [usr/lib/systemd/system/mysqld.service]
diff -Nru mariadb-10.11.6/debian/not-installed
mariadb-10.11.6/debian/not-installed
--- mariadb-10.11.6/debian/not-installed 2024-01-04 11:36:14.000000000
+0100
+++ mariadb-10.11.6/debian/not-installed 2024-01-22 22:30:08.000000000
+0100
@@ -5,12 +5,12 @@
etc/mysql/mariadb.conf.d/enable_encryption.preset # Debian packaging uses
files from debian/additions/mariadb.cnf.d/
etc/mysql/mariadb.conf.d/mysql-clients.cnf # Debian packaging uses files from
debian/additions/mariadb.cnf.d/
etc/mysql/mariadb.conf.d/server.cnf # Debian packaging uses files from
debian/additions/mariadb.cnf.d/
-lib/systemd/system/mariadb-extra.socket # Installed by rules file
-lib/systemd/system/[email protected] # Installed by rules file
-lib/systemd/system/mariadb.service # Installed by rules file
-lib/systemd/system/[email protected] # Installed by rules file
-lib/systemd/system/mariadb.socket # Installed by rules file
-lib/systemd/system/[email protected] # Installed by rules file
+usr/lib/systemd/system/mariadb-extra.socket # Installed by rules file
+usr/lib/systemd/system/[email protected] # Installed by rules file
+usr/lib/systemd/system/mariadb.service # Installed by rules file
+usr/lib/systemd/system/[email protected] # Installed by rules file
+usr/lib/systemd/system/mariadb.socket # Installed by rules file
+usr/lib/systemd/system/[email protected] # Installed by rules file
usr/bin/mariadb-embedded # Shipping the embedded server in distro packaging
does not make sense
usr/bin/mysql_config # Debian packaging has mysql_config as symlink to
mariadb_config
usr/bin/mysql_embedded # Symlink to mariadb-embedded which is intentionally
not included
diff -Nru mariadb-10.11.6/debian/patches/install-files-into-usr.patch
mariadb-10.11.6/debian/patches/install-files-into-usr.patch
--- mariadb-10.11.6/debian/patches/install-files-into-usr.patch 1970-01-01
01:00:00.000000000 +0100
+++ mariadb-10.11.6/debian/patches/install-files-into-usr.patch 2024-01-22
22:30:08.000000000 +0100
@@ -0,0 +1,31 @@
+From cca521fa52f5d78083b06a6cd232efadb72d8eae Mon Sep 17 00:00:00 2001
+From: Michael Biebl <[email protected]>
+Date: Mon, 22 Jan 2024 22:52:25 +0100
+Subject: [PATCH] Install PAM modules and systemd units into /usr
+
+Since Debian trixie all files need to be installed into their canonical
+location under /usr.
+---
+ cmake/install_layout.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
+index 877b147bc6e..29fbbccddca 100644
+--- a/cmake/install_layout.cmake
++++ b/cmake/install_layout.cmake
+@@ -194,10 +194,10 @@ SET(INSTALL_SUPPORTFILESDIR_DEB "share/mysql")
+ SET(INSTALL_MYSQLDATADIR_DEB "/var/lib/mysql")
+
+ SET(INSTALL_UNIX_ADDRDIR_DEB "/run/mysqld/mysqld.sock")
+-SET(INSTALL_SYSTEMD_UNITDIR_DEB "/lib/systemd/system")
++SET(INSTALL_SYSTEMD_UNITDIR_DEB "/usr/lib/systemd/system")
+ SET(INSTALL_SYSTEMD_SYSUSERSDIR_DEB "/usr/lib/sysusers.d")
+ SET(INSTALL_SYSTEMD_TMPFILESDIR_DEB "/usr/lib/tmpfiles.d")
+-SET(INSTALL_PAMDIR_DEB
"/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/security")
++SET(INSTALL_PAMDIR_DEB
"/usr/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/security")
+ SET(INSTALL_PAMDATADIR_DEB "/etc/security")
+
+ #
+--
+2.43.0
+
diff -Nru mariadb-10.11.6/debian/patches/series
mariadb-10.11.6/debian/patches/series
--- mariadb-10.11.6/debian/patches/series 2024-01-05 09:32:12.000000000
+0100
+++ mariadb-10.11.6/debian/patches/series 2024-01-22 22:30:08.000000000
+0100
@@ -11,3 +11,4 @@
2777-fix-disks-disk-test.patch
2883-subselect-test-failures.patch
2980-riscv-use-rdtime.patch
+install-files-into-usr.patch
--- End Message ---
--- Begin Message ---
Source: mariadb
Source-Version: 1:10.11.7-1
Done: Otto Kekäläinen <[email protected]>
We believe that the bug you reported is fixed in the latest version of
mariadb, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Otto Kekäläinen <[email protected]> (supplier of updated mariadb package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Tue, 06 Feb 2024 20:14:49 -0800
Source: mariadb
Architecture: source
Version: 1:10.11.7-1
Distribution: unstable
Urgency: medium
Maintainer: Debian MySQL Maintainers <[email protected]>
Changed-By: Otto Kekäläinen <[email protected]>
Closes: 1061348
Changes:
mariadb (1:10.11.7-1) unstable; urgency=medium
.
[ Otto Kekäläinen ]
* New upstream version 10.11.7. Includes fixes for several regressions
as noted at https://mariadb.com/kb/en/mariadb-10-11-7-release-notes/
* Add missing ${misc:Depends} to Depends for mariadb-server-10.5
* Re-export upstream signing key without extra signatures
* Remove field Priority on binary package mariadb-server-10.5 that duplicates
source
* Update debian/copyright for 2024
* Delete test plugin pam_mariadb_mtr.so to keep mariadb-test-data clean
* Clean away unused Lintian overrides
* Remove unneeded CMAKE_SYSTEM_PROCESSOR from debian/rules
* Add patch to skip building AUTH_SOCKET on Hurd (Related: #1006531)
* Use Pre-Depends to ensure init-system-helpers is present
.
[ Michael Biebl ]
* Install PAM module and systemd files into /usr (Closes: #1061348)
* Install .service files via .install and let dh_installinit/dh_systemd
generate the maintscript code
* Switch to dh_installsystemd and debhelper compat 13
Checksums-Sha1:
ea85b03cc5ee8a0aa0edd397be69c7100d8a8455 5050 mariadb_10.11.7-1.dsc
55188fb920e24c5f22ab94d609fe46ba81be524a 96991805 mariadb_10.11.7.orig.tar.gz
bfc46f50e3bc85f147726e65e10b00c4e4f3747a 275660 mariadb_10.11.7-1.debian.tar.xz
4e5e3b46aed509213f988a1d9515690d28e63dc9 8973
mariadb_10.11.7-1_source.buildinfo
Checksums-Sha256:
e9a49b51c9e91ee21f8dad36395ee15350a8eb11542d45edfd7fea37990d137b 5050
mariadb_10.11.7-1.dsc
9aa2e3445fadd52524505c8d9c9bd08e4a4f51600b5c2d7933fe18ae6b1c53ca 96991805
mariadb_10.11.7.orig.tar.gz
ab388679841f134c18a87279727a1c09fe072ff236e46576f36b3afee701b2fd 275660
mariadb_10.11.7-1.debian.tar.xz
aba6a969445cdb43070610f6d54d042659f9fefee33bfe198162286966929147 8973
mariadb_10.11.7-1_source.buildinfo
Files:
84dd1cdf7787754aa270d2024a875b64 5050 database optional mariadb_10.11.7-1.dsc
2987250d26f39c02443051569ee2385e 96991805 database optional
mariadb_10.11.7.orig.tar.gz
392b6dd8d877b865f2db02d910c4ca1f 275660 database optional
mariadb_10.11.7-1.debian.tar.xz
9903f1584d4a35022e3d61404e204657 8973 database optional
mariadb_10.11.7-1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEmbRSsR88dMO0U+RvvthEn87o2ogFAmXG4jIACgkQvthEn87o
2ojp9w//Sp4x2U3nb6jYo5QPEpx0DTKYKvej0+ZW1lnkC1Nb9r7+xBDNfoxuvH9m
21Xp0P71yGONEKyzNSYYbi5mxkI/AsLawJPs4NpJeSzNQ9B4RmyyMeRYWv8EPkzS
yzbwjwYbk3VJ7ycndEt29YYs9JIziAduiwhcxAn53iXqI5CCsNbcSc6ieu4raI8C
+QMrR8cy7srvEcvTBwFkiiIkCM0ZTtJwfjiAtjB+fThvd5TmoMOO3URJ2IktgBvg
dQipQ9sBe7Azukl/0qeL9ZVJOiXF9z6Od9m3Ov3upPt5nZjAHchgT6oD2rJ3W/1Y
9bVENF882oBvCjy8Yhq4bvPM3BvFm7tR0QCa8h3YTLAMrEY1P+S/B4U3RFUB4nIE
6kDazLJdgrqyhB8GZTpzwbL6dUDai6lE8DeEyCPeY7ikaRhre0AmermCkaR3yWsW
LrgSYMvk9rORh8V7d0ALgOTbh5BVyWWjo+k1SRB88sU8n9UfndydWxBsqHuEwvCJ
No9S0bbeqaMkgI4I/MC0yNuDi0ojxWYuR5s+ZXtm7ZpWHxpqa6LGrpc/LiDeZySB
G/A/Qg46R11oRcSlJ7+M0N7tbNPhxJuSwVqhmCXe4Nxylvr3D7hcSoDVIVS1YCb5
ROKZPrCNBlKU65oBjP4s76KoSAGawi/JBthORGBpVTqZk6TG9JM=
=hQkg
-----END PGP SIGNATURE-----
--- End Message ---
