diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-06-07 17:46:29 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-06-07 17:46:29 +0000 |
| commit | a399ffb837b323d8a4899d57478b6fd53e005920 (patch) | |
| tree | 4aa63df102349a5a97d9d0d40215ea5a757d5ac4 /sys-apps/util-linux/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-a399ffb837b323d8a4899d57478b6fd53e005920.tar.gz gentoo-2-a399ffb837b323d8a4899d57478b6fd53e005920.tar.bz2 gentoo-2-a399ffb837b323d8a4899d57478b6fd53e005920.zip | |
Do not rely on a.out.h #221939 by Mart Raudsepp. arm/s390/sh stable
(Portage version: 2.2_pre7-r1/cvs/Linux 2.6.25 AMD Athlon(tm) 64 X2 Dual Core Processor 4200+)
Diffstat (limited to 'sys-apps/util-linux/files')
| -rw-r--r-- | sys-apps/util-linux/files/util-linux-2.13.1-no-a.out.patch | 26 |
1 files changed, 26 insertions, 0 deletions
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: |