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

This commit is contained in:
wang_yue111 2021-03-04 14:50:09 +08:00
parent c298f19106
commit 83aa395654
4 changed files with 52 additions and 39 deletions

Binary file not shown.

BIN
f2fs-tools-1.14.0.tar.gz Normal file

Binary file not shown.

View File

@ -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 <byteswap.h>
#define le16_to_cpu(x) bswap_16(x)
#define le32_to_cpu(x) bswap_32(x)
#define le64_to_cpu(x) bswap_64(x)

View File

@ -1,64 +1,66 @@
#%global debug_package %{nil} Name: f2fs-tools
Version: 1.14.0
Name: f2fs-tools Release: 1
Version: 1.13.0 Summary: Tools for Flash-Friendly File System (F2FS)
Release: 2 License: GPLv2+
Summary: f2fs-tools are tools for flash fs URL: http://sourceforge.net/projects/f2fs-tools/
License: GPLv2 Source0: http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/%{name}-%{version}.tar.gz
URL: https://sourceforge.net/projects/f2fs-tools/ Patch0: f2fs-tools-1.8.0-bigendian.patch
Source0: https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/%{name}-%{version}.tar.gz BuildRequires: autoconf automake uuid-devel libuuid-devel libtool libselinux-devel libblkid-devel make
BuildRequires: gcc autoconf automake uuid-devel libblkid-devel libtool-devel libtool
%description %description
f2fs is a file system desigend for flash devices f2fs is a file system desigend for flash devices
%package devel %package devel
Summary: devel pacakge for f2fs-tools Summary: Development files for %{name}
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%description devel %description devel
f2fs is a file system desigend for flash devices f2fs is a file system desigend for flash devices
%prep %prep
%setup -q -n %{name}-%{version}/ %setup -q
%patch0 -p1 -b .bigendian
sed -i 's/AC_PROG_LIBTOOL/LT_INIT/' configure.ac
%build %build
./autogen.sh autoreconf --install
%configure %configure --disable-static
%make_build %{make_build}
%install %install
%make_install %{make_install}
rm -rf %{buildroot}/%{_libdir}/*.la install -m 644 mkfs/f2fs_format_utils.h %{buildroot}%{_includedir}
rm -rf %{buildroot}/%{_libdir}/*.a find %{buildroot} -type f -name "*.la" -delete
%ldconfig_scriptlets %ldconfig_scriptlets
%pre
%preun
%post
%postun
%check
%files %files
%license COPYING %license COPYING
%doc ChangeLog README %doc AUTHORS ChangeLog
%{_sbindir}/* %{_sbindir}/mkfs.f2fs
%{_libdir}/libf2fs.so.* %{_sbindir}/fibmap.f2fs
%{_libdir}/libf2fs_format.so.* %{_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 %files devel
%{_libdir}/libf2fs.so %{_includedir}/*.h
%{_libdir}/libf2fs_format.so %{_libdir}/*.so
%{_includedir}/*
%{_mandir}/*
%changelog %changelog
* Thu Mar 04 2021 wangyue <wangyue92@huawei.com> - 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 <liqingqing3@huawei.com> * Tue Oct 13 2020 Qingqing Li <liqingqing3@huawei.com>
- update souece0 - update souece0
* Sun Mar 29 2020 Wei Xiong <myeuler@163.com> * Sun Mar 29 2020 Wei Xiong <myeuler@163.com>
- Package init - Package init