diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2004-07-17 12:26:09 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2004-07-17 12:26:09 +0000 |
| commit | f598e66bf408eba689fbacee72dd3a347517d1ed (patch) | |
| tree | e697001a720a7259d55cdaa2b14ce3301187e312 /ftp | |
| parent | Update to 0715 snapshot (diff) | |
- Fix crasher in pure-pw
PR: ports/69098
Submitted by: Xin LI <delphij@frontfree.net>
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=113813
Diffstat (limited to 'ftp')
| -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 8f303a543b5b..e4e9076843fb 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 236a27cde851..b886953e2437 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; |