[pkgsrc/trunk]: pkgsrc/net/ncftp3 update to 3.1.9

[recht <recht%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3faa6b522b2a
branches:  trunk
changeset: 493464:3faa6b522b2a
user:      recht <recht%pkgsrc.org@localhost>
date:      Sat May 07 15:14:44 2005 +0000

description:
update to 3.1.9
ok'd by zuntum@

Add a patch from darwinports to disable Framework checks.

changes:
3.1.9, 2005-03-19
  + Renamed internal libraru function getline() to gl_getline()
    to avoid namespace collision with glibc.
  + Renamed internal library function Duration() to FTPDuration()
    to avoid namespace collision on Mac OS X.
  + Recognize additional error response codes to SITE UTIME, to prevent
    using it if the server doesn't support it.
  + If the server does not support setting timestamps in MDTM, quit
    trying it if it fails the first time.
  + Do not allow control characters such as NUL, CR, LF in FTP URLs, to
    avoid command injection as described by
    Albert Puigsech Galicia <ripe AT 7a69ezine.org>.
  + Fixed a problem where a timed-out transfer may have been detected
    but still locked up the process (Thanks, IWAI, Masaharu).
  + Ncftpget and ncftpput now accept a "-C" parameter which is similar
    to the "-c" option (ftp "cat" mode), where stdin (stdout) is not used
    and the filename is specified as a parameter instead.  This is useful
    if you don't want to specify a password on the command line.
  + Ncftpput now allows the "-m" option in conjunction with the "-c" or "-C"
    options.
  + Small compatibility fixes for Mac OS X, Solaris 10, Linux.

3.1.8.1, 2004-07-27
  + A fix for some DNS resolution problems on Linux.

diffstat:

 net/ncftp3/Makefile         |   7 +--
 net/ncftp3/distinfo         |  10 +++---
 net/ncftp3/patches/patch-ab |  75 ++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 79 insertions(+), 13 deletions(-)

diffs (114 lines):

diff -r 9948da2a8dab -r 3faa6b522b2a net/ncftp3/Makefile
--- a/net/ncftp3/Makefile       Sat May 07 15:10:24 2005 +0000
+++ b/net/ncftp3/Makefile       Sat May 07 15:14:44 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:46:51 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/07 15:14:44 recht Exp $
 
-DISTNAME=      ncftp-3.1.8-src
-PKGNAME=       ncftp3-3.1.8
-PKGREVISION=   1
+DISTNAME=      ncftp-3.1.9-src
+PKGNAME=       ncftp3-3.1.9
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.ncftp.com/ncftp/
 
diff -r 9948da2a8dab -r 3faa6b522b2a net/ncftp3/distinfo
--- a/net/ncftp3/distinfo       Sat May 07 15:10:24 2005 +0000
+++ b/net/ncftp3/distinfo       Sat May 07 15:14:44 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 12:13:54 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/05/07 15:14:44 recht Exp $
 
-SHA1 (ncftp-3.1.8-src.tar.gz) = 0fca0dd12ceafd9d491f32afca404c6b5da3ef31
-RMD160 (ncftp-3.1.8-src.tar.gz) = 5abc7f64a72ed1f074eb2d65c071158c0c542a1c
-Size (ncftp-3.1.8-src.tar.gz) = 509185 bytes
+SHA1 (ncftp-3.1.9-src.tar.gz) = 8bd1f7e30be35e67a23852c0fc120a6d0d5a6af0
+RMD160 (ncftp-3.1.9-src.tar.gz) = 7314b4b889530739e916de59ea724c10c32b8ee9
+Size (ncftp-3.1.9-src.tar.gz) = 516060 bytes
 SHA1 (patch-aa) = 38d3b7d1796424bf40b07a1e7e8627ad8d01ea8c
-SHA1 (patch-ab) = 50a5339631ebe82fd7c812f17c0429684214f48e
+SHA1 (patch-ab) = 718366f10e6a2b8b5a0b3a35fc6b818ca1edf747
diff -r 9948da2a8dab -r 3faa6b522b2a net/ncftp3/patches/patch-ab
--- a/net/ncftp3/patches/patch-ab       Sat May 07 15:10:24 2005 +0000
+++ b/net/ncftp3/patches/patch-ab       Sat May 07 15:14:44 2005 +0000
@@ -1,8 +1,75 @@
-$NetBSD: patch-ab,v 1.3 2005/01/16 21:36:34 jmmv Exp $
+$NetBSD: patch-ab,v 1.4 2005/05/07 15:14:44 recht Exp $
 
---- configure.orig     2004-01-06 21:44:43.000000000 +0100
-+++ configure
-@@ -8010,7 +8010,7 @@ fi
+--- configure.orig     2005-03-25 02:18:12.000000000 +0100
++++ configure  2005-05-07 10:56:46.000000000 +0200
+@@ -913,65 +913,7 @@
+       macos*|darwin|rhapsody)
+               OS="macosx"
+               SYS="macosx"
+-              os_v=`perl -e '{open(F, "< /System/Library/CoreServices/SystemVersion.plist") or exit(2); my ($doc) = ""; my ($line); while (defined($line = <F>)) { $doc .= $line; } close(F); $doc =~ 
s/\s+//gs; if ($doc =~ /<key>ProductVersion<\/key><string>([^<]+)<\/string>/) { print , "\n"; exit(0); } exit(1); }' 2>/dev/null`
+-              if [ "$os_v" = "" ] && [ -x "$HOME/bin/macosver" ] ; then
+-                      os_v=`"$HOME/bin/macosver" 2>/dev/null`
+-              fi
+-              if [ "$os_v" = "" ] ; then
+-                      cat > "$HOME/macosver.c" <<EOF
+-/*
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+-<plist version="0.9">
+-<dict>
+-      <key>ProductBuildVersion</key>
+-      <string>5S66</string>
+-      <key>ProductName</key>
+-      <string>Mac OS X</string>
+-      <key>ProductVersion</key>
+-      <string>10.1.5</string>
+-</dict>
+-</plist>
+-*/
+-
+-#include <stdio.h>
+-#include <string.h>
+-#include <stdlib.h>
+-#include <ctype.h>
+-
+-main()
+-{
+-      char line[256], *cp, *cp2; 
+-      FILE *fp;
+-
+-      fp = fopen("/System/Library/CoreServices/SystemVersion.plist", "r");
+-
+-      if (fp != NULL) {
+-              memset(line, 0, sizeof(line));
+-              while (fgets(line, sizeof(line) - 1, fp) != NULL) {
+-                      cp = strstr(line, "<key>ProductVersion</key>");
+-                      if (cp != NULL) {
+-                              memset(line, 0, sizeof(line));
+-                              if (fgets(line, sizeof(line) - 2, fp) != NULL) {
+-                                      for (cp = line; ((*cp != '\0') && (! isdigit(*cp))); ) cp++;
+-                                      for (cp2 = cp; ((*cp2 != '\0') && (! isspace(*cp2)) && (*cp2 != '<') && (*cp2 != '>')); ) cp2++;
+-                                      cp2[0] = '\0';
+-                                      fclose(fp);
+-                                      fprintf(stdout, "%s\n", cp);
+-                                      exit(0);
+-                              }
+-                      }
+-              }
+-      }
+-      fclose(fp);
+-      exit(1);
+-}
+-EOF
+-                      ${CC-cc} "$HOME/macosver.c" -o "$HOME/macosver" > /dev/null 2>&1
+-                      os_v=`"$HOME/macosver" 2>/dev/null`
+-                      mv "$HOME/macosver" "$HOME/bin/macosver" 2>/dev/null
+-                      rm -f "$HOME/macosver.c" "$HOME/macosver"
+-              fi
++              os_v=`perl -e '{open(F, "< /System/Library/CoreServices/SystemVersion.plist") or exit(2); my ($doc) = ""; my ($line); while (defined($line = <F>)) { $doc .= $line; } close(F); $doc =~ 
s/\s+//gs; if ($doc =~ /<key>ProductVersion<\/key><string>([^<]+)<\/string>/) { print $1, "\n"; exit(0); } exit(1); }' 2>/dev/null`
+               if [ "$os_v" != "" ] ; then
+                       OS="macosx${os_v}"
+                       os_v1=`echo "$os_v" | cut -d. -f1`
+@@ -8529,7 +8471,7 @@
  fi