summaryrefslogtreecommitdiffstats
path: root/debian/patches/install-files-into-usr.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 12:33:08 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 12:33:08 +0000
commit7e05033f3904808cdd611a9c81c9b0ba30e73acd (patch)
treed31799a885d962cc183a52288c2eae01c682a31c /debian/patches/install-files-into-usr.patch
parentMerging upstream version 1:10.11.7. (diff)
downloadmariadb-7e05033f3904808cdd611a9c81c9b0ba30e73acd.tar.xz
mariadb-7e05033f3904808cdd611a9c81c9b0ba30e73acd.zip
Adding debian version 1:10.11.7-1.debian/1%10.11.7-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/install-files-into-usr.patch')
-rw-r--r--debian/patches/install-files-into-usr.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/debian/patches/install-files-into-usr.patch b/debian/patches/install-files-into-usr.patch
new file mode 100644
index 00000000..29dd6a1f
--- /dev/null
+++ b/debian/patches/install-files-into-usr.patch
@@ -0,0 +1,27 @@
+Forwarded: TODO
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061348
+From: Michael Biebl <biebl@debian.org>
+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(-)
+
+--- a/cmake/install_layout.cmake
++++ b/cmake/install_layout.cmake
+@@ -194,10 +194,10 @@ SET(INSTALL_SUPPORTFILESDIR_DEB
+ 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")
+
+ #