Update "bidwatcher" to version 1.3.6. Changes since version 1.3.5:

- Added Comment field.
- Fixed ebay time sync'ing.
- Fix bad "Host:" entity-header if a proxy server was used. It used
  to send "Host: proxy.do.main" instead of "Host: whatever.ebay.com".
- It now sends an "User-Agent" string which looks like Mozilla 1.1
  including the real operating system and machine.
- It support using "POST" for the actual bid. I've succesfully tested
  this by bidding on an auction.
- Fixed stupid bug introduced in 1.3.5 for certain ebay motors auctions
- Fixed handling bad DNS responses.

6 files changed, 5 insertions, 554 deletions

diff --git a/misc/bidwatcher/Makefile b/misc/bidwatcher/Makefile
index 5c6afbb6436..44204ffc968 100644
--- a/misc/bidwatcher/Makefile
+++ b/misc/bidwatcher/Makefile
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2002/10/20 02:41:29 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2002/10/27 21:54:25 tron Exp $
 
-DISTNAME=	bidwatcher-1.3.5
+DISTNAME=	bidwatcher-1.3.6
 CATEGORIES=	misc
-PKGREVISION=	2
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bidwatcher/}
 
-PATCHFILES=	bidwatcher-1.3.5-p1.diff
-PATCH_SITES= 	${MASTER_SITE_SOURCEFORGE:=bidwatcher/}
-
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=       http://sourceforge.net/projects/bidwatcher/
 COMMENT=        eBay snipe tool
diff --git a/misc/bidwatcher/distinfo b/misc/bidwatcher/distinfo
index 3d67c355513..c3114af4cbd 100644
--- a/misc/bidwatcher/distinfo
+++ b/misc/bidwatcher/distinfo
@@ -1,10 +1,4 @@
-$NetBSD: distinfo,v 1.15 2002/10/12 15:32:15 tron Exp $
+$NetBSD: distinfo,v 1.16 2002/10/27 21:54:25 tron Exp $
 
