From 8c2f04480fcb47bcc93f588640954167109d8d14 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Mon, 16 Feb 2015 21:28:16 +0000 Subject: [PATCH] Drop old Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xD1F781EFF9F4A3B6 --- dev-db/mysql-init-scripts/ChangeLog | 8 +- dev-db/mysql-init-scripts/Manifest | 33 +++-- .../files/mysql-5.1.53-conf.d | 79 ----------- .../files/mysql-5.1.67-init.d | 125 ------------------ .../mysql-init-scripts-2.0_pre1-r6.ebuild | 64 --------- 5 files changed, 21 insertions(+), 288 deletions(-) delete mode 100644 dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d delete mode 100644 dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d delete mode 100644 dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r6.ebuild diff --git a/dev-db/mysql-init-scripts/ChangeLog b/dev-db/mysql-init-scripts/ChangeLog index 33751a20d0f9..0fe846e6006e 100644 --- a/dev-db/mysql-init-scripts/ChangeLog +++ b/dev-db/mysql-init-scripts/ChangeLog @@ -1,6 +1,10 @@ # 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.53 2014/12/04 08:36:04 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.54 2015/02/16 21:28:08 grknight Exp $ + + 16 Feb 2015; Brian Evans -files/mysql-5.1.53-conf.d, + -files/mysql-5.1.67-init.d, -mysql-init-scripts-2.0_pre1-r6.ebuild: + Drop old 04 Dec 2014; Agostino Sarubbo mysql-init-scripts-2.0-r1.ebuild: diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest index 6ad05f55c4ab..865c0c337cce 100644 --- a/dev-db/mysql-init-scripts/Manifest +++ b/dev-db/mysql-init-scripts/Manifest @@ -4,30 +4,27 @@ Hash: SHA256 AUX conf.d-2.0 3063 SHA256 6cd8551b8ac0dded54f42c2cc9cd55fbc4776d1a541e13d7d571cefd906cb3f4 SHA512 10144086db0fdcb8309e091bc43911fa9861d099500f2d8532376707d947da08491f7629e4008468758464cd2b3911479701fa24fff9f1614008a5c227529e3a WHIRLPOOL 0317929f28e0767e9bcb60715dc3bb2a05f5d1a0e05133135294abc8870f40ed3a4a26507b2ea84d4f7bc6e25f371d1cc7f1acc69ad08a8a9e940bb289d6b1c3 AUX init.d-2.0 4641 SHA256 1c89b70714bac5edece71ecc113a35350fc96ef977be2e0f44d6b46adbbb6c30 SHA512 0b4ea930ddd2ca7a59b8773d687f1f238cca51906e47ab09aff3deb463344072c4416f3d822e6cc4d804fec8755b50afe0a79a42ee5529afb90750792da98eb5 WHIRLPOOL 878f87a0b3657613cd01888d11bb1876a7b9036e8c81d544356cb23660149cd9ff2788b833e14f4e69f17f596847e94cd4022ee8ae0992d9649312cdc07e60d6 AUX logrotate.mysql 491 SHA256 a82f4497594e03cce55dce1f008206bafb85e3e4c6fc1f43c7a90d57be5f7aa1 SHA512 d5d3a753938c6c790a8202cd4685cc6a539e10519032fd26693130b51ef6a35a3a2e58b1c8be302ec7b73ef27aa8b99f992f16385fc2d28e05cc02611a2803ec WHIRLPOOL d7d55fa1a0afd1d98553809e30c99685db3ce20b26326ac19115f81c105db0b688c990494a4444f280517c2f56c05da4eddaa931b647fbed61d9db4908f878b7 -AUX mysql-5.1.53-conf.d 3071 SHA256 45da613841969adf564f9f2f08257f749539651ee2fae85266f59fdd7a6f8123 SHA512 d8b861bea36e6701f6959edcac893a5e553eb9eeac70719789635d989a5b9bd90c85643ccc51b86df01879a730c0da3815169d3b16984f3342e10e2f5096a67a WHIRLPOOL d1c06e8eb7d3ae239b9ffae1a273bee318db1429ab4ea55eba7e6db94f826e711cefaf9f67a53778e55dff94a49719644eeb813237e0e94b4ef926d38b0c39eb -AUX mysql-5.1.67-init.d 3596 SHA256 0794a8bfd3fff585e29f64b007f25bf202c47e7d2c17cc5001d59acb2c48c60d SHA512 4f41c2b33c5c296576f73ec73e64a815564e5d60600fbc6bf1d36eb40253b386cca2266a1ed9d0670e78c8dde645f700cf4bc67c4493b0bfef02fe77dec894d6 WHIRLPOOL ffaed73a56ec508dea6505d43529083cb40daa51418d51fcea7a2e620bb68c3171c605e779a054812925e7018cf1311ebac3feea30888f6fcf8e71aad0221383 AUX mysql.conf 37 SHA256 08daa863ddd50aff0b608621ed26936919211e286440951dca5866141291004d SHA512 7b4940666d21f09fda47e2b24bd252c83af4372f34f1b3410c59d8f439fb7c0166d5a1b8d857bf67f2263f15d95a0fa0b67f225152a18c180b67d28f4ceb5f00 WHIRLPOOL e2765bf32478fa6d3362760845188bc25b5e2a280cac66dc453b593445d8eaa0af4c92704ed20b4561377771b354605477d8cb5420937d1e9f970e0b4b106d85 AUX mysqld-wait-ready 1758 SHA256 98d845897c4098e4a3ca62cd3bad26a6fc2565a33737f1d1c91f9c98006c7157 SHA512 ad4a850d045149df156c8236ae114e94887626e3ca803dea9bcc3909349043b51357a71ac17d694e0217f7856e076a0736267fc1ea3dedbef8a319fc9014c01b WHIRLPOOL fb748c13658d276c061a44ffd488eeb2cf002df20ee94b5aa600175fa776e099211f89343d1322bbf03ddaebbafb30208e615ad78eb1fbedb26f77232662907b AUX mysqld.service 638 SHA256 75cde49c980757250d4e801c3f506f4540ae2afc59d5cd0cffc4f70e2c7e2de0 SHA512 631d0cafd6ee4703803143c402898b52d2508cd016b81f847503a09364cd3d4929f48d020a65ecf8d61200e7f7cd0ea11011380358bcf65e1125d40e5600d849 WHIRLPOOL 592e8ee78710e938a2ae85550b6bd4ab0c7ddde007ff386862c8450452d1f8d16206635948fd52d225ee8fdece519afad81f6944b23d09de969f25bf0174964f AUX mysqld_at.service 694 SHA256 5ba955058dfd26c3ed8a3b7d979ebd3e5cf0e1423cd1e730e400137059d10906 SHA512 f33864294ba2adea940027da32a9b744dd665e2d0325b0ff2a9d2ff7a1b7fbc2885e80ca548d4784c45665826b5fa7c0c73400352db5ac108260ef2e021d6752 WHIRLPOOL 1f703df092bdf03e2ebbab8db0aa618b7482b7116a21e31a6b41e84c3c35887b3ba6bf8c56fc8c74bfb0fabbb603f322502a6e34e745a2038cb1d188abf7d105 EBUILD mysql-init-scripts-2.0-r1.ebuild 2275 SHA256 7ae6e251f98b928c10eb46abfef3bc50db3c0b7eea6349c9b016b1d05d2a0784 SHA512 cce723f216b6dff00533b023646d515ab646240f32a252d79a888bd45ea57ae7bf596f1f7c047c002b209a1718c64b3b475febcf728bd69550533b3851ea0c16 WHIRLPOOL eb4de16877bc3a2be6acb01909e3778e5a1e7da27c39084d8acced4089666f7c0c846dd55fd9380dfecb5a79713c87a4f4be7bc8c9f04cd97339f5554df04015 -EBUILD mysql-init-scripts-2.0_pre1-r6.ebuild 2206 SHA256 6d03f74b1a740d34b302dc33c76ec8719b8a27d9f96bab4f16f679f9199e61b3 SHA512 8b311a4a71e94889a4005732e56a00d9918a2942762d80ec2821c6fcd640f138252614215ccebdb3a0ba72ed207d11ca69bb21c1e8be5c1e73ec2aa6f4137a7f WHIRLPOOL adedb3b71fa2102e257959b0d4a3824ea52ebc775e74d60a3a9eb16f02511b2625bcc1d6ed99cdb20d22d6424228c6db65ce192660a6bc5ddbe7820fb9db51a9 -MISC ChangeLog 8941 SHA256 2e7921634627ef53851f2097d118fa180e45655c800b160423edd94968d09f50 SHA512 caa46b39e3a9d9b93f0457c227a4bbce078402e49c2e43462990b6b2cf3237f3e0e10254440d653eeffbf7891505b348b61362e8b74400f4f17acaaabab8709a WHIRLPOOL 654ddffd8c7547eb67d4e93e9baaa1f68177e51b26b9ccf2ea1a2a15fb84d728a75abe7dc10aaf564b3af67927135d786d5887acc5059b8a5a8ca80d1e1467c1 +MISC ChangeLog 9105 SHA256 7511fd2b3d6b65a31db9ebc6cb6494d3becb11f188f28ca2b16a9d8ea026641c SHA512 e1e0ae32263e04fa7924b4d1fa2e31a2461281af9cac4a417666da8eace1daaf43c69d1af6a559391b424dc7d9aa151f5cc2ed471b6b31e783e3c051ee06dee7 WHIRLPOOL ee022b16dac6c4a842c640dc414433d740dc4e8745415ed8f7efce8ab63030f463caca4c89b8d24eba5b7443084c2129d8872e492ff4411958f3a2e54afb14e9 MISC metadata.xml 159 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7 SHA512 f06513333c3d0b329da5d8ea142c0dbd58d9c40c559d92ae4b0ac7e5fae848f56a832867c79f6931148de7d97302b690ce676f911d477e85ebab7798ce198d92 WHIRLPOOL b99390a39596639a5903a470d8a00dcfdc001c2cd70631526b1586b9a32893c00692fcb19cb2764979f128318dd01782be4d3a84ad82ee202da77d908d56c0b5 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQIcBAEBCAAGBQJUgBz1AAoJELp701BxlEWfNQgQAJEblst4In+WWjAfXFYWS3xa -9/F2YIx7CUtMrpGPkPbtvB+FHBSG7XtWg5v6WtU++tMf9wvGS+dWek22NvdoTBVc -ZgwfWnYkq+9z4skSAChUnj4QjacC0aZ4RXC3AwsuP2J9d1LSq2whJIw5sS5ex/0F -NZ2XlkFEpH12WYOsd6bvrW/MKPzZQ3uaQK+2uytzmHMvRZ0HrTy6EJjKJpMCbywc -fbkZKcZeEVPjzb+FFH0EdHAB9Fm33C2+vBx3KZeg853gBBBB3mzVTlSjqFaOl75M -3nf4AL8N/UGo4Fxj+sDtGew2IrPtji+01BK1fQ5GgJahQf1GARRlI62nWqeQ5Xc5 -2G3H4768PUdR542nuhmvjfrSMXz0pXWoiEpqsNGwZUWdnmHnU7NAvoQoyjGT6eht -wbPC7GV2oub1ob+VBhC4LUSw0VnKbs2Z1hxsxM2J6BfGaSZ+eLpqDvHfYGePilNy -xAm6S61oDl4bA0w6RCB1Gd2mRYbypXHgKSAsnn3A3Kzqi0IM42Og3wBUGYZr0w2F -9ZjL2WKiyxvr9vqPjPeYHemQHTjrCV037et7Bhi70xSK8bmbAlCHf/wrugiEGOkJ -8wjZqu1R5vojCbNxv9UIYI1zlQGqJ1mJEe5DRr7cI1kfwDJfDe/KVfTHo1Gn4Zlz -QkwOAOwWKB3lXJVXSdtW -=HC3c +iQIcBAEBCAAGBQJU4mDrAAoJENH3ge/59KO2OTcP/2+AmxfnRClhssrow+Y1Dv9B +TfmpUPUo/hX9YOE1ljdUy486XibzqoYEZmiHKnclJi8uacCDhxynWyw5fQM19boL +P5fqG9wbSOCXaaS0SKw4jcv+seZ/oiy8YQb/+2P1sCVUxaWOCMBsb2+rEHzXGvn+ +5h1sPRB6RzbUme55iKcO/wgcG+lHayZrcQgG+yXp2ipQDVwNfCVv1r9LyIRpXLoa +Rl88/BTeOKZbG0ig1MMQlU78vtCDY2/ar7D+5Lcc+LFEMT1xmHhIMm5l4QqyovF6 +8fdB9I396Z9s2MZS7GJ1uSZYb5459cuHMVgNWTBCUf9KDI3VJZhpV+d7chDO+90d +1V7VL1/V3/XlCZvf7e+sMdGJzlcWUn62zOlp37g4mIBc3Mry8JCXpUhbVA7g4Jsb +7/P01pyLpC1u6dfWqNVJt+YJPJ0dzLYu47+ztbYuYjNVqRplVFNBn9/yn82bbbAG +PqnUchws+4bOVmTNmdxx/zURcmFz5jXHyCPR1XsY9fKlJRTvri82PsTlL+2J2kL5 +TqTOyNLlEuSLCNrfgBkCF1Ar+IPKUHliA2Wgs/5DNfaUouRIRGFdQyyWwTHpcnqY +/VJ5F9aUEPWUn1B+bXr0B1vggY3IHma/tDfbzDcFS+yPSr0lJQKMsebkOpX/EX1H +8ieLEHGamKX1/GtwbOGA +=NiMx -----END PGP SIGNATURE----- diff --git a/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d b/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d deleted file mode 100644 index df4c3a467690..000000000000 --- a/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.53-conf.d,v 1.2 2011/01/15 17:54:31 robbat2 Exp $ - -# If you want a non-stock location for the config file, uncomment or update -# either of these as needed. If you do use it, you must make sure that none of -# your socket, pidfile, datadir, logfiles, binary logs, relay logs or InnoDB -# files collide with each other. -MY_CNF="/etc/mysql/my.cnf" -#MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}" -#MY_CNF="${MY_CNF:-/etc/mysql/my-${SVCNAME/mysql.}.cnf}" - -# Place any additional arguments here that you might need -# Common/useful options: -# --skip-slave-start=1 - For bringing up replication initially -# --server-id=NNN - Server ID for replication -# --skip-networking - lock it down to UNIX sockets only -MY_ARGS="" - -# This setting (in seconds) should be high enough to allow InnoDB to do a full -# checkpoint recovery. 900 is the default used in the upstream RPM startup -# scripts. 30 seconds should be sufficent if you just have a tiny <1GiB -# database. After the core startup is done, we wait this long for the UNIX -# socket to appear. -STARTUP_TIMEOUT="900" - -# This is how long, in milliseconds, we wait for pidfile to be created, early -# in the startup. -STARTUP_EARLY_TIMEOUT="1000" - -# How long (in seconds) should we wait for shutdown? -STOP_TIMEOUT=120 - -# integer [-20 .. 19 ] default 0 -# change the priority of the server -20 (high) to 19 (low) -# see nice(1) for description -#NICE=0 - -# See start-stop-daemon(8) for possible settings -#IONICE=2 - -# If defined, --verbose gets passed to S-S-D -#DEBUG=1 - -# Depending on your usage of MySQL, you may also wish to start it after some -# other services are up. Uncomment the lines below as needed. If these aren't -# enough for you, we encourage you to file a bug, and help us understand how -# you are using MySQL. - -# Do your MySQL ACLs refer to hostnames not in your /etc/hosts? -# If so, you need DNS before you can accept connections. -# Avoid dependency circular loops if you use MySQL to power a local DNS server. -#rc_use="dns" -#rc_after="dns" - -# Does your MySQL bind to an IP on an interface other than net.lo? -# Alternatively you might wish to specify the exact interface here. -#rc_use="net" -#rc_after="net" - -# Do you store your MySQL files on a SAN or other network filesystem, that is -# provided by the netmount init script? -#rc_need="netmount" - -# 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" - -# Should any one of the instances satisfy the requirement for MySQL coming up? -# By default, we say no. -[ "${SVCNAME}" != mysql ] && rc_provide="!mysql" -# But uncomment this next instead if you think it should. -#rc_provide="mysql" - -# The conditional above has a false-positive "failure" return value as a -# side-effect, and since it's the last statement, without the next line, this -# script returns failure. -return 0 -# vim: ft=gentoo-conf-d et ts=4 sw=4: diff --git a/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d b/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d deleted file mode 100644 index e1fb608b4515..000000000000 --- a/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d +++ /dev/null @@ -1,125 +0,0 @@ -#!/sbin/runscript -# 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/files/mysql-5.1.67-init.d,v 1.2 2014/09/23 01:23:27 grknight Exp $ - -depend() { - use net.lo - # localmount needed for $basedir - need localmount -} - -get_config() { - my_print_defaults --config-file="$1" mysqld | - sed -n -e "s/^--$2=//p" -} - -mysql_svcname() { - local ebextra= - case "${SVCNAME}" in - mysql*) ;; - *) ebextra=" (mysql)" ;; - esac - echo "${SVCNAME}${ebextra}" -} - -start() { - # Check for old conf.d variables that mean migration was not yet done. - set | egrep -sq '^(mysql_slot_|MYSQL_BLOG_PID_FILE|STOPTIMEOUT)' - rc=$? - # Yes, MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING is a hidden variable. - # It does have a use in testing, as it is possible to build a config file - # that works with both the old and new init scripts simulateously. - if [ "${rc}" = 0 -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then - eerror "You have not updated your conf.d for the new mysql-init-scripts-2 revamp." - eerror "Not proceeding because it may be dangerous." - return 1 - fi - - # Now we can startup - ebegin "Starting $(mysql_svcname)" - - MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}" - - if [ ! -r "${MY_CNF}" ] ; then - eerror "Cannot read the configuration file \`${MY_CNF}'" - return 1 - fi - - # tail -n1 is critical as these we only want the last instance of the option - local basedir=$(get_config "${MY_CNF}" basedir | tail -n1) - local datadir=$(get_config "${MY_CNF}" datadir | tail -n1) - local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1) - local socket=$(get_config "${MY_CNF}" socket | tail -n1) - - if [ ! -d "${datadir}" ] ; then - eerror "MySQL datadir \`${datadir}' is empty or invalid" - eerror "Please check your config file \`${MY_CNF}'" - return 1 - fi - - 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)) - if [ -z ${DBPKG_P} ] ; then - eerror "You don't appear to have a server package installed yet." - else - eerror "You don't appear to have the mysql database installed yet." - eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..." - fi - return 1 - fi - - local piddir="${pidfile%/*}" - checkpath -d --owner mysql:mysql --mode 0755 "$piddir" - rc=$? - if [ $rc -ne 0 ]; then - eerror "Directory $piddir for pidfile does not exist and cannot be created" - return 1 - fi - - local startup_timeout=${STARTUP_TIMEOUT:-900} - local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000} - local tmpnice="${NICE:+"--nicelevel "}${NICE}" - local tmpionice="${IONICE:+"--ionice "}${IONICE}" - start-stop-daemon \ - ${DEBUG:+"--verbose"} \ - --start \ - --exec "${basedir}"/sbin/mysqld \ - --pidfile "${pidfile}" \ - --background \ - --wait ${startup_early_timeout} \ - ${tmpnice} \ - ${tmpionice} \ - -- --defaults-file="${MY_CNF}" ${MY_ARGS} - local ret=$? - if [ ${ret} -ne 0 ] ; then - eend ${ret} - return ${ret} - fi - - ewaitfile ${startup_timeout} "${socket}" - eend $? || return 1 - - save_options pidfile "${pidfile}" - save_options basedir "${basedir}" -} - -stop() { - ebegin "Stopping $(mysql_svcname)" - - local pidfile="$(get_options pidfile)" - local basedir="$(get_options basedir)" - local stop_timeout=${STOP_TIMEOUT:-120} - - start-stop-daemon \ - ${DEBUG:+"--verbose"} \ - --stop \ - --exec "${basedir}"/sbin/mysqld \ - --pidfile "${pidfile}" \ - --retry ${stop_timeout} - eend $? -} -# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet: - diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r6.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r6.ebuild deleted file mode 100644 index 050e4c8289e4..000000000000 --- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r6.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# 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_pre1-r6.ebuild,v 1.10 2014/08/10 20:01:21 slyfox Exp $ - -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="!