Date: Sun, 15 Nov 2020 20:37:58 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555432 - head/security/pinentry Message-ID: <202011152037.0AFKbwMD025001@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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: <sdalu@sdalu.com> 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 <bsd.port.options.mk> 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: <<EOM +Due to a dependency loop, you must install security/pinentry-gnome3 manually. +A symlink has been created for you so that pinentry-gnome3 will be the default +pinentry binary after you install it, but bear in mind that the package system +will not keep track of this dependency. + +You may install pinentry-gnome3 with one of the following commands: + +# pkg install security/pinentry-gnome3 + or +# make -C /usr/ports/security/pinentry-gnome3 install clean +EOM +} +{ type: remove + message: <<EOM +The pinentry package has been removed. If you no longer plan on using this +package, you may remove the pinentry-gnome3 package as well. + +You may remove the pinentry-gnome3 package with the following command: + +# pkg delete pinentry-gnome3 +EOM +} +]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011152037.0AFKbwMD025001>