From cb89bde0edacdf8bdcde28d58a472a0b4f830106 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Fri, 14 Nov 2003 12:06:39 +0000
Subject: [PATCH] updated the wget dietlibc patch

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1761 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 .../base/dietlibc/pkg_patch/pkg_wget.patch    | 40 ++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/package/base/dietlibc/pkg_patch/pkg_wget.patch b/package/base/dietlibc/pkg_patch/pkg_wget.patch
index 636a6028d..ba0027dd9 100644
--- a/package/base/dietlibc/pkg_patch/pkg_wget.patch
+++ b/package/base/dietlibc/pkg_patch/pkg_wget.patch
@@ -31,18 +31,18 @@
  
    while (p < bp->buffer + bp->width)
      *p++ = ' ';
---- ./src/url.c~	Sat Mar 15 19:50:51 2003
-+++ ./src/url.c	Sat Mar 15 20:49:43 2003
-@@ -205,7 +205,7 @@
+--- ./src/url.c~	2003-11-14 12:25:27.000000000 +0100
++++ ./src/url.c	2003-11-14 12:28:43.000000000 +0100
+@@ -204,7 +204,7 @@
+       else
  	*p2++ = *p1++;
      }
-   *p2 = '\0';
 -  assert (p2 - newstr == newlen);
 +  assert ((p2 - newstr) == newlen);
+   *p2 = '\0';
  
    return newstr;
- }
-@@ -408,7 +408,7 @@
+@@ -398,7 +398,7 @@
  	}
      }
    *p2 = '\0';
@@ -50,8 +50,17 @@
 +  assert ((p2 - newstr) == newlen);
    return newstr;
  }
- 
-@@ -1846,7 +1846,7 @@
+ 
+@@ -1481,7 +1481,7 @@
+ 	      *q++ = XNUM_TO_DIGIT (ch & 0xf);
+ 	    }
+ 	}
+-      assert (q - TAIL (dest) == outlen);
++      assert ((q - TAIL (dest)) == outlen);
+     }
+   TAIL_INCR (dest, outlen);
+ }
+@@ -2018,7 +2018,7 @@
    p += fplen;
    *p++ = '\0';
  
@@ -60,7 +69,20 @@
  
    if (quoted_user && quoted_user != url->user)
      xfree (quoted_user);
-@@ -2337,7 +2337,7 @@
+--- ./src/html-parse.c~	2003-11-14 12:37:26.000000000 +0100
++++ ./src/html-parse.c	2003-11-14 12:37:59.000000000 +0100
+@@ -379,7 +379,7 @@
+ 	}
+       /* Verify that we haven't exceeded the original size.  (It
+ 	 shouldn't happen, hence the assert.)  */
+-      assert (to - (pool->contents + pool->tail) <= end - beg);
++      assert ((to - (pool->contents + pool->tail)) <= (end - beg));
+ 
+       /* Make POOL's tail point to the position following the string
+ 	 we've written.  */
+--- ./src/convert.c~	2003-11-14 12:36:33.000000000 +0100
++++ ./src/convert.c	2003-11-14 12:37:06.000000000 +0100
+@@ -600,7 +600,7 @@
  	      *to++ = 'F';
  	    }
  	}