Merge branch 'upstream' into tizen_base

Change-Id: I3cf7519103132fc9e078433a621ba4e476754060

diff --cc NOTICE
Simple merge

diff --cc e2fsprogs.spec
index f89ffee,a8fd1dd..1cb83d6
--- 1/e2fsprogs.spec.in
--- 2/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@@ -5,9 -5,9 +5,9 @@@
  
  Summary: Utilities for managing ext2/ext3/ext4 filesystems
  Name: e2fsprogs
- Version: @E2FSPROGS_PKGVER@
+ Version: 1.46.0
  Release: 0
 -License: GPLv2
 +License: GPL-2.0
  Group: System Environment/Base
  Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
  Url: http://e2fsprogs.sourceforge.net/

diff --cc misc/mke2fs.8.in
Simple merge

diff --cc packaging/e2fsprogs.spec
index 2a389ee,0000000..b7033a4
mode 100755,000000..100755
--- 1/packaging/e2fsprogs.spec
--- /dev/null
+++ b/packaging/e2fsprogs.spec
@@@ -1,200 -1,0 +1,204 @@@
- Version:        1.43.4
 +Name:           e2fsprogs
 +BuildRequires:  autoconf
 +BuildRequires:  libblkid-devel
 +BuildRequires:  libuuid-devel
 +BuildRequires:  pkg-config
++Version:        1.46.0
 +Release:        0
 +Summary:        Utilities for the Second Extended File System
 +License:        GPL-2.0
 +Group:          System/Filesystems
 +Url:            http://e2fsprogs.sourceforge.net
 +Requires:       libcom_err >= %{version}
 +Requires:       libext2fs >= %{version}
 +Source:         http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v%{version}/e2fsprogs-%{version}.tar.xz
 +Source1:        baselibs.conf
 +Source2:        e2fsck.conf
 +Source1001:   e2fsprogs.manifest
 +
 +%description
 +Utilities needed to create and maintain ext2 and ext3 file systems
 +under Linux. Included in this package are: chattr, lsattr, mke2fs,
 +mklost+found, tune2fs, e2fsck, resize2fs, and badblocks.
 +
 +%package devel
 +Summary:        Dummy development package
 +License:        LGPL-2.0
 +Group:          Base/Development
 +Requires:       libblkid-devel
 +Requires:       libext2fs-devel = %version
 +Requires:       libuuid-devel
 +
 +%description devel
 +Dummy development package for backwards compatibility.
 +
 +%package -n libext2fs
 +Summary:        Ext2fs library
 +License:        LGPL-2.0
 +Group:          Base/File Systems
 +
 +%description -n libext2fs
 +The basic Ext2fs shared library.
 +
 +%package -n libext2fs-devel
 +Summary:        Development files for libext2fs
 +License:        LGPL-2.0
 +Group:          Base/Development
 +Requires:       libcom_err-devel
 +Requires:       libext2fs = %version
 +
 +%description -n libext2fs-devel
 +Development files for libext2fs.
 +
 +%package -n libcom_err
 +Summary:        E2fsprogs error reporting library
 +License:        MIT
 +Group:          Base/File Systems
 +
 +%description -n libcom_err
 +com_err is an error message display library.
 +
 +%package -n libcom_err-devel
 +Summary:        Development files for libcom_err
 +License:        MIT
 +Group:          Base/Development
 +Requires:       glibc-devel
 +Requires:       libcom_err = %version
 +
 +%description -n libcom_err-devel
 +Development files for the com_err error message display library.
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
 +%build
 +%{?asan:%restore_fcommon}
 +export CFLAGS="${CFLAGS} -fPIE -flto "
 +export LDFLAGS="${LDFLAGS} -pie -flto "
 +%configure \
 +  --disable-evms \
 +  --with-root-prefix=''   \
 +  --enable-elf-shlibs \
 +  --disable-libblkid \
 +  --disable-libuuid \
 +  --disable-uuidd \
 +  --disable-nls \
 +  --disable-fsck \
 +  --enable-hardening \
 +
 +make %{?_smp_mflags} V=1
 +
 +%install
 +make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_libdir}
 +find "%buildroot/%_libdir" -type f -name "*.a" \
 +       -print -delete
 +# Let boot continue even if system clock is wrong
 +install -p -m 644 %{SOURCE2} %{buildroot}/etc/e2fsck.conf
 +
 +
 +rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
 +rm -f $RPM_BUILD_ROOT/%{_sbindir}/mkfs.ext4dev
 +rm -f $RPM_BUILD_ROOT/%{_sbindir}/fsck.ext4dev
 +rm -f $RPM_BUILD_ROOT/usr/share/man/man8/mkfs.ext4dev.8*
 +rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4dev.8*
 +
 +mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}
 +install -p -m 644 README %{buildroot}/%{_defaultdocdir}/%{name}/README
 +install -p -m 644 RELEASE-NOTES %{buildroot}/%{_defaultdocdir}/%{name}/RELEASE-NOTES
 +
 +%post -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
 +
 +%post -n libext2fs -p /sbin/ldconfig
 +
 +%postun -n libext2fs -p /sbin/ldconfig
 +
 +%post -n libcom_err -p /sbin/ldconfig
 +
 +%postun -n libcom_err -p /sbin/ldconfig
 +
 +%docs_package
 +%doc %{_defaultdocdir}/%{name}/RELEASE-NOTES
 +%doc %{_defaultdocdir}/%{name}/README
 +
 +%files devel
 +%manifest %{name}.manifest
 +%doc README
 +
 +%files
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%license NOTICE
 +%config /etc/e2fsck.conf
 +%config /etc/mke2fs.conf
