From 9ba765bc8c208aeef962b035d033a12e18166e57 Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Mon, 15 Aug 2022 11:08:08 +0800 Subject: [PATCH 01/19] - more fixes for bug 2113103 - am-utils: FTBFS in Fedora rawhide/f37 --- am-utils-6.2-dont-include-linux_mount_h.patch | 35 +++++ ...2-fix-linux-nfs-kernel-module-search.patch | 134 ++++++++++++++++++ am-utils.spec | 12 +- 3 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 am-utils-6.2-dont-include-linux_mount_h.patch create mode 100644 am-utils-6.2-fix-linux-nfs-kernel-module-search.patch diff --git a/am-utils-6.2-dont-include-linux_mount_h.patch b/am-utils-6.2-dont-include-linux_mount_h.patch new file mode 100644 index 0000000..2f8aaf5 --- /dev/null +++ b/am-utils-6.2-dont-include-linux_mount_h.patch @@ -0,0 +1,35 @@ +am-utils-6.2 - dont include linux/mount.h + +From: Ian Kent + +Updates to glibc to add support for fsconfig() et. al. have introduced +conflicts between sys/mount.h and the corresponding kernel header +linux/mount.h. + +But sys/mount.h and linux/mount.h provide very close to the same +definitions except that sys/mount.h has some additional function +declarations. + +So add a macro define to the amd include file to stop its inclusion +of linux/mount.h when including linux/fs.h so that sys/mount.h is +used instead. + +Signed-off-by: Ian Kent +--- + include/mount_headers1.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/mount_headers1.h b/include/mount_headers1.h +index 7d518a06..af9a90ee 100644 +--- a/include/mount_headers1.h ++++ b/include/mount_headers1.h +@@ -160,6 +160,9 @@ + # endif /* HAVE_LINUX_LIST_H */ + # include + # else ++# ifdef HAVE_SYS_MOUNT_H ++# define _LINUX_MOUNT_H ++# endif /* HAVE_SYS_MOUNT_H */ + # include + # endif/* (!__GLIBC__ || __GLIBC__ < 2) */ + #endif /* HAVE_LINUX_FS_H */ diff --git a/am-utils-6.2-fix-linux-nfs-kernel-module-search.patch b/am-utils-6.2-fix-linux-nfs-kernel-module-search.patch new file mode 100644 index 0000000..41c539c --- /dev/null +++ b/am-utils-6.2-fix-linux-nfs-kernel-module-search.patch @@ -0,0 +1,134 @@ +am-utils-6.2 - fix linux nfs kernel module search + +From: Ian Kent + +The configure macros AMU_CHECK_FS_MNTENT() and AMU_CHECK_MOUNT_TYPE() +haven't been updated for a log time. In particular kernel modules that +are xz compressed aren't considered. + +Also the containing subdirectory name isn't always the the same as +the module name and needs to be special cased. + +The cases I found have been fixed, there are probably more but this +is enough to get us started. + +Signed-off-by: Ian Kent +--- + amd/amfs_host.c | 1 + + configure.ac | 6 +++--- + m4/macros/check_fs_mntent.m4 | 17 +++++++++++++++-- + m4/macros/check_mount_type.m4 | 29 +++++++++++++++++++++++++---- + 4 files changed, 44 insertions(+), 9 deletions(-) + +diff --git a/amd/amfs_host.c b/amd/amfs_host.c +index a363c5cc..deaf69fa 100644 +--- a/amd/amfs_host.c ++++ b/amd/amfs_host.c +@@ -50,6 +50,7 @@ + #endif /* HAVE_CONFIG_H */ + #include + #include ++#include + + static char *amfs_host_match(am_opts *fo); + static int amfs_host_init(mntfs *mf); +diff --git a/configure.ac b/configure.ac +index ef4dab0e..408964d8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -808,8 +808,8 @@ dnl NFS related tests need to happen earlier: many things depend on them + AMU_STRUCT_FIELD_NFS_FH + AMU_STRUCT_NFS_FH + AMU_STRUCT_NFS_FH3 +-AMU_CHECK_FS_MNTENT(nfs3) +-AMU_CHECK_FS_MNTENT(nfs4) ++AMU_CHECK_FS_MNTENT(nfsv3 nfs3, nfs3) ++AMU_CHECK_FS_MNTENT(nfsv4 nfs4, nfs4) + dnl ====================================================================== + + dnl ----------------------------------------------------------------------- +@@ -1117,7 +1117,7 @@ dnl check for mount(2) type/name for filesystem (MNTTYPE_*, MOUNT_*) + AC_MSG_NOTICE(*** MOUNTING TYPES ***) + AMU_CHECK_MOUNT_TYPE(nfs) + AMU_CHECK_MOUNT_TYPE(nfs3) +-AMU_CHECK_MOUNT_TYPE(nfs4) ++AMU_CHECK_MOUNT_TYPE(nfsv4 nfs4, nfs4) + AMU_CHECK_MOUNT_TYPE(lustre) + AMU_CHECK_MOUNT_TYPE(ext4 ext3 ext2 ffs ufs 4.2 4.3 4.4 efs xfs jfs ultrix, ufs) + AMU_CHECK_MOUNT_TYPE(xfs) +diff --git a/m4/macros/check_fs_mntent.m4 b/m4/macros/check_fs_mntent.m4 +index e612b4ec..45ac4974 100644 +--- a/m4/macros/check_fs_mntent.m4 ++++ b/m4/macros/check_fs_mntent.m4 +@@ -98,12 +98,25 @@ do + fi + + # look for a loadable filesystem module (linux 2.4+) +- if test -f /lib/modules/$host_os_version/kernel/fs/$ac_fs_tmp/$ac_fs_tmp.ko ++ ac_fs_subdir=$ac_fs_tmp ++ if test -n "$2" ++ then ++ if test "$ac_fs_tmp" = "nfsv3" -o "$ac_fs_tmp" = "nfsv4" ++ then ++ ac_fs_subdir="nfs" ++ fi ++ fi ++ if test -f /lib/modules/$host_os_version/kernel/fs/$ac_fs_subdir/$ac_fs_tmp.ko.xz ++ then ++ eval "ac_cv_fs_$ac_fs_name=yes" ++ break ++ fi ++ if test -f /lib/modules/$host_os_version/kernel/fs/$ac_fs_subdir/$ac_fs_tmp.ko + then + eval "ac_cv_fs_$ac_fs_name=yes" + break + fi +- if test -f /lib/modules/$host_os_version/kernel/fs/$ac_fs_tmp/$ac_fs_tmp.o ++ if test -f /lib/modules/$host_os_version/kernel/fs/$ac_fs_subdir/$ac_fs_tmp.o + then + eval "ac_cv_fs_$ac_fs_name=yes" + break +diff --git a/m4/macros/check_mount_type.m4 b/m4/macros/check_mount_type.m4 +index c779e0bf..88f85323 100644 +--- a/m4/macros/check_mount_type.m4 ++++ b/m4/macros/check_mount_type.m4 +@@ -104,14 +104,35 @@ do + fi + + # look for a loadable filesystem module (linux 2.4+) +- if test -f /lib/modules/$host_os_version/kernel/fs/$ac_fs_tmp/$ac_fs_tmp.ko ++ # special casing here assumes preferred option name will be ++ # first in the list. ++ ac_fs_option="$ac_fs_tmp" ++ ac_fs_subdir=$ac_fs_tmp ++ if test -n "$2" + then +- eval "ac_cv_mount_type_$ac_fs_name=\\\"$ac_fs_tmp\\\"" ++ if test "$ac_fs_tmp" = "nfsv3" -o "$ac_fs_tmp" = "nfsv4" ++ then ++ ac_fs_subdir="nfs" ++ ac_fs_option="$ac_fs_name" ++ fi ++ if test "$ac_fs_tmp" = "vfat" -o "$ac_fs_tmp" = "msdos" ++ then ++ ac_fs_subdir="fat" ++ fi ++ fi ++ if test -f /lib/modules/$host_os_version/kernel/fs/$ac_fs_subdir/$ac_fs_tmp.ko.xz ++ then ++ eval "ac_cv_mount_type_$ac_fs_name=\\\"$ac_fs_option\\\"" + break + fi +- if test -f /lib/modules/$host_os_version/kernel/fs/$ac_fs_tmp/$ac_fs_tmp.o ++ if test -f /lib/modules/$host_os_version/kernel/fs/$ac_fs_subdir/$ac_fs_tmp.ko + then +- eval "ac_cv_mount_type_$ac_fs_name=\\\"$ac_fs_tmp\\\"" ++ eval "ac_cv_mount_type_$ac_fs_name=\\\"$ac_fs_option\\\"" ++ break ++ fi ++ if test -f /lib/modules/$host_os_version/kernel/fs/$ac_fs_subdir/$ac_fs_tmp.o ++ then ++ eval "ac_cv_mount_type_$ac_fs_name=\\\"$ac_fs_option\\\"" + break + fi + diff --git a/am-utils.spec b/am-utils.spec index 51f260b..047b35c 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: 48%{?dist} +Release: 49%{?dist} License: BSD Epoch: 5 URL: http://am-utils.org @@ -98,6 +98,9 @@ Patch44: am-utils-6.2-fix-fsmount-naming-conflict.patch Patch45: am-utils-6.2-fix-SEGV-on-quick-reply-error.patch 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 + # 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. @@ -173,6 +176,9 @@ mounting and unmounting filesystems. %patch45 -p1 %patch46 -p1 +%patch47 -p1 +%patch48 -p1 + ./bootstrap find_requires=%{old_find_requires} @@ -275,6 +281,10 @@ fi %{_libdir}/libamu.so* %changelog +* Mon Aug 15 2022 Ian Kent - 5:6.2.0-49 +- fix linux nfs kernel module search. +- dont include linux/mount.h. + * Thu Aug 04 2022 Ian Kent - 5:6.2.0-48 - fix fsmount naming conflict. - fix SEGV on quick reply error. From 901c8bab008c2eacff1ed9bb978b61d28aecd7cd Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Mon, 15 Aug 2022 13:50:30 +0800 Subject: [PATCH 02/19] - add BuildRequires: kernel-modules for s390x. --- am-utils.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/am-utils.spec b/am-utils.spec index 047b35c..9cee802 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: 49%{?dist} +Release: 50%{?dist} License: BSD Epoch: 5 URL: http://am-utils.org @@ -25,6 +25,12 @@ BuildRequires: texinfo BuildRequires: gcc BuildRequires: m4 BuildRequires: libtirpc-devel +%ifarch s390x +# configure can't find kernel modules on s390x without this package. +# dracut fails of course but the modules are present for configure +# to use. +BuildRequires: kernel-modules +%endif BuildRequires: kernel-headers BuildRequires: libnsl2-devel BuildRequires: rpcsvc-proto-devel @@ -281,6 +287,9 @@ fi %{_libdir}/libamu.so* %changelog +* Mon Aug 15 2022 Ian Kent - 5:6.2.0-50 +- add BuildRequires: kernel-modules for s390x. + * Mon Aug 15 2022 Ian Kent - 5:6.2.0-49 - fix linux nfs kernel module search. - dont include linux/mount.h. From 34382e964f08b1ef3a879f9c6ba6c796d7c37ec0 Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Mon, 15 Aug 2022 14:20:46 +0800 Subject: [PATCH 03/19] - don't use ifarch macro. --- am-utils.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/am-utils.spec b/am-utils.spec index 9cee802..c6acac0 100644 --- a/am-utils.spec +++ b/am-utils.spec @@ -25,12 +25,10 @@ BuildRequires: texinfo BuildRequires: gcc BuildRequires: m4 BuildRequires: libtirpc-devel -%ifarch s390x # configure can't find kernel modules on s390x without this package. # dracut fails of course but the modules are present for configure # to use. BuildRequires: kernel-modules -%endif BuildRequires: kernel-headers BuildRequires: libnsl2-devel BuildRequires: rpcsvc-proto-devel From e056269e13c5ccf779c0f109b66e898e440b938c Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Mon, 15 Aug 2022 17:19:54 +0800 Subject: [PATCH 04/19] - ensure NFSv4 is seen as supported on s390x build. --- am-utils-6.2-fix-fedora-mock-build-fail.patch | 82 +++++++++++++++++++ am-utils.spec | 12 +-- 2 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 am-utils-6.2-fix-fedora-mock-build-fail.patch diff --git a/am-utils-6.2-fix-fedora-mock-build-fail.patch b/am-utils-6.2-fix-fedora-mock-build-fail.patch new file mode 100644 index 0000000..7fb2b0c --- /dev/null +++ b/am-utils-6.2-fix-fedora-mock-build-fail.patch @@ -0,0 +1,82 @@ +am-utils-6.2 - fix fedora mock build fail + +From: Ian Kent + +NFSv4 really needs to be used here but fedora mock builds don't seem +to be able to see the kernel modules. And when NFSv4 is a module, and +has not been used yet, the test fails. + +So use the existing hack to ensure NFSv4 is seen as supported for both +check_fs_mntent.m4 and check_mount_type.m4 in m4/macros. + +Signed-off-by: Ian Kent +--- + m4/macros/check_fs_mntent.m4 | 23 +++++++++++++---------- + m4/macros/check_mount_type.m4 | 18 ++++++++++++++++++ + 2 files changed, 31 insertions(+), 10 deletions(-) + +diff --git a/m4/macros/check_fs_mntent.m4 b/m4/macros/check_fs_mntent.m4 +index 45ac4974..de3d9a91 100644 +--- a/m4/macros/check_fs_mntent.m4 ++++ b/m4/macros/check_fs_mntent.m4 +@@ -141,18 +141,21 @@ do + break + fi + +- if test "$ac_fs_tmp" = "nfs3" -a "$ac_cv_header_linux_nfs_mount_h" = "yes" ++ if test $ac_fs_tmp = "nfs3" -o $ac_fs_tmp = "nfs4" + then +- # hack hack hack +- # in 6.1, which has fallback to v2/udp, we might want +- # to always use version 4. +- # in 6.0 we do not have much choice +- # +- let nfs_mount_version="`grep NFS_MOUNT_VERSION /usr/include/linux/nfs_mount.h | awk '{print $''3;}'`" +- if test $nfs_mount_version -ge 4 ++ if test "$ac_cv_header_linux_nfs_mount_h" = "yes" + then +- eval "ac_cv_fs_$ac_fs_name=yes" +- break ++ # hack hack hack ++ # in 6.1, which has fallback to v2/udp, we might want ++ # to always use version 4. ++ # in 6.0 we do not have much choice ++ # ++ let nfs_mount_version="`grep NFS_MOUNT_VERSION /usr/include/linux/nfs_mount.h | awk '{print $''3;}'`" ++ if test $nfs_mount_version -ge 4 ++ then ++ eval "ac_cv_fs_$ac_fs_name=yes" ++ break ++ fi + fi + fi + +diff --git a/m4/macros/check_mount_type.m4 b/m4/macros/check_mount_type.m4 +index 88f85323..69354221 100644 +--- a/m4/macros/check_mount_type.m4 ++++ b/m4/macros/check_mount_type.m4 +@@ -155,6 +155,24 @@ do + break + fi + ++ if test $ac_fs_tmp = "nfs4" ++ then ++ if test "$ac_cv_header_linux_nfs_mount_h" = "yes" ++ then ++ # hack hack hack ++ # in 6.1, which has fallback to v2/udp, we might want ++ # to always use version 4. ++ # in 6.0 we do not have much choice ++ # ++ let nfs_mount_version="`grep NFS_MOUNT_VERSION /usr/include/linux/nfs_mount.h | awk '{print $''3;}'`" ++ if test $nfs_mount_version -ge 4 ++ then ++ eval "ac_cv_mount_type_$ac_fs_name=\\\"$ac_fs_tmp\\\"" ++ break ++ fi ++ fi ++ fi ++ + # run a test program for bsdi3 + AC_RUN_IFELSE( + [AC_LANG_SOURCE( diff --git a/am-utils.spec b/am-utils.spec index c6acac0..fc6bf4a 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: 50%{?dist} +Release: 51%{?dist} License: BSD Epoch: 5 URL: http://am-utils.org @@ -25,10 +25,6 @@ BuildRequires: texinfo BuildRequires: gcc BuildRequires: m4 BuildRequires: libtirpc-devel -# configure can't find kernel modules on s390x without this package. -# dracut fails of course but the modules are present for configure -# to use. -BuildRequires: kernel-modules BuildRequires: kernel-headers BuildRequires: libnsl2-devel BuildRequires: rpcsvc-proto-devel @@ -104,6 +100,7 @@ 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 # 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 @@ -182,6 +179,7 @@ mounting and unmounting filesystems. %patch47 -p1 %patch48 -p1 +%patch49 -p1 ./bootstrap @@ -285,6 +283,10 @@ fi %{_libdir}/libamu.so* %changelog +* Mon Aug 15 2022 Ian Kent - 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 - 5:6.2.0-50 - add BuildRequires: kernel-modules for s390x. From bb122e50151f5b6ee71649b3d2c94ee33f199a90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:39:12 +0000 Subject: [PATCH 05/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- am-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/am-utils.spec b/am-utils.spec index fc6bf4a..f3a87e9 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: 51%{?dist} +Release: 52%{?dist} License: BSD Epoch: 5 URL: http://am-utils.org @@ -283,6 +283,9 @@ fi %{_libdir}/libamu.so* %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 5:6.2.0-52 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Aug 15 2022 Ian Kent - 5:6.2.0-50 - remove BuildRequires: kernel-modules for s390x. - add hack to ensure NFSv4 is seen as supported on s390x. From 56ba80bf838e65d4912e358aa11ae2c44a2b6760 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 16 Feb 2023 11:15:41 +0100 Subject: [PATCH 06/19] Port configure script to C99 (#2170414) Related to: --- am-utils-configure-c99.patch | 214 +++++++++++++++++++++++++++++++++++ am-utils.spec | 7 +- 2 files changed, 220 insertions(+), 1 deletion(-) create mode 100644 am-utils-configure-c99.patch diff --git a/am-utils-configure-c99.patch b/am-utils-configure-c99.patch new file mode 100644 index 0000000..f4f1a83 --- /dev/null +++ b/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 + #include +-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 + #include +-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 + #include +-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` diff --git a/am-utils.spec b/am-utils.spec index f3a87e9..8ddcc99 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: 52%{?dist} +Release: 53%{?dist} License: BSD Epoch: 5 URL: http://am-utils.org @@ -101,6 +101,7 @@ 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 # 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 @@ -180,6 +181,7 @@ mounting and unmounting filesystems. %patch47 -p1 %patch48 -p1 %patch49 -p1 +%patch50 -p1 ./bootstrap @@ -283,6 +285,9 @@ fi %{_libdir}/libamu.so* %changelog +* Thu Feb 16 2023 Florian Weimer - 5:6.2.0-53 +- Port configure script to C99 (#2170414) + * Wed Jan 18 2023 Fedora Release Engineering - 5:6.2.0-52 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 3c402764ffa0dff54e5ef46a740a3902fdb244cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:11:15 +0000 Subject: [PATCH 07/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- am-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/am-utils.spec b/am-utils.spec index 8ddcc99..f7f78c7 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: 53%{?dist} +Release: 54%{?dist} License: BSD Epoch: 5 URL: http://am-utils.org @@ -285,6 +285,9 @@ fi %{_libdir}/libamu.so* %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 5:6.2.0-54 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Feb 16 2023 Florian Weimer - 5:6.2.0-53 - Port configure script to C99 (#2170414) From 8518c2c5ccbdd558a958dbf1d9ce35737dcf962f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:48:00 +0000 Subject: [PATCH 08/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- am-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/am-utils.spec b/am-utils.spec index f7f78c7..4712f9a 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: 54%{?dist} +Release: 55%{?dist} License: BSD Epoch: 5 URL: http://am-utils.org @@ -285,6 +285,9 @@ fi %{_libdir}/libamu.so* %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 5:6.2.0-55 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 5:6.2.0-54 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From bb254c6afeae626f06c40c1fe27894d19f6303da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:57:49 +0000 Subject: [PATCH 09/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- am-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/am-utils.spec b/am-utils.spec index 4712f9a..69bc7f5 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: 55%{?dist} +Release: 56%{?dist} License: BSD Epoch: 5 URL: http://am-utils.org @@ -285,6 +285,9 @@ fi %{_libdir}/libamu.so* %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 5:6.2.0-56 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 5:6.2.0-55 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a2a99550179ca2267e1dab02b040e076fe0b0f27 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 10/19] 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 11/19] 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 12/19] - 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 13/19] - 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 14/19] - 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 15/19] - 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 16/19] 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 17/19] 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 18/19] 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 19/19] 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