From nobody Mon Jul 08 05:12:27 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 4WHXLN3ptPz5QxJJ; Mon, 08 Jul 2024 05:12:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WHXLN06Yvz579g; Mon, 8 Jul 2024 05:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720415548; 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=sWgV0uP6b3+TERzjCiAb1xotkFl0XhcEaHbDa9fp9L0=; b=WemyTIJbXqqp4JPd36mhe/Qr3PMazyViwWNsZuP/hB8nH5RPqe4Z1IOT4nNy576qtFsRPT CGCIiYI/yONsZMD++gQJB66gep6KiO+uIEu197+I8KDCa/k2ILAWkwE0cAuXTzsyBsLQUF hvX5zaMMxZozjtGdHN7zR7Vb+bR0R6Xl7bC/+Y467Wvo/62BP2aAuM4c0jW1GTBJ2SvvZg 9oLERM6hKq5oPKmMoSaKCk71vg36qSqE29bPp7qGgLVhGgpWHh3p7O02L7DCYP9IZ0pGfC KSUY6iZRhUem7rwr/ITmp0AZk8c/c8SS/KBRHcxpRAgXmNUC44qsvgxL+RnorQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720415548; a=rsa-sha256; cv=none; b=BYXYci/QZXQ1VmlOmb+loX9h3yC3r1yYvF9mY7LkmsDxub+U+ZnjcWmi9Aeme/PRj67R+W EZOq/5ZOKOxkjJ1wm4IUpL3pvdtSk2/oMWxuC0UOvcWrzBY4zxiziw+NHcT3pUWxGYWojh mDag877MyCu7pTK9t+YeLse5X9ajqzGDDhQcm2aF7IoiaBwTwRCgiiEH117z8ECj1NVh3b k11s94p443AAbSG29Pw6m/32ovt+2vCE+THGN9tQcEpMIue6X50DTokFYotjbWn3IyD0IO Dtg/hwnX+MmsARFmpBWcq1jz6TVITuBqA+djDtIWwMOelfCv8g39H0Zw9vtJjA== 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=1720415548; 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=sWgV0uP6b3+TERzjCiAb1xotkFl0XhcEaHbDa9fp9L0=; b=AdJoH0and4gocbewbfspvoSBKyPCxZJW/mD8lFhb55uxvcJH4Cj+4t+3jgiZf+qHE7K1eJ iImsrAJJwVM6fmvs5oUGQo6r+zogbQTPhln1/6RlCjtcs8PogsAgbGwP2fi1To9a8ITVzo 5erCC9OqJK9HOuaFFF1vxmmAMS3PQv2LqrAE04dutmDA2GTY1v7+cmoNCEszKftaKJNp38 EyVfn8HobwdX4w7o7LTyhOHIfrnz9GOvBFF1HDTW7BDgVVJ99pUC+b9R873wKovAlu0L/3 J/+UDbi7RnyWlreBaktkrJ+DXI0gjRk0Rn8aO3/QaZrcUgVpemGJr+hlMFPwLg== 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 4WHXLM6TpnzdmQ; Mon, 8 Jul 2024 05:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4685CRjO061457; Mon, 8 Jul 2024 05:12:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4685CRrt061454; Mon, 8 Jul 2024 05:12:27 GMT (envelope-from git) Date: Mon, 8 Jul 2024 05:12:27 GMT Message-Id: <202407080512.4685CRrt061454@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 3e5923de1a67 - main - security/pinentry: Update to 1.3.1 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e5923de1a67bbde383842055a00f1370ee82f89 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e5923de1a67bbde383842055a00f1370ee82f89 commit 3e5923de1a67bbde383842055a00f1370ee82f89 Author: Jason E. Hale AuthorDate: 2024-07-06 04:59:24 +0000 Commit: Jason E. Hale CommitDate: 2024-07-08 05:12:00 +0000 security/pinentry: Update to 1.3.1 https://dev.gnupg.org/T7046 --- security/pinentry-curses/Makefile | 2 +- security/pinentry-efl/Makefile | 2 +- security/pinentry-fltk/Makefile | 2 +- security/pinentry-gnome/Makefile | 2 +- security/pinentry-gtk2/Makefile | 2 +- security/pinentry-qt5/Makefile | 2 +- security/pinentry-qt6/Makefile | 2 +- security/pinentry-tty/Makefile | 2 +- security/pinentry/Makefile | 15 +++++++++------ security/pinentry/distinfo | 8 +++----- security/pinentry/files/patch-qt5_icons_Makefile.in | 19 +++++++++++++++++++ security/pinentry/files/patch-qt5_main.cpp | 13 +++++++++++++ .../files/patch-qt5_org.gnupg.pinentry-qt5.desktop.in | 12 ++++++++++++ security/pinentry/files/patch-qt5_pinentryrc.qrc | 13 +++++++++++++ security/pinentry/files/patch-secmem_secmem.c | 4 ++-- 15 files changed, 79 insertions(+), 21 deletions(-) diff --git a/security/pinentry-curses/Makefile b/security/pinentry-curses/Makefile index 740cf8fcf767..a042d94094f6 100644 --- a/security/pinentry-curses/Makefile +++ b/security/pinentry-curses/Makefile @@ -1,5 +1,5 @@ PORTNAME= pinentry -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= Curses version of the GnuPG password dialog diff --git a/security/pinentry-efl/Makefile b/security/pinentry-efl/Makefile index ffbf49cf7b8e..1bb829cc34ca 100644 --- a/security/pinentry-efl/Makefile +++ b/security/pinentry-efl/Makefile @@ -1,5 +1,5 @@ PORTNAME= pinentry -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= EFL version of the GnuPG password dialog diff --git a/security/pinentry-fltk/Makefile b/security/pinentry-fltk/Makefile index b61426527c35..71ea2872f41a 100644 --- a/security/pinentry-fltk/Makefile +++ b/security/pinentry-fltk/Makefile @@ -1,5 +1,5 @@ PORTNAME= pinentry -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= FLTK version of the GnuPG password dialog diff --git a/security/pinentry-gnome/Makefile b/security/pinentry-gnome/Makefile index 9ee65ae1602a..713d3747a985 100644 --- a/security/pinentry-gnome/Makefile +++ b/security/pinentry-gnome/Makefile @@ -1,5 +1,5 @@ PORTNAME= pinentry -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= GNOME version of the GnuPG password dialog diff --git a/security/pinentry-gtk2/Makefile b/security/pinentry-gtk2/Makefile index 870428af55e6..6e01e0bf1d9e 100644 --- a/security/pinentry-gtk2/Makefile +++ b/security/pinentry-gtk2/Makefile @@ -1,5 +1,5 @@ PORTNAME= pinentry -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= GTK 2.0 version of the GnuPG password dialog diff --git a/security/pinentry-qt5/Makefile b/security/pinentry-qt5/Makefile index 9e8bdf8542a0..29b7601f5940 100644 --- a/security/pinentry-qt5/Makefile +++ b/security/pinentry-qt5/Makefile @@ -1,5 +1,5 @@ PORTNAME= pinentry -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= Qt 5 version of the GnuPG password dialog diff --git a/security/pinentry-qt6/Makefile b/security/pinentry-qt6/Makefile index 0e5891b7ab09..608d035ceb5d 100644 --- a/security/pinentry-qt6/Makefile +++ b/security/pinentry-qt6/Makefile @@ -1,5 +1,5 @@ PORTNAME= pinentry -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= Qt 6 version of the GnuPG password dialog diff --git a/security/pinentry-tty/Makefile b/security/pinentry-tty/Makefile index d2bed6223f02..17e436edbd25 100644 --- a/security/pinentry-tty/Makefile +++ b/security/pinentry-tty/Makefile @@ -1,5 +1,5 @@ PORTNAME= pinentry -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= Console version of the GnuPG password dialog diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index 1c36db0fdd9a..af97894d3530 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -1,12 +1,9 @@ PORTNAME= pinentry -PORTVERSION= 1.3.0 +PORTVERSION= 1.3.1 PORTREVISION?= 0 CATEGORIES= security MASTER_SITES= GNUPG/pinentry -PATCH_SITES= https://github.com/gpg/pinentry/commit/ -PATCHFILES+= 844360c9c99d2f11dc4236c0ab6bdb9b56758898.patch:-p1 - MAINTAINER= jhale@FreeBSD.org COMMENT?= Collection of simple PIN or passphrase entry dialogs WWW= https://www.gnupg.org/aegypten2 @@ -117,7 +114,8 @@ USE_KDE= wayland USE_QT= core gui widgets x11extras buildtools:build USE_XORG= x11 PLIST_FILES= bin/pinentry-qt5 \ - share/applications/org.gnupg.pinentry-qt5.desktop + share/applications/org.gnupg.pinentry-qt5.desktop \ + share/pixmaps/pinentry-qt5.png CONFIGURE_ARGS+=--enable-pinentry-qt5 .else CONFIGURE_ARGS+=--disable-pinentry-qt5 @@ -129,7 +127,8 @@ USE_CXXSTD= c++17 USE_KDE= guiaddons windowsystem USE_QT= base PLIST_FILES= bin/pinentry-qt \ - share/applications/org.gnupg.pinentry-qt.desktop + share/applications/org.gnupg.pinentry-qt.desktop \ + share/pixmaps/pinentry.png CONFIGURE_ARGS+=--enable-pinentry-qt .else CONFIGURE_ARGS+=--disable-pinentry-qt @@ -171,6 +170,10 @@ CONFIGURE_ARGS+=--enable-pinentry-tty CONFIGURE_ARGS+=--disable-pinentry-tty .endif +# Rename icon to prevent install conflicts with the Qt6 frontend. +post-extract: + @(cd ${WRKSRC}/qt5/icons && ${MV} pinentry.png pinentry-qt5.png) + post-install: ${RM} ${STAGEDIR}${PREFIX}/bin/pinentry \ ${STAGEDIR}${PREFIX}/share/info/pinentry.info diff --git a/security/pinentry/distinfo b/security/pinentry/distinfo index 112363030ce9..4cdb84128637 100644 --- a/security/pinentry/distinfo +++ b/security/pinentry/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1712087076 -SHA256 (pinentry-1.3.0.tar.bz2) = 9b3cd5226e7597f2fded399a3bc659923351536559e9db0826981bca316494de -SIZE (pinentry-1.3.0.tar.bz2) = 610363 -SHA256 (844360c9c99d2f11dc4236c0ab6bdb9b56758898.patch) = 80804d34202a3c8c700226e77431cd4585b760de038bd84d3a1ae9813f25d924 -SIZE (844360c9c99d2f11dc4236c0ab6bdb9b56758898.patch) = 3846 +TIMESTAMP = 1720239644 +SHA256 (pinentry-1.3.1.tar.bz2) = bc72ee27c7239007ab1896c3c2fae53b076e2c9bd2483dc2769a16902bce8c04 +SIZE (pinentry-1.3.1.tar.bz2) = 611233 diff --git a/security/pinentry/files/patch-qt5_icons_Makefile.in b/security/pinentry/files/patch-qt5_icons_Makefile.in new file mode 100644 index 000000000000..cc040c6e8b6c --- /dev/null +++ b/security/pinentry/files/patch-qt5_icons_Makefile.in @@ -0,0 +1,19 @@ +Rename icon to prevent install conflicts with the Qt6 frontend. + +--- qt5/icons/Makefile.in.orig 2024-07-03 09:29:09 UTC ++++ qt5/icons/Makefile.in +@@ -350,12 +350,12 @@ EXTRA_DIST = data-error.svg \ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + EXTRA_DIST = data-error.svg \ +- pinentry.png \ ++ pinentry-qt5.png \ + hint.svg \ + password-generate.svg \ + visibility.svg + +-icons_DATA = pinentry.png ++icons_DATA = pinentry-qt5.png + iconsdir = $(datadir)/pixmaps + all: all-am + diff --git a/security/pinentry/files/patch-qt5_main.cpp b/security/pinentry/files/patch-qt5_main.cpp new file mode 100644 index 000000000000..2f70594538ff --- /dev/null +++ b/security/pinentry/files/patch-qt5_main.cpp @@ -0,0 +1,13 @@ +Rename icon to prevent install conflicts with the Qt6 frontend. + +--- qt5/main.cpp.orig 2024-07-03 09:19:19 UTC ++++ qt5/main.cpp +@@ -422,7 +422,7 @@ main(int argc, char *argv[]) + new_argc = argc; + Q_ASSERT (new_argc); + app = new QApplication(new_argc, new_argv); +- app->setWindowIcon(QIcon(QLatin1String(":/icons/pinentry.png"))); ++ app->setWindowIcon(QIcon(QLatin1String(":/icons/pinentry-qt5.png"))); + app->setDesktopFileName(QStringLiteral("org.gnupg.pinentry-qt5")); + (void) new KeyboardFocusIndication{app}; + } diff --git a/security/pinentry/files/patch-qt5_org.gnupg.pinentry-qt5.desktop.in b/security/pinentry/files/patch-qt5_org.gnupg.pinentry-qt5.desktop.in new file mode 100644 index 000000000000..f934637fbb78 --- /dev/null +++ b/security/pinentry/files/patch-qt5_org.gnupg.pinentry-qt5.desktop.in @@ -0,0 +1,12 @@ +Rename icon to prevent install conflicts with the Qt6 frontend. + +--- qt5/org.gnupg.pinentry-qt5.desktop.in.orig 2024-07-03 09:19:19 UTC ++++ qt5/org.gnupg.pinentry-qt5.desktop.in +@@ -4,6 +4,6 @@ NoDisplay=true + Categories=Qt;Utility; + Exec=@prefix@/bin/pinentry-qt5 + NoDisplay=true +-Icon=pinentry ++Icon=pinentry-qt5 + GenericName=Utility for entering GnuPG secrets + X-KDE-Wayland-Interfaces=org_kde_kwin_keystate diff --git a/security/pinentry/files/patch-qt5_pinentryrc.qrc b/security/pinentry/files/patch-qt5_pinentryrc.qrc new file mode 100644 index 000000000000..860544dc5a02 --- /dev/null +++ b/security/pinentry/files/patch-qt5_pinentryrc.qrc @@ -0,0 +1,13 @@ +Rename icon to prevent install conflicts with the Qt6 frontend. + +--- qt5/pinentryrc.qrc.orig 2024-07-03 09:19:19 UTC ++++ qt5/pinentryrc.qrc +@@ -2,7 +2,7 @@ + + + icons/data-error.svg +- icons/pinentry.png ++ icons/pinentry-qt5.png + icons/hint.svg + icons/password-generate.svg + icons/visibility.svg diff --git a/security/pinentry/files/patch-secmem_secmem.c b/security/pinentry/files/patch-secmem_secmem.c index a21d0ba2221f..4d180a173403 100644 --- a/security/pinentry/files/patch-secmem_secmem.c +++ b/security/pinentry/files/patch-secmem_secmem.c @@ -1,6 +1,6 @@ ---- secmem/secmem.c.orig 2016-04-14 14:39:51 UTC +--- secmem/secmem.c.orig 2024-02-26 14:24:12 UTC +++ secmem/secmem.c -@@ -88,7 +88,7 @@ log_fatal(char *template, ...) +@@ -84,7 +84,7 @@ log_fatal(char *template, ...) # define MAP_ANONYMOUS MAP_ANON #endif