Do not rely on a.out.h #221939 by Mart Raudsepp. arm/s390/sh stable

Package-Manager: portage-2.2_pre7-r1/cvs/Linux 2.6.25 AMD Athlon(tm) 64 X2 Dual Core Processor 4200+

4 files changed, 47 insertions, 5 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 557f56dd2049..79faea6ca084 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.238 2008/04/28 17:01:56 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.239 2008/06/07 17:46:28 vapier Exp $
+
+  07 Jun 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.13.1-no-a.out.patch, util-linux-2.13.1.1.ebuild:
+  Do not rely on a.out.h #221939 by Mart Raudsepp.
 
   28 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   util-linux-2.13.1.1.ebuild:
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 93f2825b7334..8c8cb825e821 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
 AUX crypto-loop.initd 1722 RMD160 a4015562eb8ac2946082acd54599dc0ad95ca2f1 SHA1 c33d9f04ba9b3ba778bf91404ef559cbc9a8a24f SHA256 6acbd91fdda145b511f380c6d01d0fb9049500d78a109ee54a305e7986b6de88
 AUX no-symlink-resolve.patch 316 RMD160 a38941174577c046e982d696b245e8c64d491caa SHA1 8cb06d4ed19ab4330b1e3841d0f824d19ea66a7c SHA256 e02ba35bde41df4fcbf215a4598427711bd8104b883f9bd7aeab76c1c8741db9
@@ -29,6 +32,7 @@ AUX util-linux-2.13-locale.patch 3028 RMD160 243732d4e353932908837a3b354e4b7486e
 AUX util-linux-2.13-script-SIGWINCH.patch 1338 RMD160 276f52d6f07dfa145eac7693d79531193a12d666 SHA1 4524f74d0ed8a7242667c3532e733fb9d8d4a23f SHA256 edf47e56e844a4af3efe643501ee5905be3957e3c76c97925df87bb61921e619
 AUX util-linux-2.13-setuid-checks.patch 1860 RMD160 9146bad2a5593424f52cea4615e4fe53cff60654 SHA1 c4da69c54a735c9fa717ef9c0dc07d11cd731181 SHA256 aec9802cace8538a77e006721b05bf50436b116f5e56d7468ca85ffc253d7e0a
 AUX util-linux-2.13-uclibc.patch 1627 RMD160 3c52bac5b792c3ee6ccf69324729793314f279af SHA1 d85ad97b602daec290cc28858269ae4bcc0666f3 SHA256 7f0c5dcf91d3143c99006ada59ccb7842427933ad14e39c88bfaa7985d91a392
+AUX util-linux-2.13.1-no-a.out.patch 659 RMD160 8398db67db7224038e51cd9febc239d0cd6072d7 SHA1 29573af66b0e1fd68cfacf7109ad8470fbebc432 SHA256 4b70927a0c635c514d2ee71a33d71e43292e70b4fcfaae2fc789383f3486b51b
 DIST loop-AES-v3.1f.tar.bz2 173423 RMD160 7490e3d90727621fde3052fd1747af338518b158 SHA1 abcc9c29c16596923a0c50a9190025a08b069ef4 SHA256 f744f3dd74b554d1a2e3788752c4a63049647bfd2bae71d9fff2427c0e175ca7
 DIST loop-AES-v3.2c.tar.bz2 222421 RMD160 d6b3781103aa64aa6db738083ff2d1adb4f9ca8f SHA1 63102863459370e35f4edb26e83f548f8ce1a7bb SHA256 c0313b445cb41ef586ba9774fc7cbf41114d93064b3417cf8512da6f746d3542
 DIST util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800 RMD160 82e54aedd691aa93b67de9dfb9049a3f012a29f7 SHA1 69b757c28b6401abe454f060c2a24da49e2d129a SHA256 565a0cc6c3c148a66969276ae9d34dc34f19fbd45df2740343793ee067b3700f
@@ -40,8 +44,15 @@ DIST util-linux-ng-2.13.1.tar.bz2 2854716 RMD160 954c9dfcc551a6bbe4fbeff5cd2a79a
 DIST util-linux-ng-2.13.tar.bz2 2702618 RMD160 499b1c5c2060b23d8bf504122a22122af99eb7fa SHA1 089638d9d3d57a22f80069f7f149b7521e689804 SHA256 002412e93d8e85b1796fdbe65bbb0a4d193d0317a7155fda4270667e08bdfbfc
 EBUILD util-linux-2.12r-r8.ebuild 6784 RMD160 c84f893ea67a77fa83a2f04952ae745aaa4dcba4 SHA1 39cb035a05e3437e2a9cd28e4b6d7c0886e9a7b7 SHA256 23cdadb84a007b9560e6d70b0d42d51fca3902712c071790ec0676564c1ce3c0
 EBUILD util-linux-2.13-r2.ebuild 2420 RMD160 cf497228d22b6f3f0c5a6b80a7824887de527172 SHA1 434720501c11f981ed2a22df866b3bce5095351f SHA256 b4433a9d0b237909f02dcb5a1e0bd5acc5fc06ae2234176e2f221db2567e891e
