diff options
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/Manifest.gz | bin | 23672 -> 23666 bytes | |||
| -rw-r--r-- | app-crypt/gnupg/Manifest | 1 | ||||
| -rw-r--r-- | app-crypt/gnupg/files/gnupg-2.2.1-fix-gnupg-wait.patch | 85 | ||||
| -rw-r--r-- | app-crypt/pgpdump/Manifest | 4 | ||||
| -rw-r--r-- | app-crypt/pgpdump/pgpdump-0.33.ebuild (renamed from app-crypt/pgpdump/pgpdump-0.31.ebuild) | 11 | ||||
| -rw-r--r-- | app-crypt/pinentry/Manifest | 1 | ||||
| -rw-r--r-- | app-crypt/pinentry/pinentry-1.1.0-r2.ebuild | 102 |
7 files changed, 110 insertions, 94 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz Binary files differindex 01f20513ea30..279738e9da06 100644 --- a/app-crypt/Manifest.gz +++ b/app-crypt/Manifest.gz diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest index a937ab8177ff..888bf9332ed1 100644 --- a/app-crypt/gnupg/Manifest +++ b/app-crypt/gnupg/Manifest @@ -1,7 +1,6 @@ AUX gnupg-2.1.20-gpg-Fix-typo.patch 843 BLAKE2B 6e7c56d54ef0b0a1e14030a7636bd35dedca8d22a49b6feb5616a474b150b90d703d9b928204946cc71016a84bea1183bba9ddd3323acb83a1d41027650fb61d SHA512 eb451eedb3e0282f3b7d10d0b12753a55b6bd92b2cdfc1dce5a9ffe1f0015cc598193193a8c8292371fb285517016d69ec70b7820f9dc0047e33b2e3f16214ed AUX gnupg-2.1.20-gpg-Properly-account-for-ring-trust-packets.patch 2987 BLAKE2B eff568f4988b147a9d1aba77965222fcbfc2e9c3efef8eed9ce58f1c7058214ece62046435c90227d8fce1829f3131387f59598676d1359320f61b441018eb85 SHA512 2cf3147638c69f49b4d792a01321b5892f882fc67a1aee8f51f9b35761e6961e9c46d9abc92b0e5250a85b7145e69ba9583b3ce2323943587feb52a029e95deb AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce -AUX gnupg-2.2.1-fix-gnupg-wait.patch 2881 BLAKE2B 054c3de81a2ae70c7dea439cd66b9d5642510920af9ba48e4dab28c3457dad95f7ffd3ddb106dd4a5dacebfbedf225e88ad57934ee03a6b80da00ac03f7f944d SHA512 3622c1667c3f0b0acb28fd3ac440af76c0f2757e1d654fbd85344a1193a088db087861f7410e249ece5c99fd7afd7d7a24c43f58e88f5c21949195714be4cbf6 AUX gnupg-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch 1342 BLAKE2B d494d544e9bbfd4115b58cc0117171d7792b44158e48032ddfdbacaff38cc5aebae4e1f1d46fa814ea40504441c8288937a5cfa7d475246cd301061176969e7c SHA512 171ae5092b9cab26446a2c4fe12137f5f1e92ba1d3c542a52900c14c488d902dfad84594473063f7eacb65ff7cefadb88239534498245f79f16ce8c58005f99c DIST gnupg-1.4.21.tar.bz2 3689305 BLAKE2B 0c26c9c3aeae2bf2eafa858bc3bd15cc2702bce12a8a90938565322c34e2eeb8e5432932f5c9344a76aa4528b66051141536c062d9923a79d12a0767421bb017 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984 DIST gnupg-2.1.15.tar.bz2 5723689 BLAKE2B 48889c0a5445b5b76b027debd6a4711930694e7440b76c06a7da1db5e7989eeae791e4c7a29e60a9d0b862c167374016d908aaa54165a44268f072075cdd9690 SHA512 69c943e853e1a37e8b17b3bc34e1503f14bc8f189fa9f3ac6644bcc98ccce6eaef64da20ff9dd1c8de3a7789ea577167984ccf3ac286cac50752e6f7c2f42ab1 diff --git a/app-crypt/gnupg/files/gnupg-2.2.1-fix-gnupg-wait.patch b/app-crypt/gnupg/files/gnupg-2.2.1-fix-gnupg-wait.patch deleted file mode 100644 index 6a2c18e9b63f..000000000000 --- a/app-crypt/gnupg/files/gnupg-2.2.1-fix-gnupg-wait.patch +++ /dev/null @@ -1,85 +0,0 @@ -From eeb3da6eb717ed6a1a1069a7611eb37503e8672d Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka <gniibe@fsij.org> -Date: Tue, 19 Sep 2017 12:28:43 +0900 -Subject: [PATCH 2/3] common: Fix gnupg_wait_processes. - -* common/exechelp-posix.c (gnupg_wait_processes): Loop for r_exitcodes -even if we already see an error. - --- - -The value stored by waitpid for exit code is encoded; It requires -decoded by WEXITSTATUS macro, regardless of an error. - -For example, when one of processes is already exited and another is -still running, it resulted wrong value of in r_exitcodes[n]. - -Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> ---- - common/exechelp-posix.c | 50 +++++++++++++++++++++++++------------------------ - 1 file changed, 26 insertions(+), 24 deletions(-) - -diff --git a/common/exechelp-posix.c b/common/exechelp-posix.c -index 7237993a2..3acf74ad6 100644 ---- a/common/exechelp-posix.c -+++ b/common/exechelp-posix.c -@@ -784,30 +784,32 @@ gnupg_wait_processes (const char **pgmnames, pid_t *pids, size_t count, - } - } - -- if (ec == 0) -- for (i = 0; i < count; i++) -- { -- if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i]) == 127) -- { -- log_error (_("error running '%s': probably not installed\n"), -- pgmnames[i]); -- ec = GPG_ERR_CONFIGURATION; -- } -- else if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i])) -- { -- if (dummy) -- log_error (_("error running '%s': exit status %d\n"), -- pgmnames[i], WEXITSTATUS (r_exitcodes[i])); -- else -- r_exitcodes[i] = WEXITSTATUS (r_exitcodes[i]); -- ec = GPG_ERR_GENERAL; -- } -- else if (!WIFEXITED (r_exitcodes[i])) -- { -- log_error (_("error running '%s': terminated\n"), pgmnames[i]); -- ec = GPG_ERR_GENERAL; -- } -- } -+ for (i = 0; i < count; i++) -+ { -+ if (r_exitcodes[i] == -1) -+ continue; -+ -+ if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i]) == 127) -+ { -+ log_error (_("error running '%s': probably not installed\n"), -+ pgmnames[i]); -+ ec = GPG_ERR_CONFIGURATION; -+ } -+ else if (WIFEXITED (r_exitcodes[i]) && WEXITSTATUS (r_exitcodes[i])) -+ { -+ if (dummy) -+ log_error (_("error running '%s': exit status %d\n"), -+ pgmnames[i], WEXITSTATUS (r_exitcodes[i])); -+ else -+ r_exitcodes[i] = WEXITSTATUS (r_exitcodes[i]); -+ ec = GPG_ERR_GENERAL; -+ } -+ else if (!WIFEXITED (r_exitcodes[i])) -+ { -+ log_error (_("error running '%s': terminated\n"), pgmnames[i]); -+ ec = GPG_ERR_GENERAL; -+ } -+ } - - xfree (dummy); - return gpg_err_make (GPG_ERR_SOURCE_DEFAULT, ec); --- -2.13.5 - diff --git a/app-crypt/pgpdump/Manifest b/app-crypt/pgpdump/Manifest index 5576e68bb37c..dadfe6583cec 100644 --- a/app-crypt/pgpdump/Manifest +++ b/app-crypt/pgpdump/Manifest @@ -1,9 +1,9 @@ AUX pgpdump-0.28-respect-ldflags.patch 977 BLAKE2B a1e2bc207f696e6382849995b69d90ab550d37e3b91a0f3b94ad1082656ef7f900f521d7704e27d098293e30a863ddf09545abbd41ce8cdc33e88f0c78010063 SHA512 3b615f8276ad4099c7963a53189af482b90143e1f36f14b596fb471736a7ee9ee13b6b873fa56dc7792605449c00a4e1a273c7aa35dc7de1ffd3fabacab6728e AUX pgpdump-0.32-respect-ldflags.patch 998 BLAKE2B fefa545f3c2d1d3ed3baa5a9d2b84b9b32745626883e9b8056fff045ceb0d06a490f5068782dbda07e4956429a2d2f31865c9c0e55b91bd9aa613f9ce6016537 SHA512 ed333769ded8acbec36d34bc86d935705294d96854e84af4673d44ed3d04f5272d2c1bba38b2742afeb02b2a307a983ff61566433ad1546769e6a68f2318e760 DIST pgpdump-0.30.tar.gz 63152 BLAKE2B 71381c5be016761100d0274753b20b27b361f45a40d9407706057523248c442fba3e36c55d57db2b66d7f0c252844c077ff99f45cffaef8b233c79af10386e91 SHA512 e250dc82bb890a7645a41f6ddbfad9155ddf70f2ea53b09e771e9b6851d05d3fba88e16b106681ab092174e79ad709ed860be25bfded1ca7f369b357e8c72730 -DIST pgpdump-0.31.tar.gz 63808 BLAKE2B 3c9b328bdbc503c82f8100f0d749cc08ea1eb9a27bce661bb7c1d85a125c047c0865a5c6f6af2deb0425f00f74bc3097c4f3e2797b0c2375fb0c56f6362a1e22 SHA512 10d138baf0e3c9a47f6c8549a94b14eaa8babf95a09265e3a5b91469598726d6ee94cc7c481688c2d2b63917d6daba1bb368923aaf75adac6b18694d9a2940c4 DIST pgpdump-0.32.tar.gz 65444 BLAKE2B baa7d9077799f6295adf2927933f1ccb466dd7afedf496d5e4010d06f7111a2cf58ea4a48590d76bb166862c0315c333ae40f79d0946c5bb05092f6122f8a071 SHA512 3f28a301cce703e934eb8b6124af4db78801d444ce74f43f8511009ea0684f9e9c229ef2a18cc732fe0854f2e02c4bbfdee46ffee64a5f490ff06c060472e49d +DIST pgpdump-0.33.tar.gz 65730 BLAKE2B 9941f55a070c219b1b6096939f1a8d775d85c8de60154f2ca93709b489605c8c3937bb4e250390fc71d152bf23c5a22f37226a64ff57036268cf49d793c215bd SHA512 976e2c185c9d72302c9c020dde1d2872b01fd9c2195be0d43441a03c3c6a4a70636f8ac2b35e3fde30e45ecc7fc1c23d7c92dcbd90fc503bbcdef73e3483e9c7 EBUILD pgpdump-0.30.ebuild 552 BLAKE2B 7d1941dff7af58734a07664c8cb2ea84187ec8faaadee8a83118a5ecb1b552941858fcf1c6cbb5df83730ea481af2d37ab3189fa751030457874498bcd705cf2 SHA512 4d06ab2adcead278d58d1a9366919e83d57b32b98c89a2eee4bd667c8853f3ff7289be99c225179781cfb4d0e92823d7f2af41f5eb93f9ef1e3183efccfcf279 -EBUILD pgpdump-0.31.ebuild 556 BLAKE2B 7a7a3fffbba36591d2bb915f43f5d30de5003b3c8afd4dfca18bca2e535ba484bf7d59d177753b4b27dec8b1897c1c9552d74610b846ddbbdb686d6dbb24d391 SHA512 ec70920127ac19861873f30d3151e6623379d06f4b6a3d5180d6f1729144d3631a08c516cfa32698680c7436b395bbd01df5a0a14e40ff4d05cc580aa4ee3c89 EBUILD pgpdump-0.32.ebuild 528 BLAKE2B 77bc198cde30232d9d4b37928449b704857778f1b54dfc2bd4c23733afc05f19c7229f6a431ce0ac761e71a69d772575c316bc4ca8fbb49d298db85f96b1375b SHA512 f99dfcc371d372dc6cfa9613c4f40336dfaeacd08851f0302bed6d5f91814dc35e31d4a3ce0cf273c3e4a8781cb02aff907d31861f863a0c5f5d9e2dfa5126a9 +EBUILD pgpdump-0.33.ebuild 528 BLAKE2B 50a12fcf48bbb498debe29c1ee57ba15d83fe7eb0d9d6488efb49a0da5d949e03696ef97d5bc3c320c34a7ab5504f65663b6772ef58f72970defd0cb0362aff1 SHA512 bbc1474b856606b888002043d231d2a1fb082c13020d2ab58a5064baca69f770e31a3a358fd049b62a12dfbbcf68073ee7014a39d51467b06a50bf29a8692183 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274 diff --git a/app-crypt/pgpdump/pgpdump-0.31.ebuild b/app-crypt/pgpdump/pgpdump-0.33.ebuild index d3836f782bb5..38fcf5506fc8 100644 --- a/app-crypt/pgpdump/pgpdump-0.31.ebuild +++ b/app-crypt/pgpdump/pgpdump-0.33.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=6 DESCRIPTION="A PGP packet visualizer" HOMEPAGE="http://www.mew.org/~kazu/proj/pgpdump/" @@ -17,9 +16,9 @@ DEPEND="sys-libs/zlib app-arch/bzip2" RDEPEND="${DEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.28-respect-ldflags.patch -} +PATCHES=( + "${FILESDIR}"/${PN}-0.32-respect-ldflags.patch +) src_install() { dobin pgpdump diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest index 57ab4b5a02f3..29a4ab32821c 100644 --- a/app-crypt/pinentry/Manifest +++ b/app-crypt/pinentry/Manifest @@ -8,4 +8,5 @@ DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1 EBUILD pinentry-1.0.0-r2.ebuild 2886 BLAKE2B 27f6057b0d5d0d474397660d755c90ab8dc025a80d5573e44c71093839efee3c0a126fb5dc10fb53083946c46989cdb63aa1baf6e75f40c2e3aef6bae558bfef SHA512 32cc1cc04357afe5f0b84f1bd75af877e1b849d3a4fc70d194e627a32da883a05037d36d15b25cea67d2963563402c13d125a928278f9326fda8463b5951eb3a EBUILD pinentry-1.0.0-r3.ebuild 2958 BLAKE2B 350c3f20934857f72ce46dad5d8a047f5b04c10dbf4f398e346a5b1339a81fa1263296859a240fe717970840ed81b2f271a902d3e26b5d93f108bbdf3117cc20 SHA512 10c088dd6cd0efab43430856615cd795986c127765fbb47c0d324085aac9474da85bd317a8ec23aecc05fafba19f14392ccbf59b1820590223be0eb57855a2a6 EBUILD pinentry-1.1.0-r1.ebuild 2809 BLAKE2B b67fe9e2549179f6a035e7b47a2a5041e97e2924c381a66f889d656176c1ee464ab023297801f7f0442390565f5697f2e5fb67a54d7a4c3cfb8f5a4aeae23288 SHA512 e27748277d88402c8c46251ab95f7852fc6ff0499b00823cc1a980ebc222568acf6c31d6ebe92a29b414aba0a6f1796679b43ec279e36bd423183a1a25431411 +EBUILD pinentry-1.1.0-r2.ebuild 2876 BLAKE2B 00a80e0c23694d45c5ac529e086934f1ce28be2c46594171d6de17a2eeb7904df1ab031f4ba4c76d00e61944d229feabf204643ceb5a806b98c56566e262096c SHA512 9eccbd9d41ebf030ad823fa66f25509b6f68b29c5ea85a772453dd81a86c35d0734fbdb4b1d24970a7d0e3851dedd9357bf0c804d3f3987f7f34eab86674f923 MISC metadata.xml 352 BLAKE2B 75bb4d471f7b82b6cfe614d5c2ed226df087792ed84803ce4b011c5ad0a5a1548a87c6ab4c17ffeef53eb64bdea262fda4f89d27c38950ff1ced736b38d7df59 SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0 diff --git a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild new file mode 100644 index 000000000000..5b9da6b3a473 --- /dev/null +++ b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic qmake-utils toolchain-funcs + +DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" +HOMEPAGE="https://gnupg.org/aegypten2/index.html" +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static" + +CDEPEND=" + app-eselect/eselect-pinentry + >=dev-libs/libassuan-2.1 + >=dev-libs/libgcrypt-1.6.3 + >=dev-libs/libgpg-error-1.17 + caps? ( sys-libs/libcap ) + fltk? ( x11-libs/fltk ) + gnome-keyring? ( app-crypt/libsecret ) + gtk? ( x11-libs/gtk+:2 ) + ncurses? ( sys-libs/ncurses:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) +" +DEPEND="${CDEPEND} + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND="${CDEPEND} + gnome-keyring? ( app-crypt/gcr ) +" + +REQUIRED_USE=" + gtk? ( !static ) + qt5? ( !static ) +" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +PATCHES=( + "${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch" + "${FILESDIR}/${PN}-0.8.2-ncurses.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + use static && append-ldflags -static + [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 + + export QTLIB="$(qt5_get_libdir)" + + econf \ + --enable-pinentry-tty \ + $(use_with caps libcap) \ + $(use_enable emacs pinentry-emacs) \ + $(use_enable fltk pinentry-fltk) \ + $(use_enable gnome-keyring libsecret) \ + $(use_enable gnome-keyring pinentry-gnome3) \ + $(use_enable gtk pinentry-gtk2) \ + $(use_enable ncurses pinentry-curses) \ + $(use_enable ncurses fallback-curses) \ + $(use_enable qt5 pinentry-qt) \ + MOC="$(qt5_get_bindir)"/moc +} + +src_install() { + default + rm -f "${ED}"/usr/bin/pinentry || die + + use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4 +} + +pkg_postinst() { + if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then + elog "We no longer install pinentry-curses and pinentry-qt SUID root by default." + elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes." + elog "The soft resource limit for memory locking specifies the limit an" + elog "unprivileged process may lock into memory. You can also use POSIX" + elog "capabilities to allow pinentry to lock memory. To do so activate the caps" + elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" + elog "your users." + fi + + eselect pinentry update ifunset +} + +pkg_postrm() { + eselect pinentry update ifunset +} |