--- e2fsprogs-1.41.10.orig/README.subset +++ e2fsprogs-1.41.10/README.subset @@ -0,0 +1,15 @@ +This distribution contains a subset of the e2fsprogs package; it +contains the base libraries (ss, et, uuid, blkid) which may be used by +other non-ext2-related applications. + +This may be useful for non-Linux operating systems that need these +libraries for GNOME, but who do not need the ext2/ext3 filesystem +utilities. + +The full e2fsprogs distributions can be found at the e2fsprogs web +page, which is: + + http://e2fsprogs.sourceforge.net + +In case of bugs in these libraries, please contact Ted Ts'o at +tytso@mit.edu or tytso@alum.mit.edu. --- e2fsprogs-1.41.10.orig/TODO +++ e2fsprogs-1.41.10/TODO @@ -0,0 +1,277 @@ +Need to process the bad block inode *before* doing the inode scan. + +Also check to see if the first block of the inode table is not on the +bad block scan, and fix that. We need to check for an inaccurate +blocks, and fix them before we start doing anything else with the +filesystem! + +--------------------------------------------------- +User request: + +BTW: Could you please add some sort of deleted and possibly corrupted file + and inode list to e2fsck report. There should be filenames deleted + from directory inodes, files with duplicate blocks e.t.c. + It's pretty annoying to filter this information from e2fsck output + by hand :- + +------------------------------------------ + +Add a "answer Yes always to this class of question" response. + +---------------------------------- + +ext2fs_flush() should return a different error message for primary +versus backup superblock flushing, so that mke2fs can print an +appropriate error message. + +--------------------------------- +Date: Mon, 08 Mar 1999 21:46:14 +0100 +From: Sergio Polini + + +I'm reading the sorce code of e2fsck 1.14. +In pass2.c, lines 352-357, I read: + +if ((dirent->name_len & 0xFF) > EXT2_NAME_LEN) { + if (fix_problem(ctx, PR_2_FILENAME_LONG, &cd->pctx)) { + dirent->name_len = EXT2_NAME_LEN; + dir_modified++; + } +} + +I think that I'll never see any messages about too long filenames, +because "whatever & 0xFF" can never be "> 0xFF". +Am I wrong? +-------------------------------------- + +Add chmod command to debugfs. + +------------------------------------------ + +Date: Tue, 18 Jan 2000 17:54:53 -0800 (PST) +From: Alan Blanchard +To: tytso@MIT.EDU +Subject: DEBUGFS - thanks and a feature idea +Content-Type: TEXT/PLAIN; charset=US-ASCII + +Theodore: + +First, let me thank you for writing debugfs. Recently, my Linux box +(RH 6.0, 400 MHz PIII, on a DSL line) was hacked into. The intruder did +an "rm -Rf" on a 34 GB drive with about 5GB of data on it. I was able to +restore essentially the entire thing with debugfs and a bit of C code and Perl. +Actually, I could have done the entire thing with debugfs and Perl, but I +thought it would be too slow. + +During this exercise, I noticed that one small feature was lacking that would +have made my job a bit easier. The length of a deleted directory is +reported as 0, hence debugfs won't dump the contents of the directory to a +file using the "dump" command. The only thing that saved me was that the +list of disk blocks is not zeroed out. I was able to dump the contents of the +directories by using debugfs to get the relevant block numbers, then +using dd to get the actual data. + +If debugfs had a feature where it ignored the size of a directory reported by +the inode and instead just dumped all the blocks, it would have facilited +things a bit. This seems like a very easy feature to add. + +Again, thanks for writing debugfs (and all the other Linux stuff you've written!). + +Cheers, +Alan Blanchard +alan@abraxas.to + + +------------------------------------------------------------------- + +Date: Fri, 21 Jan 2000 14:07:12 -0800 +From: "H. Peter Anvin" +Subject: mkfs -cc and fsck -c + +b) An option to mkfs to zero the partition. Yes, it can be done with +dd, but it would be a nicer way of doing it. + +------------------------------------------------------------------ + +Add support for in ext2fs_block_iterate() for a returning the +compressed flag blocks to block_iterate. Change default to not return +EXT2_COMPRESSED_BLKADDR. Change e2fsck to pass this flag in. + +(The old compression patches did this by default all the time, which +is bad, since it meant e2fsck never saw the EXT2_COMPRESSED_BLKADDR +flagword. + +------------------------------------------------------------ + +E2fsck should offer to clear all the blocks in an indirect block, not +the entire inode, so there's better recovery for when an indirect +block gets trashed. + + +------------------------------------------------------------- + +From: Yann Dirson - LOGATIQUE +Date: Thu, 2 Mar 2000 13:52:13 +0100 (MET) + +During my experiments on the broken system, I noticed the following in +the badblocks program (which I'm aware is not designed for IDE drives) +- I'd probably have already fixed them if my home system was up :( + +* the syntax summary documents 2nd arg as blocks_count, which should +probably read something like end_count. + +* testing past end of device is not detected, and lists those blocks +as bad, whereas they simply do not exist. + + +I think I'll probably add a "max count" option to findsuper(8), so +that I do not have to wait for the whole disk to be scanned when the +system had to be launched with "init=/bin/sh", in which case Ctrl-[CZ] +and friends appear to be absolutely ignored. + + +Somewhat unrelated, I just noticed the +http://web.mit.edu/tytso/www/linux/ext2.html could be updated: + +- could mention SGI xfs (http://oss.sgi.com/projects/xfs/ - they just + release 0.03 snapshot) + +---------------------------------------------------------------- + +Return-Path: +Date: Thu, 10 Feb 2000 13:20:14 -0500 +From: "Theodore Y. Ts'o" +To: R.E.Wolff@BitWizard.nl +In-Reply-To: Rogier Wolff's message of Thu, 10 Feb 2000 08:46:30 +0100 (MET), + <200002100746.IAA24573@cave.bitwizard.nl> +Subject: Re: e2fsck request for enhancement. +Phone: (781) 391-3464 + + Date: Thu, 10 Feb 2000 08:46:30 +0100 (MET) + From: R.E.Wolff@BitWizard.nl (Rogier Wolff) + + Lately, while trying to recover a broken disk, my system froze (twice, + until I tried something else) while copying the disk. + + So I had a file of about 50Mb that was growing frantically at the + moment of the crash. + + e2fsck, then finds an indirect block that is completely bogus. It + starts by asking me if it's ok to clear a few of the referenced + blocks. I say yes. Then it comes to the conclusion: + + too many invalid blocks. Clear inode? + + and then I get the option to delete the whole file. Not to truncate + the file to a "working" size. + + + I'd MUCH rather have e2fsck say something like: + + inode 1234 references an invalid block 134345454. Hmm. + inode 1234 references 567 out of 50176 invalid blocks, + all near the end. Truncate file to 49152 blocks? + + Here you can see that of the 1024 blocks near the end of the file, + only 567 were detected as invalid. However now 48Mb of the file will + be recovered, instead of thrown away. + +That's a good point. Actually, the right thing is for e2fsck to offer +to clear all of the bad blocks in a particular indirect block. I don't +know how hard it would be to do that, but I'll put it on my e2fsprogs +TODO list. + + - Ted + +--------------------------------------------------------------- +From e2fsprogs Debian TODO file as of 1.10-13. + +* Maybe make -dbg packages. Look at how others do it. + +--------------------------------------------------------------- + +Add --lba option to debian icheck command, and have ways of making it +easier to translate LBA to filesystem block numbers. + +------------------------------------------------------- + + + +List of projects for e2fsprogs: + + +1) Make debugfs's "ncheck " command list all of the pathnames +to an inode, not just only the first link to the inode which is found. +(A good "intro to libext2fs programming interfaces project) + + Difficulty: Low Priority: Low + +2) Use a code coverage tool such as Rational's PureCoverage to see +what kind of code coverage we have for e2fsck, and try to add test +cases to increase the code coverage for e2fsck. + + Difficulty: Medium Priorty: Low + +3) Use a code coverage tool such as Rational's PureCoverage to see +what kind of code coverage we have for resize2fs, and try to add test +cases to increase the code coverage for resize2fs. + + Difficulty: Medium Priorty: Medium + +4) Create a new I/O manager (i.e., test_io.c, unix_io.c, et.al.) which +layers on top of an existing I/O manager which provides copy-on-write +functionality. This COW I/O manager takes will take two open I/O +managers, call them "base" and "changed". The "base" I/O manager is +opened read/only, so any changes are written instead to the "changed" +I/O manager, in a compact, non-sparse format containing the intended +modification to the "base" filesystem. + +This will allow resize2fs to figure out what changes need to made to +extend a filesystem, or expand the size of inodes in the inode table, +and the changes can be pushed the filesystem in one fell swoop. (If +the system crashes; the program which runs the "changed" file can be +re-run, much like a journal replay. My assumption is that the COW +file will contain the filesystem UUID in a the COW superblock, and the +COW file will be stored in some place such as /var/state/e2fsprogs, +with an init.d file to automate the replay so we can recover cleanly +from a crash during the resize2fs process.) + + Difficulty: Medium Priority: Medium + +5) Create a new I/O manager (i.e., test_io.c, unix_io.c, et.al.) which +layers on top of an existing I/O manager which provides an "undo" +functionality. This undo I/O manager takes will take two open I/O +managers, call them "base" and "undo". The "base" I/O manager is be +opened read/write, and when any writes are sent to the I/O manager, +the I/O manager will check the "undo" I/O manager, using a file format +identical to the one found in (5) above. + +This is useful for allowing e2fsck to create an "undo" file, which +would make things like "e2fsck -y" much safer. + + Difficulty: Low (once 5 is done) Priority: Low + +6) Modify resize2fs so that it can relocate and reorganize the +filesystem in the following ways: (1) increase the inode size, so that +an existing filesystem can use the EA-in-inode kernel patch, (2) +reserve blocks in the resize inode to allow for on-line resizing. Use +the COW I/O manager described in (5) in order to provide robustness in +case of a crash during the resize/reorganization operation. + + Difficulty: High Priority: Medium + +7) Review the EA-in-inode patches to e2fsck for correctness/code +cleanliness. (I will probably have to do this myself -- Ted) + + Difficulty: High Priorty: Medium + +8) Add support for extent maps to e2fsprogs. I need to review the +extent maps first/in parallel. + + Difficulty: High Priority: Medium + +---------------------------------- + +Need to deal with the case where the resize inode overlaps with the +bad blocks inode. + --- e2fsprogs-1.41.10.orig/debian/control.in +++ e2fsprogs-1.41.10/debian/control.in @@ -1,11 +1,12 @@ Source: e2fsprogs Section: admin Priority: required -Maintainer: Theodore Y. Ts'o +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Theodore Y. Ts'o ifdef(`UTIL_LINUX_NG', -``Build-Depends: texi2html (>= 1.76), gettext, texinfo, dc, pkg-config, dietlibc-dev (>> 0.30) [alpha amd64 arm hppa i386 ia64 powerpc ppc64 s390 sparc], debhelper (>= 7.0), m4, libblkid-dev (>= 2.16), uuid-dev (>= 2.16) +``Build-Depends: texi2html (>= 1.76), gettext, texinfo, dc, pkg-config, debhelper (>= 7.0), m4, libblkid-dev (>= 2.16), uuid-dev (>= 2.16) '', -``Build-Depends: texi2html (>= 1.76), gettext, texinfo, dc, pkg-config, dietlibc-dev (>> 0.30) [alpha amd64 arm hppa i386 ia64 powerpc ppc64 s390 sparc], debhelper (>= 7.0), m4 +``Build-Depends: texi2html (>= 1.76), gettext, texinfo, dc, pkg-config, debhelper (>= 7.0), m4 '')dnl Standards-Version: 3.8.3 Homepage: http://e2fsprogs.sourceforge.net --- e2fsprogs-1.41.10.orig/debian/control +++ e2fsprogs-1.41.10/debian/control @@ -0,0 +1,175 @@ +Source: e2fsprogs +Section: admin +Priority: required +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Theodore Y. Ts'o +Build-Depends: texi2html (>= 1.76), gettext, texinfo, dc, pkg-config, debhelper (>= 7.0), m4, libblkid-dev (>= 2.16), uuid-dev (>= 2.16) +Standards-Version: 3.8.3 +Homepage: http://e2fsprogs.sourceforge.net + +Package: e2fsck-static +Priority: optional +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: sash | bash-static | zsh-static | busybox-static | zsh30-static +Architecture: any +Description: statically-linked version of the ext2/ext3/ext4 filesystem checker + This may be of some help to you if your filesystem gets corrupted enough + to break the shared libraries used by the dynamically linked checker. + . + This binary takes much more space than its dynamic counterpart located + in e2fsprogs, though. + . + You may want to install a statically-linked shell as well, to be able + to run this program if something like your C library gets corrupted. + +Package: libcomerr2 +Section: libs +Provides: libcomerr-kth-compat +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: e2fsprogs (<< 1.34-1) +Architecture: any +Description: common error description library + libcomerr is an attempt to present a common error-handling mechanism to + manipulate the most common form of error code in a fashion that does not + have the problems identified with mechanisms commonly in use. + +Package: comerr-dev +Section: libdevel +Priority: extra +Depends: libc6-dev | libc-dev, libcomerr2 (= ${mainBinary}), ${misc:Depends} +Suggests: doc-base +Replaces: e2fslibs-dev (<< 1.33-2), libkrb5-dev (<< 1.3) +Architecture: any +Description: common error description library - headers and static libraries + libcom_err is an attempt to present a common error-handling mechanism to + manipulate the most common form of error code in a fashion that does not + have the problems identified with mechanisms commonly in use. + . + This package contains the development environment for the com_err library. + +Package: libss2 +Section: libs +Depends: libcomerr2, ${shlibs:Depends}, ${misc:Depends} +Replaces: e2fsprogs (<< 1.34-1) +Architecture: any +Description: command-line interface parsing library + This package includes a tool that parses a command table to generate + a simple command-line interface parser, the include files needed to + compile and use it, and the static libs. + . + It was originally inspired by the Multics SubSystem library. + +Package: ss-dev +Section: libdevel +Priority: extra +Depends: libc6-dev | libc-dev, libss2 (= ${mainBinary}), comerr-dev, ${misc:Depends} +Architecture: any +Description: command-line interface parsing library - headers and static libraries + This package includes a tool that parses a command table to generate + a simple command-line interface parser, the include files needed to + compile and use it, and the static libs. + . + It was originally inspired by the Multics SubSystem library. + . + This package contains the development environment for the ss library. + +Package: e2fsprogs-udeb +XC-Package-Type: udeb +Section: debian-installer +Priority: optional +Depends: ${shlibs:Depends}, ${misc:Depends} +Architecture: any +Description: stripped-down versions of e2fsprogs, for debian-installer + This package is an e2fsprogs package built for a reduced size, so that + it can help to save space in debian-installer. + . + Don't attempt to install this package, it has no support for a couple of + features you surely want. Anyway it should refuse to install. + +Package: e2fslibs +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: e2fsprogs (<< 1.34-1) +Provides: libext2fs2, libe2p2 +Architecture: any +Description: ext2/ext3/ext4 file system libraries + The ext2, ext3 and ext4 file systems are successors of the original ext + ("extended") file system. They are the main file system types used for + hard disks on Debian and other Linux systems. + . + This package provides the ext2fs and e2p libraries, for userspace software + that directly accesses extended file systems. Programs that use libext2fs + include e2fsck, mke2fs, and tune2fs. Programs that use libe2p include + dumpe2fs, chattr, and lsattr. + +Package: e2fslibs-dev +Section: libdevel +Priority: extra +Depends: libc6-dev | libc-dev, comerr-dev, e2fslibs (= ${binary:Version}), ${misc:Depends} +Suggests: doc-base +Provides: ext2fs-dev, e2p-dev +Replaces: libkrb5-dev (<< 1.3) +Architecture: any +Description: ext2/ext3/ext4 file system libraries - headers and static libraries + The ext2, ext3 and ext4 file systems are successors of the original ext + ("extended") file system. They are the main file system types used for + hard disks on Debian and other Linux systems. + . + This package contains the development environment for the ext2fs and e2p + libraries. + +Package: e2fsprogs +Essential: yes +Pre-Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>= 2.15~rc1-1) +Suggests: gpart, parted, e2fsck-static +Conflicts: dump (<< 0.4b4-4), quota (<< 1.55-8.1), initscripts (<< 2.85-4), sysvinit (<< 2.85-4) +Replaces: hurd (<= 20040301-1), libblkid1 (<< 1.38+1.39-WIP-2005.12.10-2), libuuid1 (<< 1.38+1.39-WIP-2005.12.10-2) +Architecture: any +Description: ext2/ext3/ext4 file system utilities + The ext2, ext3 and ext4 file systems are successors of the original ext + ("extended") file system. They are the main file system types used for + hard disks on Debian and other Linux systems. + . + This package contains programs for creating, checking, and maintaining + ext-based file systems, and the generic fsck wrapper. + +Package: e2fsprogs-dbg +Section: debug +Priority: extra +Depends: e2fsprogs (= ${binary:Version}), ${misc:Depends} +Architecture: any +Description: debugging information for e2fsprogs + This package includes the debug information useful for debugging e2fsprogs + and its libraries, contained in the e2fsprogs and e2fsck-static packages. + The debug information is used for execution tracing and core + dump analysis. + +Package: e2fslibs-dbg +Section: debug +Priority: extra +Depends: e2fslibs (= ${binary:Version}), ${misc:Depends} +Architecture: any +Description: debugging information for e2fslibs + This package includes the debug information useful for debugging the + ext2fs and e2p libraries, contained in the e2fslibs package. The debug + information is used for execution tracing and core dump analysis. + +Package: libcomerr2-dbg +Section: debug +Priority: extra +Depends: libcomerr2 (= ${binary:Version}), ${misc:Depends} +Architecture: any +Description: debugging information for libcomerr2 + This package includes the debug information useful for debugging the + com_err library, contained in the libcomerr2 package. The debugging + information is used for execution tracing and core dump analysis. + +Package: libss2-dbg +Section: debug +Priority: extra +Depends: libss2 (= ${binary:Version}), ${misc:Depends} +Architecture: any +Description: debugging information for libss2 + This package includes the debug information useful for debugging the + ss library, contained in the libss2 package. The debug information + is used for execution tracing and core dump analysis. --- e2fsprogs-1.41.10.orig/debian/e2fsprogs.preinst +++ e2fsprogs-1.41.10/debian/e2fsprogs.preinst @@ -0,0 +1,17 @@ +#!/bin/sh + +set -e + +if [ -f /etc/e2fsck.conf ]; then + MD5=$(md5sum /etc/e2fsck.conf) + + if [ "$MD5" = "71563145349a6c512471c495ad8d5143" ]; then + rm -f /etc/e2fsck.conf + else + sed -i -e '/\bbuggy_init_scripts\b/d' /etc/e2fsck.conf + fi +fi + +#DEBHELPER# + +exit 0 --- e2fsprogs-1.41.10.orig/debian/changelog +++ e2fsprogs-1.41.10/debian/changelog @@ -1,3 +1,23 @@ +e2fsprogs (1.41.10-1ubuntu2) lucid; urgency=low + + * Add fsck.ext4 symlink to e2fsprogs-udeb. + + -- Colin Watson Fri, 26 Feb 2010 18:03:35 +0000 + +e2fsprogs (1.41.10-1ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - Do not build-depend on dietlibc-dev, which is universe. + - Do now allow pkg-create-dbgsym to operate on this package. + - Always use external libblkid and libuuid from util-linux, rather than + building our own. + - Includes debian/control in the source package to force the above. + - Build with -O2 on powerpc to avoid a suspected toolchain bug + (LP: #450214). + - Do not include /etc/e2fsck.conf and remove on upgrade. + + -- Scott James Remnant Wed, 17 Feb 2010 10:53:45 +0000 + e2fsprogs (1.41.10-1) unstable; urgency=low * New upstream release @@ -67,6 +87,138 @@ -- Theodore Y. Ts'o Sun, 07 Feb 2010 20:56:47 -0500 +e2fsprogs (1.41.9-1ubuntu4) lucid; urgency=low + + * Update from GIT maint branch: + + [Michael Roth] + + * Update .gitignore + + [Cristian Rodríguez] + + * fix fd leak that causes fsck to fail with "too many open files" + + [Eric Sandeen] + + * mke2fs: get device topology values from blkid + * configure.in: Fix typo: remove '2' from blkid_probe_get_topology2 + * resize2fs: exit fix_sb_journal_backup early for external journal + * libext2fs: don't swap extent-based journal backup + * mke2fs support for BLKDISCARD + * mke2fs: open device writable for trim/discard + + [Peng Tao] + + * resize2fs: calculate minimal fs size only once + * resize2fs: fix minimum resize size calculation with flex_bg. redhat: + #519131 + * debugfs: add matching fclose. novell: #524526 + + [Theodore Ts'o] + + * tune2fs: Fix "tune2fs -j " for extent-enabled filesystems. + launchpad: #416648 + * e2fsck: Avoid scary failure messages on low-memory systems. + Closes: #509529 + * debian: Make sure libblkid1 and libblkid1-dbg have changelogs + * dumpe2fs: Print more information about the inline journal + * configure.in, configure: Drop --with-cc, --with-ccopts, --with-ldopts. + sourceforge: #2843248 + * tune2fs.8: Document the flex_bg file system option in the man page. + sourceforge: #2822186 + * mke2fs.8.in: Clarify flex_bg feature description + * libext2fs: Round up the bitmap size when allocating a new bitmap. + sourceforge: #2328708 + * e2undo: Initialize com_err error tables for the ext2fs library + * libext2fs: Add error table initialization to test programs + * blkid: Avoid a potentially error message when running "make clean" + * e2fsck: Use the correct problem code in the case of LAST_WRITE_FUDGED + * Don't use in-tree header files if using system uuid or blkid libraries + * tests: Account for new mke2fs topology information + * libext2fs: Always build file_io.c + * e2fsck: Interpret negative blkcount in file system problem reports. + sourceforge: #2871782 + * e2fsck: Fix handling of non-zero i_blocks_high field + * e2fsck: Accept superblock times to be fudged by up to 24 hours by default + * libext2fs: Fix FEATURE_RO_COMPAT_HUGE_FILE && !HUGE_FILE_FL + * dumpe2fs: Fix usage message for -o superblock= and -o + blocksize=. launchpad: #448099 + * tune2fs.8: Clarify tune2fs's -i option + * debian: Add pre-depends for util-linux for util-linux-ng builds. + Closes: #551795 + * debian: Fix pre-depends relation for util-linux-ng + * libss: initialize function pointer for readline_shutdown() + * e2fsck: Fix duplicate directory entries for non-indexed directories. + sourceforge: #2862551 + * configure: Work around bug in autoconf 2.64 + * e2fsck: Fix directory with holes even when i_size is wrong + * e2fsck: Move check to add an index to a directory after fixing i_size + * filefrag: Fix a core dump on sparc32 platforms with 8k file systems + * e2fsck: detect holes in extent-mapped directories + * libext2fs: Fix SET_BMAP bugs in ext2fs_bmap() and ext2fs_bmap2() + * e2fsck: Fix block allocation for holes in extent-mapped directories + * e2fsck: Don't rehash directories which can fit in a single directory block + * e2fsck: Try to update on-disk bitmap in e2fsck_get_alloc_block() callback + * tests: Add new test f_holedir2 + * debian: Fix FTBFS problem caused by texi2html changing its output + location. Closes: #552934 + * debian: Add source lintian overrides + + [Karel Zak] + + * blkid: support .ko.gz in modules.dep parser + * libext2fs: handle <=linux-2.6.19 bug in /proc/swaps + + [localization folks] + + * po: update vi.po (from translationproject.org) (Clytie Siddall) + * po: update pl.po (from translationproject.org) (Jakub Bogusz) + * po: update cs.po (from translationproject.org) (Petr Pisar) + * po: update id.po (from translationproject.org) (Arif E. Nugroho) + + remaining changes: + - Do not build-depend on dietlibc-dev, which is universe. + - Do now allow pkg-create-dbgsym to operate on this package. + - Do not include /etc/e2fsck.conf and remove on upgrade. + - Always regenerate debian/control + + -- Scott James Remnant Sat, 06 Feb 2010 00:30:22 -0800 + +e2fsprogs (1.41.9-1ubuntu3) karmic; urgency=low + + * Build e2fsprogs-udeb with -O2 on powerpc to avoid a suspected toolchain bug + (LP: #450214). + + -- Luke Yelavich Sat, 24 Oct 2009 17:03:42 +1100 + +e2fsprogs (1.41.9-1ubuntu2) karmic; urgency=low + + * Applied patch (sent upstream) to ignore a future last mount, write or + check time by up to 24 hrs when fsck called with -p ("preen", ie. + fix minor problems without human intervention). LP: #268808. + + -- Scott James Remnant Mon, 12 Oct 2009 16:35:14 +0100 + +e2fsprogs (1.41.9-1ubuntu1) karmic; urgency=low + + * Merge from Debian, remaining changes: + - Do not build-depend on dietlibc-dev, which is universe. + - Do now allow pkg-create-dbgsym to operate on this package. + - Use external libblkid and libuuid from util-linux, rather than + building our own. + - Do not include /etc/e2fsck.conf and remove on upgrade. + + * Included a couple of extra revisions from GIT maint: + - (ffd8078) e2freefrag: Update manpage to include e2fsprogs version + and release date + - (31b5a2b) mke2fs.conf: Use the feature name "extent" instead of + "extents" + - (8bafedb) tune2fs: Fix "tune2fs -j " for extent-enabled + filesystems. LP: #416648. + + -- Scott James Remnant Tue, 25 Aug 2009 18:34:46 +0100 + e2fsprogs (1.41.9-1) unstable; urgency=low * New upstream release @@ -111,6 +263,26 @@ -- Theodore Y. Ts'o Mon, 20 Jul 2009 09:38:21 -0400 +e2fsprogs (1.41.8-1ubuntu2) karmic; urgency=low + + * Remove /etc/e2fsck.conf on upgrade. + + -- Scott James Remnant Fri, 17 Jul 2009 10:31:13 +0100 + +e2fsprogs (1.41.8-1ubuntu1) karmic; urgency=low + + * Merge from Debian, remaining changes: + - Do not build-depend on dietlibc-dev, which is universe. + - Do now allow pkg-create-dbgsym to operate on this package. + - Use external libblkid from util-linux, rather than building our own + (conditional on lsb_release, debian/control mangling via m4) + + * Use external libuuid from util-linux, rather than building our own. + * Cherry pick 9d4bade from GIT maint: + - filefrag: Restore "perfect" number of extents calculation for ext2/ext3 + + -- Scott James Remnant Wed, 15 Jul 2009 15:58:37 +0100 + e2fsprogs (1.41.8-1) unstable; urgency=low * New upstream release @@ -208,6 +380,26 @@ -- Theodore Y. Ts'o Fri, 30 May 2009 13:26:23 -0400 +e2fsprogs (1.41.5-1ubuntu3) karmic; urgency=low + + * debian/control.in: Add build-dependency on lsb-release. + + -- Scott James Remnant Wed, 06 May 2009 17:00:56 +0100 + +e2fsprogs (1.41.5-1ubuntu2) karmic; urgency=low + + * Use external libblkid from util-linux, rather than building our own. + + -- Scott James Remnant Wed, 29 Apr 2009 18:19:46 +0100 + +e2fsprogs (1.41.5-1ubuntu1) karmic; urgency=low + + * Merge with Debian unstable, remaining changes: + - Do not build-depend on dietlibc-dev, which is in universe. + - Do not allow pkg-create-dbgsym to operate on this package. + + -- Scott James Remnant Wed, 29 Apr 2009 12:11:35 +0100 + e2fsprogs (1.41.5-1) unstable; urgency=low * New upstream release @@ -261,6 +453,14 @@ -- Theodore Y. Ts'o Sun, 19 Apr 2009 23:05:53 -0400 +e2fsprogs (1.41.4-1ubuntu1) jaunty; urgency=low + + * Update to new upstream release, LP: #327206. Remaining changes: + - Do not build-depend on dietlibc-dev, which is in universe. + - Do not allow pkg-create-dbgsym to operate on this package. + + -- Scott James Remnant Thu, 12 Feb 2009 15:26:29 +0000 + e2fsprogs (1.41.4-1) unstable; urgency=low * New upstream release @@ -328,6 +528,20 @@ -- Theodore Y. Ts'o Tue, 27 Jan 2009 11:50:49 -0500 +e2fsprogs (1.41.3-1ubuntu2) jaunty; urgency=low + + * Install mkfs.ext4 symlink in e2fsprogs-udeb. + + -- Colin Watson Thu, 08 Jan 2009 14:16:28 +0000 + +e2fsprogs (1.41.3-1ubuntu1) intrepid; urgency=low + + * Update at upstream author's suggestion, remaining changes: + - Do not build-depend on dietlibc-dev, which is in universe. + - Do not allow pkg-create-dbgsym to operate on this package. + + -- Scott James Remnant Mon, 13 Oct 2008 13:58:42 +0100 + e2fsprogs (1.41.3-1) unstable; urgency=low * New upstream release @@ -350,6 +564,20 @@ -- Theodore Y. Ts'o Sun, 12 Oct 2008 22:45:34 -0400 +e2fsprogs (1.41.2-1ubuntu2) intrepid; urgency=low + + * Do not allow pkg-create-dbgsym to operate on this package; missing + from previous changelog entry thus missed out. Oops. + + -- Scott James Remnant Mon, 06 Oct 2008 12:41:23 +0100 + +e2fsprogs (1.41.2-1ubuntu1) intrepid; urgency=low + + * Update at upstream author's suggestion, remaining change: + - Do not build-depend on dietlibc-dev, which is in universe. + + -- Scott James Remnant Mon, 06 Oct 2008 10:52:59 +0100 + e2fsprogs (1.41.2-1) unstable; urgency=low * New upstream release @@ -471,6 +699,28 @@ -- Theodore Y. Ts'o Sat, 23 Aug 2008 08:56:47 -0400 +e2fsprogs (1.41.0-3ubuntu3) intrepid; urgency=low + + * Revert previous attempt to fix FTBFS, it didn't work. Disable + pkg-create-dbgsym altogether. There is no way that poor pkg-create-dbgsym + could cope with this packages' very "custom" way of producing *-dbg. + + -- Martin Pitt Mon, 11 Aug 2008 16:31:31 +0200 + +e2fsprogs (1.41.0-3ubuntu2) intrepid; urgency=low + + * debian/rules: don't build a -dbg package for e2fsck-static, as this + appears to confuse the dbgsym handler on the Ubuntu buildds. + + -- Steve Langasek Fri, 08 Aug 2008 23:15:10 +0000 + +e2fsprogs (1.41.0-3ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable (LP: #254152, #246461), remaining changes: + - Do not build-depend on dietlibc-dev, which is in universe. + + -- Steve Langasek Fri, 08 Aug 2008 20:32:11 +0000 + e2fsprogs (1.41.0-3) unstable; urgency=medium * Fix mips-specific FTBFS problem in debian/rules file @@ -570,6 +820,12 @@ -- Theodore Y. Ts'o Tue, 17 Jun 2008 23:57:08 -0400 +e2fsprogs (1.40.11-1ubuntu1) intrepid; urgency=low + + * Do not build-depend on dietlibc-dev, it's in Universe (LP: #251746). + + -- Luca Falavigna Fri, 25 Jul 2008 11:23:54 +0200 + e2fsprogs (1.40.11-1) unstable; urgency=low * Change mke2fs, tune2fs and resize2fs to use floating point precision --- e2fsprogs-1.41.10.orig/debian/rules +++ e2fsprogs-1.41.10/debian/rules @@ -9,13 +9,10 @@ # be paranoid export LC_ALL=C - -# Allow distro-specific behaviour -DISTRO :=$(shell sed -ne '/DISTRIB_ID/s/.*=//p' /etc/lsb-release 2>/dev/null || echo Debian) -SYS_BLKID_VER := $(shell dpkg-query -W libblkid1 | cut -f 2 | cut -b 1) -ifeq ($(SYS_BLKID_VER),2) +# no chance that pkg-create-dbgsym can cope with this package's manual construction of -dbg +export NO_PKG_MANGLE=1 +# always build with libblkid and libuuid from util-linux UTIL_LINUX_NG ?= yes -endif # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -125,7 +122,11 @@ E2FSCK_STATIC = ${stdbuilddir}/e2fsck/e2fsck.static endif +ifeq ($(DEB_HOST_ARCH),powerpc) +BF_CFLAGS = -O2 -fomit-frame-pointer +else BF_CFLAGS = -Os -fomit-frame-pointer +endif COMMON_CONF_FLAGS = \ --enable-elf-shlibs --infodir=/usr/share/info @@ -242,7 +243,7 @@ mkdir -p ${STAMPSDIR} touch ${CFGSTATICSTAMP} -build: build-std build-bf $(BUILD_STATIC) +build: debian/control build-std build-bf $(BUILD_STATIC) build-std: ${BUILDSTDSTAMP} ${BUILDSTDSTAMP}: ${CFGSTDSTAMP} @@ -282,7 +283,7 @@ $(MAKE) -C ${staticbuilddir}/e2fsck all e2fsck.static touch ${BUILDSTATICSTAMP} -clean: +clean: debian/control dh_testdir rm -rf ${STAMPSDIR} [ ! -f ${stdbuilddir}/Makefile ] || $(MAKE) -C ${stdbuilddir} distclean @@ -351,7 +352,8 @@ -a ! -name resize2fs -a ! -name badblocks -print | xargs rm (cd ${udebdir}/sbin; ln -s e2fsck fsck.ext2 ; \ - ln -s e2fsck fsck.ext3 ; ln -s mke2fs mkfs.ext2 ; \ + ln -s e2fsck fsck.ext3 ; ln -s e2fsck fsck.ext4 ; \ + ln -s mke2fs mkfs.ext2 ; \ ln -s mke2fs mkfs.ext3 ; ln -s mke2fs mkfs.ext4) ifneq ($(UTIL_LINUX_NG),yes) @@ -453,6 +455,8 @@ -pe2fsprogs-dbg -pe2fslibs-dbg \ -plibcomerr2-dbg -plibss2-dbg ifneq ($(UTIL_LINUX_NG),yes) + DH_OPTIONS= dh_installchangelogs -plibblkid${BLKID_SOVERSION} \ + -plibblkid1-dbg DH_OPTIONS= dh_installchangelogs -plibuuid${UUID_SOVERSION} \ -puuid-dev -puuid-runtime -puuid-runtime-dbg -plibuuid1-dbg \ -plibblkid${BLKID_SOVERSION} -plibblkid1-dbg --- e2fsprogs-1.41.10.orig/lib/ext2fs/Makefile.pq +++ e2fsprogs-1.41.10/lib/ext2fs/Makefile.pq @@ -0,0 +1,49 @@ +TOPSRC=..\.. +LIBNAME=EXT2.LIB +OBJFILE=EXT2.LST + +OBJS= alloc.obj \ + alloc_tables.obj \ + badblocks.obj \ + bb_compat.obj \ + bb_inode.obj \ + bitmaps.obj \ + bitops.obj \ + block.obj \ + bmap.obj \ + bmove.obj \ + check_desc.obj \ + closefs.obj \ + cmp_bitmaps.obj \ + dblist.obj \ + dblist_dir.obj \ + dirblock.obj \ + dir_iterate.obj \ + dupfs.obj \ + expanddir.obj \ + fileio.obj \ + freefs.obj \ + get_pathname.obj \ + icount.obj \ + initialize.obj \ + inline.obj \ + inode.obj \ + ismounted.obj \ + link.obj \ + lookup.obj \ + mkdir.obj \ + namei.obj \ + native.obj \ + newdir.obj \ + openfs.obj \ + read_bb.obj \ + read_bb_file.obj \ + rs_bitmap.obj \ + rw_bitmaps.obj \ + swapfs.obj \ + unlink.obj \ + valid_blk.obj \ + version.obj + +!include $(TOPSRC)\powerquest\MCONFIG + --- e2fsprogs-1.41.10.orig/util/Makefile.pq +++ e2fsprogs-1.41.10/util/Makefile.pq @@ -0,0 +1,10 @@ +TOPSRC=.. + +!include $(TOPSRC)\powerquest\MCONFIG + +ALL:: libecho.exe + +libecho.exe: libecho.c + +clean:: + $(RM) libecho.exe --- e2fsprogs-1.41.10.orig/resize/Makefile.pq +++ e2fsprogs-1.41.10/resize/Makefile.pq @@ -0,0 +1,11 @@ +TOPSRC=.. +LIBNAME=RESIZE.LIB +OBJFILE=RESIZE.LST + +OBJS= extent.obj \ + ext2_block_move.obj \ + ext2_inode_move.obj \ + resize2fs.obj + +!include $(TOPSRC)\powerquest\MCONFIG + --- e2fsprogs-1.41.10.orig/e2fsck/Makefile.pq +++ e2fsprogs-1.41.10/e2fsck/Makefile.pq @@ -0,0 +1,9 @@ +TOPSRC=.. +LIBNAME=E2FSCK.LIB +OBJFILE=E2FSCK.LST + +OBJS= e2fsck.obj super.obj pass1.obj pass2.obj pass3.obj \ + pass4.obj pass5.obj dirinfo.obj + +!include $(TOPSRC)\powerquest\MCONFIG +