Merge lp://staging/~xnox/ubuntu/quantal/e2fsprogs/merge into lp://staging/ubuntu/quantal/e2fsprogs
| Status: | Merged |
|---|---|
| Merge reported by: | Martin Pitt |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~xnox/ubuntu/quantal/e2fsprogs/merge |
| Merge into: | lp://staging/ubuntu/quantal/e2fsprogs |
| Diff against target: |
101744 lines (+26748/-50330) 206 files modified
.gitignore (+2/-1) .pc/add-C-to-chattr-usage/misc/chattr.c (+343/-0) .pc/applied-patches (+0/-1) .pc/fix-blhc-warnings/MCONFIG.in (+262/-0) .pc/fix-blhc-warnings/configure (+12770/-0) .pc/fix-blhc-warnings/configure.in (+1266/-0) .pc/fix-blhc-warnings/e2fsck/Makefile.in (+576/-0) .pc/fix-blhc-warnings/lib/ext2fs/Makefile.in (+949/-0) .pc/fix-blhc-warnings/lib/uuid/Makefile.in (+214/-0) .pc/fix-blhc-warnings/misc/Makefile.in (+683/-0) .pc/fix-version.h-datestamp/version.h (+11/-0) .pc/git-update-to-3b0018beee/config/config.guess (+0/-1561) .pc/git-update-to-3b0018beee/config/config.sub (+0/-1686) .pc/git-update-to-3b0018beee/configure (+0/-12746) .pc/git-update-to-3b0018beee/configure.in (+0/-1247) .pc/git-update-to-3b0018beee/debugfs/debugfs.c (+0/-2409) .pc/git-update-to-3b0018beee/e2fsck/e2fsck.conf.5.in (+0/-402) .pc/git-update-to-3b0018beee/e2fsck/iscan.c (+0/-142) .pc/git-update-to-3b0018beee/e2fsck/logfile.c (+0/-383) .pc/git-update-to-3b0018beee/e2fsck/pass5.c (+0/-851) .pc/git-update-to-3b0018beee/e2fsck/quota.c (+0/-90) .pc/git-update-to-3b0018beee/e2fsck/scantest.c (+0/-144) .pc/git-update-to-3b0018beee/e2fsck/unix.c (+0/-1727) .pc/git-update-to-3b0018beee/e2fsprogs.spec (+0/-242) .pc/git-update-to-3b0018beee/lib/config.h.in (+0/-611) .pc/git-update-to-3b0018beee/lib/ext2fs/Makefile.in (+0/-939) .pc/git-update-to-3b0018beee/lib/ext2fs/bitops.h (+0/-680) .pc/git-update-to-3b0018beee/lib/ext2fs/blkmap64_rb.c (+0/-824) .pc/git-update-to-3b0018beee/lib/ext2fs/crc32c.c (+0/-1144) .pc/git-update-to-3b0018beee/lib/ext2fs/ext2fs.h (+0/-1748) .pc/git-update-to-3b0018beee/lib/ext2fs/gen_bitmap.c (+0/-560) .pc/git-update-to-3b0018beee/lib/ext2fs/gen_bitmap64.c (+0/-792) .pc/git-update-to-3b0018beee/lib/ext2fs/get_pathname.c (+0/-172) .pc/git-update-to-3b0018beee/lib/ext2fs/icount.c (+0/-850) .pc/git-update-to-3b0018beee/lib/ext2fs/ismounted.c (+0/-389) .pc/git-update-to-3b0018beee/lib/ext2fs/mkjournal.c (+0/-629) .pc/git-update-to-3b0018beee/lib/ext2fs/rbtree.h (+0/-180) .pc/git-update-to-3b0018beee/lib/ext2fs/tst_bitmaps.c (+0/-577) .pc/git-update-to-3b0018beee/lib/ext2fs/tst_bitmaps_cmd.ct (+0/-39) .pc/git-update-to-3b0018beee/lib/ext2fs/tst_bitmaps_cmds (+0/-46) .pc/git-update-to-3b0018beee/lib/ext2fs/tst_bitmaps_exp (+0/-92) .pc/git-update-to-3b0018beee/misc/e2image.c (+0/-1363) .pc/git-update-to-3b0018beee/misc/fsck.c (+0/-1344) .pc/git-update-to-3b0018beee/misc/ismounted.c (+0/-216) .pc/git-update-to-3b0018beee/misc/mke2fs.c (+0/-2605) .pc/git-update-to-3b0018beee/misc/tune2fs.c (+0/-2227) .pc/git-update-to-3b0018beee/version.h (+0/-11) .pc/quota-FTBFS-fix/lib/quota/quotaio.c (+394/-0) MCONFIG.in (+21/-0) Makefile.in (+2/-0) README (+1/-1) RELEASE-NOTES (+174/-0) configure (+36/-7) configure.in (+26/-5) debian/changelog (+71/-0) debian/control (+1/-1) debian/control.in (+1/-1) debian/e2fslibs.symbols (+3/-0) debian/patches/add-C-to-chattr-usage (+19/-0) debian/patches/fix-blhc-warnings (+335/-0) debian/patches/fix-version.h-datestamp (+19/-0) debian/patches/git-update-to-3b0018beee (+0/-2358) debian/patches/quota-FTBFS-fix (+25/-0) debian/patches/series (+4/-1) debian/rules (+21/-16) debugfs/debugfs.c (+4/-6) debugfs/util.c (+8/-1) doc/libext2fs.texinfo (+4/-4) e2fsck/Makefile.in (+60/-35) e2fsck/jfs_user.h (+2/-2) e2fsck/journal.c (+38/-26) e2fsck/logfile.c (+3/-0) e2fsck/pass1.c (+3/-3) e2fsck/pass5.c (+2/-4) e2fsck/problem.c (+8/-3) e2fsck/problem.h (+3/-0) e2fsck/quota.c (+13/-18) e2fsck/recovery.c (+12/-13) e2fsck/super.c (+5/-1) e2fsck/unix.c (+26/-10) e2fsprogs.lsm (+5/-5) e2fsprogs.spec (+1/-1) lib/Makefile.bsd-lib (+1/-1) lib/Makefile.elf-lib (+5/-8) lib/blkid/blkid.pc.in (+1/-1) lib/config.h.in (+0/-3) lib/e2p/e2p.pc.in (+1/-1) lib/e2p/feature.c (+10/-0) lib/e2p/pf.c (+1/-0) lib/et/com_err.pc.in (+1/-1) lib/ext2fs/Makefile.in (+9/-2) lib/ext2fs/blkmap64_rb.c (+1/-1) lib/ext2fs/block.c (+17/-2) lib/ext2fs/ext2_fs.h (+4/-0) lib/ext2fs/ext2_io.h (+3/-0) lib/ext2fs/ext2fs.h (+1/-46) lib/ext2fs/ext2fs.pc.in (+1/-1) lib/ext2fs/extent.c (+5/-2) lib/ext2fs/getsectsize.c (+26/-0) lib/ext2fs/inline.c (+51/-2) lib/ext2fs/inode.c (+2/-2) lib/ext2fs/io_manager.c (+17/-0) lib/ext2fs/mmp.c (+9/-28) lib/ext2fs/openfs.c (+1/-1) lib/ext2fs/rw_bitmaps.c (+9/-15) lib/ext2fs/test_io.c (+6/-1) lib/ext2fs/unix_io.c (+55/-29) lib/quota/Makefile.in (+11/-12) lib/quota/dqblk_v2.h (+5/-17) lib/quota/mkquota.c (+71/-29) lib/quota/mkquota.h (+3/-2) lib/quota/quota.h (+0/-155) lib/quota/quota.pc.in (+1/-1) lib/quota/quotaio.c (+2/-10) lib/quota/quotaio.h (+26/-26) lib/quota/quotaio_tree.h (+2/-1) lib/quota/quotaio_v2.c (+5/-46) lib/quota/quotaio_v2.h (+3/-52) lib/ss/ss.pc.in (+1/-1) lib/uuid/Makefile.in (+3/-3) lib/uuid/uuid.pc.in (+1/-1) misc/Makefile.in (+20/-18) misc/chattr.1.in (+26/-18) misc/chattr.c (+2/-1) misc/dumpe2fs.c (+20/-8) misc/e2image.8.in (+26/-26) misc/tune2fs.8.in (+1/-1) po/cs.po (+719/-708) po/de.po (+772/-747) po/e2fsprogs.pot (+318/-312) po/fr.po (+722/-707) po/nl.po (+728/-710) po/pl.po (+711/-705) po/sv.po (+712/-706) po/vi.po (+725/-707) resize/resize2fs.8.in (+30/-30) tests/Makefile.in (+31/-19) tests/d_loaddump/expect (+3/-3) tests/d_loaddump/script (+6/-7) tests/defaults/e_script (+2/-2) tests/e_brel_bma/script (+1/-2) tests/e_icount_normal/name (+1/-1) tests/e_irel_ima/script (+1/-2) tests/f_dup4/script (+2/-3) tests/f_dup_de/script (+1/-2) tests/f_dup_resize/script (+2/-3) tests/f_eofblocks/expect.1 (+13/-0) tests/f_eofblocks/expect.2 (+7/-0) tests/f_eofblocks/name (+1/-0) tests/f_ext_journal/name (+1/-0) tests/f_h_badnode/script (+1/-2) tests/f_h_badroot/script (+1/-2) tests/f_h_normal/script (+1/-2) tests/f_h_reindex/script (+1/-2) tests/f_h_unsigned/script (+1/-2) tests/f_imagic_fs/script (+1/-2) tests/f_jnl_32bit/expect.0 (+568/-0) tests/f_jnl_32bit/expect.1 (+16/-0) tests/f_jnl_32bit/expect.2 (+7/-0) tests/f_jnl_32bit/name (+1/-0) tests/f_jnl_32bit/script (+4/-0) tests/f_jnl_64bit/expect.0 (+929/-0) tests/f_jnl_64bit/expect.1 (+16/-0) tests/f_jnl_64bit/expect.2 (+7/-0) tests/f_jnl_64bit/name (+1/-0) tests/f_jnl_64bit/script (+4/-0) tests/f_jnl_errno/expect.0 (+48/-0) tests/f_jnl_errno/expect.1 (+9/-0) tests/f_jnl_errno/expect.2 (+7/-0) tests/f_jnl_errno/name (+1/-0) tests/f_jnl_errno/script (+4/-0) tests/f_mmp/script (+9/-10) tests/f_mmp_garbage/script (+4/-5) tests/f_orphan_extents_inode/expect.1 (+10/-0) tests/f_orphan_extents_inode/expect.2 (+7/-0) tests/f_orphan_extents_inode/name (+1/-0) tests/f_orphan_indirect_inode/expect.1 (+2/-0) tests/f_orphan_indirect_inode/expect.2 (+7/-0) tests/f_orphan_indirect_inode/name (+1/-0) tests/f_orphan_indirect_inode/script (+2/-0) tests/f_rehash_dir/name (+1/-0) tests/f_resize_inode/script (+5/-7) tests/f_uninit_ext_past_eof/expect.1 (+7/-0) tests/f_uninit_ext_past_eof/expect.2 (+7/-0) tests/f_uninit_ext_past_eof/name (+1/-0) tests/f_uninit_last_uninit/script (+1/-2) tests/f_unused_itable/name (+1/-1) tests/i_e2image/script (+5/-8) tests/m_mkfs_overhead/script (+3/-5) tests/m_mmp/script (+3/-3) tests/r_inline_xattr/script (+3/-5) tests/r_move_itable/script (+6/-7) tests/r_resize_inode/script (+6/-7) tests/run_e2fsck (+26/-13) tests/t_ext_jnl_rm/script (+3/-5) tests/t_mmp_1on/script (+7/-8) tests/t_mmp_2off/script (+7/-8) tests/test_one.in (+69/-0) tests/test_post (+17/-0) tests/test_script.in (+11/-68) tests/u_mke2fs/script (+3/-5) tests/u_tune2fs/script (+3/-5) util/Makefile.in (+5/-1) util/install-symlink.in (+89/-0) util/symlinks.c (+385/-0) version.h (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~xnox/ubuntu/quantal/e2fsprogs/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pitt | Approve | ||
|
Review via email:
|
|||
Description of the change
e2fsprogs (1.42.4-3ubuntu1) quantal; urgency=low
.
* Merge from Debian unstable (LP: #978012), remainging changes:
- debian/control.in:
Drop build dependency on dc, which hasn't been needed for some time.
Update maintainer field.
- debian/rules:
Block pkg-create-dbgsym from operating on this package.
Build without dietlibc-dev, which is in universe
- debian/control:
Regenerate with ./debian/rules debian/control
.
e2fsprogs (1.42.4-3) unstable; urgency=medium
.
* Add the -C option to chattr's usage message
* Fix e2fsprogs so it is blhc (build log hardening check) clean. This
fixed e2fsck.static which previously was not getting built with the
security hardening flags.
.
e2fsprogs (1.42.4-2) unstable; urgency=medium
.
* Fix FTBFS problem on the hurd and freebsd platforms
.
e2fsprogs (1.42.4-1) unstable; urgency=medium
.
* New upstream version
* Fix 64-bit block number bugs in e2fsck, dumpe2fs, and debugfs which
could corrupt file systems
* Fixed e2fsck's handling of how errors propagate from the journal to
the file system superblock
* Fixed a false positive complaint from e2fsck if all of the extents
in the last extent block are uninitialized and located after the
end of the file.
* dumpe2fs will display the journal's error indicator in the
superblock if it is set
* Fixed a bug which caused e2fsck to incorrectly use O_EXCLUSIVE in
some corner cases.
* Fix truncation of extent-mapped inodes in e2fsck and libext2fs
* Fixed i_blocks accounting in bigalloc file systems.
* Add support for btrfs's No_COW flag to lsattr and chattr
* Debugfs interprets the date strings of the form "@ddd" as ddd
seconds after the epoch
* Updated/fixed various man pages (Closes: #674453, #674694)
.
e2fsprogs (1.42.3-1) unstable; urgency=low
.
* New upstream version
* Fix bugs on 32-bit systems which could corrupt > 16TB file systems
* Quiet complaints in e2fsck when the total free blocks or inodes are
incorrect in the superblock after an system crash, since we don't
update nor depend on the superblock summaries at each commit boundary
* Fixed support for (hidden) quota files built into ext4; in
particular, don't rewrite the quota inode unless the quotas are
inconsistent
* Optimized reading and writing bitmaps if direct I/O was enabled
* Update Czech, Dutch, French, German, Polish, Sweedish, and
Vietnamese translations
* Fixed incorrect indentation in tune2fs man page
* Update debian policy compliance to 3.9.3
| Dimitri John Ledkov (xnox) wrote | # |
Thanks, looks good! When I actually try to merge this I get tons of conflicts (argh UDD), so I just uploaded this from your branch, verified the debdiff, let the package importer take care of it, and manually set this to merged.
FYI, for sponsors it's a lot easier, faster, and more robust to just add a debdiff to a sponsoring bug.