From nobody Fri Apr 5 19:48:38 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VB8Dk70Rqz5H54C; Fri, 5 Apr 2024 19:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VB8Dk5BzYz4sNm; Fri, 5 Apr 2024 19:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712346518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2x4g8x2OET7hRYKH8kDcRx9zbyYp/WYqxqVp4ksaurY=; b=VtjxgEmXYdF5NmkvzN9esgrFYH07po7sX02sZSyXek5hgiSEeIba2ksVU6Du+D1jUCcWN2 yi2s4abZBSvwPWKhdRbCUOn0d77i0jp8j92Y1Yguocad5MaAv8YrC0wy68AzHUe+E+CV03 He/9ZDVrsVANCom7gA1WFFuiqPtrq/7W1vJZFuo3ZXp0Bf0eRcekWctQ7RXEwjupZxH0fT gKneIUiuJ5EveIS5cA5dqJfWfyMIdzVYd17Pk3Gd/PzgjqmQJ9QCbrVZSgCB+Z5g7a5A7c vypxNojHz3mIrqM9+Trifoa4aNd/gVcWT/ZZ1Lml5J9PxkMmz9l9dm2KZf1+5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712346518; a=rsa-sha256; cv=none; b=uwpJFCo2CJNTsLQJwDSxFwJMScn1HECUJMaJTwXTnZRY+rzb+AK9TfsE265dUE+rQsoipT 0c+u5ykMzXVtT7EB+uy2P5/3ZZ0zFl+2SEOt0+BKuhb+7kkVvr8fTuUkM8erJeDA/rKgUH qD6E3OYcjjBvWTKKUyySW3EOsCz61ajTrmINl709EPSjAN1q4BauP5mtbltVSqpqtzDHgd nVt5U32s+dlCDK8M82Li6yBlDQRU6Nl91PPJAyL0B7AJAriMt/kVy4B2x7Ujos7Fl4/fd6 ox/IT7LqTg7waAEYn1rlmdLl3yI9uMk9LDtKqblTPtSM3ZaJwMI5yVVbMjw90A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712346518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2x4g8x2OET7hRYKH8kDcRx9zbyYp/WYqxqVp4ksaurY=; b=JDle3KM/O7d2RiLamXqRzqWinbtmPJ7EKR4HGt98pKm9VoT2RnG8DbUuphXjZhPwWF0Vta hHlbeaM3vBj/qBdVPvXLo38bpAPIfaz3ZTUpDraorH7DQcFXdL8mb7nIzyN2SuNpj4gDYP 2hrpCq0FFAzmzYMj3amBdzPz+2C+wmd/oQHwKsfRNe5MGfPrXk+maIEgJ1UY21/OXxwOYj UTi/R2FpFqHkCiMiF7lJOaKNn49YAaJ69oQaMthcGOpxvDMrv0iuj3Wusj8zPcmXLg/n+A w/Mmk5g3w5Ud35FWDmBXapD19Du18c2MB5YU6X9nSjR/vvklN/Eus6YUqTw9RQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB8Dk4qVkz1CD0; Fri, 5 Apr 2024 19:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435Jmc1u037470; Fri, 5 Apr 2024 19:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435JmcWI037467; Fri, 5 Apr 2024 19:48:38 GMT (envelope-from git) Date: Fri, 5 Apr 2024 19:48:38 GMT Message-Id: <202404051948.435JmcWI037467@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 7b9266ba2dea - main - security/gnome-ssh-askpass: Update version 7.3p1=>7.4p1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b9266ba2dea2b1f9b1f6655a0097051daf1b0bc Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b9266ba2dea2b1f9b1f6655a0097051daf1b0bc commit 7b9266ba2dea2b1f9b1f6655a0097051daf1b0bc Author: Muhammad Moinur Rahman AuthorDate: 2024-04-05 19:15:40 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-04-05 19:48:23 +0000 security/gnome-ssh-askpass: Update version 7.3p1=>7.4p1 --- security/gnome-ssh-askpass/Makefile | 4 +- security/gnome-ssh-askpass/distinfo | 6 +- .../files/patch-contrib_gnome-ssh-askpass2.c | 77 +++++++++++++++------- 3 files changed, 57 insertions(+), 30 deletions(-) diff --git a/security/gnome-ssh-askpass/Makefile b/security/gnome-ssh-askpass/Makefile index c120c43ef63c..5bfc92d92d09 100644 --- a/security/gnome-ssh-askpass/Makefile +++ b/security/gnome-ssh-askpass/Makefile @@ -1,5 +1,5 @@ PORTNAME= gnome-ssh-askpass -PORTVERSION= 7.3p1 +PORTVERSION= 7.4p1 CATEGORIES= security gnome MASTER_SITES= OPENBSD/OpenSSH/portable/ DISTNAME= openssh-${PORTVERSION} @@ -21,7 +21,7 @@ ALL_TARGET= gnome-ssh-askpass2 PLIST_FILES= bin/gnome-ssh-askpass2 USES= gnome pkgconfig -USE_GNOME= cairo gtk20 +USE_GNOME= cairo gdkpixbuf2 gtk20 CFLAGS+= -lpthread diff --git a/security/gnome-ssh-askpass/distinfo b/security/gnome-ssh-askpass/distinfo index af794a95d571..8b653097f6bc 100644 --- a/security/gnome-ssh-askpass/distinfo +++ b/security/gnome-ssh-askpass/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712235662 -SHA256 (openssh-7.3p1.tar.gz) = 3ffb989a6dcaa69594c3b550d4855a5a2e1718ccdde7f5e36387b424220fbecc -SIZE (openssh-7.3p1.tar.gz) = 1522617 +TIMESTAMP = 1712343952 +SHA256 (openssh-7.4p1.tar.gz) = 1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1 +SIZE (openssh-7.4p1.tar.gz) = 1511780 diff --git a/security/gnome-ssh-askpass/files/patch-contrib_gnome-ssh-askpass2.c b/security/gnome-ssh-askpass/files/patch-contrib_gnome-ssh-askpass2.c index 281d2981379d..5dc0d45704db 100644 --- a/security/gnome-ssh-askpass/files/patch-contrib_gnome-ssh-askpass2.c +++ b/security/gnome-ssh-askpass/files/patch-contrib_gnome-ssh-askpass2.c @@ -1,53 +1,55 @@ ---- contrib/gnome-ssh-askpass2.c.orig 2009-11-18 06:51:59 UTC +--- contrib/gnome-ssh-askpass2.c.orig 2016-12-19 04:59:41 UTC +++ contrib/gnome-ssh-askpass2.c -@@ -88,12 +88,13 @@ passphrase_dialog(char *message) +@@ -86,12 +86,13 @@ passphrase_dialog(char *message) { const char *failed; char *passphrase, *local; - int result, grab_tries, grab_server, grab_pointer; + int result, grab_tries, grab_server, grab_pointer, grab_keyboard; - 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_keyboard = (getenv("GNOME_SSH_ASKPASS_GRAB_KEYBOARD") != NULL); ++ grab_keyboard = (getenv("GNOME_SSH_ASKPASS_GRAB_KEYBOARD") != NULL); grab_tries = 0; - dialog = gtk_message_dialog_new(NULL, 0, -@@ -138,17 +139,21 @@ passphrase_dialog(char *message) + /* Create an invisible parent window so that GtkDialog doesn't +@@ -139,18 +140,20 @@ 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); - if (++grab_tries > GRAB_TRIES) { - failed = "keyboard"; - goto nograbkb; -+ -+ if (grab_keyboard) { -+ for(;;) { -+ status = gdk_keyboard_grab((GTK_WIDGET(dialog))->window, -+ FALSE, GDK_CURRENT_TIME); -+ if (status == GDK_GRAB_SUCCESS) -+ break; -+ usleep(GRAB_WAIT * 1000); -+ if (++grab_tries > GRAB_TRIES) { -+ failed = "keyboard"; -+ goto nograbkb; -+ } - } - } -+ +- } +- } ++ if (grab_keyboard) { ++ for(;;) { ++ 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); ++ if (++grab_tries > GRAB_TRIES) { ++ failed = "keyboard"; ++ goto nograbkb; ++ } ++ } ++ } if (grab_server) { gdk_x11_grab_server(); } -@@ -160,7 +165,8 @@ passphrase_dialog(char *message) - XUngrabServer(GDK_DISPLAY()); +@@ -162,7 +165,8 @@ passphrase_dialog(char *message) + XUngrabServer(gdk_x11_get_default_xdisplay()); if (grab_pointer) gdk_pointer_ungrab(GDK_CURRENT_TIME); - gdk_keyboard_ungrab(GDK_CURRENT_TIME); @@ -56,3 +58,28 @@ gdk_flush(); /* Report passphrase if user selected OK */ +@@ -178,13 +182,13 @@ passphrase_dialog(char *message) + puts(passphrase); + } + } +- ++ + /* Zero passphrase in memory */ + memset(passphrase, '\b', strlen(passphrase)); + gtk_entry_set_text(GTK_ENTRY(entry), passphrase); + memset(passphrase, '\0', strlen(passphrase)); + g_free(passphrase); +- ++ + gtk_widget_destroy(dialog); + return (result == GTK_RESPONSE_OK ? 0 : -1); + +@@ -197,7 +201,7 @@ passphrase_dialog(char *message) + if (grab_server) + XUngrabServer(gdk_x11_get_default_xdisplay()); + gtk_widget_destroy(dialog); +- ++ + report_failed_grab(parent_window, failed); + + return (-1);