Author: oden
Date: Wed Feb 7 16:37:32 2007
New Revision: 117211
Added:
packages/cooker/uClibc-wget/current/SOURCES/wget-1.10-CVE-2006-6719.patch
Modified:
packages/cooker/uClibc-wget/current/SPECS/uClibc-wget.spec
Log:
- fix build
- sync with wget-1.10-1.2.20060mdk
Added: packages/cooker/uClibc-wget/current/SOURCES/wget-1.10-CVE-2006-6719.patch
==============================================================================
--- (empty file)
+++ packages/cooker/uClibc-wget/current/SOURCES/wget-1.10-CVE-2006-6719.patch
Wed Feb 7 16:37:32 2007
@@ -0,0 +1,32 @@
+--- wget-1.10/src/ftp-basic.c 2005-05-16 16:08:57.000000000 -0600
++++ wget-1.10.2/src/ftp-basic.c 2007-01-13 13:50:44.000000000 -0700
+@@ -1039,7 +1039,9 @@
+ first word of the server response)? */
+ request = strtok (NULL, " ");
+
+- if (!strcasecmp (request, "VMS"))
++ if (request == NULL)
++ *server_type = ST_OTHER;
++ else if (!strcasecmp (request, "VMS"))
+ *server_type = ST_VMS;
+ else if (!strcasecmp (request, "UNIX"))
+ *server_type = ST_UNIX;
+@@ -1081,6 +1083,7 @@
+ return err;
+ if (*respline == '5')
+ {
++ err:
+ xfree (respline);
+ return FTPSRVERR;
+ }
+@@ -1089,6 +1092,10 @@
+ and everything following it. */
+ strtok (respline, "\"");
+ request = strtok (NULL, "\"");
++ if (!request)
++ /* Treat the malformed response as an error, which the caller has
++ to handle gracefully anyway. */
++ goto err;
+
+ /* Has the `pwd' been already allocated? Free! */
+ xfree_null (*pwd);
Modified: packages/cooker/uClibc-wget/current/SPECS/uClibc-wget.spec
==============================================================================
--- packages/cooker/uClibc-wget/current/SPECS/uClibc-wget.spec (original)
+++ packages/cooker/uClibc-wget/current/SPECS/uClibc-wget.spec Wed Feb 7
16:37:32 2007
@@ -30,6 +30,7 @@
Patch10: wget-1.10-referer-opt-typo.patch
Patch11: wget-1.9.1-fix-fr-translation.patch
Patch12: wget-1.10-CAN-2005-3185.patch
+Patch13: wget-1.10-CVE-2006-6719.patch
Requires: uClibc-libopenssl0.9.7
Requires: uClibc
BuildRequires: gettext
@@ -59,6 +60,7 @@
%patch10 -p0 -b .typo
%patch11 -p0 -b .frtypo
%patch12 -p1 -b .can-2005-3185
+%patch13 -p1 -b .cve-2006-6719
%build
#aclocal
@@ -69,6 +71,7 @@
export CFLAGS="%{optflags} -Wall"
uclibc ./configure \
+ --host=%{_target_cpu}-mandriva-linux-gnu \
--disable-nls \
--disable-shared \
--prefix=%{basedir} \
@@ -91,6 +94,7 @@
rm -rf %{buildroot}/usr/share
rm -rf %{buildroot}%{basedir}/info
+rm -rf %{buildroot}%{basedir}/share/info
%clean
rm -fr %{buildroot}
