grknight 14/09/15 14:17:12 Modified: ChangeLog Added: mysql-init-scripts-2.0-r1.ebuild Removed: mysql-init-scripts-2.0.ebuild Log: Revision bump. Update checkconfig section to accept alternate configurations. Thanks to László Szalma <[email protected]> for the input. wrt bug 522766 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)
Revision Changes Path 1.42 dev-db/mysql-init-scripts/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog?rev=1.42&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog?rev=1.42&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog?r1=1.41&r2=1.42 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- ChangeLog 21 Aug 2014 03:08:13 -0000 1.41 +++ ChangeLog 15 Sep 2014 14:17:12 -0000 1.42 @@ -1,6 +1,13 @@ # ChangeLog for dev-db/mysql-init-scripts # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.41 2014/08/21 03:08:13 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.42 2014/09/15 14:17:12 grknight Exp $ + +*mysql-init-scripts-2.0-r1 (15 Sep 2014) + + 15 Sep 2014; <[email protected]> +mysql-init-scripts-2.0-r1.ebuild, + -mysql-init-scripts-2.0.ebuild, files/init.d-2.0: + Revision bump. Update checkconfig section to accept alternate configurations. + Thanks to László Szalma <[email protected]> for the input. wrt bug 522766 *mysql-init-scripts-2.0 (21 Aug 2014) 1.1 dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild?rev=1.1&content-type=text/plain Index: mysql-init-scripts-2.0-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild,v 1.1 2014/09/15 14:17:12 grknight Exp $ EAPI=5 inherit systemd DESCRIPTION="Gentoo MySQL init scripts" HOMEPAGE="http://www.gentoo.org/"; SRC_URI="" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~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" "[email protected]" 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 }
