[gentoo-commits] proj/musl:master commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/
commit: 95f41dd2bc08fda4f634f338ab74a73a996f9356
Author: Michael Everitt veremit xyz>
AuthorDate: Sun Apr 19 00:28:47 2020 +
Commit: Jory Pratt gentoo org>
CommitDate: Sun Apr 19 13:10:28 2020 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=95f41dd2
Fixed in ::gentoo, v3.31.91, commit d91ec7bf4ecbbfcdb7a4cb7889c33ed6cd7c2519
Signed-off-by: Michael Everitt veremit.xyz>
Signed-off-by: Jory Pratt 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..000
--- 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..000
---
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.0 -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
- #include
-+#include
-
- #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..000
--- 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
[gentoo-commits] proj/musl:master commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/
commit: c953aa1e70692f4b0bc89135fd3b9ba3879a8e48
Author: Anthony G. Basile blueness AT gentoo DOT org
AuthorDate: Sat Jul 18 22:48:02 2015 +
Commit: Anthony G. Basile blueness AT gentoo DOT org
CommitDate: Sat Jul 18 22:57:30 2015 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=c953aa1e
gnome-base/gnome-keyring: add missing sys/select.h
gnome-base/gnome-keyring/Manifest | 4 ++
...nome-keyring-3.14.0-musl-add-sys_select_h.patch | 11
.../gnome-keyring/gnome-keyring-3.14.0-r99.ebuild | 77 ++
gnome-base/gnome-keyring/metadata.xml | 18 +
4 files changed, 110 insertions(+)
diff --git a/gnome-base/gnome-keyring/Manifest
b/gnome-base/gnome-keyring/Manifest
new file mode 100644
index 000..00d0cb4
--- /dev/null
+++ b/gnome-base/gnome-keyring/Manifest
@@ -0,0 +1,4 @@
+AUX gnome-keyring-3.14.0-musl-add-sys_select_h.patch 504 SHA256
17abd3f7674e162c69ff0fe0138271403c4b8a67595866fff5a3272a6001ad0e SHA512
1b809e0529ad86719b6409cfb83f88bb8529c5da3ede71d5353a26123206183c05e96297c8f14658654906c9ed14505d32c6a6ef9184cc59e39877450dc81274
WHIRLPOOL
b29265de7e3129bdc458c08555051c4884a800c09fb3c6e2211cf3e708c137f637a7d3d741fadeafd68a2313d26e584f9f8203743e96ccfaf62ace7759d21253
+DIST gnome-keyring-3.14.0.tar.xz 1172092 SHA256
c7059516cc47192e8bc5f1095e8e57cd3388825a4584ea8ad67a97763b7c9040 SHA512
5f8e1cd636e6293efe2b70e981efe80adc22152531530ace8d704fc2f7596c3502ff8a8ffdb1b15fa69d642d04eabd875761588f13269847116fd72416596be8
WHIRLPOOL
b6913bd252697cf8822c51a93aef2501c32ed5d128947e137730d7a16722f4806e0dcefc5b452ff01a55d26a4e53126dfdba368a093f106cb13ec97ebdb58723
+EBUILD gnome-keyring-3.14.0-r99.ebuild 2092 SHA256
707cb7da895764d376ec3c26d4f9738664b452f68f827018dd6741478ab6f901 SHA512
77b6f707a509b9e477682cbe708cd981a6b8b079e67d88736cfb83e5049163746009b42f2f70f4298f591a004fb6d7fc1af9a6db80f2ce805d7c62251d77b1aa
WHIRLPOOL
d451e0bba41c5cbbe6dcc892c46f166ecf30342eaafa8ee0dfe319afd9880fc05d47ff4668652206644ff8e5c7255cbbc5f5f87a92e8e215c4ac609daf916132
+MISC metadata.xml 789 SHA256
77bcb7e0dbc7721e5491732fb92fba7473e9ae9b17725842270c75fe12124e5c SHA512
802568250f4e486d06a5b724deee4bc1aeab25348d58df62a37ab82f61c56ef47d69fdd853bf7ad4fcd9ce4cd8cbf174c86c1f1f6f96dc145fa40a5aaf22d299
WHIRLPOOL
6af3afe8de8b38ff7ff6a14a0fad9bc89ba498164c112a1adcbdc721d41d7e2651ddaf94de11a072eed951255f55866f8d74c813cde0f2a0db18fb7e44f945a2
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
new file mode 100644
index 000..f6f2513
--- /dev/null
+++
b/gnome-base/gnome-keyring/files/gnome-keyring-3.14.0-musl-add-sys_select_h.patch
@@ -0,0 +1,11 @@
+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.0 -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.14.0-r99.ebuild
b/gnome-base/gnome-keyring/gnome-keyring-3.14.0-r99.ebuild
new file mode 100644
index 000..c5b2cf5
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.14.0-r99.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
/var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.14.0.ebuild,v
1.9 2015/07/17 15:33:40 ago Exp $
+
+EAPI=5
+GCONF_DEBUG=yes # Not gnome macro but similar
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils 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 debug pam selinux +ssh-agent test
+KEYWORDS=~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh ~sparc x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris
~x86-solaris
+
+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=
+ =sys-apps/dbus-1.1.1
+ caps? ( sys-libs/libcap-ng )
+ pam? ( virtual/pam )
+
+DEPEND=${RDEPEND}
+ app-text/docbook-xml-dtd:4.3
+ dev-libs/libxslt
+ =dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? ( ${PYTHON_DEPS} )
+
+
+pkg_setup() {
+ use test python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch ${FILESDIR}/${P}-musl-add-sys_select_h.patch
+
+ # Disable stupid CFLAGS
+ sed -e 's/CFLAGS=$CFLAGS -g//' \
+
