Re: pkg/32901 ([Patch] New pure-ftpd 1.0.21 release)

[Geert Hendrickx <ghen%netbsd.org@localhost>]

The following reply was made to PR pkg/32901; it has been noted by GNATS.

From: Geert Hendrickx <ghen%netbsd.org@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: tonio%netbsd.org@localhost
Subject: Re: pkg/32901 ([Patch] New pure-ftpd 1.0.21 release)
Date: Fri, 24 Feb 2006 10:29:21 +0100

 I have tested the update, and it seems to work fine (with the addition of
 the libiconv/bl3.mk include, as tonio also pointed out),  but I'm getting
 different distfiles from different MASTER_SITES.  The SourceForge mirrors
 have this, after untarring: 
 
 % diff -ur pure-ftpd-1.0.21 pure-ftpd-1.0.21-sourceforge;
 diff -ur pure-ftpd-1.0.21/src/bsd-getopt_long.c 
pure-ftpd-1.0.21-sourceforge/src/bsd-getopt_long.c
 --- pure-ftpd-1.0.21/src/bsd-getopt_long.c      2006-02-24 09:55:10.000000000 
+0100
 +++ pure-ftpd-1.0.21-sourceforge/src/bsd-getopt_long.c  2006-02-24 
09:55:10.000000000 +0100
 @@ -464,19 +464,16 @@
                      fprintf(stderr, recargchar, optchar);
                  pure_optopt = optchar;
                  return BADARG;
 -           } else {
 -               pure_optarg = nargv[pure_optind];
 -           }
 -       } 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 &&
 -               *nargv[pure_optind + 1] != '-') {
 -               pure_optarg = nargv[++pure_optind];
 -           }
 +            } 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 &&
 +                   *nargv[pure_optind + 1] != '-') {
 +                   pure_optarg = nargv[++pure_optind];
 +               }
          }
          pure_place = EMSG;
          ++pure_optind;
 diff -ur pure-ftpd-1.0.21/src/ftpd.c pure-ftpd-1.0.21-sourceforge/src/ftpd.c
 --- pure-ftpd-1.0.21/src/ftpd.c 2006-02-24 09:55:10.000000000 +0100
 +++ pure-ftpd-1.0.21-sourceforge/src/ftpd.c     2006-02-24 09:55:10.000000000 
+0100
 @@ -4171,8 +4171,7 @@
      if (strncasecmp("utf8 ", args, 5) == 0) {
         if (cmdopts == NULL) {
             addreply_noformat(501, "OPTS UTF8: " MSG_MISSING_ARG);          
 -       } else if ((iconv_fd_fs2utf8 == NULL || iconv_fd_utf82fs == NULL)
 -                  && strcasecmp(charset_fs, "utf-8") != 0) {
 +       } else if (iconv_fd_fs2utf8 == NULL || iconv_fd_utf82fs == NULL) {
             addreply_noformat(500, "Disabled");
         } else if (strncasecmp(cmdopts, "on", sizeof "on" - 1U) == 0) {
             utf8 = 1;       
 Only in pure-ftpd-1.0.21/src: ftpd.c.orig
 
 
 Maybe this was a pre-release tarball  and the Sourceforge mirrors are not
 up-to-date yet  (they really shouldn't give their beta distfiles the same
 name as their actual release distfiles then!).   If that's the case, I'll
 just wait one or two days for the mirrors to sync,  and commit the update 
 then.  If not, I'll have to contact the PureFTPD authors about it.  
 
        Geert