From 40a726740a94b58ff58544926aae4193ee2152da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:49 +0100 Subject: [PATCH 01/18] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- fcoe-utils.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index e4f2469..7c7e73f 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.33 -Release: 5.git%{shortcommit0}%{?dist} +Release: 6.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -79,6 +79,10 @@ done %{_libexecdir}/fcoe/ %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.0.33-6.git848bcc6 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Feb 02 2021 Chris Leech - 1.0.33-5.git848bcc6 - add in RHEL conditional for removed fcoe.ko support From 278397fbf463964d3f1398f9d699a3d0462191b3 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Wed, 14 Apr 2021 11:10:12 -0700 Subject: [PATCH 02/18] upstream 1.0.34 drop gcc11 warning disabling patch, warnings have been addressed upstream --- fcoe-utils-gcc11.patch | 28 ---------------------------- fcoe-utils.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 fcoe-utils-gcc11.patch diff --git a/fcoe-utils-gcc11.patch b/fcoe-utils-gcc11.patch deleted file mode 100644 index 3614194..0000000 --- a/fcoe-utils-gcc11.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 2f323e4..d6bc3c3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -25,6 +25,10 @@ fcping_CFLAGS = $(AM_CFLAGS) - ## rules for building fipvlan - fipvlan_SOURCES = fipvlan.c - fipvlan_LDADD = lib/libutil.a -+# These look like valid warnings, but the code may be fine in practice. Someone -+# with a deeper understanding of the source needs to chime in -+fipvlan_CFLAGS = $(AM_CFLAGS) -Wno-error=array-bounds -Wno-stringop-overread -+ - - AUTOMAKE_OPTIONS=subdir-objects - noinst_LIBRARIES = lib/libutil.a libopenfcoe.a -diff --git a/Makefile.am b/Makefile.am -index 11262ec..08bc207 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -20,7 +20,7 @@ fcoemon_CFLAGS = $(AM_CFLAGS) $(DCBD_CFLAGS) - ## rules for building fcping - fcping_SOURCES = fcping.c - fcping_LDADD = lib/libutil.a libopenfcoe.a $(PCIACCESS_LIBS) -lrt --fcping_CFLAGS = $(AM_CFLAGS) -+fcping_CFLAGS = $(AM_CFLAGS) -Wno-error=stringop-overflow - - ## rules for building fipvlan - fipvlan_SOURCES = fipvlan.c diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 7c7e73f..489313b 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -1,19 +1,18 @@ # https://fedoraproject.org/wiki/Packaging:Guidelines#Compiler_flags %global _hardened_build 1 -# v1.0.33-9-g848bcc6ba8c -%global commit0 848bcc6ba8cda1f344663b4e73f1bc4857bcb4e3 +# v1.0.34 +%global commit0 14ef0d24c0657e56c68360afcfe64034d37323e0 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: fcoe-utils -Version: 1.0.33 -Release: 6.git%{shortcommit0}%{?dist} +Version: 1.0.34 +Release: 0.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities 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 -Patch3: %{name}-gcc11.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -79,6 +78,10 @@ done %{_libexecdir}/fcoe/ %changelog +* Wed Apr 14 2021 Chris Leech - 1.0.34-0.git14ef0d2 +- upstream 1.0.34 +- drop gcc11 warning disabling patch, warnings have been addressed upstream + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.0.33-6.git848bcc6 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. diff --git a/sources b/sources index 5f6df35..0a8640e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fcoe-utils-1.0.33-848bcc6.tar.gz) = 1f591d4b950032f015399a56233510146791d6c0ac510c1c384ce430273445f4be94aaaeb144469b856830401f2089bb951ec3ee253b425ec9e02fbd8d639bda +SHA512 (fcoe-utils-1.0.34-14ef0d2.tar.gz) = bc58aa0e60eaae156e4ac8c6cbbca621abb52da8acd685d4839f15727c067b0ee99a483057c33449b87eef034971a98e3cb3ea6d24093d5239dedf27391dabae From ca843ca7f3fbd60d64303557e331712a87190660 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 22:47:26 +0000 Subject: [PATCH 03/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 489313b..0fd242e 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 0.git%{shortcommit0}%{?dist} +Release: 0.git%{shortcommit0}%{?dist}.1 Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -78,6 +78,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.0.34-0.git14ef0d2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Apr 14 2021 Chris Leech - 1.0.34-0.git14ef0d2 - upstream 1.0.34 - drop gcc11 warning disabling patch, warnings have been addressed upstream From 71939a4dad07a85fa0200cfc716abdff867016fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 02:49:40 +0000 Subject: [PATCH 04/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 0fd242e..81f09a6 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 0.git%{shortcommit0}%{?dist}.1 +Release: 0.git%{shortcommit0}%{?dist}.2 Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -78,6 +78,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.0.34-0.git14ef0d2.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1.0.34-0.git14ef0d2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 5ae4c632c12f8e532e3be9999ee1e985b182581d Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Fri, 28 Jan 2022 11:20:21 -0800 Subject: [PATCH 05/18] FTBFS: update with gcc 12 fix from upstream --- fcoe-utils.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 81f09a6..8ee8b2a 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -1,13 +1,13 @@ # https://fedoraproject.org/wiki/Packaging:Guidelines#Compiler_flags %global _hardened_build 1 -# v1.0.34 -%global commit0 14ef0d24c0657e56c68360afcfe64034d37323e0 +# v1.0.34-2 +%global commit0 b233050792cc5fa54ba1da257706ca2b5ef3c987 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: fcoe-utils Version: 1.0.34 -Release: 0.git%{shortcommit0}%{?dist}.2 +Release: 1.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -78,6 +78,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Fri Jan 28 2022 Chris Leech - 1.0.34-1.gitb233050 +- FTBFS: update with gcc 12 fix from upstream + * Thu Jan 20 2022 Fedora Release Engineering - 1.0.34-0.git14ef0d2.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 0a8640e..31e1a11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fcoe-utils-1.0.34-14ef0d2.tar.gz) = bc58aa0e60eaae156e4ac8c6cbbca621abb52da8acd685d4839f15727c067b0ee99a483057c33449b87eef034971a98e3cb3ea6d24093d5239dedf27391dabae +SHA512 (fcoe-utils-1.0.34-b233050.tar.gz) = 8fc7df765fb7a2a17f9d3b9ce67b2499b7f602671d75be663cb7a668b0cbdfe7126796548c16496dac964549c695de844e6599c026a71f3b67d3d5fe6c29f858 From be0b0eb93565d0d525ca73bbb5c31d91b9d19719 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Fri, 4 Feb 2022 09:51:58 -0800 Subject: [PATCH 06/18] FTBFS: more gcc 12 snprintf truncation issues on 32-bit arch --- ...intf-string-precision-modifiers-in-f.patch | 95 +++++++++++++++++++ fcoe-utils.spec | 7 +- 2 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch diff --git a/0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch b/0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch new file mode 100644 index 0000000..1c9e3b3 --- /dev/null +++ b/0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch @@ -0,0 +1,95 @@ +From c54147b3ada8c37a536a4df90e8707538021ed20 Mon Sep 17 00:00:00 2001 +From: Chris Leech +Date: Fri, 4 Feb 2022 09:21:47 -0800 +Subject: [PATCH 1/1] fcoemon: add snprintf string precision modifiers in + fcm_netif_advance + +GCC 12 is warning of potential snprintf truncations + +fcm_netif.ifname is an IFNAMSIZ array, but formating with %s doesn't +understand that, so add a precision modifier every time we print it to +limit the output. This allows the compiler to verify that the output +buffer is of sufficient length to never truncate. + +Signed-off-by: Chris Leech +--- + fcoemon.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/fcoemon.c b/fcoemon.c +index 8c08bc5a032..b85f276c7df 100644 +--- a/fcoemon.c ++++ b/fcoemon.c +@@ -3135,55 +3135,55 @@ static void fcm_netif_advance(struct fcm_netif *ff) + case FCD_ERROR: + break; + case FCD_GET_DCB_STATE: +- snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s", ++ snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s", + DCB_CMD, CLIF_RSP_VERSION, + CMD_GET_CONFIG, FEATURE_DCB, 0, +- (u_int) strlen(ff->ifname), ff->ifname); ++ (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname); + ff->response_pending = fcm_dcbd_request(buf); + break; + case FCD_SEND_CONF: + snprintf(params, sizeof(params), "%x1%x02", + ff->ff_app_info.enable, + ff->ff_app_info.willing); +- snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s", ++ snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s", + DCB_CMD, CLIF_RSP_VERSION, + CMD_SET_CONFIG, FEATURE_APP, APP_FCOE_STYPE, +- (u_int) strlen(ff->ifname), ff->ifname, params); ++ (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, params); + ff->response_pending = fcm_dcbd_request(buf); + break; + case FCD_GET_PFC_CONFIG: +- snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s", ++ snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s", + DCB_CMD, CLIF_RSP_VERSION, + CMD_GET_CONFIG, FEATURE_PFC, 0, +- (u_int) strlen(ff->ifname), ff->ifname, ""); ++ (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, ""); + ff->response_pending = fcm_dcbd_request(buf); + break; + case FCD_GET_APP_CONFIG: +- snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s", ++ snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s", + DCB_CMD, CLIF_RSP_VERSION, + CMD_GET_CONFIG, FEATURE_APP, APP_FCOE_STYPE, +- (u_int) strlen(ff->ifname), ff->ifname, ""); ++ (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, ""); + ff->response_pending = fcm_dcbd_request(buf); + break; + case FCD_GET_PFC_OPER: +- snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s", ++ snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s", + DCB_CMD, CLIF_RSP_VERSION, + CMD_GET_OPER, FEATURE_PFC, 0, +- (u_int) strlen(ff->ifname), ff->ifname, ""); ++ (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, ""); + ff->response_pending = fcm_dcbd_request(buf); + break; + case FCD_GET_APP_OPER: +- snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s", ++ snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s", + DCB_CMD, CLIF_RSP_VERSION, + CMD_GET_OPER, FEATURE_APP, APP_FCOE_STYPE, +- (u_int) strlen(ff->ifname), ff->ifname, ""); ++ (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, ""); + ff->response_pending = fcm_dcbd_request(buf); + break; + case FCD_GET_PEER: +- snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%s%s", ++ snprintf(buf, sizeof(buf), "%c%x%2.2x%2.2x%2.2x%2.2x%.*s%s", + DCB_CMD, CLIF_RSP_VERSION, + CMD_GET_PEER, FEATURE_APP, APP_FCOE_STYPE, +- (u_int) strlen(ff->ifname), ff->ifname, ""); ++ (u_int) strlen(ff->ifname), IFNAMSIZ, ff->ifname, ""); + ff->response_pending = fcm_dcbd_request(buf); + break; + case FCD_DONE: +-- +2.34.1 + diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 8ee8b2a..a32d047 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -27,6 +27,8 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +Patch1: 0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch + %description Fibre Channel over Ethernet utilities fcoeadm - command line tool for configuring FCoE interfaces @@ -78,6 +80,9 @@ done %{_libexecdir}/fcoe/ %changelog +* Fri Feb 04 2022 Chris Leech - 1.0.34-2.gitb233050 +- FTBFS: more gcc 12 snprintf truncation issues on 32-bit arch + * Fri Jan 28 2022 Chris Leech - 1.0.34-1.gitb233050 - FTBFS: update with gcc 12 fix from upstream From 8ba515b514c55d95bca01621febd588c47af90ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 02:57:56 +0000 Subject: [PATCH 07/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index a32d047..ff40692 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -80,6 +80,9 @@ done %{_libexecdir}/fcoe/ %changelog +* 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 From 5d854e7245993ec5b1736997be1431030d26c886 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 03:14:09 +0000 Subject: [PATCH 08/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index ff40692..0e985d5 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 3.git%{shortcommit0}%{?dist} +Release: 4.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -80,6 +80,9 @@ done %{_libexecdir}/fcoe/ %changelog +* 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 From 297dd1dca7fe7bd3f325f3aab6e0e77e037e0bb8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 19:27:54 +0000 Subject: [PATCH 09/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 0e985d5..3ea7c16 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 4.git%{shortcommit0}%{?dist} +Release: 5.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPLv2 URL: http://www.open-fcoe.org @@ -80,6 +80,9 @@ done %{_libexecdir}/fcoe/ %changelog +* 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 From 028510839f20f11ac7addda937e7bbae8815791c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 12 Jul 2023 20:34:32 -0400 Subject: [PATCH 10/18] Drop i686 build This package fails with a compiler error on i686 only, but there should be no need for an i686 build at this point: https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval --- fcoe-utils.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 3ea7c16..bea6cd6 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -29,6 +29,9 @@ Requires(postun): systemd Patch1: 0001-fcoemon-add-snprintf-string-precision-modifiers-in-f.patch +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + %description Fibre Channel over Ethernet utilities fcoeadm - command line tool for configuring FCoE interfaces From 8f53992b0f469d00871123a8cb020cefd6ce9d4e Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Mon, 30 Oct 2023 13:33:46 -0700 Subject: [PATCH 11/18] use SPDX in license tag --- fcoe-utils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index bea6cd6..e14e61c 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,9 +7,9 @@ Name: fcoe-utils Version: 1.0.34 -Release: 5.git%{shortcommit0}%{?dist} +Release: 6.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities -License: GPLv2 +License: GPL-2.0-only 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 @@ -83,6 +83,9 @@ done %{_libexecdir}/fcoe/ %changelog +* 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 From 5ac2d8057f7d62e55315fe8300aa176dd0dd11d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:03:15 +0000 Subject: [PATCH 12/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index e14e61c..59d9771 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 6.git%{shortcommit0}%{?dist} +Release: 7.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPL-2.0-only URL: http://www.open-fcoe.org @@ -83,6 +83,9 @@ done %{_libexecdir}/fcoe/ %changelog +* 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 From 106e662e895a3b5edf7bb2158fabc2886b21dd09 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 11:21:49 +0000 Subject: [PATCH 13/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 59d9771..e0ad9a4 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 7.git%{shortcommit0}%{?dist} +Release: 8.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPL-2.0-only URL: http://www.open-fcoe.org @@ -83,6 +83,9 @@ done %{_libexecdir}/fcoe/ %changelog +* 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 From 3132bf66ab0c821be58f3081df9a73ae27d7c0ee Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 6 Feb 2024 21:23:00 -0500 Subject: [PATCH 14/18] FTBFS: Don't attempt to memcpy() zero bytes Signed-off-by: Stephen Gallagher --- 0002-Don-t-attempt-to-memcpy-zero-bytes.patch | 34 +++++++++++++++++++ fcoe-utils.spec | 8 ++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0002-Don-t-attempt-to-memcpy-zero-bytes.patch diff --git a/0002-Don-t-attempt-to-memcpy-zero-bytes.patch b/0002-Don-t-attempt-to-memcpy-zero-bytes.patch new file mode 100644 index 0000000..fa45a14 --- /dev/null +++ b/0002-Don-t-attempt-to-memcpy-zero-bytes.patch @@ -0,0 +1,34 @@ +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/fcoe-utils.spec b/fcoe-utils.spec index e0ad9a4..263df66 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 8.git%{shortcommit0}%{?dist} +Release: 9.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPL-2.0-only URL: http://www.open-fcoe.org @@ -29,6 +29,9 @@ 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 + # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -83,6 +86,9 @@ done %{_libexecdir}/fcoe/ %changelog +* 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 From 66071c86d6d6f156815160a8d2502023e9d1cb98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 22:55:13 +0000 Subject: [PATCH 15/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 263df66..4c46ba5 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 9.git%{shortcommit0}%{?dist} +Release: 10.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPL-2.0-only URL: http://www.open-fcoe.org @@ -86,6 +86,9 @@ done %{_libexecdir}/fcoe/ %changelog +* 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 From a5b0bf8780e55b58cab05aec95c6bb68821c7143 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 18:02:04 +0000 Subject: [PATCH 16/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 4c46ba5..dd01c07 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 10.git%{shortcommit0}%{?dist} +Release: 11.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPL-2.0-only URL: http://www.open-fcoe.org @@ -86,6 +86,9 @@ done %{_libexecdir}/fcoe/ %changelog +* 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 From 03250fc98889f227ae59499b342938d959f0531b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:24:20 +0000 Subject: [PATCH 17/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- fcoe-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fcoe-utils.spec b/fcoe-utils.spec index dd01c07..e5dc173 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 11.git%{shortcommit0}%{?dist} +Release: 12.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPL-2.0-only URL: http://www.open-fcoe.org @@ -86,6 +86,9 @@ done %{_libexecdir}/fcoe/ %changelog +* 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 From 5f395717891c031fb15e694d9f428cc982815622 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Tue, 6 Jan 2026 16:25:57 -0800 Subject: [PATCH 18/18] FTBFS: GCC 16 -Werror=discarded-qualifiers Signed-off-by: Chris Leech --- ...iscards-const-qualifier-from-pointer.patch | 44 +++++++++++++++++++ fcoe-utils.spec | 7 ++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 0003-initialization-discards-const-qualifier-from-pointer.patch diff --git a/0003-initialization-discards-const-qualifier-from-pointer.patch b/0003-initialization-discards-const-qualifier-from-pointer.patch new file mode 100644 index 0000000..39fc30e --- /dev/null +++ b/0003-initialization-discards-const-qualifier-from-pointer.patch @@ -0,0 +1,44 @@ +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 e5dc173..1794653 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -7,7 +7,7 @@ Name: fcoe-utils Version: 1.0.34 -Release: 12.git%{shortcommit0}%{?dist} +Release: 13.git%{shortcommit0}%{?dist} Summary: Fibre Channel over Ethernet utilities License: GPL-2.0-only URL: http://www.open-fcoe.org @@ -32,6 +32,8 @@ 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} @@ -86,6 +88,9 @@ 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