Hello community, here is the log from the commit of package e2fsprogs for openSUSE:Factory checked in at 2014-02-02 18:08:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/e2fsprogs (Old) and /work/SRC/openSUSE:Factory/.e2fsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "e2fsprogs" Changes: -------- --- /work/SRC/openSUSE:Factory/e2fsprogs/e2fsprogs.changes 2013-06-28 16:03:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.e2fsprogs.new/e2fsprogs.changes 2014-02-02 18:08:35.000000000 +0100 @@ -1,0 +2,32 @@ +Mon Jan 27 13:05:33 UTC 2014 - [email protected] + +- Removed "-mini" spec file for now as it is causing troubles in Factory + and according to Coolo may not be needed after all. + +------------------------------------------------------------------- +Mon Jan 27 09:22:23 UTC 2014 - [email protected] + +- update to 1.42.9 + * fixes in resize2fs, e2fsck, debugfs, and libext2fs to correctly handle + bigalloc filesystems + * fix rehashing of extent mapped directory in e2fsck + * fix e2fsck not to add lost+found in read-only mode + * fix buffer overruns in e2image + * fix tune2fs to properly update all backup superblocks when disabling quota + feature + * e2image support for efficient copying of filesystems + * fix complaint about uninitialized extents beyond EOF in e2fsck + * fix resize2fs to not corrupt filesystem in some corner cases + * fix e2fsck crashes when deleting invalid symlink, directory larger than 2GB + ... + +------------------------------------------------------------------- +Tue Dec 10 00:45:47 UTC 2013 - [email protected] + +- Created "-mini" version of package which doesn't + build "info" and so doesn't depend on makeinfo, + texinfo, and all of tex. This should allow packages + in the bootstrap cycle (such as krb5-mini) to + build-depends of libraries from here. + +------------------------------------------------------------------- Old: ---- e2fsprogs-1.42.8.tar.gz New: ---- e2fsprogs-1.42.9.tar.gz pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ e2fsprogs.spec ++++++ --- /var/tmp/diff_new_pack.WMKfpx/_old 2014-02-02 18:08:36.000000000 +0100 +++ /var/tmp/diff_new_pack.WMKfpx/_new 2014-02-02 18:08:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package e2fsprogs # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,8 @@ # +%define build_mini 0 + Name: e2fsprogs %if 0%{?suse_version} >= 1010 # Hint for ZYPP @@ -25,6 +27,7 @@ BuildRequires: libblkid-devel BuildRequires: libuuid-devel BuildRequires: pkg-config +%if ! %{build_mini} %if 0%{?suse_version} > 1220 BuildRequires: makeinfo %endif @@ -35,12 +38,29 @@ %define install_info_delete sbin/install-info --delete %endif Requires: %install_info_prereq +%endif # bug437293 %ifarch ppc64 Obsoletes: e2fsprogs-64bit %endif + +%if %{build_mini} +Conflicts: e2fsprogs +Conflicts: e2fsprogs-devel +Conflicts: libext2fs2 +Conflicts: libext2fs-devel +Conflicts: libcom_err2 +Conflicts: libcom_err-devel +%else +Conflicts: e2fsprogs-mini +Conflicts: e2fsprogs-mini-devel +Conflicts: libext2fs2-mini +Conflicts: libext2fs-mini-devel +Conflicts: libcom_err2-mini +Conflicts: libcom_err-mini-devel +%endif # -Version: 1.42.8 +Version: 1.42.9 Release: 0 Summary: Utilities for the Second Extended File System License: GPL-2.0 @@ -84,25 +104,45 @@ %description devel Dummy development package for backwards compatibility. +%if %{build_mini} +%package -n libext2fs2-mini +%else %package -n libext2fs2 +%endif Summary: Ext2fs library License: LGPL-2.0 Group: System/Filesystems +%if %{build_mini} +%description -n libext2fs2-mini +%else %description -n libext2fs2 +%endif The basic Ext2fs shared library. +%if %{build_mini} +%package -n libext2fs-mini-devel +%else %package -n libext2fs-devel +%endif Summary: Development files for libext2fs License: LGPL-2.0 Group: Development/Libraries/C and C++ Requires: libcom_err-devel Requires: libext2fs2 = %version +%if %{build_mini} +%description -n libext2fs-mini-devel +%else %description -n libext2fs-devel +%endif Development files for libext2fs. +%if %{build_mini} +%package -n libcom_err2-mini +%else %package -n libcom_err2 +%endif Summary: E2fsprogs error reporting library License: MIT Group: System/Filesystems @@ -115,10 +155,18 @@ Provides: libcom_err = %{version} Obsoletes: libcom_err <= 1.40 +%if %{build_mini} +%description -n libcom_err2-mini +%else %description -n libcom_err2 +%endif com_err is an error message display library. +%if %{build_mini} +%package -n libcom_err-mini-devel +%else %package -n libcom_err-devel +%endif Summary: Development files for libcom_err License: MIT Group: Development/Libraries/C and C++ @@ -130,11 +178,15 @@ Requires: glibc-devel Requires: libcom_err2 = %version +%if %{build_mini} +%description -n libcom_err-mini-devel +%else %description -n libcom_err-devel +%endif Development files for the com_err error message display library. %prep -%setup -q +%setup -q -n e2fsprogs-%{version} # e2fsprogs patches %patch1 # libcom_err patches @@ -154,6 +206,9 @@ --disable-uuidd \ --disable-fsck \ CFLAGS="$RPM_OPT_FLAGS" +%if %{build_mini} +rm -rf doc +%endif make %{?_smp_mflags} V=1 #Guarantee that tranlations match the source messages make -C po update-po @@ -164,7 +219,7 @@ # Let boot continue even if system clock is wrong install -p -m 644 %{SOURCE4} %{buildroot}/etc/e2fsck.conf -%{find_lang} %{name} +%{find_lang} e2fsprogs rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper rm -f $RPM_BUILD_ROOT/%{_sbindir}/mkfs.ext4dev @@ -209,21 +264,41 @@ #EndUsrMerge %post /sbin/ldconfig +%if ! %{build_mini} %install_info --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz +%endif %postun /sbin/ldconfig +%if ! %{build_mini} %install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz +%endif +%if %{build_mini} +%post -n libext2fs2-mini -p /sbin/ldconfig +%else %post -n libext2fs2 -p /sbin/ldconfig +%endif +%if %{build_mini} +%postun -n libext2fs2-mini -p /sbin/ldconfig +%else %postun -n libext2fs2 -p /sbin/ldconfig +%endif +%if %{build_mini} +%post -n libcom_err2-mini -p /sbin/ldconfig +%else %post -n libcom_err2 -p /sbin/ldconfig +%endif +%if %{build_mini} +%postun -n libcom_err2-mini -p /sbin/ldconfig +%else %postun -n libcom_err2 -p /sbin/ldconfig +%endif -%files -f %{name}.lang +%files -f e2fsprogs.lang %defattr(-, root, root) %doc RELEASE-NOTES README %config /etc/e2fsck.conf @@ -270,9 +345,12 @@ %{_sbindir}/filefrag %{_sbindir}/e2freefrag %{_sbindir}/e4defrag +%if ! %{build_mini} %{_infodir}/libext2fs.info.gz +%endif %{_mandir}/man1/chattr.1.gz %{_mandir}/man1/lsattr.1.gz +%{_mandir}/man5/ext?.5.gz %{_mandir}/man5/e2fsck.conf.5.gz %{_mandir}/man5/mke2fs.conf.5.gz %{_mandir}/man8/*.8.gz @@ -281,7 +359,11 @@ %defattr(-,root,root) %doc README.SUSE +%if %{build_mini} +%files -n libext2fs2-mini +%else %files -n libext2fs2 +%endif %defattr(-, root, root) #UsrMerge /%{_lib}/libext2fs.so.* @@ -290,7 +372,11 @@ %{_libdir}/libext2fs.so.* %{_libdir}/libe2p.so.* +%if %{build_mini} +%files -n libext2fs-mini-devel +%else %files -n libext2fs-devel +%endif %defattr(-, root, root) %{_libdir}/libext2fs.so %ifarch %sparc @@ -302,7 +388,11 @@ %_libdir/pkgconfig/e2p.pc %_libdir/pkgconfig/ext2fs.pc +%if %{build_mini} +%files -n libcom_err2-mini +%else %files -n libcom_err2 +%endif %defattr(-, root, root) #UsrMerge /%{_lib}/libcom_err.so.* @@ -311,7 +401,11 @@ %{_libdir}/libcom_err.so.* %{_libdir}/libss.so.* +%if %{build_mini} +%files -n libcom_err-mini-devel +%else %files -n libcom_err-devel +%endif %defattr(-, root, root) %_bindir/compile_et %_bindir/mk_cmds ++++++ e2fsprogs-1.41.1-splash_support.patch ++++++ --- /var/tmp/diff_new_pack.WMKfpx/_old 2014-02-02 18:08:36.000000000 +0100 +++ /var/tmp/diff_new_pack.WMKfpx/_new 2014-02-02 18:08:36.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- e2fsck/Makefile.in.orig +++ e2fsck/Makefile.in -@@ -68,7 +68,7 @@ OBJS= crc32.o dict.o unix.o e2fsck.o sup +@@ -69,7 +69,7 @@ OBJS= crc32.o dict.o unix.o e2fsck.o sup pass3.o pass4.o pass5.o journal.o badblocks.o util.o dirinfo.o \ dx_dirinfo.o ehandler.o problem.o message.o quota.o recovery.o \ region.o revoke.o ea_refcount.o rehash.o profile.o prof_err.o \ @@ -11,7 +11,7 @@ PROFILED_OBJS= profiled/dict.o profiled/unix.o profiled/e2fsck.o \ profiled/super.o profiled/pass1.o profiled/pass1b.o \ -@@ -107,6 +107,7 @@ SRCS= $(srcdir)/e2fsck.c \ +@@ -108,6 +108,7 @@ SRCS= $(srcdir)/e2fsck.c \ $(srcdir)/rehash.c \ $(srcdir)/region.c \ $(srcdir)/profile.c \ @@ -19,7 +19,7 @@ $(srcdir)/sigcatcher.c \ $(srcdir)/logfile.c \ prof_err.c \ -@@ -539,6 +540,7 @@ region.o: $(srcdir)/region.c $(top_build +@@ -541,6 +542,7 @@ region.o: $(srcdir)/region.c $(top_build $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/mkquota.h \ $(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \ $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h @@ -162,15 +162,15 @@ #include "../version.h" /* Command line options */ -@@ -1165,6 +1166,7 @@ int main (int argc, char *argv[]) +@@ -1169,6 +1170,7 @@ int main (int argc, char *argv[]) e2fsck_t ctx; - blk_t orig_superblock; + blk64_t orig_superblock; struct problem_context pctx; + struct splash_ops *sops; int flags, run_result; int journal_size; int sysval, sys_page_size = 4096; -@@ -1203,6 +1205,7 @@ int main (int argc, char *argv[]) +@@ -1207,6 +1209,7 @@ int main (int argc, char *argv[]) exit(FSCK_ERROR); } reserve_stdio_fds(); @@ -178,7 +178,7 @@ set_up_logging(ctx); if (ctx->logf) { -@@ -1577,6 +1580,7 @@ print_unsupp_features: +@@ -1584,6 +1587,7 @@ print_unsupp_features: fatal_error(ctx, 0); check_if_skip(ctx); check_resize_inode(ctx); ++++++ e2fsprogs-1.42.8.tar.gz -> e2fsprogs-1.42.9.tar.gz ++++++ ++++ 53253 lines of diff (skipped) ++++++ pre_checkin.sh ++++++ #!/bin/sh sed -e 's/Name:.*/Name: e2fsprogs-mini/' \ -e 's/spec file for package.*/&-mini/' \ -e 's/%define.*build_mini.*/%define build_mini 1/' e2fsprogs.spec > e2fsprogs-mini.spec cp e2fsprogs.changes e2fsprogs-mini.changes -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
