From 7e47faafdc9818f2c96133146e087c995b4346e5 Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 4 Apr 2004 16:59:17 +0000 Subject: Get password authentication working for sftp on recent 5.X systems at least. Since 4.X lacks the UNIX98 terminal functions, it is unlikely that password auth will ever work correctly on those systems. However, pure password-less publickey sftp does work. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2251 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/gnome-vfs/files/patch-modules_pty-open.c | 13 +++++++++++++ devel/gnome-vfs/files/patch-modules_sftp-method.c | 9 --------- devel/gnomevfs2/files/patch-modules_pty-open.c | 13 +++++++++++++ devel/gnomevfs2/files/patch-modules_sftp-method.c | 9 --------- 4 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 devel/gnome-vfs/files/patch-modules_pty-open.c create mode 100644 devel/gnomevfs2/files/patch-modules_pty-open.c diff --git a/devel/gnome-vfs/files/patch-modules_pty-open.c b/devel/gnome-vfs/files/patch-modules_pty-open.c new file mode 100644 index 000000000..2ee23b086 --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_pty-open.c @@ -0,0 +1,13 @@ +--- modules/pty-open.c.orig Sun Apr 4 12:58:08 2004 ++++ modules/pty-open.c Sun Apr 4 12:59:30 2004 +@@ -613,6 +613,10 @@ + if ((fd == -1) && (errno == ENOENT)) { + fd = open("/dev/ptc", O_RDWR | O_NOCTTY); /* AIX */ + } ++ ++ if ((fd == -1) && (errno == ENOENT)) { ++ fd = posix_openpt(O_RDWR); ++ } + #endif + /* Set it to blocking. */ + flags = fcntl(fd, F_GETFL); diff --git a/devel/gnome-vfs/files/patch-modules_sftp-method.c b/devel/gnome-vfs/files/patch-modules_sftp-method.c index be5e1448a..976a9ad4b 100644 --- a/devel/gnome-vfs/files/patch-modules_sftp-method.c +++ b/devel/gnome-vfs/files/patch-modules_sftp-method.c @@ -1,14 +1,5 @@ --- modules/sftp-method.c.orig Sat Apr 3 23:58:06 2004 +++ modules/sftp-method.c Sun Apr 4 00:00:38 2004 -@@ -72,7 +72,7 @@ - size_t default_req_len = 32768; - guint max_req = 16; - --#ifdef HAVE_GRANTPT -+#if defined(HAVE_GRANTPT) && !defined(__FreeBSD__) - /* We only use this on systems with unix98 ptys */ - #define USE_PTY 1 - #endif @@ -174,6 +174,15 @@ /* Inspired by atomicio() from OpenSSH */ diff --git a/devel/gnomevfs2/files/patch-modules_pty-open.c b/devel/gnomevfs2/files/patch-modules_pty-open.c new file mode 100644 index 000000000..2ee23b086 --- /dev/null +++ b/devel/gnomevfs2/files/patch-modules_pty-open.c @@ -0,0 +1,13 @@ +--- modules/pty-open.c.orig Sun Apr 4 12:58:08 2004 ++++ modules/pty-open.c Sun Apr 4 12:59:30 2004 +@@ -613,6 +613,10 @@ + if ((fd == -1) && (errno == ENOENT)) { + fd = open("/dev/ptc", O_RDWR | O_NOCTTY); /* AIX */ + } ++ ++ if ((fd == -1) && (errno == ENOENT)) { ++ fd = posix_openpt(O_RDWR); ++ } + #endif + /* Set it to blocking. */ + flags = fcntl(fd, F_GETFL); diff --git a/devel/gnomevfs2/files/patch-modules_sftp-method.c b/devel/gnomevfs2/files/patch-modules_sftp-method.c index be5e1448a..976a9ad4b 100644 --- a/devel/gnomevfs2/files/patch-modules_sftp-method.c +++ b/devel/gnomevfs2/files/patch-modules_sftp-method.c @@ -1,14 +1,5 @@ --- modules/sftp-method.c.orig Sat Apr 3 23:58:06 2004 +++ modules/sftp-method.c Sun Apr 4 00:00:38 2004 -@@ -72,7 +72,7 @@ - size_t default_req_len = 32768; - guint max_req = 16; - --#ifdef HAVE_GRANTPT -+#if defined(HAVE_GRANTPT) && !defined(__FreeBSD__) - /* We only use this on systems with unix98 ptys */ - #define USE_PTY 1 - #endif @@ -174,6 +174,15 @@ /* Inspired by atomicio() from OpenSSH */ -- cgit v1.2.3