diff --git a/harden_mariadb.service.patch b/harden_mariadb.service.patch deleted file mode 100644 index dbe7d1a..0000000 --- a/harden_mariadb.service.patch +++ /dev/null @@ -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 diff --git a/mariadb.changes b/mariadb.changes index f9598e2..fc2f092 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 15 11:02:55 UTC 2021 - Danilo Spinella + +- Revert systemd hardening + * Remove harden_mariadb.service.patch + ------------------------------------------------------------------- Fri Nov 12 21:44:03 UTC 2021 - Callum Farmer diff --git a/mariadb.service.in b/mariadb.service.in index 21d4d8e..993c6d3 100644 --- a/mariadb.service.in +++ b/mariadb.service.in @@ -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 diff --git a/mariadb.spec b/mariadb.spec index 35e6723..718c401 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -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