++%config /etc/e2scrub.conf
 +%{_sbindir}/badblocks
 +%{_sbindir}/debugfs
 +%{_sbindir}/dumpe2fs
 +%{_sbindir}/e2undo
 +%{_sbindir}/e2fsck
 +%{_sbindir}/e2label
++%{_sbindir}/e2scrub
++%{_sbindir}/e2scrub_all
 +%{_sbindir}/fsck.ext2
 +%{_sbindir}/fsck.ext3
 +%{_sbindir}/fsck.ext4
 +%{_sbindir}/mke2fs
 +%{_sbindir}/mkfs.ext2
 +%{_sbindir}/mkfs.ext3
 +%{_sbindir}/mkfs.ext4
 +%{_sbindir}/resize2fs
 +%{_sbindir}/tune2fs
 +%{_sbindir}/e2image
 +%{_sbindir}/logsave
 +%{_bindir}/chattr
 +%{_bindir}/lsattr
 +%{_sbindir}/mklost+found
 +%{_sbindir}/filefrag
 +%{_sbindir}/e2freefrag
++%{_sbindir}/e2mmpstatus
 +%{_sbindir}/e4crypt
 +%{_sbindir}/e4defrag
 +
 +%files -n libext2fs
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%license NOTICE
 +%{_libdir}/libext2fs.so.*
 +%{_libdir}/libe2p.so.*
 +
 +%files -n libext2fs-devel
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%{_libdir}/libext2fs.so
 +%{_libdir}/libe2p.so
 +/usr/include/ext2fs
 +/usr/include/e2p
 +%_libdir/pkgconfig/e2p.pc
 +%_libdir/pkgconfig/ext2fs.pc
 +
 +%files -n libcom_err
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%license debian/copyright
 +%{_libdir}/libcom_err.so.*
 +%{_libdir}/libss.so.*
 +
 +%files -n libcom_err-devel
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%_bindir/compile_et
 +%_bindir/mk_cmds
 +%{_libdir}/libcom_err.so
 +%{_libdir}/libss.so
 +%_libdir/pkgconfig/com_err.pc
 +%_libdir/pkgconfig/ss.pc
 +%_includedir/com_err.h
 +%_includedir/et
 +%_includedir/ss
 +%_datadir/et
 +%_datadir/ss
 +
 +%changelog

diff --cc resize/resize2fs.c
index 9540863,270e4de..d14d55f
mode 100755,100644..100755
--- 1/resize/resize2fs.c
--- 2/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@@ -2871,11 -2981,12 +2976,11 @@@ blk64_t calculate_minimum_resize_size(e
  #endif
  
        /*
-        * if we need more group descriptors in order to accomodate our data
+        * if we need more group descriptors in order to accommodate our data
         * then we need to add them here
         */
 -      blks_needed = data_needed;
 -      while (blks_needed > data_blocks) {
 -              blk64_t remainder = blks_needed - data_blocks;
 +      while (data_needed > data_blocks) {
 +              blk64_t remainder = data_needed - data_blocks;
                dgrp_t extra_grps;
  
                /* figure out how many more groups we need for the data */