summaryrefslogtreecommitdiff
path: root/app-crypt
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-04-15 11:48:08 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-04-15 11:48:08 +0100
commit04fc7f10cec12efb1240344a0090b539e24ad0f3 (patch)
tree130fb059a6b83e95af28b97b0f55c716d48924bf /app-crypt
parent0bec4ab1937eed98ee24e2d48f0cfec46de2fc58 (diff)
gentoo auto-resync : 15:04:2023 - 11:48:08
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/Manifest.gzbin24973 -> 24813 bytes
-rw-r--r--app-crypt/seahorse/Manifest3
-rw-r--r--app-crypt/seahorse/files/seahorse-43.0-clang16.patch35
-rw-r--r--app-crypt/seahorse/seahorse-43.0-r2.ebuild (renamed from app-crypt/seahorse/seahorse-43.0-r1.ebuild)1
-rw-r--r--app-crypt/yubikey-manager/Manifest2
-rw-r--r--app-crypt/yubikey-manager/yubikey-manager-4.0.8-r1.ebuild42
-rw-r--r--app-crypt/yubioath-desktop/Manifest5
-rw-r--r--app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch22
-rw-r--r--app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-qtquickcontrols1.patch10
-rw-r--r--app-crypt/yubioath-desktop/metadata.xml15
-rw-r--r--app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r3.ebuild60
11 files changed, 38 insertions, 157 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 3d2baf42e70f..96648dc2dfea 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
Binary files differ
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 81387ea0503d..f123f185005f 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,5 +1,6 @@
+AUX seahorse-43.0-clang16.patch 1305 BLAKE2B 89fdc92c2efd0e5e17c408e16455116cd02c5a7a0121da84447dedd7849c389fddcc3d1f0e59d11911f50b2d1195e9424c977550a213c47c4b7a39433e6002f1 SHA512 e61e085d198991f41d8d18e40d73db282f6c3f67d8fa3f8baca5d12e07b88990ef4abfcdc34e0a71f2a96c8e105128cebb7d92568d2193c23cbd1b274c9ba4a7
AUX seahorse-43.0-gnupg-2.4.patch 577 BLAKE2B 5e85a1ffbaa044b38f26a9fb2a561e62d71d892d090036d4cdb6a67072c06dd9fcba728c963c2205ae681b8722fe764a22b62b5bf5f2125db66d7e45c20e7f88 SHA512 bdef1c825a2cf407f6fdf4797b9220c69465265072204ea2d07e9c0cd1804e872d5d731a068abf5d40465ae32e2abc05eeebc96913aeba75653849bbd494c59a
AUX seahorse-43.0-musl-stdout.patch 4959 BLAKE2B 2d0990d9f7a5fc7e205d209f4b598e96ac1a09f15fc14bf7f5f51203c124903826d0504f47ed848a1f29ab9af323f4fa65988ea17a701ded95c3e5eac1f021b4 SHA512 5a972e3678c19f294434e788b55f5c0e120a241b2d19de1bac878bf067daff765a6f776607f3a158aecae3a3370280c3b23bdf090d02ee7d53e4b5d28a1e0a69
DIST seahorse-43.0.tar.xz 1392460 BLAKE2B b7ae8b42042ad8e07eaf2633583b566f9757f83bd066eb8b0786d5e89353901f5526ed925bb6152820a5b2a36defb0c0f38dea634c3ae78ebf8d29ab07ff9cfb SHA512 168fdfc829134915f513028b1d35b647aa18a0390786cbf512f7ddb7b125b239f3f3d880a847119a5aa22580354f0b594e553fe3940a3afbda5861e69dd88e5d
-EBUILD seahorse-43.0-r1.ebuild 1781 BLAKE2B f7be61bd1685059d68767ac608d508218f58d3a03bd35c7ff8da7daa3261f2970f9d0d7f1b3f30dae10d7f499e4354357261680390078856a20ddba436bde5a4 SHA512 0034703e480903842c75b8c689df0e9186c0ab5b5b00fdf1668efd65f7916d7eddda413fda912b9aaf31d81a3e65979b9f895907c6094efcd3d5d15c47621f74
+EBUILD seahorse-43.0-r2.ebuild 1815 BLAKE2B f8ebc17892801762b66d424a303da5cea4da93abf18253287d88b1f0cccf42404ed03bdd84ecf0a6332c878cd8e10e038aafba96f0912b668a6c7d4af83b59df SHA512 d7dfa88bbab13ea2ede13fa67f87fb1686319d3ba73de58b2898e8e69537a429abf38133fb1c8b0d5933689f4b77844de4537de7389a91ee190464efe9fb3d56
MISC metadata.xml 874 BLAKE2B 5aa0d587b2dc015d9030160fb1fa89a2fe670a56ecd10972096199deafa321f9c1ded0702c74a27b42224f356a623817beb831f50ab7aeb3e00f8470a72d15a5 SHA512 59d1aa71802cff633f84c2500126dbfb729fb5e1a0f08fad496f53692be2b7c5db7e509a7289ba7521a916ebae13f772e35c6d52f6b2cb6c421134a1caa5bae7
diff --git a/app-crypt/seahorse/files/seahorse-43.0-clang16.patch b/app-crypt/seahorse/files/seahorse-43.0-clang16.patch
new file mode 100644
index 000000000000..c31fc42709e1
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-43.0-clang16.patch
@@ -0,0 +1,35 @@
+https://gitlab.gnome.org/GNOME/seahorse/-/merge_requests/214
+
+From 3887ba07ccab4aa970c24a22a183b97e255e6ece Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Fri, 14 Apr 2023 14:37:23 +0200
+Subject: [PATCH] Avoid C99 incompatibility around
+ seahorse_pkcs11_backend_initialize
+
+Move the prototype for seahorse_pkcs11_backend_initialize into the
+header file, so C code generated from Vala sources will use it.
+This avoids an implicit function declaration during the C-build
+of src/application.vala, and resulting build failures with future
+compilers.
+--- a/pkcs11/seahorse-pkcs11-backend.c
++++ b/pkcs11/seahorse-pkcs11-backend.c
+@@ -43,8 +43,6 @@ enum {
+ PROP_LOADED,
+ };
+
+-void seahorse_pkcs11_backend_initialize (void);
+-
+ static SeahorsePkcs11Backend *pkcs11_backend = NULL;
+
+ struct _SeahorsePkcs11Backend {
+--- a/pkcs11/seahorse-pkcs11-backend.h
++++ b/pkcs11/seahorse-pkcs11-backend.h
+@@ -43,4 +43,6 @@ SeahorsePkcs11Backend * seahorse_pkcs11_backend_get (void);
+ GcrCollection * seahorse_pkcs11_backend_get_writable_tokens (SeahorsePkcs11Backend *self,
+ gulong with_mechanism);
+
++void seahorse_pkcs11_backend_initialize (void);
++
+ #endif /* SEAHORSE_PKCS11_BACKEND_H_ */
+--
+GitLab
diff --git a/app-crypt/seahorse/seahorse-43.0-r1.ebuild b/app-crypt/seahorse/seahorse-43.0-r2.ebuild
index 876b56992f86..54b472f9d3d2 100644
--- a/app-crypt/seahorse/seahorse-43.0-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-43.0-r2.ebuild
@@ -50,6 +50,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-gnupg-2.4.patch
"${FILESDIR}"/${P}-musl-stdout.patch
+ "${FILESDIR}"/${P}-clang16.patch
)
src_prepare() {
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index e4309b1aa612..98d32d872002 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,6 +1,4 @@
-DIST yubikey-manager-4.0.8.tar.gz 147076 BLAKE2B efdefb15c3939bfb2171766aec195fb776668894d4439565840587d14387999e052aee6eb225b9332662f1ebdbf1db24fceb606393e23d591ff61b91c1ee96f5 SHA512 87352bbb133eead48d1588df2db5420687278a9f76ceb283a53af8eab3d29e30c86e01a588a6da2884e6dac6af192ad355a28745f2f8505ef6cd0e96dea3e9c7
DIST yubikey_manager-5.0.1.tar.gz 158829 BLAKE2B 082b7405a6b8049c0086126c8287ab66f5028b121da4aeae81939683ed65cef1a7c59bf545b5e768b18643bd6c0ee759b2897673870344d8f7ab5217413c1a0d SHA512 2e798f8475e52c9091f5cd6ebbd5937eb3f14c49e9c2c9c7eda09c095ac3a1c80065e14f8e9c827c1eee8914ce3c3e21dbb2820a6ac8cefed1306d409cc6a0fc
DIST yubikey_manager-5.0.1.tar.gz.sig 310 BLAKE2B c12b2c6f09be26a3df394cc296fbe28db560f31864a5b46d18021d672947c0d929b56be5cd10fd0347e4bcdeb988a242780b58565eb64163b125752756e5dda1 SHA512 876c47c2b22efd58f801f3bf7110c1896f425090d2454db4eb8214442b5a909b75f6fcf8e581c97806e488bfc6fb306e92274ce1b29be9e3240813944155478f
-EBUILD yubikey-manager-4.0.8-r1.ebuild 1091 BLAKE2B 81bd4c6f18fd9ea41e3764c2cd20b1f2763c59e02ad6694dcb5d461a13e91e8bfc1d6c2fd5e5e7dc62a11880f48fda86f38373b3bd84c09e8a84cf7ef0754404 SHA512 e1e278b190546a842d1a0f679526d0a92ccb69875e7c976e19582798e57721dd2da9436ee10eb759bd04e5904456583a3b95ae75e660770e7916df70739b5e13
EBUILD yubikey-manager-5.0.1.ebuild 1650 BLAKE2B d8deaf437fc53079e3cfaa06b06dc1d83c064bc08a4720d1073a026390a7e17111501e574dd1db02539cf36cc408ad5f9f1397efd289d0406c58801ef0296002 SHA512 cc685555df71bcf7762c8d995be94073dd1615bcbbf75c5ec4c5546ca61ee12df2c44ee4aa2532c63d0a3df747ac87acafb2c6c8fb2fcc8c36f6b3f07af33433
MISC metadata.xml 534 BLAKE2B 1dc91b31fae812c9abf38e762d18db228cf07cb29dc41f5c7928ef417002826acaaabaa3b1374433f9fdfc251b5f5fbabbc43e66e3b94cc6df3174d3ae5aa059 SHA512 cf47e3400679f7f4feb73ef3b8282d3f4dae6b6d0e5034cbc22935fd0196be0784946bf9ac93dea7fb36a16347f867d092845c1ce3528a00c704de9657ad3821
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.8-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.8-r1.ebuild
deleted file mode 100644
index c1c671051c91..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.8-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_PEP517=poetry
-
-inherit distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
-# the official source for tarballs, not Github
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="ssl"
-
-# app-crypt/ccid required for
-# - 'ykman oath'
-# - 'ykman openpgp'
-# - 'ykman piv'
-RDEPEND="
- app-crypt/ccid
- dev-python/click[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
- dev-python/pyscard[${PYTHON_USEDEP}]
- ssl? ( >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] )"
-BDEPEND="test? (
- dev-python/makefun[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
- distutils-r1_python_install_all
- doman man/ykman.1
-}
diff --git a/app-crypt/yubioath-desktop/Manifest b/app-crypt/yubioath-desktop/Manifest
deleted file mode 100644
index 08ac0f13396b..000000000000
--- a/app-crypt/yubioath-desktop/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX yubioath-desktop-5.1.0-bin-installdir.patch 548 BLAKE2B 3ba3286ace20e64dd543f377631dcbc30e2e83c52a9e62954518ab06cbef1609d559092f49fefaa4f37316bab793511712e52817107d1e98b66843cd2cb88038 SHA512 d570d4484ea394413fa365a5a2e29a32a54adf703f83ca918ec0eef474adda9e95f7ab0048e2977f11066bd6884567e50c3787ddb1d3c356df6eeee8d9fafd17
-AUX yubioath-desktop-5.1.0-qtquickcontrols1.patch 263 BLAKE2B cbb8ff839df0ff5a821a47fe0d27c2e2e8d0ce55a137e36ba270242bbfc79d0190cdd4bbcf6b20bc0a3a5170ab790a172871c41b635300721209b50a0a9826b4 SHA512 5c51737ddb2c59e01212418035cedcf1df17fa065a11b38a9a6a32b5bc5e3fb04ac99eb8a9128c9e258d39f3974ca0cff4276c59bc49d531b4a40b5acd3afdd1
-DIST yubioath-desktop-5.1.0.tar.gz 6322224 BLAKE2B e1fc93bd38af3c6937f390c738248e43dbd17052df5103a0e25547adf7b34eca60ed8b45c9681568202d01802a5d8503cf2a5bf53d57c7c18ee2ee53cecd8d51 SHA512 152e27fca3c082c996c96fb05ed66781a52a47f30d8c5649d43937cf87c566f09c1fcb6afd65402b5f7fbe2a1f71872f10c8b456bd8a9b240c360018defd48c9
-EBUILD yubioath-desktop-5.1.0-r3.ebuild 1397 BLAKE2B 0ebb1105031f83931582db262d1947ab8d8354afd28e5ab66ffbaa3441d4171eaed7692fcbb7b184f286b659266850c81eefa3a1d96fa2cda95d3689c90bcce7 SHA512 d7e50f534ba80db3e7d6fbdebaed370c60a08ed96a09f1e2d40214709c4793bb73ea7ec5c1c2a0f46e6df3a5561271db7aecdfab57afd9282570e671c0180594
-MISC metadata.xml 439 BLAKE2B ec9d98e0cbdf2325a27af35087517196863c02dc25c9cf5da2a88f183b7e5fea9d584248f0baa8d51dd364174ff1082d87433df0802b224f35e9f208dbff9d55 SHA512 1715923b5a0a10c5dadfc931eb8e3bc4487ff3d4354501b495eafd01f76e2349b926e7d69b55f9c16d802aed539b5daa995b203431576c4e3865e49aa98a874d
diff --git a/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch b/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch
deleted file mode 100644
index 749533ba31ba..000000000000
--- a/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 9ae1ef710d5b070e128597a0fad3bd4ffa94b0aa Mon Sep 17 00:00:00 2001
-From: Dennis Fokin <Dennis.Fokin@yubico.com>
-Date: Thu, 7 Oct 2021 10:18:33 +0200
-Subject: [PATCH] Set correct install path
-
----
- yubioath-desktop.pro | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/yubioath-desktop.pro b/yubioath-desktop.pro
-index 551416ae..c0ef9bb1 100644
---- a/yubioath-desktop.pro
-+++ b/yubioath-desktop.pro
-@@ -75,6 +75,8 @@ lupdate_only {
- qml/slot/*.qml
- }
-
-+# Set correct install path
-+target.path = $$PREFIX/bin
-
- DISTFILES += \
- py/* \
diff --git a/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-qtquickcontrols1.patch b/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-qtquickcontrols1.patch
deleted file mode 100644
index f5d80643bf84..000000000000
--- a/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-qtquickcontrols1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/qml/NewCredentialView.qml
-+++ b/qml/NewCredentialView.qml
-@@ -3,7 +3,6 @@
- import QtQuick.Layouts 1.3
- import QtQuick.Controls.Material 2.2
- import QtGraphicalEffects 1.0
--import QtQuick.Dialogs 1.2
- import Qt.labs.platform 1.0
- import QtQuick.Window 2.2
-
diff --git a/app-crypt/yubioath-desktop/metadata.xml b/app-crypt/yubioath-desktop/metadata.xml
deleted file mode 100644
index e3ffb2c669e2..000000000000
--- a/app-crypt/yubioath-desktop/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>soap@gentoo.org</email>
- <name>David Seifert</name>
- </maintainer>
- <maintainer type="person">
- <email>marecki@gentoo.org</email>
- <name>Marek Szuba</name>
- </maintainer>
- <upstream>
- <remote-id type="github">Yubico/yubioath-desktop</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r3.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r3.ebuild
deleted file mode 100644
index 71795479f0b7..000000000000
--- a/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="Library and tool for personalization of Yubico's YubiKey NEO"
-HOMEPAGE="
- https://developers.yubico.com/yubioath-desktop/
- https://github.com/Yubico/yubioath-desktop"
-SRC_URI="https://github.com/Yubico/yubioath-desktop/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- ${PYTHON_DEPS}
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtquickcontrols2:5
- dev-qt/qtdeclarative:5
- dev-qt/qtmultimedia:5
- dev-qt/qtwidgets:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- x11-libs/libdrm"
-RDEPEND="${DEPEND}
- $(python_gen_cond_dep '
- >=app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]
- <app-crypt/yubikey-manager-5.0.0[${PYTHON_USEDEP}]
- ')
- dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}"/${P}-bin-installdir.patch
- "${FILESDIR}"/${P}-qtquickcontrols1.patch
-)
-
-src_prepare() {
- default
- python_fix_shebang "${S}"
-}
-
-src_configure() {
- eqmake5 yubioath-desktop.pro
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- domenu resources/com.yubico.yubioath.desktop
- doicon resources/icons/com.yubico.yubioath.png
- doicon -s scalable resources/icons/com.yubico.yubioath.svg
-}