From b8092a3c9de9a74c8b2b37f415fe5e78d4cb9185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Mon, 13 Apr 2020 14:26:34 +0300 Subject: [PATCH] Deb: Remove unmaintained AWS key plugin packaging Likewise to TokuDB and Cassandra, if this plugin is maintained it should be either fully enabled or not present at all. Packaging can be recovered from MariaDB 10.2 if needed, or if build outside of this packaging, then also the packaging scripts and snippets should be injected from the outside. --- debian/autobake-deb.sh | 3 --- debian/mariadb-plugin-aws-key-management.install | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 debian/mariadb-plugin-aws-key-management.install diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 354a2706e1e..b5c3dc84f06 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -77,9 +77,6 @@ then sed '/Package: mariadb-plugin-rocksdb/,/^$/d' -i debian/control fi -# Always remove AWS plugin, see -DNOT_FOR_DISTRIBUTION in CMakeLists.txt -sed '/Package: mariadb-plugin-aws-key-management-10.2/,/^$/d' -i debian/control - # If libpcre2-dev is not available (before Debian Stretch and Ubuntu Xenial) # attempt to build using older libpcre3-dev (SIC!) if ! apt-cache madison libpcre2-dev | grep --quiet 'libpcre2-dev' diff --git a/debian/mariadb-plugin-aws-key-management.install b/debian/mariadb-plugin-aws-key-management.install deleted file mode 100644 index 199d4c87950..00000000000 --- a/debian/mariadb-plugin-aws-key-management.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/additions/enable_encryption.preset etc/mysql/mariadb.conf.d -etc/mysql/conf.d/aws_key_management.cnf etc/mysql/mariadb.conf.d -usr/lib/mysql/plugin/aws_key_management.so