From e98c432bf4ba32caa41f29610b1fbb7bd0cd3c98 Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Wed, 8 Jan 2020 14:46:02 +0800 Subject: [PATCH] repackaged --- README.md | 39 --------------------------------------- mariadb-server-galera.te | 23 ----------------------- mariadb.spec | 18 ++++-------------- 3 files changed, 4 insertions(+), 76 deletions(-) delete mode 100644 README.md delete mode 100644 mariadb-server-galera.te diff --git a/README.md b/README.md deleted file mode 100644 index 96b5060..0000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# mariadb - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/mariadb-server-galera.te b/mariadb-server-galera.te deleted file mode 100644 index bdce127..0000000 --- a/mariadb-server-galera.te +++ /dev/null @@ -1,23 +0,0 @@ - -module mariadb-server-galera 1.0; - -require { - type mysqld_t; - type rsync_exec_t; - type anon_inodefs_t; - type proc_net_t; - type kerberos_port_t; - class file { read execute execute_no_trans getattr open }; - class tcp_socket { name_bind name_connect }; - class process { setpgid siginh rlimitinh noatsecure }; -} - -# allow mysqld to run rsyncd -allow mysqld_t self:process setpgid; -allow mysqld_t rsync_exec_t:file { read execute execute_no_trans getattr open }; -allow mysqld_t anon_inodefs_t:file getattr; -allow mysqld_t proc_net_t:file { read open }; - -# allow rsyncd to listen on port 4444 -allow mysqld_t kerberos_port_t:tcp_socket { name_bind name_connect }; - diff --git a/mariadb.spec b/mariadb.spec index c6dd079..30d908f 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -2,14 +2,13 @@ Name: mariadb Version: 10.3.9 -Release: 4 +Release: 5 Epoch: 3 Summary: One of the most popular database servers License: GPLv2 with exceptions and LGPLv2 and BSD URL: http://mariadb.org Source0: https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz -Source1: mariadb-server-galera.te BuildRequires: selinux-policy-devel, cmake, gcc-c++ BuildRequires: systemd, systemd-devel, multilib-rpm-config @@ -191,9 +190,6 @@ This contains test suitte for the developing of MariaDB. %autosetup -n %{name}-%{version} -p1 find . -name "*.jar" -type f -exec rm --verbose -f {} \; -mkdir selinux -sed 's/mariadb-server-galera/%{name}-server-galera/' %{SOURCE1} > selinux/%{name}-server-galera.te - pcre_maj=`grep '^m4_define(pcre_major' pcre/configure.ac | sed -r 's/^m4_define\(pcre_major, \[([0-9]+)\]\)/\1/'` pcre_min=`grep '^m4_define(pcre_minor' pcre/configure.ac | sed -r 's/^m4_define\(pcre_minor, \[([0-9]+)\]\)/\1/'` @@ -282,8 +278,6 @@ cmake -L %make_build VERBOSE=1 -make -C selinux -f /usr/share/selinux/devel/Makefile %{name}-server-galera.pp - %install %make_install @@ -315,10 +309,6 @@ rm %{buildroot}%{_libexecdir}/rcmysql rm %{buildroot}%{_tmpfilesdir}/tmpfiles.conf echo "d %{_rundir}/%{name} 0755 mysql mysql -" >>%{buildroot}%{_tmpfilesdir}/%{name}.conf - -install -p -m 644 -D selinux/%{name}-server-galera.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp - - mv %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} ln -s ../../../../../bin/my_safe_process %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process @@ -408,7 +398,6 @@ export MTR_BUILD_THREAD=%{__isa_bits} semanage port -a -t mysqld_port_t -p tcp 4568 &> /dev/null || : semanage port -a -t mysqld_port_t -p tcp 4567 &> /dev/null || : semanage port -a -t mysqld_port_t -p udp 4567 &> /dev/null || : -semodule -i %{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp &> /dev/null || : %post server %systemd_post %{name}.service @@ -555,8 +544,6 @@ fi %{_bindir}/galera_new_cluster %{_bindir}/galera_recovery %{_datadir}/%{name}/systemd/use_galera_new_cluster.conf -%{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp - %files gssapi-server %config(noreplace) %{_sysconfdir}/my.cnf.d/auth_gssapi.cnf @@ -611,6 +598,9 @@ fi %changelog +* Wed Jan 8 2020 openEuler Buildteam - 3:10.3.9-5 +- Repackaged + * Tue Dec 31 2019 openEuler Buildteam - 3:10.3.9-4 - Package rewrap and update the release number -- Gitee