diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-06-21 04:45:34 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2008-06-21 04:45:34 +0000 |
commit | 0c8437a1dffe8f4fe3910ebf5f46f21fb526a081 (patch) | |
tree | 620c083e5114c190028c0e610520ba8c273eda82 /sys-apps/util-linux | |
parent | Fixed to work with gcc-4.3*, bug #227689. (diff) | |
download | historical-0c8437a1dffe8f4fe3910ebf5f46f21fb526a081.tar.gz historical-0c8437a1dffe8f4fe3910ebf5f46f21fb526a081.tar.bz2 historical-0c8437a1dffe8f4fe3910ebf5f46f21fb526a081.zip |
old
Diffstat (limited to 'sys-apps/util-linux')
-rw-r--r-- | sys-apps/util-linux/files/util-linux-2.13-locale.patch | 121 | ||||
-rw-r--r-- | sys-apps/util-linux/files/util-linux-2.13-script-SIGWINCH.patch | 56 | ||||
-rw-r--r-- | sys-apps/util-linux/util-linux-2.13-r2.ebuild | 89 | ||||
-rw-r--r-- | sys-apps/util-linux/util-linux-2.13.1.ebuild | 92 |
4 files changed, 0 insertions, 358 deletions
diff --git a/sys-apps/util-linux/files/util-linux-2.13-locale.patch b/sys-apps/util-linux/files/util-linux-2.13-locale.patch deleted file mode 100644 index feb46f98af3a..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.13-locale.patch +++ /dev/null @@ -1,121 +0,0 @@ -http://bugs.gentoo.org/191111 -http://thread.gmane.org/gmane.linux.utilities.util-linux-ng/614 - -Move all locale/nls related includes to nls.h and make sure they are only -pulled in when ENABLE_NLS. When !ENABLE_NLS, don't include any locale/nls -related headers and stub out setlocale() as well. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - include/nls.h | 5 ++++- - misc-utils/cal.c | 1 - - misc-utils/look.c | 1 - - misc-utils/write.c | 1 - - text-utils/colrm.c | 2 +- - text-utils/more.c | 1 - - text-utils/pg.c | 2 -- - 7 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/include/nls.h b/include/nls.h -index f571ca5..e9f7927 100644 ---- a/include/nls.h -+++ b/include/nls.h -@@ -9,6 +9,8 @@ int main(int argc, char *argv[]); - - #ifdef ENABLE_NLS - # include <libintl.h> -+# include <locale.h> -+# include <nl_types.h> - # define _(Text) gettext (Text) - # ifdef gettext_noop - # define N_(String) gettext_noop (String) -@@ -16,9 +18,10 @@ int main(int argc, char *argv[]); - # define N_(String) (String) - # endif - #else --# include <locale.h> - # undef bindtextdomain - # define bindtextdomain(Domain, Directory) /* empty */ -+# undef setlocale -+# define setlocale(Category, Locale) /* empty */ - # undef textdomain - # define textdomain(Domain) /* empty */ - # define _(Text) (Text) -diff --git a/misc-utils/cal.c b/misc-utils/cal.c -index f5ede93..77333d8 100644 ---- a/misc-utils/cal.c -+++ b/misc-utils/cal.c -@@ -63,7 +63,6 @@ - #include <string.h> - #include <time.h> - #include <unistd.h> --#include <locale.h> - #include "errs.h" - #include "nls.h" - -diff --git a/misc-utils/look.c b/misc-utils/look.c -index 5c7e30c..9e25596 100644 ---- a/misc-utils/look.c -+++ b/misc-utils/look.c -@@ -59,7 +59,6 @@ - #include <strings.h> - #include <ctype.h> - #include <getopt.h> --#include <locale.h> - #include "pathnames.h" - #include "nls.h" - -diff --git a/misc-utils/write.c b/misc-utils/write.c -index b3c96d1..46b8f0a 100644 ---- a/misc-utils/write.c -+++ b/misc-utils/write.c -@@ -54,7 +54,6 @@ - #include <pwd.h> - #include <string.h> - #include <stdlib.h> --#include <locale.h> - #include <signal.h> - #include <sys/param.h> - #include <sys/signal.h> -diff --git a/text-utils/colrm.c b/text-utils/colrm.c -index 5e18a6f..e8b1ea4 100644 ---- a/text-utils/colrm.c -+++ b/text-utils/colrm.c -@@ -40,8 +40,8 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <locale.h> - -+#include "nls.h" - #include "widechar.h" - - /* -diff --git a/text-utils/more.c b/text-utils/more.c -index 19c4417..5dcae7b 100644 ---- a/text-utils/more.c -+++ b/text-utils/more.c -@@ -55,7 +55,6 @@ - #include <sys/file.h> - #include <sys/wait.h> - #include <a.out.h> --#include <locale.h> - #include "xstrncpy.h" - #include "nls.h" - #include "widechar.h" -diff --git a/text-utils/pg.c b/text-utils/pg.c -index 10bdd15..3e1b25e 100644 ---- a/text-utils/pg.c -+++ b/text-utils/pg.c -@@ -49,8 +49,6 @@ - #include <unistd.h> - #include <signal.h> - #include <setjmp.h> --#include <locale.h> --#include <nl_types.h> - #include <libgen.h> - - #ifdef HAVE_NCURSES_H --- -1.5.3.rc7 - diff --git a/sys-apps/util-linux/files/util-linux-2.13-script-SIGWINCH.patch b/sys-apps/util-linux/files/util-linux-2.13-script-SIGWINCH.patch deleted file mode 100644 index e8ed571be2ee..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.13-script-SIGWINCH.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit 2b8bbb5fb0f024ea3917fedbbbaf0fab1c1f6555 -Author: Karel Zak <kzak@redhat.com> -Date: Fri Oct 5 12:22:13 2007 +0200 - - script: dies on SIGWINCH - - The "doinput" process doesn't make a difference between SIGWINCH and - SIGCHILD. This process also sends unnecessary SIGWINCH to child (the - signal is ignored by child). Fixed. - - Signed-off-by: Karel Zak <kzak@redhat.com> - -diff --git a/misc-utils/script.c b/misc-utils/script.c -index d3272df..3b957d8 100644 ---- a/misc-utils/script.c -+++ b/misc-utils/script.c -@@ -99,6 +99,7 @@ int tflg = 0; - static char *progname; - - int die; -+int resized; - - static void - die_if_link(char *fn) { -@@ -235,8 +236,14 @@ doinput() { - if (die == 0 && child && kill(child, 0) == -1 && errno == ESRCH) - die = 1; - -- while (die == 0 && (cc = read(0, ibuf, BUFSIZ)) > 0) -- (void) write(master, ibuf, cc); -+ while (die == 0) { -+ if ((cc = read(0, ibuf, BUFSIZ)) > 0) -+ (void) write(master, ibuf, cc); -+ else if (cc == -1 && errno == EINTR && resized) -+ resized = 0; -+ else -+ break; -+ } - - done(); - } -@@ -255,11 +262,10 @@ finish(int dummy) { - - void - resize(int dummy) { -+ resized = 1; - /* transmit window change information to the child */ - (void) ioctl(0, TIOCGWINSZ, (char *)&win); - (void) ioctl(slave, TIOCSWINSZ, (char *)&win); -- -- kill(child, SIGWINCH); - } - - /* - - diff --git a/sys-apps/util-linux/util-linux-2.13-r2.ebuild b/sys-apps/util-linux/util-linux-2.13-r2.ebuild deleted file mode 100644 index 0f2981a0b668..000000000000 --- a/sys-apps/util-linux/util-linux-2.13-r2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# 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-r2.ebuild,v 1.10 2008/01/12 10:50:31 vapier Exp $ - -EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git" -inherit eutils -[[ ${PV} == "9999" ]] && inherit git - -MY_PV=${PV/_/-} -MY_P=${PN}-ng-${MY_PV} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux-ng/" -if [[ ${PV} == "9999" ]] ; then - SRC_URI="" -else - SRC_URI="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2 - crypt? ( http://loop-aes.sourceforge.net/updates/${MY_P}-1.diff.bz2 )" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="crypt nls old-linux selinux" - -RDEPEND="!sys-process/schedutils - !sys-apps/setarch - >=sys-libs/ncurses-5.2-r2 - >=sys-fs/e2fsprogs-1.34 - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/os-headers" - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git_src_unpack - cd "${S}" - ./autogen.sh || die - else - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-uclibc.patch #203711 - epatch "${FILESDIR}"/${P}-locale.patch #191111 - epatch "${FILESDIR}"/${P}-ioprio-syscalls.patch #190613 - epatch "${FILESDIR}"/${P}-setuid-checks.patch - epatch "${FILESDIR}"/${P}-script-SIGWINCH.patch #191452 - use crypt && epatch "${WORKDIR}"/${MY_P}-1.diff - sed -i '/#include <asm\/page.h>/d' mount/swapon.c || die - fi -} - -src_compile() { - export localedir="/usr/share/locale" #190895 - econf \ - --with-fsprobe=blkid \ - $(use_enable nls) \ - --enable-agetty \ - --enable-cramfs \ - $(use_enable old-linux elvtune) \ - --disable-init \ - --disable-kill \ - --disable-last \ - --disable-mesg \ - --enable-partx \ - --enable-raw \ - --enable-rdev \ - --enable-rename \ - --disable-reset \ - --disable-login-utils \ - --enable-schedutils \ - --disable-wall \ - --enable-write \ - --without-pam \ - $(use_with selinux) \ - || die "configure failed" - emake || die "emake failed" -} - -src_install() { - emake install DESTDIR="${D}" || die "install failed" - dodoc AUTHORS NEWS README* TODO docs/* - - if use crypt ; then - newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die - newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die - fi -} diff --git a/sys-apps/util-linux/util-linux-2.13.1.ebuild b/sys-apps/util-linux/util-linux-2.13.1.ebuild deleted file mode 100644 index 1e173e075161..000000000000 --- a/sys-apps/util-linux/util-linux-2.13.1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# 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.ebuild,v 1.11 2008/04/21 23:42:15 vapier Exp $ - -EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git" -inherit eutils -[[ ${PV} == "9999" ]] && inherit git - -MY_PV=${PV/_/-} -MY_P=${PN}-ng-${MY_PV} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux-ng/" -if [[ ${PV} == "9999" ]] ; then - SRC_URI="" -else - SRC_URI="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2 - loop-aes? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v3.2c.tar.bz2 )" -fi - -LICENSE="GPL-2" -SLOT="0" -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 - !sys-apps/setarch - >=sys-libs/ncurses-5.2-r2 - >=sys-fs/e2fsprogs-1.34 - selinux? ( sys-libs/libselinux ) - slang? ( sys-libs/slang )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/os-headers" - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git_src_unpack - cd "${S}" - ./autogen.sh || die - else - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-2.13-uclibc.patch #203711 - 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 - fi -} - -src_compile() { - econf \ - --with-fsprobe=blkid \ - $(use_enable nls) \ - --enable-agetty \ - --enable-cramfs \ - $(use_enable old-linux elvtune) \ - --disable-init \ - --disable-kill \ - --disable-last \ - --disable-mesg \ - --enable-partx \ - --enable-raw \ - --enable-rdev \ - --enable-rename \ - --disable-reset \ - --disable-login-utils \ - --enable-schedutils \ - --disable-wall \ - --enable-write \ - --without-pam \ - $(use_with selinux) \ - $(use_with slang) \ - || die "configure failed" - emake || die "emake failed" -} - -src_install() { - emake install DESTDIR="${D}" || die "install failed" - dodoc AUTHORS NEWS README* TODO docs/* - - if use crypt ; then - newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die - newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die - fi -} - -pkg_postinst() { - ewarn "USE=crypt has been changed to USE=loop-aes. If you need" - ewarn "support for it, make sure to update your USE accordingly." -} |