diff -uNr greed.orig/Makefile greed/Makefile --- greed.orig/Makefile Mon Dec 20 17:15:17 2004 +++ greed/Makefile Mon Dec 20 16:36:04 2004 @@ -2,7 +2,7 @@ # Date created: 13 April 1999 # Whom: Chris Piazza # -# $FreeBSD$ +# $FreeBSD: ports/ftp/greed/Makefile,v 1.22 2004/02/05 20:37:09 trevor Exp $ # PORTNAME= greed @@ -10,6 +10,7 @@ CATEGORIES= ftp www MASTER_SITES= http://sheepkiller.nerim.net/ports/$(PORTNAME)/ DISTNAME= greed.81p +PORTREVISION= 1 MAINTAINER= ports@FreeBSD.org COMMENT= A utility for downloading files with resume capabilities diff -uNr greed.orig/files/patch-ab greed/files/patch-ab --- greed.orig/files/patch-ab Thu Jan 1 01:00:00 1970 +++ greed/files/patch-ab Mon Dec 20 16:56:17 2004 @@ -0,0 +1,37 @@ +--- main.c.orig Thu Jan 20 19:31:46 2000 ++++ main.c Mon Dec 20 16:56:12 2004 +@@ -416,18 +416,28 @@ + ARCHIVES = 1; + } + +- if (ARCHIVES) +- if(system(strcat(COMMAND, URL->filename)) == 0) ++ if (ARCHIVES) { ++ ++ strncat(COMMAND, URL->filename,sizeof(COMMAND)); ++ if (strpbrk(COMMAND, BADCHARS)) { ++ printf("Shell characters found in URL, skipping the download.\n"); ++ return; ++ } ++ ++ if(system(COMMAND) == 0) + { printf("**** %s is a valid archive!\n\n\n", URL->filename); + if (CALL_ME) + MailNotify(URL,1); + } else + { printf("!!!! %s HAS ERRORS!!!\n\n\n", URL->filename); +- if (CALL_ME) ++ if (CALL_ME) { + MailNotify(URL,0); +- } else if (CALL_ME) +- MailNotify(URL,-1); +- } ++ } else if (CALL_ME) { ++ MailNotify(URL,-1); ++ } ++ } ++ } ++ } + } + } + diff -uNr greed.orig/files/patch-ac greed/files/patch-ac --- greed.orig/files/patch-ac Thu Jan 1 01:00:00 1970 +++ greed/files/patch-ac Mon Dec 20 17:03:40 2004 @@ -0,0 +1,11 @@ +--- main.h.orig Thu Jan 20 19:33:45 2000 ++++ main.h Mon Dec 20 17:03:22 2004 +@@ -62,7 +62,7 @@ + #define CURRENT_VERSION "GREED/0.81+ STABLE" + #define GGR "http://www.public.asu.edu/~arturner/greed.tar.gz" + #define BASE64 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" +- ++#define BADCHARS ";&()|<>*?[]~!\"'`$" + + typedef int bool; +