commit: 95f41dd2bc08fda4f634f338ab74a73a996f9356 Author: Michael Everitt <gentoo <AT> veremit <DOT> xyz> AuthorDate: Sun Apr 19 00:28:47 2020 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Sun Apr 19 13:10:28 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=95f41dd2
Fixed in ::gentoo, v3.31.91, commit d91ec7bf4ecbbfcdb7a4cb7889c33ed6cd7c2519 Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz> Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> gnome-base/gnome-keyring/Manifest | 3 - ...nome-keyring-3.14.0-musl-add-sys_select_h.patch | 11 --- .../gnome-keyring/gnome-keyring-3.20.0.ebuild | 79 ---------------------- .../gnome-keyring/gnome-keyring-3.20.1.ebuild | 79 ---------------------- .../gnome-keyring/gnome-keyring-3.28.2.ebuild | 79 ---------------------- gnome-base/gnome-keyring/metadata.xml | 21 ------ 6 files changed, 272 deletions(-) diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest deleted file mode 100644 index 68d9379..0000000 --- a/gnome-base/gnome-keyring/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST gnome-keyring-3.20.0.tar.xz 1215324 SHA256 bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99 SHA512 f7e6195b4be52edaee3bc3181f006ec31ebd54f8000c98220520f4158f66580b60950e4f55247aefae6aa9320f6589c8a09c1e32853165915ae5ff1b40627c5b WHIRLPOOL 63ceaf842b4f9661eb732fbddec6f26dda7ae157e405eb0d0b377ff07dd01c0e0ae3b3c0dd07d2434199edb3730994231da936aaf472054ee5cb76f089439fb8 -DIST gnome-keyring-3.20.1.tar.xz 1219800 SHA256 97964e723f454be509c956ed5e38b5c2fd7363f43bd3f153b94a4a63eb888c8c SHA512 a60d8a4b17a9c6d8c581578881abaf7d79de43045a314b401e3bfd3974edb4ab94117dd430203b721058f432b24bf6296e0b7c4fba1e66cccd2c2e9441787177 WHIRLPOOL e05ccedf325cafdd3faa70c6873345b4febbf0dc9e45e611165b58b78e99659fd238dbddc5a24e470663cf6d8772eb0a07677257d1a4b35c5333f6cc872403af -DIST gnome-keyring-3.28.2.tar.xz 1322108 BLAKE2B 416697befb7670c3b854ff8d70626d495f5ba77691a062f854360e25a76766f5023e998b86114d36965023a5efefc2eb0ab1dca9aa03d73351eafebaa4920784 SHA512 a51bc9d6bc9203b86febe99bdbf893d3ba0eeaad976ece2bd49efc3869bd1d15f440a01999ce969f845f8336538de22e9f1161da990d707cbadb99d5cc3549bc diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.14.0-musl-add-sys_select_h.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.14.0-musl-add-sys_select_h.patch deleted file mode 100644 index f6f2513..0000000 --- a/gnome-base/gnome-keyring/files/gnome-keyring-3.14.0-musl-add-sys_select_h.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur gnome-keyring-3.14.0.orig/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c gnome-keyring-3.14.0/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c ---- gnome-keyring-3.14.0.orig/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c 2014-09-23 03:45:13.000000000 -0400 -+++ gnome-keyring-3.14.0/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c 2015-07-18 18:45:17.631673696 -0400 -@@ -34,6 +34,7 @@ - - #include <dlfcn.h> - #include <pthread.h> -+#include <sys/select.h> - - #define SOCKET_PATH "/tmp/gkm-rpc-daemon.sock" - diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild deleted file mode 100644 index 0cbfcb3..0000000 --- a/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 ) - -inherit fcaps gnome2 pam python-any-r1 versionator virtualx - -DESCRIPTION="Password and keyring managing daemon" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"; - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+caps pam selinux +ssh-agent test" -KEYWORDS="amd64 arm arm64 ~mips ppc x86" - -# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456 -RDEPEND=" - >=app-crypt/gcr-3.5.3:=[gtk] - >=dev-libs/glib-2.38:2 - app-misc/ca-certificates - >=dev-libs/libgcrypt-1.2.2:0= - caps? ( sys-libs/libcap-ng ) - pam? ( sys-libs/pam ) - selinux? ( sec-policy/selinux-gnome ) - >=app-crypt/gnupg-2.0.28:= -" -DEPEND="${RDEPEND} - >=app-eselect/eselect-pinentry-0.5 - app-text/docbook-xml-dtd:4.3 - dev-libs/libxslt - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig - test? ( ${PYTHON_DEPS} ) -" -PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512 -PATCHES=( "${FILESDIR}/${PN}-3.14.0-musl-add-sys_select_h.patch" ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - # Disable stupid CFLAGS with debug enabled - sed -e 's/CFLAGS="$CFLAGS -g"//' \ - -e 's/CFLAGS="$CFLAGS -O0"//' \ - -i configure.ac configure || die - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_with caps libcap-ng) \ - $(use_enable pam) \ - $(use_with pam pam-dir $(getpam_mod_dir)) \ - $(use_enable selinux) \ - $(use_enable ssh-agent) \ - --enable-doc -} - -src_test() { - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die - GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check -} - -pkg_postinst() { - # cap_ipc_lock only needed if building --with-libcap-ng - # Never install as suid root, this breaks dbus activation, see bug #513870 - use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon - gnome2_pkg_postinst - - if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then - ewarn "Please select pinentry-gnome3 as default pinentry provider:" - ewarn " # eselect pinentry set pinentry-gnome3" - fi -} diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.20.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.20.1.ebuild deleted file mode 100644 index 0cbfcb3..0000000 --- a/gnome-base/gnome-keyring/gnome-keyring-3.20.1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 ) - -inherit fcaps gnome2 pam python-any-r1 versionator virtualx - -DESCRIPTION="Password and keyring managing daemon" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"; - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+caps pam selinux +ssh-agent test" -KEYWORDS="amd64 arm arm64 ~mips ppc x86" - -# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456 -RDEPEND=" - >=app-crypt/gcr-3.5.3:=[gtk] - >=dev-libs/glib-2.38:2 - app-misc/ca-certificates - >=dev-libs/libgcrypt-1.2.2:0= - caps? ( sys-libs/libcap-ng ) - pam? ( sys-libs/pam ) - selinux? ( sec-policy/selinux-gnome ) - >=app-crypt/gnupg-2.0.28:= -" -DEPEND="${RDEPEND} - >=app-eselect/eselect-pinentry-0.5 - app-text/docbook-xml-dtd:4.3 - dev-libs/libxslt - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig - test? ( ${PYTHON_DEPS} ) -" -PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512 -PATCHES=( "${FILESDIR}/${PN}-3.14.0-musl-add-sys_select_h.patch" ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - # Disable stupid CFLAGS with debug enabled - sed -e 's/CFLAGS="$CFLAGS -g"//' \ - -e 's/CFLAGS="$CFLAGS -O0"//' \ - -i configure.ac configure || die - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_with caps libcap-ng) \ - $(use_enable pam) \ - $(use_with pam pam-dir $(getpam_mod_dir)) \ - $(use_enable selinux) \ - $(use_enable ssh-agent) \ - --enable-doc -} - -src_test() { - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die - GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check -} - -pkg_postinst() { - # cap_ipc_lock only needed if building --with-libcap-ng - # Never install as suid root, this breaks dbus activation, see bug #513870 - use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon - gnome2_pkg_postinst - - if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then - ewarn "Please select pinentry-gnome3 as default pinentry provider:" - ewarn " # eselect pinentry set pinentry-gnome3" - fi -} diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild deleted file mode 100644 index 88215af..0000000 --- a/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 ) - -inherit fcaps gnome2 pam python-any-r1 virtualx - -DESCRIPTION="Password and keyring managing daemon" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"; - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+caps pam selinux +ssh-agent test" -KEYWORDS="amd64 arm arm64 ~mips ~ppc x86" - -# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456 -RDEPEND=" - >=app-crypt/gcr-3.27.90:=[gtk] - >=dev-libs/glib-2.44:2 - app-misc/ca-certificates - >=dev-libs/libgcrypt-1.2.2:0= - caps? ( sys-libs/libcap-ng ) - pam? ( sys-libs/pam ) - selinux? ( sec-policy/selinux-gnome ) - >=app-crypt/gnupg-2.0.28:= - ssh-agent? ( net-misc/openssh ) -" -DEPEND="${RDEPEND} - >=app-eselect/eselect-pinentry-0.5 - app-text/docbook-xml-dtd:4.3 - dev-libs/libxslt - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( ${PYTHON_DEPS} ) -" -PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512 -PATCHES=( "${FILESDIR}/${PN}-3.14.0-musl-add-sys_select_h.patch" ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - # Disable stupid CFLAGS with debug enabled - sed -e 's/CFLAGS="$CFLAGS -g"//' \ - -e 's/CFLAGS="$CFLAGS -O0"//' \ - -i configure.ac configure || die - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_with caps libcap-ng) \ - $(use_enable pam) \ - $(use_with pam pam-dir $(getpam_mod_dir)) \ - $(use_enable selinux) \ - $(use_enable ssh-agent) \ - --enable-doc -} - -src_test() { - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die - GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check -} - -pkg_postinst() { - # cap_ipc_lock only needed if building --with-libcap-ng - # Never install as suid root, this breaks dbus activation, see bug #513870 - use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon - gnome2_pkg_postinst - - if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then - ewarn "Please select pinentry-gnome3 as default pinentry provider:" - ewarn " # eselect pinentry set pinentry-gnome3" - fi -} diff --git a/gnome-base/gnome-keyring/metadata.xml b/gnome-base/gnome-keyring/metadata.xml deleted file mode 100644 index f8058de..0000000 --- a/gnome-base/gnome-keyring/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>gn...@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <longdescription lang="en"> - GNOME Keyring is a collection of components in GNOME that store - secrets, passwords, keys, certificates and make them available to - applications. It is integrated with the user's login, so that - their secret storage can be unlocked when the user logins into their - session. It is based around a standard called PKCS#11, which is a - standard way for applications to manage certificates and keys on - smart cards or secure storage. - </longdescription> - <use> - <flag name="ssh-agent">Use GNOME Keyring to unlock SSH keys. - Recommended unless you are using ECDSA or Ed25519 keys.</flag> - </use> -</pkgmetadata>
