Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

am-utils-6.2-allow-autoconf-2.72.patch

@@ -0,0 +1,28 @@
+am-utils-6.2 - allow autoconf 2.72
+
+From: Ian Kent <raven@themaw.net>
+
+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 <raven@themaw.net>
+---
+ 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

am-utils-configure-c99.patch

@@ -0,0 +1,214 @@
+Fix various autoconf helper macros not to require support for implicit
+ints and implicit function declarations in the compiler.  These C
+language features have been removed from C99, and future compilers
+will not accept them by default.
+
+diff --git a/m4/macros/check_fs_mntent.m4 b/m4/macros/check_fs_mntent.m4
+index de3d9a918283bb1d..7800d3eff0f59e71 100644
+--- a/m4/macros/check_fs_mntent.m4
++++ b/m4/macros/check_fs_mntent.m4
+@@ -165,15 +165,15 @@ do
+   [[
+ #include <sys/param.h>
+ #include <sys/mount.h>
+-main()
++int main(void)
+ {
+   int i;
+   struct vfsconf vf;
+   i = getvfsbyname("$ac_fs_tmp", &vf);
+   if (i < 0)
+-    exit(1);
++    return 1;
+   else
+-    exit(0);
++    return 0;
+ }
+   ]])], [eval "ac_cv_fs_$ac_fs_name=yes"
+       break
+diff --git a/m4/macros/check_gnu_getopt.m4 b/m4/macros/check_gnu_getopt.m4
+index 6ac6440c47e8edd8..daa61cbaef3b09e9 100644
+--- a/m4/macros/check_gnu_getopt.m4
++++ b/m4/macros/check_gnu_getopt.m4
+@@ -17,7 +17,7 @@ int main()
+    int isGNU = 0;
+ 
+    rf = fopen("conftestresult", "w");
+-   if (rf == NULL) exit(1);
++   if (rf == NULL) return 1;
+ 
+    while ( (c = getopt(argc, argv, "x")) != -1 ) {
+        switch ( c ) {
+@@ -25,11 +25,11 @@ int main()
+ 	     isGNU=1;
+              break;
+           default:
+-             exit(1);
++             return 1;
+        }
+    }
+    fprintf(rf, isGNU ? "yes" : "no");
+-   exit(0);
++   return 0;
+ }
+ ]])],[
+ ac_cv_sys_gnu_getopt="`cat conftestresult`"
+diff --git a/m4/macros/check_mnttab_type.m4 b/m4/macros/check_mnttab_type.m4
+index a840991e95e3ba81..398314910d80337a 100644
+--- a/m4/macros/check_mnttab_type.m4
++++ b/m4/macros/check_mnttab_type.m4
+@@ -121,15 +121,15 @@ do
+   [[
+ #include <sys/param.h>
+ #include <sys/mount.h>
+-main()
++int main(void)
+ {
+   int i;
+   struct vfsconf vf;
+   i = getvfsbyname("$ac_fs_tmp", &vf);
+   if (i < 0)
+-    exit(1);
++    return 1;
+   else
+-    exit(0);
++    return 0;
+ }
+   ]])], [eval "ac_cv_mnttab_type_$ac_fs_name=\\\"$ac_fs_tmp\\\""
+       break
+diff --git a/m4/macros/check_mount_type.m4 b/m4/macros/check_mount_type.m4
+index 693542219f7aee90..1b0de6ccb0b7cafd 100644
+--- a/m4/macros/check_mount_type.m4
++++ b/m4/macros/check_mount_type.m4
+@@ -179,15 +179,15 @@ do
+   [[
+ #include <sys/param.h>
+ #include <sys/mount.h>
+-main()
++int main(void)
+ {
+   int i;
+   struct vfsconf vf;
+   i = getvfsbyname("$ac_fs_tmp", &vf);
+   if (i < 0)
+-    exit(1);
++    return 1;
+   else
+-    exit(0);
++    return 0;
+ }
+   ]])], [eval "ac_cv_mount_type_$ac_fs_name=\\\"$ac_fs_tmp\\\""
+       break
+diff --git a/m4/macros/check_varargs_macros.m4 b/m4/macros/check_varargs_macros.m4
+index 93c26ffced82fdcc..1dbd4fb59e3d1c88 100644
+--- a/m4/macros/check_varargs_macros.m4
++++ b/m4/macros/check_varargs_macros.m4
+@@ -9,6 +9,7 @@ ac_cv_varargs_macros,
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
++void bar(const char *, ...);
+ #define foo(str,size,fmt,...)  bar(__FILE__,__LINE__,(str),(size),(fmt),__VA_ARGS__)
+ ]],
+ [[
+@@ -20,6 +21,7 @@ foo(a, sizeof(a), "%d,%d", 1, 2);
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
++void bar(const char *, ...);
+ #define foo(str,size,args...)  bar(__FILE__,__LINE__,(str),(size),(fmt),args)
+ ]],
+ [[
+diff --git a/m4/macros/expand_cpp_hex.m4 b/m4/macros/expand_cpp_hex.m4
+index 13c7c832b0d764fb..7b915d0431b8f688 100644
+--- a/m4/macros/expand_cpp_hex.m4
++++ b/m4/macros/expand_cpp_hex.m4
+@@ -14,17 +14,16 @@ AC_RUN_IFELSE(
+ [AC_LANG_SOURCE(
+ [[
+ [$1]
+-main(argc)
+-int argc;
++int main(int argc)
+ {
+ #ifdef $2
+ if (argc > 1)
+   printf("0x%x", $2);
+-exit(0);
++return 0;
+ #else
+ # error no such option $2
+ #endif
+-exit(1);
++return 1;
+ }]])], value=`./conftest dummy 2>>config.log`, value="notfound", value="notfound")
+ ,
+ value="notfound"
+diff --git a/m4/macros/expand_cpp_int.m4 b/m4/macros/expand_cpp_int.m4
+index e58649e83013265e..798e7fd7590f4ca7 100644
+--- a/m4/macros/expand_cpp_int.m4
++++ b/m4/macros/expand_cpp_int.m4
+@@ -16,17 +16,16 @@ AC_RUN_IFELSE(
+ [AC_LANG_SOURCE(
+ [[
+ [$1]
+-main(argc)
+-int argc;
++int main(int argc)
+ {
+ #ifdef $2
+ if (argc > 1)
+   printf("%d", $2);
+-exit(0);
++return 0;
+ #else
+ # error no such option $2
+ #endif
+-exit(1);
++return 1;
+ }]])], value=`./conftest dummy 2>>config.log`, value="notfound", value="notfound")
+ ,
+ value="notfound"
+diff --git a/m4/macros/expand_cpp_string.m4 b/m4/macros/expand_cpp_string.m4
+index e014b7e4fc9d8030..256ddee09303fde4 100644
+--- a/m4/macros/expand_cpp_string.m4
++++ b/m4/macros/expand_cpp_string.m4
+@@ -14,17 +14,16 @@ AC_RUN_IFELSE(
+ [AC_LANG_SOURCE(
+ [[
+ [$1]
+-main(argc)
+-int argc;
++int main(int argc)
+ {
+ #ifdef $2
+ if (argc > 1)
+   printf("%s", $2);
+-exit(0);
++return 0;
+ #else
+ # error no such option $2
+ #endif
+-exit(1);
++return 1;
+ }]])], value=`./conftest dummy 2>>config.log`, value="notfound", value="notfound")
+ ,
+ value="notfound"
+diff --git a/m4/macros/expand_run_string.m4 b/m4/macros/expand_run_string.m4
+index f9390020aa934c3e..c8c350f533f80a82 100644
+--- a/m4/macros/expand_run_string.m4
++++ b/m4/macros/expand_run_string.m4
+@@ -8,11 +8,10 @@ AC_RUN_IFELSE(
+ [AC_LANG_SOURCE(
+ [[
+ $1
+-main(argc)
+-int argc;
++int main(int argc)
+ {
+ $2
+-exit(0);
++return 0;
+ }]])],
+ [
+ value=`./conftest dummy 2>>config.log`

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: 51%{?dist}
-License: BSD
+Release: 62%{?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
@@ -26,7 +27,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 +36,7 @@ Requires: grep
 Requires: gawk
 Requires: findutils
 Requires: libtirpc
-Requires: libnsl2
+#Requires: libnsl2
 
 Requires(pre):    /usr/bin/grep
 Requires(post):   systemd-sysv
@@ -101,6 +102,9 @@ Patch46: am-utils-6.2-fix-mountd-version-used-when-mount-is-nfs-v4.patch
 Patch47: am-utils-6.2-fix-linux-nfs-kernel-module-search.patch
 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
@@ -129,57 +133,60 @@ 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 -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
 
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
+%patch -P 44 -p1
+%patch -P 45 -p1
+%patch -P 46 -p1
 
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
+%patch -P 47 -p1
+%patch -P 48 -p1
+%patch -P 49 -p1
+%patch -P 50 -p1
+
+%patch -P 51 -p1
 
 ./bootstrap
 
@@ -191,9 +198,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
 
@@ -283,9 +288,48 @@ fi
 %{_libdir}/libamu.so*
 
 %changelog
-* Mon Aug 15 2022 Ian Kent <raven@themaw.net> - 5:6.2.0-51
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5:6.2.0-62
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5:6.2.0-61
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5:6.2.0-60
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Aug 28 2024 Miroslav Suchý <msuchy@redhat.com> - 5:6.2.0-59
+- convert license to SPDX
+
+* Tue Jul 30 2024 Ian Kent <raven@themaw.net> - 5:6.2.0-58
+- allow autoconf 2.72.
+- remove BuildRequires (and Requires) libnsl2.
+- also remove references to libnsl in configure invocation.
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5:6.2.0-57
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5:6.2.0-56
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5:6.2.0-55
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5:6.2.0-54
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Feb 16 2023 Florian Weimer <fweimer@redhat.com> - 5:6.2.0-53
+- Port configure script to C99 (#2170414)
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5:6.2.0-52
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Aug 15 2022 Ian Kent <raven@themaw.net> - 5:6.2.0-50
+- remove BuildRequires: kernel-modules for s390x.
 - add hack to ensure NFSv4 is seen as supported on s390x.
 
+* Mon Aug 15 2022 Ian Kent <raven@themaw.net> - 5:6.2.0-50
+- add BuildRequires: kernel-modules for s390x.
+
 * Mon Aug 15 2022 Ian Kent <raven@themaw.net> - 5:6.2.0-49
 - fix linux nfs kernel module search.
 - dont include linux/mount.h.