Index | Thread | Search

From:
Stuart Henderson <stu@spacehopper.org>
Subject:
security/pinentry update
To:
Pierre-Emmanuel André <pea@openbsd.org>
Cc:
ports <ports@openbsd.org>
Date:
Fri, 10 May 2024 14:16:17 +0100

Download raw body.

Thread
Here's an update to security/pinentry, the "pinentry-qt" binary is
now for Qt6 so I've added a separate package for that.

pinentry-gnome3 moves from x11/gnome/gcr to x11/gnome/gcr4.

Index: Makefile
===================================================================
RCS file: /cvs/ports/security/pinentry/Makefile,v
diff -u -p -w -u -r1.34 Makefile
--- Makefile	2 Nov 2023 08:12:51 -0000	1.34
+++ Makefile	10 May 2024 13:14:11 -0000
@@ -1,14 +1,13 @@
 COMMENT-main = 	PIN or passphrase entry dialog (ncurses interface)
 COMMENT-gnome3 =PIN or passphrase entry dialog (GNOME 3 interface)
 COMMENT-qt5 =	PIN or passphrase entry dialog (Qt5 interface)
+COMMENT-qt6 =	PIN or passphrase entry dialog (Qt6 interface)
 
-VERSION = 	1.2.1
+VERSION =	1.3.0
 DISTNAME = 	pinentry-${VERSION}
 CATEGORIES = 	security
 EXTRACT_SUFX =	.tar.bz2
 
-REVISION-qt5 =	0
-
 SITES = 	${SITE_GNUPG:=pinentry/}
 
 HOMEPAGE = 	https://www.gnupg.org/related_software/pinentry/index.en.html
@@ -30,22 +29,28 @@ LIB_DEPENDS =		security/libassuan \
 			x11/gnome/libsecret
 
 WANTLIB-gnome3 += ${WANTLIB}
-WANTLIB-gnome3 += atk-1.0 cairo cairo-gobject gck-1 gcr-base-3 gcr-ui-3
-WANTLIB-gnome3 += gdk-3 gdk_pixbuf-2.0 gtk-3 harfbuzz p11-kit pango-1.0
-WANTLIB-gnome3 += pangocairo-1.0
+WANTLIB-gnome3 += gck-2 gcr-4 p11-kit
 
 LIB_DEPENDS-gnome3 =	${LIB_DEPENDS} \
-			x11/gnome/gcr
+			x11/gnome/gcr4
 
 WANTLIB-qt5 += ${WANTLIB}
 WANTLIB-qt5 += ${COMPILER_LIBCXX} KF5WaylandClient Qt5Core Qt5Gui
 WANTLIB-qt5 += Qt5Widgets Qt5X11Extras X11 m
 
+RUN_DEPENDS-qt5 =	devel/desktop-file-utils
 LIB_DEPENDS-qt5 =	${LIB_DEPENDS} \
 			devel/kf5/kwayland \
 			x11/qt5/qtbase \
 			x11/qt5/qtx11extras
 
+WANTLIB-qt6 += ${WANTLIB} ${COMPILER_LIBCXX}
+WANTLIB-qt6 += Qt6Core Qt6Gui Qt6Widgets m
+
+RUN_DEPENDS-qt6 =	devel/desktop-file-utils
+LIB_DEPENDS-qt6 =	${LIB_DEPENDS} \
+			x11/qt6/qtbase
+
 CONFIGURE_STYLE = 	gnu
 CONFIGURE_ENV = 	CPPFLAGS="-I${LOCALBASE}/include -D_XOPEN_SOURCE_EXTENDED" \
 			LDFLAGS="-L${LOCALBASE}/lib"
@@ -57,10 +62,10 @@ CONFIGURE_ARGS = 	--enable-pinentry-curs
 			--disable-pinentry-tqt \
 			--disable-pinentry-fltk
 
-MULTI_PACKAGES =	-main -gnome3 -qt5
+MULTI_PACKAGES =	-main -gnome3 -qt5 -qt6
 
-PSEUDO_FLAVORS=		no_gnome3 no_qt5 bootstrap
-FLAVOR?=		no_gnome3 no_qt5 bootstrap
+PSEUDO_FLAVORS=		no_gnome3 no_qt5 no_qt6 bootstrap
+FLAVOR?=		no_gnome3 no_qt5 no_qt6 bootstrap
 
 .include <bsd.port.arch.mk>
 
@@ -69,8 +74,11 @@ CONFIGURE_ARGS +=	--disable-pinentry-gno
 .endif
 
 .if !${BUILD_PACKAGES:M-qt5}
-CONFIGURE_ARGS +=	--disable-pinentry-qt
 CONFIGURE_ARGS +=	--disable-pinentry-qt5
+.endif
+
+.if !${BUILD_PACKAGES:M-qt6}
+CONFIGURE_ARGS +=	--disable-pinentry-qt
 .endif
 
 # http://pkgs.fedoraproject.org/cgit/pinentry.git/tree/pinentry-wrapper
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/pinentry/distinfo,v
diff -u -p -w -u -r1.10 distinfo
--- distinfo	30 Aug 2022 06:06:32 -0000	1.10
+++ distinfo	10 May 2024 13:14:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (pinentry-1.2.1.tar.bz2) = RXoYXlqFI4+5RalV3GNSq5YtyLSHILYvyfpIx1QKQGc=
-SIZE (pinentry-1.2.1.tar.bz2) = 547698
+SHA256 (pinentry-1.3.0.tar.bz2) = mzzVIm51l/L97TmaO8ZZkjNRU2VZ6dsIJpgbyjFklN4=
+SIZE (pinentry-1.3.0.tar.bz2) = 610363
Index: pkg/DESCR-qt6
===================================================================
RCS file: pkg/DESCR-qt6
diff -N pkg/DESCR-qt6
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-qt6	10 May 2024 13:14:11 -0000
@@ -0,0 +1 @@
+This package provides a Qt6 interface to pinentry.
Index: pkg/PLIST-qt5
===================================================================
RCS file: /cvs/ports/security/pinentry/pkg/PLIST-qt5,v
diff -u -p -w -u -r1.2 PLIST-qt5
--- pkg/PLIST-qt5	11 Mar 2022 19:53:51 -0000	1.2
+++ pkg/PLIST-qt5	10 May 2024 13:14:11 -0000
@@ -1 +1,4 @@
-@bin bin/pinentry-qt
+@bin bin/pinentry-qt5
+share/applications/
+share/applications/org.gnupg.pinentry-qt5.desktop
+@tag update-desktop-database
Index: pkg/PLIST-qt6
===================================================================
RCS file: pkg/PLIST-qt6
diff -N pkg/PLIST-qt6
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-qt6	10 May 2024 13:14:11 -0000
@@ -0,0 +1,5 @@
+@conflict pinentry-qt5-<1.3.0
+@bin bin/pinentry-qt
+share/applications/
+share/applications/org.gnupg.pinentry-qt.desktop
+@tag update-desktop-database