-SHA1 (bidwatcher-1.3.5.tar.gz) = ac214aec04bb5cd7a3ba44b7b260c8f4a6b20b4a
-Size (bidwatcher-1.3.5.tar.gz) = 146807 bytes
-SHA1 (bidwatcher-1.3.5-p1.diff) = f1173d61c6bd592b0db404a5e8ae05bd5e793423
-Size (bidwatcher-1.3.5-p1.diff) = 2131 bytes
-SHA1 (patch-aa) = e0efcb1b5f5c07b01cb53ae2d76de25b70eab370
-SHA1 (patch-ab) = a42d928e6da968bb2abdc00683c598813c9fb9a9
-SHA1 (patch-ac) = 1c2def19e1ebba85dc5e314a332097cd1570facd
-SHA1 (patch-ad) = 6001a5af42a27dbac556db52c7082c53a55af646
+SHA1 (bidwatcher-1.3.6.tar.gz) = b60bfa71203ef865489f5b95fec0eff90c92c998
+Size (bidwatcher-1.3.6.tar.gz) = 145239 bytes
diff --git a/misc/bidwatcher/patches/patch-aa b/misc/bidwatcher/patches/patch-aa
deleted file mode 100644
index 7f282687cb1..00000000000
--- a/misc/bidwatcher/patches/patch-aa
+++ /dev/null
@@ -1,342 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2002/10/12 12:25:56 tron Exp $
-
---- helpers.cpp.orig	Sat Oct 12 11:07:22 2002
-+++ helpers.cpp	Sat Oct 12 11:07:43 2002
-@@ -1000,12 +1000,12 @@
- 	 case 2: // current price
- 	   if (CurrentBid==0) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     parseprice(LineData,this,FALSE);
-+	     parseprice(LineData, this, FALSE);
- 	     
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     if (strstr(LineData,"reserve not") != NULL)
-+	     if (strstr(LineData, "reserve not"))
- 	       reserveMet = 'n';
--	     else if (strstr(LineData,"reserve met") != NULL)
-+	     else if (strstr(LineData, "reserve met"))
- 	       reserveMet = 'y';
- 	     else
- 	       // Not a reserve auction, put the chars back.
-@@ -1014,92 +1014,92 @@
- 	   }
- 	   break;
- 	 case 3:  // first bid
--	   if (FirstBid==0) {
-+	   if (!FirstBid) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     parseprice(LineData,this,TRUE);
--	     /*	     CheckBadChars(LineData,CheckPrice);
--		     strncpy(FirstBid,LineData,14); */
-+	     parseprice(LineData, this, TRUE);
-+	     /*	     CheckBadChars(LineData, CheckPrice);
-+		     strncpy(FirstBid, LineData, 14); */
- 	   }
- 	   break;
- 	 case 4: // quantity
--	   if (Quantity==0) {
-+	   if (!Quantity) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     CheckBadChars(LineData,"0123456789");
--	     //	     strncpy(Quantity,LineData,14);
--	     Quantity=atoi(LineData);
-+	     CheckBadChars(LineData, "0123456789");
-+	     //	     strncpy(Quantity, LineData, 14);
-+	     Quantity = atoi(LineData);
- 	   }
- 	   break;
- 	 case 5: // bid count
--	   if (BidCount==0) {
-+	   if (!BidCount) {
- 	     char bc[80];
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     for(cnt=0;(((LineData[cnt]!=' ') && 
--			 (LineData[cnt]!=0)) && (cnt<14));++cnt)
--	       bc[cnt]=LineData[cnt];
--	     bc[cnt]=0;
--	     BidCount=atoi(bc);
-+	     for(cnt=0; (((LineData[cnt]!=' ') && 
-+			  (LineData[cnt]!=0)) && (cnt<14)); ++cnt)
-+	       bc[cnt] = LineData[cnt];
-+	     bc[cnt] = 0;
-+	     BidCount = atoi(bc);
- 	   }
- 	   break;
- 	 case 6: // time left
--	   if (TimeLeft[0]==0) {
-+	   if (!TimeLeft[0]) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     strncpy(TimeLeft,LineData,50);
--	     if (strstr(LineData, "Auction has ended") != NULL ) { //DBS
--	       ended_early = 1;					   //DBS
-+	     strncpy(TimeLeft, LineData, 50);
-+	     if (strstr(LineData, "Auction has ended")) { //DBS
-+	       ended_early = 1;				  //DBS
- 	       showError("Auction has ended.");
- 	     }
- 	     
- 	   }
- 	   break;
- 	 case 7: // location
--	   if (Location[0]==0) {
-+	   if (!Location[0]) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     strncpy(Location,LineData,100);
-+	     strncpy(Location, LineData, 100);
- 	   }
- 	   break;
- 	 case 8: // time started
--	   if (Started[0]==0) {
-+	   if (!Started[0]) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     strncpy(Started,LineData,50);
-+	     strncpy(Started, LineData,50);
- 	     translate_date(Started);
- 	   }
- 	   break;
- 	 case 9: // time ending
--	   if (Ends[0]==0) {
-+	   if (!Ends[0]) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     strncpy(Ends,LineData,50);
-+	     strncpy(Ends, LineData, 50);
- 	     translate_date(Ends);
- 	   }
- 	   break;
- 	 case 10: // seller id
--	   if (Seller[0]==0) {
-+	   if (!Seller[0]) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     strncpy(Seller,LineData,75);
-+	     strncpy(Seller, LineData, 75);
- 	   }
- 	   break;
- 	 case 11: // high bidder id
--	   if (HighBidder[0]==0) {
-+	   if (!HighBidder[0]) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     strncpy(HighBidder,LineData,76);
-+	     strncpy(HighBidder, LineData, 76);
- 	     HighBidder[75] = '\0';
- 	   }
- 	   break;
- 	   
--	   //case 12: idx=GetLineOfData(idx,1024,LineData,Buff);
--	   //         CheckBadChars(LineData,CheckPrice);
--	   //         strncpy(BidInc,LineData,14);
-+	   //case 12: idx=GetLineOfData(idx, 1024, LineData, Buff);
-+	   //         CheckBadChars(LineData, CheckPrice);
-+	   //         strncpy(BidInc, LineData, 14);
- 	   //         break;
- 	      
- 	 case 13: // dutch auction
- 	   streamBuff.getline(LineData, 1024, '\n');
--	   if (strcmp(LineData, "Dutch Auction") == 0)
-+	   if (!strcmp(LineData, "Dutch Auction"))
- 	     strcpy(HighBidder, "Dutch Auction");
- 	   break;
- 
- 	 case 15: // reserve auctions
--	   if (strstr(LineData,"reserve not") != NULL)
-+	   if (strstr(LineData,"reserve not"))
- 	     reserveMet = 'n';
--	   else if (strstr(LineData,"reserve met") != NULL)
-+	   else if (strstr(LineData,"reserve met"))
- 	     reserveMet = 'y';
- 
- 	 default:;
-@@ -1109,78 +1109,78 @@
- 
-        case TYPE_EBAYMOTORSCAR:
- 	 //printf("LD:%s:%i\n", LineData, strlen(LineData));
--	 switch(ReturnBidVarNum(LineData,auc_type)) {
-+	 switch(ReturnBidVarNum(LineData, auc_type)) {
- 	 case 9:
- 	 case 1:  // Current Bid
--	   if (CurrentBid==0) {
-+	   if (!CurrentBid) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     parseprice(LineData,this,FALSE);
-+	     parseprice(LineData, this, FALSE);
- 	     
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     if (strstr(LineData,"reserve not") != NULL)
-+	     if (strstr(LineData, "reserve not"))
- 	       reserveMet = 'n';
--	     else if (strstr(LineData,"reserve met") != NULL)
-+	     else if (strstr(LineData, "reserve met"))
- 	       reserveMet = 'y';
--	     else if (strstr(LineData,"Time left") != NULL)
-+	     else if (strstr(LineData, "Time left"))
- 	       TimeLeft[0] = '0';
- 	   }
- 	   break;
- 	    
- 	 case 2: //Time left
--	   if (TimeLeft[0]==0) {
-+	   if (!TimeLeft[0]) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     strncpy(TimeLeft,LineData,50);
-+	     strncpy(TimeLeft, LineData, 50);
- 	   }
- 	   break;
- 	 case 3: //Seller
--	   if (Seller[0]==0) {
-+	   if (!Seller[0]) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     strncpy(Seller,LineData,75);
-+	     strncpy(Seller, LineData, 75);
- 	   }
- 	   break;
- 	 case 4: //High bid
--	   if (HighBidder[0]==0) {
-+	   if (!HighBidder[0]) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     strncpy(HighBidder,LineData,76);
-+	     strncpy(HighBidder, LineData, 76);
- 	     HighBidder[75] = '\0';
- 	   }
- 	   break;
- 	 case 5: //Number of bids
--	   if (BidCount==0) {
-+	   if (!BidCount) {
- 	     char bc[80];
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     for(cnt=0;(((LineData[cnt]!=' ') && 
--			 (LineData[cnt]!=0)) && (cnt<14));++cnt)
--	       bc[cnt]=LineData[cnt];
--	     bc[cnt]=0;
--	     BidCount=atoi(bc);
-+	     for(cnt=0; (((LineData[cnt]!=' ') && 
-+			  (LineData[cnt]!=0)) && (cnt<14)); ++cnt)
-+	       bc[cnt] = LineData[cnt];
-+	     bc[cnt] = 0;
-+	     BidCount = atoi(bc);
- 	   }
- 	   break;
- 	 case 6: //Location
--	   if (Location[0]==0) {
-+	   if (!Location[0]) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     strncpy(Location,LineData,100);
-+	     strncpy(Location, LineData, 100);
- 	   }
- 	   break;
- 	 case 7: //Started
--	   if (Started[0]==0) {
-+	   if (!Started[0]) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     strncpy(Started,LineData,50);
--	     translate_date( Started );
-+	     strncpy(Started, LineData, 50);
-+	     translate_date(Started);
- 	   }
- 	   break;
- 	 case 8: //Ends
--	   if (Ends[0]==0) {
-+	   if (!Ends[0]) {
- 	     streamBuff.getline(LineData, 1024, '\n');
--	     strncpy(Ends,LineData,50);
--	     translate_date( Ends );
-+	     strncpy(Ends, LineData, 50);
-+	     translate_date(Ends);
- 	   }
- 	   break;
- 
- 	 case 10: // reserve auctions
--	   if (strstr(LineData,"reserve not") != NULL)
-+	   if (strstr(LineData, "reserve not"))
- 	     reserveMet = 'n';
--	   else if (strstr(LineData,"reserve met") != NULL)
-+	   else if (strstr(LineData, "reserve met"))
- 	     reserveMet = 'y';
- 	   
- 	 default:;
-@@ -1210,16 +1210,16 @@
-    if (!scratch) return FALSE;
- 
-    strcpy(Seller, scratch);
--   scratch = strtok(0,")");
-+   scratch = strtok(0, ")");
- 
-    if (scratch) {
-       strcpy(SellerRate, scratch);
-       strcat(SellerRate, ")");
-    }
- 
--   if ((strcmp(HighBidder, "Dutch Auction") == 0) ||
--       (strcmp(HighBidder, "see Dutch high bidders") == 0) ||
--       (strcmp(HighBidder, "--") == 0) ) {
-+   if ((!strcmp(HighBidder, "Dutch Auction")) ||
-+       (!strcmp(HighBidder, "see Dutch high bidders")) ||
-+       (!strcmp(HighBidder, "--")) ) {
-      return TRUE;
-    } else {
-      strcpy(newName, HighBidder);
-@@ -1228,7 +1228,7 @@
-      if (!scratch) return FALSE;
-      
-      strcpy(HighBidder, scratch);
--     scratch = strtok(0,")");
-+     scratch = strtok(0, ")");
-      if (scratch) {
-        strcpy(BidderRate, scratch);
-        strcat(BidderRate, ")");
-@@ -1303,12 +1303,24 @@
-    ebay_time.tm_isdst = 0;
-    while(streamBuff) {
-      streamBuff.getline(lineBuff, 1024, '\n');
--     if (strstr(lineBuff, 
--		"Look here to see what time eBay thinks it is") != NULL ) {
-+     /*
-+     if (strstr(lineBuff, "Look here to see what time eBay thinks it is")) {
-        scratch = strtok(lineBuff, ">");
-        if (scratch) scratch = strtok(0, ">");
-        if (scratch) scratch = strtok(0, ">");
-        if (scratch) scratch = strtok(0, " ");
-+     */
-+
-+     scratch = strstr(lineBuff, "Monday");
-+     if (!scratch) scratch = strstr(lineBuff, "Tuesday");
-+     if (!scratch) scratch = strstr(lineBuff, "Wednesday");
-+     if (!scratch) scratch = strstr(lineBuff, "Thursday");     
-+     if (!scratch) scratch = strstr(lineBuff, "Friday");     
-+     if (!scratch) scratch = strstr(lineBuff, "Saturday");     
-+     if (!scratch) scratch = strstr(lineBuff, "Sunday");     
-+
-+     if (scratch) {
-+       scratch = strtok(scratch, " "); 
-        if (scratch) scratch = strtok(0, " ");
-        if (scratch) strcpy(chMonth, scratch);
-        scratch = strtok(0, " ");
-@@ -1335,18 +1347,18 @@
-                        ((int(chSec[strlen(chSec) - 1])) - 48);
-    ebay_time.tm_mday = atoi(chDay); 
-    if (strcmp("Jan", chMonth) == 0) ebay_time.tm_mon = 0 ;
--   else if (strcmp("Feb", chMonth) == 0) ebay_time.tm_mon = 1 ;
--   else if (strcmp("Mar", chMonth) == 0) ebay_time.tm_mon = 2 ;
--   else if (strcmp("Apr", chMonth) == 0) ebay_time.tm_mon = 3 ;
--   else if (strcmp("May", chMonth) == 0) ebay_time.tm_mon = 4 ;
--   else if (strcmp("Jun", chMonth) == 0) ebay_time.tm_mon = 5 ;
--   else if (strcmp("Jul", chMonth) == 0) ebay_time.tm_mon = 6 ;
--   else if (strcmp("Aug", chMonth) == 0) ebay_time.tm_mon = 7 ;
--   else if (strcmp("Sep", chMonth) == 0) ebay_time.tm_mon = 8 ;
--   else if (strcmp("Oct", chMonth) == 0) ebay_time.tm_mon = 9 ;
--   else if (strcmp("Nov", chMonth) == 0) ebay_time.tm_mon = 10 ;
--   else ebay_time.tm_mon = 11;   
--   ebay_time.tm_year = atoi(chYear) - 1900;  
-+   else if (strcmp("Feb", chMonth) == 0) ebay_time.tm_mon = 1;
-+   else if (strcmp("Mar", chMonth) == 0) ebay_time.tm_mon = 2;
-+   else if (strcmp("Apr", chMonth) == 0) ebay_time.tm_mon = 3;
-+   else if (strcmp("May", chMonth) == 0) ebay_time.tm_mon = 4;
-+   else if (strcmp("Jun", chMonth) == 0) ebay_time.tm_mon = 5;
-+   else if (strcmp("Jul", chMonth) == 0) ebay_time.tm_mon = 6;
-+   else if (strcmp("Aug", chMonth) == 0) ebay_time.tm_mon = 7;
-+   else if (strcmp("Sep", chMonth) == 0) ebay_time.tm_mon = 8;
-+   else if (strcmp("Oct", chMonth) == 0) ebay_time.tm_mon = 9;
-+   else if (strcmp("Nov", chMonth) == 0) ebay_time.tm_mon = 10;
-+   else ebay_time.tm_mon = 11;
-+   ebay_time.tm_year = atoi(chYear) - 1900;
- 
-    time_t theTime = mktime(&ebay_time) - new_time_t;
- 
diff --git a/misc/bidwatcher/patches/patch-ab b/misc/bidwatcher/patches/patch-ab
deleted file mode 100644
index 04f343f0bc5..00000000000
--- a/misc/bidwatcher/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/10/12 15:32:15 tron Exp $
-
---- bidwatcher.h.orig	Mon Sep  9 15:57:24 2002
-+++ bidwatcher.h	Sat Oct 12 16:41:22 2002
-@@ -100,7 +100,7 @@
- struct URL {
-     struct hostent *hostinfo;
-     unsigned int port;
--    char url[256];
-+    char url[256], hoststring[256];
-     bool useproxy;
-     int numaliases;
-     int numaddrs;
-@@ -331,7 +331,7 @@
- void translate_date(char *date);
- bool GetAucInfo(char *Buff, struct auctioninfo *NewAuction);
- int calcTimeDiff (char *buffer);
--int fetchURL(URL *url, char **Buff, double timeOut);
-+int fetchURL(URL *url, int Post, char **Buff, double timeOut);
- char *stristr(const char *haystack, const char *needle);
- char translate_special(const char *input, int *len);
- 
diff --git a/misc/bidwatcher/patches/patch-ac b/misc/bidwatcher/patches/patch-ac
deleted file mode 100644
index 4ba13261a0c..00000000000
--- a/misc/bidwatcher/patches/patch-ac
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2002/10/12 15:32:15 tron Exp $
-
---- netstuff.cpp.orig	Sat Oct 12 16:16:49 2002
-+++ netstuff.cpp	Sat Oct 12 16:49:10 2002
-@@ -34,6 +34,7 @@
- #include <time.h>
- #include <netinet/in.h>
- #include <sys/socket.h>
-+#include <sys/utsname.h>
- #include <netdb.h>
- #include <gtk/gtk.h>
- #include "bidwatcher.h"
-@@ -51,7 +52,7 @@
-   g_free(ustring);
- 
-   char *HtmlBuff;
--  fetchURL(url,&HtmlBuff,TIMEOUT);
-+  fetchURL(url,0,&HtmlBuff,TIMEOUT);
-   char *adultcookie=strstr(HtmlBuff,"Set-Cookie");
-   if (adultcookie==NULL) {
-     printf("adult cookie not found\n");
-@@ -143,16 +144,16 @@
- }
- 
- void URL::create(char *newurl,URL *proxy) {
-+  char *hostoff = strstr(newurl, "://") + 3;
-+
-+  sprintf(hoststring, "%.*s", strcspn(hostoff, "/"), hostoff);
-   if (proxy == NULL) {
--    char *hostoff = strstr(newurl, "://") + 3;
-     char tmpstr[256];
- 
-     useproxy = FALSE;
- 
--    strncpy(tmpstr, hostoff, strcspn(hostoff, "/"));
--    tmpstr[strcspn(hostoff, "/")] = '\0';
--
--    if (strlen(tmpstr) < strlen(newurl)) {
-+    strcpy(tmpstr, hoststring);
-+    if (strlen(tmpstr) < strlen(hostoff)) {
-       strcpy(url, hostoff + strlen(tmpstr));
-     } else url[0] = '\0';
-     
-@@ -235,13 +236,17 @@
-   else return FALSE;
- }
- 
--int fetchURL(URL *url, char **Buff, double timeOut)
-+int fetchURL(URL *url, int Post, char **Buff, double timeOut)
- {
-    int    buffLength,recerr;
-    int    socketID;
-+   char   UserAgent[256];
-+   char   *Host;
-    char   lineBuff[1024];
-    char   htmlBuff[HUGEBUFF];
- 
-+   struct    utsname     utsbuf;
-+
-    struct    sockaddr_in soc_in;
-    int	  err;
-    fd_set fds;
-@@ -331,9 +336,26 @@
-      return NET_NETERROR;
-    }
- 
-+   if (uname(&utsbuf) < 0)
-+     UserAgent[0] = '\0';
-+   else
-+     sprintf(UserAgent, "User-Agent: Mozilla/5.0 (X11; U; %s %s; en-US; rv:1.1) Gecko/20020912\r\n", utsbuf.sysname, utsbuf.machine);
-+
-    // send our request for the web page.
-    // XXX: Took out the cookie for now cuz we're not yet using it.
--   sprintf(lineBuff, "GET %s HTTP/1.1\r\nConnection: close\r\nHost: %s\r\nUser-Agent: bidwatcher\r\n\r\n", url->url, url->hostinfo->h_name);
-+   if (Post) {
-+     int URLLen;
-+     char *Args;
-+
-+     URLLen = strcspn(url->url, "?");
-+     Args = &url->url[URLLen];
-+     if (*Args != '\0')
-+       Args++;
-+
-+     sprintf(lineBuff, "POST %.*s HTTP/1.1\r\nConnection: close\r\nHost: %s\r\nContent-Length: %d\r\n%s\r\n%s", URLLen, url->url, url->hoststring, strlen(Args), UserAgent, Args);
-+   } else {
-+     sprintf(lineBuff, "GET %s HTTP/1.1\r\nConnection: close\r\nHost: %s\r\n%s\r\n", url->url, url->hoststring, UserAgent);
-+   }
- 
-    if (send(socketID, lineBuff, strlen(lineBuff), 0) < 0) {
- #ifdef DEBUG_NETWORK
-@@ -406,7 +428,7 @@
-    if (checkredir(url,htmlBuff)) {
-      g_free(time_since_pkt);
-      g_free(time_since_start);
--     return fetchURL(url, Buff, timeOut);
-+     return fetchURL(url, 0, Buff, timeOut);
-    } else {
-      if (!goodcall) {
-        g_free(time_since_pkt);
diff --git a/misc/bidwatcher/patches/patch-ad b/misc/bidwatcher/patches/patch-ad
deleted file mode 100644
index 6ea5f66dd24..00000000000
--- a/misc/bidwatcher/patches/patch-ad
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2002/10/12 15:32:16 tron Exp $
-
---- bidwatcher.cpp.orig	Sat Oct 12 17:17:13 2002
-+++ bidwatcher.cpp	Sat Oct 12 17:18:32 2002
-@@ -582,7 +582,7 @@
-   bidurl = new URL(ustring, proxyurl);
-   g_free(ustring);
- 
--  int returnVal = fetchURL(bidurl, &Buff, TIMEOUT);
-+  int returnVal = fetchURL(bidurl, 1, &Buff, TIMEOUT);
-   if (returnVal != 1) {
-     if (returnVal == 2)
-       showError("Could not obtain bid key: a network error occurred.");
-@@ -662,7 +662,7 @@
- 
-   g_free(url);
-   
--  retval = fetchURL(bidurl, &Buff, TIMEOUT);
-+  retval = fetchURL(bidurl, 1, &Buff, TIMEOUT);
-   
-   if (retval != NET_SUCCESS) {
-     sprintf(lineBuff,"Bid on %lu FAILED: Error %d connecting to eBay",
-@@ -869,7 +869,7 @@
- 	      "ReturnUserEmail&requested=%s&userid=%s&pass=%s&iid=%s",
- 	      name,authID,authPASS,auctionid);
-       URL *emailurl=new URL(WebPage,proxyurl);
--      int err = fetchURL(emailurl,&Buff,TIMEOUT);
-+      int err = fetchURL(emailurl,0,&Buff,TIMEOUT);
-       delete(emailurl);
-       if ((err == 2) || (err == 4) || (strlen(Buff) < 1000)) {
- 	  showError("Could not get email address: Network error");
-@@ -3533,7 +3533,7 @@
- 	  "MfcISAPICommand=ViewBidItems&userid=%s&completed=0&all=1&rows=200",
- 	  authID);
-   URL *bidsurl = new URL(WebPage, proxyurl);
--  returnVal = fetchURL(bidsurl, &Buff, TIMEOUT);
-+  returnVal = fetchURL(bidsurl, 0, &Buff, TIMEOUT);
-   delete(bidsurl);
-   blackLED();
-   showStatus("");
-@@ -3613,7 +3613,7 @@
-   sprintf(WebPage, "http://cgi6.ebay.com/aw-cgi/eBayISAPI.dll?"
- 	  "ViewListedItems&userid=%s&completed=0&sort=3&since=-1", authID);
-   URL *listingurl = new URL(WebPage, proxyurl);
--  returnVal = fetchURL(listingurl, &Buff, TIMEOUT);
-+  returnVal = fetchURL(listingurl, 0, &Buff, TIMEOUT);
-   delete listingurl;
-   blackLED();
-   showStatus("");
-@@ -3828,7 +3828,7 @@
-     infourl = new URL(urlstring, proxyurl);
- 
-   greenLED();
--  returnVal = fetchURL(infourl, &HtmlBuff, TIMEOUT);
-+  returnVal = fetchURL(infourl, 0, &HtmlBuff, TIMEOUT);
- 
-   if (returnVal == NET_NETERROR || returnVal == NET_TIMEOUT) { 
-     // maybe proxy settings changed
-@@ -3836,7 +3836,7 @@
-       delete(infourl);
-     infourl = new URL(urlstring, proxyurl);
-  
--    returnVal = fetchURL(infourl, &HtmlBuff, TIMEOUT);
-+    returnVal = fetchURL(infourl, 0, &HtmlBuff, TIMEOUT);
-   }
- 
-   g_free(urlstring);
-@@ -3905,7 +3905,7 @@
-       greenLED();
-       gettimeofday(&tm_start, NULL);
-       
--      returnVal = fetchURL(timesyncurl, &HtmlBuff, TIMEOUT);
-+      returnVal = fetchURL(timesyncurl, 0, &HtmlBuff, TIMEOUT);
- 
-       gettimeofday(&tm_end, NULL);
-       t1 = (tm_end.tv_sec + 0.000001 * tm_end.tv_usec)