glibc-2.5 issue, bug#160278, thanks to Paul Moore

Package-Manager: portage-2.1.1-r2

diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 978e711a1aa09400fba8faf61d93faf3d1236f17..3789e719385e4d09fc04d8f8a687b030e4f520f5 100644 (file)
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -46,6 +46,10 @@ AUX baselayout-1.12.5-dmesg.patch 5202 RMD160 ce0b8e91590888fa6f9f0cc84ed29bd3a6
 MD5 05e23d7d8cd139821113afb7d6ef56cc files/baselayout-1.12.5-dmesg.patch 5202
 RMD160 ce0b8e91590888fa6f9f0cc84ed29bd3a6007156 files/baselayout-1.12.5-dmesg.patch 5202
 SHA256 837ed3be21597ae44de1debe5f48460945039cf1f4b7de9f067d5e78bb83a0c6 files/baselayout-1.12.5-dmesg.patch 5202
+AUX baselayout-1.12.8-checkfs.patch 429 RMD160 1815e3241978d80b6262db05309ddf3716116aef SHA1 8b14630c5618dfc9aa26fd4b3bb16a7ff473b301 SHA256 ccc3d6c3366ff990837d74a3bad44880b25390778bbc86814c46da54d6a50152
+MD5 5f22d7850be949e28fb26ece1a836890 files/baselayout-1.12.8-checkfs.patch 429
+RMD160 1815e3241978d80b6262db05309ddf3716116aef files/baselayout-1.12.8-checkfs.patch 429
+SHA256 ccc3d6c3366ff990837d74a3bad44880b25390778bbc86814c46da54d6a50152 files/baselayout-1.12.8-checkfs.patch 429
 AUX baselayout-1.12.8-r2440.patch 1779 RMD160 eeda0b3883163b8d8184812aadee8525d0be0b54 SHA1 0b6134cc3e5f95461078988a9bedf3ee1edd8cb1 SHA256 31f0936868430bd06a161372b0030fadc086121f71fabc40b9588575360fa202
 MD5 322d665a75ef5cc1db64ab02242c634e files/baselayout-1.12.8-r2440.patch 1779
 RMD160 eeda0b3883163b8d8184812aadee8525d0be0b54 files/baselayout-1.12.8-r2440.patch 1779
@@ -88,6 +92,10 @@ EBUILD baselayout-1.12.8-r1.ebuild 17222 RMD160 bbbf217a167d3d3336cfc52f1419ba69
 MD5 4c2d228369d8ff1f53210afcf873dfb6 baselayout-1.12.8-r1.ebuild 17222
 RMD160 bbbf217a167d3d3336cfc52f1419ba69d22a2219 baselayout-1.12.8-r1.ebuild 17222
 SHA256 20d19c44f5b69138a652137d3713a5731ceb9a813270355935cfb18914543429 baselayout-1.12.8-r1.ebuild 17222
+EBUILD baselayout-1.12.8-r2.ebuild 17265 RMD160 6dce7734d90493714e91ee587936a8b303449f3a SHA1 ab9481155805a2810682ed464171ea4fcc6460d1 SHA256 817f4944e9f846eba46e4c2254d1d4d827534dbb2d7a4f2ccef737c0c9382407
+MD5 ef33dc78218831ab3158adedca75aeab baselayout-1.12.8-r2.ebuild 17265
+RMD160 6dce7734d90493714e91ee587936a8b303449f3a baselayout-1.12.8-r2.ebuild 17265
+SHA256 817f4944e9f846eba46e4c2254d1d4d827534dbb2d7a4f2ccef737c0c9382407 baselayout-1.12.8-r2.ebuild 17265
 EBUILD baselayout-1.12.8.ebuild 17035 RMD160 b7088b2a5f8aad3ce43b920b965f1280f24c3be1 SHA1 a2110deb651437e356ae4f9ce9b7d5b0d6e4f89e SHA256 2de062a8fff51618f17af46395ab9a202d229d86e8e0f8fe713da344ec3d4d9a
 MD5 082aa588289d254af8bbdfbf37f0a05e baselayout-1.12.8.ebuild 17035
 RMD160 b7088b2a5f8aad3ce43b920b965f1280f24c3be1 baselayout-1.12.8.ebuild 17035
