Skip to content

M
MariaDB
Commit 84b42eda authored by Monty's avatar Monty
Browse files
Options

Updated debian packages to 10.5

parent 9a8d1d84
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 59 deletions
debian/autobake-deb.sh
View file @ 84b42eda
......@@ -67,9 +67,9 @@ then
sed 's/ --with systemd//' -i debian/rules
sed '/systemd/d' -i debian/rules
sed '/\.service/d' -i debian/rules
sed '/galera_new_cluster/d' -i debian/mariadb-server-10.4.install
sed '/galera_recovery/d' -i debian/mariadb-server-10.4.install
sed '/mariadb-service-convert/d' -i debian/mariadb-server-10.4.install
sed '/galera_new_cluster/d' -i debian/mariadb-server-10.5.install
sed '/galera_recovery/d' -i debian/mariadb-server-10.5.install
sed '/mariadb-service-convert/d' -i debian/mariadb-server-10.5.install
fi
# If libzstd-dev is not available (before Debian Stretch and Ubuntu Xenial)
......@@ -113,7 +113,7 @@ then
sed -i -e "/Package: mariadb-plugin-mroonga/,/^$/d" debian/control
sed -i -e "/Package: mariadb-plugin-spider/,/^$/d" debian/control
sed -i -e "/Package: mariadb-plugin-oqgraph/,/^$/d" debian/control
sed -i -e "/usr\/lib\/mysql\/plugin\/ha_sphinx.so/d" debian/mariadb-server-10.4.install
sed -i -e "/usr\/lib\/mysql\/plugin\/ha_sphinx.so/d" debian/mariadb-server-10.5.install
sed -i -e "/Package: libmariadbd-dev/,/^$/d" debian/control
fi
......
debian/changelog
View file @ 84b42eda
mariadb-10.4 (1:10.4.0) unstable; urgency=low
mariadb-10.5 (1:10.5.0) unstable; urgency=low
* Initial release.
......
debian/control
View file @ 84b42eda
Source: mariadb-10.4
Source: mariadb-10.5
Section: database
Priority: optional
Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
......@@ -232,7 +232,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
This package includes files needed by all versions of the client library
(e.g. /etc/mysql/conf.d/mariadb.cnf).
Package: mariadb-client-core-10.4
Package: mariadb-client-core-10.5
Architecture: any
Depends: mariadb-common (>= ${source:Version}),
${misc:Depends},
......@@ -302,10 +302,10 @@ Description: MariaDB database core client binaries
.
This package includes the core client files, as used by Akonadi.
Package: mariadb-client-10.4
Package: mariadb-client-10.5
Architecture: any
Depends: debianutils (>=1.6),
mariadb-client-core-10.4 (>= ${source:Version}),
mariadb-client-core-10.5 (>= ${source:Version}),
mariadb-common,
${misc:Depends},
${perl:Depends},
......@@ -362,7 +362,7 @@ Description: MariaDB database client binaries
This package includes the client binaries and the additional tools
innotop and mysqlreport.
Package: mariadb-server-core-10.4
Package: mariadb-server-core-10.5
Architecture: any
Depends: mariadb-common (>= ${source:Version}),
${misc:Depends},
......@@ -422,7 +422,7 @@ Description: MariaDB database core server files
.
This package includes the core server files, as used by Akonadi.
Package: mariadb-server-10.4
Package: mariadb-server-10.5
Architecture: any
Suggests: mailx,
mariadb-test,
......@@ -438,8 +438,8 @@ Depends: galera-4 (>=26.4),
libdbi-perl,
lsb-base (>= 3.0-10),
lsof,
mariadb-client-10.4 (>= ${source:Version}),
mariadb-server-core-10.4 (>= ${binary:Version}),
mariadb-client-10.5 (>= ${source:Version}),
mariadb-server-core-10.5 (>= ${binary:Version}),
passwd,
perl (>= 5.6),
psmisc,
......@@ -503,11 +503,11 @@ Description: MariaDB database server binaries
Package: mariadb-server
Architecture: all
Depends: mariadb-server-10.4 (>= ${source:Version}),
Depends: mariadb-server-10.5 (>= ${source:Version}),
${misc:Depends}
Description: MariaDB database server (metapackage depending on the latest version)
This is an empty package that depends on the current "best" version of
mariadb-server (currently mariadb-server-10.4), as determined by the MariaDB
mariadb-server (currently mariadb-server-10.5), as determined by the MariaDB
maintainers. Install this package if in doubt about which MariaDB
version you need. That will install the version recommended by the
package maintainers.
......@@ -519,11 +519,11 @@ Description: MariaDB database server (metapackage depending on the latest versio
Package: mariadb-client
Architecture: all
Depends: mariadb-client-10.4 (>= ${source:Version}),
Depends: mariadb-client-10.5 (>= ${source:Version}),
${misc:Depends}
Description: MariaDB database client (metapackage depending on the latest version)
This is an empty package that depends on the current "best" version of
mariadb-client (currently mariadb-client-10.4), as determined by the MariaDB
mariadb-client (currently mariadb-client-10.5), as determined by the MariaDB
maintainers. Install this package if in doubt about which MariaDB version
you want, as this is the one considered to be in the best shape.
......@@ -533,7 +533,7 @@ Breaks: mariadb-backup-10.1,
mariadb-backup-10.2
Replaces: mariadb-backup-10.1,
mariadb-backup-10.2
Depends: mariadb-client-core-10.4 (= ${binary:Version}),
Depends: mariadb-client-core-10.5 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: Backup tool for MariaDB server
......@@ -546,7 +546,7 @@ Description: Backup tool for MariaDB server
Package: mariadb-plugin-connect
Architecture: any
Depends: libxml2,
mariadb-server-10.4 (= ${binary:Version}),
mariadb-server-10.5 (= ${binary:Version}),
unixodbc,
${misc:Depends},
${shlibs:Depends}
......@@ -564,7 +564,7 @@ Description: Connect storage engine for MariaDB
Package: mariadb-plugin-rocksdb
Architecture: amd64 arm64 mips64el ppc64el
Depends: mariadb-server-10.4 (= ${binary:Version}),
Depends: mariadb-server-10.5 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: mariadb-rocksdb-engine-10.2,
......@@ -580,7 +580,7 @@ Description: RocksDB storage engine for MariaDB
Package: mariadb-plugin-oqgraph
Architecture: any
Depends: libjudydebian1,
mariadb-server-10.4 (= ${binary:Version}),
mariadb-server-10.5 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: mariadb-oqgraph-engine-10.1,
......@@ -597,7 +597,7 @@ Description: OQGraph storage engine for MariaDB
Package: mariadb-plugin-tokudb
Architecture: amd64
Depends: libjemalloc1 (>= 3.0.0~) | libjemalloc2,
mariadb-server-10.4 (= ${binary:Version}),
mariadb-server-10.5 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: mariadb-server-10.0,
......@@ -616,7 +616,7 @@ Description: TokuDB storage engine for MariaDB
Package: mariadb-plugin-mroonga
Architecture: any-alpha any-amd64 any-arm any-arm64 any-i386 any-ia64 any-mips64el any-mips64r6el any-mipsel any-mipsr6el any-nios2 any-powerpcel any-ppc64el any-sh3 any-sh4 any-tilegx
Depends: mariadb-server-10.4 (= ${binary:Version}),
Depends: mariadb-server-10.5 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: mariadb-server-10.0,
......@@ -634,7 +634,7 @@ Description: Mroonga storage engine for MariaDB
Package: mariadb-plugin-spider
Architecture: any
Depends: mariadb-server-10.4 (= ${binary:Version}),
Depends: mariadb-server-10.5 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: mariadb-server-10.0,
......@@ -653,7 +653,7 @@ Description: Spider storage engine for MariaDB
Package: mariadb-plugin-cassandra
Architecture: any
Depends: mariadb-server-10.4 (= ${binary:Version}),
Depends: mariadb-server-10.5 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: mariadb-server-10.0,
......@@ -675,7 +675,7 @@ Description: Cassandra storage engine for MariaDB
Package: mariadb-plugin-gssapi-server
Architecture: any
Depends: libgssapi-krb5-2,
mariadb-server-10.4 (= ${binary:Version}),
mariadb-server-10.5 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: mariadb-gssapi-server-10.1,
......@@ -693,7 +693,7 @@ Description: GSSAPI authentication plugin for MariaDB server
Package: mariadb-plugin-gssapi-client
Architecture: any
Depends: libgssapi-krb5-2,
mariadb-client-10.4 (= ${binary:Version}),
mariadb-client-10.5 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: mariadb-gssapi-client-10.1,
......@@ -711,7 +711,7 @@ Description: GSSAPI authentication plugin for MariaDB client
Package: mariadb-plugin-cracklib-password-check
Architecture: any
Depends: libcrack2 (>= 2.9.0),
mariadb-server-10.4 (= ${binary:Version}),
mariadb-server-10.5 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: CrackLib Password Validation Plugin for MariaDB
......@@ -720,8 +720,8 @@ Description: CrackLib Password Validation Plugin for MariaDB
Package: mariadb-test
Architecture: any
Depends: mariadb-client-10.4 (= ${binary:Version}),
mariadb-server-10.4 (= ${binary:Version}),
Depends: mariadb-client-10.5 (= ${binary:Version}),
mariadb-server-10.5 (= ${binary:Version}),
mariadb-test-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
......
debian/mariadb-client-10.4.menu
View file @ 84b42eda
# According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/
?package(mariadb-client-10.4):needs="text" section="Applications/Data Management"\
?package(mariadb-client-10.5):needs="text" section="Applications/Data Management"\
title="Innotop" command="/usr/bin/innotop"
debian/mariadb-plugin-tokudb.install
View file @ 84b42eda
......@@ -3,6 +3,6 @@ etc/systemd/system/mariadb.service.d/tokudb.conf
usr/bin/tokuft_logprint
usr/bin/tokuftdump
usr/lib/mysql/plugin/ha_tokudb.so
usr/share/doc/mariadb-server-10.4/README.md usr/share/doc/mariadb-plugin-tokudb/README.md
usr/share/doc/mariadb-server-10.5/README.md usr/share/doc/mariadb-plugin-tokudb/README.md
usr/share/man/man1/tokuft_logprint.1
usr/share/man/man1/tokuftdump.1
debian/mariadb-server-10.4.install
View file @ 84b42eda
......@@ -56,8 +56,8 @@ usr/lib/mysql/plugin/server_audit.so
usr/lib/mysql/plugin/simple_password_check.so
usr/lib/mysql/plugin/sql_errlog.so
usr/lib/mysql/plugin/wsrep_info.so
usr/share/apport/package-hooks/source_mariadb-10.4.py
usr/share/doc/mariadb-server-10.4/mysqld.sym.gz
usr/share/apport/package-hooks/source_mariadb-10.5.py
usr/share/doc/mariadb-server-10.5/mysqld.sym.gz
usr/share/man/man1/aria_chk.1
usr/share/man/man1/aria_dump_log.1
usr/share/man/man1/aria_ftdump.1
......
debian/mariadb-server-10.4.mysql.init
View file @ 84b42eda
......@@ -158,7 +158,7 @@ case "${1:-''}" in
if ! mysqld_status check_dead warn; then
log_end_msg 1
log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.4/README.Debian.gz!"
log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.5/README.Debian.gz!"
exit -1
else
log_end_msg 0
......
debian/mariadb-server-10.4.postinst
View file @ 84b42eda
......@@ -106,7 +106,7 @@ EOF
# Clean up old flags before setting new one
rm -f $mysql_datadir/debian-*.flag
# Flag data dir to avoid downgrades
touch $mysql_datadir/debian-10.4.flag
touch $mysql_datadir/debian-10.5.flag
# initiate databases. Output is not allowed by debconf :-(
# This will fail if we are upgrading an existing database; in this case
......
debian/mariadb-server-10.4.postrm
View file @ 84b42eda
......@@ -49,9 +49,9 @@ if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; the
rm -f /var/log/mysql.{log,err}{,.0,.[1234567].gz}
rm -rf /var/log/mysql
db_input high mariadb-server-10.4/postrm_remove_databases || true
db_input high mariadb-server-10.5/postrm_remove_databases || true
db_go || true
db_get mariadb-server-10.4/postrm_remove_databases || true
db_get mariadb-server-10.5/postrm_remove_databases || true
if [ "$RET" = "true" ]; then
# never remove the debian.cnf when the databases are still existing
# else we ran into big trouble on the next install!
......
debian/mariadb-server-10.4.preinst
View file @ 84b42eda
......@@ -48,7 +48,7 @@ stop_server() {
################################ main() ##########################
this_version=10.4
this_version=10.5
max_upgradeable_version=5.7
# Check if a flag file is found that indicates a previous MariaDB or MySQL
......@@ -112,7 +112,7 @@ fi
# Instead simply move the old datadir and create a new for this_version.
if [ ! -z "$downgrade_detected" ]
then
db_input critical mariadb-server-10.4/old_data_directory_saved || true
db_input critical mariadb-server-10.5/old_data_directory_saved || true
db_go
echo "The file $mysql_datadir/debian-$found_version.flag indicates a" 1>&2
echo "version that cannot automatically be upgraded. Therefore the" 1>&2
......
debian/mariadb-server-10.4.templates
View file @ 84b42eda
......@@ -7,7 +7,7 @@
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.
Template: mariadb-server-10.4/old_data_directory_saved
Template: mariadb-server-10.5/old_data_directory_saved
Type: note
_Description: The old data directory will be saved at new location
A file named /var/lib/mysql/debian-*.flag exists on this system.
......@@ -19,7 +19,7 @@ _Description: The old data directory will be saved at new location
.
Please manually export/import your data (e.g. with mysqldump) if needed.
Template: mariadb-server-10.4/nis_warning
Template: mariadb-server-10.5/nis_warning
Type: note
#flag:translate!:3,5
_Description: Important note for NIS/YP users
......@@ -33,7 +33,7 @@ _Description: Important note for NIS/YP users
.
/var/lib/mysql: drwxr-xr-x mysql mysql
Template: mariadb-server-10.4/postrm_remove_databases
Template: mariadb-server-10.5/postrm_remove_databases
Type: boolean
Default: false
_Description: Remove all MariaDB databases?
......@@ -66,7 +66,7 @@ _Description: Unable to set password for the MariaDB "root" user
.
You should check the account's password after the package installation.
.
Please read the /usr/share/doc/mariadb-server-10.4/README.Debian file
Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file
for more information.
Template: mysql-server/password_mismatch
......
debian/mariadb-server-10.4.py → debian/mariadb-server-10.5.py
View file @ 84b42eda
'''apport package hook for mariadb-10.4
'''apport package hook for mariadb-10.5
(c) 2009 Canonical Ltd.
Author: Mathias Gug <mathias.gug@canonical.com>
......@@ -20,7 +20,7 @@ def _add_my_conf_files(report, filename):
continue
def add_info(report):
attach_conffiles(report, 'mariadb-server-10.4', conffiles=None)
attach_conffiles(report, 'mariadb-server-10.5', conffiles=None)
key = 'Logs' + path_to_key('/var/log/daemon.log')
report[key] = ""
for line in read_file('/var/log/daemon.log').split('\n'):
......
debian/not-installed
View file @ 84b42eda
......@@ -7,15 +7,15 @@ usr/lib/sysusers.d/sysusers.conf
usr/lib/tmpfiles.d/tmpfiles.conf
usr/lib/mysql/plugin/JavaWrappers.jar # These are only built if JNI/libjawt.so is installed from e.g. openjdk-8-jre-headless
usr/lib/mysql/plugin/JdbcInterface.jar # These are only built if JNI/libjawt.so is installed from e.g. openjdk-8-jre-headless
usr/share/doc/mariadb-server-10.4/COPYING
usr/share/doc/mariadb-server-10.4/COPYING.AGPLv3
usr/share/doc/mariadb-server-10.4/COPYING.GPLv2
usr/share/doc/mariadb-server-10.4/COPYING.thirdparty
usr/share/doc/mariadb-server-10.4/CREDITS
usr/share/doc/mariadb-server-10.4/EXCEPTIONS-CLIENT
usr/share/doc/mariadb-server-10.4/INSTALL-BINARY
usr/share/doc/mariadb-server-10.4/PATENTS
usr/share/doc/mariadb-server-10.4/README-wsrep
usr/share/doc/mariadb-server-10.5/COPYING
usr/share/doc/mariadb-server-10.5/COPYING.AGPLv3
usr/share/doc/mariadb-server-10.5/COPYING.GPLv2
usr/share/doc/mariadb-server-10.5/COPYING.thirdparty
usr/share/doc/mariadb-server-10.5/CREDITS
usr/share/doc/mariadb-server-10.5/EXCEPTIONS-CLIENT
usr/share/doc/mariadb-server-10.5/INSTALL-BINARY
usr/share/doc/mariadb-server-10.5/PATENTS
usr/share/doc/mariadb-server-10.5/README-wsrep
usr/share/groonga/COPYING
usr/share/groonga-normalizer-mysql/lgpl-2.0.txt
usr/share/groonga-normalizer-mysql/README.md
......
debian/rules
View file @ 84b42eda
......@@ -116,8 +116,8 @@ override_dh_auto_install:
ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS)))
# Copy systemd files to a location available for dh_installinit
cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.4.mariadb.service
cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.4.mariadb@.service
cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.5.mariadb.service
cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.5.mariadb@.service
endif
# make install
......@@ -130,12 +130,12 @@ endif
# nm numeric soft is not enough, therefore extra sort in command
# to satisfy Debian reproducible build requirements
nm --defined-only $(BUILDDIR)/sql/mysqld | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.4/mysqld.sym.gz
nm --defined-only $(BUILDDIR)/sql/mysqld | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.5/mysqld.sym.gz
# rename and install AppArmor profile
install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld
# install Apport hook
install -D -m 644 debian/mariadb-server-10.4.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.4.py
install -D -m 644 debian/mariadb-server-10.5.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.5.py
# Install libmariadbclient18 compatibility links
ln -s libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7