rpms/wget/devel wget-1.10-docs.patch, NONE, 1.1 wget-1.10-no-cookies.patch, NONE, 1.1 wget.spec, 1.31, 1.32

[fedora-cvs-commits at redhat.com]

Author: karsten

Update of /cvs/dist/rpms/wget/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17785

Modified Files:
	wget.spec 
Added Files:
	wget-1.10-docs.patch wget-1.10-no-cookies.patch 
Log Message:
- fix minor documentation bug
- fix --no-cookies crash



wget-1.10-docs.patch:
 main.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE wget-1.10-docs.patch ---
--- wget-1.10/src/main.c.rh2	2005-07-05 11:56:13.000000000 +0200
+++ wget-1.10/src/main.c	2005-07-05 11:56:50.000000000 +0200
@@ -603,7 +603,7 @@
     N_("\
   -K,  --backup-converted   before converting file X, back up as X.orig.\n"),
     N_("\
-  -m,  --mirror             shortcut option equivalent to -r -N -l inf -nr.\n"),
+  -m,  --mirror             shortcut option equivalent to -r -N -l inf --no-remove-listing.\n"),
     N_("\
   -p,  --page-requisites    get all images, etc. needed to display HTML page.\n"),
     N_("\

wget-1.10-no-cookies.patch:
 ChangeLog |    7 +++++++
 http.c    |   47 ++++++++++++++++++++++++-----------------------
 2 files changed, 31 insertions(+), 23 deletions(-)

--- NEW FILE wget-1.10-no-cookies.patch ---
--- wget-1.10/src/ChangeLog.no-cookies	2005-05-30 20:44:20.000000000 +0200
+++ wget-1.10/src/ChangeLog	2005-07-05 12:05:16.000000000 +0200
@@ -0,0 +1,7 @@
+2005-06-22  Hrvoje Niksic  <hniksic at xemacs.org>
+
+	* http.c (gethttp): Only handle --set-cookies (and assert that
+	cookie jar exists) if opt.cookies is true.  Failure to do so
+	triggered the assert when --no-cookies was used and the server
+	sent a Set-Cookie header.  Ouch!
+
--- wget-1.10/src/http.c.no-cookies	2005-07-05 12:02:47.000000000 +0200
+++ wget-1.10/src/http.c	2005-07-05 12:02:47.000000000 +0200
@@ -1717,29 +1717,30 @@
   hs->remote_time = resp_header_strdup (resp, "Last-Modified");
 
   /* Handle (possibly multiple instances of) the Set-Cookie header. */
-  {
-    char *pth = NULL;
-    int scpos;
-    const char *scbeg, *scend;
-    /* The jar should have been created by now. */
-    assert (wget_cookie_jar != NULL);
-    for (scpos = 0;
-	 (scpos = resp_header_locate (resp, "Set-Cookie", scpos,
-				      &scbeg, &scend)) != -1;
-	 ++scpos)
-      {
-	char *set_cookie; BOUNDED_TO_ALLOCA (scbeg, scend, set_cookie);
-	if (pth == NULL)
-	  {
-	    /* u->path doesn't begin with /, which cookies.c expects. */
-	    pth = (char *) alloca (1 + strlen (u->path) + 1);
-	    pth[0] = '/';
-	    strcpy (pth + 1, u->path);
-	  }
-	cookie_handle_set_cookie (wget_cookie_jar, u->host, u->port, pth,
-				  set_cookie);
-      }
-  }
+  if (opt.cookies)
+    {
+      char *pth = NULL;
+      int scpos;
+      const char *scbeg, *scend;
+      /* The jar should have been created by now. */
+      assert (wget_cookie_jar != NULL);
+      for (scpos = 0;
+	   (scpos = resp_header_locate (resp, "Set-Cookie", scpos,
+					&scbeg, &scend)) != -1;
+	   ++scpos)
+	{
+	  char *set_cookie; BOUNDED_TO_ALLOCA (scbeg, scend, set_cookie);
+	  if (pth == NULL)
+	    {
+	      /* u->path doesn't begin with /, which cookies.c expects. */
+	      pth = (char *) alloca (1 + strlen (u->path) + 1);
+	      pth[0] = '/';
+	      strcpy (pth + 1, u->path);
+	    }
+	  cookie_handle_set_cookie (wget_cookie_jar, u->host, u->port, pth,
+				    set_cookie);
+	}
+    }
 
   if (resp_header_copy (resp, "Content-Range", hdrval, sizeof (hdrval)))
     {


Index: wget.spec
===================================================================
RCS file: /cvs/dist/rpms/wget/devel/wget.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- wget.spec	4 Jul 2005 13:57:46 -0000	1.31
+++ wget.spec	5 Jul 2005 10:52:33 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols.
 Name: wget
 Version: 1.10
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/Internet
 Url: http://wget.sunsite.dk/
@@ -11,6 +11,8 @@
 Patch2: wget-1.10-rh1.patch
 Patch3: wget-1.10-path.patch
 Patch4: wget-1.9.1-docsyntax.patch
+Patch5: wget-1.10-docs.patch
+Patch6: wget-1.10-no-cookies.patch
 Provides: webclient
 Prereq: /sbin/install-info
 BuildRequires: perl, openssl-devel, pkgconfig, texinfo, gettext, autoconf
@@ -31,6 +33,8 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 cp %{SOURCE2} $RPM_BUILD_DIR/wget-%{version}/po/ko.po
 
@@ -69,6 +73,10 @@
 %{_infodir}/*
 
 %changelog
+* Tue Jul 05 2005 Karsten Hopp <karsten at redhat.de> 1.10-3
+- fix minor documentation bug
+- fix --no-cookies crash
+
 * Mon Jul 04 2005 Karsten Hopp <karsten at redhat.de> 1.10-2
 - update to wget-1.10
   - drop passive-ftp patch, already in 1.10