Skip to content

Commit

Permalink
Revert "MDEV-33636: RPM caps is on mariadbd exe"
Browse files Browse the repository at this point in the history
This was the orginal implementation that reverted with a bunch of
commits.

This reverts commit a13e521.

Revert "cmake: append to the array correctly"
This reverts commit 51e3f1d.

Revert "build failure with cmake < 3.10"
This reverts commit 49cf702.

Revert "MDEV-33301 memlock with systemd still not working"
This reverts commit 8a1904d.
  • Loading branch information
grooverdan committed Mar 27, 2024
1 parent 987a266 commit ee2ed1a
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 38 deletions.
8 changes: 0 additions & 8 deletions cmake/cpack_rpm.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ SET(CPACK_RPM_server_USER_FILELIST
"%config(noreplace) ${INSTALL_SYSCONF2DIR}/*"
"%config(noreplace) ${INSTALL_SYSCONFDIR}/logrotate.d/mysql"
)

SET(CPACK_RPM_common_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONFDIR}/my.cnf")
SET(CPACK_RPM_shared_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*")
SET(CPACK_RPM_client_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*")
Expand All @@ -180,13 +179,6 @@ MACRO(SETA var)
ENDFOREACH()
ENDMACRO(SETA)

IF (CMAKE_VERSION VERSION_GREATER 3.10.0)
# cmake bug #14362
SET(CPACK_RPM_server_USER_FILELIST ${CPACK_RPM_server_USER_FILELIST}
"%caps(cap_ipc_lock=pe) %{_sbindir}/mariadbd"
)
ENDIF()

SETA(CPACK_RPM_client_PACKAGE_OBSOLETES
"mysql-client"
"MySQL-client"
Expand Down
26 changes: 0 additions & 26 deletions debian/mariadb-server-core-10.5.postinst

This file was deleted.

1 change: 0 additions & 1 deletion support-files/policy/apparmor/usr.sbin.mysqld
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

capability chown,
capability dac_override,
capability ipc_lock,
capability setgid,
capability setuid,
capability sys_rawio,
Expand Down
4 changes: 1 addition & 3 deletions support-files/policy/selinux/mariadb-server.te
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ require {
class lnk_file read;
class process { getattr signull };
class unix_stream_socket connectto;
class capability { ipc_lock sys_resource sys_nice };
class capability { sys_resource sys_nice };
class tcp_socket { name_bind name_connect };
class file { execute setattr read create getattr execute_no_trans write ioctl open append unlink };
class sock_file { create unlink getattr };
Expand Down Expand Up @@ -87,8 +87,6 @@ allow mysqld_t bin_t:file { getattr read execute open execute_no_trans ioctl };

# MariaDB additions
allow mysqld_t self:process setpgid;
allow mysqld_t self:capability { ipc_lock };

# This rule allows port tcp/4444
allow mysqld_t kerberos_port_t:tcp_socket { name_bind name_connect };
# This rule allows port tcp/4567 (tram_port_t may not be available on
Expand Down

0 comments on commit ee2ed1a

Please sign in to comment.