diff --git a/xfsprogs-5.19.0.tar.xz b/xfsprogs-5.19.0.tar.xz deleted file mode 100644 index a3c0427e9ba84e0dee508533ab31f185b93cb7d0..0000000000000000000000000000000000000000 Binary files a/xfsprogs-5.19.0.tar.xz and /dev/null differ diff --git a/xfsprogs-6.1.1.tar.gz b/xfsprogs-6.1.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..73ac11bff9971e9fea06b99ac9d2ee810709f7dd Binary files /dev/null and b/xfsprogs-6.1.1.tar.gz differ diff --git a/xfsprogs-c99.patch b/xfsprogs-c99.patch new file mode 100644 index 0000000000000000000000000000000000000000..12125d476a9257a5be2b0f783482fd96ea119359 --- /dev/null +++ b/xfsprogs-c99.patch @@ -0,0 +1,104 @@ +Patch posted upstream: https://marc.info/?l=linux-xfs&m=167584946813673 + +From: Arjun Shankar +Date: Wed, 8 Feb 2023 10:35:05 +0100 +Subject: [PATCH] Remove several implicit function declarations + +During configure, several ioctl checks omit the correspondig include +and a pwritev2 check uses the wrong feature test macro. Also, +scrub/unicrash.c omits the appropriate include for u_init/u_cleanup. +All of the above lead to implicit function declarations at build time. +This commit fixes the same. + +Signed-off-by: Arjun Shankar + +diff --git a/configure b/configure +index cee6a7f8f844cbb7..0de77850b9cff273 100755 +--- a/configure ++++ b/configure +@@ -14839,6 +14839,7 @@ $as_echo_n "checking for fiemap... " >&6; } + #define _GNU_SOURCE + #include + #include ++#include + + int + main () +@@ -14869,7 +14870,7 @@ $as_echo_n "checking for pwritev2... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-#define _BSD_SOURCE ++#define _GNU_SOURCE + #include + + int +@@ -15619,6 +15620,7 @@ $as_echo_n "checking for struct sg_io_hdr ... " >&6; } + /* end confdefs.h. */ + + #include ++#include + + int + main () +@@ -15648,7 +15650,8 @@ $as_echo_n "checking for struct hd_geometry ... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-#include , ++#include ++#include + + int + main () +diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4 +index bb1ab49c11e49cd0..f987aa4ab7b5b8de 100644 +--- a/m4/package_libcdev.m4 ++++ b/m4/package_libcdev.m4 +@@ -117,6 +117,7 @@ AC_DEFUN([AC_HAVE_FIEMAP], + #define _GNU_SOURCE + #include + #include ++#include + ]], [[ + struct fiemap *fiemap; + ioctl(0, FS_IOC_FIEMAP, (unsigned long)fiemap); +@@ -153,7 +154,7 @@ AC_DEFUN([AC_HAVE_PWRITEV2], + [ AC_MSG_CHECKING([for pwritev2]) + AC_LINK_IFELSE( + [ AC_LANG_PROGRAM([[ +-#define _BSD_SOURCE ++#define _GNU_SOURCE + #include + ]], [[ + pwritev2(0, 0, 0, 0, 0); +@@ -454,6 +455,7 @@ AC_DEFUN([AC_HAVE_SG_IO], + AC_COMPILE_IFELSE( + [ AC_LANG_PROGRAM([[ + #include ++#include + ]], [[ + struct sg_io_hdr hdr; + ioctl(0, SG_IO, &hdr); +@@ -471,7 +473,8 @@ AC_DEFUN([AC_HAVE_HDIO_GETGEO], + [ AC_MSG_CHECKING([for struct hd_geometry ]) + AC_COMPILE_IFELSE( + [ AC_LANG_PROGRAM([[ +-#include , ++#include ++#include + ]], [[ + struct hd_geometry hdr; + ioctl(0, HDIO_GETGEO, &hdr); +diff --git a/scrub/unicrash.c b/scrub/unicrash.c +index cb0880c1040a73ae..3be0718afa883a19 100644 +--- a/scrub/unicrash.c ++++ b/scrub/unicrash.c +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + #include "libfrog/paths.h" + #include "xfs_scrub.h" + #include "common.h" diff --git a/xfsprogs.spec b/xfsprogs.spec index 389eb6c98afb05cf0b6e88c5951c3ee8d0e682e5..6da1de78b098ad546673e319dc02b730ee0deb66 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,29 +1,24 @@ %define anolis_release 1 Name: xfsprogs -Version: 5.19.0 +Version: 6.1.1 Release: %{anolis_release}%{?dist} Summary: Userspace utilities that manage XFS filesystems License: GPL+ and LGPLv2+ URL: https://xfs.wiki.kernel.org -Source0: https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.xz - -BuildRequires: make -BuildRequires: gcc -BuildRequires: libtool -BuildRequires: gettext -BuildRequires: libattr-devel -BuildRequires: libuuid-devel -BuildRequires: libedit-devel -BuildRequires: libblkid-devel -BuildRequires: libicu -BuildRequires: systemd -BuildRequires: xz -BuildRequires: inih-devel -BuildRequires: userspace-rcu-devel +Source0: https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.gz + +Patch0: xfsprogs-c99.patch + +BuildRequires: make gcc libtool gettext libicu systemd xz +BuildRequires: libattr-devel libuuid-devel libedit-devel libblkid-devel +BuildRequires: inih-devel userspace-rcu-devel + Provides: xfs-cmds +Obsoletes: xfs-cmds < %{version}-%{release} Provides: xfsprogs-qa-devel +Obsoletes: xfsprogs-qa-devel < %{version}-%{release} Suggests: xfsprogs-xfs_scrub %description @@ -74,7 +69,8 @@ on xfs filesystems. %autosetup -p1 %build -%configure --enable-editline=yes --enable-blkid=yes +export tagname=CC +%configure --enable-editline=yes --enable-blkid=yes --enable-lto=no %make_build %install @@ -88,6 +84,7 @@ rm -f %{buildroot}/{%{_lib}/*.{la,a,so},%{_libdir}/*.{la,a}} rm -rf %{buildroot}/%{_datadir}/doc/xfsprogs %find_lang %{name} +%generate_compatibility_deps %files -f %{name}.lang %{_libdir}/*.so.* @@ -98,6 +95,13 @@ rm -rf %{buildroot}/%{_datadir}/doc/xfsprogs %{_sbindir}/* %{_unitdir}/* %{_datadir}/xfsprogs/mkfs/*.conf +%dir %{abidir} +%{abidir}/libhandle.dump +%{abidir}/xfs_admin-option.list +%{abidir}/xfs_estimate-option.list +%{abidir}/xfs_fsr-option.list +%{abidir}/xfs_mkfile-option.list +%{abidir}/xfs_quota-option.list %exclude %{_sbindir}/xfs_scrub* %exclude %{_mandir}/man8/xfs_scrub* %exclude %{_usr}/%{_lib}/xfsprogs/xfs_scrub* @@ -113,6 +117,7 @@ rm -rf %{buildroot}/%{_datadir}/doc/xfsprogs %{_usr}/%{_lib}/xfsprogs/xfs_scrub* %{_mandir}/man8/xfs_scrub_all* %{_unitdir}/xfs_scrub* +%{abidir}/xfs_scrub_all-option.list %files devel %{_mandir}/man2/* @@ -130,10 +135,12 @@ rm -rf %{buildroot}/%{_datadir}/doc/xfsprogs %{_includedir}/xfs/xfs_da_format.h %{_includedir}/xfs/xfs_log_format.h %{_includedir}/xfs/xqm.h - %{_libdir}/*.so %changelog +* Tue Jul 04 2023 happy_orange - 6.1.1-1 +- update to 6.1.1 + * Fri Sep 23 2022 mgb01105731 - 5.19.0-1 - update to 5.19.0