Deb: Cleanup and document

- Remove unnecessary unused files
- Remove duplicate encryption configuration sample from sources and
  re-use the identical file in RPM directory instead
- Clean away harmful "default-character-set = utf8mb4" from client config
  as it is unnecassary (server enforces utf8mb4 anyway by default) and
  could cause issues with mysqlbinlog and other tools (MDEV-22981).
- Update S3 plugin description to be long enough
- Remove trailing whitespace from support-files and Debian packaging.
- Clean away fixed Lintian issues
- Clean away temporary Salsa-CI fixes now that 10.5.4 is out and is fixed
- Apply wrap-and-sort -a -v

debian/additions/Docs__Images__Makefile.in

-all:
-
-distclean:
-	-rm -f Makefile
-
-.PHONY: all distclean clean install check

debian/additions/Docs__Makefile.in

-all:
-
-distclean:
-	-rm -f Makefile
-
-.PHONY: all distclean clean install check

debian/additions/enable_encryption.preset

-#
-# !include this file into your my.cnf (or any of *.cnf files in /etc/mysql/conf.d)
-# and it will enable data at rest encryption. This is a simple way to
-# ensure that everything that can be encrypted will be and your
-# data will not leak unencrypted.
-#
-# DO NOT EDIT THIS FILE! On MariaDB upgrades it might be replaced with a
-# newer version and your edits will be lost. Instead, add your edits
-# to the .cnf file after the !include directive.
-#
-# NOTE that you also need to install an encryption plugin for the encryption
-# to work. See https://mariadb.com/kb/en/mariadb/data-at-rest-encryption/#encryption-key-management
-#
-[mariadb]
-aria-encrypt-tables
-encrypt-binlog
-encrypt-tmp-disk-tables
-encrypt-tmp-files
-loose-innodb-encrypt-log
-loose-innodb-encrypt-tables

debian/additions/mariadb.cnf

 # The MariaDB configuration file
 #
 # The MariaDB/MySQL tools read configuration files in the following order:
+# 0. "/etc/mysql/my.cnf" symlinks to this file, reason why all the rest is read.
 # 1. "/etc/mysql/mariadb.cnf" (this file) to set global defaults,
 # 2. "/etc/mysql/conf.d/*.cnf" to set global options.
 # 3. "/etc/mysql/mariadb.conf.d/*.cnf" to set MariaDB-only options.
@@ -17,9 +18,9 @@
 # use it for options that affect everything
 #
 [client-server]
-
+# Port or socket location where to connect
+# port = 3306
 socket = /run/mysqld/mysqld.sock
-#port                   = 3306
 
 # Import all .cnf files from configuration directory
 !includedir /etc/mysql/conf.d/

debian/additions/mariadb.conf.d/50-client.cnf

@@ -4,9 +4,6 @@
 #
 
 [client]
-# Default is Latin1, if you need UTF-8 set this (also in server section)
-# default-character-set = utf8mb4
-
 # Example of client certificate usage
 # ssl-cert=/etc/mysql/client-cert.pem
 # ssl-key=/etc/mysql/client-key.pem

debian/additions/mariadb.conf.d/99-enable-encryption.cnf.preset

+../../../support-files/rpm/enable_encryption.preset
\ No newline at end of file

debian/control

@@ -637,8 +637,10 @@ Depends: libcurl4,
          mariadb-server-10.5 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Description: S3 storage engine for MariaDB
- Read only table stored in S3.
+Description: Amazon S3 archival storage engine for MariaDB
+ The S3 storage engine allows one to archive MariaDB tables in Amazon S3 (or any
+ third-party public or private cloud that implements S3 API), but still have
+ them accessible in MariaDB in read-only mode.
 
 Package: mariadb-plugin-rocksdb
 Architecture: amd64 arm64 mips64el ppc64el

debian/salsa-ci.yml

@@ -73,7 +73,6 @@ autopkgtest:
 piuparts:
   extends: .test-piuparts
   stage: test extras
-  allow_failure: true
 
 blhc:
   extends: .test-blhc
@@ -84,11 +83,9 @@ blhc:
 
 lintian:
   extends: .test-lintian
-  allow_failure: true
 
 missing-breaks:
   extends: .test-missing-breaks
-  allow_failure: true
 
 # In addition to Salsa-CI, also run these fully MariaDB specific build jobs
 
@@ -124,7 +121,6 @@ fresh install:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mariadb-10.3.x to mariadb-10.5.y upgrade:
   stage: upgrade in Sid
