mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
gnome-base/gnome-keyring: drop 42.1-r2
Signed-off-by: Pacho Ramos <pacho@gentoo.org>
This commit is contained in:
Pacho Ramos
@@ -1,2 +1 @@
|
||||
DIST gnome-keyring-42.1.tar.xz 1346284 BLAKE2B ff6093cc16c649cda1e6cc2848c2198a502d8aa20a56f0a4dca00550e99f18820028427a7ec3979b6871648a7931da19fced3210558d5ca3de47983b7c94452d SHA512 560dc409c21768dcbdf42151986a5bbbfb9a092d2c36295cf76bd603cdf9650fa80670631c7fb8b3e1822bed6a1f55c34b2170a1419ce45fbe8ca08c7eaf3a57
|
||||
DIST gnome-keyring-46.2.tar.xz 1359500 BLAKE2B 47dad5b1eab387e600016828c99d7c829f509e9929e0e06d6427f6c84053050be1e79c4fb369caa1cdfc862e20677a518155b1a5496a64e118f461e81b60edcd SHA512 4229ca0606bdd1b84a3c737288df7f1fc1f8715734e3001964babd882201c3d818deabb3a7662dbf9b67316f03b234de84da3128fb991a500ef8305c2f962ba2
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
https://bugs.gentoo.org/922630
|
||||
https://gitlab.gnome.org/GNOME/gnome-keyring/-/commit/f298c87e14e89656992ccfd17b133f4f2ab9c5ea
|
||||
|
||||
From f298c87e14e89656992ccfd17b133f4f2ab9c5ea Mon Sep 17 00:00:00 2001
|
||||
From: Yaakov Selkowitz <yselkowi@redhat.com>
|
||||
Date: Wed, 24 Jan 2024 14:01:06 -0500
|
||||
Subject: [PATCH] gkm: fix test-sexp with GCC 14
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
pkcs11/gkm/test-sexp.c: In function ‘test_sign_verify’:
|
||||
pkcs11/gkm/test-sexp.c:231:92: error: passing argument 6 of ‘gkm_crypto_sign_xsa’ from incompatible pointer type [-Wincompatible-pointer-types]
|
||||
In file included from pkcs11/gkm/test-sexp.c:31:
|
||||
./pkcs11/gkm/gkm-crypto.h:92:86: note: expected ‘CK_ULONG_PTR’ {aka ‘long unsigned int *’} but argument is of type ‘gsize *’ {aka ‘unsigned int *’}
|
||||
pkcs11/gkm/test-sexp.c:251:87: error: passing argument 6 of ‘gkm_crypto_sign_xsa’ from incompatible pointer type [-Wincompatible-pointer-types]
|
||||
./pkcs11/gkm/gkm-crypto.h:92:86: note: expected ‘CK_ULONG_PTR’ {aka ‘long unsigned int *’} but argument is of type ‘gsize *’ {aka ‘unsigned int *’}
|
||||
pkcs11/gkm/test-sexp.c:271:91: error: passing argument 6 of ‘gkm_crypto_sign_xsa’ from incompatible pointer type [-Wincompatible-pointer-types]
|
||||
./pkcs11/gkm/gkm-crypto.h:92:86: note: expected ‘CK_ULONG_PTR’ {aka ‘long unsigned int *’} but argument is of type ‘gsize *’ {aka ‘unsigned int *’}
|
||||
|
||||
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
|
||||
--- a/pkcs11/gkm/test-sexp.c
|
||||
+++ b/pkcs11/gkm/test-sexp.c
|
||||
@@ -221,10 +221,10 @@ test_sign_verify (Test *test, gconstpointer unused)
|
||||
{
|
||||
gcry_sexp_t pubkey = NULL;
|
||||
gboolean ret;
|
||||
- guchar data[] = TEST_DATA;
|
||||
- guchar data_size = TEST_DATA_SIZE;
|
||||
- guchar signature[128];
|
||||
- gsize signature_size = 128;
|
||||
+ CK_BYTE data[] = TEST_DATA;
|
||||
+ CK_ULONG data_size = TEST_DATA_SIZE;
|
||||
+ CK_BYTE signature[128];
|
||||
+ CK_ULONG signature_size = 128;
|
||||
|
||||
/* RSA */
|
||||
/* sign some data */
|
||||
--
|
||||
GitLab
|
||||
@@ -1,88 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
|
||||
inherit 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="pam selinux +ssh-agent systemd test valgrind"
|
||||
RESTRICT="!test? ( test )"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
|
||||
RDEPEND="
|
||||
>=app-crypt/gcr-3.27.90:0=[gtk]
|
||||
>=app-crypt/gnupg-2.0.28:=
|
||||
>=app-eselect/eselect-pinentry-0.5
|
||||
app-misc/ca-certificates
|
||||
>=dev-libs/glib-2.44:2
|
||||
>=dev-libs/libgcrypt-1.2.2:0=
|
||||
pam? ( sys-libs/pam )
|
||||
selinux? ( sec-policy/selinux-gnome )
|
||||
ssh-agent? ( virtual/openssh )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
valgrind? ( dev-debug/valgrind )
|
||||
"
|
||||
BDEPEND="
|
||||
>=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} )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/gnome-keyring-42.1-c99.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 \
|
||||
--without-libcap-ng \
|
||||
$(use_enable pam) \
|
||||
$(use_with pam pam-dir $(getpam_mod_dir)) \
|
||||
$(use_enable selinux) \
|
||||
$(use_enable ssh-agent) \
|
||||
$(use_with systemd) \
|
||||
$(use_enable valgrind) \
|
||||
--enable-doc
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Needs dbus-run-session to not get:
|
||||
# ERROR: test-dbus-search process failed: -6
|
||||
"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
|
||||
GSETTINGS_SCHEMA_DIR="${S}/schema" virtx dbus-run-session emake check
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# cap_ipc_lock only needed if building --with-libcap-ng, but that breaks with glib-2.70
|
||||
# Never install as suid root, this breaks dbus activation, see bug #513870
|
||||
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
|
||||
}
|
||||
Reference in New Issue
Block a user