diff --git a/whatsup-1.14-Adjust-to-Autoconf-2.71.patch b/whatsup-1.14-Adjust-to-Autoconf-2.71.patch new file mode 100644 index 0000000..df11910 --- /dev/null +++ b/whatsup-1.14-Adjust-to-Autoconf-2.71.patch @@ -0,0 +1,59 @@ +From c261979245527ae780f83d00d3cffcc117873658 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Fri, 26 Nov 2021 14:55:49 +0100 +Subject: [PATCH] Adjust to Autoconf-2.71 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Autoconf-2.71 fixed handling traling white spaces (marked with an +underscore here): + + AC_CHECK_FUNCS( \ + strcpy \ + strdup \ + strchr \_ + strlen \_ + strcat \_ + strtok \_ + ) + +and correctly converted them to this shell code: + + for ac_func in strcpy strdup strchr \ strlen \ strcat \ strtok \ + do : + [...] + done + +This patch removes the trailing new lines. + + + + +Signed-off-by: Petr Písař +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 668b3c9..0f7c26d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -174,10 +174,10 @@ AC_FUNC_MALLOC + AC_CHECK_FUNCS( \ + strcpy \ + strdup \ +- strchr \ +- strlen \ +- strcat \ +- strtok \ ++ strchr \ ++ strlen \ ++ strcat \ ++ strtok \ + ) + AC_CHECK_FUNCS([getopt_long]) + +-- +2.31.1 + diff --git a/whatsup.spec b/whatsup.spec index ba1047d..0aaa840 100644 --- a/whatsup.spec +++ b/whatsup.spec @@ -1,6 +1,8 @@ %global libname libnodeupdown -%ifnarch s390 s390x +# There is no opensm on 32-bit ARM, bugs #1484155, #1556539 +# There is no libibcommon on s390, s390x +%ifnarch %{arm} s390 s390x %global with_ib 1 %else %global with_ib 0 @@ -9,14 +11,19 @@ Summary: Node up/down detection utility Name: whatsup Version: 1.14 -Release: 22%{?dist} -Group: Applications/Communications -License: GPLv2+ +Release: 53%{?dist} +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://computing.llnl.gov/linux/whatsup.html Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}-1/%{name}-%{version}.tar.gz Source1: %{name}-hostsfile Source2: %{name}-pingd.service Patch0: %{name}-%{version}-bug#1117251.patch +# Adjust to Autconf-2.71, bug #1999491, +# , +# +Patch1: %{name}-%{version}-Adjust-to-Autoconf-2.71.patch +BuildRequires: make BuildRequires: perl-devel BuildRequires: perl-generators BuildRequires: perl(ExtUtils::MakeMaker) expat-devel, libtool-ltdl-devel, libgenders-devel @@ -37,20 +44,17 @@ and several optional cluster node databases. %package -n %{libname}-devel Summary: Development headers for %{libname} -Group: Applications/Communications Requires: %{libname} = %{version}-%{release} %description -n %{libname}-devel development headers for %{libname} %package -n %{libname} Summary: A cluster node up/down detection library -Group: Applications/Communications %description -n %{libname} A cluster node up/down detection library, with different backends %package -n %{libname}-backend-ganglia Summary: Ganglia backend for %{libname} -Group: Applications/Communications Requires: %{libname} = %{version}-%{release} BuildRequires: ganglia-devel %description -n %{libname}-backend-ganglia @@ -59,8 +63,7 @@ Ganglia backend module for %{libname} %if %{with_ib} %package -n %{libname}-backend-openib Summary: Openib backend for %{libname} -Group: Applications/Communications -BuildRequires: opensm-devel, libibcommon-devel, libibumad-devel +BuildRequires: opensm-devel, libibcommon-devel, rdma-core-devel Requires: %{libname} = %{version}-%{release} %description -n %{libname}-backend-openib openib backend module for %{libname} @@ -68,7 +71,6 @@ openib backend module for %{libname} %package -n %{libname}-backend-pingd Summary: Pingd backend for %{libname} -Group: Applications/Communications Requires: %{libname} = %{version}-%{release} Requires: %{name}-pingd = %{version}-%{release} %description -n %{libname}-backend-pingd @@ -76,7 +78,6 @@ pingd backend module for %{libname} %package -n %{name}-pingd Summary: Pingd daemon for %{name} -Group: Applications/Communications Requires: %{libname} = %{version}-%{release} %if 0%{?fedora} > 15 Requires(post): systemd-sysv @@ -95,9 +96,7 @@ pingd daemon for %{name} %package -n perl-%{libname} Summary: Perl bindings for %{libname} -Group: Applications/Communications Requires: %{libname} = %{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -n perl-%{libname} Perl bindings for %{libname} @@ -108,21 +107,20 @@ Perl bindings for %{libname} %package -n %{libname}-clusterlist-hostsfile Summary: Hostsfile clusterlist module for %{libname} -Group: Applications/Communications Requires: %{libname} = %{version}-%{release} %description -n %{libname}-clusterlist-hostsfile Hostsfile clusterlist module for %{libname} %package -n %{libname}-clusterlist-genders Summary: Genders clusterlist module for %{libname} -Group: Applications/Communications Requires: %{libname} = %{version}-%{release} %description -n %{libname}-clusterlist-genders Genders clusterlist module for %{libname} %prep %setup -q -%patch0 -p0 +%patch -P0 -p0 +%patch -P1 -p1 %if 0%{?fedora} > 17 autoreconf -I config -f -i %endif @@ -178,13 +176,7 @@ find %{buildroot} -type f -name "*.la" -exec rm -f {} \; %{_fixperms} %{buildroot}/* touch %{buildroot}%{_sysconfdir}/hostsfile -%if 0%{?rhel} <= 6 -%clean -rm -rf %{buildroot} -%endif - -%post -n %{libname} -p /sbin/ldconfig -%postun -n %{libname} -p /sbin/ldconfig +%ldconfig_scriptlets -n %{libname} %post -n %{name}-pingd %if 0%{?fedora} > 15 @@ -196,7 +188,8 @@ if [ $1 -eq 1 ] ; then /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi %endif -%else # EPEL thing +%else +# EPEL thing if [ $1 -eq 1 ] ; then # Initial installation /sbin/chkconfig --add whatsup-pingd @@ -214,7 +207,8 @@ if [ $1 -eq 0 ] ; then /bin/systemctl stop whatsup-pingd.service > /dev/null 2>&1 || : fi %endif -%else # EPEL thing +%else +# EPEL thing if [ $1 -eq 0 ] ; then # Package removal, not upgrade /sbin/service whatsup-pingd stop >/dev/null 2>&1 || : @@ -233,7 +227,8 @@ if [ $1 -ge 1 ] ; then /bin/systemctl try-restart whatsup-pingd.service >/dev/null 2>&1 || : fi %endif -%else #EPEL thing +%else +#EPEL thing if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall /sbin/service whatsup-pingd condrestart @@ -253,14 +248,12 @@ fi %endif %files -%defattr(-,root,root,-) %doc AUTHORS COPYING DISCLAIMER NEWS README ChangeLog %{_bindir}/whatsdown %{_bindir}/whatsup %{_mandir}/man1/* %files -n perl-%{libname} -%defattr(-,root,root,-) %doc COPYING %{_mandir}/man3/Libnodeupdown.3* %{_mandir}/man3/Nodeupdown.3* @@ -268,7 +261,6 @@ fi %exclude %dir %{perl_vendorarch}/auto/ %files -n %{name}-pingd -%defattr(-,root,root,-) %doc COPYING %if 0%{?fedora} > 15 %{_unitdir}/%{name}-pingd.service @@ -285,7 +277,6 @@ fi %config(noreplace) %{_sysconfdir}/pingd.conf %files -n %{libname}-devel -%defattr(-,root,root,-) %doc COPYING %{_includedir}/nodeupdown.h %dir %{_includedir}/nodeupdown @@ -294,7 +285,6 @@ fi %{_mandir}/man3/nodeupdown* %files -n %{libname} -%defattr(-,root,root,-) %doc COPYING %{_libdir}/libnodeupdown*.so.* %dir %{_libdir}/nodeupdown @@ -303,35 +293,124 @@ fi %config(noreplace) %{_sysconfdir}/nodeupdown.conf %files -n %{libname}-backend-ganglia -%defattr(-,root,root,-) %doc COPYING %{_libdir}/nodeupdown/nodeupdown_backend_ganglia.so %if %{with_ib} %files -n %{libname}-backend-openib -%defattr(-,root,root,-) %doc COPYING %{_libdir}/nodeupdown/nodeupdown_backend_openib.so %endif %files -n %{libname}-backend-pingd -%defattr(-,root,root,-) %doc COPYING %{_libdir}/nodeupdown/nodeupdown_backend_pingd.so %files -n %{libname}-clusterlist-genders -%defattr(-,root,root,-) %doc COPYING %{_libdir}/nodeupdown/nodeupdown_clusterlist_genders.so %files -n %{libname}-clusterlist-hostsfile -%defattr(-,root,root,-) %doc COPYING %{_libdir}/nodeupdown/nodeupdown_clusterlist_hostsfile.so %config(noreplace) %{_sysconfdir}/hostsfile %changelog +* Wed Jul 22 2026 Jitka Plesnikova - 1.14-53 +- Perl 5.44 rebuild + +* Fri Jul 17 2026 Fedora Release Engineering - 1.14-52 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 1.14-51 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 1.14-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Jul 07 2025 Jitka Plesnikova - 1.14-49 +- Perl 5.42 rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 1.14-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 26 2024 Miroslav Suchý - 1.14-47 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 1.14-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jun 10 2024 Jitka Plesnikova - 1.14-45 +- Perl 5.40 rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.14-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1.14-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Jitka Plesnikova - 1.14-42 +- Perl 5.38 rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.14-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.14-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon May 30 2022 Jitka Plesnikova - 1.14-39 +- Perl 5.36 rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.14-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Nov 26 2021 Petr Pisar - 1.14-37 +- Adjust to Autconf-2.71 (bug #1999491) + +* Fri Jul 23 2021 Fedora Release Engineering - 1.14-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 1.14-35 +- Perl 5.34 rebuild + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.14-34 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Wed Jan 27 2021 Fedora Release Engineering - 1.14-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.14-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jun 22 2020 Jitka Plesnikova - 1.14-31 +- Perl 5.32 rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.14-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.14-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu May 30 2019 Jitka Plesnikova - 1.14-28 +- Perl 5.30 rebuild + +* Fri May 03 2019 Petr Pisar - 1.14-27 +- Disable InfiniBand support on 32-bit ARM architectures (bug #1556539) + +* Mon Apr 22 2019 Björn Esser - 1.14-26 +- rebuilt(opensm) + +* Sun Feb 03 2019 Fedora Release Engineering - 1.14-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.14-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jun 27 2018 Jitka Plesnikova - 1.14-23 +- Perl 5.28 rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.14-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild