diff --git a/SPECS-EXTENDED/edac-utils/13.patch b/SPECS-EXTENDED/edac-utils/13.patch new file mode 100644 index 00000000000..29000a3d6d4 --- /dev/null +++ b/SPECS-EXTENDED/edac-utils/13.patch @@ -0,0 +1,263 @@ +From edf15c84e3cc9a7476745a683ef4047e14944b2b Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Mon, 6 Dec 2021 10:43:07 -0500 +Subject: [PATCH] Update obsolete FSF postal addresses + +--- + COPYING | 41 ++++++++++++++++++++--------------------- + config/config.guess | 3 ++- + config/config.sub | 4 ++-- + config/depcomp | 4 ++-- + config/ltmain.sh | 3 ++- + config/missing | 4 ++-- + src/util/list.c | 2 +- + src/util/list.h | 2 +- + src/util/split.c | 2 +- + src/util/split.h | 2 +- + 10 files changed, 34 insertions(+), 33 deletions(-) + +diff --git a/COPYING b/COPYING +index d60c31a..d159169 100644 +--- a/COPYING ++++ b/COPYING +@@ -1,12 +1,12 @@ +- GNU GENERAL PUBLIC LICENSE +- Version 2, June 1991 ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 + +- Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +- Preamble ++ Preamble + + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public +@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This + General Public License applies to most of the Free Software + Foundation's software and to any other program whose authors commit to + using it. (Some other Free Software Foundation software is covered by +-the GNU Library General Public License instead.) You can apply it to ++the GNU Lesser General Public License instead.) You can apply it to + your programs, too. + + When we speak of free software, we are referring to freedom, not +@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and + modification follow. +- +- GNU GENERAL PUBLIC LICENSE ++ ++ GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) +- ++ + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the Program, + and can be reasonably considered independent and separate works in +@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent + access to copy the source code from the same place counts as + distribution of the source code, even though third parties are not + compelled to copy the source along with the object code. +- ++ + 4. You may not copy, modify, sublicense, or distribute the Program + except as expressly provided under this License. Any attempt + otherwise to copy, modify, sublicense or distribute the Program is +@@ -225,7 +225,7 @@ impose that choice. + + This section is intended to make thoroughly clear what is believed to + be a consequence of the rest of this License. +- ++ + 8. If the distribution and/or use of the Program is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Program under this License +@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals + of preserving the free status of all derivatives of our free software and + of promoting the sharing and reuse of software generally. + +- NO WARRANTY ++ NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY + FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER + PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. + +- END OF TERMS AND CONDITIONS +- +- How to Apply These Terms to Your New Programs ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest + possible use to the public, the best way to achieve this is to make it +@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +- ++ You should have received a copy of the GNU General Public License along ++ with this program; if not, write to the Free Software Foundation, Inc., ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Also add information on how to contact you by electronic and paper mail. + + If the program is interactive, make it output a short notice like this + when it starts in an interactive mode: + +- Gnomovision version 69, Copyright (C) year name of author ++ Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. +@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: + This General Public License does not permit incorporating your program into + proprietary programs. If your program is a subroutine library, you may + consider it more useful to permit linking proprietary applications with the +-library. If this is what you want to do, use the GNU Library General ++library. If this is what you want to do, use the GNU Lesser General + Public License instead of this License. +diff --git a/config/config.guess b/config/config.guess +index 7d0185e..b33cc98 100755 +--- a/config/config.guess ++++ b/config/config.guess +@@ -17,7 +17,8 @@ timestamp='2004-09-07' + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +diff --git a/config/config.sub b/config/config.sub +index edb6b66..c966cb4 100755 +--- a/config/config.sub ++++ b/config/config.sub +@@ -21,8 +21,8 @@ timestamp='2004-08-29' + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, +-# Boston, MA 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +diff --git a/config/depcomp b/config/depcomp +index 11e2d3b..eed3cc9 100755 +--- a/config/depcomp ++++ b/config/depcomp +@@ -17,8 +17,8 @@ scriptversion=2004-05-31.23 + + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +diff --git a/config/ltmain.sh b/config/ltmain.sh +index 23f82e3..7827500 100644 +--- a/config/ltmain.sh ++++ b/config/ltmain.sh +@@ -17,7 +17,8 @@ + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +diff --git a/config/missing b/config/missing +index 64b5f90..3392b9e 100755 +--- a/config/missing ++++ b/config/missing +@@ -19,8 +19,8 @@ scriptversion=2004-09-07.08 + + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +diff --git a/src/util/list.c b/src/util/list.c +index 1f9b29c..034f587 100644 +--- a/src/util/list.c ++++ b/src/util/list.c +@@ -20,7 +20,7 @@ + * + * You should have received a copy of the GNU General Public License along + * with LSD-Tools; if not, write to the Free Software Foundation, Inc., +- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ***************************************************************************** + * Refer to "list.h" for documentation on public functions. + ***************************************************************************** +diff --git a/src/util/list.h b/src/util/list.h +index 289b6bd..524a497 100644 +--- a/src/util/list.h ++++ b/src/util/list.h +@@ -19,7 +19,7 @@ + * + * You should have received a copy of the GNU General Public License along + * with LSD-Tools; if not, write to the Free Software Foundation, Inc., +- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ***************************************************************************** + * This file is originally from LSD-Tools, the LLNL Software + * Development Toolbox. +diff --git a/src/util/split.c b/src/util/split.c +index 1c4419a..7cf0260 100644 +--- a/src/util/split.c ++++ b/src/util/split.c +@@ -20,7 +20,7 @@ + * + * You should have received a copy of the GNU General Public License along + * with Pdsh; if not, write to the Free Software Foundation, Inc., +- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + \*****************************************************************************/ + + #include +diff --git a/src/util/split.h b/src/util/split.h +index f877592..2054482 100644 +--- a/src/util/split.h ++++ b/src/util/split.h +@@ -20,7 +20,7 @@ + * + * You should have received a copy of the GNU General Public License along + * with Pdsh; if not, write to the Free Software Foundation, Inc., +- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + \*****************************************************************************/ + #ifndef _SPLIT_H + #define _SPLIT_H diff --git a/SPECS-EXTENDED/edac-utils/edac-utils.signatures.json b/SPECS-EXTENDED/edac-utils/edac-utils.signatures.json index 7330ce6f8ab..4adcad4048d 100644 --- a/SPECS-EXTENDED/edac-utils/edac-utils.signatures.json +++ b/SPECS-EXTENDED/edac-utils/edac-utils.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "edac-utils-0.16.tar.bz2": "4e4b4013e356e1c4d3262aae95983d23094a0d16e7be3c563ec7f8c402d42ab6", + "edac-utils-0.18.tar.gz": "2a027dbde6c3095807c9fbfa0025bedad38fc839e9967707c1986089ff4c8750", "edac.service": "d9cd19da9e61c599b4ee95f405e3cac2965e0d0d79408c28333410e0a9856827" } } diff --git a/SPECS-EXTENDED/edac-utils/edac-utils.spec b/SPECS-EXTENDED/edac-utils/edac-utils.spec index 5fda9616464..a22175c5937 100644 --- a/SPECS-EXTENDED/edac-utils/edac-utils.spec +++ b/SPECS-EXTENDED/edac-utils/edac-utils.spec @@ -1,108 +1,190 @@ Vendor: Microsoft Corporation Distribution: Azure Linux -Name: edac-utils -Version: 0.16 -Release: 23%{?dist} -Summary: Userspace helper for kernel EDAC drivers +Name: edac-utils +Version: 0.18 +%global so_version 1 +Release: 1%{?dist} +Summary: Userspace helper for kernel EDAC drivers + +# The entire source is GPL-2.0-or-later. +# +# Any files under different licenses are part of the build system and do not +# contribute to the license of the binary RPM: +# - configure is FSFUL or more likely (FSFUL AND GPL-2.0-or-later) +# - install-sh is X11 +License: GPL-2.0-or-later +URL: https://github.com/grondo/edac-utils +Source0: %{url}/archive/%{version}/edac-utils-%{version}.tar.gz +Source1: edac.service + +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + +# Update obsolete FSF postal addresses +# https://github.com/grondo/edac-utils/pull/13 +# +# Since upstream merged the PR, we feel justified in patching the COPYING file. +Patch: %{url}/pull/13.patch + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool -License: GPLv2+ -URL: https://github.com/grondo/edac-utils +BuildRequires: gcc +BuildRequires: make +BuildRequires: perl-generators + +BuildRequires: libsysfs-devel +BuildRequires: systemd-rpm-macros + +Requires: libedac = %{version}-%{release} +Requires: edac-util = %{version}-%{release} +Requires: edac-ctl = %{version}-%{release} + +%global common_description %{expand: +EDAC (Error Detection and Correction) is a set of Linux kernel modules that +handle reporting of hardware-related errors. Currently these modules mainly +handle detection of ECC memory errors for many x86 and x86-64 chipsets and PCI +bus parity errors. + +The edac-utils project currently has three components: libedac, edac-util, and +edac-ctl. The libedac library presents a standard API for reading EDAC error +counts and other information from sysfs, and edac-util uses this API to +generate standard reports from the commandline. The edac-ctl utility is a perl +script which uses config files to load the appropriate EDAC driver for a given +chipset and register motherboard DIMM labels if they are configured. An init +script is also provided which uses edac-ctl to initialize EDAC at system +startup.} + +%description %{common_description} + +This is a metapackage that installs all three components. + + +%package -n libedac +Summary: Standard API for reading EDAC error counts from sysfs + +%description -n libedac %{common_description} + +This package provides the libedac library. + + +%package -n libedac-devel +Summary: Development files for libedac + +Requires: libedac%{?_isa} = %{version}-%{release} -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} -# Source0: https://github.com/grondo/edac-utils/archive/refs/tags/0.16.tar.gz -Source0: https://github.com/grondo/edac-utils/archive/refs/tags/%{name}-%{version}.tar.bz2 -Source1: edac.service +Provides: edac-utils-devel%{?_isa} = %{version}-%{release} +Provides: edac-utils-devel = %{version}-%{release} +Obsoletes: edac-utils-devel < 0.18-18 -%ifarch %{ix86} x86_64 -Requires: dmidecode +%description -n libedac-devel %{common_description} + +This package contains the development headers and libraries and the man page +for libedac. + + +%package -n edac-util +Summary: Command-line tool to generate standard EDAC reports + +Requires: libedac%{?_isa} = %{version}-%{release} + +%description -n edac-util %{common_description} + +This package provides the edac-util command-line tool. + + +%package -n edac-ctl +Summary: Script to load EDAC driver and register DIMM labels + +# Require dmidecode where it is available. Architecture list from +# ExclusiveArch in dmidecode.spec; updated 2021-12-06. +%ifarch %{ix86} x86_64 ia64 aarch64 +Requires: dmidecode %endif -Requires: hwdata -Requires: sysfsutils -Requires: systemd -BuildRequires: gcc -BuildRequires: libsysfs-devel -BuildRequires: perl-generators -BuildRequires: systemd -BuildRequires: systemd-devel - -%description -EDAC is the current set of drivers in the Linux kernel that handle -detection of ECC errors from memory controllers for most chipsets -on i386 and x86_64 architectures. This userspace component consists -of an init script which makes sure EDAC drivers and DIMM labels -are loaded at system startup, as well as a library and utility -for reporting current error counts from the EDAC sysfs files. - -%package devel -Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} - -%description devel -This package contains the development headers and libraries -for %{name}. +Requires: hwdata +# for modprobe: +Requires: kmod + +# This subpackage would be BuildArch: noarch, except for the arch-conditional +# dependency on dmidecode. + +%description -n edac-ctl %{common_description} + +This package provides the edac-ctl script and the edac service. + %prep -%setup -q +%autosetup -p1 + %build +autoreconf --force --install --verbose %configure --disable-static -make %{?_smp_mflags} +%make_build + %install -make install-exec install-data DESTDIR="$RPM_BUILD_ROOT" -# Remove libtool archive -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la - -install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/edac.service -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/edac - -%post -/sbin/ldconfig -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - -%preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable edac.service > /dev/null 2>&1 || : - /bin/systemctl stop edac.service > /dev/null 2>&1 || : -fi - -%postun -/sbin/ldconfig -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart edac.service >/dev/null 2>&1 || : -fi - -%triggerun -- edac-utils < 0.9-14 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply edac -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save edac >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del edac >/dev/null 2>&1 || : -/bin/systemctl try-restart edac.service >/dev/null 2>&1 || : - -%files -%doc COPYING README NEWS ChangeLog DISCLAIMER -%{_sbindir}/edac-ctl +%make_install +find '%{buildroot}' -type f -name '*.la' -print -delete + +install -D -p -m 0644 '%{SOURCE1}' '%{buildroot}%{_unitdir}/edac.service' +rm -f '%{buildroot}%{_sysconfdir}/init.d/edac' +install -d -m 0755 '%{buildroot}%{_sysconfdir}/edac/labels.d' \ + '%{buildroot}%{_sysconfdir}/edac/mainboard' + + +%post -n edac-ctl +%systemd_post edac.service + + +%preun -n edac-ctl +%systemd_preun edac.service + + +%postun -n edac-ctl +%systemd_postun_with_restart edac.service + + +%files +# Empty; the base package is now a metapackage + + +%files -n libedac +%license AUTHORS COPYING DISCLAIMER +%{_libdir}/libedac.so.%{so_version}{,.*} + + +%files -n libedac-devel +%doc README NEWS +%{_libdir}/libedac.so +%{_includedir}/edac.h +%{_mandir}/man3/edac.3* + + +%files -n edac-util %{_bindir}/edac-util -%{_libdir}/*.so.* -%{_mandir}/*/* +%{_mandir}/man1/edac-util.1* + + +%files -n edac-ctl +%license AUTHORS COPYING DISCLAIMER +%doc README NEWS + +%{_sbindir}/edac-ctl +%{_mandir}/man8/edac-ctl.8* +# The explicit directory permissions don’t seem necessary, but we don’t see a +# reason to change them now, either. %dir %attr(0755,root,root) %{_sysconfdir}/edac -%config(noreplace) %{_sysconfdir}/edac/* +%config(noreplace) %{_sysconfdir}/edac/labels.db +%dir %attr(0755,root,root) %dir %{_sysconfdir}/edac/labels.d +%dir %attr(0755,root,root) %dir %{_sysconfdir}/edac/mainboard %{_unitdir}/edac.service -%files devel -%{_libdir}/*.so -%{_includedir}/edac.h - %changelog +* Fri Oct 25 2024 Sumit Jena - 0.18-1 +- Update to version 0.18 + * Fri Oct 15 2021 Pawel Winogrodzki - 0.16-23 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/cgmanifest.json b/cgmanifest.json index 9844b8f542f..721df7db406 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -3148,8 +3148,8 @@ "type": "other", "other": { "name": "edac-utils", - "version": "0.16", - "downloadUrl": "https://github.com/grondo/edac-utils/archive/refs/tags/edac-utils-0.16.tar.bz2" + "version": "0.18", + "downloadUrl": "https://github.com/grondo/edac-utils/archive/0.18/edac-utils-0.18.tar.gz" } } },