From c1dd116fd7d64adeb202b33458150beb613452c1 Mon Sep 17 00:00:00 2001 From: Sun Yuechi Date: Sun, 17 May 2026 14:40:44 +0800 Subject: [PATCH 01/11] SPECS: keepalived: Remove duplicate BuildRequires. Signed-off-by: Sun Yuechi --- SPECS/keepalived/keepalived.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/SPECS/keepalived/keepalived.spec b/SPECS/keepalived/keepalived.spec index 14ccccc639..5294299da4 100644 --- a/SPECS/keepalived/keepalived.spec +++ b/SPECS/keepalived/keepalived.spec @@ -21,7 +21,7 @@ Summary: High Availability monitor for LVS and VRRP License: GPL-2.0-or-later URL: http://www.keepalived.org/ VCS: git:https://github.com/acassen/keepalived -#!RemoteAsset +#!RemoteAsset: sha256:85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6 Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service BuildSystem: autotools @@ -53,11 +53,10 @@ BuildOption(build): STRIP=/bin/true %if %{with snmp} BuildRequires: pkgconfig(netsnmp) %endif -%if %{with nftables} BuildRequires: pkgconfig(libmnl) +%if %{with nftables} BuildRequires: pkgconfig(libnftnl) %else -BuildRequires: pkgconfig(libmnl) BuildRequires: pkgconfig(xtables) %endif BuildRequires: gcc @@ -117,4 +116,4 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog -%{?autochangelog} +%autochangelog From b54327f1ecc7bc7b533640b540449c0097899b59 Mon Sep 17 00:00:00 2001 From: Sun Yuechi Date: Sun, 17 May 2026 14:41:14 +0800 Subject: [PATCH 02/11] SPECS: qt6-qtquick3d: Remove duplicate Requires. Signed-off-by: Sun Yuechi --- SPECS/qt6-qtquick3d/qt6-qtquick3d.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/SPECS/qt6-qtquick3d/qt6-qtquick3d.spec b/SPECS/qt6-qtquick3d/qt6-qtquick3d.spec index fe99065638..e80e1d7e79 100644 --- a/SPECS/qt6-qtquick3d/qt6-qtquick3d.spec +++ b/SPECS/qt6-qtquick3d/qt6-qtquick3d.spec @@ -62,7 +62,6 @@ The Qt 6 Quick3D library. Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig(Qt6Gui) -Requires: qt6-qtquick3d Requires: pkgconfig(Qt6Quick) %description devel From 991ac80b3c20c317ce9332a6a1168893950516d6 Mon Sep 17 00:00:00 2001 From: Sun Yuechi Date: Sun, 17 May 2026 14:41:28 +0800 Subject: [PATCH 03/11] SPECS: python-groovy: Fix description. The description was accidentally copy-pasted from python-safehttpx. Signed-off-by: Sun Yuechi --- SPECS/python-groovy/python-groovy.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SPECS/python-groovy/python-groovy.spec b/SPECS/python-groovy/python-groovy.spec index 72d5115f7b..36609202a0 100644 --- a/SPECS/python-groovy/python-groovy.spec +++ b/SPECS/python-groovy/python-groovy.spec @@ -26,8 +26,7 @@ Provides: python3-%{srcname} = %{version}-%{release} %python_provide python3-%{srcname} %description -A small Python library created to help developers protect their -applications from Server Side Request Forgery (SSRF) attacks. +Groovy is a Python-to-JavaScript transpiler. %generate_buildrequires %pyproject_buildrequires From 5d0f8b5429aa0d54a472555f90c37d4ace65fde3 Mon Sep 17 00:00:00 2001 From: Sun Yuechi Date: Sun, 17 May 2026 14:41:33 +0800 Subject: [PATCH 04/11] SPECS: python-aiosignal: Fix description. The description was accidentally copy-pasted from python-frozenlist. Signed-off-by: Sun Yuechi --- SPECS/python-aiosignal/python-aiosignal.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SPECS/python-aiosignal/python-aiosignal.spec b/SPECS/python-aiosignal/python-aiosignal.spec index ec4fb7d47a..edcec656fa 100644 --- a/SPECS/python-aiosignal/python-aiosignal.spec +++ b/SPECS/python-aiosignal/python-aiosignal.spec @@ -29,8 +29,9 @@ Provides: python3-%{srcname} = %{version}-%{release} %python_provide python3-%{srcname} %description -FrozenList is a list-like structure which implements -collections.abc.MutableSequence, and which can be made immutable. +aiosignal is a library that provides a Signal class for registering +and dispatching asynchronous callbacks. It is used by aiohttp and +other asyncio-based projects to manage lists of callable handlers. %generate_buildrequires %pyproject_buildrequires From f65568f913d09882566c98ebb944d3da240a3289 Mon Sep 17 00:00:00 2001 From: Sun Yuechi Date: Sun, 17 May 2026 14:41:53 +0800 Subject: [PATCH 05/11] SPECS: python-expandvars: Fix URL. The URL was accidentally copy-pasted from python-yarl. Signed-off-by: Sun Yuechi --- SPECS/python-expandvars/python-expandvars.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/python-expandvars/python-expandvars.spec b/SPECS/python-expandvars/python-expandvars.spec index 1407ac2f7c..963331f66d 100644 --- a/SPECS/python-expandvars/python-expandvars.spec +++ b/SPECS/python-expandvars/python-expandvars.spec @@ -11,7 +11,7 @@ Version: 1.1.2 Release: %autorelease Summary: Expand system variables Unix style License: MIT -URL: https://github.com/aio-libs/yarl +URL: https://github.com/sayanarijit/expandvars #!RemoteAsset: sha256:6c5822b7b756a99a356b915dd1267f52ab8a4efaa135963bd7f4bd5d368f71d7 Source0: https://files.pythonhosted.org/packages/source/e/%{srcname}/%{srcname}-%{version}.tar.gz BuildArch: noarch From e762d197c2337466be3f90c15f320c9f12e5f983 Mon Sep 17 00:00:00 2001 From: Sun Yuechi Date: Sun, 17 May 2026 14:42:03 +0800 Subject: [PATCH 06/11] SPECS: opensc: Remove unused patches. Signed-off-by: Sun Yuechi --- .../opensc/0003-opensc-0.26.1-compiler.patch | 337 ------------------ .../0004-opensc-0.26.1-bash-completion.patch | 28 -- 2 files changed, 365 deletions(-) delete mode 100644 SPECS/opensc/0003-opensc-0.26.1-compiler.patch delete mode 100644 SPECS/opensc/0004-opensc-0.26.1-bash-completion.patch diff --git a/SPECS/opensc/0003-opensc-0.26.1-compiler.patch b/SPECS/opensc/0003-opensc-0.26.1-compiler.patch deleted file mode 100644 index 6a60196cd2..0000000000 --- a/SPECS/opensc/0003-opensc-0.26.1-compiler.patch +++ /dev/null @@ -1,337 +0,0 @@ -diff --git a/src/libopensc/card-epass2003.c b/src/libopensc/card-epass2003.c -index 14d389a43..0650b1d48 100644 ---- a/src/libopensc/card-epass2003.c -+++ b/src/libopensc/card-epass2003.c -@@ -3046,11 +3046,14 @@ epass2003_erase_card(struct sc_card *card) - { - static const unsigned char install_magic_pin[26] = { - /* compare install_secret_key */ -- 0x06,0x01,0x10,0x16, 0x16,0x16,0x00,0x0f, 0xff,0x66, -- 0x31,0x32,0x33,0x34, 0x35,0x36,0x37,0x38, -- 0x31,0x32,0x33,0x34, 0x35,0x36,0x37,0x38, -+ 0x06, 0x01, 0x10, 0x16, 0x16, 0x16, 0x00, 0x0f, 0xff, 0x66, -+ 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, -+ 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, -+ }; -+ static const unsigned char magic_pin[16] = { -+ 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, -+ 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, - }; -- static const unsigned char magic_pin[16] = "1234567812345678"; - static const unsigned char mf_path[2] = { 0x3f, 0x00 }; - sc_apdu_t apdu; - int r; -diff --git a/src/libopensc/card-piv.c b/src/libopensc/card-piv.c -index 81a1ad541..573d0bae5 100644 ---- a/src/libopensc/card-piv.c -+++ b/src/libopensc/card-piv.c -@@ -604,143 +604,143 @@ struct piv_object { - static const struct piv_object piv_objects[] = { - { PIV_OBJ_CCC, "Card Capability Container", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.1.219.0", 3, "\x5F\xC1\x07", "\xDB\x00", PIV_OBJECT_NEEDS_VCI}, -+ "2.16.840.1.101.3.7.1.219.0", 3, {0x5F, 0xC1, 0x07}, {0xDB, 0x00}, PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_CHUI, "Card Holder Unique Identifier", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.48.0", 3, "\x5F\xC1\x02", "\x30\x00", 0}, -+ "2.16.840.1.101.3.7.2.48.0", 3, {0x5F, 0xC1, 0x02}, {0x30, 0x00}, 0}, - { PIV_OBJ_X509_PIV_AUTH, "X.509 Certificate for PIV Authentication", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.1.1", 3, "\x5F\xC1\x05", "\x01\x01", PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI} , -+ "2.16.840.1.101.3.7.2.1.1", 3, {0x5F, 0xC1, 0x05}, {0x01, 0x01}, PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI} , - { PIV_OBJ_CHF, "Card Holder Fingerprints", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.96.16", 3, "\x5F\xC1\x03", "\x60\x10", PIV_OBJECT_NEEDS_PIN | PIV_OBJECT_NEEDS_VCI}, -+ "2.16.840.1.101.3.7.2.96.16", 3, {0x5F, 0xC1, 0x03}, {0x60, 0x10}, PIV_OBJECT_NEEDS_PIN | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_PI, "Printed Information", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.48.1", 3, "\x5F\xC1\x09", "\x30\x01", PIV_OBJECT_NEEDS_PIN | PIV_OBJECT_NEEDS_VCI}, -+ "2.16.840.1.101.3.7.2.48.1", 3, {0x5F, 0xC1, 0x09}, {0x30, 0x01}, PIV_OBJECT_NEEDS_PIN | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_CHFI, "Cardholder Facial Images", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.96.48", 3, "\x5F\xC1\x08", "\x60\x30", PIV_OBJECT_NEEDS_PIN | PIV_OBJECT_NEEDS_VCI}, -+ "2.16.840.1.101.3.7.2.96.48", 3, {0x5F, 0xC1, 0x08}, {0x60, 0x30}, PIV_OBJECT_NEEDS_PIN | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_X509_DS, "X.509 Certificate for Digital Signature", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.1.0", 3, "\x5F\xC1\x0A", "\x01\x00", PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, -+ "2.16.840.1.101.3.7.2.1.0", 3, {0x5F, 0xC1, 0x0A}, {0x01, 0x00}, PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_X509_KM, "X.509 Certificate for Key Management", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.1.2", 3, "\x5F\xC1\x0B", "\x01\x02", PIV_OBJECT_TYPE_CERT}, -+ "2.16.840.1.101.3.7.2.1.2", 3, {0x5F, 0xC1, 0x0B}, {0x01, 0x02}, PIV_OBJECT_TYPE_CERT}, - { PIV_OBJ_X509_CARD_AUTH, "X.509 Certificate for Card Authentication", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.5.0", 3, "\x5F\xC1\x01", "\x05\x00", PIV_OBJECT_TYPE_CERT}, -+ "2.16.840.1.101.3.7.2.5.0", 3, {0x5F, 0xC1, 0x01}, {0x05, 0x00}, PIV_OBJECT_TYPE_CERT}, - { PIV_OBJ_SEC_OBJ, "Security Object", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.144.0", 3, "\x5F\xC1\x06", "\x90\x00", PIV_OBJECT_NEEDS_VCI}, -+ "2.16.840.1.101.3.7.2.144.0", 3, {0x5F, 0xC1, 0x06}, {0x90, 0x00}, PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_DISCOVERY, "Discovery Object", - SC_ASN1_APP | SC_ASN1_CONS | 0x1E, -- "2.16.840.1.101.3.7.2.96.80", 1, "\x7E", "\x60\x50", 0}, -+ "2.16.840.1.101.3.7.2.96.80", 1, {0x7E}, {0x60, 0x50}, 0}, - { PIV_OBJ_HISTORY, "Key History Object", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.96.96", 3, "\x5F\xC1\x0C", "\x60\x60", PIV_OBJECT_NEEDS_VCI}, -+ "2.16.840.1.101.3.7.2.96.96", 3, {0x5F, 0xC1, 0x0C}, {0x60, 0x60}, PIV_OBJECT_NEEDS_VCI}, - - /* 800-73-3, 21 new objects, 20 history certificates */ - { PIV_OBJ_RETIRED_X509_1, "Retired X.509 Certificate for Key Management 1", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.1", 3, "\x5F\xC1\x0D", "\x10\x01", -+ "2.16.840.1.101.3.7.2.16.1", 3, {0x5F, 0xC1, 0x0D}, {0x10, 0x01}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_2, "Retired X.509 Certificate for Key Management 2", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.2", 3, "\x5F\xC1\x0E", "\x10\x02", -+ "2.16.840.1.101.3.7.2.16.2", 3, {0x5F, 0xC1, 0x0E}, {0x10, 0x02}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_3, "Retired X.509 Certificate for Key Management 3", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.3", 3, "\x5F\xC1\x0F", "\x10\x03", -+ "2.16.840.1.101.3.7.2.16.3", 3, {0x5F, 0xC1, 0x0F}, {0x10, 0x03}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_4, "Retired X.509 Certificate for Key Management 4", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.4", 3, "\x5F\xC1\x10", "\x10\x04", -+ "2.16.840.1.101.3.7.2.16.4", 3, {0x5F, 0xC1, 0x10}, {0x10, 0x04}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_5, "Retired X.509 Certificate for Key Management 5", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.5", 3, "\x5F\xC1\x11", "\x10\x05", -+ "2.16.840.1.101.3.7.2.16.5", 3, {0x5F, 0xC1, 0x11}, {0x10, 0x05}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_6, "Retired X.509 Certificate for Key Management 6", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.6", 3, "\x5F\xC1\x12", "\x10\x06", -+ "2.16.840.1.101.3.7.2.16.6", 3, {0x5F, 0xC1, 0x12}, {0x10, 0x06}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_7, "Retired X.509 Certificate for Key Management 7", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.7", 3, "\x5F\xC1\x13", "\x10\x07", -+ "2.16.840.1.101.3.7.2.16.7", 3, {0x5F, 0xC1, 0x13}, {0x10, 0x07}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_8, "Retired X.509 Certificate for Key Management 8", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.8", 3, "\x5F\xC1\x14", "\x10\x08", -+ "2.16.840.1.101.3.7.2.16.8", 3, {0x5F, 0xC1, 0x14}, {0x10, 0x08}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_9, "Retired X.509 Certificate for Key Management 9", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.9", 3, "\x5F\xC1\x15", "\x10\x09", -+ "2.16.840.1.101.3.7.2.16.9", 3, {0x5F, 0xC1, 0x15}, {0x10, 0x09}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_10, "Retired X.509 Certificate for Key Management 10", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.10", 3, "\x5F\xC1\x16", "\x10\x0A", -+ "2.16.840.1.101.3.7.2.16.10", 3, {0x5F, 0xC1, 0x16}, {0x10, 0x0A}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_11, "Retired X.509 Certificate for Key Management 11", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.11", 3, "\x5F\xC1\x17", "\x10\x0B", -+ "2.16.840.1.101.3.7.2.16.11", 3, {0x5F, 0xC1, 0x17}, {0x10, 0x0B}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_12, "Retired X.509 Certificate for Key Management 12", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.12", 3, "\x5F\xC1\x18", "\x10\x0C", -+ "2.16.840.1.101.3.7.2.16.12", 3, {0x5F, 0xC1, 0x18}, {0x10, 0x0C}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_13, "Retired X.509 Certificate for Key Management 13", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.13", 3, "\x5F\xC1\x19", "\x10\x0D", -+ "2.16.840.1.101.3.7.2.16.13", 3, {0x5F, 0xC1, 0x19}, {0x10, 0x0D}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_14, "Retired X.509 Certificate for Key Management 14", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.14", 3, "\x5F\xC1\x1A", "\x10\x0E", -+ "2.16.840.1.101.3.7.2.16.14", 3, {0x5F, 0xC1, 0x1A}, {0x10, 0x0E}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_15, "Retired X.509 Certificate for Key Management 15", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.15", 3, "\x5F\xC1\x1B", "\x10\x0F", -+ "2.16.840.1.101.3.7.2.16.15", 3, {0x5F, 0xC1, 0x1B}, {0x10, 0x0F}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_16, "Retired X.509 Certificate for Key Management 16", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.16", 3, "\x5F\xC1\x1C", "\x10\x10", -+ "2.16.840.1.101.3.7.2.16.16", 3, {0x5F, 0xC1, 0x1C}, {0x10, 0x10}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_17, "Retired X.509 Certificate for Key Management 17", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.17", 3, "\x5F\xC1\x1D", "\x10\x11", -+ "2.16.840.1.101.3.7.2.16.17", 3, {0x5F, 0xC1, 0x1D}, {0x10, 0x11}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_18, "Retired X.509 Certificate for Key Management 18", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.18", 3, "\x5F\xC1\x1E", "\x10\x12", -+ "2.16.840.1.101.3.7.2.16.18", 3, {0x5F, 0xC1, 0x1E}, {0x10, 0x12}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_19, "Retired X.509 Certificate for Key Management 19", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.19", 3, "\x5F\xC1\x1F", "\x10\x13", -+ "2.16.840.1.101.3.7.2.16.19", 3, {0x5F, 0xC1, 0x1F}, {0x10, 0x13}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - { PIV_OBJ_RETIRED_X509_20, "Retired X.509 Certificate for Key Management 20", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.20", 3, "\x5F\xC1\x20", "\x10\x14", -+ "2.16.840.1.101.3.7.2.16.20", 3, {0x5F, 0xC1, 0x20}, {0x10, 0x14}, - PIV_OBJECT_NOT_PRESENT|PIV_OBJECT_TYPE_CERT | PIV_OBJECT_NEEDS_VCI}, - - { PIV_OBJ_IRIS_IMAGE, "Cardholder Iris Images", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.21", 3, "\x5F\xC1\x21", "\x10\x15", PIV_OBJECT_NEEDS_PIN | PIV_OBJECT_NEEDS_VCI}, -+ "2.16.840.1.101.3.7.2.16.21", 3, {0x5F, 0xC1, 0x21}, {0x10, 0x15}, PIV_OBJECT_NEEDS_PIN | PIV_OBJECT_NEEDS_VCI}, - - /* 800-73-4, 3 new objects */ - { PIV_OBJ_BITGT, "Biometric Information Templates Group Template", - SC_ASN1_APP | SC_ASN1_CONS | 0x1F61, -- "2.16.840.1.101.3.7.2.16.22", 2, "\x7F\x61", "\x10\x16", 0}, -+ "2.16.840.1.101.3.7.2.16.22", 2, {0x7F, 0x61}, {0x10, 0x16}, 0}, - { PIV_OBJ_SM_CERT_SIGNER, "Secure Messaging Certificate Signer", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.23", 3, "\x5F\xC1\x22", "\x10\x17", -+ "2.16.840.1.101.3.7.2.16.23", 3, {0x5F, 0xC1, 0x22}, {0x10, 0x17}, - PIV_OBJECT_TYPE_CERT | PIV_OBJECT_TYPE_CVC}, - {PIV_OBJ_PCRDCS, "Pairing Code Reference Data Container", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.16.24", 3, "\x5F\xC1\x23", "\x10\x18", PIV_OBJECT_NEEDS_PIN | PIV_OBJECT_NEEDS_VCI}, -+ "2.16.840.1.101.3.7.2.16.24", 3, {0x5F, 0xC1, 0x23}, {0x10, 0x18}, PIV_OBJECT_NEEDS_PIN | PIV_OBJECT_NEEDS_VCI}, - - /* following not standard , to be used by piv-tool only for testing */ - { PIV_OBJ_9B03, "3DES-ECB ADM", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.3", 2, "\x9B\x03", "\x9B\x03", 0}, -+ "2.16.840.1.101.3.7.2.9999.3", 2, {0x9B, 0x03}, {0x9B, 0x03}, 0}, - /* Only used when signing a cert req, usually from engine - * after piv-tool generated the key and saved the pub key - * to a file. Note RSA key can be 1024, 2048 or 3072 -@@ -748,77 +748,77 @@ static const struct piv_object piv_objects[] = { - */ - { PIV_OBJ_9A06, "RSA 9A Pub key from last genkey", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.20", 2, "\x9A\x06", "\x9A\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.20", 2, {0x9A, 0x06}, {0x9A, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_9C06, "Pub 9C key from last genkey", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.21", 2, "\x9C\x06", "\x9C\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.21", 2, {0x9C, 0x06}, {0x9C, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_9D06, "Pub 9D key from last genkey", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.22", 2, "\x9D\x06", "\x9D\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.22", 2, {0x9D, 0x06}, {0x9D, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_9E06, "Pub 9E key from last genkey", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.23", 2, "\x9E\x06", "\x9E\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.23", 2, {0x9E, 0x06}, {0x9E, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - - { PIV_OBJ_8206, "Pub 82 key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.101", 2, "\x82\x06", "\x82\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.101", 2, {0x82, 0x06}, {0x82, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_8306, "Pub 83 key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.102", 2, "\x83\x06", "\x83\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.102", 2, {0x83, 0x06}, {0x83, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_8406, "Pub 84 key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.103", 2, "\x84\x06", "\x84\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.103", 2, {0x84, 0x06}, {0x84, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_8506, "Pub 85 key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.104", 2, "\x85\x06", "\x85\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.104", 2, {0x85, 0x06}, {0x85, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_8606, "Pub 86 key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.105", 2, "\x86\x06", "\x86\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.105", 2, {0x86, 0x06}, {0x86, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_8706, "Pub 87 key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.106", 2, "\x87\x06", "\x87\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.106", 2, {0x87, 0x06}, {0x87, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_8806, "Pub 88 key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.107", 2, "\x88\x06", "\x88\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.107", 2, {0x88, 0x06}, {0x88, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_8906, "Pub 89 key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.108", 2, "\x89\x06", "\x89\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.108", 2, {0x89, 0x06}, {0x89, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_8A06, "Pub 8A key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.109", 2, "\x8A\x06", "\x8A\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.109", 2, {0x8A, 0x06}, {0x8A, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_8B06, "Pub 8B key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.110", 2, "\x8B\x06", "\x8B\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.110", 2, {0x8B, 0x06}, {0x8B, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_8C06, "Pub 8C key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.111", 2, "\x8C\x06", "\x8C\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.111", 2, {0x8C, 0x06}, {0x8C, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_8D06, "Pub 8D key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.112", 2, "\x8D\x06", "\x8D\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.112", 2, {0x8D, 0x06}, {0x8D, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_8E06, "Pub 8E key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.113", 2, "\x8E\x06", "\x8E\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.113", 2, {0x8E, 0x06}, {0x8E, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_8F06, "Pub 8F key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.114", 2, "\x8F\x06", "\x8F\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.114", 2, {0x8F, 0x06}, {0x8F, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_9006, "Pub 90 key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.115", 2, "\x90\x06", "\x90\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.115", 2, {0x90, 0x06}, {0x90, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_9106, "Pub 91 key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.116", 2, "\x91\x06", "\x91\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.116", 2, {0x91, 0x06}, {0x91, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_9206, "Pub 92 key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.117", 2, "\x92\x06", "\x92\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.117", 2, {0x92, 0x06}, {0x92, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_9306, "Pub 93 key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.118", 2, "\x93\x06", "\x93\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.118", 2, {0x93, 0x06}, {0x93, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_9406, "Pub 94 key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.119", 2, "\x94\x06", "\x94\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.119", 2, {0x94, 0x06}, {0x94, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - { PIV_OBJ_9506, "Pub 95 key ", - SC_ASN1_APP | 0x13, -- "2.16.840.1.101.3.7.2.9999.120", 2, "\x95\x06", "\x95\x06", PIV_OBJECT_TYPE_PUBKEY}, -+ "2.16.840.1.101.3.7.2.9999.120", 2, {0x95, 0x06}, {0x95, 0x06}, PIV_OBJECT_TYPE_PUBKEY}, - /* - * "Secure Messaging Certificate Signer" is just a certificate. - * No pub or private key on the card. -diff --git a/src/tests/p11test/p11test_case_wrap.c b/src/tests/p11test/p11test_case_wrap.c -index ecb257b56..e9c503d7e 100644 ---- a/src/tests/p11test/p11test_case_wrap.c -+++ b/src/tests/p11test/p11test_case_wrap.c -@@ -390,15 +390,15 @@ test_unwrap_aes(test_cert_t *o, token_info_t *info, test_mech_t *mech) - CK_ULONG key_padded_len = sizeof(key); - CK_OBJECT_CLASS keyClass = CKO_SECRET_KEY; - CK_KEY_TYPE keyType = CKK_AES; -- CK_BBOOL true = CK_TRUE; -+ CK_BBOOL _true = CK_TRUE; - CK_BYTE new_id[] = {0x00, 0xff, 0x42}; - CK_BYTE new_label[] = "Unwrapped key"; - CK_ATTRIBUTE template[] = { - {CKA_CLASS, &keyClass, sizeof(keyClass)}, - {CKA_KEY_TYPE, &keyType, sizeof(keyType)}, -- {CKA_ENCRYPT, &true, sizeof(true)}, -- {CKA_DECRYPT, &true, sizeof(true)}, -- {CKA_TOKEN, &true, sizeof(true)}, -+ {CKA_ENCRYPT, &_true, sizeof(_true)}, -+ {CKA_DECRYPT, &_true, sizeof(_true)}, -+ {CKA_TOKEN, &_true, sizeof(_true)}, - {CKA_ID, &new_id, sizeof(new_id)}, - {CKA_LABEL, &new_label, sizeof(new_label)}, - {CKA_VALUE_LEN, &key_len, sizeof(key_len)}, /* keep this one last! */ --- -2.48.0 - diff --git a/SPECS/opensc/0004-opensc-0.26.1-bash-completion.patch b/SPECS/opensc/0004-opensc-0.26.1-bash-completion.patch deleted file mode 100644 index 05d3ea8e2d..0000000000 --- a/SPECS/opensc/0004-opensc-0.26.1-bash-completion.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ba4849ffcba132376111363ab8c6bb5afebc9c65 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Veronika=20Hanul=C3=ADkov=C3=A1?= -Date: Wed, 23 Jul 2025 14:44:21 +0200 -Subject: [PATCH] Fix bash completion function name - -The `_split_longopt` is renamed to `_comp__split_longopt` -from bash-completion v2.12.0. ---- - doc/tools/completion-template | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/doc/tools/completion-template b/doc/tools/completion-template -index 895a3a9ceb..19a480d3f4 100644 ---- a/doc/tools/completion-template -+++ b/doc/tools/completion-template -@@ -5,7 +5,11 @@ _FUNCTION_NAME() - local cur prev split=false - _get_comp_words_by_ref -n : cur prev - -- _split_longopt && split=true -+ if type _comp__split_longopt &>/dev/null; then -+ _comp__split_longopt && split=true -+ else -+ _split_longopt && split=true -+ fi - - opts="ALLOPTS" - From 8b2decee1f052ce7aab9a19323ed3e4bd4caf2a0 Mon Sep 17 00:00:00 2001 From: Sun Yuechi Date: Sun, 17 May 2026 14:42:33 +0800 Subject: [PATCH 07/11] SPECS: sddm: Remove unused patch. Signed-off-by: Sun Yuechi --- ...ate-symlinks-out-of-the-SessionModel.patch | 45 ------------------- 1 file changed, 45 deletions(-) delete mode 100644 SPECS/sddm/0003-Leave-duplicate-symlinks-out-of-the-SessionModel.patch diff --git a/SPECS/sddm/0003-Leave-duplicate-symlinks-out-of-the-SessionModel.patch b/SPECS/sddm/0003-Leave-duplicate-symlinks-out-of-the-SessionModel.patch deleted file mode 100644 index bf31507087..0000000000 --- a/SPECS/sddm/0003-Leave-duplicate-symlinks-out-of-the-SessionModel.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a86829ae62b4338be716b3d75642321e631dcdec Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Sat, 4 Feb 2023 22:14:16 +0100 -Subject: [PATCH] Leave duplicate symlinks out of the SessionModel - -Used for autologin (default.desktop) and backwards-compat. ---- - src/greeter/SessionModel.cpp | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp -index 3a89d42..9eaab10 100644 ---- a/src/greeter/SessionModel.cpp -+++ b/src/greeter/SessionModel.cpp -@@ -136,6 +136,15 @@ namespace SDDM { - sessions.removeDuplicates(); - for (auto& session : qAsConst(sessions)) { - Session *si = new Session(type, session); -+ -+ // Skip symlinks that point to the same directory, -+ // they will be visited under the real name -+ QFileInfo fi_link(si->fileName()); -+ if (fi_link.isSymLink() && fi_link.canonicalPath() == si->directory().path()) { -+ delete si; -+ continue; -+ } -+ - bool execAllowed = true; - QFileInfo fi(si->tryExec()); - if (fi.isAbsolute()) { -@@ -164,8 +173,10 @@ namespace SDDM { - } - } - // find out index of the last session -+ const QString canonicalLastSession = QFileInfo(stateConfig.Last.Session.get()).canonicalFilePath(); - for (int i = 0; i < d->sessions.size(); ++i) { -- if (d->sessions.at(i)->fileName() == stateConfig.Last.Session.get()) { -+ const QString canonicalSession = QFileInfo(d->sessions.at(i)->fileName()).canonicalFilePath(); -+ if (canonicalSession == canonicalLastSession) { - d->lastIndex = i; - break; - } --- -2.39.1 - From 9016aca4b4a4c73ae0e9d2351e9d86acc20bd4fa Mon Sep 17 00:00:00 2001 From: Sun Yuechi Date: Sun, 17 May 2026 14:42:42 +0800 Subject: [PATCH 08/11] SPECS: uuid: Remove unused patch. Signed-off-by: Sun Yuechi --- SPECS/uuid/ossp-uuid.patch | 207 ------------------------------------- 1 file changed, 207 deletions(-) delete mode 100644 SPECS/uuid/ossp-uuid.patch diff --git a/SPECS/uuid/ossp-uuid.patch b/SPECS/uuid/ossp-uuid.patch deleted file mode 100644 index 3d572bc6ca..0000000000 --- a/SPECS/uuid/ossp-uuid.patch +++ /dev/null @@ -1,207 +0,0 @@ -diff -urN uuid-1.5.1.orig/Makefile.PL uuid-1.5.1/Makefile.PL ---- uuid-1.5.1.orig/Makefile.PL 2006-01-15 12:37:43.000000000 -0600 -+++ uuid-1.5.1/Makefile.PL 2006-09-21 15:59:40.000000000 -0500 -@@ -44,7 +44,7 @@ - all pure_all: - \@if [ ! -d build ]; then mkdir build; fi - \@if [ ! -f build/Makefile ]; then (cd build && ../configure --disable-shared); fi -- \@if [ ! -f build/libuuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libuuid.la); fi -+ \@if [ ! -f build/libossp-uuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libossp-uuid.la); fi - \@if [ ! -f perl/Makefile ]; then (cd perl && \$(PERL) Makefile.PL \$(ARGS)); fi - \@cd perl && \$(MAKE) \$(MFLAGS) \$\@ - -diff -urN uuid-1.5.1.orig/Makefile.in uuid-1.5.1/Makefile.in ---- uuid-1.5.1.orig/Makefile.in 2006-07-31 07:20:03.000000000 -0500 -+++ uuid-1.5.1/Makefile.in 2006-09-21 16:06:31.000000000 -0500 -@@ -61,13 +61,13 @@ - PHP = @PHP@ - PG_CONFIG = @PG_CONFIG@ - --LIB_NAME = libuuid.la -+LIB_NAME = libossp-uuid.la - LIB_OBJS = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo - --DCE_NAME = libuuid_dce.la -+DCE_NAME = libossp-uuid_dce.la - DCE_OBJS = uuid_dce.lo $(LIB_OBJS) - --CXX_NAME = libuuid++.la -+CXX_NAME = libossp-uuid++.la - CXX_OBJS = uuid++.lo $(LIB_OBJS) - - PRG_NAME = uuid -@@ -78,10 +78,10 @@ - PERL_NAME = $(S)/perl/blib/lib/OSSP/uuid.pm - PERL_OBJS = $(S)/perl/uuid.pm - --PHP_NAME = $(S)/php/modules/uuid.so -+PHP_NAME = $(S)/php/modules/ossp-uuid.so - PHP_OBJS = $(S)/php/uuid.c - --PGSQL_NAME = $(S)/pgsql/libuuid.so -+PGSQL_NAME = $(S)/pgsql/libossp-uuid.so - PGSQL_OBJS = $(S)/pgsql/uuid.c - - TARGETS = $(LIB_NAME) @DCE_NAME@ @CXX_NAME@ $(PRG_NAME) @PERL_NAME@ @PHP_NAME@ @PGSQL_NAME@ -@@ -230,7 +230,7 @@ - $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 - $(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/ - $(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/ -- $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ -+ $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc - $(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/ - -@if [ ".$(WITH_DCE)" = .yes ]; then \ - echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \ -@@ -240,7 +240,7 @@ - echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \ - $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \ - fi -- $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ -+ $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ossp-uuid.3 - -@if [ ".$(WITH_CXX)" = .yes ]; then \ - echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \ - $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \ -@@ -275,7 +275,7 @@ - -@if [ ".$(WITH_CXX)" = .yes ]; then \ - $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(CXX_NAME); \ - fi -- -$(RM) $(DESTDIR)$(mandir)/man3/uuid.3 -+ -$(RM) $(DESTDIR)$(mandir)/man3/ossp-uuid.3 - -@if [ ".$(WITH_CXX)" = .yes ]; then \ - echo "$(RM) $(DESTDIR)$(mandir)/man3/uuid++.3"; \ - $(RM) $(DESTDIR)$(mandir)/man3/uuid++.3; \ -@@ -289,7 +289,7 @@ - echo "$(RM) $(DESTDIR)$(includedir)/uuid++.hh"; \ - $(RM) $(DESTDIR)$(includedir)/uuid++.hh; \ - fi -- -$(RM) $(DESTDIR)$(libdir)/pkgconfig/uuid.pc -+ -$(RM) $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc - -$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1 - -$(RM) $(DESTDIR)$(bindir)/uuid-config - -$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE) -diff -urN uuid-1.5.1.orig/perl/Makefile.PL uuid-1.5.1/perl/Makefile.PL ---- uuid-1.5.1.orig/perl/Makefile.PL 2006-01-13 00:44:33.000000000 -0600 -+++ uuid-1.5.1/perl/Makefile.PL 2006-09-21 15:59:40.000000000 -0500 -@@ -33,9 +33,9 @@ - use ExtUtils::MakeMaker; - - # determine source directory --my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d } -- grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la")) -- or die "no source directory found (where libuuid.la is located)"; -+my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d } -+ grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la")) -+ or die "no source directory found (where libossp-uuid.la is located)"; - - # determine extra build options - my $compat = 0; -@@ -47,7 +47,7 @@ - VERSION_FROM => 'uuid.pm', - ABSTRACT_FROM => 'uuid.pod', - PREREQ_PM => {}, -- LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ], -+ LIBS => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ], - DEFINE => '', - INC => "-I. -I$srcdir", - PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm', -diff -urN uuid-1.5.1.orig/pgsql/Makefile uuid-1.5.1/pgsql/Makefile ---- uuid-1.5.1.orig/pgsql/Makefile 2006-07-31 07:36:58.000000000 -0500 -+++ uuid-1.5.1/pgsql/Makefile 2006-09-21 16:07:23.000000000 -0500 -@@ -17,13 +17,13 @@ - top_builddir := $(dir $(PGXS))../.. - include $(top_builddir)/src/Makefile.global - --NAME = uuid -+NAME = ossp-uuid - OBJS = uuid.o - SO_MAJOR_VERSION = 1 - SO_MINOR_VERSION = 0 - - override CPPFLAGS := -I.. $(CPPFLAGS) --SHLIB_LINK := -L../.libs -luuid -+SHLIB_LINK := -L../.libs -lossp-uuid - SHLIB_LINK += $(shell test $(shell uname -s) = FreeBSD && echo "-Wl,-Bsymbolic") - rpath := - -@@ -33,16 +33,16 @@ - include $(top_builddir)/src/Makefile.shlib - - uuid.sql: uuid.sql.in -- sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' uuid.sql -+ sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX);g' uuid.sql - - install: all - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - $(mkinstalldirs) $(DESTDIR)$(datadir) -- $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX) -+ $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX) - $(INSTALL_DATA) uuid.sql $(DESTDIR)$(datadir)/uuid.sql - - uninstall: -- -rm -f $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX) -+ -rm -f $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX) - -rm -f $(DESTDIR)$(datadir)/uuid.sql - - clean distclean: clean-lib -diff -urN uuid-1.5.1.orig/php/Makefile.local uuid-1.5.1/php/Makefile.local ---- uuid-1.5.1.orig/php/Makefile.local 2006-07-31 06:41:46.000000000 -0500 -+++ uuid-1.5.1/php/Makefile.local 2006-09-21 15:59:40.000000000 -0500 -@@ -48,7 +48,7 @@ - @version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \ - echo "installing PHP$$version API into $$extdir"; \ - ./build/shtool mkdir -f -p -m 755 $(DESTDIR)$$extdir; \ -- ./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/uuid.so; \ -+ ./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/ossp-uuid.so; \ - ./build/shtool install -c -m 644 uuid.php$$version $(DESTDIR)$$extdir/uuid.php - - clean: -diff -urN uuid-1.5.1.orig/php/config.m4 uuid-1.5.1/php/config.m4 ---- uuid-1.5.1.orig/php/config.m4 2006-01-13 00:44:34.000000000 -0600 -+++ uuid-1.5.1/php/config.m4 2006-09-21 15:59:40.000000000 -0500 -@@ -34,7 +34,7 @@ - PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared) - AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library]) - PHP_ADD_LIBPATH([..], ) -- PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD) -+ PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD) - PHP_ADD_INCLUDE([..]) - PHP_SUBST(UUID_SHARED_LIBADD) - dnl avoid conflict with libc's uuid_create(3) -diff -urN uuid-1.5.1.orig/php/uuid.ts uuid-1.5.1/php/uuid.ts ---- uuid-1.5.1.orig/php/uuid.ts 2006-01-13 00:44:34.000000000 -0600 -+++ uuid-1.5.1/php/uuid.ts 2006-09-21 15:59:40.000000000 -0500 -@@ -34,9 +34,9 @@ - - $php_version = $argv[1]; - --print "++ loading DSO uuid.so (low-level API)\n"; -+print "++ loading DSO ossp-uuid.so (low-level API)\n"; - if (!extension_loaded('uuid')) { -- dl('modules/uuid.so'); -+ dl('modules/ossp-uuid.so'); - } - - print "++ loading PHP uuid.php${php_version} (high-level API)\n"; -diff -urN uuid-1.5.1.orig/uuid-config.in uuid-1.5.1/uuid-config.in ---- uuid-1.5.1.orig/uuid-config.in 2006-01-13 00:44:30.000000000 -0600 -+++ uuid-1.5.1/uuid-config.in 2006-09-21 15:59:40.000000000 -0500 -@@ -120,7 +120,7 @@ - output_extra="$output_extra $uuid_ldflags" - ;; - --libs) -- output="$output -luuid" -+ output="$output -lossp-uuid" - output_extra="$output_extra $uuid_libs" - ;; - * ) -diff -urN uuid-1.5.1.orig/uuid.pc.in uuid-1.5.1/uuid.pc.in ---- uuid-1.5.1.orig/uuid.pc.in 2006-01-13 00:44:30.000000000 -0600 -+++ uuid-1.5.1/uuid.pc.in 2006-09-21 15:59:40.000000000 -0500 -@@ -37,6 +37,6 @@ - Version: @UUID_VERSION_RAW@ - URL: http://www.ossp.org/pkg/lib/uuid/ - Cflags: -I${includedir} --Libs: -L${libdir} -luuid -+Libs: -L${libdir} -lossp-uuid - Libs.private: @LIBS@ - From c2d81c55271d55f50512156d06655899a07d996c Mon Sep 17 00:00:00 2001 From: Sun Yuechi Date: Sun, 17 May 2026 14:42:47 +0800 Subject: [PATCH 09/11] SPECS: python-requests-ftp: Remove unused patch. Signed-off-by: Sun Yuechi --- .../0001-Remove-use-of-the-cgi-module.patch | 105 ------------------ 1 file changed, 105 deletions(-) delete mode 100644 SPECS/python-requests-ftp/0001-Remove-use-of-the-cgi-module.patch diff --git a/SPECS/python-requests-ftp/0001-Remove-use-of-the-cgi-module.patch b/SPECS/python-requests-ftp/0001-Remove-use-of-the-cgi-module.patch deleted file mode 100644 index b9621fc2f6..0000000000 --- a/SPECS/python-requests-ftp/0001-Remove-use-of-the-cgi-module.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 641144341250d8943311cd3454b1d5696d55f573 Mon Sep 17 00:00:00 2001 -From: David Shea -Date: Tue, 8 Jul 2025 13:41:13 -0400 -Subject: [PATCH] Remove use of the cgi module - ---- - requests_ftp/ftp.py | 56 --------------------------------------------- - 1 file changed, 56 deletions(-) - -diff --git a/requests_ftp/ftp.py b/requests_ftp/ftp.py -index 5a9d571..9491ad9 100644 ---- a/requests_ftp/ftp.py -+++ b/requests_ftp/ftp.py -@@ -1,6 +1,5 @@ - # -*- encoding: utf-8 -*- - import base64 --import cgi - import ftplib - from io import BytesIO - import os -@@ -34,12 +33,6 @@ class FTPSession(requests.Session): - content field contains the binary data.''' - return self.request('RETR', url, **kwargs) - -- def stor(self, url, files=None, **kwargs): -- '''Sends an FTP STOR to a given URL. Returns a Response object. Expects -- to be given one file by the standard Requests method. The remote -- filename will be given by the URL provided.''' -- return self.request('STOR', url, files=files, **kwargs) -- - def nlst(self, url, **kwargs): - '''Sends an FTP NLST. Returns a Response object.''' - return self.request('NLST', url, **kwargs) -@@ -61,30 +54,6 @@ def monkeypatch_session(): - return - - --def parse_multipart_files(request): -- '''Given a prepared request, return a file-like object containing the -- original data. This is pretty hacky.''' -- # Start by grabbing the pdict. -- _, pdict = cgi.parse_header(request.headers['Content-Type']) -- -- # Now, wrap the multipart data in a BytesIO buffer. This is annoying. -- buf = BytesIO() -- buf.write(request.body) -- buf.seek(0) -- -- # Parse the data. Simply take the first file. -- data = cgi.parse_multipart(buf, pdict) -- _, filedata = data.popitem() -- buf.close() -- -- # Get a BytesIO now, and write the file into it. -- buf = BytesIO() -- buf.write(''.join(filedata)) -- buf.seek(0) -- -- return buf -- -- - def data_callback_factory(variable): - '''Returns a callback suitable for use by the FTP library. This callback - will repeatedly save data into the variable provided to this function. This -@@ -189,7 +158,6 @@ class FTPAdapter(requests.adapters.BaseAdapter): - self.func_table = { - 'LIST': self.list, - 'RETR': self.retr, -- 'STOR': self.stor, - 'NLST': self.nlst, - 'SIZE': self.size, - 'HEAD': self.head, -@@ -393,30 +361,6 @@ class FTPAdapter(requests.adapters.BaseAdapter): - response.status_code = codes.ok - return response - -- def stor(self, path, request): -- '''Executes the FTP STOR command on the given path.''' -- -- # First, get the file handle. We assume (bravely) -- # that there is only one file to be sent to a given URL. We also -- # assume that the filename is sent as part of the URL, not as part of -- # the files argument. Both of these assumptions are rarely correct, -- # but they are easy. -- data = parse_multipart_files(request) -- -- # Split into the path and the filename. -- path, filename = os.path.split(path) -- -- # Switch directories and upload the data. -- self.conn.cwd(path) -- code = self.conn.storbinary('STOR ' + filename, data) -- -- # Close the connection and build the response. -- self.conn.close() -- -- response = build_binary_response(request, BytesIO(), code) -- -- return response -- - def nlst(self, path, request): - '''Executes the FTP NLST command on the given path.''' - data = BytesIO() --- -2.49.0 From 887c2996134916e4ed52091d3593131cf98fffb1 Mon Sep 17 00:00:00 2001 From: Sun Yuechi Date: Sun, 17 May 2026 15:05:30 +0800 Subject: [PATCH 10/11] SPECS: python-simpleline: Fix URL. The URL was accidentally copy-pasted from python-iso639. Signed-off-by: Sun Yuechi --- SPECS/python-simpleline/python-simpleline.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/python-simpleline/python-simpleline.spec b/SPECS/python-simpleline/python-simpleline.spec index a95d7ad88e..8d20693fd1 100644 --- a/SPECS/python-simpleline/python-simpleline.spec +++ b/SPECS/python-simpleline/python-simpleline.spec @@ -11,7 +11,7 @@ Version: 1.9.0 Release: %autorelease Summary: Python text UI framework License: MIT -URL: https://github.com/janpipek/iso639-python +URL: https://github.com/rhinstaller/python-simpleline #!RemoteAsset: sha256:7645e29a83df27a46defa1dc1e7e84f6adf91645e03cdd06b4384079bc89aef1 Source0: https://files.pythonhosted.org/packages/source/s/%{srcname}/%{srcname}-%{version}.tar.gz BuildSystem: autotools From 20b18ac460bf7cb2fc94ea9b00e504cb3b522045 Mon Sep 17 00:00:00 2001 From: Sun Yuechi Date: Sun, 17 May 2026 15:06:46 +0800 Subject: [PATCH 11/11] SPECS: python-spacy-legacy: Fix URL. The URL was accidentally copy-pasted from python-spacy-loggers. Signed-off-by: Sun Yuechi --- SPECS/python-spacy-legacy/python-spacy-legacy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/python-spacy-legacy/python-spacy-legacy.spec b/SPECS/python-spacy-legacy/python-spacy-legacy.spec index 63b2ce83b3..2998a2973b 100644 --- a/SPECS/python-spacy-legacy/python-spacy-legacy.spec +++ b/SPECS/python-spacy-legacy/python-spacy-legacy.spec @@ -11,7 +11,7 @@ Version: 3.0.12 Release: %autorelease Summary: Legacy registered functions for spaCy backwards compatibility License: MIT -URL: https://github.com/explosion/spacy-loggers +URL: https://github.com/explosion/spacy-legacy #!RemoteAsset: sha256:b37d6e0c9b6e1d7ca1cf5bc7152ab64a4c4671f59c85adaf7a3fcb870357a774 Source0: https://files.pythonhosted.org/packages/source/s/spacy_legacy/spacy-legacy-%{version}.tar.gz BuildArch: noarch