-EBUILD util-linux-2.13.1.1.ebuild 2505 RMD160 0e4477bf7032f22f9fa9e6b7db3ec0a7e5bb5dcc SHA1 608af900599c0027d55b94fafcc85ab24f40fb27 SHA256 ea3484f9cf112ff2f9c2124613435b4fc2ebb94aa0aa54c32884d3e4a861d7ef
+EBUILD util-linux-2.13.1.1.ebuild 2556 RMD160 d978885e3991f0fc3ad8c644dd18729a5e64e221 SHA1 88290c8a81bf5224857721d44bc0468ffb0a1538 SHA256 521ab0e1579b99e4f12cc371b2738744a7a2e4d94e4053c1607f1d5a2881ada1
 EBUILD util-linux-2.13.1.ebuild 2496 RMD160 6b15df8432deb6382b1148894e7befdf745785dc SHA1 30c010f7331c7e0a04188384ee84089a907e9cf6 SHA256 06f3a65abe957cc2a0e4e3de092d79476c3308b50bef6d3c345e0acb1297117c
 EBUILD util-linux-9999.ebuild 2115 RMD160 2e24b69651286dc8c751b39c7b43a9cbd6f579ab SHA1 e6d713b5b4e75bf2ede0b4a817789e75a9ef52f7 SHA256 c96b58766ac5e81ca689d2ae3e84cb9252b3129b4ea7f88b15cc2d290b86515f
-MISC ChangeLog 36892 RMD160 75b4331a7d9a8c2b3d8d316f73909ff3fb42c618 SHA1 439dc26f0280dfd4dea832d44c024ce72351df93 SHA256 12fb7739f894ef20b7634ed5de06e53bbeeebb7327d77064bd0b415c657fcd60
+MISC ChangeLog 37061 RMD160 85967db5325de80eecf426da849d51065224c65e SHA1 854af16a851d1ea821825b52c840b3a17b6b72dc SHA256 7d1ca4c7fed20d688b6eba78a27ab5900aa5662fc678ec15cb8b2b332ce36c2d
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFISsl6j9hvisErhMIRAsvyAKDHv4wBslXlKOBhEMck3IAquCAKqACgup6N
+2TMTuC7Np7C0Qg2MtDPrNek=
+=/7ol
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/util-linux-2.13.1-no-a.out.patch b/sys-apps/util-linux/files/util-linux-2.13.1-no-a.out.patch
new file mode 100644
index 000000000000..d871575e4a3d
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.13.1-no-a.out.patch
@@ -0,0 +1,26 @@
+http://bugs.gentoo.org/221939
+http://article.gmane.org/gmane.linux.utilities.util-linux-ng/1463
+
+--- a/text-utils/more.c
++++ b/text-utils/more.c
+@@ -54,7 +54,6 @@
+ #include <sys/stat.h>
+ #include <sys/file.h>
+ #include <sys/wait.h>
+-#include <a.out.h>
+ #include "xstrncpy.h"
+ #include "nls.h"
+ #include "widechar.h"
+@@ -546,9 +545,9 @@ magic(f, fs)
+ 
+ 	if (fread(twobytes, 2, 1, f) == 1) {
+ 		switch(twobytes[0] + (twobytes[1]<<8)) {
+-		case OMAGIC:	/* 0407 */
+-		case NMAGIC:	/* 0410 */
+-		case ZMAGIC:	/* 0413 */
++		case 0407:	/* a.out obj */
++		case 0410:	/* a.out exec */
++		case 0413:	/* a.out demand exec */
+ 		case 0405:
+ 		case 0411:
+ 		case 0177545:
diff --git a/sys-apps/util-linux/util-linux-2.13.1.1.ebuild b/sys-apps/util-linux/util-linux-2.13.1.1.ebuild
index 656fd83c5893..8fb07f02ae9d 100644
--- a/sys-apps/util-linux/util-linux-2.13.1.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.13.1.1.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-apps/util-linux/util-linux-2.13.1.1.ebuild,v 1.7 2008/04/28 17:01:56 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.13.1.1.ebuild,v 1.8 2008/06/07 17:46:28 vapier Exp $
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
 inherit eutils
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="crypt loop-aes nls old-linux selinux slang unicode"
 
 RDEPEND="!sys-process/schedutils
@@ -46,6 +46,7 @@ src_unpack() {
 		use loop-aes && epatch "${WORKDIR}"/loop-AES-*/util-linux-ng-*.diff
 		use unicode && sed -i 's:-lncurses:-lncursesw:' */Makefile.in #208976
 		epatch "${FILESDIR}"/${PN}-2.13-ioprio-syscalls.patch #190613
+		epatch "${FILESDIR}"/${PN}-2.13.1-no-a.out.patch #221939
 	fi
 }