From owner-svn-ports-all@freebsd.org Sun Nov 15 20:37:59 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6CFFF468B1F; Sun, 15 Nov 2020 20:37:59 +0000 (UTC) (envelope-from jhale@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CZ3tb2cvwz3RJk; Sun, 15 Nov 2020 20:37:59 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3E00C21F94; Sun, 15 Nov 2020 20:37:59 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AFKbxxL025003; Sun, 15 Nov 2020 20:37:59 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AFKbwMD025001; Sun, 15 Nov 2020 20:37:58 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <202011152037.0AFKbwMD025001@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Sun, 15 Nov 2020 20:37:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555432 - head/security/pinentry X-SVN-Group: ports-head X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: head/security/pinentry X-SVN-Commit-Revision: 555432 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2020 20:37:59 -0000 Author: jhale Date: Sun Nov 15 20:37:58 2020 New Revision: 555432 URL: https://svnweb.freebsd.org/changeset/ports/555432 Log: security/pinentry: Users who enable the non-default GNOME3 option will now have to install security/pinentry-gnome3 manually. This has been done to break a dependency loop that was introduced in r553735 where security/gcr added a build dependency on security/gnupg. Before r553735: security/gnupg -> security/pinentry -> security/pinentry-gnome3 -> security/gcr After r553735: security/gnupg -> security/pinentry -> security/pinentry-gnome3 -> security/gcr -> security/gnupg Now: security/gnupg -> security/pinentry security/pinentry-gnome3 -> security/gcr -> security/gnupg A pkg-message has been added to remind users of the GNOME3 option to install the required package manually and to deinstall it if no longer needed. PR: 250945 Reported by: Added: head/security/pinentry/pkg-message.gnome3 (contents, props changed) Modified: head/security/pinentry/Makefile Modified: head/security/pinentry/Makefile ============================================================================== --- head/security/pinentry/Makefile Sun Nov 15 20:29:52 2020 (r555431) +++ head/security/pinentry/Makefile Sun Nov 15 20:37:58 2020 (r555432) @@ -3,7 +3,7 @@ PORTNAME= pinentry PORTVERSION= 1.1.0 -PORTREVISION?= 6 +PORTREVISION?= 7 CATEGORIES= security MASTER_SITES= GNUPG/pinentry @@ -49,7 +49,11 @@ QT5_RUN_DEPENDS= ${PINENTRY_QT5}:security/pinentry-qt5 GNOME3_DESC= GNOME 3 frontend PINENTRY_GNOME3= pinentry-gnome3 -GNOME3_RUN_DEPENDS= ${PINENTRY_GNOME3}:security/pinentry-gnome3 +# Due to a dependency loop that exists between security/pinentry-gnome3, +# security/gcr, security/gnupg and security/pinentry, the user must install +# pinentry-gnome3 manually. See pkg-message.gnome3 for more details. +#GNOME3_RUN_DEPENDS= ${PINENTRY_GNOME3}:security/pinentry-gnome3 +GNOME3_VARS= PKGMESSAGE+=${.CURDIR}/pkg-message.gnome3 .include Added: head/security/pinentry/pkg-message.gnome3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/pinentry/pkg-message.gnome3 Sun Nov 15 20:37:58 2020 (r555432) @@ -0,0 +1,26 @@ +[ +{ type: install + message: <