@@ -104,10 +112,10 @@ EBUILD baselayout-1.13.0_alpha10.ebuild 9979 RMD160 a6cd64566591832f7a27ceed9865
 MD5 3142bbab3c121b88c30c92eef33acbba baselayout-1.13.0_alpha10.ebuild 9979
 RMD160 a6cd64566591832f7a27ceed9865c5243c0f55d3 baselayout-1.13.0_alpha10.ebuild 9979
 SHA256 426ef12358ae0ff7bd6e112fbea601bbf263f605b7c7ccd2e0858a837f6a9bd6 baselayout-1.13.0_alpha10.ebuild 9979
-MISC ChangeLog 86749 RMD160 43208f88c6f4fffd18f5a0d2b995059a40243ca9 SHA1 277eb5a2fc4c8dcb684d90258ed8b9af3aa06052 SHA256 21f59bdaa38bcc1d6295407317a19260d2c9ec9100835c43cd84d2806bbfe9e4
-MD5 5213eee41ce7962443710483a503e9a2 ChangeLog 86749
-RMD160 43208f88c6f4fffd18f5a0d2b995059a40243ca9 ChangeLog 86749
-SHA256 21f59bdaa38bcc1d6295407317a19260d2c9ec9100835c43cd84d2806bbfe9e4 ChangeLog 86749
+MISC ChangeLog 87023 RMD160 dc1ca562f7db6b4539ec7110615a1145999b5f4f SHA1 31a8ce5c8414a883d34e6572f2a5eb58684d5b12 SHA256 4719bc6ec5e02ea31f620ee8ac0865e683f58ba11e3399514301949199340a63
+MD5 8ee5bda192f1e81df9616578ee10ebfe ChangeLog 87023
+RMD160 dc1ca562f7db6b4539ec7110615a1145999b5f4f ChangeLog 87023
+SHA256 4719bc6ec5e02ea31f620ee8ac0865e683f58ba11e3399514301949199340a63 ChangeLog 87023
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -130,6 +138,9 @@ SHA256 d5d0b95861bb7a1549bf4ac58d623bc24aa07e6887ecc31d1210c92b66901765 files/di
 MD5 cc3850f4547f7dda6cb6da09e200b7a5 files/digest-baselayout-1.12.8-r1 256
 RMD160 ee4d86476675e157d2237a3611970af21d27450f files/digest-baselayout-1.12.8-r1 256
 SHA256 d5d0b95861bb7a1549bf4ac58d623bc24aa07e6887ecc31d1210c92b66901765 files/digest-baselayout-1.12.8-r1 256
+MD5 cc3850f4547f7dda6cb6da09e200b7a5 files/digest-baselayout-1.12.8-r2 256
+RMD160 ee4d86476675e157d2237a3611970af21d27450f files/digest-baselayout-1.12.8-r2 256
+SHA256 d5d0b95861bb7a1549bf4ac58d623bc24aa07e6887ecc31d1210c92b66901765 files/digest-baselayout-1.12.8-r2 256
 MD5 a906c725ad1f2a7363333865e410227c files/digest-baselayout-1.13.0_alpha10 280
 RMD160 4f16b9967ebd8f5133edcbd9eee430020b4094ea files/digest-baselayout-1.13.0_alpha10 280
 SHA256 2aff7adae59490722f3880d409166e61514c4dd90043c810f172776627f80505 files/digest-baselayout-1.13.0_alpha10 280

diff --git a/sys-apps/suspend2-userui/ChangeLog b/sys-apps/suspend2-userui/ChangeLog
index ca5f3b1a579837ba8d51fe569ab3dd83be90e509..cfd48d91eb628f7542cf9ecc7259f51cfa8fcc98 100644 (file)
--- a/sys-apps/suspend2-userui/ChangeLog
+++ b/sys-apps/suspend2-userui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/suspend2-userui
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/ChangeLog,v 1.16 2006/12/16 21:29:50 alonbl Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/ChangeLog,v 1.17 2007/01/05 18:20:20 alonbl Exp $
+
+  05 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/suspend2-userui-0.6.4-glibc.patch, suspend2-userui-0.6.4-r1.ebuild:
+  glibc-2.5 issue, bug#160278, thanks to Paul Moore
 
   16 Dec 2006; Alon Bar-Lev <alonbl@gentoo.org> metadata.xml:
   Modify maintainer

