rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

Accepting request 931583 from home:dspinella:branches:server:database

Browse Source 
- Revert systemd hardening
  * Remove harden_mariadb.service.patch

OBS-URL: https://build.opensuse.org/request/show/931583
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=285
This commit is contained in:
Danilo Spinella 2021-11-15 15:33:48 +00:00 committed by Git OBS Bridge
parent 6b5e134a25
commit fe2661729b
4 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
harden_mariadb.service.patch
View File

@ -1,21 +0,0 @@
Index: mariadb-10.6.4/support-files/mariadb.service.in
===================================================================
--- mariadb-10.6.4.orig/support-files/mariadb.service.in
+++ mariadb-10.6.4/support-files/mariadb.service.in
@@ -29,6 +29,16 @@ WantedBy=multi-user.target
[Service]
+# added automatically, for details please see
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
+ProtectHostname=true
+ProtectClock=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+# end of automatic additions
##############################################################################
## Core requirements

6
mariadb.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Nov 15 11:02:55 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
- Revert systemd hardening
* Remove harden_mariadb.service.patch
-------------------------------------------------------------------
Fri Nov 12 21:44:03 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>

11
mariadb.service.in
View File

@ -63,17 +63,6 @@ ProtectSystem=full
# Prevent accessing /home, /root and /run/user
ProtectHome=true
# added automatically, for details please see
# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
PrivateDevices=true
ProtectHostname=true
ProtectClock=true
ProtectKernelTunables=true
ProtectKernelModules=true
ProtectKernelLogs=true
ProtectControlGroups=true
RestrictRealtime=true
# end of automatic additions
# Execute pre and post scripts as root, otherwise it does it as User=
PermissionsStartOnly=true

2
mariadb.spec
View File

@ -78,7 +78,6 @@ Patch3: mariadb-10.0.15-logrotate-su.patch
Patch4: mariadb-10.2.4-fortify-and-O.patch
Patch6: mariadb-10.4.12-harden_setuid.patch
Patch7: mariadb-10.4.12-fix-install-db.patch
Patch8: harden_mariadb.service.patch
Patch9: func_math_tests_MDEV-26645.diff
Patch10: fix-pamdir.patch
# needed for bison SQL parser and wsrep API
@ -364,7 +363,6 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
%patch4
%patch6 -p1
%patch7 -p1
%patch8 -p1
%if 0%{?suse_version} > 1500
%ifarch s390x ppc64 ppc64le
%patch9