diff --git a/0002-Don-t-attempt-to-memcpy-zero-bytes.patch b/0002-Don-t-attempt-to-memcpy-zero-bytes.patch deleted file mode 100644 index fa45a14..0000000 --- a/0002-Don-t-attempt-to-memcpy-zero-bytes.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 78a5e2e17bba531b41101ca036a5bb1a0d5caca5 Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Tue, 6 Feb 2024 21:15:33 -0500 -Subject: [PATCH 2/2] Don't attempt to memcpy() zero bytes - -add_rtattr_nest() is called in several places in the code. As part of -its operation, it calls add_rtattr(nm type, NULL, 0) which results in -NULL and 0 being passed to memcpy(). This fails with -Werror=nonnull -on recent GCC. - -Signed-off-by: Stephen Gallagher ---- - lib/rtnetlink.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/rtnetlink.c b/lib/rtnetlink.c -index 3b8413718997568a20752791807b19c1f299955e..faa60d7c12f68af175d223b6c3c3257a982e4f37 100644 ---- a/lib/rtnetlink.c -+++ b/lib/rtnetlink.c -@@ -172,7 +172,10 @@ static void add_rtattr(struct nlmsghdr *n, int type, const void *data, int alen) - - rta->rta_type = type; - rta->rta_len = len; -- memcpy(RTA_DATA(rta), data, alen); -+ if (alen > 0) -+ { -+ memcpy(RTA_DATA(rta), data, alen); -+ } - n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len); - } - --- -2.43.0 - diff --git a/0003-initialization-discards-const-qualifier-from-pointer.patch b/0003-initialization-discards-const-qualifier-from-pointer.patch deleted file mode 100644 index 39fc30e..0000000 --- a/0003-initialization-discards-const-qualifier-from-pointer.patch +++ /dev/null @@ -1,44 +0,0 @@ -From dfadd3fd53860a8f44871e479bf602a2fa3bae53 Mon Sep 17 00:00:00 2001 -From: Chris Leech -Date: Tue, 6 Jan 2026 16:20:49 -0800 -Subject: [PATCH 1/1] =?UTF-8?q?initialization=20discards=20=E2=80=98const?= - =?UTF-8?q?=E2=80=99=20qualifier=20from=20pointer=20target=20type?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Chris Leech ---- - lib/fcoe_utils.c | 2 +- - lib/sysfs_hba.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/fcoe_utils.c b/lib/fcoe_utils.c -index 4d13dd7ecf9..5ea713679a5 100644 ---- a/lib/fcoe_utils.c -+++ b/lib/fcoe_utils.c -@@ -161,7 +161,7 @@ int fcoe_checkdir(char *dir) - */ - char *get_ifname_from_symbolic_name(const char *symbolic_name) - { -- char *last_space = strrchr(symbolic_name, ' '); -+ const char *last_space = strrchr(symbolic_name, ' '); - - if (!last_space || strlen(last_space) == 1) - return NULL; -diff --git a/lib/sysfs_hba.c b/lib/sysfs_hba.c -index 381f335d7ea..302ce634954 100644 ---- a/lib/sysfs_hba.c -+++ b/lib/sysfs_hba.c -@@ -441,7 +441,7 @@ char *get_pci_dev_from_netdev(const char *netdev) - free(path); - if (ret == -1) { - char realdev[256]; -- char *subif; -+ const char *subif; - size_t len; - - subif = strchr(netdev, '.'); --- -2.52.0 - diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 1794653..a32d047 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,9 +7,9 @@ Name: fcoe-utils Version: 1.0.34 -Release: 13.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities -License: GPL-2.0-only +License: GPLv2 URL: http://www.open-fcoe.org Source0: https://github.com/openSUSE/fcoe-utils/archive/%{commit0}.tar.gz#/%{name}-%{version}-%{shortcommit0}.tar.gz ExcludeArch: ppc s390 @@ -29,14 +29,6 @@ Requires(postun): systemd Patch1: 0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch -# https://github.com/openSUSE/fcoe-utils/pull/25 -Patch2: 0002-Don-t-attempt-to-memcpy-zero-bytes.patch - -Patch3: 0003-initialization-discards-const-qualifier-from-pointer.patch - -# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -ExcludeArch: %{ix86} - %description Fibre Channel over Ethernet utilities fcoeadm - command line tool for configuring FCoE interfaces @@ -88,39 +80,6 @@ done %{_libexecdir}/fcoe/ %changelog -* Wed Jan 07 2026 Chris Leech - 1.0.34-13.gitb233050 -- FTBFS: GCC 16 -Werror=discarded-qualifiers - -* Wed Jul 23 2025 Fedora Release Engineering - 1.0.34-12.gitb233050 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 1.0.34-11.gitb233050 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 1.0.34-10.gitb233050 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 06 2024 Stephen Gallagher - 1.0.34-9.gitb233050 -- FTBFS: Don't attempt to memcpy() zero bytes - -* Wed Jan 24 2024 Fedora Release Engineering - 1.0.34-8.gitb233050 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.0.34-7.gitb233050 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Oct 30 2023 Chris Leech - 1.0.34-6.gitb233050 -- use SPDX in license tag - -* Wed Jul 19 2023 Fedora Release Engineering - 1.0.34-5.gitb233050 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1.0.34-4.gitb233050 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 1.0.34-3.gitb233050 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - * Fri Feb 04 2022 Chris Leech - 1.0.34-2.gitb233050 - FTBFS: more gcc 12 snprintf truncation issues on 32-bit arch