diff --git a/sys-apps/suspend2-userui/Manifest b/sys-apps/suspend2-userui/Manifest
index 781cbb331a4cbb279d7bab8bf8792ff742e13969..28d86d88dc9149d36113154040a44179518912d3 100644 (file)
--- a/sys-apps/suspend2-userui/Manifest
+++ b/sys-apps/suspend2-userui/Manifest
@@ -6,6 +6,10 @@ AUX suspend2-userui-0.6.3-skewed-text.patch 416 RMD160 09daa415e2e09958f5e4c8e6a
 MD5 ad0e358f60075a903529f7e8d4b64d3f files/suspend2-userui-0.6.3-skewed-text.patch 416
 RMD160 09daa415e2e09958f5e4c8e6a7c9940732042e72 files/suspend2-userui-0.6.3-skewed-text.patch 416
 SHA256 a62cf316af1e9cc93afe3a50e627bbd56c4b06a8d7d56896835a5aa5db0dd427 files/suspend2-userui-0.6.3-skewed-text.patch 416
+AUX suspend2-userui-0.6.4-glibc.patch 496 RMD160 ce164e74fc2cd6b30ff4086b82eef870f0d4e47f SHA1 accc29396a93c87ebdcf0e04c2c56fdb1a366e0b SHA256 0fbe276f9d740ce65ff3f7458047cd02d0cf9f560c35332f6a3774ebde2c09db
+MD5 2c130ab6830433fc1ff9481a6f568dc5 files/suspend2-userui-0.6.4-glibc.patch 496
+RMD160 ce164e74fc2cd6b30ff4086b82eef870f0d4e47f files/suspend2-userui-0.6.4-glibc.patch 496
+SHA256 0fbe276f9d740ce65ff3f7458047cd02d0cf9f560c35332f6a3774ebde2c09db files/suspend2-userui-0.6.4-glibc.patch 496
 AUX suspend2-userui-0.6.4-remove-debug.patch 580 RMD160 696462ca16cee491dc0dee1ae581b8c5a0d3b72f SHA1 e6be12ed9389e5abf2d67ae9fdd2355be7955171 SHA256 e0ddd798c53ff576fc5e3431cdf0b6c91686f5ede81388abca178ee64e4ed0a4
 MD5 914b309d095d1ba985ebb419a5fcabf8 files/suspend2-userui-0.6.4-remove-debug.patch 580
 RMD160 696462ca16cee491dc0dee1ae581b8c5a0d3b72f files/suspend2-userui-0.6.4-remove-debug.patch 580
@@ -16,18 +20,18 @@ EBUILD suspend2-userui-0.6.3-r1.ebuild 1642 RMD160 d2a8d53148d5b7714506d1f77646d
 MD5 5f15373b602355b6db9a66247405c4f0 suspend2-userui-0.6.3-r1.ebuild 1642
 RMD160 d2a8d53148d5b7714506d1f77646dd2032f6e165 suspend2-userui-0.6.3-r1.ebuild 1642
 SHA256 21204fdb947050d545c0d22133bbef73f9118793ecf973ffc9b02901041693fc suspend2-userui-0.6.3-r1.ebuild 1642
-EBUILD suspend2-userui-0.6.4-r1.ebuild 1771 RMD160 acee82a7db3a7c459ee57eac8a1d1e3fa5a62c73 SHA1 b971ab6547c9fbe0e9fbe6f2d9d1f080837d1df3 SHA256 d4852c6973364febdebef4f8cbfc51e276b0abcf6f82a81361b60986b0bbfb42
-MD5 45c76af5829527c1e4b233c9ce1271ea suspend2-userui-0.6.4-r1.ebuild 1771
-RMD160 acee82a7db3a7c459ee57eac8a1d1e3fa5a62c73 suspend2-userui-0.6.4-r1.ebuild 1771
-SHA256 d4852c6973364febdebef4f8cbfc51e276b0abcf6f82a81361b60986b0bbfb42 suspend2-userui-0.6.4-r1.ebuild 1771
+EBUILD suspend2-userui-0.6.4-r1.ebuild 1816 RMD160 65967caa6714c363e9ddabb9eb9b613016d9eff4 SHA1 37751b38641516295a0e4002898297ee38ec0c4b SHA256 f9829d244c95fc1b9874cdd1c37f02bb71fea6b3f3d4aece7216daa1be77a094
+MD5 9cc37e4008fbe97ec21f01bb803192bf suspend2-userui-0.6.4-r1.ebuild 1816
+RMD160 65967caa6714c363e9ddabb9eb9b613016d9eff4 suspend2-userui-0.6.4-r1.ebuild 1816
+SHA256 f9829d244c95fc1b9874cdd1c37f02bb71fea6b3f3d4aece7216daa1be77a094 suspend2-userui-0.6.4-r1.ebuild 1816
 EBUILD suspend2-userui-0.6.4.ebuild 1597 RMD160 b197147a9d52e842ce9774f85a0d803872192fd8 SHA1 d520e444d0346770715476ccdb7eb0bfd2ad8ad0 SHA256 15a6c3a4b8831ef97347256429159e6ea8563be116d2929b184686fd4eb1ea10
 MD5 451b964a8d3b95567e5f888c53b1f6a8 suspend2-userui-0.6.4.ebuild 1597
 RMD160 b197147a9d52e842ce9774f85a0d803872192fd8 suspend2-userui-0.6.4.ebuild 1597
 SHA256 15a6c3a4b8831ef97347256429159e6ea8563be116d2929b184686fd4eb1ea10 suspend2-userui-0.6.4.ebuild 1597
