diff --git a/f2fs-tools-1.13.0.tar.gz b/f2fs-tools-1.13.0.tar.gz deleted file mode 100644 index 153744c7d350fc900ff40f5666901b2a21e7e984..0000000000000000000000000000000000000000 Binary files a/f2fs-tools-1.13.0.tar.gz and /dev/null differ diff --git a/f2fs-tools-1.14.0.tar.gz b/f2fs-tools-1.14.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4296e33630248a73d24dace2ab14b713386ecf43 Binary files /dev/null and b/f2fs-tools-1.14.0.tar.gz differ diff --git a/f2fs-tools-1.8.0-bigendian.patch b/f2fs-tools-1.8.0-bigendian.patch new file mode 100644 index 0000000000000000000000000000000000000000..5fb890c0ff0d92b766a018c0c3c52b145672e3e3 --- /dev/null +++ b/f2fs-tools-1.8.0-bigendian.patch @@ -0,0 +1,11 @@ +diff -up f2fs-tools-1.4.0/include/f2fs_fs.h.orig f2fs-tools-1.4.0/include/f2fs_fs.h +--- f2fs-tools-1.4.0/include/f2fs_fs.h.orig 2015-01-03 09:45:23.000000000 +0100 ++++ f2fs-tools-1.4.0/include/f2fs_fs.h 2015-01-03 09:45:20.000000000 +0100 +@@ -34,6 +34,7 @@ typedef unsigned long pgoff_t; + #define cpu_to_le32(x) ((__u32)(x)) + #define cpu_to_le64(x) ((__u64)(x)) + #elif __BYTE_ORDER == __BIG_ENDIAN ++#include + #define le16_to_cpu(x) bswap_16(x) + #define le32_to_cpu(x) bswap_32(x) + #define le64_to_cpu(x) bswap_64(x) diff --git a/f2fs-tools.spec b/f2fs-tools.spec index 153fb865b90091028a23c99b595d110d080d004f..21f7251c0535b0829debcaccffceafe1988a8b2b 100644 --- a/f2fs-tools.spec +++ b/f2fs-tools.spec @@ -1,61 +1,66 @@ -#%global debug_package %{nil} - -Name: f2fs-tools -Version: 1.13.0 -Release: 1 -Summary: f2fs-tools are tools for flash fs -License: GPLv2 -URL: https://sourceforge.net/projects/f2fs-tools/ -Source0: https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/%{name}-%{version}.tar.gz - -BuildRequires: gcc autoconf automake uuid-devel libblkid-devel libtool-devel libtool +Name: f2fs-tools +Version: 1.14.0 +Release: 1 +Summary: Tools for Flash-Friendly File System (F2FS) +License: GPLv2+ +URL: http://sourceforge.net/projects/f2fs-tools/ +Source0: http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/%{name}-%{version}.tar.gz +Patch0: f2fs-tools-1.8.0-bigendian.patch +BuildRequires: autoconf automake uuid-devel libuuid-devel libtool libselinux-devel libblkid-devel make %description f2fs is a file system desigend for flash devices %package devel -Summary: devel pacakge for f2fs-tools -Requires: %{name} = %{version}-%{release} +Summary: Development files for %{name} +Requires: %{name} = %{version}-%{release} %description devel f2fs is a file system desigend for flash devices %prep -%setup -q -n %{name}-%{version}/ +%setup -q +%patch0 -p1 -b .bigendian +sed -i 's/AC_PROG_LIBTOOL/LT_INIT/' configure.ac %build -./autogen.sh -%configure -%make_build +autoreconf --install +%configure --disable-static +%{make_build} %install -%make_install -rm -rf %{buildroot}/%{_libdir}/*.la -rm -rf %{buildroot}/%{_libdir}/*.a - +%{make_install} +install -m 644 mkfs/f2fs_format_utils.h %{buildroot}%{_includedir} +find %{buildroot} -type f -name "*.la" -delete %ldconfig_scriptlets -%pre -%preun -%post -%postun - -%check - %files -%license COPYING -%doc ChangeLog README -%{_sbindir}/* -%{_libdir}/libf2fs.so.* -%{_libdir}/libf2fs_format.so.* +%license COPYING +%doc AUTHORS ChangeLog +%{_sbindir}/mkfs.f2fs +%{_sbindir}/fibmap.f2fs +%{_sbindir}/fsck.f2fs +%{_sbindir}/dump.f2fs +%{_sbindir}/parse.f2fs +%{_sbindir}/defrag.f2fs +%{_sbindir}/resize.f2fs +%{_sbindir}/sload.f2fs +%{_sbindir}/f2fs_io +%{_sbindir}/f2fstat +%{_sbindir}/f2fscrypt +%{_sbindir}/sg_write_buffer +%{_libdir}/*.so.* +%{_mandir}/man8/*f2*.gz %files devel -%{_libdir}/libf2fs.so -%{_libdir}/libf2fs_format.so -%{_includedir}/* -%{_mandir}/* - +%{_includedir}/*.h +%{_libdir}/*.so %changelog +* Thu Mar 04 2021 wangyue - 1.14.0-1 +- Update to 1.14.0 to fix CVE-2020-6106 and CVE-2020-6104 and CVE-2020-6107 and CVE-2020-6108 and CVE-2020-6105 + +* Tue Oct 13 2020 Qingqing Li +- update souece0 + * Sun Mar 29 2020 Wei Xiong - Package init -