Hello community,
here is the log from the commit of package mariadb for openSUSE:Factory checked
in at 2020-08-06 17:30:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mariadb (Old)
and /work/SRC/openSUSE:Factory/.mariadb.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb"
Thu Aug 6 17:30:18 2020 rev:100 rq:824288 version:10.4.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2020-06-11
14:43:51.417234797 +0200
+++ /work/SRC/openSUSE:Factory/.mariadb.new.3399/mariadb.changes
2020-08-06 17:30:45.521075153 +0200
@@ -1,0 +2,6 @@
+Mon Aug 3 07:49:32 UTC 2020 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Fix installed .service files to follow the /usr/lib ->
+ /usr/libexec move (boo#1174811).
+
+-------------------------------------------------------------------
Old:
----
mariadb.service
mariadb@.service
New:
----
mariadb.service.in
mari...@.service.in
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb.spec ++++++
--- /var/tmp/diff_new_pack.1umOTO/_old 2020-08-06 17:30:50.337076339 +0200
+++ /var/tmp/diff_new_pack.1umOTO/_new 2020-08-06 17:30:50.341076340 +0200
@@ -65,10 +65,10 @@
Source7: README.install
Source12: mysql-user.conf
Source14: my.ini
-Source15: mariadb.service
+Source15: mariadb.service.in
Source16: mariadb.target
Source17: mysql-systemd-helper
-Source18: mariadb@.service
+Source18: mari...@.service.in
Source19: macros.mariadb-test
Source50: suse_skipped_tests.list
Source51: mariadb-rpmlintrc
@@ -627,8 +627,8 @@
ln -sf service '%{buildroot}'%{_sbindir}/rcmysql
ln -sf service '%{buildroot}'%{_sbindir}/rcmariadb
rm -rf '%{buildroot}'%{_sysconfdir}/init.d
-install -D -m 644 %{_sourcedir}/mariadb.service
'%{buildroot}'%{_unitdir}/mariadb.service
-install -D -m 644 %{_sourcedir}/mariadb@.service
'%{buildroot}'%{_unitdir}/mariadb@.service
+sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{_sourcedir}/mariadb.service.in >
'%{buildroot}'%{_unitdir}/mariadb.service
+sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{_sourcedir}/mari...@.service.in >
'%{buildroot}'%{_unitdir}/mariadb@.service
install -D -m 644 %{_sourcedir}/mariadb.target
'%{buildroot}'%{_unitdir}/mariadb.target
# Aliases for the backward compatibility. Create symlinks from the alias to
the existing one
# We can't use 'Alias=' option only because it's effective only when the unit
is enabled
++++++ mariadb.service.in ++++++
# It's not recommended to modify this unit file because your changes
# would be overwritten during the package update.
#
# However, there are 2 methods how to customize this unit file:
#
# 1) Copy this unit file from /usr/lib/systemd/system to
# /etc/systemd/system and modify the chosen settings.
#
# 2) Create a directory named mariadb.service.d/ within /etc/systemd/system
# and place a drop-in file name.conf there that only changes the specific
# settings one is interested in.
#
# see systemd.unit(5) for details
#
# Example - increasing of the TimeoutSec= limit
# mkdir /etc/systemd/system/mariadb.service.d
# cat > /etc/systemd/system/mariadb.service.d/timeout.conf << EOF
# [Service]
# TimeoutSec=600
# EOF
[Unit]
Description=MariaDB database server
Documentation=man:mysqld(8)
Documentation=https://mariadb.com/kb/en/library/systemd/
Wants=basic.target
Conflicts=mariadb.target
After=basic.target network.target
[Install]
WantedBy=multi-user.target
Alias=mysql.service
[Service]
ExecStartPre=@LIBEXECDIR@/mysql/mysql-systemd-helper install
ExecStartPre=@LIBEXECDIR@/mysql/mysql-systemd-helper upgrade
ExecStart=@LIBEXECDIR@/mysql/mysql-systemd-helper start
Type=notify
User=mysql
Group=mysql
KillSignal=SIGTERM
# Don't want to see an automated SIGKILL ever
SendSIGKILL=no
# Restart crashed server only, on-failure would also restart, for example, when
# my.cnf contains unknown option
Restart=on-abort
RestartSec=5s
# Configures the time to wait for start-up/stop
TimeoutSec=300
# CAP_IPC_LOCK To allow memlock to be used as non-root user
# CAP_DAC_OVERRIDE To allow auth_pam_tool (which is SUID root) to read
/etc/shadow when it's chmod 0
# does nothing for non-root, not needed if /etc/shadow is u+r
# CAP_AUDIT_WRITE auth_pam_tool needs it on Debian for whatever reason
CapabilityBoundingSet=CAP_IPC_LOCK CAP_DAC_OVERRIDE CAP_AUDIT_WRITE
# Prevent writes to /usr, /boot, and /etc
ProtectSystem=full
# Prevent accessing /home, /root and /run/user
ProtectHome=true
# Execute pre and post scripts as root, otherwise it does it as User=
PermissionsStartOnly=true
UMask=007
++++++ mari...@.service.in ++++++
# It's not recommended to modify this unit file because your changes
# would be overwritten during the package update.
#
# However, there are 2 methods how to customize this unit file:
#
# 1) Copy this unit file from /usr/lib/systemd/system to
# /etc/systemd/system and modify the chosen settings.
#
# 2) Create a directory named mariadb.service.d/ within /etc/systemd/system
# and place a drop-in file name.conf there that only changes the specific
# settings one is interested in.
#
# see systemd.unit(5) for details
#
# Example - increasing of the TimeoutSec= limit
# mkdir /etc/systemd/system/mariadb.service.d
# cat > /etc/systemd/system/mariadb.service.d/timeout.conf << EOF
# [Service]
# TimeoutSec=600
# EOF
[Unit]
Description=MariaDB database server - %I instance
Documentation=man:mysqld(8)
Documentation=https://mariadb.com/kb/en/library/systemd/
Wants=basic.target
PartOf=mariadb.target
After=basic.target network.target
[Install]
WantedBy=multi-user.target
Alias=mysql.service
[Service]
ExecStartPre=@LIBEXECDIR@/mysql/mysql-systemd-helper install %i
ExecStartPre=@LIBEXECDIR@/mysql/mysql-systemd-helper upgrade %i
ExecStart=@LIBEXECDIR@/mysql/mysql-systemd-helper start %i
Type=notify
User=mysql
Group=mysql
KillSignal=SIGTERM
# Don't want to see an automated SIGKILL ever
SendSIGKILL=no
# Restart crashed server only, on-failure would also restart, for example, when
# my.cnf contains unknown option
Restart=on-abort
RestartSec=5s
# Configures the time to wait for start-up/stop
TimeoutSec=300
# CAP_IPC_LOCK To allow memlock to be used as non-root user
# CAP_DAC_OVERRIDE To allow auth_pam_tool (which is SUID root) to read
/etc/shadow when it's chmod 0
# does nothing for non-root, not needed if /etc/shadow is u+r
# CAP_AUDIT_WRITE auth_pam_tool needs it on Debian for whatever reason
CapabilityBoundingSet=CAP_IPC_LOCK CAP_DAC_OVERRIDE CAP_AUDIT_WRITE
# Prevent writes to /usr, /boot, and /etc
ProtectSystem=full
# Prevent accessing /home, /root and /run/user
ProtectHome=true
# Execute pre and post scripts as root, otherwise it does it as User=
PermissionsStartOnly=true
UMask=007
