From nobody Wed Apr 10 15:47:29 2024 X-Original-To: dev-commits-ports-main@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 4VF6f970ffz5HL1g; Wed, 10 Apr 2024 15:47:29 +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 4VF6f95ctVz42p1; Wed, 10 Apr 2024 15:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712764049; 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=XZKbEBf9n9eUm9lgZvMKhjY1eooQRqbsMyyjCk8ppF0=; b=W0+fZxJPOhQMjCdrYGJt7MJP+r3TdToMP/QPFecPSMG8i/jMFGv0Q30UAgXz9rfPH/G8c2 NKNQ0oVpbEn4HzgeT6vDe+QCSz2Sln0QJ57o9LYFz4zSEPFPt0wpBcE5n4UhORrblMuwYu UG5BSl/OxS6O019xO0N0sX4ErgLDZk8aFa1YCfkYkGSc35E4HzOJHsnqBsLXjNGGF//F82 xMFYXsLrdhxatnO97Iv/AyG5YcKuHYvcyTNJG+kRTDnukYb/gyEvt74HU7eclbVKJCMaTn PR6BdbQeSjdpjElU5w7IUw5wFk1NSgMLZOlI1cHoc3Qmpx7l3DoTdxFvZiNTZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712764049; a=rsa-sha256; cv=none; b=hi+7aw7AdMiCT0TUl215ebl/rOFnLbl/+WeAKtdk+p8ZUqtFysJozhoZG+Gvlh3WI9oytq Gr+hWHGLS4N7eL7pMMH/Za3KVF/VRiKsHwtgN+7b3nioL0rSIRpX+oAonq/jdo9jNxuBZS sgZgkN/aFzaP2iTPK+vVw58YlTbWi7rZuRSz/plnoYaJueb/IMMl6OGvJXNCnEGVKMmweS vIKAJSSZd65x81yztM7LQn+X0KZRjBBW/fOjfTKvFxZaYgEnrS5sg5RP+HOFPI102o5jRA fLj1yH0DcWm5nnnghFVlm80TeXcHYmXmOV9WwMkdFhzxOXqb0Ce0bwzEzWrs6g== 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=1712764049; 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=XZKbEBf9n9eUm9lgZvMKhjY1eooQRqbsMyyjCk8ppF0=; b=W5soxgvuzFx26OPocfMg47UKzWWARtghBGXxiE9yCG8yGjg8hZbRfLEpZoOu1zhN+f/ou8 eDbDcKDCycTV74X/SnMj1iXtiQxGoXb2vCq8ZJCgxTfZ1gUzRKHfkw9W6catsfRsHIUkd+ /6cTJAXOfnZdSW9D7KgDmiH+6Djm8AWEMUvUMDBRRKA9OwKNs1qW2FeOqWBTBRzbLQR6ne 9IFUr5+KauFI0s2FGSVYGoEN4Kqxc8RlcIl1NC+BcgO1VGdWQEQ0wQxkys+vV9giggR4rC q/grRcUsnLkoY1V7g5utmseUAk6rZUonYSD1VVHsX6N5abbRUpyEWAaCK/UPpQ== 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 4VF6f94yfzzjvw; Wed, 10 Apr 2024 15:47:29 +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 43AFlTCY044495; Wed, 10 Apr 2024 15:47:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43AFlTxh044492; Wed, 10 Apr 2024 15:47:29 GMT (envelope-from git) Date: Wed, 10 Apr 2024 15:47:29 GMT Message-Id: <202404101547.43AFlTxh044492@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: 321b83d05e91 - main - security/gnome-ssh-askpass: Update version 8.0p1=>8.2p1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-ports-main+owner@freebsd.org X-BeenThere: dev-commits-ports-main@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: 321b83d05e91d188f110de74aa8be6cf71817b80 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=321b83d05e91d188f110de74aa8be6cf71817b80 commit 321b83d05e91d188f110de74aa8be6cf71817b80 Author: Muhammad Moinur Rahman AuthorDate: 2024-04-10 15:45:59 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-04-10 15:46:59 +0000 security/gnome-ssh-askpass: Update version 8.0p1=>8.2p1 --- security/gnome-ssh-askpass/Makefile | 3 +- security/gnome-ssh-askpass/distinfo | 6 ++-- .../files/patch-contrib_gnome-ssh-askpass2.c | 36 ++++------------------ 3 files changed, 11 insertions(+), 34 deletions(-) diff --git a/security/gnome-ssh-askpass/Makefile b/security/gnome-ssh-askpass/Makefile index 96ac9d47d684..db57acae9d62 100644 --- a/security/gnome-ssh-askpass/Makefile +++ b/security/gnome-ssh-askpass/Makefile @@ -1,5 +1,5 @@ PORTNAME= gnome-ssh-askpass -PORTVERSION= 8.0p1 +PORTVERSION= 8.2p1 CATEGORIES= security gnome MASTER_SITES= OPENBSD/OpenSSH/portable/ DISTNAME= openssh-${PORTVERSION} @@ -24,6 +24,7 @@ ALL_TARGET= gnome-ssh-askpass2 PLIST_FILES= bin/gnome-ssh-askpass2 USES= gnome pkgconfig USE_GNOME= cairo gdkpixbuf2 gtk20 +USE_XORG= x11 CFLAGS+= -lpthread diff --git a/security/gnome-ssh-askpass/distinfo b/security/gnome-ssh-askpass/distinfo index 3f3d0c9d8ecb..84ecea44197b 100644 --- a/security/gnome-ssh-askpass/distinfo +++ b/security/gnome-ssh-askpass/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712490451 -SHA256 (openssh-8.0p1.tar.gz) = bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68 -SIZE (openssh-8.0p1.tar.gz) = 1597697 +TIMESTAMP = 1712763424 +SHA256 (openssh-8.2p1.tar.gz) = 43925151e6cf6cee1450190c0e9af4dc36b41c12737619edff8bcebdff64e671 +SIZE (openssh-8.2p1.tar.gz) = 1701197 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 5dc0d45704db..03063378a484 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,21 +1,22 @@ ---- contrib/gnome-ssh-askpass2.c.orig 2016-12-19 04:59:41 UTC +--- contrib/gnome-ssh-askpass2.c.orig 2020-02-14 00:40:54 UTC +++ contrib/gnome-ssh-askpass2.c -@@ -86,12 +86,13 @@ passphrase_dialog(char *message) +@@ -90,13 +90,14 @@ passphrase_dialog(char *message, int prompt_type) { const char *failed; char *passphrase, *local; - int result, grab_tries, grab_server, grab_pointer; + int result, grab_tries, grab_server, grab_pointer, grab_keyboard; + int buttons, default_response; 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; /* Create an invisible parent window so that GtkDialog doesn't -@@ -139,18 +140,20 @@ passphrase_dialog(char *message) +@@ -156,18 +157,20 @@ passphrase_dialog(char *message, int prompt_type) } } } @@ -48,7 +49,7 @@ if (grab_server) { gdk_x11_grab_server(); } -@@ -162,7 +165,8 @@ passphrase_dialog(char *message) +@@ -179,7 +182,8 @@ passphrase_dialog(char *message, int prompt_type) XUngrabServer(gdk_x11_get_default_xdisplay()); if (grab_pointer) gdk_pointer_ungrab(GDK_CURRENT_TIME); @@ -58,28 +59,3 @@ 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);