ports/51391: update-port: ftp/gftp

[Oliver Lehmann]

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

From: Oliver Lehmann <lehmann at ans-netz.de>
To: freebsd-gnats-submit at FreeBSD.org
Cc:  
Subject: Re: ports/51391: update-port: ftp/gftp
Date: Fri, 25 Apr 2003 02:31:02 +0200

 After applying the patch, apply the following patch please:
 
 diff -ruN gftp.old/files/patch-lib::misc.c gftp/files/patch-lib::misc.c
 --- gftp.old/files/patch-lib::misc.c	Fri Apr 25 02:23:52 2003
 +++ gftp/files/patch-lib::misc.c	Fri Apr 25 02:24:07 2003
 @@ -1,14 +1,12 @@
 ---- lib/misc.c.orig	Thu Apr 24 11:54:48 2003
 -+++ lib/misc.c	Thu Apr 24 11:53:00 2003
 -@@ -881,7 +881,11 @@
 +--- lib/misc.c.orig	Fri Dec  6 03:28:19 2002
 ++++ lib/misc.c	Fri Apr 25 01:51:48 2003
 +@@ -881,7 +881,8 @@
         diff += rd;
         tempstr[diff] = '\0'; 
   
 -+#ifdef __FreeBSD__
 -+      if (strcmp (tempstr, "Password:") == 0)
 -+#else
 -       if (diff > 11 && strcmp (tempstr + diff - 10, "password: ") == 0)
 -+#endif
 +-      if (diff > 11 && strcmp (tempstr + diff - 10, "password: ") == 0)
 ++      if ( (strcmp (tempstr, "Password:") == 0) ||
 ++           (diff > 11 && strcmp (tempstr + diff - 10, "password: ") == 0) )
           {
             if (wrotepw)
               {
 
 
 with that, you should get a gftp/files/patch-lib::misc.c which looks like:
 
 
 root at kartoffel ftp> cat gftp/files/patch-lib::misc.c
 --- lib/misc.c.orig     Fri Dec  6 03:28:19 2002
 +++ lib/misc.c  Fri Apr 25 01:51:48 2003
 @@ -881,7 +881,8 @@
        diff += rd;
        tempstr[diff] = '\0'; 
  
 -      if (diff > 11 && strcmp (tempstr + diff - 10, "password: ") == 0)
 +      if ( (strcmp (tempstr, "Password:") == 0) ||
 +           (diff > 11 && strcmp (tempstr + diff - 10, "password: ") == 0) )
          {
            if (wrotepw)
              {
 root at kartoffel ftp> 
 
 
 That was needed because ssh Password prompts can be at least "Password: " _or_ "hostname... password: "
 
 -- 
  Oliver Lehmann
         @home: lehmann at ans-netz.de
       @office: oliver.lehmann at mgi.de
          @www: http://www.pofo.de/  |  http://wishlist.ans-netz.de/