[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-init-scripts/, dev-db/mysql-init-scripts/files/

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-init-scripts/, dev-db/mysql-init-scripts/files/

[Sam James]

commit:     6f292c815f3656e78702d02fa17cb173c473d7aa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 29 00:27:13 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 29 00:27:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f292c81

dev-db/mysql-init-scripts: update init.d for nfsmount removal

Bug: https://bugs.gentoo.org/925459
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/mysql-init-scripts/files/conf.d-2.0                              | 2 +-
 ...ysql-init-scripts-2.3-r6.ebuild => mysql-init-scripts-2.3-r7.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql-init-scripts/files/conf.d-2.0 b/dev-db/mysql-init-scripts/files/conf.d-2.0
index cecb9a940f14..843b6fe93095 100644
--- a/dev-db/mysql-init-scripts/files/conf.d-2.0
+++ b/dev-db/mysql-init-scripts/files/conf.d-2.0
@@ -63,7 +63,7 @@ STOP_TIMEOUT=120
 
 # Or from NFS? P.S. This is not a good idea in most cases, but does have some
 # valid usage cases, so we provide the option.
-#rc_need="nfsmount"
+#rc_need="nfsclient"
 
 # Should any one of the instances satisfy the requirement for MySQL coming up?
 # By default, we say no.

diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r6.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r7.ebuild
similarity index 98%
rename from dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r6.ebuild
rename to dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r7.ebuild
index b5212ccb5bf5..ce3110eecafa 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r6.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-init-scripts/, dev-db/mysql-init-scripts/files/

[Petr Vaněk]

commit:     c48f8dd8c90980285b51259f47303383c9dffe9a
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  8 11:57:26 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Apr  8 13:56:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c48f8dd8

dev-db/mysql-init-scripts: fix typo in extra commands list

This fixes remaining typos in extra commands lists referencing
bootstrap_galera function:

  boostrap_galera -> bootstrap_galera

It is followup to the commit 460c2f8c5390 ("dev-db/mysql-init-scripts:
Fix important typo and commit straight to stable")

Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 dev-db/mysql-init-scripts/files/init.d-2.3                          | 4 ++--
 dev-db/mysql-init-scripts/files/init.d-s6-2.3                       | 4 ++--
 dev-db/mysql-init-scripts/files/init.d-supervise-2.3                | 6 +++---
 ...-init-scripts-2.3-r7.ebuild => mysql-init-scripts-2.3-r8.ebuild} | 0
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-db/mysql-init-scripts/files/init.d-2.3 b/dev-db/mysql-init-scripts/files/init.d-2.3
index 90e7e7536881..1216ac9a67c3 100644
--- a/dev-db/mysql-init-scripts/files/init.d-2.3
+++ b/dev-db/mysql-init-scripts/files/init.d-2.3
@@ -1,12 +1,12 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="checkconfig"
 extra_stopped_commands="bootstrap_galera"
 
 description_checkconfig="Verify the server's configuration"
-description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
+description_bootstrap_galera="Start a new Galera cluster with this server as the initial node"
 
 depend() {
 	use net.lo

diff --git a/dev-db/mysql-init-scripts/files/init.d-s6-2.3 b/dev-db/mysql-init-scripts/files/init.d-s6-2.3
index 5bf62e3ef937..4222de898125 100644
--- a/dev-db/mysql-init-scripts/files/init.d-s6-2.3
+++ b/dev-db/mysql-init-scripts/files/init.d-s6-2.3
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -41,7 +41,7 @@ extra_commands="checkconfig"
 extra_stopped_commands="bootstrap_galera"
 
 description_checkconfig="Verify the server's configuration"
-description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
+description_bootstrap_galera="Start a new Galera cluster with this server as the initial node"
 supervisor=s6
 name=$(mysql_svcname)
 s6_service_timeout_stop="$((1000*${STOP_TIMEOUT:-120}))"

diff --git a/dev-db/mysql-init-scripts/files/init.d-supervise-2.3 b/dev-db/mysql-init-scripts/files/init.d-supervise-2.3
index 1bacbd4d8566..fa7cba8d45c4 100644
--- a/dev-db/mysql-init-scripts/files/init.d-supervise-2.3
+++ b/dev-db/mysql-init-scripts/files/init.d-supervise-2.3
@@ -1,12 +1,12 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="checkconfig"
-extra_stopped_commands="boostrap_galera"
+extra_stopped_commands="bootstrap_galera"
 
 description_checkconfig="Verify the server's configuration"
-description_boostrap_galera="Start a new Galera cluster with this server as the initial node"
+description_bootstrap_galera="Start a new Galera cluster with this server as the initial node"
 
 depend() {
 	use net.lo

diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r7.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r8.ebuild
similarity index 100%
rename from dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r7.ebuild
rename to dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r8.ebuild

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-init-scripts/, dev-db/mysql-init-scripts/files/

[Conrad Kostecki]

commit:     a2e045276140813d197d5eb341bb583dc76cac41
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 19:00:48 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 19:09:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e04527

dev-db/mysql-init-scripts: update tmpfiles path

The path '/var/run' is deprecated, as the following message is being
shown:

/usr/lib/tmpfiles.d/mysql.conf:1: Line references path below legacy
directory /var/run/, updating /var/run/mysqld  /run/mysqld;
please update the tmpfiles.d/ drop-in file accordingly.

Closes: https://github.com/gentoo/gentoo/pull/24947
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-db/mysql-init-scripts/files/mysql.conf                            | 1 -
 dev-db/mysql-init-scripts/files/mysql.conf-r1                         | 1 +
 ...ql-init-scripts-2.3-r3.ebuild => mysql-init-scripts-2.3-r4.ebuild} | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-db/mysql-init-scripts/files/mysql.conf b/dev-db/mysql-init-scripts/files/mysql.conf
deleted file mode 100644
index 74cd5f836e76..000000000000
--- a/dev-db/mysql-init-scripts/files/mysql.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/mysqld 0755 mysql mysql -

diff --git a/dev-db/mysql-init-scripts/files/mysql.conf-r1 b/dev-db/mysql-init-scripts/files/mysql.conf-r1
new file mode 100644
index 000000000000..6883dc798881
--- /dev/null
+++ b/dev-db/mysql-init-scripts/files/mysql.conf-r1
@@ -0,0 +1 @@
+d /run/mysqld 0755 mysql mysql -

diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r4.ebuild
similarity index 95%
rename from dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
rename to dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r4.ebuild
index 34fe271b9756..889e84ccfc61 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,7 @@ src_install() {
 	doexe "${FILESDIR}"/mysqld-wait-ready
 	systemd_newunit "${FILESDIR}/mysqld-v2.service" "mysqld.service"
 	systemd_newunit "${FILESDIR}/mysqld_at-v2.service" "mysqld@.service"
-	dotmpfiles "${FILESDIR}/mysql.conf"
+	newtmpfiles "${FILESDIR}/mysql.conf-r1" "mysql.conf"
 
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/logrotate.mysql-2.3" "mysql"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-init-scripts/, dev-db/mysql-init-scripts/files/

[Brian Evans]

commit:     57f61a80872e0ceb8e89d2a2472e03e65a8f0320
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 12:40:51 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 12:40:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57f61a80

dev-db/mysql-init-scripts: Revbump to fix supervise-daemon syntax change

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 .../mysql-init-scripts/files/init.d-supervise-2.3  |  4 +-
 .../mysql-init-scripts-2.3-r1.ebuild               | 67 ++++++++++++++++++++++
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/dev-db/mysql-init-scripts/files/init.d-supervise-2.3 b/dev-db/mysql-init-scripts/files/init.d-supervise-2.3
index e611995b9a0..d0cbb312cca 100644
--- a/dev-db/mysql-init-scripts/files/init.d-supervise-2.3
+++ b/dev-db/mysql-init-scripts/files/init.d-supervise-2.3
@@ -121,7 +121,7 @@ start() {
 #	local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000}
 	local tmpnice="${NICE:+"--nicelevel "}${NICE}"
 	local tmpionice="${IONICE:+"--ionice "}${IONICE}"
-	supervise-daemon \
+	supervise-daemon "${SVCNAME}" \
 		${DEBUG:+"--verbose"} \
 		--pidfile "/run/${SVCNAME}.pid" \
 		${tmpnice} \
@@ -146,7 +146,7 @@ stop() {
 
 	ebegin "Stopping $(mysql_svcname)"
 
-	supervise-daemon \
+	supervise-daemon "${SVCNAME}" \
 		${DEBUG:+"--verbose"} \
 		--stop \
 		--pidfile "/run/${SVCNAME}.pid"

diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r1.ebuild
new file mode 100644
index 00000000000..b3283cf3ba2
--- /dev/null
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd s6 tmpfiles
+
+DESCRIPTION="Gentoo MySQL init scripts."
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+# This _will_ break with MySQL 5.0, 4.x, 3.x
+# It also NEEDS openrc for the save_options/get_options builtins.
+# The s6 support was added after openrc 0.16.2
+# mysql-connector-c needed for my_print_defaults
+RDEPEND="
+	!<dev-db/mysql-5.1
+	!<sys-apps/openrc-0.16.2
+	dev-db/mysql-connector-c
+	"
+# Need to set S due to PMS saying we need it existing, but no SRC_URI
+S=${WORKDIR}
+
+src_install() {
+	newconfd "${FILESDIR}/conf.d-2.0" "mysql"
+
+	# s6 init scripts
+	if use amd64 || use x86 ; then
+		newconfd "${FILESDIR}/conf.d-2.0" "mysql-s6"
+		newinitd "${FILESDIR}/init.d-s6-2.3" "mysql-s6"
+		s6_install_service mysql "${FILESDIR}/run-s6"
+		s6_install_service mysql/log "${FILESDIR}/log-s6"
+	fi
+
+	newinitd "${FILESDIR}/init.d-2.3" "mysql"
+	newinitd "${FILESDIR}/init.d-supervise-2.3" "mysql-supervise"
+
+	# systemd unit installation
+	exeinto /usr/libexec
+	doexe "${FILESDIR}"/mysqld-wait-ready
+	systemd_newunit "${FILESDIR}/mysqld-v2.service" "mysqld.service"
+	systemd_newunit "${FILESDIR}/mysqld_at-v2.service" "mysqld@.service"
+	dotmpfiles "${FILESDIR}/mysql.conf"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate.mysql-2.3" "mysql"
+}
+
+pkg_postinst() {
+	tmpfiles_process mysql.conf
+	if use amd64 || use x86 ; then
+		elog ""
+		elog "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package."
+		elog "If you wish to use s6 logging support, comment out the log-error setting in your my.cnf"
+	fi
+
+	elog ""
+	elog "Starting with version 10.1.8, MariaDB includes an improved systemd unit named mariadb.service"
+	elog "You should prefer that unit over this package's mysqld.service."
+	einfo ""
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-init-scripts/, dev-db/mysql-init-scripts/files/

[Brian Evans]

commit:     a51d8843bdf6d39c7964abac3b751f658ed4a078
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 21:50:44 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 21:55:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51d8843

dev-db/mysql-init-scripts: Add 'keyword -timeout'

It may take longer than 60 seconds to startup.  Let the script
handle any timeouts.

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 dev-db/mysql-init-scripts/files/init.d-2.2         |  5 +-
 .../mysql-init-scripts-2.2-r3.ebuild               | 64 ++++++++++++++++++++++
 2 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/dev-db/mysql-init-scripts/files/init.d-2.2 b/dev-db/mysql-init-scripts/files/init.d-2.2
index f6ad52496e4..5603f9e6031 100644
--- a/dev-db/mysql-init-scripts/files/init.d-2.2
+++ b/dev-db/mysql-init-scripts/files/init.d-2.2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="checkconfig"
@@ -12,6 +12,9 @@ depend() {
 	use net.lo
 	# localmount needed for $basedir
 	need localmount
+	# This service has its own timeout and may need to wait for repairs
+	# or remote synchronization
+	keyword -timeout
 }
 
 get_config() {

diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r3.ebuild
new file mode 100644
index 00000000000..f405a38a67f
--- /dev/null
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd s6
+
+DESCRIPTION="Gentoo MySQL init scripts."
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+# This _will_ break with MySQL 5.0, 4.x, 3.x
+# It also NEEDS openrc for the save_options/get_options builtins.
+# The s6 support was added after openrc 0.16.2
+RDEPEND="
+	!<dev-db/mysql-5.1
+	!<sys-apps/openrc-0.16.2
+	"
+# Need to set S due to PMS saying we need it existing, but no SRC_URI
+S=${WORKDIR}
+
+src_install() {
+	newconfd "${FILESDIR}/conf.d-2.0" "mysql"
+
+	# s6 init scripts
+	if use amd64 || use x86 ; then
+		newconfd "${FILESDIR}/conf.d-2.0" "mysql-s6"
+		newinitd "${FILESDIR}/init.d-s6-2.2" "mysql-s6"
+		s6_install_service mysql "${FILESDIR}/run-s6"
+		s6_install_service mysql/log "${FILESDIR}/log-s6"
+	fi
+
+	newinitd "${FILESDIR}/init.d-2.2" "mysql"
+	newinitd "${FILESDIR}/init.d-supervise" "mysql-supervise"
+
+	# systemd unit installation
+	exeinto /usr/libexec
+	doexe "${FILESDIR}"/mysqld-wait-ready
+	systemd_newunit "${FILESDIR}/mysqld-v2.service" "mysqld.service"
+	systemd_newunit "${FILESDIR}/mysqld_at-v2.service" "mysqld@.service"
+	systemd_dotmpfilesd "${FILESDIR}/mysql.conf"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate.mysql" "mysql"
+}
+
+pkg_postinst() {
+	if use amd64 || use x86 ; then
+		elog ""
+		elog "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package."
+		elog "If you wish to use s6 logging support, comment out the log-error setting in your my.cnf"
+	fi
+
+	elog ""
+	elog "Starting with version 10.1.8, MariaDB includes an improved systemd unit named mariadb.service"
+	elog "You should prefer that unit over this package's mysqld.service."
+	einfo ""
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-init-scripts/, dev-db/mysql-init-scripts/files/

[Brian Evans]

commit:     19488c726460a55eb7b134687ac71fe6e9db77db
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 13:37:33 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 13:37:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19488c72

dev-db/mysql-init-scripts: Drop old versions

These use mysqld_safe in the mysqld.service which is unnecessary
and vulernable to attacks wrt CVE-2016-6662

Package-Manager: portage-2.3.0

 dev-db/mysql-init-scripts/files/mysqld.service     | 26 ---------
 dev-db/mysql-init-scripts/files/mysqld_at.service  | 26 ---------
 .../mysql-init-scripts-2.0-r1.ebuild               | 68 ----------------------
 .../mysql-init-scripts-2.1_alpha4.ebuild           | 58 ------------------
 4 files changed, 178 deletions(-)

diff --git a/dev-db/mysql-init-scripts/files/mysqld.service b/dev-db/mysql-init-scripts/files/mysqld.service
deleted file mode 100644
index de9ea2f..00000000
--- a/dev-db/mysql-init-scripts/files/mysqld.service
+++ /dev/null
@@ -1,26 +0,0 @@
-[Unit]
-Description=MySQL database server
-After=syslog.target
-After=network.target
-
-[Service]
-Type=simple
-User=mysql
-Group=mysql
-
-# Note: we set --basedir to prevent probes that might trigger SELinux alarms,
-# https://bugzilla.redhat.com/show_bug.cgi?id=547485
-ExecStart=/usr/bin/mysqld_safe --basedir=/usr
-ExecStartPost=/usr/libexec/mysqld-wait-ready $MAINPID
-
-# Give a reasonable amount of time for the server to start up/shut down
-TimeoutSec=300
-
-# We rely on systemd, not mysqld_safe, to restart mysqld if it dies
-Restart=always
-
-# Place temp files in a secure directory, not /tmp
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target

diff --git a/dev-db/mysql-init-scripts/files/mysqld_at.service b/dev-db/mysql-init-scripts/files/mysqld_at.service
deleted file mode 100644
index f46cf9e..00000000
--- a/dev-db/mysql-init-scripts/files/mysqld_at.service
+++ /dev/null
@@ -1,26 +0,0 @@
-[Unit]
-Description=MySQL database server
-ConditionPathExists=/etc/mysql/my%I.cnf
-After=network.target
-
-[Service]
-Type=simple
-User=mysql
-Group=mysql
-
-# Note: we set --basedir to prevent probes that might trigger SELinux alarms,
-# https://bugzilla.redhat.com/show_bug.cgi?id=547485
-ExecStart=/usr/bin/mysqld_safe --defaults-file=/etc/mysql/my%I.cnf --basedir=/usr
-ExecStartPost=/usr/libexec/mysqld-wait-ready $MAINPID
-
-# Give a reasonable amount of time for the server to start up/shut down
-TimeoutSec=300
-
-# We rely on systemd, not mysqld_safe, to restart mysqld if it dies
-Restart=always
-
-# Place temp files in a secure directory, not /tmp
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target

diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild
deleted file mode 100644
index d624ff9..00000000
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit systemd
-
-DESCRIPTION="Gentoo MySQL init scripts"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-# This _will_ break with MySQL 5.0, 4.x, 3.x
-# It also NEEDS openrc for the save_options/get_options builtins.
-RDEPEND="!<dev-db/mysql-5.1"
-# Need to set S due to PMS saying we need it existing, but no SRC_URI
-S=${WORKDIR}
-
-src_install() {
-	newconfd "${FILESDIR}/conf.d-${PV}" "mysql"
-	newinitd "${FILESDIR}/init.d-${PV}" "mysql"
-
-	# systemd unit installation
-	exeinto /usr/libexec
-	doexe "${FILESDIR}"/mysqld-wait-ready
-	systemd_dounit "${FILESDIR}/mysqld.service"
-	systemd_newunit "${FILESDIR}/mysqld_at.service" "mysqld@.service"
-	systemd_dotmpfilesd "${FILESDIR}/mysql.conf"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate.mysql" "mysql"
-}
-
-pkg_postinst() {
-	grep -sq mysql_slot "${ROOT}"/etc/conf.d/mysql
-	old_conf_present=$?
-	grep -sq get_slot_config "${ROOT}"/etc/init.d/mysql
-	old_init_present=$?
-
-	egrep -sq 'MY_CNF|MY_ARGS|(STARTUP|STOP)_TIMEOUT' "${ROOT}"/etc/conf.d/mysql
-	new_conf_present=$?
-	egrep -sq 'MY_ARGS|STOP_TIMEOUT' "${ROOT}"/etc/init.d/mysql
-	new_init_present=$?
-
-	einfo "Please note that if you are using multiple internal 'slots' in the"
-	einfo "old conf.d file, you should use multiple init files now."
-	echo old $old_conf_present $old_init_present
-	echo new $new_conf_present $new_init_present
-
-	# new scripts present
-	if [ $new_conf_present -eq 0 -a $new_init_present -eq 0 -a \
-		 $old_conf_present -eq 1 -a $old_init_present -eq 1 ]; then
-		:
-	elif [ $old_conf_present -eq 0 -a $old_init_present -eq 0 -a \
-		 $new_conf_present -eq 1 -a $new_init_present -eq 1 ]; then
-		ewarn "Old /etc/init.d/mysql and /etc/conf.d/mysql still present!"
-		ewarn "Update both of those files to the new versions!"
-	else
-		eerror "DANGER, mixed update of /etc/init.d/mysql and /etc/conf.d/mysql"
-		eerror "detected! You must update BOTH to the new versions"
-	fi
-}

diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha4.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha4.ebuild
deleted file mode 100644
index 591720c..00000000
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit systemd s6
-
-DESCRIPTION="Gentoo MySQL init scripts."
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-# This _will_ break with MySQL 5.0, 4.x, 3.x
-# It also NEEDS openrc for the save_options/get_options builtins.
-# The s6 support was added after openrc 0.16.2
-RDEPEND="
-	!<dev-db/mysql-5.1
-	!<sys-apps/openrc-0.16.2
-	"
-# Need to set S due to PMS saying we need it existing, but no SRC_URI
-S=${WORKDIR}
-
-src_install() {
-	newconfd "${FILESDIR}/conf.d-2.0" "mysql"
-
-	# s6 init scripts
-	if use amd64 || use x86 ; then
-		newconfd "${FILESDIR}/conf.d-2.0" "mysql-s6"
-		newinitd "${FILESDIR}/init.d-s6" "mysql-s6"
-		s6_install_service mysql "${FILESDIR}/run-s6"
-		s6_install_service mysql/log "${FILESDIR}/log-s6"
-	fi
-
-	newinitd "${FILESDIR}/init.d-2.0" "mysql"
-
-	# systemd unit installation
-	exeinto /usr/libexec
-	doexe "${FILESDIR}"/mysqld-wait-ready
-	systemd_dounit "${FILESDIR}/mysqld.service"
-	systemd_newunit "${FILESDIR}/mysqld_at.service" "mysqld@.service"
-	systemd_dotmpfilesd "${FILESDIR}/mysql.conf"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate.mysql" "mysql"
-}
-
-pkg_postinst() {
-	if use amd64 || use x86 ; then
-		elog "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package."
-		elog "If you wish to use s6 logging support, comment out the log-error setting in your my.cnf"
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-init-scripts/, dev-db/mysql-init-scripts/files/

[Brian Evans]

commit:     3f9e1ccadbb179e26960138ffe9e0e4b394c3c57
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 16:23:01 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 16:23:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f9e1cca

dev-db/mysql-init-scripts: Version bump wrt bug 571508

Package-Manager: portage-2.3.0

 dev-db/mysql-init-scripts/files/init.d-2.0                            | 4 ++--
 dev-db/mysql-init-scripts/files/init.d-s6                             | 4 ++--
 ...ysql-init-scripts-2.1_rc1.ebuild => mysql-init-scripts-2.1.ebuild} | 0
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-db/mysql-init-scripts/files/init.d-2.0 b/dev-db/mysql-init-scripts/files/init.d-2.0
index ec4f996..19a4b92 100644
--- a/dev-db/mysql-init-scripts/files/init.d-2.0
+++ b/dev-db/mysql-init-scripts/files/init.d-2.0
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -72,7 +72,7 @@ start() {
 	if [ ! -d "${datadir}"/mysql ] ; then
 		# find which package is installed to report an error
 		local EROOT=$(portageq envvar EROOT)
-		local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql))
+		local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
 		if [ -z ${DBPKG_P} ] ; then
 			eerror "You don't appear to have a server package installed yet."
 		else

diff --git a/dev-db/mysql-init-scripts/files/init.d-s6 b/dev-db/mysql-init-scripts/files/init.d-s6
index 3c6feec..573ffbc 100644
--- a/dev-db/mysql-init-scripts/files/init.d-s6
+++ b/dev-db/mysql-init-scripts/files/init.d-s6
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -63,7 +63,7 @@ start_pre() {
 	if [ ! -d "${datadir}"/mysql ] ; then
 		# find which package is installed to report an error
 		local EROOT=$(portageq envvar EROOT)
-		local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql))
+		local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql | head -n1))
 		if [ -z ${DBPKG_P} ] ; then
 			eerror "You don't appear to have a server package installed yet."
 		else

diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_rc1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.1.ebuild
similarity index 100%
rename from dev-db/mysql-init-scripts/mysql-init-scripts-2.1_rc1.ebuild
rename to dev-db/mysql-init-scripts/mysql-init-scripts-2.1.ebuild