diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-03-17 06:49:08 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-03-17 06:49:08 +0000 |
| commit | 2bf68d7062b64d9f815f3b8ce6942a66afe53b0d (patch) | |
| tree | ac1e773aaa4d3575d18d178ae260cab963bbf64c /gnome-base | |
| parent | cd356b722fd8d162f02a5059fae1a66e00be52e3 (diff) | |
gentoo auto-resync : 17:03:2024 - 06:49:08
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/Manifest.gz | bin | 4718 -> 4720 bytes | |||
| -rw-r--r-- | gnome-base/gnome-keyring/Manifest | 3 | ||||
| -rw-r--r-- | gnome-base/gnome-keyring/files/gnome-keyring-42.1-c99.patch | 40 | ||||
| -rw-r--r-- | gnome-base/gnome-keyring/gnome-keyring-42.1-r2.ebuild | 4 |
4 files changed, 46 insertions, 1 deletions
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz Binary files differindex fb61c2d23de8..89be9d8d6ad3 100644 --- a/gnome-base/Manifest.gz +++ b/gnome-base/Manifest.gz diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest index dd9dd31d9801..29b8ba89f030 100644 --- a/gnome-base/gnome-keyring/Manifest +++ b/gnome-base/gnome-keyring/Manifest @@ -1,3 +1,4 @@ +AUX gnome-keyring-42.1-c99.patch 2141 BLAKE2B 4eb182721490c785e5d7425243d30b9240183b575d6f10ab85deff917831f595c4a750af8c769daa2056891a5c80fca79ad5397188169a647b18339be01a8f02 SHA512 772f6408c77ef83c3abfb4eb17c370603b0dc549bc306baf7cb7e1a4f4c14011bb03b3f0a41b34ab0bc4919464984d1b3bc46d816a000e4fbcd8c5d388383cb1 DIST gnome-keyring-42.1.tar.xz 1346284 BLAKE2B ff6093cc16c649cda1e6cc2848c2198a502d8aa20a56f0a4dca00550e99f18820028427a7ec3979b6871648a7931da19fced3210558d5ca3de47983b7c94452d SHA512 560dc409c21768dcbdf42151986a5bbbfb9a092d2c36295cf76bd603cdf9650fa80670631c7fb8b3e1822bed6a1f55c34b2170a1419ce45fbe8ca08c7eaf3a57 -EBUILD gnome-keyring-42.1-r2.ebuild 2241 BLAKE2B 2120b1f2481d7e09e89f8908e6e504242d3d9519c6319cb06d7510e6a13c65cd3337487da37dca7dc258ce854443ef87a0a562d32f89c7e7cd5931130cd9962f SHA512 9fbbf63046846bbc4fc6c3c1384ecf6c75650072d7cbdb1d0bda61c986fe05eef829d6d9a66d2da53619a148ba006b55ceae519b73a64af61ff875bc7a3c54ba +EBUILD gnome-keyring-42.1-r2.ebuild 2298 BLAKE2B 817a58d35bbf36a0143783288ec4a159cd48e184fa04b369167cd09ae4e515d23ef2655d174eb24a3e91db4d8ca83d39ea1d3209fec6a10d97566e1875652bb9 SHA512 d5a674d995e79177579d249432d77e4d02fd76fd370841dd9509cafca4d22a02c33cf24f65e4c92e1a0f7598c4c8bacc9b736f2f94357f0d7fb521ee3f4b04a9 MISC metadata.xml 1001 BLAKE2B 276e415289b39f9c75fc156ad695644c5393dff0c689ceacc5c82c2ebee5c4840433966cacb208cff72bcbe6d16a58eea9d59dd75a14839cd2a99cbfa7963ac2 SHA512 7e7e35356506cc0308b7ef42115da4291d6b379094117a516637404ee448d64f5c3477c812c91c7a1cc7e849efed28b67f9a747c303154a9664e5472a558b7c7 diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-42.1-c99.patch b/gnome-base/gnome-keyring/files/gnome-keyring-42.1-c99.patch new file mode 100644 index 000000000000..3dfd578b7407 --- /dev/null +++ b/gnome-base/gnome-keyring/files/gnome-keyring-42.1-c99.patch @@ -0,0 +1,40 @@ +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 diff --git a/gnome-base/gnome-keyring/gnome-keyring-42.1-r2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-42.1-r2.ebuild index 5cce53f7b4df..a2696c83bd79 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-42.1-r2.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-42.1-r2.ebuild @@ -40,6 +40,10 @@ BDEPEND=" test? ( ${PYTHON_DEPS} ) " +PATCHES=( + "${FILESDIR}"/gnome-keyring-42.1-c99.patch +) + pkg_setup() { use test && python-any-r1_pkg_setup } |