@@ -165,7 +161,6 @@ mariadb-10.3.x to mariadb-10.5.y upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mariadb-10.3.x buster to mariadb-10.5 upgrade:
   stage: upgrade from Buster/Stretch/Jessie
@@ -210,7 +205,6 @@ mariadb-10.3.x buster to mariadb-10.5 upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mariadb-10.1 to mariadb-10.5 upgrade:
   stage: upgrade from Buster/Stretch/Jessie
@@ -255,7 +249,6 @@ mariadb-10.1 to mariadb-10.5 upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 test basic features:
   stage: test
@@ -311,7 +304,6 @@ test basic features:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 # Build a piece of software that was designed for libmysqlclient-dev but using the
 # libmariadb-dev-compat layer. Should always end up using libmariadb.so.3 run-time.
@@ -335,7 +327,6 @@ build mariadbclient consumer Python-MySQLdb:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 libmysql* to libmariadb* upgrade:
   stage: test extras
@@ -375,7 +366,6 @@ libmysql* to libmariadb* upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 default-libmysqlclient-dev upgrade:
   stage: upgrade in Sid
@@ -402,7 +392,6 @@ default-libmysqlclient-dev upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 default-libmysqlclient-dev on buster upgrade:
   stage: upgrade from Buster/Stretch/Jessie
@@ -431,7 +420,6 @@ default-libmysqlclient-dev on buster upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 default-libmysqlclient-dev on stretch upgrade:
   stage: upgrade from Buster/Stretch/Jessie
@@ -460,7 +448,6 @@ default-libmysqlclient-dev on stretch upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mariadb-connector-c on stretch upgrade:
   stage: upgrade from Buster/Stretch/Jessie
@@ -489,7 +476,6 @@ mariadb-connector-c on stretch upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 mysql-5.5 to mariadb-10.5 upgrade:
   stage: upgrade from Buster/Stretch/Jessie
@@ -534,7 +520,6 @@ mysql-5.5 to mariadb-10.5 upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 # Upgrading from MySQL 5.7 involves automatic renaming of auth_socket plugin
 # to unix_socket and automaticly re-adding Password column in user table.
@@ -581,7 +566,6 @@ mysql-5.7 to mariadb-10.5 upgrade:
   except:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
-  allow_failure: true
 
 # Upgrading from MySQL 8.0 with datadir in place is not possible. Users need to do a data dump.
 # The Debian maintainer scripts detect this situation and simply moves old datadir aside and start fresh.
@@ -648,17 +632,14 @@ mariadb.org-10.5.x to mariadb-10.5 upgrade:
     - sed -i "s/101/0/g" -i /usr/sbin/policy-rc.d # Enable automatic restarts from maint scripts
     - cd ${WORKING_DIR} # Don't repeat this step, it's just cd ./debian/output
     - apt-get update
-    - apt install -y curl systemctl # systemctl shim needed on platforms that don't have systemd
+    - apt install -y curl
     - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
     - echo 'deb [arch=amd64,i386] http://mirror.one.com/mariadb/repo/10.5/debian sid main' > /etc/apt/sources.list.d/mariadb.list
     - apt-get update
     - apt-get install -y mariadb-server-10.5
     # Verify installation of MySQL from Sid
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
-    # MariaDB.org version of 10.4 and early 10.5 do not install an init file, so
-    # it must be installed here manually
-    - cp /usr/share/mysql/mysql.init /etc/init.d/mysql; chmod +x /etc/init.d/mysql; service mysql start; sleep 5
-    - service mysql status
+    - service mariadb status
     - mysql --skip-column-names -e "SELECT @@version, @@version_comment"
     - mysql -e "SELECT Host,User,plugin,authentication_string FROM user;" mysql
     - mysql -e "SELECT * FROM plugin;" mysql
@@ -668,7 +649,6 @@ mariadb.org-10.5.x to mariadb-10.5 upgrade:
     # Verify installation of MariaDB built in this commit
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
     - mariadb --version # Client version
-    - service mysql status
     - service mariadb status
     - mkdir -p debug # Ensure dir exists before using it
     - find /var/lib/mysql -ls > debug/var-lib-mysql.list || true # Ignore errors about "no such file or directory"

debian/source/lintian-overrides

-# Upstream fix pending: https://github.com/wolfSSL/wolfssl/pull/2785
-source-is-missing extra/wolfssl/wolfssl/doc/formats/html/html_changes/menu.js line length is 679 characters (>512)
 # Necessary for drop-in-place-replacement upgrades on mysql-server/-client
 # since package breaks/replaces these but at the same time also provides them
 version-substvar-for-external-package mariadb-client-core-10.5 -> mysql-client-5.5