diff options
author | Mike Frysinger <vapier@gentoo.org> | 2004-10-08 00:36:02 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2004-10-08 00:36:02 +0000 |
commit | 066082c5295664fb3bc665c04b139f094a2d42fb (patch) | |
tree | d229d55695813dccfeaebad0430261f9649f0e0c /sys-fs/xfsprogs | |
parent | Stable on x86 wrt security bug #66357 (diff) | |
download | historical-066082c5295664fb3bc665c04b139f094a2d42fb.tar.gz historical-066082c5295664fb3bc665c04b139f094a2d42fb.tar.bz2 historical-066082c5295664fb3bc665c04b139f094a2d42fb.zip |
some uclibc loving and a configure fix #65735
Diffstat (limited to 'sys-fs/xfsprogs')
-rw-r--r-- | sys-fs/xfsprogs/ChangeLog | 11 | ||||
-rw-r--r-- | sys-fs/xfsprogs/Manifest | 12 | ||||
-rw-r--r-- | sys-fs/xfsprogs/files/2.6.13-configure.patch | 10 | ||||
-rw-r--r-- | sys-fs/xfsprogs/files/2.6.13-uclibc-mincore.patch | 52 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-2.6.13.ebuild | 14 |
5 files changed, 90 insertions, 9 deletions
diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog index bda6fab6dff7..22664647b1d9 100644 --- a/sys-fs/xfsprogs/ChangeLog +++ b/sys-fs/xfsprogs/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-fs/xfsprogs # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.23 2004/09/22 03:36:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.24 2004/10/08 00:36:02 vapier Exp $ + + 07 Oct 2004; <solar@gentoo.org> +files/2.6.13-uclibc-mincore.patch, + xfsprogs-2.6.13.ebuild: + mincore() does not appear to be part of POSIX or the Single Unix + Specification. So we patch it out for uclibc builds. + + 07 Oct 2004; Mike Frysinger <vapier@gentoo.org> xfsprogs-2.6.13.ebuild, + +files/2.6.13-configure.patch: + Add patch to fix configure mis-detection #65735 by Marc Bevand. 21 Sep 2004; Mike Frysinger <vapier@gentoo.org> xfsprogs-2.6.13.ebuild: Make nls support optional #64862 by Aaron GIpson. diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 9a9ca13d6af2..bf82baf25929 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,22 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 5914f3d56c6a25a9eb313255d1f9256d ChangeLog 6665 +MD5 a1eac82551d0108f9d776b5d555ba949 ChangeLog 7058 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 9e42ad06e1b82266ed01a015574ef469 xfsprogs-1.3.13.ebuild 1390 MD5 c29238db0357c31e34cad800d7cdbc1c xfsprogs-2.3.9.ebuild 1497 MD5 b120762512e6b89ddd3bd48286423e02 xfsprogs-2.6.0.ebuild 1545 MD5 daca0f10022d70dd802cc79be37f1acf xfsprogs-2.6.3.ebuild 1551 -MD5 ca170dd7891b2aef7a1aa3e11b1cea2c xfsprogs-2.6.13.ebuild 1609 +MD5 6461306a81999756f315f813107027e9 xfsprogs-2.6.13.ebuild 1921 MD5 cef66d8125681fa3a3eccf0be0698b25 files/digest-xfsprogs-1.3.13 71 MD5 0ad03e88abe9cb756d16c8b202804fbc files/digest-xfsprogs-2.3.9 70 MD5 ed760013d5e82b9e87430f596ba7b76c files/digest-xfsprogs-2.6.0 70 MD5 904d7858666a28afd34a5e0e4e5bc2ae files/digest-xfsprogs-2.6.3 70 MD5 3d4e4aea1da9c2a07cc9581930aab671 files/digest-xfsprogs-2.6.13 71 +MD5 911b4db00dda0d9aad7d79c8f2de99c3 files/2.6.13-configure.patch 238 +MD5 7b6e7879f947d56d486f1d17f3c8f3e1 files/2.6.13-uclibc-mincore.patch 1141 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFBUPM5HTu7gpaalycRAjVsAJ9joV8L2JjMIolUG9T42FwhTPeUrQCg3prw -dtAVHdsyeILQQBvt8S/zRN4= -=OsdK +iD8DBQFBZeD/HTu7gpaalycRAkUaAJ94oc9XOlPNZp25m/UagSUQlcKNDwCfWXot +SygKAKyTxoEHrkep2jsDfqw= +=VIxg -----END PGP SIGNATURE----- diff --git a/sys-fs/xfsprogs/files/2.6.13-configure.patch b/sys-fs/xfsprogs/files/2.6.13-configure.patch new file mode 100644 index 000000000000..d05fea227dd0 --- /dev/null +++ b/sys-fs/xfsprogs/files/2.6.13-configure.patch @@ -0,0 +1,10 @@ +--- configure.in.orig 2004-09-29 00:20:24.361474856 +0200 ++++ configure.in 2004-09-29 00:20:37.668451888 +0200 +@@ -1,4 +1,7 @@ + AC_INIT(include/libxfs.h) ++ ++AC_PROG_CC ++ + AC_CONFIG_HEADER(include/platform_defs.h) + + AC_ARG_ENABLE(shared, diff --git a/sys-fs/xfsprogs/files/2.6.13-uclibc-mincore.patch b/sys-fs/xfsprogs/files/2.6.13-uclibc-mincore.patch new file mode 100644 index 000000000000..e299870c40e7 --- /dev/null +++ b/sys-fs/xfsprogs/files/2.6.13-uclibc-mincore.patch @@ -0,0 +1,52 @@ +--- xfsprogs-orig/io/mmap.c Fri Apr 30 20:34:08 2004 ++++ xfsprogs-2.6.13/io/mmap.c Sat Sep 11 15:34:43 2004 +@@ -44,7 +44,9 @@ + static cmdinfo_t munmap_cmd; + static cmdinfo_t mwrite_cmd; + static cmdinfo_t madvise_cmd; ++#ifndef __UCLIBC__ + static cmdinfo_t mincore_cmd; ++#endif + + mmap_region_t *maptable; + int mapcount; +@@ -679,6 +681,7 @@ + return 0; + } + ++#ifndef __UCLIBC__ + int + mincore_f( + int argc, +@@ -757,6 +760,7 @@ + free(vec); + return 0; + } ++#endif + + void + mmap_init(void) +@@ -822,6 +826,7 @@ + madvise_cmd.oneline = _("give advice about use of memory"); + madvise_cmd.help = madvise_help; + ++#ifndef __UCLIBC__ + mincore_cmd.name = _("mincore"); + mincore_cmd.altname = _("mi"); + mincore_cmd.cfunc = mincore_f; +@@ -830,6 +835,7 @@ + mincore_cmd.flags = CMD_NOFILE_OK | CMD_FOREIGN_OK; + mincore_cmd.args = _("[off len]"); + mincore_cmd.oneline = _("find mapping pages that are memory resident"); ++#endif + + add_command(&mmap_cmd); + add_command(&mread_cmd); +@@ -837,5 +843,7 @@ + add_command(&munmap_cmd); + add_command(&mwrite_cmd); + add_command(&madvise_cmd); ++#ifndef __UCLIBC__ + add_command(&mincore_cmd); ++#endif + } diff --git a/sys-fs/xfsprogs/xfsprogs-2.6.13.ebuild b/sys-fs/xfsprogs/xfsprogs-2.6.13.ebuild index 1886dc273361..0c07e12b9dd7 100644 --- a/sys-fs/xfsprogs/xfsprogs-2.6.13.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-2.6.13.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.6.13.ebuild,v 1.5 2004/09/22 03:36:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.6.13.ebuild,v 1.6 2004/10/08 00:36:02 vapier Exp $ -inherit flag-o-matic +inherit flag-o-matic eutils DESCRIPTION="xfs filesystem utilities" HOMEPAGE="http://oss.sgi.com/projects/xfs/" @@ -11,7 +11,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="alpha amd64 hppa ia64 mips ppc ~sparc x86" -IUSE="nls" +IUSE="nls uclibc" RDEPEND="virtual/libc sys-fs/e2fsprogs" @@ -28,6 +28,14 @@ src_unpack() { -e '/^PKG_[[:upper:]]*_DIR/s:= := $(DESTDIR):' \ include/builddefs.in \ || die "sed include/builddefs.in failed" + + # mincore does not appear to be part of POSIX or the Single Unix + # Specification. So we patch it out for uclibc builds. + epatch ${FILESDIR}/${PV}-uclibc-mincore.patch + use uclibc && append-flags -D__UCLIBC__ + + epatch ${FILESDIR}/${PV}-configure.patch #65735 + autoreconf -i || die "autoreconf" } src_compile() { |