4 files changed, 30 insertions, 23 deletions

diff --git a/contrib/Makefile b/contrib/Makefile
index eaf7fe2fd..3a36387b3 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -13,5 +13,10 @@ gnome-ssh-askpass2: gnome-ssh-askpass2.c
                 gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
                 `$(PKG_CONFIG) --libs gtk+-2.0 x11`
 
+gnome-ssh-askpass3: gnome-ssh-askpass2.c
+        $(CC) $(CFLAGS) `$(PKG_CONFIG) --cflags gtk+-3.0` \
+                gnome-ssh-askpass2.c -o gnome-ssh-askpass3 \
+                `$(PKG_CONFIG) --libs gtk+-3.0 x11`
+
 clean:
-        rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass
+        rm -f *.o gnome-ssh-askpass gnome-ssh-askpass[123]
diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c
index 9d97c30c0..535a69274 100644
--- a/contrib/gnome-ssh-askpass2.c
+++ b/contrib/gnome-ssh-askpass2.c
@@ -57,19 +57,17 @@
 #include <gdk/gdkx.h>
 
 static void
-report_failed_grab (const char *what)
+report_failed_grab (GtkWidget *parent_window, const char *what)
 {
         GtkWidget *err;
 
-        err = gtk_message_dialog_new(NULL, 0,
+        err = gtk_message_dialog_new(GTK_WINDOW(parent_window), 0,
                                      GTK_MESSAGE_ERROR,
                                      GTK_BUTTONS_CLOSE,
                                      "Could not grab %s. "
                                      "A malicious client may be eavesdropping "
                                      "on your session.", what);
         gtk_window_set_position(GTK_WINDOW(err), GTK_WIN_POS_CENTER);
-        gtk_label_set_line_wrap(GTK_LABEL((GTK_MESSAGE_DIALOG(err))->label),
-                                TRUE);
 
         gtk_dialog_run(GTK_DIALOG(err));
 
@@ -89,22 +87,27 @@ passphrase_dialog(char *message)
         const char *failed;
         char *passphrase, *local;
         int result, grab_tries, grab_server, grab_pointer;
-        GtkWidget *dialog, *entry;
+        GtkWidget *parent_window, *dialog, *entry;
         GdkGrabStatus status;
 
         grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL);
         grab_pointer = (getenv("GNOME_SSH_ASKPASS_GRAB_POINTER") != NULL);
         grab_tries = 0;
 
-        dialog = gtk_message_dialog_new(NULL, 0,
+        /* Create an invisible parent window so that GtkDialog doesn't
+         * complain.  */
+        parent_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
+        dialog = gtk_message_dialog_new(GTK_WINDOW(parent_window), 0,
                                         GTK_MESSAGE_QUESTION,
                                         GTK_BUTTONS_OK_CANCEL,
                                         "%s",
                                         message);
 
         entry = gtk_entry_new();
-        gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), entry, FALSE,
-            FALSE, 0);
+        gtk_box_pack_start(
+            GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), entry,
+            FALSE, FALSE, 0);
         gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
         gtk_widget_grab_focus(entry);
         gtk_widget_show(entry);
@@ -112,8 +115,6 @@ passphrase_dialog(char *message)
         gtk_window_set_title(GTK_WINDOW(dialog), "OpenSSH");
         gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
         gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
-        gtk_label_set_line_wrap(GTK_LABEL((GTK_MESSAGE_DIALOG(dialog))->label),
-                                TRUE);
 
         /* Make <enter> close dialog */
         gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
@@ -127,8 +128,8 @@ passphrase_dialog(char *message)
         if (grab_pointer) {
                 for(;;) {
                         status = gdk_pointer_grab(
-                           (GTK_WIDGET(dialog))->window, TRUE, 0, NULL,
-                           NULL, GDK_CURRENT_TIME);
+                            (gtk_widget_get_window(GTK_WIDGET(dialog))), TRUE,
+                            0, NULL, NULL, GDK_CURRENT_TIME);
                         if (status == GDK_GRAB_SUCCESS)
                                 break;
                         usleep(GRAB_WAIT * 1000);
@@ -139,8 +140,9 @@ passphrase_dialog(char *message)
                 }
         }
         for(;;) {
-                status = gdk_keyboard_grab((GTK_WIDGET(dialog))->window,
-                   FALSE, GDK_CURRENT_TIME);
+                status = gdk_keyboard_grab(
+                    gtk_widget_get_window(GTK_WIDGET(dialog)), FALSE,
+                    GDK_CURRENT_TIME);
                 if (status == GDK_GRAB_SUCCESS)
                         break;
                 usleep(GRAB_WAIT * 1000);
@@ -157,7 +159,7 @@ passphrase_dialog(char *message)
 
         /* Ungrab */
         if (grab_server)
-                XUngrabServer(GDK_DISPLAY());
+                XUngrabServer(gdk_x11_get_default_xdisplay());
         if (grab_pointer)
                 gdk_pointer_ungrab(GDK_CURRENT_TIME);
         gdk_keyboard_ungrab(GDK_CURRENT_TIME);
@@ -193,10 +195,10 @@ passphrase_dialog(char *message)
         gdk_pointer_ungrab(GDK_CURRENT_TIME);
  nograb:
         if (grab_server)
-                XUngrabServer(GDK_DISPLAY());
+                XUngrabServer(gdk_x11_get_default_xdisplay());
         gtk_widget_destroy(dialog);
         
-        report_failed_grab(failed);
+        report_failed_grab(parent_window, failed);
 
         return (-1);
 }
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index fd8678f12..666097c5e 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 7.3p1
+%define ver 7.4p1
 %define rel 1
 
 # OpenSSH privilege separation requires a user & group ID
@@ -72,8 +72,8 @@ Release: %{rel}rescue
 %else
 Release: %{rel}
 %endif
-URL: http://www.openssh.com/portable.html
-Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
+URL: https://www.openssh.com/portable.html
+Source0: https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
 %if ! %{no_x11_askpass}
 Source1: http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz
 %endif
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index d2b2728d5..4c4bbb69c 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -13,8 +13,8 @@
 
 Summary:        OpenSSH, a free Secure Shell (SSH) protocol implementation
 Name:           openssh
-Version:        7.3p1
-URL:            http://www.openssh.com/
+Version:        7.4p1
+URL:            https://www.openssh.com/
 Release:        1
 Source0:        openssh-%{version}.tar.gz
 Source1:        x11-ssh-askpass-%{xversion}.tar.gz