Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-gnome-2.32 grimoire by Ladislav Hagara (17c45fa91edc87907dfeea257fd532160e7c0a57)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-gnome-2.32 grimoire by Ladislav Hagara (17c45fa91edc87907dfeea257fd532160e7c0a57)
  • Date: Sun, 24 Oct 2010 00:17:53 -0500

GIT changes to devel-gnome-2.32 grimoire by Ladislav Hagara <hgr AT vabo.cz>:

gnome2-libs/gvfs/HISTORY | 3 ++
gnome2-libs/gvfs/PRE_BUILD | 4 --
gnome2-libs/gvfs/openssh56.patch | 56
---------------------------------------
3 files changed, 3 insertions(+), 60 deletions(-)

New commits:
commit 17c45fa91edc87907dfeea257fd532160e7c0a57
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

gvfs: openssh56.patch removed, included upstream

diff --git a/gnome2-libs/gvfs/HISTORY b/gnome2-libs/gvfs/HISTORY
index 697a570..feecef1 100644
--- a/gnome2-libs/gvfs/HISTORY
+++ b/gnome2-libs/gvfs/HISTORY
@@ -1,3 +1,6 @@
+2010-10-24 Ladislav Hagara <hgr AT vabo.cz>
+ * PRE_BUILD, openssh56.patch: patch removed, included upstream
+
2010-09-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 1.6.4

diff --git a/gnome2-libs/gvfs/PRE_BUILD b/gnome2-libs/gvfs/PRE_BUILD
deleted file mode 100755
index b7dd25a..0000000
--- a/gnome2-libs/gvfs/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/openssh56.patch"
diff --git a/gnome2-libs/gvfs/openssh56.patch
b/gnome2-libs/gvfs/openssh56.patch
deleted file mode 100644
index d3a146e..0000000
--- a/gnome2-libs/gvfs/openssh56.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- daemon/gvfsbackendsftp.c
-+++ daemon/gvfsbackendsftp.c
-@@ -24,6 +24,7 @@
- #include <config.h>
-
- #include <stdlib.h>
-+#include <sys/poll.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/time.h>
-@@ -852,6 +853,9 @@ handle_login (GVfsBackend *backend,
- const gchar *authtype = NULL;
- gchar *object = NULL;
- char *prompt;
-+ /*
-+ * TODO: compare this with sshfs.c where the prompt appears on stdin_fd
-+ */
-
- if (op_backend->client_vendor == SFTP_VENDOR_SSH)
- prompt_fd = stderr_fd;
-@@ -864,14 +868,13 @@ handle_login (GVfsBackend *backend,
- ret_val = TRUE;
- while (1)
- {
-- FD_ZERO (&ifds);
-- FD_SET (stdout_fd, &ifds);
-- FD_SET (prompt_fd, &ifds);
--
-- tv.tv_sec = SFTP_READ_TIMEOUT;
-- tv.tv_usec = 0;
-+ struct pollfd fds[2];
-+ fds[0].fd = stdout_fd;
-+ fds[0].events = POLLIN;
-+ fds[1].fd = prompt_fd;
-+ fds[1].events = POLLIN;
-
-- ret = select (MAX (stdout_fd, prompt_fd)+1, &ifds, NULL, NULL, &tv);
-+ ret = poll(fds, 2, SFTP_READ_TIMEOUT);
-
- if (ret <= 0)
- {
-@@ -882,11 +885,11 @@ handle_login (GVfsBackend *backend,
- break;
- }
-
-- if (FD_ISSET (stdout_fd, &ifds))
-+ if (fds[0].revents)
- break; /* Got reply to initial INIT request */
-
-- g_assert (FD_ISSET (prompt_fd, &ifds));
--
-+ if (!(fds[1].revents & POLLIN))
-+ continue;
-
- len = g_input_stream_read (prompt_stream,
- buffer, sizeof (buffer) - 1,



  • [SM-Commit] GIT changes to devel-gnome-2.32 grimoire by Ladislav Hagara (17c45fa91edc87907dfeea257fd532160e7c0a57), Ladislav Hagara, 10/24/2010

Archive powered by MHonArc 2.6.24.

Top of Page