Update to 1.3, http_proxy support incorporated into distribution.

4 files changed, 9 insertions, 71 deletions

diff --git a/www/urlget/Makefile b/www/urlget/Makefile
index 53cdecb063e..6111cf903f4 100644
--- a/www/urlget/Makefile
+++ b/www/urlget/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/03/03 00:18:08 kim Exp $
+# $NetBSD: Makefile,v 1.2 2000/10/14 18:09:55 kim Exp $
 #
 
-DISTNAME=		urlget-1.2
+DISTNAME=		urlget-1.3
 CATEGORIES=		www
 MASTER_SITES=		ftp://ftp.gw.com/pub/people/kim/
 
diff --git a/www/urlget/files/md5 b/www/urlget/files/md5
index 86d362f09e5..bd2402f5b6e 100644
--- a/www/urlget/files/md5
+++ b/www/urlget/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/03/03 00:18:08 kim Exp $
+$NetBSD: md5,v 1.2 2000/10/14 18:09:56 kim Exp $
 
-MD5 (urlget-1.2.tar.gz) = 382741925e296f6475fa88f5aa0dada5
+MD5 (urlget-1.3.tar.gz) = ccc1a342d84ee604c0bbccb815702cfc
diff --git a/www/urlget/files/patch-sum b/www/urlget/files/patch-sum
index 75f17d82fbd..68ec1d748e4 100644
--- a/www/urlget/files/patch-sum
+++ b/www/urlget/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.1 2000/10/03 11:19:25 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/10/14 18:09:56 kim Exp $
 
-MD5 (patch-aa) = 1c13b41e0c08d6eb6a9902e375d2e78c
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/www/urlget/patches/patch-aa b/www/urlget/patches/patch-aa
deleted file mode 100644
index 6e3c7b2604b..00000000000
--- a/www/urlget/patches/patch-aa
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2000/10/03 11:19:26 agc Exp $
-
-Patches to make urlget honour http_proxy environment setting
-
---- urlget.c	2000/09/18 13:56:27	1.1
-+++ urlget.c	2000/09/18 14:23:37
-@@ -91,6 +91,7 @@
-   char **postargv = NULL;
-   int c, ret, s = 0, count, sawNL;
-   int errflg = 0, postflg = 0, hdrflg = 0, oldflg = 0, debug = 0;
-+  int isproxy = 0;
-   FILE *fp;
- 
-   while ((c = getopt(argc, argv, "Dhop")) != EOF) {
-@@ -131,17 +132,31 @@
-   if (strncmp(url, "http:", 5) || (url[5] != '/') || (url[6] != '/'))
-     usage(argv[0]);
- 
--  if ((path = strchr(host, '/')) == NULL)
--    usage(argv[0]);
--  *path++ = '\0';
--
--  if ((p = strchr(host, ':')) != NULL) {
--    *p++ = '\0';
--    server.sin_port = htons((u_short) atoi(p));
--  } else if ((sp = getservbyname("http", "tcp")) == NULL) {
--    server.sin_port = htons((u_short) DEF_PORT);
-+  if ((p = getenv("http_proxy")) == NULL) {
-+	if ((path = strchr(host, '/')) == NULL)
-+		usage(argv[0]);
-+	*path++ = '\0';
-+	if ((p = strchr(host, ':')) != NULL) {
-+		*p++ = '\0';
-+		server.sin_port = htons((u_short) atoi(p));
-+	} else if ((sp = getservbyname("http", "tcp")) == NULL) {
-+		server.sin_port = htons((u_short) DEF_PORT);
-+	} else {
-+		server.sin_port = sp->s_port;
-+	}
-   } else {
--    server.sin_port = sp->s_port;
-+	host = &p[7];
-+	if ((ep = strchr(host, ':')) == NULL) {
-+		server.sin_port = htons((u_short) DEF_PORT);
-+	} else {
-+		*ep++ = 0;
-+		server.sin_port = htons((u_short) atoi(ep));
-+	}
-+	if ((ep = strrchr(p, '/')) != NULL) {
-+		*ep = 0;
-+	}
-+	path = url;
-+	isproxy = 1;
-   }
- 
-   if ((hp = gethostbyname(host)) == NULL) {
-@@ -171,7 +186,7 @@
-     printf("host = \"%s\", port = %d\n", host, ntohs(server.sin_port));
-   }
- 
--  fprintf(fp, "%s /%s%s\r\n", cmd, path, oldflg ? "" : " HTTP/1.0");
-+  fprintf(fp, "%s %s%s%s\r\n", cmd, (isproxy) ? "" : "/", path, oldflg ? "" : " HTTP/1.0");
-   if (!oldflg) {
-       fprintf(fp, "Host: %s\r\n", host);
-   }