diff options
| author | pav <pav@FreeBSD.org> | 2004-07-17 20:26:09 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2004-07-17 20:26:09 +0800 |
| commit | e66b22a8851ece304130ede1b7642248785eb116 (patch) | |
| tree | 7356d05227d8c058745dafbb836df369838c2b89 /ftp/pure-ftpd | |
| parent | abe0f949cc9ba1028ef8399a12139504e671f905 (diff) | |
| download | freebsd-ports-graphics-e66b22a8851ece304130ede1b7642248785eb116.tar.gz freebsd-ports-graphics-e66b22a8851ece304130ede1b7642248785eb116.tar.zst freebsd-ports-graphics-e66b22a8851ece304130ede1b7642248785eb116.zip | |
- Fix crasher in pure-pw
PR: ports/69098
Submitted by: Xin LI <delphij@frontfree.net>
Approved by: maintainer
Diffstat (limited to 'ftp/pure-ftpd')
| -rw-r--r-- | ftp/pure-ftpd/Makefile | 1 | ||||
| -rw-r--r-- | ftp/pure-ftpd/files/patch-src_bsd-getopt_long.c | 24 |
2 files changed, 18 insertions, 7 deletions
diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile index 8f303a543b5..e4e9076843f 100644 --- a/ftp/pure-ftpd/Makefile +++ b/ftp/pure-ftpd/Makefile @@ -7,6 +7,7 @@ PORTNAME= pure-ftpd PORTVERSION= 1.0.19 +PORTREVISION= 1 CATEGORIES= ftp ipv6 MASTER_SITES= ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \ ftp://ftp2.fr.pureftpd.org/pub/mirrors/ftp.fr.pureftpd.org/pub/pure-ftpd/releases/ \ diff --git a/ftp/pure-ftpd/files/patch-src_bsd-getopt_long.c b/ftp/pure-ftpd/files/patch-src_bsd-getopt_long.c index 236a27cde85..b886953e243 100644 --- a/ftp/pure-ftpd/files/patch-src_bsd-getopt_long.c +++ b/ftp/pure-ftpd/files/patch-src_bsd-getopt_long.c @@ -1,11 +1,21 @@ ---- src/bsd-getopt_long.c.orig Sun Jun 20 19:29:34 2004 -+++ src/bsd-getopt_long.c Tue Jun 22 15:21:09 2004 -@@ -472,6 +472,8 @@ - *nargv[pure_optind + 1] != '-') { - pure_optarg = nargv[++pure_optind]; - } +--- src/bsd-getopt_long.c.orig Mon Jun 21 01:29:56 2004 ++++ src/bsd-getopt_long.c Thu Jul 15 22:03:34 2004 +@@ -462,16 +462,8 @@ + fprintf(stderr, recargchar, optchar); + pure_optopt = optchar; + return BADARG; +- } else if (!(flags & FLAG_PERMUTE)) { +- /* +- * If permutation is disabled, we can accept an +- * optional arg separated by whitespace so long +- * as it does not start with a dash (-). +- */ +- if (pure_optind + 1 < nargc && pure_optind + 1 > 0 && +- *nargv[pure_optind + 1] != '-') { +- pure_optarg = nargv[++pure_optind]; +- } + } else { -+ pure_optarg = nargv[pure_optind]; ++ pure_optarg = nargv[++pure_optind]; } } pure_place = EMSG; |