From a2a99550179ca2267e1dab02b040e076fe0b0f27 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 01/10] Eliminate use of obsolete %patchN syntax (#2283636) --- am-utils.spec | 100 +++++++++++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/am-utils.spec b/am-utils.spec index 69bc7f5..220bda5 100644 --- a/am-utils.spec +++ b/am-utils.spec @@ -130,58 +130,58 @@ mounting and unmounting filesystems. %prep %setup -q -n %{name}-%{upstream_version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P5 -p1 +%patch -P6 -p1 +%patch -P7 -p1 +%patch -P8 -p1 +%patch -P9 -p1 +%patch -P10 -p1 +%patch -P11 -p1 +%patch -P12 -p1 +%patch -P13 -p1 +%patch -P14 -p1 +%patch -P15 -p1 +%patch -P16 -p1 +%patch -P17 -p1 +%patch -P18 -p1 +%patch -P19 -p1 +%patch -P20 -p1 +%patch -P21 -p1 +%patch -P22 -p1 +%patch -P23 -p1 +%patch -P24 -p1 +%patch -P25 -p1 +%patch -P26 -p1 +%patch -P27 -p1 +%patch -P28 -p1 +%patch -P29 -p1 +%patch -P30 -p1 +%patch -P31 -p1 +%patch -P32 -p1 +%patch -P33 -p1 +%patch -P34 -p1 +%patch -P35 -p1 +%patch -P36 -p1 +%patch -P37 -p1 +%patch -P38 -p1 +%patch -P39 -p1 +%patch -P40 -p1 +%patch -P41 -p1 +%patch -P42 -p1 +%patch -P43 -p1 -%patch44 -p1 -%patch45 -p1 -%patch46 -p1 +%patch -P44 -p1 +%patch -P45 -p1 +%patch -P46 -p1 -%patch47 -p1 -%patch48 -p1 -%patch49 -p1 -%patch50 -p1 +%patch -P47 -p1 +%patch -P48 -p1 +%patch -P49 -p1 +%patch -P50 -p1 ./bootstrap From e176b0ba741ae49f2a2a19ad4e76254933e3b0f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:54:21 +0000 Subject: [PATCH 02/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- am-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/am-utils.spec b/am-utils.spec index 220bda5..8727d7e 100644 --- a/am-utils.spec +++ b/am-utils.spec @@ -2,7 +2,7 @@ Summary: Automount utilities including an updated version of Amd Name: am-utils Version: 6.2.0 %define upstream_version 6.2 -Release: 56%{?dist} +Release: 57%{?dist} License: BSD Epoch: 5 URL: http://am-utils.org @@ -285,6 +285,9 @@ fi %{_libdir}/libamu.so* %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 5:6.2.0-57 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 5:6.2.0-56 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d69d00c1957bb3e72dfe43643c26d5065482aebb Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Tue, 30 Jul 2024 11:27:45 +0800 Subject: [PATCH 03/10] - fix Fedora 41 build. --- am-utils-6.2-allow-autoconf-2.72.patch | 28 ++++++ am-utils.spec | 114 +++++++++++++------------ 2 files changed, 89 insertions(+), 53 deletions(-) create mode 100644 am-utils-6.2-allow-autoconf-2.72.patch diff --git a/am-utils-6.2-allow-autoconf-2.72.patch b/am-utils-6.2-allow-autoconf-2.72.patch new file mode 100644 index 0000000..ff2d70d --- /dev/null +++ b/am-utils-6.2-allow-autoconf-2.72.patch @@ -0,0 +1,28 @@ +am-utils-6.2 - allow autoconf 2.72 + +From: Ian Kent + +am-utils creates configure at build time and requires versions of autoconf +that are known to work ok. + +Allow autoconf version 2.72 to get a build. + +Signed-off-by: Ian Kent +--- + bootstrap | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/bootstrap b/bootstrap +index d454c63..55b2084 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -10,7 +10,8 @@ validateversion() { + case "$v" in + *2.69) ;; + *2.71) ;; +- *) echo "am-utils requires autoconf 2.69 or 2.71, you have:" ++ *2.72) ;; ++ *) echo "am-utils requires autoconf 2.69, 2.71 or 2.72, you have:" + echo " $v" + exit 1;; + esac diff --git a/am-utils.spec b/am-utils.spec index 8727d7e..3d80a7b 100644 --- a/am-utils.spec +++ b/am-utils.spec @@ -2,7 +2,7 @@ Summary: Automount utilities including an updated version of Amd Name: am-utils Version: 6.2.0 %define upstream_version 6.2 -Release: 57%{?dist} +Release: 58%{?dist} License: BSD Epoch: 5 URL: http://am-utils.org @@ -26,7 +26,7 @@ BuildRequires: gcc BuildRequires: m4 BuildRequires: libtirpc-devel BuildRequires: kernel-headers -BuildRequires: libnsl2-devel +#BuildRequires: libnsl2-devel BuildRequires: rpcsvc-proto-devel BuildRequires: make @@ -35,7 +35,7 @@ Requires: grep Requires: gawk Requires: findutils Requires: libtirpc -Requires: libnsl2 +#Requires: libnsl2 Requires(pre): /usr/bin/grep Requires(post): systemd-sysv @@ -103,6 +103,8 @@ Patch48: am-utils-6.2-dont-include-linux_mount_h.patch Patch49: am-utils-6.2-fix-fedora-mock-build-fail.patch Patch50: am-utils-configure-c99.patch +Patch51: am-utils-6.2-allow-autoconf-2.72.patch + # Not needed since autoreconf/libtool appear to do this automatically # Leaving it set doesn't appear to be a problem so leave it set in # case this changes. @@ -130,58 +132,60 @@ mounting and unmounting filesystems. %prep %setup -q -n %{name}-%{upstream_version} -%patch -P1 -p1 -%patch -P2 -p1 -%patch -P3 -p1 -%patch -P4 -p1 -%patch -P5 -p1 -%patch -P6 -p1 -%patch -P7 -p1 -%patch -P8 -p1 -%patch -P9 -p1 -%patch -P10 -p1 -%patch -P11 -p1 -%patch -P12 -p1 -%patch -P13 -p1 -%patch -P14 -p1 -%patch -P15 -p1 -%patch -P16 -p1 -%patch -P17 -p1 -%patch -P18 -p1 -%patch -P19 -p1 -%patch -P20 -p1 -%patch -P21 -p1 -%patch -P22 -p1 -%patch -P23 -p1 -%patch -P24 -p1 -%patch -P25 -p1 -%patch -P26 -p1 -%patch -P27 -p1 -%patch -P28 -p1 -%patch -P29 -p1 -%patch -P30 -p1 -%patch -P31 -p1 -%patch -P32 -p1 -%patch -P33 -p1 -%patch -P34 -p1 -%patch -P35 -p1 -%patch -P36 -p1 -%patch -P37 -p1 -%patch -P38 -p1 -%patch -P39 -p1 -%patch -P40 -p1 -%patch -P41 -p1 -%patch -P42 -p1 -%patch -P43 -p1 +%patch -P 1 -p1 +%patch -P 2 -p1 +%patch -P 3 -p1 +%patch -P 4 -p1 +%patch -P 5 -p1 +%patch -P 6 -p1 +%patch -P 7 -p1 +%patch -P 8 -p1 +%patch -P 9 -p1 +%patch -P 10 -p1 +%patch -P 11 -p1 +%patch -P 12 -p1 +%patch -P 13 -p1 +%patch -P 14 -p1 +%patch -P 15 -p1 +%patch -P 16 -p1 +%patch -P 17 -p1 +%patch -P 18 -p1 +%patch -P 19 -p1 +%patch -P 20 -p1 +%patch -P 21 -p1 +%patch -P 22 -p1 +%patch -P 23 -p1 +%patch -P 24 -p1 +%patch -P 25 -p1 +%patch -P 26 -p1 +%patch -P 27 -p1 +%patch -P 28 -p1 +%patch -P 29 -p1 +%patch -P 30 -p1 +%patch -P 31 -p1 +%patch -P 32 -p1 +%patch -P 33 -p1 +%patch -P 34 -p1 +%patch -P 35 -p1 +%patch -P 36 -p1 +%patch -P 37 -p1 +%patch -P 38 -p1 +%patch -P 39 -p1 +%patch -P 40 -p1 +%patch -P 41 -p1 +%patch -P 42 -p1 +%patch -P 43 -p1 -%patch -P44 -p1 -%patch -P45 -p1 -%patch -P46 -p1 +%patch -P 44 -p1 +%patch -P 45 -p1 +%patch -P 46 -p1 -%patch -P47 -p1 -%patch -P48 -p1 -%patch -P49 -p1 -%patch -P50 -p1 +%patch -P 47 -p1 +%patch -P 48 -p1 +%patch -P 49 -p1 +%patch -P 50 -p1 + +%patch -P 51 -p1 ./bootstrap @@ -285,6 +289,10 @@ fi %{_libdir}/libamu.so* %changelog +* Tue Jan 30 2024 Ian Kent - 5:6.2.0-58 +- allow autoconf 2.72. +- remove BuildRequires (and Requires) libnsl2. + * Wed Jul 17 2024 Fedora Release Engineering - 5:6.2.0-57 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a8ea799173ad16039373f4d6a1decb65d05c3e80 Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Tue, 30 Jul 2024 11:59:15 +0800 Subject: [PATCH 04/10] - fix changelog date. --- am-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/am-utils.spec b/am-utils.spec index 3d80a7b..96bc359 100644 --- a/am-utils.spec +++ b/am-utils.spec @@ -289,7 +289,7 @@ fi %{_libdir}/libamu.so* %changelog -* Tue Jan 30 2024 Ian Kent - 5:6.2.0-58 +* Tue Jul 30 2024 Ian Kent - 5:6.2.0-58 - allow autoconf 2.72. - remove BuildRequires (and Requires) libnsl2. From 7afaaebd8f3968ee33edd1126c1b66348929a57a Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Tue, 30 Jul 2024 12:37:23 +0800 Subject: [PATCH 05/10] - don't check kernel verion matches kernel-headers version at build. --- ...-6.2-dont-check-kernel-version-match.patch | 32 +++++++++++++++++++ am-utils.spec | 3 ++ 2 files changed, 35 insertions(+) create mode 100644 am-utils-6.2-dont-check-kernel-version-match.patch diff --git a/am-utils-6.2-dont-check-kernel-version-match.patch b/am-utils-6.2-dont-check-kernel-version-match.patch new file mode 100644 index 0000000..f778e55 --- /dev/null +++ b/am-utils-6.2-dont-check-kernel-version-match.patch @@ -0,0 +1,32 @@ +am-utils-6.2 - dont check kernel version match + +From: Ian Kent + +The configure script checks that the host kernel version matches the +installed headers version. To do this it uses a program that depends +on /usr/include/linux/version.h from the hernel headers. This program +is failing to run (or perhaps to compile) and the Fedora build system +doesn't provide the needed logs to find out why. + +For now comment out this check and assume the kernel-headers package +will be installed due to the BuildRequires and that the include file +/usr/include/linux/version.h will be available. + +Signed-off-by: Ian Kent +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 408964d..5c015b9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -173,7 +173,7 @@ dnl ###################################################################### + dnl Some of these macros must be called before any call to the C compiler + AC_MSG_NOTICE(*** UNIX VARIANTS ***) + dnl UNIX VARIANTS +-AMU_LINUX_HEADERS ++dnl AMU_LINUX_HEADERS + dnl ====================================================================== + + dnl ###################################################################### diff --git a/am-utils.spec b/am-utils.spec index 96bc359..040fd9f 100644 --- a/am-utils.spec +++ b/am-utils.spec @@ -104,6 +104,7 @@ Patch49: am-utils-6.2-fix-fedora-mock-build-fail.patch Patch50: am-utils-configure-c99.patch Patch51: am-utils-6.2-allow-autoconf-2.72.patch +Patch52: am-utils-6.2-dont-check-kernel-version-match.patch # Not needed since autoreconf/libtool appear to do this automatically # Leaving it set doesn't appear to be a problem so leave it set in @@ -186,6 +187,7 @@ mounting and unmounting filesystems. %patch -P 50 -p1 %patch -P 51 -p1 +%patch -P 52 -p1 ./bootstrap @@ -292,6 +294,7 @@ fi * Tue Jul 30 2024 Ian Kent - 5:6.2.0-58 - allow autoconf 2.72. - remove BuildRequires (and Requires) libnsl2. +- don't check kernel version matches kernel-headers version at build. * Wed Jul 17 2024 Fedora Release Engineering - 5:6.2.0-57 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 30593ae3fd9bf809c78bca13164cbe8f22e1facf Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Tue, 30 Jul 2024 13:14:01 +0800 Subject: [PATCH 06/10] - reinstate the kernel version check and fix configure invocation. --- ...-6.2-dont-check-kernel-version-match.patch | 32 ------------------- am-utils.spec | 8 ++--- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 am-utils-6.2-dont-check-kernel-version-match.patch diff --git a/am-utils-6.2-dont-check-kernel-version-match.patch b/am-utils-6.2-dont-check-kernel-version-match.patch deleted file mode 100644 index f778e55..0000000 --- a/am-utils-6.2-dont-check-kernel-version-match.patch +++ /dev/null @@ -1,32 +0,0 @@ -am-utils-6.2 - dont check kernel version match - -From: Ian Kent - -The configure script checks that the host kernel version matches the -installed headers version. To do this it uses a program that depends -on /usr/include/linux/version.h from the hernel headers. This program -is failing to run (or perhaps to compile) and the Fedora build system -doesn't provide the needed logs to find out why. - -For now comment out this check and assume the kernel-headers package -will be installed due to the BuildRequires and that the include file -/usr/include/linux/version.h will be available. - -Signed-off-by: Ian Kent ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 408964d..5c015b9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -173,7 +173,7 @@ dnl ###################################################################### - dnl Some of these macros must be called before any call to the C compiler - AC_MSG_NOTICE(*** UNIX VARIANTS ***) - dnl UNIX VARIANTS --AMU_LINUX_HEADERS -+dnl AMU_LINUX_HEADERS - dnl ====================================================================== - - dnl ###################################################################### diff --git a/am-utils.spec b/am-utils.spec index 040fd9f..46f8c25 100644 --- a/am-utils.spec +++ b/am-utils.spec @@ -104,7 +104,6 @@ Patch49: am-utils-6.2-fix-fedora-mock-build-fail.patch Patch50: am-utils-configure-c99.patch Patch51: am-utils-6.2-allow-autoconf-2.72.patch -Patch52: am-utils-6.2-dont-check-kernel-version-match.patch # Not needed since autoreconf/libtool appear to do this automatically # Leaving it set doesn't appear to be a problem so leave it set in @@ -187,7 +186,6 @@ mounting and unmounting filesystems. %patch -P 50 -p1 %patch -P 51 -p1 -%patch -P 52 -p1 ./bootstrap @@ -199,9 +197,7 @@ chmod +x find-requires %configure \ --enable-shared \ --enable-am-cflags="-DHAVE_LINUX_NFS_MOUNT_H" \ - --enable-cppflags="-I%{_includedir}/nsl" \ - --enable-ldflags="-L%{_libdir}/nsl" \ - --enable-libs="-lnsl -lresolv" \ + --enable-libs="-lresolv" \ --without-hesiod \ --enable-debug @@ -294,7 +290,7 @@ fi * Tue Jul 30 2024 Ian Kent - 5:6.2.0-58 - allow autoconf 2.72. - remove BuildRequires (and Requires) libnsl2. -- don't check kernel version matches kernel-headers version at build. +- also remove references to libnsl in configure invocation. * Wed Jul 17 2024 Fedora Release Engineering - 5:6.2.0-57 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e2bc00949973c50980c126ed452f1e4318456132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 07:51:48 +0200 Subject: [PATCH 07/10] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- am-utils.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/am-utils.spec b/am-utils.spec index 46f8c25..4369ee1 100644 --- a/am-utils.spec +++ b/am-utils.spec @@ -2,8 +2,9 @@ Summary: Automount utilities including an updated version of Amd Name: am-utils Version: 6.2.0 %define upstream_version 6.2 -Release: 58%{?dist} -License: BSD +Release: 59%{?dist} +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD Epoch: 5 URL: http://am-utils.org # Git repository git://git.fsl.cs.sunysb.edu/am-utils-6.2.git @@ -287,6 +288,9 @@ fi %{_libdir}/libamu.so* %changelog +* Wed Aug 28 2024 Miroslav Suchý - 5:6.2.0-59 +- convert license to SPDX + * Tue Jul 30 2024 Ian Kent - 5:6.2.0-58 - allow autoconf 2.72. - remove BuildRequires (and Requires) libnsl2. From 979241094be65da81201c40ef532d0ed370a52da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:56:08 +0000 Subject: [PATCH 08/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- am-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/am-utils.spec b/am-utils.spec index 4369ee1..33c5f23 100644 --- a/am-utils.spec +++ b/am-utils.spec @@ -2,7 +2,7 @@ Summary: Automount utilities including an updated version of Amd Name: am-utils Version: 6.2.0 %define upstream_version 6.2 -Release: 59%{?dist} +Release: 60%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD Epoch: 5 @@ -288,6 +288,9 @@ fi %{_libdir}/libamu.so* %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 5:6.2.0-60 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 28 2024 Miroslav Suchý - 5:6.2.0-59 - convert license to SPDX From a2bec4d0b4ec5d1a9c44fa166ef812297a92b03a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:56:00 +0000 Subject: [PATCH 09/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- am-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/am-utils.spec b/am-utils.spec index 33c5f23..5cdf6dc 100644 --- a/am-utils.spec +++ b/am-utils.spec @@ -2,7 +2,7 @@ Summary: Automount utilities including an updated version of Amd Name: am-utils Version: 6.2.0 %define upstream_version 6.2 -Release: 60%{?dist} +Release: 61%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD Epoch: 5 @@ -288,6 +288,9 @@ fi %{_libdir}/libamu.so* %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 5:6.2.0-61 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 5:6.2.0-60 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 395ecc79e3026030a875fd050ad5c349d4e5abc5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:37:30 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- am-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/am-utils.spec b/am-utils.spec index 5cdf6dc..7f08678 100644 --- a/am-utils.spec +++ b/am-utils.spec @@ -2,7 +2,7 @@ Summary: Automount utilities including an updated version of Amd Name: am-utils Version: 6.2.0 %define upstream_version 6.2 -Release: 61%{?dist} +Release: 62%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD Epoch: 5 @@ -288,6 +288,9 @@ fi %{_libdir}/libamu.so* %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 5:6.2.0-62 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 5:6.2.0-61 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild