From e4f781c364368f771d2ac213ffe6c0b0788694cc Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Sun, 29 Jan 2012 13:00:13 +0000 Subject: remove obsolete ebuilds (Portage version: 2.2.0_alpha84/cvs/Linux x86_64) --- dev-libs/dietlibc/ChangeLog | 11 +- dev-libs/dietlibc/dietlibc-0.28.ebuild | 51 -------- dev-libs/dietlibc/dietlibc-0.30.ebuild | 46 -------- dev-libs/dietlibc/dietlibc-0.33_pre20100626.ebuild | 50 -------- .../dietlibc/files/0.24-dirent-prototype.patch | 14 --- dev-libs/dietlibc/files/dietlibc-0.26-ssp.patch | 54 --------- .../dietlibc/files/dietlibc-0.28-Makefile.patch | 28 ----- .../dietlibc/files/dietlibc-sparc64-makefile.patch | 11 -- dev-libs/dietlibc/files/gcc-33-r3.patch | 16 --- dev-libs/dietlibc/files/ssp.c | 129 --------------------- 10 files changed, 9 insertions(+), 401 deletions(-) delete mode 100644 dev-libs/dietlibc/dietlibc-0.28.ebuild delete mode 100644 dev-libs/dietlibc/dietlibc-0.30.ebuild delete mode 100644 dev-libs/dietlibc/dietlibc-0.33_pre20100626.ebuild delete mode 100644 dev-libs/dietlibc/files/0.24-dirent-prototype.patch delete mode 100644 dev-libs/dietlibc/files/dietlibc-0.26-ssp.patch delete mode 100644 dev-libs/dietlibc/files/dietlibc-0.28-Makefile.patch delete mode 100644 dev-libs/dietlibc/files/dietlibc-sparc64-makefile.patch delete mode 100644 dev-libs/dietlibc/files/gcc-33-r3.patch delete mode 100644 dev-libs/dietlibc/files/ssp.c (limited to 'dev-libs') diff --git a/dev-libs/dietlibc/ChangeLog b/dev-libs/dietlibc/ChangeLog index ded83baf14f4..0e9b9fb6f5a6 100644 --- a/dev-libs/dietlibc/ChangeLog +++ b/dev-libs/dietlibc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/dietlibc -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.88 2011/11/20 09:20:49 xarthisius Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.89 2012/01/29 13:00:13 hollow Exp $ + + 29 Jan 2012; Benedikt Böhm + -files/0.24-dirent-prototype.patch, -files/dietlibc-0.26-ssp.patch, + -dietlibc-0.28.ebuild, -files/dietlibc-0.28-Makefile.patch, + -dietlibc-0.30.ebuild, -dietlibc-0.33_pre20100626.ebuild, + -files/gcc-33-r3.patch, -files/dietlibc-sparc64-makefile.patch, -files/ssp.c: + remove obsolete ebuilds 20 Nov 2011; Kacper Kowalik dietlibc-0.28.ebuild, dietlibc-0.30-r2.ebuild, dietlibc-0.30.ebuild, diff --git a/dev-libs/dietlibc/dietlibc-0.28.ebuild b/dev-libs/dietlibc/dietlibc-0.28.ebuild deleted file mode 100644 index 5d556d1063f2..000000000000 --- a/dev-libs/dietlibc/dietlibc-0.28.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.28.ebuild,v 1.13 2011/11/20 09:20:49 xarthisius Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="A minimal libc" -HOMEPAGE="http://www.fefe.de/dietlibc/" -SRC_URI="mirror://kernel/linux/libs/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~mips sparc x86" -IUSE="debug" - -DEPEND="" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/0.24-dirent-prototype.patch - epatch "${FILESDIR}"/gcc-33-r3.patch - epatch "${FILESDIR}"/dietlibc-sparc64-makefile.patch #45601 - - filter-flags -fstack-protector -fstack-protector-all - - # Ok so let's make dietlibc ssp aware (Aug 7 2004) -solar - cp ${FILESDIR}/ssp.c "${S}"/lib/ || die "Failed to copy ssp.c into lib for compile" - epatch "${FILESDIR}"/dietlibc-0.26-ssp.patch - - replace-sparc64-flags #45716 - - # Fix for not available gcc option on hppa (20 Jul 2005) KillerFox - test-flag -fno-stack-protector && append-flags -D__dietlibc__ -fno-stack-protector-all -fno-stack-protector - epatch "${FILESDIR}"/dietlibc-0.28-Makefile.patch -} - -src_compile() { - local make_opt="" - use debug && make_opt="DEBUG=1" - emake CFLAGS="${CFLAGS}" ${make_opt} || die "emake failed" -} - -src_install() { - make install DESTDIR="${D}" || die "make install failed" - dobin "${D}"/usr/diet/bin/* || die "dobin" - doman "${D}"/usr/diet/man/*/* || die "doman" - rm -r "${D}"/usr/diet/{man,bin} - dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING -} diff --git a/dev-libs/dietlibc/dietlibc-0.30.ebuild b/dev-libs/dietlibc/dietlibc-0.30.ebuild deleted file mode 100644 index 5dbfa50e06f8..000000000000 --- a/dev-libs/dietlibc/dietlibc-0.30.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.30.ebuild,v 1.6 2011/11/20 09:20:49 xarthisius Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="A minimal libc" -HOMEPAGE="http://www.fefe.de/dietlibc/" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~phreak/distfiles/${P}-patches-${PR}.tar.bz2 - http://dev.gentoo.org/~hollow/distfiles/${P}-patches-${PR}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~hppa ~mips sparc x86" -IUSE="debug" - -DEPEND="" - -pkg_setup() { - # Replace sparc64 related C[XX]FLAGS (see bug #45716) - use sparc && replace-sparc64-flags - - # gcc-hppa suffers support for SSP, compilation will fail - use hppa && strip-unsupported-flags -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${WORKDIR}"/patches/*.patch -} - -src_compile() { - local my_cflags="${CFLAGS} -fno-pie" - use debug && my_cflags="${my_cflags} -g" - make CFLAGS="${my_cflags}" || die "make failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dobin "${D}"/usr/diet/bin/* || die "dobin failed" - doman "${D}"/usr/diet/man/*/* || die "doman failed" - rm -r "${D}"/usr/diet/{man,bin} - dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING -} diff --git a/dev-libs/dietlibc/dietlibc-0.33_pre20100626.ebuild b/dev-libs/dietlibc/dietlibc-0.33_pre20100626.ebuild deleted file mode 100644 index 757ed5c06893..000000000000 --- a/dev-libs/dietlibc/dietlibc-0.33_pre20100626.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.33_pre20100626.ebuild,v 1.3 2011/11/20 09:20:49 xarthisius Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="A minimal libc" -HOMEPAGE="http://www.fefe.de/dietlibc/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~sparc ~x86" -IUSE="debug" - -DEPEND="" -RDEPEND="" - -DIETHOME=/usr/diet - -pkg_setup() { - # Replace sparc64 related C[XX]FLAGS (see bug #45716) - use sparc && replace-sparc64-flags - - # gcc-hppa suffers support for SSP, compilation will fail - use hppa && strip-unsupported-flags - - # debug flags - use debug && append-flags -g - - # Makefile does not append CFLAGS - append-flags -nostdinc -W -Wall -Wextra -Wchar-subscripts \ - -Wmissing-prototypes -Wmissing-declarations -Wno-switch \ - -Wno-unused -Wredundant-decls - - # only use -nopie on archs that support it - gcc-specs-pie && append-flags -nopie -} - -src_compile() { - emake prefix=${DIETHOME} CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -j1 || die "make failed" -} - -src_install() { - emake prefix=${DIETHOME} DESTDIR="${D}" -j1 install || die "make install failed" - dobin "${D}"${DIETHOME}/bin/* || die "dobin failed" - doman "${D}"${DIETHOME}/man/*/* || die "doman failed" - rm -r "${D}"${DIETHOME}/{man,bin} - dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING -} diff --git a/dev-libs/dietlibc/files/0.24-dirent-prototype.patch b/dev-libs/dietlibc/files/0.24-dirent-prototype.patch deleted file mode 100644 index 0beeb363b1ac..000000000000 --- a/dev-libs/dietlibc/files/0.24-dirent-prototype.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nru dietlibc-0.23.orig/include/dirent.h dietlibc-0.23/include/dirent.h ---- dietlibc-0.23.orig/include/dirent.h 2003-08-19 12:22:52.000000000 -0400 -+++ dietlibc-0.23/include/dirent.h 2003-09-12 20:40:03.000000000 -0400 -@@ -37,8 +37,8 @@ - struct dirent *readdir (DIR *__dirp) __THROW; - struct dirent64 *readdir64 (DIR *__dirp) __THROW; - void rewinddir (DIR *__dirp) __THROW; --void seekdir (DIR *__dirp, long int __pos) __THROW; --long int telldir (DIR *__dirp) __THROW; -+void seekdir (DIR *__dirp, off_t __pos) __THROW; -+off_t telldir (DIR *__dirp) __THROW; - - int scandir(const char *dir, struct dirent ***namelist, - int (*selection)(const struct dirent *), diff --git a/dev-libs/dietlibc/files/dietlibc-0.26-ssp.patch b/dev-libs/dietlibc/files/dietlibc-0.26-ssp.patch deleted file mode 100644 index 98b2be1f7eb0..000000000000 --- a/dev-libs/dietlibc/files/dietlibc-0.26-ssp.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -Nrup dietlibc-0.26.orig/i386/start.S dietlibc-0.26/i386/start.S ---- dietlibc-0.26.orig/i386/start.S 2003-04-17 09:55:39.000000000 -0400 -+++ dietlibc-0.26/i386/start.S 2004-08-07 18:50:52.000000000 -0400 -@@ -50,7 +50,9 @@ _start: - PUT_VAR %edi, __vsyscall, %edx - 1: - #endif -- -+#ifdef __dietlibc__ -+ call __guard_setup -+#endif - #ifdef WANT_DYNAMIC - call _dyn_start - #else -diff -Nrup dietlibc-0.26.orig/sparc/start.S dietlibc-0.26/sparc/start.S ---- dietlibc-0.26.orig/sparc/start.S 2003-08-22 08:16:23.000000000 -0400 -+++ dietlibc-0.26/sparc/start.S 2004-08-07 18:55:26.000000000 -0400 -@@ -29,6 +29,9 @@ _start: - be NULL. */ - - /* Let libc do the rest of the initialization, and call main. */ -+#if 0 /* FIXME: __dietlibc__ */ -+ call __guard_setup -+#endif - #ifdef WANT_DYNAMIC - call dyn_start - #else -diff -Nrup dietlibc-0.26.orig/sparc64/start.S dietlibc-0.26/sparc64/start.S ---- dietlibc-0.26.orig/sparc64/start.S 2003-08-22 08:16:23.000000000 -0400 -+++ dietlibc-0.26/sparc64/start.S 2004-08-07 18:55:36.000000000 -0400 -@@ -29,6 +29,9 @@ _start: - be NULL. */ - - /* Let libc do the rest of the initialization, and call main. */ -+#if 0 /* FIXME: __dietlibc__ */ -+ call __guard_setup -+#endif - #ifdef WANT_DYNAMIC - call dyn_start - #else -diff -Nrup dietlibc-0.26.orig/x86_64/start.S dietlibc-0.26/x86_64/start.S ---- dietlibc-0.26.orig/x86_64/start.S 2003-02-05 09:29:19.000000000 -0500 -+++ dietlibc-0.26/x86_64/start.S 2004-08-07 18:52:39.000000000 -0400 -@@ -35,6 +35,10 @@ _start: - popq %rdi - #endif - -+#if 0 /* FIXME: __dietlibc__ */ -+ call __guard_setup -+#endif -+ - #ifdef WANT_DYNAMIC - call _dyn_start - #else diff --git a/dev-libs/dietlibc/files/dietlibc-0.28-Makefile.patch b/dev-libs/dietlibc/files/dietlibc-0.28-Makefile.patch deleted file mode 100644 index 7a0eb0028a30..000000000000 --- a/dev-libs/dietlibc/files/dietlibc-0.28-Makefile.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- Makefile -+++ Makefile -@@ -1,5 +1,5 @@ - INSTALL=install --prefix?=/opt/diet -+prefix=/usr/diet - # Set the following to install to a different root - #DESTDIR=/tmp/fefix - # Use "make DEBUG=1" to compile a debug version. -@@ -95,7 +95,6 @@ - - profiling: $(OBJDIR)/libgmon.a $(OBJDIR)/pstart.o - --CFLAGS=-pipe -nostdinc - CROSS= - - CC=gcc -@@ -126,10 +125,6 @@ - - LIBMATHOBJ=$(patsubst %,$(OBJDIR)/%,$(LIBMATH)) - --ifeq ($(CFLAGS),-pipe -nostdinc) --CFLAGS+=-O -fomit-frame-pointer --endif -- - ifneq ($(DEBUG),) - CFLAGS = -g - COMMENT = : diff --git a/dev-libs/dietlibc/files/dietlibc-sparc64-makefile.patch b/dev-libs/dietlibc/files/dietlibc-sparc64-makefile.patch deleted file mode 100644 index d72015214267..000000000000 --- a/dev-libs/dietlibc/files/dietlibc-sparc64-makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2004-03-25 08:24:20.420425000 -0700 -+++ Makefile 2004-03-25 08:27:02.730425000 -0700 -@@ -8,7 +8,7 @@ - BINDIR=${prefix}/bin - MAN1DIR=${prefix}/man/man1 - --MYARCH:=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/') -+MYARCH:=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/' -e 's/sparc64/sparc/') - - # This extra-ugly cruft is here so make will not run uname and sed each - # time it looks at $(OBJDIR). This alone sped up running make when diff --git a/dev-libs/dietlibc/files/gcc-33-r3.patch b/dev-libs/dietlibc/files/gcc-33-r3.patch deleted file mode 100644 index 1ccc1d4a98ff..000000000000 --- a/dev-libs/dietlibc/files/gcc-33-r3.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- diet.c -+++ diet.c -@@ -26,8 +26,13 @@ - - static const char* Os[] = { - "i386","-Os","-mpreferred-stack-boundary=2", -+#if __GNUC__ >= 3 -+ "-falign-functions=1","-falign-jumps=1", -+ "-falign-loops=1","-fomit-frame-pointer",0, -+#else - "-malign-functions=1","-malign-jumps=1", - "-malign-loops=1","-fomit-frame-pointer",0, -+#endif - "x86_64","-Os","-fno-omit-frame-pointer",0, - "sparc","-Os","-mcpu=supersparc",0, - "sparc64","-Os","-m64",0, diff --git a/dev-libs/dietlibc/files/ssp.c b/dev-libs/dietlibc/files/ssp.c deleted file mode 100644 index 18d16fec4609..000000000000 --- a/dev-libs/dietlibc/files/ssp.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/files/ssp.c,v 1.2 2004/12/05 19:25:40 solar Exp $ - * - * This is a modified version of Hiroaki Etoh's stack smashing routines - * implemented for glibc. - * - * The following people have contributed input to this code. - * Ned Ludd - - * Alexander Gabert - - * The PaX Team - - * Peter S. Mazinger - - * Yoann Vandoorselaere - - * Robert Connolly - - * Cory Visi - * - */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef __PROPOLICE_BLOCK_SEGV__ -#define SSP_SIGTYPE SIGSEGV -#elif __PROPOLICE_BLOCK_KILL__ -#define SSP_SIGTYPE SIGKILL -#else -#define SSP_SIGTYPE SIGABRT -#endif - -unsigned long __guard = 0UL; - -void -__guard_setup (void) -{ - size_t size; - if (__guard != 0UL) - return; - -#ifndef __SSP_QUICK_CANARY__ - /* - * Attempt to open kernel pseudo random device if one exists before - * opening urandom to avoid system entropy depletion. - */ - { - int fd; -#ifdef HAVE_DEV_ERANDOM - if ((fd = open ("/dev/erandom", O_RDONLY)) == (-1)) -#endif - fd = open ("/dev/urandom", O_RDONLY); - if (fd != (-1)) - { - size = read (fd, (char *) &__guard, sizeof (__guard)); - close (fd); - if (size == sizeof (__guard)) - return; - } - } -#endif - - /* If sysctl was unsuccessful, use the "terminator canary". */ - __guard = 0xFF0A0D00UL; - - { - /* Everything failed? Or we are using a weakened model of the - * terminator canary */ - struct timeval tv; - - gettimeofday (&tv, NULL); - __guard ^= tv.tv_usec ^ tv.tv_sec; - } -} - -void -__stack_smash_handler (char func[], int damaged) -{ - struct sigaction sa; - const char message[] = ": stack smashing attack in function "; - int bufsz, len; - char buf[512]; - static char *__progname = "dietapp"; - - sigset_t mask; - sigfillset (&mask); - - sigdelset (&mask, SSP_SIGTYPE); /* Block all signal handlers */ - sigprocmask (SIG_BLOCK, &mask, NULL); /* except SIGABRT */ - - bufsz = sizeof (buf); - strcpy (buf, "<2>"); - len = 3; - - strncat (buf, __progname, sizeof (buf) - 4); - len = strlen (buf); - - if (bufsz > len) - { - strncat (buf, message, bufsz - len - 1); - len = strlen (buf); - } - if (bufsz > len) - { - strncat (buf, func, bufsz - len - 1); - len = strlen (buf); - } - - /* print error message */ - write (STDERR_FILENO, buf + 3, len - 3); - write (STDERR_FILENO, "()\n", 3); - - /* Make sure the default handler is associated with the our signal handler */ - memset (&sa, 0, sizeof (struct sigaction)); - sigfillset (&sa.sa_mask); /* Block all signals */ - sa.sa_flags = 0; - sa.sa_handler = SIG_DFL; - sigaction (SSP_SIGTYPE, &sa, NULL); - (void) kill (getpid (), SSP_SIGTYPE); - _exit (127); -} -- cgit v1.2.3-65-gdbad