From bc7e0dbdbd194a8c2e09f82e1a5a4ea5e1b556f4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Mar 2024 18:50:06 +0000 Subject: gentoo auto-resync : 18:03:2024 - 18:50:06 --- app-crypt/Manifest.gz | Bin 24803 -> 24808 bytes app-crypt/pinentry/Manifest | 8 +- .../pinentry/files/pinentry-1.3.0-automagic.patch | 141 ++++++++++++++++++++ app-crypt/pinentry/pinentry-1.2.1-r4.ebuild | 2 +- app-crypt/pinentry/pinentry-1.2.1-r6.ebuild | 2 +- app-crypt/pinentry/pinentry-1.3.0.ebuild | 143 +++++++++++++++++++++ 6 files changed, 292 insertions(+), 4 deletions(-) create mode 100644 app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch create mode 100644 app-crypt/pinentry/pinentry-1.3.0.ebuild (limited to 'app-crypt') diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz index ccc91cc0365a..98fa4d3b22ae 100644 Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest index 467584945aca..59391999e456 100644 --- a/app-crypt/pinentry/Manifest +++ b/app-crypt/pinentry/Manifest @@ -1,8 +1,12 @@ AUX pinentry-1.0.0-AR.patch 326 BLAKE2B 2a05565287d2a3ff9423db1365af6ac1d2d0e0e5b3b7db49ee927eacd480cfbd29abd2313d84eb764e9d7eccd4654e2173fbf8be4508dd88f14bf12f0f9dab39 SHA512 3a8b13ddaa2af8c793586cd73e44b59828e769c3861b2d328273bac991e7e171c8714e2098674a9ae8a77c9a68098012d217e67dde8872df154a1e499837de52 AUX pinentry-1.2.1-automagic-capslock.patch 2831 BLAKE2B abe6c6815521dd80a227704ad2698e4aaa808faccb7d95acb1b2af8bb55f2fec03d92df0b60703da2c9f092988da32572ad2fcbd1735b3109ae278d24e76e1eb SHA512 a9fe32da17d214e5d0355efa575c04f4010a42dd9b272e2446f632017a383f2dd5bd3b98a8a71fe13bf55769fa0b420310d4f3217fa16a31272058d44598f99d AUX pinentry-1.2.1-include-memory.patch 8682 BLAKE2B e119583daaf2b418047fc51bc29dafb979452f5831dd89a86879c87038abb0d690752078577803810f52a0eb2660ad3428abdcac4f670450ac09b701c250641c SHA512 9a56ea04447fabd248f54953d07262510d7ebcfef3e5daf8084f4138df037bf31288ff95baa6eae6ec7584a773fd3ae242c121ca3c1910d415407a8eccb69ccd +AUX pinentry-1.3.0-automagic.patch 4219 BLAKE2B 6c4608fecfcecf588a67ecaba5ef7b69966d993bb73b97baea53899122cad3b078496ec470af3c64962e89c03062e1aed9df0b8b72eea2a2dde16757e10776b0 SHA512 d090be31dbb978211d0d9f73ed4b642608bfe73ccb9593ac5860469b19d08d345bec923fbcbd56e4183575ed6ad6223f338962ef970091253ce27ce809278785 DIST pinentry-1.2.1.tar.bz2 547698 BLAKE2B aa47612aa3a6f74c3676bf4018780356cb22ed4078792c1f466f9e0465199428c151c0e20dfbe6c784ef93c2b42b673daff0b6adc74c8c98fed9921e65ed42ea SHA512 a665315628f4dcf07e16a22db3f3be15d7e7e93b3deec0546c7275b71b0e3bd65535a08af5e12d6339fd6595132df86529401d9d12bd17c428a3466e8dfafab6 DIST pinentry-1.2.1.tar.bz2.sig 238 BLAKE2B 01ba3dc296a8e76c546d21d0bb0cd13778476d5d5b3ef55a3401c6a0353a56d79250d11555afb31c77c5a77e63847ded0f8eaef395bb0dc2ee3ff1d6a4ed83bd SHA512 d0e8435dc169a58f111f057f1c9fbb6c70da32a850f1107d6abdf41357c1714832728109ae61507db313d7eaef9596e5faf92fd21bed78adcc46a8c8a590430b -EBUILD pinentry-1.2.1-r4.ebuild 2559 BLAKE2B 9119a96aad7f9866a7f10dda1048f4f42b9b7e4298ac82160a8e0bb47d4938ef6dc8f2e400a6fc8f9426c601516738e25b470ba668a29aab761285f0ad60965d SHA512 85e87975e0e5da0f026462291ea61ac19946117e565d9c163d4dc467d8d5d6a976c2d08921a78408816090930e32f0d0c56d2cbca63e2fb85f3b532ba4834c7c -EBUILD pinentry-1.2.1-r6.ebuild 2560 BLAKE2B 5e4c6c87b7843372b79ed44c0c25f69faa4f4dca7c0ae288e0bd8ddd309f6ead98d08f5004487fda91a29cbdde6f377365f77ad97ec66967ea24bea0a606542a SHA512 2b1fc47a238fc348a3dee7862498e3eb44af9d5b3c84ccf3dbfe0474815691f2048776fc4d71f44e61007b728d84259d7606bb8fb7b28004af4be45d842e9153 +DIST pinentry-1.3.0.tar.bz2 610363 BLAKE2B a55b80754ef37d18ebdf0bd50e134a7b1bf6362b859b7069a9e4ebd86cd7e733d51f3c21a16779a18aa0d0dfab1f7a3df070d4f7e39e0840339078c4e9cb58bc SHA512 1bbac81c6811cffc8969a46494e6daa6b8447802f47ff6fa3e4dc9ac244cf6e5f629834c9b6a60770d06bff6c9932ad4059f10d2fdf93fd9e26fd5d21c0e3732 +DIST pinentry-1.3.0.tar.bz2.sig 119 BLAKE2B 0f11126761b2a06f8b08cf971f5d610cacbde1a5ee419523a6e704ac21fef4cce26495a160a51bee5ed5f68eca7d6864dfa03efa48030ba2cf783e767b925e1c SHA512 77a61877adf241d67caeea3af4c12a2c7c13ddc423ac001fab79bcec463a5853d8806052d61504fae0c67e0a9d1edf6a12d24b560ff7b4083eea5e86f9b54a90 +EBUILD pinentry-1.2.1-r4.ebuild 2575 BLAKE2B 1e8a9f62d29df187ac7dd0617dc5c8446a9cd92e4999e1f78e66d8b12ff6d74961b3aa0350255028124ffbcb5e13e6570aaf941e3de4190595a714cedf8435df SHA512 5f98140547bae48958b5ac38850602a17f7602f4dae446fc9a30b1c21ba57653619f3733fd9bfb447b2bd766827cc614b7fd76f8e623bf5fdcbfb91c793925c0 +EBUILD pinentry-1.2.1-r6.ebuild 2576 BLAKE2B 62538aecbcc7991de1af449244c054ae0a6ba19de0265210391791c7a600097ac4bff42a6deab349cad1eedb85d7a8376ae89fd4df61f424134c9c8a4cae2a55 SHA512 753e9895f30229167fff01a00fd150cca8644b0e5271935aad05b3bc1284f10ba5e2c0c13e1d536a909be46d3405ef56ee3bcf4172f8803672874ad399d47524 +EBUILD pinentry-1.3.0.ebuild 3180 BLAKE2B 5dd90e02e3729c7f2bb200d03dcfcfd72724a57473f1892a49921d6ffbcc2f82b5dae04ea32ed6b2ddd14be038e6e1f2fc3e6149b93d0b10024164dfe3fa7f4e SHA512 b6f2dbc760e6ceb466460118bfae569ae36560ed05d44caf4c9610b416b580d1006e6f2a60b7a76434378245c01abd9b691b6abf319a5a475cef9d68d45bc2f6 MISC metadata.xml 344 BLAKE2B d71f184ae783d215e32dc94e346c1f753f158b298cc2df87c14d5b73454ff3b4bf0ce4744d2aa0359bc68cb993cd35d2d6f77a09769853fda5b66e1cc1da3580 SHA512 0ae1c64980d4d94b8bbc04040a17b358b7138bf4022dcd97b6d2c464bc5fac0911c9522bea253586f69c8d137b75fe3e302d7cd9802290c2720c77706d9a935f diff --git a/app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch b/app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch new file mode 100644 index 000000000000..1236fb83f16d --- /dev/null +++ b/app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch @@ -0,0 +1,141 @@ +https://dev.gnupg.org/T6161 +https://bugs.gentoo.org/819939 +https://bugs.gentoo.org/837719 +--- a/configure.ac ++++ b/configure.ac +@@ -514,8 +514,12 @@ fi + dnl + dnl Check for libX11 library + dnl ++AC_ARG_WITH(x, ++ AS_HELP_STRING([--with-x],[use libX11]), ++ [want_x11=$withval], [want_x11=maybe]) ++ + have_x11=no +-if test "$have_w32_system" != "yes"; then ++AS_IF([test "$have_w32_system" != "yes" && test "$want_x11" != "no"], [ + PKG_CHECK_MODULES( + LIBX11, + [x11], +@@ -525,18 +529,20 @@ if test "$have_w32_system" != "yes"; then + have_x11=no + ] + ) ++]) + +- if test "$have_x11" = "yes"; then +- AC_DEFINE(HAVE_X11, 1, +- [The pinentries can optionally use x11.]) +- fi +-fi ++AS_IF([test "$have_x11" = "yes"], [AC_DEFINE(HAVE_X11, 1, [The pinentries can optionally use x11.])]) + + dnl + dnl Check for KF5WaylandClient library + dnl ++ ++AC_ARG_ENABLE(kf5-wayland, ++ AS_HELP_STRING([--enable-kf5-wayland],[use KF5WaylandClient for capslock indication on Wayland]), ++ [want_kf5_wayland=$enableval], [want_kf5_wayland=maybe]) ++ + have_kf5waylandclient=no +-if test "$have_w32_system" != "yes"; then ++AS_IF([test "$have_w32_system" != "yes" && test "$want_kf5_wayland" != "no"], [ + PKG_CHECK_MODULES( + KF5WAYLANDCLIENT, + [KF5WaylandClient >= 5.60], +@@ -546,13 +552,18 @@ if test "$have_w32_system" != "yes"; then + have_kf5waylandclient=no + ] + ) +-fi ++]) + + dnl + dnl Check for KF6GuiAddons library + dnl ++ ++AC_ARG_ENABLE(kf6-wayland, ++ AS_HELP_STRING([--enable-kf6-wayland],[use KF6GuiAddons for capslock indication and KF6WindowSystem for window parenting on Wayland]), ++ [want_kf6_wayland=$enableval], [want_kf6_wayland=maybe]) ++ + have_kf6guiaddons=no +-if test "$have_w32_system" != "yes"; then ++AS_IF([test "$have_w32_system" != "yes" && test "$want_kf6_wayland" != "no"], [ + PKG_CHECK_MODULES( + KF6GUIADDONS, + [KF6GuiAddons >= 5.240], +@@ -562,7 +573,7 @@ if test "$have_w32_system" != "yes"; then + have_kf6guiaddons=no + ] + ) +-fi ++]) + + dnl + dnl Check for Qt5 pinentry program. +@@ -663,7 +674,8 @@ dnl + dnl Check for KF6WindowSystem library + dnl + have_kf6windowsystem=no +-if test "$have_w32_system" != "yes" && test "$pinentry_qt6" = "yes"; then ++ ++AS_IF([test "$have_w32_system" != "yes" && test "$want_kf6_wayland" != "no"], [ + PKG_CHECK_MODULES( + KF6WINDOWSYSTEM, + [KF6WindowSystem >= 5.240], +@@ -673,7 +685,7 @@ if test "$have_w32_system" != "yes" && test "$pinentry_qt6" = "yes"; then + have_kf6windowsystem=no + ] + ) +-fi ++]) + + if test "$have_kf6windowsystem" = "yes"; then + PINENTRY_QT6_CFLAGS="$KF6WINDOWSYSTEM_CFLAGS $PINENTRY_QT6_CFLAGS" +--- a/m4/qt5.m4 ++++ b/m4/qt5.m4 +@@ -33,6 +33,10 @@ AC_DEFUN([FIND_QT5], + enable_pinentry_qt5=$enableval, + enable_pinentry_qt5="try") + ++ AC_ARG_ENABLE(qtx11extras, ++ AS_HELP_STRING([--enable-qtx11extras],[use Qt5X11Extras for capslock indication on X11]), ++ [want_qtx11extras=$enableval], [want_qtx11extras=maybe]) ++ + have_qt5_libs="no"; + require_qt5_cpp11="no"; + +@@ -63,20 +67,22 @@ AC_DEFUN([FIND_QT5], + fi + fi + +- if test "$have_x11" = "yes"; then ++ have_qt5_x11extras=no ++ AS_IF([test "$have_x11" = "yes" && test "$want_qtx11extras" != "no"], [ + PKG_CHECK_MODULES( + PINENTRY_QT5_X11_EXTRAS, + Qt5X11Extras >= 5.1.0, + [have_qt5_x11extras="yes"], +- [ +- AC_MSG_WARN([pinentry-qt will be built without Caps Lock warning on X11]) +- have_qt5_x11extras="no" +- ]) +- if test "$have_qt5_x11extras" = "yes"; then +- PINENTRY_QT5_CFLAGS="$LIBX11_CFLAGS $PINENTRY_QT5_CFLAGS $PINENTRY_QT5_X11_EXTRAS_CFLAGS" +- PINENTRY_QT5_LIBS="$LIBX11_LIBS $PINENTRY_QT5_LIBS $PINENTRY_QT5_X11_EXTRAS_LIBS" +- fi +- fi ++ [have_qt5_x11extras="no"] ++ ) ++ ]) ++ ++ AS_IF([test "$have_qt5_x11extras" = "yes"], [ ++ PINENTRY_QT_CFLAGS="$LIBX11_CFLAGS $PINENTRY_QT_CFLAGS $PINENTRY_QT_X11_EXTRAS_CFLAGS" ++ PINENTRY_QT_LIBS="$LIBX11_LIBS $PINENTRY_QT_LIBS $PINENTRY_QT_X11_EXTRAS_LIBS" ++ ], [ ++ AC_MSG_WARN([pinentry-qt will be built without Caps Lock warning on X11]) ++ ]) + + AC_CHECK_TOOL(MOC5, moc) + AC_MSG_CHECKING([moc version]) diff --git a/app-crypt/pinentry/pinentry-1.2.1-r4.ebuild b/app-crypt/pinentry/pinentry-1.2.1-r4.ebuild index 2efd0de3f700..0cd3553fd4ca 100644 --- a/app-crypt/pinentry/pinentry-1.2.1-r4.ebuild +++ b/app-crypt/pinentry/pinentry-1.2.1-r4.ebuild @@ -7,7 +7,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc inherit autotools qmake-utils verify-sig DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="https://gnupg.org/aegypten2/" +HOMEPAGE="https://gnupg.org/related_software/pinentry/" SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" diff --git a/app-crypt/pinentry/pinentry-1.2.1-r6.ebuild b/app-crypt/pinentry/pinentry-1.2.1-r6.ebuild index 898f4bef6a9e..52f368ac9c0d 100644 --- a/app-crypt/pinentry/pinentry-1.2.1-r6.ebuild +++ b/app-crypt/pinentry/pinentry-1.2.1-r6.ebuild @@ -7,7 +7,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc inherit autotools qmake-utils verify-sig DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="https://gnupg.org/aegypten2/" +HOMEPAGE="https://gnupg.org/related_software/pinentry/" SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" diff --git a/app-crypt/pinentry/pinentry-1.3.0.ebuild b/app-crypt/pinentry/pinentry-1.3.0.ebuild new file mode 100644 index 000000000000..48ddc34b18c0 --- /dev/null +++ b/app-crypt/pinentry/pinentry-1.3.0.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc +inherit autotools qmake-utils verify-sig + +DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" +HOMEPAGE="https://gnupg.org/related_software/pinentry/" +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" +SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="caps efl emacs gtk keyring ncurses qt5 qt6 wayland X" + +DEPEND=" + >=dev-libs/libassuan-2.1 + >=dev-libs/libgcrypt-1.6.3 + >=dev-libs/libgpg-error-1.17 + efl? ( dev-libs/efl[X] ) + keyring? ( app-crypt/libsecret ) + ncurses? ( sys-libs/ncurses:= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + wayland? ( kde-plasma/kwayland:5 ) + X? ( + dev-qt/qtx11extras:5 + x11-libs/libX11 + ) + ) + qt6? ( + dev-qt/qtbase:6[gui,widgets] + wayland? ( + kde-frameworks/kguiaddons:6 + kde-frameworks/kwindowsystem:6 + ) + ) +" +RDEPEND=" + ${DEPEND} + gtk? ( app-crypt/gcr:4[gtk] ) +" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-gnupg ) +" +PDEPEND="emacs? ( app-emacs/pinentry )" +IDEPEND=">=app-eselect/eselect-pinentry-0.7.4" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +PATCHES=( + "${FILESDIR}/${PN}-1.0.0-AR.patch" + "${FILESDIR}/${PN}-1.3.0-automagic.patch" # bug #819939, bug #837719 +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + unset FLTK_CONFIG + + local myeconfargs=( + $(use_enable efl pinentry-efl) + $(use_enable emacs pinentry-emacs) + $(use_enable keyring libsecret) + $(use_enable gtk pinentry-gnome3) + $(use_enable ncurses fallback-curses) + $(use_enable ncurses pinentry-curses) + $(use_enable qt5 pinentry-qt5) + $(use_enable qt6 pinentry-qt) + # TODO: could split this up into qt5/qt6? + $(use_enable X qtx11extras) + $(use_with X x) + + --enable-pinentry-tty + --disable-pinentry-fltk + --disable-pinentry-gtk2 + + ac_cv_path_GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config" + + $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') + ) + + if use qt5 ; then + export PATH="$(qt5_get_bindir):${PATH}" + export QTLIB="$(qt5_get_libdir):${QTLIB}" + export MOC5="$(qt5_get_bindir)"/moc + + myeconfargs+=( + $(use_enable wayland kf5-wayland) + ) + else + myeconfargs+=( + --disable-kf5-wayland + ) + fi + + if use qt6 ; then + export PATH="$(qt6_get_bindir):${PATH}" + export QTLIB="$(qt6_get_libdir):${QTLIB}" + export MOC="$(qt6_get_libdir)/qt6/libexec/moc" + + myeconfargs+=( + $(use_enable wayland kf6-wayland) + ) + else + myeconfargs+=( + --disable-kf6-wayland + ) + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + rm "${ED}"/usr/bin/pinentry || die + + if use qt6 ; then + dosym pinentry-qt /usr/bin/pinentry-qt6 + elif use qt6 ; then + dosym pinentry-qt /usr/bin/pinentry-qt5 + fi +} + +pkg_postinst() { + eselect pinentry update ifunset +} + +pkg_postrm() { + eselect pinentry update ifunset +} -- cgit v1.2.3