From 871730a874968b5b77159edc4137a1fe965f63d0 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Wed, 18 Feb 2004 16:57:32 +0000
Subject: [PATCH] use a pre-packaged dietlibc CVS snapshot (0.25-rxr) since
 there has been no release for two months and we need the fixes ...

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2373 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/dietlibc/cc-name-parsing.patch | 52 ---------------------
 package/base/dietlibc/dietlibc.desc         |  5 +-
 2 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100644 package/base/dietlibc/cc-name-parsing.patch

diff --git a/package/base/dietlibc/cc-name-parsing.patch b/package/base/dietlibc/cc-name-parsing.patch
deleted file mode 100644
index 8670b81b7..000000000
--- a/package/base/dietlibc/cc-name-parsing.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/dietlibc/gcc23_cmd.patch
-# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-This patch is needed because the diet wrapper is not correctly managing the
-gcc-* binary names correctly.
-
-  - Rene Rebe <rene@rocklinux.org>
-
---- dietlibc-0.24/diet.c	2003-10-10 15:17:46.000000000 +0200
-+++ dietlibc-0.24-fixed/diet.c	2004-01-02 17:12:43.000000000 +0100
-@@ -105,9 +105,15 @@
-   }
-   if (!argv[1]) goto usage;
-   {
--    char *tmp=strchr(argv[1],0)-2;
-+    char *tmp=strchr(argv[1],0);
-     char *tmp2,*tmp3;
-     char *cc=argv[1];
-+    /* try to find the char string "cc" - it might contain a version info */
-+    while (tmp > argv[1] && *tmp != 'c')
-+      tmp--;
-+    while (tmp > argv[1] && *(tmp - 1) == 'c' )
-+      tmp--;
-+
-     if (tmp<cc) goto donttouch;
-     if ((tmp2=strstr(cc,"linux-"))) {	/* cross compiling? */
-       int len=strlen(platform);
-@@ -179,7 +185,7 @@
- 	  strcpy(shortplatform,"mipsel");
-     }
-     strcat(dashL,platform);
--    if (!strcmp(tmp,"cc")) {
-+    if (!strncmp(tmp,"cc", 2)) {
-       char **newargv;
-       char **dest;
-       char *a,*b,*c;
diff --git a/package/base/dietlibc/dietlibc.desc b/package/base/dietlibc/dietlibc.desc
index 0ed41535a..b42361031 100644
--- a/package/base/dietlibc/dietlibc.desc
+++ b/package/base/dietlibc/dietlibc.desc
@@ -39,8 +39,9 @@
 
 [L] GPL
 [S] Stable
-[V] 0.24
+[V] 0.25.0-rxr
 [P] X 01-3-----9 114.000
 
-[D] 391581488 dietlibc-0.24.tar.bz2 http://www.kernel.org/pub/linux/libs/dietlibc/
+# [D] 0 dietlibc-0.25.tar.bz2 http://www.kernel.org/pub/linux/libs/dietlibc/
+[D] 64881034 dietlibc-0.25-rxr.tar.bz2 http://gsmp.tfh-berlin.de/ftp/software/dietlibc/