diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 353 | ||||
| -rw-r--r-- | debian/comerr-dev.doc-base | 2 | ||||
| -rw-r--r-- | debian/control.in | 18 | ||||
| -rw-r--r-- | debian/e2fsck-static.preinst | 19 | ||||
| -rw-r--r-- | debian/e2fslibs-dev.doc-base | 2 | ||||
| -rw-r--r-- | debian/e2fslibs-dev.files.in | 6 | ||||
| -rw-r--r-- | debian/e2fslibs.files.in | 4 | ||||
| -rw-r--r-- | debian/e2fslibs.symbols | 21 | ||||
| -rw-r--r-- | debian/e2fsprogs.preinst | 19 | ||||
| -rw-r--r-- | debian/libblkid-dev.files.in | 2 | ||||
| -rw-r--r-- | debian/libblkid1.files.in | 2 | ||||
| -rw-r--r-- | debian/libcomerr2.files.in | 2 | ||||
| -rw-r--r-- | debian/libss2.files.in | 2 | ||||
| -rw-r--r-- | debian/libuuid1.files.in | 2 | ||||
| -rwxr-xr-x | debian/rules | 208 | ||||
| -rwxr-xr-x | debian/scripts/test-backtrace | 34 | ||||
| -rw-r--r-- | debian/source.lintian-overrides | 1 |
17 files changed, 584 insertions, 113 deletions
diff --git a/debian/changelog b/debian/changelog index 1835a4c9..39167aa8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,356 @@ +e2fsprogs (1.42.10-1) unstable; urgency=medium + + * New upstream version + * The mke2fs program no longer requires a force (-F) option when + when creating a file system in a regular file, since this is a very + common use case when managing virtual machine images + * The mke2fs program will now ask for confirmation before wiping out a + pre-existing file system, partition label, or physical volume + * Fix e2fsck so that it properly handles an inconsistent quota inode. + Previously the quota inode could be completely corrupted, and + missing quota records could be not noticed + * Fix mke2fs so if packed metadata blocks are enabled that the block + group checksum are set correctly + * Debugfs has new commands to allow the quota inode to be queried directly + * Tune2fs will allow removal of dirty journal with two "-f" options + (Closes: #559301) + * Fixed some off-line resize2fs bugs when relocating metadata blocks + when growing or shrinking bigalloc file systems + * Fixed resize2fs's calculation of the minimum required file system + size. This allows resize2fs -M to shrink the file system more + aggressively + * Fixed resize2fs to properly handle shrinking a very large and empty + file system to a very very small size + * Fixed e4defrag to work with 64-bit and bigalloc file systems + * Fixed e2fsck to not issue a large number of very scary (but + harmless) corruption messages when checking very large file systems + when the file system has more inodes than the number of seconds + since January 1, 1970. + * E2fsck will now check the whole file system if file system problems + are detected durings its initial "pass 0" sanity check + * Filefrag now prints the "shared extent" flag which is used by some + file systems such as btrfs + * The mke2fs program would previously correctly omit the resize_inode + feature when creating a file system > 16TB when the fs size was + determined automatically. It will now also do the right thing when + the user explicitly specifies the file system size. + * The message printed by logsave is now much less scary (Closes: #468821) + * Fix spelling typo in the package descriptions + * Update Czech, Dutch, French, German, Polish, Spanish, Sweedish, and + Vietnamese translations (Closes: #703048) + * Update/fix various man pages + * Fix debian/rules compatibility problem with GNU make 4.0 + + -- Theodore Y. Ts'o <tytso@mit.edu> Sun, 18 May 2014 22:54:38 -0400 + +e2fsprogs (1.42.9-3) unstable; urgency=medium + + * Add the ability for mke2fs to create hugefiles + * Add support for the sparse_super2 compat feature + * Mke2fs can now force all of the metadata blocks to be at the + beginning of the file system + * Fix loopback mount detection (Closes: #497984) + * Add support to mke2fs to create a file system at an offset + (Closes: #417385) + * Mention badblocks in the package description (Closes: #718725) + * Update/fix various man pages (Closes: #719184, #719189) + * Improve e2fsck's "superblock corrupt" message (Closes: #719185) + * Miscellaneous Coverity clean ups + + -- Theodore Y. Ts'o <tytso@mit.edu> Tue, 04 Feb 2014 22:17:22 -0500 + +e2fsprogs (1.42.9-2) unstable; urgency=low + + * Fix lintian warning: debian-changelog-has-wrong-weekday + * Fix lintian warning: non-standard-dir-perm by using dh_strip's + --dbg-package option instead of manually managing the debug files + * Fix printf type format mismatch in e2image + * Improved debugfs's error reporting when parsing block numbers + * Use consistent configure options across the multiple e2fsprogs + builds; this means that e2fsck.static will now use the blkid library + shipped with util-linux, instead of the internal one shipped with + the e2fsprogs sources. + + -- Theodore Y. Ts'o <tytso@mit.edu> Mon, 30 Dec 2013 16:56:50 -0500 + +e2fsprogs (1.42.9-1) unstable; urgency=low + + * New upstream version + * NMU ack (Closes: #698879) + * Fix cross-build support (Closes: #721365) + * mke2fs will detect an attempt to create a file system on a + loop-mounted image file + * Fixed a large number of bugs in resize2fs, e2fsck, debugfs, to + handle bigalloc and 64-bit file systems. + * Tune2fs will no longer allow changing the uuid on a mounted file + system with the uninit_bg feature enabled. + * E2fsck will properly allocate a new extent tree block in the rare + case where one is needed when rehashing an extent-mapped directory. + * Mke2fs wil now properly set the LARGE_FILE feature when creating a + journal > 2GB. + * Debugfs will now correctly handle free a range of inodes using the + freei command. + * E2fsck will no longer complain if an external journal was exactly + 2**32 blocks. + * E2fsck will not longer try to add a missing lost+found directory + when run in read-only mode. + * Fixed some buffer overrun bugs when creating standard e2image files + * Mke2fs will not try to set both the meta_bg and resize_inode feature + when the extended option "-E resize=NNN" is specified by the user. + * Dumpe2fs will no longer abort when trying to print the journal + information from an e2image-created image file. + * Debugfs's "write" command can now create a sparse files + * Debugfs can now support a command line which is up to 8k long + * E2image will refuse to create a raw or qcomw image using a mounted + file system unless the -f option is given. + * E2image has been made more useful for efficiently copying file + systems using the -ra options. New options to help with this use + case that were added: -o, -O, -p, and -c. + * Fixed a regression introduced in 1.42.8 which would cause e2fsck to + erroneously report uninitialized extents past i_size to be invalid. + * Fixed cases where resize2fs could corrupt a file system, especially + when shrinking a file system. (Closes: #660793) + * Fixed resize2fs and e2fsck to not crash when operating on a file + system with the MMP feature enabled. + * Fixed debugfs's write command to properly create a zero-length file + (instead of creating an invalid inode). + * Fixed e2fsck to not crash when trying to delete an invalid + extent-mapped symlink. + * Improved debugfs's help texts + * Fixed a potential integer overflow problem in e2freefrag + (Closes: #718205) + * The config.guess and config.sub files have been updated to the + latest to help with the ppcle port. (Closes: #732076) + * Updated/fixed various man pages. (Closes: #586218, #669730, + #698076, #731329) + + -- Theodore Y. Ts'o <tytso@mit.edu> Sat, 28 Dec 2013 23:18:36 -0500 + +e2fsprogs (1.42.8-1) unstable; urgency=low + + * New upstream version + * Work around Debian Bug #712530 (Closes: #708307) + * Fix e2fsck so it can check a read-only root file system with an + external journal. (Closes: #707030) + * Fix off-line resizing of file systems with flex_bg && !resize_inode + (Closes: #696746) + * Change mke2fs so that it does not set the root directory to the real + uid/gid of the mke2fs process. Add the extended option root_owner to + override this behavior. + * If an invalid journal size is given to mke2fs, it will now complain + and exit sooner. + * Fix resize2fs when shrinking file systems to make sure that bitmap + blocks aren't left outside the bounds of the shrunken file system. + This could happen with flex_bg file systems that were grown using + the old online resizing algorithm. + * E2fsck will now detect and repair corrupted extent trees which contain + invalid extents at the end of the extent tree leaf block. + * E2fsck will now longer complain about zero length extended attribute values. + * Fix a regression introduced in e2fsprogs v1.42 which caused e2image -s + to crash. + * Add safety check so tune2fs will not attempt to set the inode size to + be larger than the block size. + * Enhance chattr to allow clearing the extent flag if the kernel allows it + * Fix e2image with large (> 32-bit) file systems (Closes: #703067) + * Mke2fs will not give warnings about the bigalloc and quota options in + quiet mode. + * Debugfs was erroneously giving spurious error messages for certain + extent_inode subcommands which take arguments (split_node, + replace_node, and insert_node). This has been fixed. + * Fix the parsing of the 's' (sectors) in parse_num_blocks2, which among + other programs is used by mke2fs. + * Fix texinfo incompatibilities (Closes: #712365) + * Updated/fixed various man pages (Closes: #712429, #712430, #707609) + * Update German translation + + -- Theodore Y. Ts'o <tytso@mit.edu> Thu, 20 Jun 2013 23:09:25 -0500 + +e2fsprogs (1.42.7-1) unstable; urgency=low + + * New upstream version + * Add warning indicating that the quota and bigalloc features are + still under development. + * Added new options to filefrag to be consistent with the version from + Lustre + * Optimized e2fsck's CPU utilization + * Fixed e2fsck so it detects and fixes inconsistencies in the interior + nodes of an inode's extent tree + * Fixed a potential memory corruption failure in e2fsck's error path if + the call to ext2fs_open2() fails. + * Fixed e2fsck if its logging function is enabled in e2fsck.conf, and + the resulting file name for the log file is longer than 100 bytes, + that it properly handles this situation instead of crashing. + * E2fsck will now report the amount of memory that it attempted to + allocate when a memory allocation request fails, to make it easier to + track down the problem. + * Fixed a bug in resize2fs which could cause severe file system + corruption when growing an ext4 file system which was formatted with + fewer-than-normal reserved gdt blocks + * Fixed resize2fs to be able to handle off-line resizes of file + systems with the flex_bg feature and without any reserved gdt + blocks or if the file system did not have the resize_inode feature + * Further optimize resize2fs so it doesn't use quite as much CPU when + resizing very large file systems. + * Fixed 32-bit overflow bugs which could cause resize2fs to fail and + possibly corrupt the file system while resizing 64-bit file systems. + * Fixed a big which could cause resize2fs to corrupt bigalloc file systems. + * Fix a crash while mke2fs is parsing "-E resize=NNN" with the 64bit + file system feature enabled + * Added better error checking to mke2fs to check for invalid + parameters when creating bigalloc file system. + * When creating bigalloc filesystems, the -g option to mke2fs will now + specify the number of clusters per block group. + * Added the "symlink", "zap_block", "block_dump", and "extent_open" + commands to debugfs + * Fixed debugfs's htree command so that all its messages are sent + through the pager. + * Fixed debugfs's dump_file and cat functions so they work correctly + on file systems with a block size greater than 8k. + * Fixed mke2fs's handling of the mmp_update_interval option + * Fixed e2freefrag so it works on 64-bit file systems, and so it uses + much less memory. + * E2image can now include all data blocks in the e2image output + file when the user specifies the -a option. + * Fixed debugfs's mknod command so that it updates the block group + statistics + * Document the bigalloc feature in the mke2fs man page. + (Closes: #669730) + * Update Czech, Dutch, French, German, Polish, Sweedish, and + Vietnamese translations + + -- Theodore Y. Ts'o <tytso@mit.edu> Tue, 21 Jan 2013 21:52:58 -0500 + +e2fsprogs (1.42.6-1) unstable; urgency=low + + * New upstream version + * Fix build dependencies to avoid requiring dc, and to allow + cross-building to work (Closes: #677497) + * Updated/fixed various man pages + * Mke2fs will now update its progress indicators at most once a second + to avoid overwhelming serial consoles. + * Resize2fs will support lazy_itable_init, speeding up off-line growth + of uninit_bg file systems. + * Resize2fs now supports on-line resizing 64-bit file systems beyond + 16TB. A number of bugs in resize2fs which prevented this have been + fixed. + * Resize2fs now correctly handles resizing 32-bit file systems to 16TB. + * Fixed a potential segfault in e2fsck when there is an I/O error + while reading the superblock. + + -- Theodore Y. Ts'o <tytso@mit.edu> Fri, 21 Sep 2012 12:14:41 -0400 + +e2fsprogs (1.42.5-1.1) unstable; urgency=low + + * Non-maintainer upload. + * e2fsck-static, e2fsprogs: let preinst remove a symbolic link in + /usr/share/doc, that should have been replaced with a directory since + 1.39+1.40-WIP-2006.10.02+dfsg-1. (Closes: #698879). + + -- Nicolas Boulenguez <nicolas@debian.org> Fri, 22 Feb 2013 23:14:59 +0100 + +e2fsprogs (1.42.5-1) unstable; urgency=low + + * New upstream version + * Mark the e2fsprogs package as Multi-Arch: foreign, so if a package + foo:i386 depends on e2fsprogs and is installed on an amd64 system, + the native e2fsprogs will satisfy the dependency. (Closes: #678395) + * Fix a fd leak which could cause logsave (and hence a boot-time rc + init script) to hang (Closes: #682592) + * Fix a problem if e2fsck where if the root file system is mounted + read-only, e2fsck would not clear an error indication in the journal + superblock. Combined with a kernel bug, this would cause the e2fsck + to check the file system after every single boot + * Fixed filefrag so it would not seg fault on virtual filesystems such + as /proc: e.g., "filefrag /proc/partitions" + * Fix filefrag so that it correctly reports the number of extents + * Fixed a bug which caused "mke2fs -N 256 -t ext4 /tmp/foo.img 256m" + to write blocks out until /tmp filled + * Fixed a bug in how e2fsck would uniquify directory entry names + * Change e2fsck so it will allow file systems mounted read-only to be + checked with the -f option. + * Fix e2fsck so that the file system is marked as containing an + error if the user chooses not to fix the quota usage information. + * Fix tune2fs so that it correctly removes the quota feature when + the last quota inode is removed. + * Fix tune2fs so that after removing a quota inode, the block bitmap + is updated; otherwise, e2fsck would complain after running 'tune2fs + -O ^quota <dev>'. + * Fix tune2fs so that when converting a file system from using legacy + quota files to the new quota file system feature with hidden quota + files, the accounting for these files is handled correctly so that + e2fsck doesn't complain. + * The e4defrag program now allows device symlinks, such as + /dev/mapper/testvg-testlv, instead of insisting on less + human-friendly names such as /dev/dm-2 + * Updated/fixed various man pages (Closes: #680114) + + -- Theodore Y. Ts'o <tytso@mit.edu> Sun, 29 Jul 2012 19:59:56 -0400 + +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. + + -- Theodore Y. Ts'o <tytso@mit.edu> Wed, 13 Jun 2012 16:03:24 -0400 + +e2fsprogs (1.42.4-2) unstable; urgency=medium + + * Fix FTBFS problem on the hurd and freebsd platforms + + -- Theodore Y. Ts'o <tytso@mit.edu> Tue, 12 Jun 2012 18:26:40 -0400 + +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) + + -- Theodore Y. Ts'o <tytso@mit.edu> Tue, 12 Jun 2012 18:20:55 -0400 + +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 + + -- Theodore Y. Ts'o <tytso@mit.edu> Mon, 14 May 2012 14:43:09 -0400 + +e2fsprogs (1.42.2-2) unstable; urgency=low + + * Fixed e2fsck.conf's man page (Closes: #646963) + * Fixed 32-bit binary compatibility problem for the libext2fs shared + library introduced in 1.42.2 + * mke2fs will no longer fail if the /etc/mtab file is not present + + -- Theodore Y. Ts'o <tytso@mit.edu> Mon, 09 Apr 2012 14:54:33 -0400 + e2fsprogs (1.42.2-1) unstable; urgency=low * New upstream version diff --git a/debian/comerr-dev.doc-base b/debian/comerr-dev.doc-base index ccde9543..463eb767 100644 --- a/debian/comerr-dev.doc-base +++ b/debian/comerr-dev.doc-base @@ -8,5 +8,5 @@ Abstract: A library, and associated utilities, Section: Programming Format: HTML -Index: /usr/share/doc/comerr-dev/html-info/com_err_toc.html +Index: /usr/share/doc/comerr-dev/html-info/com_err.html Files: /usr/share/doc/comerr-dev/html-info/*.html diff --git a/debian/control.in b/debian/control.in index 135ca92f..3982974e 100644 --- a/debian/control.in +++ b/debian/control.in @@ -9,10 +9,11 @@ Source: e2fsprogs Section: admin Priority: required Maintainer: Theodore Y. Ts'o <tytso@mit.edu> -Build-Depends: texi2html (>= 1.76), gettext, texinfo, dc, pkg-config, DIETLIBC_DEFINES gcc-multilib [mips mipsel], debhelper (>= 7.0), UTIL_LINUX_NG_DEFINES m4 -Standards-Version: 3.9.2 +Build-Depends: gettext, texinfo, pkg-config, DIETLIBC_DEFINES gcc-multilib [mips mipsel], debhelper (>= 7.0), UTIL_LINUX_NG_DEFINES m4 +Standards-Version: 3.9.5 Homepage: http://e2fsprogs.sourceforge.net +ifdef(`E2FSCK_STATIC',`` Package: e2fsck-static Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends} @@ -27,6 +28,7 @@ Description: statically-linked version of the ext2/ext3/ext4 filesystem checker . 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. +'')dnl Package: libcomerr2 Section: libs @@ -122,6 +124,7 @@ Description: runtime components for the Universally Unique ID library different CPU’s. It is used by libuuid as well as the uuidgen program. +ifdef(`UDEB_PKGS',`` Package: libuuid1-udeb XC-Package-Type: udeb Section: debian-installer @@ -133,6 +136,7 @@ Description: stripped down universally unique id library, for debian-installer See RFC 4122 for more information. . This is a minimal package for debian-installer. +'')dnl Package: uuid-dev Section: libdevel @@ -157,6 +161,7 @@ Description: block device id library filesystems by hard-coded device names, but via a logical naming system instead. +ifdef(`UDEB_PKGS',`` Package: libblkid1-udeb XC-Package-Type: udeb Section: debian-installer @@ -171,6 +176,7 @@ Description: stripped down block device id library, for debian-installer system instead. . This is a minimal package for debian-installer. +'')dnl Package: libblkid-dev Section: libdevel @@ -187,6 +193,7 @@ Description: block device id library - headers and static libraries This package contains the development environment for the blkid library. '')dnl +ifdef(`UDEB_PKGS',`` Package: e2fsprogs-udeb XC-Package-Type: udeb Section: debian-installer @@ -197,8 +204,9 @@ 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 + 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. +'')dnl Package: e2fslibs Section: libs @@ -240,6 +248,7 @@ ifdef(`UTIL_LINUX_NG', '', ``Pre-Depends: ${shlibs:Depends}, ${misc:Depends} '')dnl +Multi-Arch: foreign 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) @@ -250,7 +259,8 @@ Description: ext2/ext3/ext4 file system utilities hard disks on Debian and other Linux systems. . This package contains programs for creating, checking, and maintaining - ext2/3/4-based file systems. + ext2/3/4-based file systems. It also includes the "badblocks" program, + which can be used to scan for bad blocks on a disk or other storage device. Package: e2fsprogs-dbg Section: debug diff --git a/debian/e2fsck-static.preinst b/debian/e2fsck-static.preinst new file mode 100644 index 00000000..e756adea --- /dev/null +++ b/debian/e2fsck-static.preinst @@ -0,0 +1,19 @@ +#!/bin/sh + +# Abort on error. +set -e + +PKG=e2fsck-static +DOCLNK=/usr/share/doc/$PKG +if test "$1" = upgrade \ + -a -L $DOCLNK +then + rm $DOCLNK +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/e2fslibs-dev.doc-base b/debian/e2fslibs-dev.doc-base index d1023155..19d04f42 100644 --- a/debian/e2fslibs-dev.doc-base +++ b/debian/e2fslibs-dev.doc-base @@ -6,5 +6,5 @@ Abstract: The EXT2FS library is designed to allow Section: Programming Format: HTML -Index: /usr/share/doc/e2fslibs/html-info/libext2fs_toc.html +Index: /usr/share/doc/e2fslibs/html-info/libext2fs.html Files: /usr/share/doc/e2fslibs/html-info/*.html diff --git a/debian/e2fslibs-dev.files.in b/debian/e2fslibs-dev.files.in index a1a66a6e..b2cd6c92 100644 --- a/debian/e2fslibs-dev.files.in +++ b/debian/e2fslibs-dev.files.in @@ -1,5 +1,7 @@ -usr/lib/*/*.so -usr/lib/*/*.a +usr/lib/*/libext2fs*.so +usr/lib/*/libext2fs*.a +usr/lib/*/libe2p*.so +usr/lib/*/libe2p*.a usr/include/ext2fs usr/include/e2p usr/share/info/libext2fs.info* diff --git a/debian/e2fslibs.files.in b/debian/e2fslibs.files.in index 276b4b66..11198f76 100644 --- a/debian/e2fslibs.files.in +++ b/debian/e2fslibs.files.in @@ -1,2 +1,2 @@ -lib/*/libext2fs* -lib/*/libe2p* +lib/*/libext2fs*.so.* +lib/*/libe2p*.so.* diff --git a/debian/e2fslibs.symbols b/debian/e2fslibs.symbols index c9d1b338..5422544f 100644 --- a/debian/e2fslibs.symbols +++ b/debian/e2fslibs.symbols @@ -44,6 +44,7 @@ libext2fs.so.2 e2fslibs #MINVER# ext2fs_add_dir_block2@Base 1.42 ext2fs_add_dir_block@Base 1.37 ext2fs_add_journal_device@Base 1.37 + ext2fs_add_journal_inode2@Base 1.42.9-3~ ext2fs_add_journal_inode@Base 1.37 ext2fs_adjust_ea_refcount2@Base 1.42 ext2fs_adjust_ea_refcount@Base 1.37 @@ -82,10 +83,12 @@ libext2fs.so.2 e2fslibs #MINVER# ext2fs_bg_itable_unused_set@Base 1.42 ext2fs_bg_used_dirs_count@Base 1.42 ext2fs_bg_used_dirs_count_set@Base 1.42 + ext2fs_bitcount@Base 1.42.7 ext2fs_blkmap64_bitarray@Base 1.42 ext2fs_blkmap64_rbtree@Base 1.42.1 ext2fs_block_alloc_stats2@Base 1.42 ext2fs_block_alloc_stats@Base 1.37 + ext2fs_block_alloc_stats_range@Base 1.42.9-3~ ext2fs_block_bitmap_loc@Base 1.42 ext2fs_block_bitmap_loc_set@Base 1.42 ext2fs_block_iterate2@Base 1.37 @@ -148,12 +151,15 @@ libext2fs.so.2 e2fslibs #MINVER# ext2fs_expand_dir@Base 1.37 ext2fs_ext_attr_hash_entry@Base 1.41.0 ext2fs_extent_delete@Base 1.41.0 + ext2fs_extent_fix_parents@Base 1.42.7 ext2fs_extent_free@Base 1.41.0 ext2fs_extent_get@Base 1.41.0 ext2fs_extent_get_info@Base 1.41.0 + ext2fs_extent_goto2@Base 1.42.7 ext2fs_extent_goto@Base 1.41.0 ext2fs_extent_header_verify@Base 1.41.0 ext2fs_extent_insert@Base 1.41.0 + ext2fs_extent_node_split@Base 1.42.7 ext2fs_extent_open2@Base 1.41.6 ext2fs_extent_open@Base 1.41.0 ext2fs_extent_replace@Base 1.41.0 @@ -182,6 +188,7 @@ libext2fs.so.2 e2fslibs #MINVER# ext2fs_fast_unmark_inode_bitmap@Base 1.37 ext2fs_file_acl_block@Base 1.42 ext2fs_file_acl_block_set@Base 1.42 + ext2fs_file_block_offset_too_big@Base 1.42.9 ext2fs_file_close@Base 1.37 ext2fs_file_flush@Base 1.37 ext2fs_file_get_fs@Base 1.37 @@ -198,7 +205,12 @@ libext2fs.so.2 e2fslibs #MINVER# ext2fs_file_set_size@Base 1.37 ext2fs_file_write@Base 1.37 ext2fs_find_block_device@Base 1.37 + ext2fs_find_first_set_block_bitmap2@Base 1.42.9-3~ + ext2fs_find_first_set_generic_bitmap@Base 1.42.9-3~ + ext2fs_find_first_set_generic_bmap@Base 1.42.9-3~ + ext2fs_find_first_set_inode_bitmap2@Base 1.42.9-3~ ext2fs_find_first_zero_block_bitmap2@Base 1.42.2 + ext2fs_find_first_zero_generic_bitmap@Base 1.42.3 ext2fs_find_first_zero_generic_bmap@Base 1.42.2 ext2fs_find_first_zero_inode_bitmap2@Base 1.42.2 ext2fs_flush2@Base 1.42 @@ -237,6 +249,7 @@ libext2fs.so.2 e2fslibs #MINVER# ext2fs_get_device_sectsize@Base 1.37 ext2fs_get_device_size2@Base 1.41.4 ext2fs_get_device_size@Base 1.37 + ext2fs_get_dio_alignment@Base 1.42.3 ext2fs_get_free_blocks2@Base 1.42 ext2fs_get_free_blocks@Base 1.37 ext2fs_get_generic_bitmap_end@Base 1.41.0 @@ -262,8 +275,8 @@ libext2fs.so.2 e2fslibs #MINVER# ext2fs_get_pathname@Base 1.37 ext2fs_get_rec_len@Base 1.41.7 ext2fs_group_blocks_count@Base 1.42 - ext2fs_group_desc_csum@Base 1.42.2 ext2fs_group_desc@Base 1.42 + ext2fs_group_desc_csum@Base 1.42.2 ext2fs_group_desc_csum_set@Base 1.41.0 ext2fs_group_desc_csum_verify@Base 1.41.0 ext2fs_group_first_block2@Base 1.42 @@ -295,8 +308,8 @@ libext2fs.so.2 e2fslibs #MINVER# ext2fs_inode_bitmap_loc_set@Base 1.42 ext2fs_inode_data_blocks2@Base 1.42 ext2fs_inode_data_blocks@Base 1.37 - ext2fs_inode_has_valid_blocks@Base 1.37 ext2fs_inode_has_valid_blocks2@Base 1.42 + ext2fs_inode_has_valid_blocks@Base 1.37 ext2fs_inode_i_blocks@Base 1.42 ext2fs_inode_io_intern2@Base 1.37 ext2fs_inode_io_intern@Base 1.37 @@ -308,6 +321,7 @@ libext2fs.so.2 e2fslibs #MINVER# ext2fs_llseek@Base 1.37 ext2fs_lookup@Base 1.37 ext2fs_make_generic_bitmap@Base 1.41.0 + ext2fs_map_cluster_block@Base 1.42.9 ext2fs_mark_bb_dirty@Base 1.37 ext2fs_mark_block_bitmap2@Base 1.42 ext2fs_mark_block_bitmap@Base 1.37 @@ -346,7 +360,6 @@ libext2fs.so.2 e2fslibs #MINVER# ext2fs_open_file@Base 1.42 ext2fs_open_inode_scan@Base 1.37 ext2fs_parse_version_string@Base 1.37 - ext2fs_print_bmap_statistics@Base 1.42.1 ext2fs_process_dir_block@Base 1.37 ext2fs_punch@Base 1.42 ext2fs_r_blocks_count@Base 1.42 @@ -410,6 +423,7 @@ libext2fs.so.2 e2fslibs #MINVER# ext2fs_swab16@Base 1.37 ext2fs_swab32@Base 1.37 ext2fs_swab64@Base 1.40 + ext2fs_symlink@Base 1.42.7 ext2fs_sync_device@Base 1.37 ext2fs_tdb_append@Base 1.40 ext2fs_tdb_chainlock@Base 1.40 @@ -523,6 +537,7 @@ libext2fs.so.2 e2fslibs #MINVER# initialize_ext2_error_table@Base 1.37 initialize_ext2_error_table_r@Base 1.37 inode_io_manager@Base 1.37 + io_channel_alloc_buf@Base 1.42.3 io_channel_discard@Base 1.42 io_channel_read_blk64@Base 1.41.1 io_channel_set_options@Base 1.37 diff --git a/debian/e2fsprogs.preinst b/debian/e2fsprogs.preinst new file mode 100644 index 00000000..bfa9f6b0 --- /dev/null +++ b/debian/e2fsprogs.preinst @@ -0,0 +1,19 @@ +#!/bin/sh + +# Abort on error. +set -e + +PKG=e2fsprogs +DOCLNK=/usr/share/doc/$PKG +if test "$1" = upgrade \ + -a -L $DOCLNK +then + rm $DOCLNK +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/libblkid-dev.files.in b/debian/libblkid-dev.files.in index 84dc3f2c..7b3da368 100644 --- a/debian/libblkid-dev.files.in +++ b/debian/libblkid-dev.files.in @@ -1,4 +1,4 @@ -usr/lib/*/libblkid* +usr/lib/*/libblkid*.so.* usr/include/blkid usr/share/man/man3/libblkid.3 usr/lib/*/pkgconfig/blkid.pc diff --git a/debian/libblkid1.files.in b/debian/libblkid1.files.in index 871d7be0..54ef86de 100644 --- a/debian/libblkid1.files.in +++ b/debian/libblkid1.files.in @@ -1 +1 @@ -lib/*/libblkid* +lib/*/libblkid*.so.* diff --git a/debian/libcomerr2.files.in b/debian/libcomerr2.files.in index e4e5efc0..16b039ef 100644 --- a/debian/libcomerr2.files.in +++ b/debian/libcomerr2.files.in @@ -1 +1 @@ -lib/*/libcom_err* +lib/*/libcom_err*.so.* diff --git a/debian/libss2.files.in b/debian/libss2.files.in index e5d8182b..386e1854 100644 --- a/debian/libss2.files.in +++ b/debian/libss2.files.in @@ -1 +1 @@ -lib/*/libss* +lib/*/libss*.so.* diff --git a/debian/libuuid1.files.in b/debian/libuuid1.files.in index 6dc05ce3..0761f3b8 100644 --- a/debian/libuuid1.files.in +++ b/debian/libuuid1.files.in @@ -1 +1 @@ -lib/*/libuuid* +lib/*/libuuid*.so.* diff --git a/debian/rules b/debian/rules index 1f6e7b4a..5e55e68a 100755 --- a/debian/rules +++ b/debian/rules @@ -12,13 +12,6 @@ # 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) -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) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) @@ -28,6 +21,10 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null) +# Allow distro-specific behaviour +DISTRO :=$(shell sed -ne '/DISTRIB_ID/s/.*=//p' /etc/lsb-release 2>/dev/null || echo Debian) +UTIL_LINUX_NG ?= yes + # find the version for the main package, from changelog file MAIN_VERSION = $(shell head -n 1 debian/changelog | cut '-d ' -f 2 | sed 's/[()]//g') # find versions for libraries going into their own packages, from their Makefile.in's, @@ -114,6 +111,13 @@ INSTALL_PROGRAM ?= $(INSTALL) -p -o root -g root -m 0755 #INSTALL_PROGRAM += -s #endif +ifneq (,$(findstring update-symbols,$(DEB_BUILD_OPTIONS))) +SYMBOL_LIBS := e2fslibs libcomerr2 libss2 +ifneq ($(UTIL_LINUX_NG),yes) +SYMBOL_LIBS += libblkid1 libuuid1 +endif +endif + DEFAULT_CFLAGS ?= -g -O2 DEFAULT_LDFLAGS ?= -Wl,-Bsymbolic-functions @@ -142,6 +146,10 @@ BUILD_STATIC = build-static E2FSCK_STATIC = ${staticbuilddir}/e2fsck/e2fsck.static endif +ifneq ($(SKIP_UDEB),) +SKIP_BF ?= yes +endif + ifeq ($(SKIP_BF),yes) BUILD_BF = bfbuilddir ?= ${stdbuilddir} @@ -152,13 +160,12 @@ endif BF_CFLAGS = -Os -fomit-frame-pointer -COMMON_CONF_FLAGS = --disable-e2initrd-helper --enable-elf-shlibs \ - --enable-quota --infodir=/usr/share/info ifeq ($(UTIL_LINUX_NG),yes) -COMMON_CONF_FLAGS += --disable-fsck --disable-libblkid \ +UTIL_CONF_FLAGS ?= --disable-fsck --disable-libblkid \ --disable-libuuid --disable-uuidd else -COMMON_CONF_FLAGS += --enable-fsck +UTIL_CONF_FLAGS ?= --enable-fsck --enable-libblkid \ + --enable-libuuid --enable-uuidd endif ifneq ($(strip $(DEB_HOST_MULTIARCH)),) @@ -171,10 +178,16 @@ else USRLIB ?= /usr/lib endif -STD_CONF_FLAGS ?= --enable-symlink-install $(MULTIARCH_CONF) +BACKTRACE_CONF_FLAGS ?= $(shell if ${debdir}/scripts/test-backtrace ; then echo --disable-backtrace ; fi) + +COMMON_CONF_FLAGS = --disable-e2initrd-helper --enable-quota \ + --infodir=/usr/share/info --enable-symlink-install \ + $(MULTIARCH_CONF) $(BACKTRACE_CONF_FLAGS) $(UTIL_CONF_FLAGS) -BF_CONF_FLAGS ?= --disable-nls --disable-imager --disable-testio-debug \ - --disable-uuidd --disable-tls --disable-debugfs +STD_CONF_FLAGS ?= --enable-elf-shlibs + +BF_CONF_FLAGS ?= --enable-elf-shlibs --disable-nls --disable-imager \ + --disable-testio-debug --disable-uuidd --disable-tls --disable-debugfs STATIC_CONF_FLAGS ?= --disable-nls --disable-imager \ --disable-uuidd --disable-tls @@ -211,7 +224,20 @@ M4_ARGS+=-UDIETLIBC WITH_DIET_LIBC = else M4_ARGS+=-DDIETLIBC -WITH_DIET_LIBC = --with-diet-libc +WITH_DIET_LIBC = --with-diet-libc --enable-libuuid --enable-libblkid +endif + +ifneq ($(BUILD_E2FSCK_STATIC),no) +M4_ARGS+=-DE2FSCK_STATIC +else +M4_ARGS+=-UE2FSCK_STATIC +endif + +ifeq ($(SKIP_UDEB),) +INSTALL_UDEB = install-udeb +M4_ARGS+=-DUDEB_PKGS +else +M4_ARGS+=-UUDEB_PKGS endif FILES_FIXUP= libcomerr2.files comerr-dev.files libss2.files ss-dev.files \ @@ -246,21 +272,27 @@ ${CFGSTDSTAMP}: ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) cd ${stdbuilddir} && AWK=/usr/bin/awk \ ${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \ - CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" + ${EXTRA_CONF_FLAGS} CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" \ + LDFLAGS="$(LDFLAGS)" else cd ${stdbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \ ${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \ - --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \ - CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" + ${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \ + --host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \ + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" endif # specially-built MIPS libs ifneq ($(ismips),) mkdir -p ${mipsbuilddir} ${mipsbuilddir64} cd ${mipsbuilddir} && AWK=/usr/bin/awk \ - ${topdir}/configure ${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}" + ${topdir}/configure ${COMMON_CONF_FLAGS} \ + ${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}" \ + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" cd ${mipsbuilddir64} && AWK=/usr/bin/awk \ - ${topdir}/configure ${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}" + ${topdir}/configure ${COMMON_CONF_FLAGS} \ + ${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}" \ + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" endif mkdir -p ${STAMPSDIR} @@ -274,12 +306,14 @@ ${CFGBFSTAMP}: ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) cd ${bfbuilddir} && AWK=/usr/bin/awk \ ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \ - CFLAGS="${CFLAGS} ${BF_CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" + ${EXTRA_CONF_FLAGS} CFLAGS="${CFLAGS} ${BF_CFLAGS}" \ + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" else cd ${bfbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \ ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \ - --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \ - CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" + ${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \ + --host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \ + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" endif mkdir -p ${STAMPSDIR} touch ${CFGBFSTAMP} @@ -292,18 +326,22 @@ ${CFGSTATICSTAMP}: ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) if type diet > /dev/null 2>&1 ; then \ cd ${staticbuilddir} && AWK=/usr/bin/awk \ - ${topdir}/configure ${STATIC_CONF_FLAGS} \ - ${WITH_DIET_LIBC} CFLAGS="${CFLAGS}"; \ + ${topdir}/configure ${COMMON_CONF_FLAGS} ${STATIC_CONF_FLAGS} \ + ${EXTRA_CONF_FLAGS} ${WITH_DIET_LIBC} CFLAGS="${CFLAGS}" \ + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"; \ else \ cd ${staticbuilddir} && AWK=/usr/bin/awk \ - ${topdir}/configure ${STATIC_CONF_FLAGS} \ - CFLAGS="${CFLAGS}"; \ + ${topdir}/configure ${COMMON_CONF_FLAGS} \ + ${STATIC_CONF_FLAGS} ${EXTRA_CONF_FLAGS} \ + CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" \ + LDFLAGS="$(LDFLAGS)"; \ fi else cd ${staticbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \ ${topdir}/configure ${COMMON_CONF_FLAGS} ${STATIC_CONF_FLAGS} \ - --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \ - CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" + ${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \ + --host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \ + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" endif mkdir -p ${STAMPSDIR} touch ${CFGSTATICSTAMP} @@ -316,11 +354,13 @@ build-std: ${BUILDSTDSTAMP} ${BUILDSTDSTAMP}: ${CFGSTDSTAMP} dh_testdir $(MAKE) -C ${stdbuilddir} V=1 all +ifneq ($(BUILD_E2FSCK_STATIC),no) $(MAKE) -C ${stdbuilddir}/e2fsck V=1 e2fsck.static +endif $(MAKE) -C ${stdbuilddir}/po V=1 update-gmo - ( cd ${stdbuilddir}/doc && $(MAKE) V=1 libext2fs_abt.html ) - ( cd ${stdbuilddir}/lib/et && $(MAKE) V=1 com_err.info com_err_abt.html ) + ( cd ${stdbuilddir}/doc && $(MAKE) V=1 libext2fs.html ) + ( cd ${stdbuilddir}/lib/et && $(MAKE) V=1 com_err.info com_err.html ) # specially-built MIPS libs ifneq ($(ismips),) @@ -342,21 +382,24 @@ ${BUILDBFSTAMP}: ${CFGBFSTAMP} $(MAKE) -C ${bfbuilddir} V=1 libs $(MAKE) -C ${bfbuilddir}/e2fsck V=1 all $(MAKE) -C ${bfbuilddir}/misc V=1 all + $(MAKE) -C ${bfbuilddir}/resize V=1 all touch ${BUILDBFSTAMP} build-static: ${BUILDSTATICSTAMP} ${BUILDSTATICSTAMP}: ${CFGSTATICSTAMP} dh_testdir $(MAKE) -C ${staticbuilddir} V=1 libs +ifneq ($(BUILD_E2FSCK_STATIC),no) $(MAKE) -C ${staticbuilddir}/e2fsck V=1 all e2fsck.static +endif touch ${BUILDSTATICSTAMP} clean: dh_testdir rm -rf ${STAMPSDIR} - [ ! -f ${stdbuilddir}/Makefile ] || $(MAKE) -C ${stdbuilddir} distclean - [ ! -f ${bfbuilddir}/Makefile ] || $(MAKE) -C ${bfbuilddir} distclean - [ ! -f ${staticbuilddir}/Makefile ] || $(MAKE) -C ${staticbuilddir} distclean + [ ! -f ${stdbuilddir}/Makefile ] || $(MAKE) -C ${stdbuilddir} V=1 distclean + [ ! -f ${bfbuilddir}/Makefile ] || $(MAKE) -C ${bfbuilddir} V=1 distclean + [ ! -f ${staticbuilddir}/Makefile ] || $(MAKE) -C ${staticbuilddir} V=1 distclean rm -rf ${stdbuilddir} ${bfbuilddir} ${staticbuilddir} ${mipsbuilddir} ${mipsbuilddir64} rm -f debian/*.substvars dh_clean @@ -378,17 +421,16 @@ install-std: build dh_installdirs mkdir -p ${tmpdir}/sbin - $(MAKE) -C ${stdbuilddir} install DESTDIR=${tmpdir} \ + $(MAKE) -C ${stdbuilddir} V=1 install DESTDIR=${tmpdir} \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true # static libs and .h files - $(MAKE) -C ${stdbuilddir} install-libs DESTDIR=${tmpdir} LDCONFIG=true + $(MAKE) -C ${stdbuilddir} V=1 install-libs DESTDIR=${tmpdir} LDCONFIG=true +ifneq ($(BUILD_E2FSCK_STATIC),no) # statically-linked fsck ${INSTALL_PROGRAM} $(E2FSCK_STATIC) ${tmpdir}/sbin cp ${mandir}/man8/e2fsck.8 ${mandir}/man8/e2fsck.static.8 - # remove static quota library for now - rm ${tmpdir}/usr/include/quota/mkquota.h - find ${tmpdir}/usr/lib -name quota.pc -o -name libquota.a | xargs rm +endif ifeq ($(DEB_BUILD_GNU_SYSTEM), gnu) ${INSTALL} -m 0644 misc/mke2fs-hurd.conf ${tmpdir}/etc/mke2fs.conf @@ -410,13 +452,13 @@ install-udeb: build dh_testdir dh_testroot - $(MAKE) -C ${bfbuilddir} install-shlibs-libs-recursive DESTDIR=${udebdir} \ + $(MAKE) -C ${bfbuilddir} V=1 install-shlibs-libs-recursive DESTDIR=${udebdir} \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true - $(MAKE) -C ${bfbuilddir}/e2fsck install DESTDIR=${udebdir} \ + $(MAKE) -C ${bfbuilddir}/e2fsck V=1 install DESTDIR=${udebdir} \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true - $(MAKE) -C ${bfbuilddir}/misc install DESTDIR=${udebdir} \ + $(MAKE) -C ${bfbuilddir}/misc V=1 install DESTDIR=${udebdir} \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true - $(MAKE) -C ${bfbuilddir}/resize install DESTDIR=${udebdir} \ + $(MAKE) -C ${bfbuilddir}/resize V=1 install DESTDIR=${udebdir} \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true rm -rf ${udebdir}/usr @@ -441,7 +483,7 @@ binary-indep: # no arch-independant debs. binary-arch: DH_OPTIONS= -a -binary-arch: install install-udeb +binary-arch: install $(INSTALL_UDEB) dh_testdir dh_testroot @@ -515,9 +557,12 @@ endif DH_OPTIONS= dh_installchangelogs -pe2fsprogs \ -plibcomerr${COMERR_SOVERSION} \ -plibss${SS_SOVERSION} \ - -pe2fslibs -pe2fsck-static \ + -pe2fslibs \ -pe2fsprogs-dbg -pe2fslibs-dbg \ -plibcomerr2-dbg -plibss2-dbg +ifneq ($(BUILD_E2FSCK_STATIC),no) + DH_OPTIONS= dh_installchangelogs -pe2fsck-static +endif ifneq ($(UTIL_LINUX_NG),yes) DH_OPTIONS= dh_installchangelogs -plibuuid${UUID_SOVERSION} \ -puuid-dev -puuid-runtime -puuid-runtime-dbg -plibuuid1-dbg \ @@ -525,62 +570,26 @@ ifneq ($(UTIL_LINUX_NG),yes) endif dh_fixperms + dh_strip -pe2fsprogs --dbg-package=e2fsprogs-dbg +ifneq ($(BUILD_E2FSCK_STATIC),no) + dh_strip -pe2fsck-static --dbg-package=e2fsprogs-dbg +endif ifneq ($(ismips),) - dh_strip -k -Xlib64ext2fs-nopic.a + dh_strip -pe2fslibs --dbg-package=e2fslibs-dbg -Xlib64ext2fs-nopic.a else - dh_strip -k -endif - - # debug package stuff - rm -rf ${udebdir}/usr -ifneq ($(UTIL_LINUX_NG),yes) - rm -rf ${blkidudebdir}/usr - rm -rf ${uuidudebdir}/usr + dh_strip -pe2fslibs --dbg-package=e2fslibs-dbg endif - -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - mkdir -p ${debugdir}/$(USRLIB) - mv ${maindir}/usr/lib/debug ${debugdir}/$(USRLIB) - rm -rf ${maindir}/usr/lib/debug - mv ${e2fsckstaticdir}/usr/lib/debug/sbin/* \ - ${debugdir}/$(USRLIB)/debug - rm -rf ${e2fsckstaticdir}/usr/lib - -ifneq ($(UTIL_LINUX_NG),yes) - mkdir -p ${uuidruntimedbgdir}/$(USRLIB) - mv ${uuidruntimedir}/usr/lib/debug ${uuidruntimedbgdir}/$(USRLIB) - rmdir ${uuidruntimedir}/usr/lib -endif - - mkdir -p ${libext2dbgdir}/$(USRLIB) - mv ${libext2dir}/usr/lib/debug ${libext2dbgdir}/$(USRLIB) - rmdir ${libext2dir}/usr/lib - - mkdir -p ${libcomerrdbgdir}/$(USRLIB) - mv ${libcomerrdir}/usr/lib/debug ${libcomerrdbgdir}/$(USRLIB) - rmdir ${libcomerrdir}/usr/lib - - mkdir -p ${libssdbgdir}/$(USRLIB) - mv ${libssdir}/usr/lib/debug ${libssdbgdir}/$(USRLIB) - rmdir ${libssdir}/usr/lib - + dh_strip -plibss${SS_SOVERSION} --dbg-package=libss${SS_SOVERSION}-dbg + dh_strip -plibcomerr${COMERR_SOVERSION} \ + --dbg-package=libcomerr${COMERR_SOVERSION}-dbg ifneq ($(UTIL_LINUX_NG),yes) - mkdir -p ${libuuiddbgdir}/$(USRLIB) - mv ${libuuiddir}/usr/lib/debug ${libuuiddbgdir}/$(USRLIB) - rmdir ${libuuiddir}/usr/lib - - mkdir -p ${libblkiddbgdir}/$(USRLIB) - mv ${libblkiddir}/usr/lib/debug ${libblkiddbgdir}/$(USRLIB) - rmdir ${libblkiddir}/usr/lib -endif + dh_strip -plibblkid${BLKID_SOVERSION} \ + --dbg-package=libblkid${BLKID_SOVERSION}-dbg + dh_strip -plibuuid${UUID_SOVERSION} --dbg-package=libuuid${UUID_SOVERSION}-dbg endif + dh_strip # dpkg symbol handling -ifneq (,$(findstring update-symbols,$(DEB_BUILD_OPTIONS))) -SYMBOL_LIBS := e2fslibs libcomerr2 libss2 -ifneq ($(UTIL_LINUX_NG),yes) -SYMBOL_LIBS += libblkid1 libuuid1 -endif for i in $(SYMBOL_LIBS); \ do \ echo "Generating symbols for $$i..."; \ @@ -589,7 +598,6 @@ endif patch debian/$$i.symbols < debian/$$i.tmp-patch; \ /bin/rm debian/$$i.tmp-patch; \ done -endif for i in e2fsprogs e2fsprogs-dbg e2fslibs e2fslibs-dbg; do \ $(INSTALL) -p -m 0644 debian/copyright \ @@ -618,6 +626,7 @@ endif dh_compress dh_makeshlibs -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb +ifeq ($(SKIP_UDEB),) dh_makeshlibs --add-udeb=e2fsprogs-udeb -plibcomerr${COMERR_SOVERSION} \ -V 'libcomerr2 (>= 1.33-3)' ifneq ($(UTIL_LINUX_NG),yes) @@ -626,13 +635,16 @@ ifneq ($(UTIL_LINUX_NG),yes) debian/libblkid1/DEBIAN/shlibs echo "udeb: libuuid 1 libuuid1-udeb" >> debian/libuuid1/DEBIAN/shlibs endif +endif dh_installdeb dh_shlibdeps -l${stdbuilddir}/lib dh_shlibdeps -pe2fsprogs -l${stdbuilddir}/lib \ -u"-Ldebian/e2fsprogs.shlibs.local" +ifeq ($(SKIP_UDEB),) dh_shlibdeps -pe2fsprogs-udeb -l${stdbuilddir}/lib \ -u"-Ldebian/e2fsprogs-udeb.shlibs.local" +endif dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev \ -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb @@ -644,24 +656,30 @@ ifneq ($(UTIL_LINUX_NG),yes) DH_OPTIONS= dh_gencontrol -puuid-dev \ -u '-v${UUID_VERSION}-${MAIN_VERSION} -VmainBinary=${MAIN_VERSION}' endif +ifeq ($(SKIP_UDEB),) dh_gencontrol -pe2fsprogs-udeb -- -fdebian/files~ ifneq ($(UTIL_LINUX_NG),yes) dh_gencontrol -plibblkid1-udeb -- -fdebian/files~ dh_gencontrol -plibuuid1-udeb -- -fdebian/files~ endif +endif +ifeq ($(SKIP_UDEB),) dpkg-distaddfile $(UDEB_NAME) debian-installer $(UDEB_PRIORITY) ifneq ($(UTIL_LINUX_NG),yes) dpkg-distaddfile $(BLKID_UDEB_NAME) debian-installer $(BLKID_UDEB_PRIORITY) dpkg-distaddfile $(UUID_UDEB_NAME) debian-installer $(UUID_UDEB_PRIORITY) endif +endif dh_md5sums -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb dh_builddeb -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb +ifeq ($(SKIP_UDEB),) dh_builddeb -pe2fsprogs-udeb --filename=$(UDEB_NAME) ifneq ($(UTIL_LINUX_NG),yes) dh_builddeb -plibblkid1-udeb --filename=$(BLKID_UDEB_NAME) dh_builddeb -plibuuid1-udeb --filename=$(UUID_UDEB_NAME) endif +endif binary: binary-indep binary-arch diff --git a/debian/scripts/test-backtrace b/debian/scripts/test-backtrace new file mode 100755 index 00000000..d90486a0 --- /dev/null +++ b/debian/scripts/test-backtrace @@ -0,0 +1,34 @@ +#!/bin/sh +# +# Test to see if backtrace requires a library in /usr/lib +# Returns true if the backtrace command works and requires a library in /usr/lib +# This is a nasty workaround for Debian bug #708307, which is really a glibc bug +# + +cat > /tmp/backtrace$$.c << EOF + +#include <execinfo.h> + +int main(int argc, char **argv) +{ + void *stack_syms[32]; + int frames; + + frames = backtrace(stack_syms, 32); + backtrace_symbols_fd(stack_syms, frames, 0); +} +EOF + +if ! cc -o /tmp/backtrace$$ /tmp/backtrace$$.c; then + exit 1 +fi + +if ! ldd /tmp/backtrace$$ > /tmp/backtrace$$.ldd 2>&1 ; then + exit 1 +fi + +grep -q /usr/lib /tmp/backtrace$$.ldd +ret=$? + +/bin/rm -f /tmp/backtrace$$* +exit $ret diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides index 8c0cd0ff..fd597df4 100644 --- a/debian/source.lintian-overrides +++ b/debian/source.lintian-overrides @@ -1,3 +1,4 @@ e2fsprogs source: weak-library-dev-dependency ss-dev on libss2 (= ${mainBinary}) e2fsprogs source: weak-library-dev-dependency comerr-dev on libcomerr2 (= ${mainBinary}) e2fsprogs source: weak-library-dev-dependency uuid-dev on libuuid1 (= ${mainBinary}) +e2fsprogs source: source-is-missing misc/util.o |