From 4c8a162e22a3c0c3f5f3b8498dc8505f82bf285f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 10 Mar 2008 15:22:13 +0000 Subject: [PATCH] Only check for downgrades on the native glibc version ... let people screw up any other system #212912. Package-Manager: portage-2.2_pre2 --- sys-libs/glibc/ChangeLog | 7 ++++++- sys-libs/glibc/Manifest | 14 +++++++------- sys-libs/glibc/glibc-2.6.1.ebuild | 6 +++--- sys-libs/glibc/glibc-2.7-r1.ebuild | 4 ++-- sys-libs/glibc/glibc-2.7.ebuild | 6 +++--- sys-libs/timezone-data/Manifest | 15 ++++++++++++++- 6 files changed, 35 insertions(+), 17 deletions(-) diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 25612a194961..d1cbd181e4af 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.572 2008/01/16 22:46:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.573 2008/03/10 15:22:13 vapier Exp $ + + 10 Mar 2008; Mike Frysinger glibc-2.6.1.ebuild, + glibc-2.7.ebuild, glibc-2.7-r1.ebuild: + Only check for downgrades on the native glibc version ... let people screw + up any other system #212912. 16 Jan 2008; Mike Frysinger glibc-2.7-r1.ebuild: Add some ~sparc love. diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index d71170e79862..7b093ee33f9e 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -182,16 +182,16 @@ EBUILD glibc-2.5-r2.ebuild 38677 RMD160 16c6bb911b3d97f1e8a9632f220f27b94a156833 EBUILD glibc-2.5-r3.ebuild 38677 RMD160 fd1ba0c2b4a9aee52666be1b00bf67f5090fa04d SHA1 8838c614b1c58f5279a5e98389c5ea56ab2ecf97 SHA256 417b99032cd614026678bf3b83a4effab7e774d46cd2285f805d00ddbbf0d694 EBUILD glibc-2.5-r4.ebuild 38679 RMD160 94adde51f8b61d6eeeffd917c0d03618f0e242b6 SHA1 b5ba47757ed8fd11e3a73cdf7491e3cea9a796d0 SHA256 3a8b5fca45f9511719a8abaca4d481b9c6813e9926aa48cae9983ad9b63417c9 EBUILD glibc-2.5.1.ebuild 38754 RMD160 4f351c8e74913b579d558df61f7e85df1550a26a SHA1 45d207e25f3b8a1752dfb0df4bdac06945991c46 SHA256 d108a1c5a82bece216b4b469f234b9d5c979431d0ab2f053fbe4c873d9dd2ba2 -EBUILD glibc-2.6.1.ebuild 12134 RMD160 d064808786a26ab3b51c6e90e6428780c2ae7393 SHA1 0d4c3be41dd7260ef837ff238737e59c5d6c72e4 SHA256 6ab204508294dd80c9331c86172ebef45b824d578c1bee7c69f009676918cf81 +EBUILD glibc-2.6.1.ebuild 12171 RMD160 e5f42300addd0e71ddef39561527bf54edde0ff3 SHA1 38956c2ec2e24f7925f2046eebd0a4f42e00d53b SHA256 7a9399026e53ee9d53a3c9f4fe5d4628d04e4e107dbc098ad2f87f5f0ab82cfd EBUILD glibc-2.6.ebuild 39505 RMD160 87c1e6fd2f982345133c1bb85424cdb80a1b71c8 SHA1 1792f6be2d12f8a4c8f4759fb00e18754459cf52 SHA256 edb61c6412783b34b6071cad06c916bf075389543206698505f9a80bfb7edafe -EBUILD glibc-2.7-r1.ebuild 12181 RMD160 507a5b7bf3af8f8466b0c5492d782904fc1f341a SHA1 c09d01c1f887dfec20013f1c2de840380e6abe45 SHA256 c2cf9ff38152b371af79b42593a52793e4ff1e98b3028b897dd373b5c10453f7 -EBUILD glibc-2.7.ebuild 12161 RMD160 57be0a12b64cd1d77f4525205b060cae077e56c5 SHA1 30ac756497ffb6dbfbf5414bc3176c6484333357 SHA256 375a28c28ce580b27f24cb3176224fd2f4e51e10952e6cd88cc4e01b54e0922c -MISC ChangeLog 108677 RMD160 5c8cfc8115f2c8e38862d1d0c4601a15b78c1f7b SHA1 aaab60665e4fbb8c811e28e61ffb192599ad5405 SHA256 ea223ce524e44246f0655f26e9abc0b92a71a5fc5dd77e90385abafa36eade93 +EBUILD glibc-2.7-r1.ebuild 12219 RMD160 a1ec6167be08b2ce5d73be780eebaea2d0fcd168 SHA1 02f90e1613668192f1d3f7a2a8d0cbc57d7a52d9 SHA256 d2ab63712033e17c84496bbbf6fccb09e64d09270179403359d3d52ffad3a740 +EBUILD glibc-2.7.ebuild 12199 RMD160 3b8e59191f73aff0075785eb10aebf82dc97918e SHA1 d3ec3bbabed04020581bf6d1ceb72b3f30a1a327 SHA256 bb97977640865d37adb3c655c1533c2bfa60b99dda1ea59f1c57e08c998f4b08 +MISC ChangeLog 108897 RMD160 46abfe41ad1fe538e3d509503d19478e24fce2d8 SHA1 2ee59dc4a984ff1a85d0e0f429789896187c5076 SHA256 8d3635e1d6a51090d524d4b03e13efdfcc560b82dcc4e5783736c961e624c6f3 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHxvPbj9hvisErhMIRAudDAJ4gmM87vhklIzhBqKkENv8e6qgzWgCgkyPO -FMTF/bWd/LNolM68MAPugJk= -=treg +iD8DBQFH1VI4j9hvisErhMIRAv5SAJoDETi5HX4CfB0AX1VmOYsgxDQ/NwCgoWT4 +RwfHpvwZhnwXQlBbQGzc+gg= +=ZO7n -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/glibc-2.6.1.ebuild b/sys-libs/glibc/glibc-2.6.1.ebuild index 3bcf794e1f86..8a2925e689d6 100644 --- a/sys-libs/glibc/glibc-2.6.1.ebuild +++ b/sys-libs/glibc/glibc-2.6.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.6.1.ebuild,v 1.18 2008/02/28 17:48:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.6.1.ebuild,v 1.19 2008/03/10 15:22:13 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -189,7 +189,7 @@ eblit-src_unpack-post() { pkg_setup() { # prevent native builds from downgrading ... maybe update to allow people # to change between diff -r versions ? (2.3.6-r4 -> 2.3.6-r2) - if [[ ${ROOT} != "/" ]] && ! tc-is-cross-compiler ; then + if [[ ${ROOT} == "/" ]] && [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then if has_version '>'${CATEGORY}/${PF} ; then eerror "Sanity check to keep you from breaking your system:" eerror " Downgrading glibc is not supported and a sure way to destruction" diff --git a/sys-libs/glibc/glibc-2.7-r1.ebuild b/sys-libs/glibc/glibc-2.7-r1.ebuild index 68d6ff0b49e5..8566eb00de3d 100644 --- a/sys-libs/glibc/glibc-2.7-r1.ebuild +++ b/sys-libs/glibc/glibc-2.7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.7-r1.ebuild,v 1.9 2008/02/10 00:24:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.7-r1.ebuild,v 1.10 2008/03/10 15:22:13 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -190,7 +190,7 @@ eblit-src_unpack-post() { pkg_setup() { # prevent native builds from downgrading ... maybe update to allow people # to change between diff -r versions ? (2.3.6-r4 -> 2.3.6-r2) - if [[ ${ROOT} != "/" ]] && ! tc-is-cross-compiler ; then + if [[ ${ROOT} == "/" ]] && [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then if has_version '>'${CATEGORY}/${PF} ; then eerror "Sanity check to keep you from breaking your system:" eerror " Downgrading glibc is not supported and a sure way to destruction" diff --git a/sys-libs/glibc/glibc-2.7.ebuild b/sys-libs/glibc/glibc-2.7.ebuild index 2f48c50c409e..d55f1fdf1146 100644 --- a/sys-libs/glibc/glibc-2.7.ebuild +++ b/sys-libs/glibc/glibc-2.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.7.ebuild,v 1.9 2007/11/18 03:49:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.7.ebuild,v 1.10 2008/03/10 15:22:13 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -190,7 +190,7 @@ eblit-src_unpack-post() { pkg_setup() { # prevent native builds from downgrading ... maybe update to allow people # to change between diff -r versions ? (2.3.6-r4 -> 2.3.6-r2) - if [[ ${ROOT} != "/" ]] && ! tc-is-cross-compiler ; then + if [[ ${ROOT} == "/" ]] && [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then if has_version '>'${CATEGORY}/${PF} ; then eerror "Sanity check to keep you from breaking your system:" eerror " Downgrading glibc is not supported and a sure way to destruction" diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest index 1777cfabe956..a19ea13d1613 100644 --- a/sys-libs/timezone-data/Manifest +++ b/sys-libs/timezone-data/Manifest @@ -1,12 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX timezone-data-2005n-makefile.patch 3504 RMD160 c08c65c6a6ae0392dfc5128801251c5d1c6d3b0d SHA1 ba0f9dd788b0cce06c7b016e3a9ff672e307aa23 SHA256 5eb2068da4df12a2eb84caebe262c285b62e244e046b50869b6a80e16401d707 DIST tzcode2007h.tar.gz 190412 RMD160 aaff5fd619a89bc2a868995c5e2068583d129820 SHA1 d04c6be80aa846d6927169b240b426d00dc6f8d9 SHA256 d9be06167a3a882e39abed547037f1404935fa80410022af455060a1ba9c8bbb DIST tzcode2007j.tar.gz 190038 RMD160 52661ebb2f40440fa70384d1fc53653d3cd36136 SHA1 3c7c60203dcfe472db5eeef906be155f19c90864 SHA256 696b5fd267c991bb814a69b0bfff8ca4edf484f5859c955ec15a134a1d7045c9 DIST tzcode2007k.tar.gz 190093 RMD160 7c661e2b611bc59b29135dbf2161ab49257ba17d SHA1 2ff7cf783186677689633a794481da2019b65507 SHA256 1e5630747b12d82e106ff52173f890fe1975e2e72768872db8c64de9eace33d4 +DIST tzcode2008a.tar.gz 190126 RMD160 1f320c0bd05b65ba488bd657b58836223060f7a0 SHA1 aa68bc0bc1aba465692c8acefcf86641f240a802 SHA256 3d0fcf4c260614a88d4ee0041ef45bceedf2b4b697647cbd47c8b72766715c72 DIST tzdata2007i.tar.gz 162977 RMD160 d55df98db7e2dddfec70a6c69b39a668c8488ff9 SHA1 b13aeaae142c45183ddba5a9dc10f1c399b41c3a SHA256 70bb254ae0da44d71f6d0932ffe34f61457bf41c38dfd389a7bf5bfb544a362b DIST tzdata2007j.tar.gz 163202 RMD160 a3699d9405b7229b33b0c381ef624a6afb7a81be SHA1 c615434776c8aaa5dd5c85eaa5e33028bc66b1c9 SHA256 0319a3dc08f05a92b5c409cc7278a45fa6194bcdfdd27918554bd3d8d6d33c6d DIST tzdata2007k.tar.gz 163688 RMD160 cc80faf9db0252f32ed0f902056160d4de2fac3f SHA1 d64928c84555a67be2eace926c066911b35b0d39 SHA256 37e986086ce1a1ccb9a4f24c2b77ede54f0eae2ee9959e7a191a49cedb405783 +DIST tzdata2008a.tar.gz 163981 RMD160 9f7c24c4260afd8a7043d99ca27ec3af789a7e54 SHA1 0a43a9b96b48421657f0e09534a23b664fc58d18 SHA256 104a270bdc7a511cffd41d2722ff3fafd0caf221b4344263316177e8a64abbf1 EBUILD timezone-data-2007i.ebuild 2403 RMD160 472ab45788797a7bbc362872bf9dadb5a26ae9b7 SHA1 3f5949342ecbda3dfbbefc92054b8fbc9ed1d93a SHA256 d55b83bd78ff8bfab34684e93c4f1cc8765a0819e9ee5fb58bb713395c802b96 EBUILD timezone-data-2007j.ebuild 2398 RMD160 fa300b522a53f529fd9306e0596523ef63a1508c SHA1 c3c585cbfd5ff800fed71ae64222e0dff5c88fdd SHA256 99d3a713a735640a2c11cff3128524e305196914880bd410e34fc1dc86dbe419 EBUILD timezone-data-2007k.ebuild 2400 RMD160 9523360c956c110ab64c54570b314ec64cc82762 SHA1 0b7eb00cedd2a9be223ecbd34d53411731b0044d SHA256 c317389397df384f4f072c84aedca3b38c46f498bd98fd962f5fd0b9dc487e40 -MISC ChangeLog 14802 RMD160 a83f7d18429968eec42f9f490c8debc7b5b9f073 SHA1 79e039dfa51a9245e3d6ce67b4b0684fadaa0641 SHA256 18c1aae50f9a286a5343b10ee0b0816a319f540f942d21a0e061550972a23572 +EBUILD timezone-data-2008a.ebuild 2410 RMD160 d29efeb86387a1e5748f35a5af3a0123ba20a9eb SHA1 f84bdc0b1b7f119f57c9a6e874112d06e85ab450 SHA256 f0feb3e525e76f5ca58f468c59aa826d5a0096ebbf5310f662fb36cb134ff090 +MISC ChangeLog 14960 RMD160 cdf042a486322d9fbc8998d3a3895172c803d2bd SHA1 95ee04115227c70259c78491b3f30630e1818d00 SHA256 c28432b49f1db826ec0b828f1ed0dbdc2aae0255aeaba9171b73160623d163c9 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFH1VKGj9hvisErhMIRAqyhAJ9+a+XXXMmPnPxEd9EGaS5/zjg87ACgl/RP +WfmYpBSp8LfiSyl8BCOQWRU= +=R5go +-----END PGP SIGNATURE----- -- 2.26.2