-MISC ChangeLog 2780 RMD160 ea755246a3393c0ed67c6ca0402eeadacfaf7de1 SHA1 9d2ed7052049431c11bb619e1b205f9bf6e8897d SHA256 8386b461edd4d8abb5adfc2ddabe754e620b8d52bca86949580393d005a7aca1
-MD5 85d56ced9563806ed9f95e3ef92f5562 ChangeLog 2780
-RMD160 ea755246a3393c0ed67c6ca0402eeadacfaf7de1 ChangeLog 2780
-SHA256 8386b461edd4d8abb5adfc2ddabe754e620b8d52bca86949580393d005a7aca1 ChangeLog 2780
+MISC ChangeLog 2958 RMD160 1b727be7a41647c8024109148a6c7283dd36ce52 SHA1 041764560513b5a722c84c1f647326b39d435b00 SHA256 401d17efbad619644b97e88d34e94225cbfe2189a38b6306160470dab94ec291
+MD5 cdac2945b9c8fffb1294e8709a1af7eb ChangeLog 2958
+RMD160 1b727be7a41647c8024109148a6c7283dd36ce52 ChangeLog 2958
+SHA256 401d17efbad619644b97e88d34e94225cbfe2189a38b6306160470dab94ec291 ChangeLog 2958
 MISC metadata.xml 247 RMD160 d8749371cfc49b45025d6bc5c71eb9b2536f418b SHA1 edc7253d34677f69b45bbcee472908989269cd5d SHA256 330b68cdad708d1490b912def754cef1be6c0b15e903977951dbbe283cd85ceb
 MD5 270d3b4ec6bc63c529761a90458eb929 metadata.xml 247
 RMD160 d8749371cfc49b45025d6bc5c71eb9b2536f418b metadata.xml 247

diff --git a/sys-apps/suspend2-userui/files/suspend2-userui-0.6.4-glibc.patch b/sys-apps/suspend2-userui/files/suspend2-userui-0.6.4-glibc.patch
new file mode 100644 (file)
index 0000000..fa63437
--- /dev/null
+++ b/sys-apps/suspend2-userui/files/suspend2-userui-0.6.4-glibc.patch
@@ -0,0 +1,15 @@
+--- suspend2-userui-0.6.4/userui.h.orig        2007-01-05 10:43:40.000000000 -0500
++++ suspend2-userui-0.6.4/userui.h     2007-01-05 10:44:11.000000000 -0500
+@@ -124,8 +124,11 @@ static __inline__ int generic_fls(int x)
+ /*
+  * Work around random glibc bugs where getpid() caches an invalid pid.
+  */
++#ifdef _syscall0
+ #define __NR_xgetpid __NR_getpid
+ static inline _syscall0(pid_t, xgetpid);
+-
++#else
++static inline pid_t xgetpid(void) { return syscall(__NR_getpid); }
++#endif
+ 
+ #endif /* _USERUI_H_ */

diff --git a/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r1.ebuild b/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r1.ebuild
index 7e3a91d98eccc0d21fefa9d34eaf56c90ba2f3a3..270118e190e627b883372ffbdbcb6267ba598247 100644 (file)
--- a/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r1.ebuild
+++ b/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r1.ebuild,v 1.1 2006/06/13 18:00:18 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r1.ebuild,v 1.2 2007/01/05 18:20:20 alonbl Exp $
 
 inherit toolchain-funcs eutils
 
@@ -24,8 +24,9 @@ DEPEND="virtual/libc
 src_unpack() {
        unpack ${A}
 
-       cd ${S}
-       epatch ${FILESDIR}/${P}-remove-debug.patch
+       cd "${S}"
+       epatch "${FILESDIR}/${P}-remove-debug.patch"
+       epatch "${FILESDIR}/${P}-glibc.patch"
 }
 
 src_compile() {