diff options
author | Francesco Riosa <vivo@gentoo.org> | 2005-10-20 11:35:57 +0000 |
---|---|---|
committer | Francesco Riosa <vivo@gentoo.org> | 2005-10-20 11:35:57 +0000 |
commit | cb0264e4ee94a95954cd13d00d57bbc691c7660d (patch) | |
tree | 6ff6a345d92e1e3656b25024bde3934f417455df | |
parent | Adding docbook-xml-dtd-4.3 dependency (bug #109326) (diff) | |
download | historical-cb0264e4ee94a95954cd13d00d57bbc691c7660d.tar.gz historical-cb0264e4ee94a95954cd13d00d57bbc691c7660d.tar.bz2 historical-cb0264e4ee94a95954cd13d00d57bbc691c7660d.zip |
fix Bug #109881 collision-protect stops MySQL upgrade to 4.1.14
Package-Manager: portage-2.0.53_rc5
-rw-r--r-- | dev-db/mysql/ChangeLog | 7 | ||||
-rw-r--r-- | dev-db/mysql/Manifest | 12 | ||||
-rw-r--r-- | dev-db/mysql/mysql-4.0.25-r2.ebuild | 18 | ||||
-rw-r--r-- | dev-db/mysql/mysql-4.0.26.ebuild | 18 | ||||
-rw-r--r-- | dev-db/mysql/mysql-4.1.14.ebuild | 18 | ||||
-rw-r--r-- | dev-db/mysql/mysql-5.0.12_beta.ebuild | 18 | ||||
-rw-r--r-- | dev-db/mysql/mysql-5.0.13_rc.ebuild | 18 |
7 files changed, 67 insertions, 42 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 851b707984f3..f7a2a1c81481 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-db/mysql # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.249 2005/10/20 08:17:44 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.250 2005/10/20 11:35:57 vivo Exp $ + + 20 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.25-r2.ebuild, + mysql-4.0.26.ebuild, mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild, + mysql-5.0.13_rc.ebuild: + fix Bug #109881 collision-protect stops MySQL upgrade to 4.1.14 20 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.13-r1.ebuild, mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild, mysql-5.0.13_rc.ebuild: diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 49486dd1fa15..e05cdd167f0e 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,4 +1,4 @@ -MD5 c48a7a5aee2a6391b735398652b98d1a ChangeLog 45039 +MD5 cd0c8bda68eeca4e9c755b4a8ac44fa7 ChangeLog 45275 MD5 c6fcd70c34bed04e59808ec71c5bedfb files/digest-mysql-3.23.58-r1 140 MD5 631ed23db7ff8777599dee1c45edae0f files/digest-mysql-4.0.22 139 MD5 631ed23db7ff8777599dee1c45edae0f files/digest-mysql-4.0.22-r2 139 @@ -23,9 +23,9 @@ MD5 eb11a08abb447b7a69b192a6f9be3dbf mysql-3.23.58-r1.ebuild 7219 MD5 00acf2c6bc09118694e11fafdb7e3970 mysql-4.0.22-r2.ebuild 9814 MD5 b4e651d8ffcb8b7a92b9bf186081d6e3 mysql-4.0.22.ebuild 8941 MD5 ac74397784bc6979c6cee6319f5be131 mysql-4.0.24.ebuild 9833 -MD5 6ddc57a27bb81cc6417c0ff0f65ccebe mysql-4.0.25-r2.ebuild 13782 -MD5 fb51170ee4c074186668c3cdc838e4d4 mysql-4.0.26.ebuild 14840 +MD5 aabdd46ba96f2ac78657eb17c6f08edd mysql-4.0.25-r2.ebuild 13862 +MD5 30b1d64e5ad083f0f5894c41f14b74e8 mysql-4.0.26.ebuild 14921 MD5 c3f09dc9b5a59873d8ebe67b2096789b mysql-4.1.13-r1.ebuild 17592 -MD5 25c98fb473640eb53e4578c8a112e58f mysql-4.1.14.ebuild 18254 -MD5 460847947a093ed7c3ecbffb2ef362c7 mysql-5.0.12_beta.ebuild 18239 -MD5 19e20422eb6870242e5d93255003da3e mysql-5.0.13_rc.ebuild 18395 +MD5 2503c954993e1c453dda889259aa4102 mysql-4.1.14.ebuild 18334 +MD5 cddbdf27a5cbbe3ae521c332c48a8469 mysql-5.0.12_beta.ebuild 18319 +MD5 e81d22b10eba80ebb8212921dcc7d125 mysql-5.0.13_rc.ebuild 18475 diff --git a/dev-db/mysql/mysql-4.0.25-r2.ebuild b/dev-db/mysql/mysql-4.0.25-r2.ebuild index 04d4472d1172..c1462405c162 100644 --- a/dev-db/mysql/mysql-4.0.25-r2.ebuild +++ b/dev-db/mysql/mysql-4.0.25-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.20 2005/10/17 13:49:25 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.21 2005/10/20 11:35:57 vivo Exp $ inherit eutils gnuconfig flag-o-matic versionator @@ -334,17 +334,21 @@ src_install() { chown -R mysql:mysql "${D}/${DATADIR}" fi - dodir "/var/log/mysql" - touch ${D}/var/log/mysql/mysql.{log,err} - chmod 0660 ${D}/var/log/mysql/mysql.{log,err} + if [ -a "${DATADIR}" ] ; then + diropts "-m0755" + dodir "/var/log/mysql" + touch ${D}/var/log/mysql/mysql.{log,err} + chmod 0660 ${D}/var/log/mysql/mysql.{log,err} + keepdir "/var/log/mysql" + chown -R mysql:mysql "${D}/var/log/mysql" + fi diropts "-m0755" dodir "/var/run/mysqld" - keepdir "/var/run/mysqld" "${D}/var/log/mysql" + keepdir "/var/run/mysqld" chown -R mysql:mysql \ - "${D}/var/run/mysqld" \ - "${D}/var/log/mysql" + "${D}/var/run/mysqld" fi # docs diff --git a/dev-db/mysql/mysql-4.0.26.ebuild b/dev-db/mysql/mysql-4.0.26.ebuild index fd4183fd8d68..1db547a4fd00 100644 --- a/dev-db/mysql/mysql-4.0.26.ebuild +++ b/dev-db/mysql/mysql-4.0.26.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.26.ebuild,v 1.9 2005/10/17 13:49:25 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.26.ebuild,v 1.10 2005/10/20 11:35:57 vivo Exp $ inherit eutils gnuconfig flag-o-matic versionator @@ -363,17 +363,21 @@ src_install() { chown -R mysql:mysql "${D}/${DATADIR}" fi - dodir "/var/log/mysql" - touch ${D}/var/log/mysql/mysql.{log,err} - chmod 0660 ${D}/var/log/mysql/mysql.{log,err} + if [ -a "${DATADIR}" ] ; then + diropts "-m0755" + dodir "/var/log/mysql" + touch ${D}/var/log/mysql/mysql.{log,err} + chmod 0660 ${D}/var/log/mysql/mysql.{log,err} + keepdir "/var/log/mysql" + chown -R mysql:mysql "${D}/var/log/mysql" + fi diropts "-m0755" dodir "/var/run/mysqld" - keepdir "/var/run/mysqld" "${D}/var/log/mysql" + keepdir "/var/run/mysqld" chown -R mysql:mysql \ - "${D}/var/run/mysqld" \ - "${D}/var/log/mysql" + "${D}/var/run/mysqld" fi # docs diff --git a/dev-db/mysql/mysql-4.1.14.ebuild b/dev-db/mysql/mysql-4.1.14.ebuild index d796cd13df76..ff117f38c340 100644 --- a/dev-db/mysql/mysql-4.1.14.ebuild +++ b/dev-db/mysql/mysql-4.1.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.14 2005/10/20 08:17:44 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.15 2005/10/20 11:35:57 vivo Exp $ inherit eutils gnuconfig flag-o-matic versionator @@ -444,17 +444,21 @@ src_install() { chown -R mysql:mysql "${D}/${DATADIR}" fi - dodir "/var/log/mysql" - touch ${D}/var/log/mysql/mysql.{log,err} - chmod 0660 ${D}/var/log/mysql/mysql.{log,err} + if [ -a "${DATADIR}" ] ; then + diropts "-m0755" + dodir "/var/log/mysql" + touch ${D}/var/log/mysql/mysql.{log,err} + chmod 0660 ${D}/var/log/mysql/mysql.{log,err} + keepdir "/var/log/mysql" + chown -R mysql:mysql "${D}/var/log/mysql" + fi diropts "-m0755" dodir "/var/run/mysqld" - keepdir "/var/run/mysqld" "${D}/var/log/mysql" + keepdir "/var/run/mysqld" chown -R mysql:mysql \ - "${D}/var/run/mysqld" \ - "${D}/var/log/mysql" + "${D}/var/run/mysqld" fi # docs diff --git a/dev-db/mysql/mysql-5.0.12_beta.ebuild b/dev-db/mysql/mysql-5.0.12_beta.ebuild index 31be79a8ec5e..b686f08a7d10 100644 --- a/dev-db/mysql/mysql-5.0.12_beta.ebuild +++ b/dev-db/mysql/mysql-5.0.12_beta.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.12_beta.ebuild,v 1.13 2005/10/20 08:17:44 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.12_beta.ebuild,v 1.14 2005/10/20 11:35:57 vivo Exp $ inherit eutils flag-o-matic versionator @@ -444,17 +444,21 @@ src_install() { chown -R mysql:mysql "${D}/${DATADIR}" fi - dodir "/var/log/mysql" - touch ${D}/var/log/mysql/mysql.{log,err} - chmod 0660 ${D}/var/log/mysql/mysql.{log,err} + if [ -a "${DATADIR}" ] ; then + diropts "-m0755" + dodir "/var/log/mysql" + touch ${D}/var/log/mysql/mysql.{log,err} + chmod 0660 ${D}/var/log/mysql/mysql.{log,err} + keepdir "/var/log/mysql" + chown -R mysql:mysql "${D}/var/log/mysql" + fi diropts "-m0755" dodir "/var/run/mysqld" - keepdir "/var/run/mysqld" "${D}/var/log/mysql" + keepdir "/var/run/mysqld" chown -R mysql:mysql \ - "${D}/var/run/mysqld" \ - "${D}/var/log/mysql" + "${D}/var/run/mysqld" fi # docs diff --git a/dev-db/mysql/mysql-5.0.13_rc.ebuild b/dev-db/mysql/mysql-5.0.13_rc.ebuild index 3e6050679d53..58ae0342870c 100644 --- a/dev-db/mysql/mysql-5.0.13_rc.ebuild +++ b/dev-db/mysql/mysql-5.0.13_rc.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.13_rc.ebuild,v 1.3 2005/10/20 08:17:44 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.13_rc.ebuild,v 1.4 2005/10/20 11:35:57 vivo Exp $ inherit eutils flag-o-matic versionator @@ -448,17 +448,21 @@ src_install() { chown -R mysql:mysql "${D}/${DATADIR}" fi - dodir "/var/log/mysql" - touch ${D}/var/log/mysql/mysql.{log,err} - chmod 0660 ${D}/var/log/mysql/mysql.{log,err} + if [ -a "${DATADIR}" ] ; then + diropts "-m0755" + dodir "/var/log/mysql" + touch ${D}/var/log/mysql/mysql.{log,err} + chmod 0660 ${D}/var/log/mysql/mysql.{log,err} + keepdir "/var/log/mysql" + chown -R mysql:mysql "${D}/var/log/mysql" + fi diropts "-m0755" dodir "/var/run/mysqld" - keepdir "/var/run/mysqld" "${D}/var/log/mysql" + keepdir "/var/run/mysqld" chown -R mysql:mysql \ - "${D}/var/run/mysqld" \ - "${D}/var/log/mysql" + "${D}/var/run/mysqld" fi # docs |