Pullup ticket 326 - requested by Matthias Scheler

security fix for gftp

Revisions pulled up:
- pkgsrc/net/gftp/DESCR			1.3
- pkgsrc/net/gftp/Makefile.common	1.8
- pkgsrc/net/gftp/PLIST			1.9
- pkgsrc/net/gftp/distinfo		1.8-1.9
- pkgsrc/net/gftp/patches/patch-aa	1.3
- pkgsrc/net/gftp/patches/patch-ab	1.5
- pkgsrc/net/gftp/patches/patch-ac	1.1
- pkgsrc/net/gftp/patches/patch-ad	1.1
- pkgsrc/net/gftp-gtk1/DESCR		1.2
- pkgsrc/net/gftp-gtk1/Makefile		1.7

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Wed Mar  2 14:36:53 UTC 2005

   Modified Files:
   	pkgsrc/net/gftp: DESCR Makefile.common PLIST distinfo
   	pkgsrc/net/gftp-gtk1: DESCR
   Added Files:
   	pkgsrc/net/gftp/patches: patch-aa patch-ab

   Log Message:
   Update "gftp" and "gftp-gtk1" package to version 2.0.18. Changes since
   version 2.0.17:
   - Added support for the FSP protocol (http://fsp.sourceforge.net/)
   - SSH2: Fixed segfault that could occur when renaming a file (bug
     introduced in 2.0.18rc1)
   - SSH2: Fixes for parsing the directory listing from the commercial SSH
     server
   - FTP: added pasv_behind_router option. If this is enabled, then the IP
     address that is in the PASV response will be ignored. Instead the IP
     address of the remote host will be used
   - FTP: removed the quote filename functionality in the SITE CHMOD and
     SITE UTIME commands
   - Chmod: Fixes for setting the group execute bit (bug introduced in
     2.0.18rc1)
   - Fixes so that the text port will prompt you for your password when
     a URL is entered on the command line
   - In the text port, convert the string from UTF8 to the users' current
     locale before it is displayed
   - Fixes for when the host system does not have getaddrinfo() (bug
     introduced in 2.0.18rc1)
   - Rewrote and improved the URL parser so that the :, @ characters are
     allowed in directories and passwords
   - Security Fix: Ignore the file paths that are returned by the remote
     server
   - FreeBSD and HP/UX fixes
   - GNOME HIG fixes
   - Many other small changes and improvements. See the ChangeLog file
     in the distribution for a detailed list of changes.
   - Updated language translations (cs de en_CA en_GB es hu nl zh_CN)
---
   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Wed Mar  2 20:43:21 UTC 2005

   Modified Files:
   	pkgsrc/net/gftp: distinfo
   	pkgsrc/net/gftp-gtk1: Makefile
   Added Files:
   	pkgsrc/net/gftp/patches: patch-ac patch-ad

   Log Message:
   Fix build problems in "gftp-gtk1" package caused by update to
   version 2.0.18.

1 files changed, 15 insertions, 0 deletions

diff --git a/net/gftp/patches/patch-aa b/net/gftp/patches/patch-aa
new file mode 100644
index 00000000000..9735054b252
--- /dev/null
+++ b/net/gftp/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.2.10.1 2005/03/02 22:15:42 salo Exp $
+
+--- lib/fsplib/lock.c.orig	2005-01-02 15:45:51.000000000 +0000
++++ lib/fsplib/lock.c	2005-03-02 14:26:27.000000000 +0000
+@@ -2,6 +2,10 @@
+ #include <stdio.h>
+ #include "lock.h"
+ 
++#if defined(__NetBSD__) || defined(sun)
++#define	_SEM_SEMUN_UNDEFINED	/**/
++#endif
++
+ /* ************ Locking functions ***************** */
+ #ifndef FSP_NOLOCKING
+