From 1450841692f3b7c4f22c34201b9e478ed715222c Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 11 May 2021 21:17:01 +0200 Subject: [PATCH] Update RPMLint whitelist; fix RPMLint findings Cherry-picked from Fedora: https://src.fedoraproject.org/rpms/mariadb/c/2e03a737bb8c76caaf9783b29fc2a537568a8a6b?branch=rawhide Related: #1971248 --- mariadb.rpmlintrc | 18 ++++++++++++++++-- mariadb.spec | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/mariadb.rpmlintrc b/mariadb.rpmlintrc index 09130ab..ff69b0e 100644 --- a/mariadb.rpmlintrc +++ b/mariadb.rpmlintrc @@ -6,7 +6,7 @@ # Spelling errors -addFilter(r'spelling-error .* en_US (cnf|mysqld|benchmarking|pam|passwordless|subpackage|libmariadb) ') +addFilter(r'spelling-error .* en_US (cnf|mysqld|benchmarking|pam|passwordless|subpackage|libmariadb|mariadbd) ') # Debugsource addFilter(r'^mariadb.*debugsource\.[^:]+: (E|W): no-documentation') @@ -33,6 +33,9 @@ addFilter(r'no-manual-page-for-binary') addFilter(r'obsolete-not-provided MySQL') # Provided by mariadb-connector-c addFilter(r'obsolete-not-provided mariadb-libs') +# Upstream dropped support +addFilter(r'obsolete-not-provided mariadb-bench') +addFilter(r'obsolete-not-provided mariadb-tokudb-engine') # Config file without noreplace flag # Don't replace logs that may contain old entries @@ -55,11 +58,22 @@ addFilter(r'non-executable-script /usr/bin/wsrep_sst_common 644 None') addFilter(r'non-executable-script /usr/libexec/mariadb-scripts-common 644 /bin/sh') # Seems pretty standard to me ... addFilter(r'non-standard-dir-perm /var/log/mariadb 750') +# 640 is IMO also prety OK +addFilter(r'non-readable /etc/sysconfig/clustercheck 640') # Unversioned bundles # RocksDB has so rapid developement, it it not compatible through versions. # That means we need to stick to the exact verison upstream use. -addFilter(r'unversioned-explicit-provides bundled(rocksdb)') +addFilter(r'unversioned-explicit-provides bundled\(rocksdb\)') # Testsuite errors addFilter(r'non-executable-script /usr/share/mysql-test') +addFilter(r'arch-dependent-file-in-usr-share /usr/share/mysql-test') + +# Comments at the end of RPM %endif tags +addFilter(r'extra tokens at the end of %endif directive') + +# PAM plugin specialities - all expected +addFilter(r'non-conffile-in-etc /etc/security/user_map.conf') +addFilter(r'setuid-binary /usr/lib64/mariadb/plugin/auth_pam_tool_dir/auth_pam_tool') +addFilter(r'non-standard-executable-perm /usr/lib64/mariadb/plugin/auth_pam_tool_dir/auth_pam_tool') diff --git a/mariadb.spec b/mariadb.spec index fd2520e..681614f 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -596,7 +596,7 @@ This plugin includes support for Kerberos on Unix. Summary: PAM authentication plugin for the MariaDB server Requires: %{name}-server%{?_isa} = %{sameevr} -# This subpackage NEED the 'mysql' user/group (created during mariadb-server %pre) to be available prior installation +# This subpackage NEED the 'mysql' user/group (created during mariadb-server %%pre) to be available prior installation Requires(pre): %{name}-server%{?_isa} = %{sameevr} BuildRequires: pam-devel