diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-03-09 01:56:06 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-03-09 01:56:06 +0000 |
commit | fbf8f40101cfbfc641b7652a5f65523e7d87b2e3 (patch) | |
tree | 15a34472618f365cd5f631f77e1464fda0955294 /dev-libs/dietlibc | |
parent | stabilize (diff) | |
download | historical-fbf8f40101cfbfc641b7652a5f65523e7d87b2e3.tar.gz historical-fbf8f40101cfbfc641b7652a5f65523e7d87b2e3.tar.bz2 historical-fbf8f40101cfbfc641b7652a5f65523e7d87b2e3.zip |
old
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'dev-libs/dietlibc')
-rw-r--r-- | dev-libs/dietlibc/Manifest | 16 | ||||
-rw-r--r-- | dev-libs/dietlibc/dietlibc-0.22-r2.ebuild | 63 | ||||
-rw-r--r-- | dev-libs/dietlibc/dietlibc-0.23.ebuild | 63 | ||||
-rw-r--r-- | dev-libs/dietlibc/dietlibc-0.24.ebuild | 57 | ||||
-rw-r--r-- | dev-libs/dietlibc/dietlibc-0.26-r1.ebuild | 71 | ||||
-rw-r--r-- | dev-libs/dietlibc/dietlibc-0.26.ebuild | 60 | ||||
-rw-r--r-- | dev-libs/dietlibc/files/0.22-dirent-prototype.patch | 13 | ||||
-rw-r--r-- | dev-libs/dietlibc/files/0.23-dirent-prototype.patch | 14 | ||||
-rw-r--r-- | dev-libs/dietlibc/files/dietlibc-0.22_xdr_security_fix.patch | 195 | ||||
-rw-r--r-- | dev-libs/dietlibc/files/dietlibc-0.23-hppa.patch | 152 | ||||
-rw-r--r-- | dev-libs/dietlibc/files/digest-dietlibc-0.22-r2 | 1 | ||||
-rw-r--r-- | dev-libs/dietlibc/files/digest-dietlibc-0.23 | 1 | ||||
-rw-r--r-- | dev-libs/dietlibc/files/digest-dietlibc-0.24 | 1 | ||||
-rw-r--r-- | dev-libs/dietlibc/files/digest-dietlibc-0.26 | 1 | ||||
-rw-r--r-- | dev-libs/dietlibc/files/digest-dietlibc-0.26-r1 | 1 |
15 files changed, 1 insertions, 708 deletions
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest index 8d7a69f34d26..34b5adf22a28 100644 --- a/dev-libs/dietlibc/Manifest +++ b/dev-libs/dietlibc/Manifest @@ -1,28 +1,14 @@ MD5 5723a65cb79ccc2683c6f1aa59c50f14 ChangeLog 6253 -MD5 8a31777f8ddb3819bf00019440802a50 dietlibc-0.22-r2.ebuild 1669 -MD5 5739b86f9fb0bf24e2fce84bdb40dd2e dietlibc-0.23.ebuild 1766 -MD5 e60984addf7d7565dcdfd4c570a01b17 dietlibc-0.24.ebuild 1521 MD5 6d7429e88eda74e2e5a1d89dcda32c33 metadata.xml 400 -MD5 f590e8e459aff5e7099ef694b926b9af dietlibc-0.25.ebuild 1562 -MD5 96d9af4a6ff7592be1643347db647241 dietlibc-0.26.ebuild 1568 -MD5 ee4e0ab7d2204662e67c1a0ffb48a6dd dietlibc-0.26-r1.ebuild 1934 +MD5 f34b064f2b43b3395dc9fec0cfcb490b dietlibc-0.25.ebuild 1561 MD5 26efff18982f62dd8b181fe691b9a384 dietlibc-0.27.ebuild 2615 MD5 d57e760a46aa30a3d74c553ec0d3d0d0 dietlibc-0.28.ebuild 1483 MD5 02d59156de2a7a0f914dc5769e26cdcf files/0.25-gcc34.patch 3454 -MD5 e33c0d8f3c56f85d1caa98118824fceb files/0.22-dirent-prototype.patch 563 -MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.23-dirent-prototype.patch 668 MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.24-dirent-prototype.patch 668 -MD5 67b93dd4033c0e66d42b6bade33c73fc files/dietlibc-0.22_xdr_security_fix.patch 5566 -MD5 2644f8611fcb7a147ec9ef76eaf5992a files/digest-dietlibc-0.22-r2 66 -MD5 b06d21ffc62c7a660a29351e55213a0b files/digest-dietlibc-0.23 66 -MD5 11048a235efe4eefcfffc4ccffa60821 files/digest-dietlibc-0.24 66 -MD5 4713f8664ff94fb53c7696d9204406ed files/dietlibc-0.23-hppa.patch 3954 MD5 9247251c0adc5ce1b626d7092ae0c903 files/gcc-33.patch 482 MD5 8c25662fd30d966f24ec20ef491075a6 files/dietlibc-sparc64-makefile.patch 499 MD5 a6911c79e510ea03173a809f5d7e6a40 files/digest-dietlibc-0.25 66 -MD5 4c8bea996353605b5d0b6184d8836ffe files/digest-dietlibc-0.26 66 MD5 9022467ec4210d62330f0eb1d8c93394 files/dietlibc-0.26-ssp.patch 1632 -MD5 4c8bea996353605b5d0b6184d8836ffe files/digest-dietlibc-0.26-r1 66 MD5 65a68ed33fd14d52b23a2fe28e06dfc9 files/ssp.c 3065 MD5 ee309afd4c5bd953a5133fb3383124de files/gcc-33-r3.patch 451 MD5 771865efe3795f379b15c0bb6d61a857 files/digest-dietlibc-0.27 66 diff --git a/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild b/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild deleted file mode 100644 index b242ab782b8d..000000000000 --- a/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.22-r2.ebuild,v 1.13 2005/01/21 22:12:20 kloeri Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="A minimal libc" -SRC_URI="mirror://kernel/linux/libs/${PN}/${P}.tar.bz2" -HOMEPAGE="http://www.fefe.de/dietlibc/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 sparc hppa amd64 alpha ppc" -IUSE="" - -src_unpack() { - filter-flags "-fstack-protector" - - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/${P}_xdr_security_fix.patch - epatch ${FILESDIR}/${PV}-dirent-prototype.patch - - mv Makefile Makefile.orig - sed -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \ - -e "s:^prefix.*:prefix=/usr/diet:" \ - -e "s:^#DESTDIR=/tmp/fef.*:DESTDIR=${D}:" \ - Makefile.orig > Makefile - # does not say anything about this in the install docs - uncommenting (Thilo) - #mkdir ${S}/include/asm - #cp /usr/include/asm/posix_types.h ${S}/include/asm -} - -src_compile() { -# Added by Jason Wever <weeve@gentoo.org> -# Fix for bug #27171. -# dietlibc assumes that if uname -m is sparc64, then gcc is 64 bit -# but this is not the case on Gentoo currently. - - if [ "${ARCH}" = "sparc" -a "${PROFILE_ARCH}" = "sparc64" ]; then - cd ${S} - /usr/bin/sparc32 make - else - emake || die - fi -} - -src_install() { - if [ "${ARCH}" = "sparc" -a "${PROFILE_ARCH}" = "sparc64" ]; then - cd ${S} - /usr/bin/sparc32 make install - else - make install || die - fi - - exeinto /usr/bin -# newexe bin-i386/diet-i diet - newexe bin-$(uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/')/diet-i diet - - doman diet.1 - dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING -} diff --git a/dev-libs/dietlibc/dietlibc-0.23.ebuild b/dev-libs/dietlibc/dietlibc-0.23.ebuild deleted file mode 100644 index 9075ca06a319..000000000000 --- a/dev-libs/dietlibc/dietlibc-0.23.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.23.ebuild,v 1.12 2005/01/21 22:12:20 kloeri Exp $ - -inherit eutils flag-o-matic gcc - -DESCRIPTION="A minimal libc" -SRC_URI="mirror://kernel/linux/libs/${PN}/${P}.tar.bz2" -HOMEPAGE="http://www.fefe.de/dietlibc/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 sparc ~hppa ~amd64 ~alpha ppc" -IUSE="" - -src_unpack() { - filter-flags "-fstack-protector" - - unpack ${A} - cd ${S} - - epatch "${FILESDIR}/${PV}-dirent-prototype.patch" - [ $(gcc-major-version) -eq 3 ] && epatch "${FILESDIR}/gcc-33.patch" - [ "${ARCH}" = "hppa" ] && epatch "${FILESDIR}/${P}-hppa.patch" - mv Makefile Makefile.orig - sed -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \ - -e "s:^prefix.*:prefix=/usr/diet:" \ - -e "s:^#DESTDIR=/tmp/fef.*:DESTDIR=${D}:" \ - Makefile.orig > Makefile - # does not say anything about this in the install docs - uncommenting (Thilo) - #mkdir ${S}/include/asm - #cp /usr/include/asm/posix_types.h ${S}/include/asm -} - -src_compile() { -# Added by Jason Wever <weeve@gentoo.org> -# Fix for bug #27171. -# dietlibc assumes that if uname -m is sparc64, then gcc is 64 bit -# but this is not the case on Gentoo currently. - - if [ "${ARCH}" = "sparc" -a "${PROFILE_ARCH}" = "sparc64" ]; then - cd ${S} - /usr/bin/sparc32 make || die - else - emake || die - fi -} - -src_install() { - if [ "${ARCH}" = "sparc" -a "${PROFILE_ARCH}" = "sparc64" ]; then - cd ${S} - /usr/bin/sparc32 make install - else - make install || die - fi - - exeinto /usr/bin -# newexe bin-i386/diet-i diet - newexe bin-$(uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/')/diet-i diet - - doman diet.1 - dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING -} diff --git a/dev-libs/dietlibc/dietlibc-0.24.ebuild b/dev-libs/dietlibc/dietlibc-0.24.ebuild deleted file mode 100644 index 25519d2d3459..000000000000 --- a/dev-libs/dietlibc/dietlibc-0.24.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.24.ebuild,v 1.13 2005/01/21 22:12:20 kloeri Exp $ - -inherit eutils flag-o-matic fixheadtails gcc - -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="x86 ppc ~sparc ~alpha arm ~hppa ~amd64" -IUSE="" - -DEPEND=">=sys-apps/sed-4" - -src_unpack() { - unpack ${A} - cd ${S} - - epatch "${FILESDIR}/${PV}-dirent-prototype.patch" - [ $(gcc-major-version) -eq 3 ] && epatch "${FILESDIR}/gcc-33.patch" - - # depending on glibc to provide guard symbols, does not work with -nostdlib building - filter-flags -fstack-protector -fstack-protector-all - - # Fix for 45716 - replace-sparc64-flags - - sed -i \ - -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \ - -e "s:^prefix.*:prefix=/usr/diet:" \ - -e "s:^#DESTDIR=.*:DESTDIR=${D}:" \ - Makefile \ - || die "sed Makefile failed" - - # New fix for sparc64 and dietlibc, fixes bug #45601 - [ "${PROFILE_ARCH}" = "sparc64" ] && \ - epatch ${FILESDIR}/dietlibc-sparc64-makefile.patch - - ht_fix_all -} - -src_compile() { - emake || die "emake failed" -} - -src_install() { - make install || die "make install failed" - - exeinto /usr/bin - newexe bin-$(uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/' -e 's/sparc64/sparc/')/diet-i diet || die "newexe failed" - - doman diet.1 - dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING -} diff --git a/dev-libs/dietlibc/dietlibc-0.26-r1.ebuild b/dev-libs/dietlibc/dietlibc-0.26-r1.ebuild deleted file mode 100644 index 9bfb31a327bf..000000000000 --- a/dev-libs/dietlibc/dietlibc-0.26-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.26-r1.ebuild,v 1.3 2005/01/21 22:12:20 kloeri Exp $ - -inherit eutils flag-o-matic fixheadtails gcc - -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="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64" -IUSE="" - -DEPEND=">=sys-apps/sed-4" - -src_unpack() { - unpack ${A} - cd ${S} - - epatch "${FILESDIR}/0.24-dirent-prototype.patch" - [ $(gcc-major-version) -eq 3 ] \ - && epatch ${FILESDIR}/gcc-33.patch - -# && epatch ${FILESDIR}/${PV}-gcc34.patch - - # depending on glibc to provide guard symbols, does not work with -nostdlib building - filter-flags -fstack-protector -fstack-protector-all - - if use x86 ; then - # Ok so let's make dietlibc ssp aware (Aug 7 2004) -solar - ebegin "Making dietlibc ssp aware" - cp ${FILESDIR}/ssp.c ${S}/lib/ || die "Failed to copy ssp.c into lib for compile" - eend $? - - # start with sparc/sparc64/x86_64/i386 for now. - epatch ${FILESDIR}/dietlibc-0.26-ssp.patch - append-flags -D__dietlibc__ - # end ssp block code - fi - # Fix for 45716 - replace-sparc64-flags - - sed -i \ - -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \ - -e "s:^prefix.*:prefix=/usr/diet:" \ - -e "s:^#DESTDIR=.*:DESTDIR=${D}:" \ - Makefile \ - || die "sed Makefile failed" - - # New fix for sparc64 and dietlibc, fixes bug #45601 - [ "${PROFILE_ARCH}" = "sparc64" ] && \ - epatch ${FILESDIR}/dietlibc-sparc64-makefile.patch - - ht_fix_all -} - -src_compile() { - emake || die "emake failed" -} - -src_install() { - make install || die "make install failed" - - exeinto /usr/bin - newexe bin-$(uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/' -e 's/sparc64/sparc/')/diet-i diet || die "newexe failed" - - doman diet.1 - dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING -} diff --git a/dev-libs/dietlibc/dietlibc-0.26.ebuild b/dev-libs/dietlibc/dietlibc-0.26.ebuild deleted file mode 100644 index d6f757a4b95a..000000000000 --- a/dev-libs/dietlibc/dietlibc-0.26.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.26.ebuild,v 1.2 2005/01/21 22:12:20 kloeri Exp $ - -inherit eutils flag-o-matic fixheadtails gcc - -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="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64" -IUSE="" - -DEPEND=">=sys-apps/sed-4" - -src_unpack() { - unpack ${A} - cd ${S} - - epatch "${FILESDIR}/0.24-dirent-prototype.patch" - [ $(gcc-major-version) -eq 3 ] \ - && epatch ${FILESDIR}/gcc-33.patch - -# && epatch ${FILESDIR}/${PV}-gcc34.patch - - # depending on glibc to provide guard symbols, does not work with -nostdlib building - filter-flags -fstack-protector -fstack-protector-all - - # Fix for 45716 - replace-sparc64-flags - - sed -i \ - -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \ - -e "s:^prefix.*:prefix=/usr/diet:" \ - -e "s:^#DESTDIR=.*:DESTDIR=${D}:" \ - Makefile \ - || die "sed Makefile failed" - - # New fix for sparc64 and dietlibc, fixes bug #45601 - [ "${PROFILE_ARCH}" = "sparc64" ] && \ - epatch ${FILESDIR}/dietlibc-sparc64-makefile.patch - - ht_fix_all -} - -src_compile() { - emake || die "emake failed" -} - -src_install() { - make install || die "make install failed" - - exeinto /usr/bin - newexe bin-$(uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6][lb]/arm/' -e 's/sparc64/sparc/')/diet-i diet || die "newexe failed" - - doman diet.1 - dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING -} diff --git a/dev-libs/dietlibc/files/0.22-dirent-prototype.patch b/dev-libs/dietlibc/files/0.22-dirent-prototype.patch deleted file mode 100644 index a5ee1d543b90..000000000000 --- a/dev-libs/dietlibc/files/0.22-dirent-prototype.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- include/dirent.h.orig 2003-06-16 10:08:35.000000000 -0400 -+++ include/dirent.h 2003-06-16 10:08:45.000000000 -0400 -@@ -35,8 +35,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/0.23-dirent-prototype.patch b/dev-libs/dietlibc/files/0.23-dirent-prototype.patch deleted file mode 100644 index 0beeb363b1ac..000000000000 --- a/dev-libs/dietlibc/files/0.23-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.22_xdr_security_fix.patch b/dev-libs/dietlibc/files/dietlibc-0.22_xdr_security_fix.patch deleted file mode 100644 index 392eb8201be1..000000000000 --- a/dev-libs/dietlibc/files/dietlibc-0.22_xdr_security_fix.patch +++ /dev/null @@ -1,195 +0,0 @@ -Index: include/rpc/xdr.h -=================================================================== -RCS file: /cvs/linuxtv/dietlibc/include/rpc/xdr.h,v -retrieving revision 1.4 -retrieving revision 1.5 -diff -u -r1.4 -r1.5 ---- include/rpc/xdr.h 26 Jun 2001 15:27:43 -0000 1.4 -+++ include/rpc/xdr.h 21 Mar 2003 21:01:04 -0000 1.5 -@@ -126,7 +126,7 @@ - /* returns bytes off from beginning */ - bool_t (*x_setpostn) (XDR *__xdrs, unsigned int __pos); - /* lets you reposition the stream */ -- int32_t *(*x_inline) (XDR *__xdrs, int __len); -+ int32_t *(*x_inline) (XDR *__xdrs, unsigned int __len); - /* buf quick ptr to buffered data */ - void (*x_destroy) (XDR *__xdrs); - /* free privates of this xdr_stream */ -@@ -139,7 +139,7 @@ - char* x_public; /* users' data */ - char* x_private; /* pointer to private data */ - char* x_base; /* private used for position info */ -- int x_handy; /* extra private word */ -+ unsigned int x_handy; /* extra private word */ - }; - - /* -Index: librpc/xdr_mem.c -=================================================================== -RCS file: /cvs/linuxtv/dietlibc/librpc/xdr_mem.c,v -retrieving revision 1.5 -retrieving revision 1.6 -diff -u -r1.5 -r1.6 ---- librpc/xdr_mem.c 23 Feb 2002 23:08:21 -0000 1.5 -+++ librpc/xdr_mem.c 21 Mar 2003 21:01:04 -0000 1.6 -@@ -48,13 +48,13 @@ - #include <netinet/in.h> - #include <string.h> - --static bool_t xdrmem_getlong(); --static bool_t xdrmem_putlong(); -+static bool_t xdrmem_getlong(XDR*, long*); -+static bool_t xdrmem_putlong(XDR*, const long*); - static bool_t xdrmem_getbytes(); - static bool_t xdrmem_putbytes(); - static unsigned int xdrmem_getpos(); - static bool_t xdrmem_setpos(); --static int32_t *xdrmem_inline(); -+static int32_t *xdrmem_inline(XDR*, unsigned int); - static void xdrmem_destroy(); - - static struct xdr_ops xdrmem_ops = { -@@ -95,54 +95,41 @@ - register XDR *xdrs; - long *lp; - { -+ if (xdrs->x_handy < 4) return FALSE; -+ xdrs->x_handy -= 4; - -- if ((xdrs->x_handy -= sizeof(long)) < 0) -- return (FALSE); -- -- *lp = (long) ntohl((unsigned long) (*((long *) (xdrs->x_private)))); -- xdrs->x_private += sizeof(long); -- -- return (TRUE); -+ *lp = (int32_t) ntohl((*((int32_t *) (xdrs->x_private)))); -+ xdrs->x_private += 4; -+ return TRUE; - } - --static bool_t xdrmem_putlong(xdrs, lp) --register XDR *xdrs; --long *lp; -+static bool_t xdrmem_putlong(XDR* xdrs, const long* lp) - { -+ if (xdrs->x_handy < 4) return FALSE; -+ xdrs->x_handy -= 4; - -- if ((xdrs->x_handy -= sizeof(long)) < 0) -- return (FALSE); -- -- *(long *) xdrs->x_private = (long) htonl((unsigned long) (*lp)); -- xdrs->x_private += sizeof(long); -+ *(int32_t *) xdrs->x_private = htonl(*lp); -+ xdrs->x_private += sizeof(long); - -- return (TRUE); -+ return (TRUE); - } - --static bool_t xdrmem_getbytes(xdrs, addr, len) --register XDR *xdrs; --char* addr; --register unsigned int len; -+static bool_t xdrmem_getbytes(XDR* xdrs, char* addr, unsigned int len) - { -- -- if ((xdrs->x_handy -= len) < 0) -- return (FALSE); -- memmove(addr, xdrs->x_private, len); -- xdrs->x_private += len; -- return (TRUE); -+ if (xdrs->x_handy < len) return FALSE; -+ xdrs->x_handy -= len; -+ memmove(addr, xdrs->x_private, len); -+ xdrs->x_private += len; -+ return TRUE; - } - --static bool_t xdrmem_putbytes(xdrs, addr, len) --register XDR *xdrs; --char* addr; --register unsigned int len; -+static bool_t xdrmem_putbytes(XDR* xdrs, char* addr, unsigned int len) - { -- -- if ((xdrs->x_handy -= len) < 0) -- return (FALSE); -- memmove(xdrs->x_private, addr, len); -- xdrs->x_private += len; -- return (TRUE); -+ if (xdrs->x_handy < len) return FALSE; -+ xdrs->x_handy -= len; -+ memmove(xdrs->x_private, addr, len); -+ xdrs->x_private += len; -+ return (TRUE); - } - - static unsigned int xdrmem_getpos(xdrs) -@@ -156,19 +143,19 @@ - register XDR *xdrs; - unsigned int pos; - { -- register char* newaddr = xdrs->x_base + pos; -- register char* lastaddr = xdrs->x_private + xdrs->x_handy; -+ register char* newaddr = xdrs->x_base + pos; -+ register char* lastaddr = xdrs->x_private + xdrs->x_handy; - -- if ((long) newaddr > (long) lastaddr) -- return (FALSE); -- xdrs->x_private = newaddr; -- xdrs->x_handy = (int) lastaddr - (int) newaddr; -- return (TRUE); -+ if ((long) newaddr > (long) lastaddr || (long)newaddr<(long)xdrs->x_base) -+ return (FALSE); -+ xdrs->x_private = newaddr; -+ xdrs->x_handy = (int) lastaddr - (int) newaddr; -+ return (TRUE); - } - - static int32_t *xdrmem_inline(xdrs, len) - register XDR *xdrs; --int len; -+unsigned int len; - { - int32_t *buf = 0; - -Index: librpc/xdr_rec.c -=================================================================== -RCS file: /cvs/linuxtv/dietlibc/librpc/xdr_rec.c,v -retrieving revision 1.6 -retrieving revision 1.7 -diff -u -r1.6 -r1.7 ---- librpc/xdr_rec.c 23 Feb 2002 23:08:21 -0000 1.6 -+++ librpc/xdr_rec.c 21 Mar 2003 21:01:04 -0000 1.7 -@@ -459,9 +459,7 @@ - return (FALSE); - } - --static int32_t *xdrrec_inline(xdrs, len) --register XDR *xdrs; --int len; -+static int32_t *xdrrec_inline(XDR* xdrs, unsigned int len) - { - register RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private; - int32_t *buf = NULL; -Index: librpc/xdr_stdio.c -=================================================================== -RCS file: /cvs/linuxtv/dietlibc/librpc/xdr_stdio.c,v -retrieving revision 1.4 -retrieving revision 1.5 -diff -u -r1.4 -r1.5 ---- librpc/xdr_stdio.c 23 Feb 2002 23:08:21 -0000 1.4 -+++ librpc/xdr_stdio.c 21 Mar 2003 21:01:04 -0000 1.5 -@@ -170,9 +170,7 @@ - FALSE : TRUE); - } - --static int32_t *xdrstdio_inline(xdrs, len) --XDR *xdrs; --unsigned int len; -+static int32_t *xdrstdio_inline(XDR* xdrs, unsigned int len) - { - - /* diff --git a/dev-libs/dietlibc/files/dietlibc-0.23-hppa.patch b/dev-libs/dietlibc/files/dietlibc-0.23-hppa.patch deleted file mode 100644 index 763b6f6bd67d..000000000000 --- a/dev-libs/dietlibc/files/dietlibc-0.23-hppa.patch +++ /dev/null @@ -1,152 +0,0 @@ -Only in dietlibc-0.23-test: bin-parisc -diff -aur dietlibc-0.23/contrib/elftrunc.c dietlibc-0.23-test/contrib/elftrunc.c ---- dietlibc-0.23/contrib/elftrunc.c 2001-10-09 18:02:10.000000000 +0000 -+++ dietlibc-0.23-test/contrib/elftrunc.c 2003-11-11 21:49:40.000000000 +0000 -@@ -54,7 +54,6 @@ - len -= n; - - eh32.e_shoff=0; -- eh32.e_shentsize=0; - eh32.e_shnum=0; - eh32.e_shstrndx=0; - -@@ -109,7 +108,6 @@ - len -= n; - - eh64.e_shoff=0; -- eh64.e_shentsize=0; - eh64.e_shnum=0; - eh64.e_shstrndx=0; - -@@ -121,8 +119,8 @@ - { - if ((n=read(in,buf,sizeof(buf)))>0) - { -- write(out,buf,(size_t)((len<(size_t)n)?len:n)); -- len-=(len<(size_t)n)?len:n; -+ write(out,buf,(size_t)((len<(size_t)n)?len:(size_t)n)); -+ len-=(len<(size_t)n)?len:(size_t)n; - } else die(2,"read error"); - } - -diff -aur dietlibc-0.23/parisc/setjmp.S dietlibc-0.23-test/parisc/setjmp.S ---- dietlibc-0.23/parisc/setjmp.S 2002-01-11 18:06:53.000000000 +0000 -+++ dietlibc-0.23-test/parisc/setjmp.S 2003-11-11 21:22:06.000000000 +0000 -@@ -52,7 +52,7 @@ - stw %sp, 0x4c(%sr0, %r26) - stw %rp, 0x50(%sr0, %r26) - /* Floating point stack in %r19 */ -- ldo 58(%r26), %r19 -+ ldo 0x58(%r26), %r19 - /* Save Floating point registers */ - fstd,ma %fr12, 8(%sr0, %r19) - fstd,ma %fr13, 8(%sr0, %r19) -diff -aur dietlibc-0.23/parisc/strchr.S dietlibc-0.23-test/parisc/strchr.S ---- dietlibc-0.23/parisc/strchr.S 2003-09-04 01:50:50.000000000 +0000 -+++ dietlibc-0.23-test/parisc/strchr.S 2003-11-11 21:24:59.000000000 +0000 -@@ -23,7 +23,7 @@ - b,n .Lfoobar - uxor,sbz %r0, %r20, %r0 - b,n .Lmdoit -- bv,n %r0(%rp) -+ bv %r0(%rp) - or %r0, %r0, %r28 - .Lfoobar: - addi -4, %r26, %r26 -diff -aur dietlibc-0.23/parisc/strlen.S dietlibc-0.23-test/parisc/strlen.S ---- dietlibc-0.23/parisc/strlen.S 2003-09-04 01:50:50.000000000 +0000 -+++ dietlibc-0.23-test/parisc/strlen.S 2003-11-11 21:25:23.000000000 +0000 -@@ -10,40 +10,41 @@ - than the HP-UX libc implementation, which is also uxor-based. - */ - --.LEVEL 1.1 -+.LEVEL 1.1 - - .text - .globl strlen - - strlen: -- .PROC -- .CALLINFO -- .ENTRY -- xor %r28, %r28, %r28 -- ldi 3, %r19 -- and,<> %r26, %r19, %r20 -- b,n .Lstrlen17 -- sub %r19, %r20, %r20 -- addi 1, %r20, %r20 -+ .PROC -+ .CALLINFO -+ .ENTRY -+ xor %r28, %r28, %r28 -+ ldi 3, %r19 -+ and,<> %r26, %r19, %r20 -+ b,n .Lstrlen17 -+ sub %r19, %r20, %r20 -+ addi 1, %r20, %r20 - .Lstrlen23: -- ldb,ma 1(%r26), %r19 -- cmpb,= %r0, %r19, .Lstrlen42 -- addi 1, %r28, %r28 -- addi,= -1, %r20, %r20 -- b,n .Lstrlen23 -+ ldb,ma 1(%r26), %r19 -+ cmpb,=,n %r0, %r19, .Lstrlen42 -+ addi 1, %r28, %r28 -+ addi,= -1, %r20, %r20 -+ b,n .Lstrlen23 - .Lstrlen17: -- ldw,ma 4(%r26), %r19 -- uxor,sbz %r19, %r0, %r0 -- b .Lstrlen17 -- addi 4, %r28, %r28 -- addi -4, %r28, %r28 -+ ldw,ma 4(%r26), %r19 -+ uxor,sbz %r19, %r0, %r0 -+ b .Lstrlen17 -+ addi 4, %r28, %r28 -+ addi -5, %r28, %r28 - .Lstrlen72: -- depw %r19, 23, 24, %r19 -- extrs,= %r19, 7, 8, %r20 -- cmpb,<> %r0, %r20, .Lstrlen72 -- addi 1, %r28, %r28 -+ extrs %r19, 7, 8, %r20 -+ addi 1, %r28, %r28 -+ cmpb,<> %r0, %r20, .Lstrlen72 -+ depw %r19, 23, 24, %r19 - .Lstrlen42: -- bv,n %r0(%rp) -- .EXIT -- .PROCEND -- .EXPORT strlen -+ bv,n %r0(%rp) -+ .EXIT -+ .PROCEND -+ .EXPORT strlen -+ -diff -aur dietlibc-0.23/parisc/strstr.S dietlibc-0.23-test/parisc/strstr.S ---- dietlibc-0.23/parisc/strstr.S 2003-09-04 01:50:50.000000000 +0000 -+++ dietlibc-0.23-test/parisc/strstr.S 2003-11-11 21:50:34.000000000 +0000 -@@ -10,7 +10,7 @@ - ldb,ma 1(%r26), %r19 - ldi 2, %ret0 - .L1: -- cmpb,=,n %r0, %r19, .Lret -+ cmpb,=,n %r0, %r19, .Lret2 - cmpb,<> %r20, %r19, .L1 - ldb,ma 1(%r26), %r19 - copy %r19, %r24 -@@ -25,8 +25,10 @@ - cmpb,<>,n %r21, %r0, .Lloop - nop - .Lret: -+ addi 0, %r26, %ret0 -+.Lret2: - bv %r0(%rp) -- addi -2, %r26, %ret0 -+ addi -2, %ret0, %ret0 - .EXIT - .PROCEND - .EXPORT strstr diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.22-r2 b/dev-libs/dietlibc/files/digest-dietlibc-0.22-r2 deleted file mode 100644 index d80396c5cefb..000000000000 --- a/dev-libs/dietlibc/files/digest-dietlibc-0.22-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 877b12ab0b2bbff340095cf2cf074418 dietlibc-0.22.tar.bz2 454012 diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.23 b/dev-libs/dietlibc/files/digest-dietlibc-0.23 deleted file mode 100644 index 826eec241de3..000000000000 --- a/dev-libs/dietlibc/files/digest-dietlibc-0.23 +++ /dev/null @@ -1 +0,0 @@ -MD5 6db6a89785f079a51bf6d93f618ceee8 dietlibc-0.23.tar.bz2 457861 diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.24 b/dev-libs/dietlibc/files/digest-dietlibc-0.24 deleted file mode 100644 index 703237165520..000000000000 --- a/dev-libs/dietlibc/files/digest-dietlibc-0.24 +++ /dev/null @@ -1 +0,0 @@ -MD5 1dc54e022c2b31fa99a512225ed36150 dietlibc-0.24.tar.bz2 500277 diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.26 b/dev-libs/dietlibc/files/digest-dietlibc-0.26 deleted file mode 100644 index bedd79836fbe..000000000000 --- a/dev-libs/dietlibc/files/digest-dietlibc-0.26 +++ /dev/null @@ -1 +0,0 @@ -MD5 68a4d1685dfc6d36ed12a5d5bb91fb80 dietlibc-0.26.tar.bz2 525208 diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.26-r1 b/dev-libs/dietlibc/files/digest-dietlibc-0.26-r1 deleted file mode 100644 index bedd79836fbe..000000000000 --- a/dev-libs/dietlibc/files/digest-dietlibc-0.26-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 68a4d1685dfc6d36ed12a5d5bb91fb80 dietlibc-0.26.tar.bz2 525208 |