From f19760c0b3116975ec18173261432f282fd9a587 Mon Sep 17 00:00:00 2001 From: FUJISHIMA Satsuki Date: Mon, 17 Dec 2001 20:44:12 +0000 Subject: [PATCH] o fix coredump in rate limitation. o remove stray debugging message. Obtained from: wget CVS --- ftp/wget-devel/Makefile | 1 + ftp/wget-devel/files/patch-src_main.c | 20 ++++++++++++++++++++ ftp/wget-devel/files/patch-src_progress.c | 17 +++++++++++++++++ ftp/wget/Makefile | 1 + ftp/wget/files/patch-src_main.c | 20 ++++++++++++++++++++ ftp/wget/files/patch-src_progress.c | 17 +++++++++++++++++ 6 files changed, 76 insertions(+) create mode 100644 ftp/wget-devel/files/patch-src_main.c create mode 100644 ftp/wget-devel/files/patch-src_progress.c create mode 100644 ftp/wget/files/patch-src_main.c create mode 100644 ftp/wget/files/patch-src_progress.c diff --git a/ftp/wget-devel/Makefile b/ftp/wget-devel/Makefile index f2dc351ba43f..caf5aad9f8cb 100644 --- a/ftp/wget-devel/Makefile +++ b/ftp/wget-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= wget PORTVERSION= 1.8 +PORTREVISION= 1 CATEGORIES= ftp www MASTER_SITES= ${MASTER_SITE_GNU} \ ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/wget/pub/unix/util/wget/ \ diff --git a/ftp/wget-devel/files/patch-src_main.c b/ftp/wget-devel/files/patch-src_main.c new file mode 100644 index 000000000000..0af7a399c1fa --- /dev/null +++ b/ftp/wget-devel/files/patch-src_main.c @@ -0,0 +1,20 @@ +Index: src/main.c +=================================================================== +RCS file: /pack/anoncvs/wget/src/main.c,v +retrieving revision 1.66 +retrieving revision 1.67 +diff -u -r1.66 -r1.67 +--- src/main.c 2001/12/06 07:14:35 1.66 ++++ src/main.c 2001/12/09 19:44:20 1.67 +@@ -738,10 +738,7 @@ + { + char *rewritten = rewrite_shorthand_url (argv[optind]); + if (rewritten) +- { +- printf ("Converted %s to %s\n", argv[optind], rewritten); +- url[i] = rewritten; +- } ++ url[i] = rewritten; + else + url[i] = xstrdup (argv[optind]); + } diff --git a/ftp/wget-devel/files/patch-src_progress.c b/ftp/wget-devel/files/patch-src_progress.c new file mode 100644 index 000000000000..33c42f877263 --- /dev/null +++ b/ftp/wget-devel/files/patch-src_progress.c @@ -0,0 +1,17 @@ +Index: src/progress.c +=================================================================== +RCS file: /pack/anoncvs/wget/src/progress.c,v +retrieving revision 1.21 +retrieving revision 1.22 +diff -u -r1.21 -r1.22 +--- src/progress.c 2001/12/09 01:24:40 1.21 WGET_1_8 ++++ src/progress.c 2001/12/09 04:51:40 1.22 +@@ -647,7 +647,7 @@ + /* Hours not printed: pad with three spaces (two digits and + colon). */ + APPEND_LITERAL (" "); +- else if (eta_hrs >= 10) ++ else if (eta_hrs < 10) + /* Hours printed with one digit: pad with one space. */ + *p++ = ' '; + else diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile index f2dc351ba43f..caf5aad9f8cb 100644 --- a/ftp/wget/Makefile +++ b/ftp/wget/Makefile @@ -7,6 +7,7 @@ PORTNAME= wget PORTVERSION= 1.8 +PORTREVISION= 1 CATEGORIES= ftp www MASTER_SITES= ${MASTER_SITE_GNU} \ ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/wget/pub/unix/util/wget/ \ diff --git a/ftp/wget/files/patch-src_main.c b/ftp/wget/files/patch-src_main.c new file mode 100644 index 000000000000..0af7a399c1fa --- /dev/null +++ b/ftp/wget/files/patch-src_main.c @@ -0,0 +1,20 @@ +Index: src/main.c +=================================================================== +RCS file: /pack/anoncvs/wget/src/main.c,v +retrieving revision 1.66 +retrieving revision 1.67 +diff -u -r1.66 -r1.67 +--- src/main.c 2001/12/06 07:14:35 1.66 ++++ src/main.c 2001/12/09 19:44:20 1.67 +@@ -738,10 +738,7 @@ + { + char *rewritten = rewrite_shorthand_url (argv[optind]); + if (rewritten) +- { +- printf ("Converted %s to %s\n", argv[optind], rewritten); +- url[i] = rewritten; +- } ++ url[i] = rewritten; + else + url[i] = xstrdup (argv[optind]); + } diff --git a/ftp/wget/files/patch-src_progress.c b/ftp/wget/files/patch-src_progress.c new file mode 100644 index 000000000000..33c42f877263 --- /dev/null +++ b/ftp/wget/files/patch-src_progress.c @@ -0,0 +1,17 @@ +Index: src/progress.c +=================================================================== +RCS file: /pack/anoncvs/wget/src/progress.c,v +retrieving revision 1.21 +retrieving revision 1.22 +diff -u -r1.21 -r1.22 +--- src/progress.c 2001/12/09 01:24:40 1.21 WGET_1_8 ++++ src/progress.c 2001/12/09 04:51:40 1.22 +@@ -647,7 +647,7 @@ + /* Hours not printed: pad with three spaces (two digits and + colon). */ + APPEND_LITERAL (" "); +- else if (eta_hrs >= 10) ++ else if (eta_hrs < 10) + /* Hours printed with one digit: pad with one space. */ + *p++ = ' '; + else