--- e2fsprogs-1.41.8.orig/README.subset +++ e2fsprogs-1.41.8/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.8.orig/TODO +++ e2fsprogs-1.41.8/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.8.orig/RELEASE-NOTES +++ e2fsprogs-1.41.8/RELEASE-NOTES @@ -1,5 +1,5 @@ -E2fsprogs 1.41.8-WIP (July 7, 2009) commit: 4bd87f22 -=================================== +E2fsprogs 1.41.8 (July 11, 2009) +================================ Fix resize2fs's online resizing, fixing a regression which in e2fpsrogs 1.41.7. (Addresses Debian Bug: #535452) --- e2fsprogs-1.41.8.orig/.hgignore +++ e2fsprogs-1.41.8/.hgignore @@ -0,0 +1,7 @@ +^autom4te.cache +^build +^FILES +^core +~$ +^.pc +^patches --- e2fsprogs-1.41.8.orig/misc/filefrag.c +++ e2fsprogs-1.41.8/misc/filefrag.c @@ -164,19 +164,20 @@ ext_len, flags); } -int filefrag_fiemap(int fd, int blk_shift, int *num_extents) +static int filefrag_fiemap(int fd, int blk_shift, int *num_extents) { char buf[4096] = ""; struct fiemap *fiemap = (struct fiemap *)buf; struct fiemap_extent *fm_ext = &fiemap->fm_extents[0]; int count = (sizeof(buf) - sizeof(*fiemap)) / sizeof(struct fiemap_extent); - unsigned long long logical_blk = 0, last_blk = 0; + unsigned long long last_blk = 0; unsigned long flags = 0; + unsigned int i; static int fiemap_incompat_printed; int tot_extents = 1, n = 0; - int last = 0, eof = 0; - int i, rc; + int last = 0; + int rc; fiemap->fm_length = ~0ULL; @@ -220,7 +221,7 @@ break; for (i = 0; i < fiemap->fm_mapped_extents; i++) { - __u64 phy_blk, phy_start, logical_blk; + __u64 phy_blk, logical_blk; unsigned long ext_len; phy_blk = fm_ext[i].fe_physical >> blk_shift; @@ -267,7 +268,6 @@ int is_ext2 = 0; static int once = 1; unsigned int flags; - unsigned long first_blk, last_blk; int rc; #ifdef HAVE_OPEN64 @@ -331,7 +331,7 @@ filename, (long long) fileinfo.st_size, numblocks, numblocks == 1 ? "" : "s", bs); if (filefrag_fiemap(fd, int_log2(bs), &num_extents) != 0) { - for (i = 0; i < numblocks; i++) { + for (i = 0, count = 0; i < numblocks; i++) { if (is_ext2 && last_block) { if (((i-EXT2_DIRECT) % bpib) == 0) last_block++; @@ -344,6 +344,7 @@ rc = get_bmap(fd, i, &block); if (block == 0) continue; + count++; if (last_block && (block != last_block+1) ) { if (verbose) printf("Discontinuity: Block %ld is at " @@ -378,7 +379,6 @@ { char **cpp; int c; - int ret; while ((c = getopt(argc, argv, "bsvx")) != EOF) switch (c) { --- e2fsprogs-1.41.8.orig/e2fsck/Makefile.pq +++ e2fsprogs-1.41.8/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 + --- e2fsprogs-1.41.8.orig/resize/Makefile.pq +++ e2fsprogs-1.41.8/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.8.orig/util/Makefile.pq +++ e2fsprogs-1.41.8/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.8.orig/debian/control.in +++ e2fsprogs-1.41.8/debian/control.in @@ -0,0 +1,314 @@ +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), lsb-release +Standards-Version: 3.8.2 +Homepage: http://e2fsprogs.sourceforge.net + +Package: e2fsck-static +Priority: optional +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} +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}) +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} +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 +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. +ifdef(`BUILD_UUID',`` +Package: libuuid1 +Section: libs +Depends: passwd, ${shlibs:Depends} +Recommends: uuid-runtime +Replaces: e2fsprogs (<< 1.34-1) +Architecture: any +Description: Universally Unique ID library + The libuuid library generates and parses 128-bit universally unique + ids (UUIDs). A UUID is an identifier that is unique across both + space and time, with respect to the space of all UUIDs. A UUID can + be used for multiple purposes, from tagging objects with an extremely + short lifetime, to reliably identifying very persistent objects + across a network. + . + See RFC 4122 for more information. + +Package: uuid-runtime +Section: libs +Priority: optional +Depends: passwd, libuuid1 (>> 1.40.3-1), ${shlibs:Depends} +Replaces: e2fsprogs (<= 1.40.3-1ubuntu1) +Architecture: any +Description: runtime components for the Universally Unique ID library + The libuuid library generates and parses 128-bit universally unique + ids (UUIDs). A UUID is an identifier that is unique across both + space and time, with respect to the space of all UUIDs. A UUID can + be used for multiple purposes, from tagging objects with an extremely + short lifetime, to reliably identifying very persistent objects + across a network. + . + See RFC 4122 for more information. + . + This package contains the uuidgen program and the uuidd daemon. + . + The uuidd daemon is used to generate UUIDs, especially time-based + UUID’s, in a secure and guaranteed-unique fashion, even in the face + of large numbers of threads trying to grab UUID’s running on + different CPU’s. It is used by libuuid as well as the uuidgen + program. + +Package: libuuid1-udeb +XC-Package-Type: udeb +Section: debian-installer +Priority: optional +Depends: ${shlibs:Depends} +Architecture: any +Description: stripped down universally unique id library, for debian-installer + libuuid generates and parses 128-bit universally unique ids (UUIDs). + See RFC 4122 for more information. + . + This is a minimal package for debian-installer. + +Package: uuid-dev +Section: libdevel +Priority: extra +Depends: libc6-dev | libc-dev, libuuid1 (= ${mainBinary}) +Replaces: e2fslibs-dev (<< 1.15) +Architecture: any +Description: universally unique id library - headers and static libraries + libuuid generates and parses 128-bit universally unique ids (UUIDs). + See RFC 4122 for more information. + . + This package contains the development environment for the uuid library. +'')dnl +ifdef(`BUILD_BLKID',`` +Package: libblkid1 +Section: libs +Depends: ${shlibs:Depends} +Architecture: any +Description: block device id library + The blkid library which allows system programs like fsck and + mount to quickly and easily find block devices by filesystem UUID and + LABEL. This allows system administrators to avoid specifying + filesystems by hard-coded device names, but via a logical naming + system instead. + +Package: libblkid1-udeb +XC-Package-Type: udeb +Section: debian-installer +Priority: optional +Depends: ${shlibs:Depends} +Architecture: any +Description: stripped down block device id library, for debian-installer + The blkid library which allows system programs like fsck and + mount to quickly and easily find block devices by filesystem UUID and + LABEL. This allows system administrators to avoid specifiying + filesystems by hard-coded device names, but via a logical naming + system instead. + . + This is a minimal package for debian-installer. + +Package: libblkid-dev +Section: libdevel +Priority: extra +Depends: libc6-dev | libc-dev, libblkid1 (= ${binary:Version}) +Architecture: any +Description: block device id library - headers and static libraries + The blkid library which allows system programs like fsck and + mount to quickly and easily find block devices by filesystem UUID and + LABEL. This allows system administrators to avoid specifiying + filesystems by hard-coded device names, but via a logical naming + system instead. + . + This package contains the development environment for the blkid library. +'')dnl + +Package: e2fsprogs-udeb +XC-Package-Type: udeb +Section: debian-installer +Priority: optional +Depends: ${shlibs: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} +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}) +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} +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}) +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. +ifdef(`BUILD_UUID',`` +Package: uuid-runtime-dbg +Section: debug +Priority: extra +Depends: uuid-runtime (= ${binary:Version}) +Architecture: any +Description: debugging information for uuid-runtime + This package includes the debug information useful for debugging the + uuid runtime programs, contained in the uuid-runtime package. + The debugging information is used for execution tracing and core + dump analysis. +'')dnl + +Package: e2fslibs-dbg +Section: debug +Priority: extra +Depends: e2fslibs (= ${binary:Version}) +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}) +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}) +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. +ifdef(`BUILD_BLKID',`` +Package: libblkid1-dbg +Section: debug +Priority: extra +Depends: libblkid1 (= ${binary:Version}) +Architecture: any +Description: debugging information for libblkid1 + This package includes the debug information useful for debugging the + blkid library, contained in the libblkid1 package. The debug + information is used for execution tracing and core dump analysis. +'')dnl +ifdef(`BUILD_UUID',`` +Package: libuuid1-dbg +Section: debug +Priority: extra +Depends: libuuid1 (= ${binary:Version}) +Architecture: any +Description: debugging information for libuuid1 + This package includes the debug information useful for debugging the + UUID library, contained in the libuuid1 package. The debug + information is used for execution tracing and core dump analysis. +'')dnl --- e2fsprogs-1.41.8.orig/debian/rules +++ e2fsprogs-1.41.8/debian/rules @@ -9,6 +9,15 @@ # be paranoid export LC_ALL=C +# no chance that pkg-create-dbgsym can cope with this package's manual construction of -dbg +export NO_PKG_MANGLE=1 + +# Allow distro-specific behaviour +DISTRO :=$(shell lsb_release -is 2>/dev/null || echo Debian) +ifeq ($(DISTRO),Ubuntu) +BUILD_BLKID ?= no +BUILD_UUID ?= no +endif # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -26,10 +35,14 @@ COMERR_SOVERSION = $(shell grep ELF_SO_VERSION lib/et/Makefile.in | cut '-d ' -f3) SS_VERSION = $(shell grep ELF_VERSION lib/ss/Makefile.in | cut '-d ' -f3) SS_SOVERSION = $(shell grep ELF_SO_VERSION lib/ss/Makefile.in | cut '-d ' -f3) +ifneq ($(BUILD_UUID),no) UUID_VERSION = $(shell grep ELF_VERSION lib/uuid/Makefile.in | cut '-d ' -f3) UUID_SOVERSION = $(shell grep ELF_SO_VERSION lib/uuid/Makefile.in | cut '-d ' -f3) +endif +ifneq ($(BUILD_BLKID),no) BLKID_VERSION = $(shell grep ELF_VERSION lib/blkid/Makefile.in | cut '-d ' -f3) BLKID_SOVERSION = $(shell grep ELF_SO_VERSION lib/blkid/Makefile.in | cut '-d ' -f3) +endif EXT2FS_SOVERSION = $(shell grep ELF_SO_VERSION lib/ext2fs/Makefile.in | cut '-d ' -f3) E2P_SOVERSION = $(shell grep ELF_SO_VERSION lib/e2p/Makefile.in | cut '-d ' -f3) @@ -39,22 +52,30 @@ debdir=${topdir}/debian tmpdir=${debdir}/tmp udebdir=${debdir}/e2fsprogs-udeb +ifneq ($(BUILD_BLKID),no) blkidudebdir=${debdir}/libblkid1-udeb +endif +ifneq ($(BUILD_UUID),no) uuidudebdir=${debdir}/libuuid1-udeb +endif libcomerrdir=${debdir}/libcomerr${COMERR_SOVERSION} comerrdevdir=${debdir}/comerr-dev libcomerrdbgdir=${debdir}/libcomerr2-dbg libssdir=${debdir}/libss${SS_SOVERSION} ssdevdir=${debdir}/ss-dev libssdbgdir=${debdir}/libss2-dbg +ifneq ($(BUILD_BLKID),no) libblkiddir=${debdir}/libblkid${BLKID_SOVERSION} libblkiddevdir=${debdir}/libblkid-dev libblkiddbgdir=${debdir}/libblkid1-dbg +endif +ifneq ($(BUILD_UUID),no) libuuiddir=${debdir}/libuuid${UUID_SOVERSION} uuiddevdir=${debdir}/uuid-dev libuuiddbgdir=${debdir}/libuuid1-dbg uuidruntimedir=${debdir}/uuid-runtime uuidruntimedbgdir=${debdir}/uuid-runtime-dbg +endif libext2dir=${debdir}/e2fslibs libext2devdir=${debdir}/e2fslibs-dev libext2dbgdir=${debdir}/e2fslibs-dbg @@ -71,13 +92,17 @@ mandir=${tmpdir}${MANDIR} UDEB_NAME = $(package)-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb -UDEB_PRIORITY = $(shell grep '^Package: e2fsprogs-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2) +UDEB_PRIORITY = $(shell grep '^Package: e2fsprogs-udeb' debian/control.in -A 10 | grep ^Priority: | cut -d ' ' -f 2) +ifneq ($(BUILD_BLKID),no) BLKID_UDEB_NAME = libblkid1-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb -BLKID_UDEB_PRIORITY = $(shell grep '^Package: libblkid1-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2) +BLKID_UDEB_PRIORITY = $(shell grep '^Package: libblkid1-udeb' debian/control.in -A 10 | grep ^Priority: | cut -d ' ' -f 2) +endif +ifneq ($(BUILD_UUID),no) UUID_UDEB_NAME = libuuid1-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb -UUID_UDEB_PRIORITY = $(shell grep '^Package: libuuid1-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2) +UUID_UDEB_PRIORITY = $(shell grep '^Package: libuuid1-udeb' debian/control.in -A 10 | grep ^Priority: | cut -d ' ' -f 2) +endif STAMPSDIR=debian/stampdir CFGSTDSTAMP=${STAMPSDIR}/configure-std-stamp @@ -115,7 +140,15 @@ BF_CCOPTS = -Os -fomit-frame-pointer COMMON_CONF_FLAGS = \ - --enable-elf-shlibs --infodir=/usr/share/info --enable-fsck + --enable-elf-shlibs --infodir=/usr/share/info +ifneq ($(BUILD_BLKID),no) +COMMON_CONF_FLAGS += --enable-fsck +else +COMMON_CONF_FLAGS += --disable-fsck --disable-libblkid +endif +ifeq ($(BUILD_UUID),no) +COMMON_CONF_FLAGS += --disable-libuuid --disable-uuidd +endif STD_CONF_FLAGS = --with-ccopts="${CCOPTS}" --enable-compression @@ -145,6 +178,21 @@ endif endif +M4_ARGS= +ifneq ($(BUILD_BLKID),no) +M4_ARGS+=-DBUILD_BLKID +else +M4_ARGS+=-UBUILD_BLKID +endif +ifneq ($(BUILD_UUID),no) +M4_ARGS+=-DBUILD_UUID +else +M4_ARGS+=-UBUILD_UUID +endif + +debian/control: debian/control.in debian/rules + m4 $(M4_ARGS) < debian/control.in > $@ + ${CFGSTDSTAMP}: dh_testdir @@ -211,7 +259,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} @@ -253,7 +301,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 @@ -325,11 +373,15 @@ ln -s e2fsck fsck.ext3 ; ln -s mke2fs mkfs.ext2 ; \ ln -s mke2fs mkfs.ext3 ; ln -s mke2fs mkfs.ext4) +ifneq ($(BUILD_BLKID),no) mkdir -p ${blkidudebdir}/lib mv ${udebdir}/lib/libblkid.* ${blkidudebdir}/lib +endif +ifneq ($(BUILD_UUID),no) mkdir -p ${uuidudebdir}/lib mv ${udebdir}/lib/libuuid.* ${uuidudebdir}/lib +endif binary-indep: # no arch-independant debs. @@ -358,9 +410,11 @@ # symlinks to prepare dh_installdocs run +ifneq ($(BUILD_BLKID),no) mkdir -p ${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION} mkdir -p ${debdir}/libblkid-dev/usr/share/doc ln -sf libblkid${BLKID_SOVERSION} ${debdir}/libblkid-dev/usr/share/doc/libblkid-dev +endif mkdir -p ${debdir}/libss${SS_SOVERSION}/usr/share/doc/libss${SS_SOVERSION} mkdir -p ${debdir}/ss-dev/usr/share/doc @@ -370,16 +424,20 @@ mkdir -p ${debdir}/comerr-dev/usr/share/doc ln -sf libcomerr${COMERR_SOVERSION} ${debdir}/comerr-dev/usr/share/doc/comerr-dev +ifneq ($(BUILD_UUID),no) mkdir -p ${debdir}/libuuid${UUID_SOVERSION}/usr/share/doc/libuuid${UUID_SOVERSION} mkdir -p ${debdir}/uuid-dev/usr/share/doc # ln -sf libuuid${UUID_SOVERSION} ${debdir}/uuid-dev/usr/share/doc/uuid-dev +endif mkdir -p ${debdir}/e2fslibs/usr/share/doc/e2fslibs mkdir -p ${debdir}/e2fslibs-dev/usr/share/doc ln -sf e2fslibs ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev +ifneq ($(BUILD_BLKID),no) $(INSTALL) -p -m 0644 debian/libblkid.copyright \ ${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION}/copyright +endif dh_installdocs -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb @@ -416,11 +474,19 @@ dh_installinfo -pe2fslibs-dev ${stdbuilddir}/doc/libext2fs.info DH_OPTIONS= dh_installchangelogs -pe2fsprogs \ - -plibblkid${BLKID_SOVERSION} -plibcomerr${COMERR_SOVERSION} \ - -plibss${SS_SOVERSION} -plibuuid${UUID_SOVERSION} \ - -pe2fslibs -puuid-dev -puuid-runtime -pe2fsck-static \ - -pe2fsprogs-dbg -puuid-runtime-dbg -pe2fslibs-dbg \ - -plibcomerr2-dbg -plibss2-dbg -plibblkid1-dbg -plibuuid1-dbg + -plibcomerr${COMERR_SOVERSION} \ + -plibss${SS_SOVERSION} \ + -pe2fslibs -pe2fsck-static \ + -pe2fsprogs-dbg -pe2fslibs-dbg \ + -plibcomerr2-dbg -plibss2-dbg +ifneq ($(BUILD_BLKID),no) + DH_OPTIONS= dh_installchangelogs -plibblkid${BLKID_SOVERSION} \ + -plibblkid1-dbg +endif +ifneq ($(BUILD_UUID),no) + DH_OPTIONS= dh_installchangelogs -plibuuid${UUID_SOVERSION} \ + -puuid-dev -puuid-runtime -puuid-runtime-dbg -plibuuid1-dbg +endif dh_fixperms ifneq ($(ismips),) @@ -431,8 +497,12 @@ # debug package stuff rm -rf ${udebdir}/usr +ifneq ($(BUILD_BLKID),no) rm -rf ${blkidudebdir}/usr +endif +ifneq ($(BUILD_UUID),no) rm -rf ${uuidudebdir}/usr +endif mkdir -p ${debugdir}/usr/lib mv ${maindir}/usr/lib/debug ${debugdir}/usr/lib @@ -441,9 +511,11 @@ ${debugdir}/usr/lib/debug rm -rf ${e2fsckstaticdir}/usr/lib +ifneq ($(BUILD_UUID),no) mkdir -p ${uuidruntimedbgdir}/usr/lib mv ${uuidruntimedir}/usr/lib/debug ${uuidruntimedbgdir}/usr/lib rmdir ${uuidruntimedir}/usr/lib +endif mkdir -p ${libext2dbgdir}/usr/lib mv ${libext2dir}/usr/lib/debug ${libext2dbgdir}/usr/lib @@ -457,17 +529,28 @@ mv ${libssdir}/usr/lib/debug ${libssdbgdir}/usr/lib rmdir ${libssdir}/usr/lib +ifneq ($(BUILD_UUID),no) mkdir -p ${libuuiddbgdir}/usr/lib mv ${libuuiddir}/usr/lib/debug ${libuuiddbgdir}/usr/lib rmdir ${libuuiddir}/usr/lib +endif +ifneq ($(BUILD_BLKID),no) mkdir -p ${libblkiddbgdir}/usr/lib mv ${libblkiddir}/usr/lib/debug ${libblkiddbgdir}/usr/lib rmdir ${libblkiddir}/usr/lib +endif # dpkg symbol handling ifneq (,$(findstring update-symbols,$(DEB_BUILD_OPTIONS))) - for i in e2fslibs libcomerr2 libss2 libblkid1 libuuid1; \ +SYMBOL_LIBS := e2fslibs libcomerr2 libss2 +ifneq ($(BUILD_BLKID),no) +SYMBOL_LIBS += libblkid1 +endif +ifneq ($(BUILD_UUID),no) +SYMBOL_LIBS += libuuid1 +endif + for i in $(SYMBOL_LIBS); \ do \ echo "Generating symbols for $$i..."; \ dpkg-gensymbols -p$$i -Pdebian/$$i > debian/$$i.tmp-patch; \ @@ -480,8 +563,10 @@ $(INSTALL) -p -m 0644 debian/e2fsprogs.copyright \ ${debugdir}/usr/share/doc/e2fsprogs-dbg/copyright +ifneq ($(BUILD_UUID),no) $(INSTALL) -p -m 0644 debian/uuid-runtime.copyright \ ${uuidruntimedbgdir}/usr/share/doc/uuid-runtime-dbg/copyright +endif $(INSTALL) -p -m 0644 debian/e2fslibs.copyright \ ${libext2dbgdir}/usr/share/doc/e2fslibs-dbg/copyright @@ -492,21 +577,29 @@ $(INSTALL) -p -m 0644 debian/libss2.copyright \ ${libssdbgdir}/usr/share/doc/libss2-dbg/copyright +ifneq ($(BUILD_BLKID),no) $(INSTALL) -p -m 0644 debian/libblkid.copyright \ ${libblkiddbgdir}/usr/share/doc/libblkid1-dbg/copyright +endif +ifneq ($(BUILD_UUID),no) $(INSTALL) -p -m 0644 debian/libuuid1.copyright \ ${libuuiddbgdir}/usr/share/doc/libuuid1-dbg/copyright +endif dh_compress dh_makeshlibs -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb dh_makeshlibs -plibcomerr${COMERR_SOVERSION} \ -V 'libcomerr2 (>= 1.33-3)' +ifneq ($(BUILD_BLKID),no) dh_makeshlibs -plibblkid${BLKID_SOVERSION} -V 'libblkid1 (>= 1.39-1)' echo "udeb: libblkid 1 libblkid1-udeb" >> \ debian/libblkid1/DEBIAN/shlibs +endif +ifneq ($(BUILD_UUID),no) echo "udeb: libuuid 1 libuuid1-udeb" >> debian/libuuid1/DEBIAN/shlibs +endif dh_installdeb dh_shlibdeps -l${stdbuilddir}/lib @@ -521,20 +614,34 @@ -u '-v${COMERR_VERSION}-${MAIN_VERSION} -VmainBinary=${MAIN_VERSION}' DH_OPTIONS= dh_gencontrol -pss-dev \ -u '-v${SS_VERSION}-${MAIN_VERSION} -VmainBinary=${MAIN_VERSION}' +ifneq ($(BUILD_UUID),no) DH_OPTIONS= dh_gencontrol -puuid-dev \ -u '-v${UUID_VERSION}-${MAIN_VERSION} -VmainBinary=${MAIN_VERSION}' +endif dh_gencontrol -pe2fsprogs-udeb -- -fdebian/files~ +ifneq ($(BUILD_BLKID),no) dh_gencontrol -plibblkid1-udeb -- -fdebian/files~ +endif +ifneq ($(BUILD_UUID),no) dh_gencontrol -plibuuid1-udeb -- -fdebian/files~ +endif dpkg-distaddfile $(UDEB_NAME) debian-installer $(UDEB_PRIORITY) +ifneq ($(BUILD_BLKID),no) dpkg-distaddfile $(BLKID_UDEB_NAME) debian-installer $(BLKID_UDEB_PRIORITY) +endif +ifneq ($(BUILD_UUID),no) dpkg-distaddfile $(UUID_UDEB_NAME) debian-installer $(UUID_UDEB_PRIORITY) +endif dh_md5sums -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb dh_builddeb -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb dh_builddeb -pe2fsprogs-udeb --filename=$(UDEB_NAME) +ifneq ($(BUILD_BLKID),no) dh_builddeb -plibblkid1-udeb --filename=$(BLKID_UDEB_NAME) +endif +ifneq ($(BUILD_UUID),no) dh_builddeb -plibuuid1-udeb --filename=$(UUID_UDEB_NAME) +endif binary: binary-indep binary-arch --- e2fsprogs-1.41.8.orig/debian/changelog +++ e2fsprogs-1.41.8/debian/changelog @@ -1,3 +1,17 @@ +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 @@ -95,6 +109,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 @@ -148,6 +182,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 @@ -215,6 +257,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 @@ -237,6 +293,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 @@ -358,6 +428,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 @@ -457,6 +549,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.8.orig/debian/control +++ e2fsprogs-1.41.8/debian/control @@ -1,8 +1,9 @@ Source: e2fsprogs Section: admin Priority: required -Maintainer: Theodore Y. Ts'o -Build-Depends: texi2html (>= 1.76), gettext, texinfo, dc, pkg-config, dietlibc-dev (>> 0.30) [alpha amd64 arm hppa i386 ia64 mips mipsel powerpc ppc64 s390 sparc], debhelper (>= 7.0) +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), lsb-release Standards-Version: 3.8.2 Homepage: http://e2fsprogs.sourceforge.net @@ -71,110 +72,6 @@ . This package contains the development environment for the ss library. -Package: libuuid1 -Section: libs -Depends: passwd, ${shlibs:Depends} -Recommends: uuid-runtime -Replaces: e2fsprogs (<< 1.34-1) -Architecture: any -Description: Universally Unique ID library - The libuuid library generates and parses 128-bit universally unique - id's (UUID's). A UUID is an identifier that is unique across both - space and time, with respect to the space of all UUIDs. A UUID can - be used for multiple purposes, from tagging objects with an extremely - short lifetime, to reliably identifying very persistent objects - across a network. - . - See RFC 4122 for more information. - -Package: uuid-runtime -Section: libs -Priority: optional -Depends: passwd, libuuid1 (>> 1.40.3-1), ${shlibs:Depends} -Replaces: e2fsprogs (<= 1.40.3-1ubuntu1) -Architecture: any -Description: runtime components for the Universally Unique ID library - The libuuid library generates and parses 128-bit universally unique - id's (UUID's). A UUID is an identifier that is unique across both - space and time, with respect to the space of all UUIDs. A UUID can - be used for multiple purposes, from tagging objects with an extremely - short lifetime, to reliably identifying very persistent objects - across a network. - . - See RFC 4122 for more information. - . - This package contains the uuidgen program and the uuidd daemon. - . - The uuidd daemon is used to generate UUIDs, especially time-based - UUID’s, in a secure and guaranteed-unique fashion, even in the face - of large numbers of threads trying to grab UUID’s running on - different CPU’s. It is used by libuuid as well as the uuidgen - program. - -Package: libuuid1-udeb -XC-Package-Type: udeb -Section: debian-installer -Priority: optional -Depends: ${shlibs:Depends} -Architecture: any -Description: stripped down universally unique id library, for debian-installer - libuuid generates and parses 128-bit universally unique id's (UUID's). - See RFC 4122 for more information. - . - This is a minimal package for debian-installer. - -Package: uuid-dev -Section: libdevel -Priority: extra -Depends: libc6-dev | libc-dev, libuuid1 (= ${mainBinary}) -Replaces: e2fslibs-dev (<< 1.15) -Architecture: any -Description: universally unique id library - headers and static libraries - libuuid generates and parses 128-bit universally unique id's (UUID's). - See RFC 4122 for more information. - . - This package contains the development environment for the uuid library. - -Package: libblkid1 -Section: libs -Depends: ${shlibs:Depends} -Architecture: any -Description: block device id library - The blkid library which allows system programs like fsck and - mount to quickly and easily find block devices by filesystem UUID and - LABEL. This allows system administrators to avoid specifying - filesystems by hard-coded device names, but via a logical naming - system instead. - -Package: libblkid1-udeb -XC-Package-Type: udeb -Section: debian-installer -Priority: optional -Depends: ${shlibs:Depends} -Architecture: any -Description: stripped down block device id library, for debian-installer - The blkid library which allows system programs like fsck and - mount to quickly and easily find block devices by filesystem UUID and - LABEL. This allows system administrators to avoid specifiying - filesystems by hard-coded device names, but via a logical naming - system instead. - . - This is a minimal package for debian-installer. - -Package: libblkid-dev -Section: libdevel -Priority: extra -Depends: libc6-dev | libc-dev, libblkid1 (= ${binary:Version}) -Architecture: any -Description: block device id library - headers and static libraries - The blkid library which allows system programs like fsck and - mount to quickly and easily find block devices by filesystem UUID and - LABEL. This allows system administrators to avoid specifiying - filesystems by hard-coded device names, but via a logical naming - system instead. - . - This package contains the development environment for the blkid library. - Package: e2fsprogs-udeb XC-Package-Type: udeb Section: debian-installer @@ -246,17 +143,6 @@ The debug information is used for execution tracing and core dump analysis. -Package: uuid-runtime-dbg -Section: debug -Priority: extra -Depends: uuid-runtime (= ${binary:Version}) -Architecture: any -Description: debugging information for uuid-runtime - This package includes the debug information useful for debugging the - uuid runtime programs, contained in the uuid-runtime package. - The debugging information is used for execution tracing and core - dump analysis. - Package: e2fslibs-dbg Section: debug Priority: extra @@ -286,23 +172,3 @@ 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. - -Package: libblkid1-dbg -Section: debug -Priority: extra -Depends: libblkid1 (= ${binary:Version}) -Architecture: any -Description: debugging information for libblkid1 - This package includes the debug information useful for debugging the - blkid library, contained in the libblkid1 package. The debug - information is used for execution tracing and core dump analysis. - -Package: libuuid1-dbg -Section: debug -Priority: extra -Depends: libuuid1 (= ${binary:Version}) -Architecture: any -Description: debugging information for libuuid1 - This package includes the debug information useful for debugging the - UUID library, contained in the libuuid1 package. The debug - information is used for execution tracing and core dump analysis. --- e2fsprogs-1.41.8.orig/lib/ext2fs/Makefile.pq +++ e2fsprogs-1.41.8/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 +