diff options
| -rw-r--r-- | sys-apps/util-linux/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-apps/util-linux/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/util-linux/files/digest-util-linux-2.11z-r5 | 2 | ||||
| -rw-r--r-- | sys-apps/util-linux/files/util-linux-2.11z-pic.patch | 76 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.11z-r5.ebuild | 103 |
5 files changed, 191 insertions, 3 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index 9abc1c1c188f..30cc84311394 100644 --- a/sys-apps/util-linux/ChangeLog +++ b/sys-apps/util-linux/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/util-linux # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.44 2003/07/06 14:38:03 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.45 2003/07/12 17:42:40 solar Exp $ + +*util-linux-2.11z-r5 (12 Jul 2003) + + 12 Jul 2003; <solar@gentoo.org> util-linux-2.11z-r5.ebuild, + files/util-linux-2.11z-pic.patch: + Added defines for fPIC code to avoid the use the of old __NR* inline assembly + construction of syscalls 05 Jul 2003; Luca Barbato <lu_zero@gentoo.org> util-linux-2.11z-r4.ebuild: Keyworded ppc diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 0560494f9275..dd187d8e7496 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,6 +1,6 @@ -MD5 3e53010365b59dade267ca354fbe2ffd ChangeLog 6958 +MD5 9043aa41895acd976b45ebfd9948d3bc ChangeLog 7199 MD5 fdc6f7ebf1e7f279d96f19c330868aa2 util-linux-2.11y.ebuild 2109 -MD5 0cd926897e8b3294ec46d9b721f9386d util-linux-2.11z-r5.ebuild 2706 +MD5 c8193ffb13cb982c0873b778b8d38415 util-linux-2.11z-r5.ebuild 2814 MD5 b73abbe53ce7a49cad81cc855b7d5924 util-linux-2.11z-r4.ebuild 2410 MD5 48e36b9b6ea3bed4ea25292f9ae5a958 files/digest-util-linux-2.11y 152 MD5 02afa4d774f45ab0b9ef42ecc1748005 files/digest-util-linux-2.11z-r4 153 diff --git a/sys-apps/util-linux/files/digest-util-linux-2.11z-r5 b/sys-apps/util-linux/files/digest-util-linux-2.11z-r5 new file mode 100644 index 000000000000..b479cd78fc10 --- /dev/null +++ b/sys-apps/util-linux/files/digest-util-linux-2.11z-r5 @@ -0,0 +1,2 @@ +MD5 abaab0a441233d6b7763b89ea5ab4078 util-linux-2.11z.tar.bz2 1266784 +MD5 9d6c4c8a99188b6696b0735fa48f67c2 util-linux-2.11z-crypt-gentoo.patch.bz2 18249 diff --git a/sys-apps/util-linux/files/util-linux-2.11z-pic.patch b/sys-apps/util-linux/files/util-linux-2.11z-pic.patch new file mode 100644 index 000000000000..53c5089d8aa1 --- /dev/null +++ b/sys-apps/util-linux/files/util-linux-2.11z-pic.patch @@ -0,0 +1,76 @@ +diff -u -r -N util-linux-2.11z.orig/fdisk/llseek.c util-linux-2.11z/fdisk/llseek.c +--- util-linux-2.11z.orig/fdisk/llseek.c 2002-10-31 14:44:31.000000000 +0100 ++++ util-linux-2.11z/fdisk/llseek.c 2003-07-12 19:08:59.000000000 +0200 +@@ -3,6 +3,9 @@ + * + * Copyright (C) 1994 Remy Card. This file may be redistributed + * under the terms of the GNU Public License. ++ * ++ * Changes: ++ * 20030712 - Alexander Gabert <pappy@nikita.ath.cx> - adding PIC defines + */ + + #include <sys/types.h> +@@ -25,7 +28,8 @@ + + #else /* HAVE_LLSEEK */ + +-#if defined(__alpha__) || defined(__ia64__) || defined(__s390x__) ++/* do not use assembler to put together syscalls at compile time (for llseek for example) when using PIC */ ++#if defined(__PIC__) || defined(__pic__) || defined(__alpha__) || defined(__ia64__) || defined(__s390x__) + + #define my_llseek lseek + +diff -u -r -N util-linux-2.11z.orig/fdisk/sfdisk.c util-linux-2.11z/fdisk/sfdisk.c +--- util-linux-2.11z.orig/fdisk/sfdisk.c 2003-01-28 19:18:03.000000000 +0100 ++++ util-linux-2.11z/fdisk/sfdisk.c 2003-07-12 19:08:38.000000000 +0200 +@@ -28,6 +28,7 @@ + * + * Changes: + * 19990319 - Arnaldo Carvalho de Melo <acme@conectiva.com.br> - i18n ++ * 20030712 - Alexander Gabert <pappy@nikita.ath.cx> - adding PIC defines + */ + + #define PROGNAME "sfdisk" +@@ -130,7 +131,9 @@ + * + * Note: we use 512-byte sectors here, irrespective of the hardware ss. + */ +-#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__) ++ ++/* do not use the assembler constructed syscalls for seeking if compiled as PIC */ ++#if !defined(__PIC__) && !defined(__pic__) && !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__) + static + _syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo, + loff_t *, res, uint, wh); +@@ -142,7 +145,7 @@ + in = ((loff_t) s << 9); + out = 1; + +-#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__) ++#if !defined(__PIC__) && !defined(__pic__) && !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__) + if (_llseek (fd, in>>32, in & 0xffffffff, &out, SEEK_SET) != 0) { + #else + if ((out = lseek(fd, in, SEEK_SET)) != in) { +diff -u -r -N util-linux-2.11z.orig/mount/pivot_root.c util-linux-2.11z/mount/pivot_root.c +--- util-linux-2.11z.orig/mount/pivot_root.c 2002-11-29 12:02:56.000000000 +0100 ++++ util-linux-2.11z/mount/pivot_root.c 2003-07-12 19:07:39.000000000 +0200 +@@ -1,12 +1,17 @@ + /* pivot_root.c - Change the root file system */ + + /* Written 2000 by Werner Almesberger */ ++/* ++ * Jul 11 2003 <solar@gentoo.org> ++ * avoid using assembler constructed _syscall2() when PIC is needed ++ */ + + #include <stdio.h> + #include <errno.h> /* needed for <linux/unistd.h> below */ + +-#ifdef __ia64__ ++#if (defined(__ia64__) || defined(__PIC__) || defined(__pic__)) + # include <sys/syscall.h> ++# include <unistd.h> + # define pivot_root(new_root,put_old) syscall(SYS_pivot_root,new_root,put_old) + #else + # include <linux/unistd.h> diff --git a/sys-apps/util-linux/util-linux-2.11z-r5.ebuild b/sys-apps/util-linux/util-linux-2.11z-r5.ebuild new file mode 100644 index 000000000000..0fbad90a33b8 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.11z-r5.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11z-r5.ebuild,v 1.1 2003/07/12 17:42:41 solar Exp $ + +IUSE="crypt nls static pam" + +# hopefully this wont blow us on us on other arches. +# see below for details on pic.patch +#inherit eutils flag-o-matic +#filter-flags -fPIC + +S=${WORKDIR}/${P} +CRYPT_PATCH_P="${P}-crypt-gentoo" +DESCRIPTION="Various useful Linux utilities" +SRC_URI="mirror://kernel/linux/utils/${PN}/${P}.tar.bz2 + crypt? ( mirror://gentoo/${CRYPT_PATCH_P}.patch.bz2 )" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/" + +#KEYWORDS="x86 amd64 ppc sparc alpha ~arm mips hppa" +KEYWORDS="-* ~x86" +SLOT="0" +LICENSE="GPL-2" + +DEPEND="virtual/glibc + >=sys-apps/sed-4.0.5 + >=sys-libs/ncurses-5.2-r2 + pam? ( sys-apps/pam-login )" + +RDEPEND="${DEPEND} dev-lang/perl + nls? ( sys-devel/gettext )" + +src_unpack() { + unpack ${A} + + cd ${S} + + if [ ! -z "`use crypt`" ] ; then + epatch ${DISTDIR}/${CRYPT_PATCH_P}.patch.bz2 + fi + + # Fix rare failures with -j4 or higher + epatch ${FILESDIR}/${P}-parallel-make.patch + + # Fix unreadable df output + epatch ${FILESDIR}/no-symlink-resolve.patch + + # Support the upcoming "script -c COMMAND" feature now. + epatch ${FILESDIR}/${P}-script.patch + + # <kumba@gentoo.org> (22 Apr 2003) + # Fix fdisk so it works on SGI Disk Labels and lets the user + # Actually select a partition, rather than automatically + # choosing "4". + if [ "${ARCH}" = "mips" ] + then + epatch ${FILESDIR}/${P}-mips-fdisk-fix.patch + fi + + # <solar@gentoo.org> This patch should allow us to remove -fPIC + # out of the filter-flags we need this be able to emit position + # independent code so we can link our elf executables as shared + # objects. "prelink" should now also be able to take advantage + epatch ${FILESDIR}/${P}-pic.patch + + #enable pam only if we use it + use pam && sed -i "s:HAVE_PAM=no:HAVE_PAM=yes:" MCONFIG + + sed -i \ + -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \ + -e "s:CPU=.*:CPU=${CHOST%%-*}:" \ + -e "s:HAVE_SLN=no:HAVE_SLN=yes:" \ + -e "s:HAVE_TSORT=no:HAVE_TSORT=yes:" \ + -e "s:usr/man:usr/share/man:" \ + -e "s:usr/info:usr/share/info:" \ + -e "s:SUIDMODE=.*4755:SUIDMODE=4711:" \ + MCONFIG || die "MCONFIG sed" + + if [ -z "`use nls`" ] ; then + sed -i -e 's/DISABLE_NLS=no/DISABLE_NLS=yes/' MCONFIG || + die "MCONFIG nls sed" + fi +} + +src_compile() { + + econf || die "configure failed" + + if [ "`use static`" ] ; then + export LDFLAGS=-static + fi + emake || die "emake failed" + cd sys-utils && makeinfo *.texi || die "makeinfo failed" +} + +src_install() { + make DESTDIR="${D}" install || die "install failed" + + dodoc HISTORY MAINTAINER README VERSION + docinto licenses + dodoc licenses/* HISTORY + docinto examples + dodoc example.files/* +} |