From: Theodore Ts'o Date: Sun, 24 Feb 2002 02:23:26 +0000 (-0500) Subject: Update with the Debian package e2fsprogs-1.26-1. X-Git-Tag: E2FSPROGS-1.27-WIP-0305~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=541d173d91b6d30f43d58ad01559fa8ad60871a8;p=thirdparty%2Fe2fsprogs.git Update with the Debian package e2fsprogs-1.26-1. Clarify and clean up the badblocks man page and the com_err info file. --- diff --git a/debian/changelog b/debian/changelog index a7909a86a..eddb9d88d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,48 @@ +e2fsprogs (1.26-1) unstable; urgency=low + + * This uploads fixes 10 bugs, including data-corruption problems, and + adds much to the ease of maintainance and problem tracking. Good + choice for woody. + + * New upstream release (Closes: #106622, #116975, #118443, #119624, + #120171, #120077, #129828, #132764). + ** Fixes for data-corruption bugs not reported to the BTS: e2fsck + trashed external journals needing to be replayed, e2fsck now hides + visible journal files (data corruption problems when not excluded from + a backup and then restored) (Closes: #132654). + ** Other noticable bugs fixed include: e2fsck null pointer + dereferencing, fsck did not finds LVM volumes by UUID or by label, + largefile support (ie. dealing with filesystems inside 2GB+ files) was + broken in several programs. + * Switch to debhelper v3 to get ldconfig automatically handled + (lintian reported that it was broken). Now call dh_makeshlibs, but + still override its generated shlibs file with ours, to get compiled + packages depend of the correct virtual packages, which include + full sonames. + * Removed call do dh_installman (Closes: #115526). + * Cleaned up maintainer scripts with dead code - most things are now + more properly handled by debhelper. Removed an "exit 0" lurking in + preinst - can't find a reason for it in the changelog, it was probably + here for ages. + * Remove obsolete maint-scripts in binary-arch, as they are provided by + upstream. + * Also remove upstream-shipped config.cache before configuring. That + shouldn't impact us, but well, that makes lintian happy :) + + -- Yann Dirson Fri, 8 Feb 2002 06:12:35 +0100 + +e2fsprogs (1.25-1) unstable; urgency=high + + * New upstream bugfix release (Closes: #112414), targeted to woody. + * com_err.info provided again now that it was fixed upstream. + * Added metainfo to com_err.texinfo so that it gets indexed correctly + (thanks lintian). Moved @setfilename and @settitle to the top so that + things get output as expected. + * Added lintian overrides for -bf and -static packages. + * Put all stamp files in debian/stampdir. + + -- Yann Dirson Sat, 22 Sep 2001 16:22:47 +0200 + e2fsprogs (1.24a-1) unstable; urgency=high * New upstream release (Closes: #109577). diff --git a/debian/control b/debian/control index 7f37be877..89feaf908 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: e2fsprogs Section: base Priority: required Maintainer: Yann Dirson -Build-Depends: texi2html, texinfo, debhelper (>= 3.0.30) +Build-Depends: texi2html, texinfo, debhelper (>= 3) Standards-Version: 3.5.4 Package: e2fsck-static diff --git a/debian/e2fsck-static.lintian-overrides b/debian/e2fsck-static.lintian-overrides new file mode 100644 index 000000000..f09976435 --- /dev/null +++ b/debian/e2fsck-static.lintian-overrides @@ -0,0 +1 @@ +e2fsck-static: statically-linked-binary ./sbin/e2fsck.static diff --git a/debian/e2fsprogs-bf.lintian-overrides b/debian/e2fsprogs-bf.lintian-overrides new file mode 100644 index 000000000..2772b5545 --- /dev/null +++ b/debian/e2fsprogs-bf.lintian-overrides @@ -0,0 +1,3 @@ +e2fsprogs-bf: binary-without-manpage +e2fsprogs-bf: no-shlibs-control-file +e2fsprogs-bf: postinst-must-call-ldconfig diff --git a/debian/e2fsprogs.preinst b/debian/e2fsprogs.preinst index 97d2f9c8c..45afe74d8 100644 --- a/debian/e2fsprogs.preinst +++ b/debian/e2fsprogs.preinst @@ -13,13 +13,4 @@ EOT *) exit 2 ;; esac -# # turn around bug in dpkg (Bug#17624) -# if [ -L /usr/doc/e2fsprogs ] -# then -# echo 'preinst: removing buggy /usr/doc/e2fsprogs symlink (Bug#17624)' -# rm -f /usr/doc/e2fsprogs -# fi - #DEBHELPER# - -exit 0 diff --git a/debian/e2fsprogs.shlibs.in b/debian/e2fsprogs.shlibs.in new file mode 100644 index 000000000..4e8d675d1 --- /dev/null +++ b/debian/e2fsprogs.shlibs.in @@ -0,0 +1,5 @@ +libext2fs 2 libext2fs2 +libe2p 2 libe2p2 +libuuid 1 libuuid1 +libcom_err 2 libcomerr2 +libss 2 libss2 diff --git a/debian/rules b/debian/rules index aab4dd06e..e5cff67ac 100644 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ # be paranoid export LC_ALL=C -export DH_COMPAT=2 +export DH_COMPAT=3 DEB_BUILD_ARCH := $(shell dpkg --print-architecture) DEB_BUILD_GNU_TYPE := $(shell ./config.guess) @@ -52,6 +52,12 @@ mandir=${tmpdir}${MANDIR} SUBPACKAGES_DIRS = tmp e2fslibs-dev comerr-dev ss-dev +STAMPSDIR=debian/stampdir +CFGSTDSTAMP=${STAMPSDIR}/configure-std-stamp +CFGBFSTAMP=${STAMPSDIR}/configure-bf-stamp +BUILDSTDSTAMP=${STAMPSDIR}/build-std-stamp +BUILDBFSTAMP=${STAMPSDIR}/build-bf-stamp + CCOPTS = -O2 -fsigned-char LIBC-DEV = libc6-dev @@ -86,8 +92,9 @@ BF_CONF_FLAGS = --with-ccopts="${CCOPTS} ${BF_CCOPTS}" \ --disable-swapfs --disable-imager \ --disable-resizer --disable-debugfs -configure-std-stamp: +${CFGSTDSTAMP}: dh_testdir + mkdir -p ${stdbuilddir} ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) cd ${stdbuilddir} && CFLAGS="${CFLAGS}" \ @@ -97,10 +104,13 @@ else ${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \ --build=$(DEB_BUILD_GNU_TYPE) $(DEB_HOST_GNU_TYPE) endif - touch configure-std-stamp + mkdir -p ${STAMPSDIR} + touch ${CFGSTDSTAMP} -configure-bf-stamp: +${CFGBFSTAMP}: dh_testdir + rm -f config.cache + mkdir -p ${bfbuilddir} ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) cd ${bfbuilddir} && CFLAGS="${CFLAGS}" \ @@ -110,29 +120,30 @@ else ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \ --build=$(DEB_BUILD_GNU_TYPE) $(DEB_HOST_GNU_TYPE) endif - touch configure-bf-stamp + mkdir -p ${STAMPSDIR} + touch ${CFGBFSTAMP} build: build-std build-bf -build-std: build-std-stamp -build-std-stamp: configure-std-stamp +build-std: ${BUILDSTDSTAMP} +${BUILDSTDSTAMP}: ${CFGSTDSTAMP} dh_testdir make -C ${stdbuilddir} all ( cd ${stdbuilddir}/doc && \ texi2html -split_chapter ${topdir}/doc/libext2fs.texinfo ) ( cd ${stdbuilddir}/lib/et && make com_err.info && \ texi2html -split_chapter -expandinfo ${topdir}/lib/et/com_err.texinfo ) - touch build-std-stamp + touch ${BUILDSTDSTAMP} -build-bf: build-bf-stamp -build-bf-stamp: configure-bf-stamp +build-bf: ${BUILDBFSTAMP} +${BUILDBFSTAMP}: ${CFGBFSTAMP} dh_testdir make -C ${bfbuilddir} all - touch build-bf-stamp + touch ${BUILDBFSTAMP} clean: dh_testdir - rm -f build-std-stamp configure-std-stamp build-bf-stamp configure-bf-stamp install + rm -rf ${STAMPSDIR} -make -C ${stdbuilddir} -i distclean -make -C ${bfbuilddir} -i distclean rm -rf ${stdbuilddir} ${bfbuilddir} @@ -190,7 +201,15 @@ binary-arch: install dh_testdir dh_testroot - rm -f debian/TODO debian/README.Debian + # remove obsolete maint-scripts provided by 1.26 upstream + cd debian && rm -f comerr-dev.postinst e2fslibs-dev.postinst \ + e2fsprogs.postinst e2fsprogs.shlibs + + # lintian overrides + for i in $$(cd debian && echo *.lintian-overrides); do \ + pkg=$${i%.lintian-overrides} ;\ + install -m644 -D -p debian/$$i ${debdir}/$${pkg}/usr/share/lintian/overrides/$${pkg} ;\ + done # symlinks to prepare dh_installdocs run mkdir -p ${debdir}/e2fsck-static/usr/share/doc/ @@ -236,9 +255,8 @@ binary-arch: install ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_MAJOR}/com_err.texi dh_installexamples - dh_installman -# dh_installinfo -pcomerr-dev ${stdbuilddir}/lib/et/com_err.info + dh_installinfo -pcomerr-dev ${stdbuilddir}/lib/et/com_err.info dh_installinfo -pe2fslibs-dev ${stdbuilddir}/doc/libext2fs.info dh_undocumented @@ -268,8 +286,10 @@ binary-arch: install echo "libcdev:Depends=${LIBC-DEV}" > debian/uuid-dev.substvars echo "libcdev:Depends=${LIBC-DEV}" > debian/e2fslibs-dev.substvars -# We do this one by hand -# dh_makeshlibs +# Call this mostly to get the maintainer-script snippets + dh_makeshlibs -pe2fsprogs +# We overwrite the shlibs by hand because of virtual packages used + cp debian/e2fsprogs.shlibs.in debian/e2fsprogs/DEBIAN/shlibs dh_installdeb dh_shlibdeps -l${stdbuilddir}/lib diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog index 0aa811fc9..6d51cece1 100644 --- a/lib/et/ChangeLog +++ b/lib/et/ChangeLog @@ -1,3 +1,9 @@ +2002-02-23 Theodore Tso + + * com_err.texinfo: Fix up the com_err info file so that it + includes the directory node information. (Taken from the + Debian diff file.) + 2002-02-03 Theodore Tso * Release of E2fsprogs 1.26 diff --git a/lib/et/com_err.texinfo b/lib/et/com_err.texinfo index 3914b095e..1bf57130e 100644 --- a/lib/et/com_err.texinfo +++ b/lib/et/com_err.texinfo @@ -14,8 +14,16 @@ @c Software Foundation, and is under different copyright restrictions @c from the rest of this package.) +@setfilename com_err +@settitle A Common Error Description Library for UNIX + @ifinfo -@barfo +@dircategory Development +@format +START-INFO-DIR-ENTRY +* com_err: (com_err.info). A Common Error Description Library for UNIX. +END-INFO-DIR-ENTRY +@end format @end ifinfo @iftex @@ -28,9 +36,6 @@ @endgroup @end iftex -@setfilename com_err -@settitle A Common Error Description Library for UNIX - @ifinfo This file documents the use of the Common Error Description library. diff --git a/misc/ChangeLog b/misc/ChangeLog index 2774a5de7..665fbae75 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,7 @@ +2002-02-23 Theodore Tso + + * badblocks.8.in: Clarify man page's description of the -f option + 2002-02-12 Theodore Tso * get_device_by_label.c: Since on non-STDC compilers, we define diff --git a/misc/badblocks.8.in b/misc/badblocks.8.in index 44517b3c3..4812c66fd 100644 --- a/misc/badblocks.8.in +++ b/misc/badblocks.8.in @@ -91,12 +91,16 @@ hard drive to be hidden by the effects of the hard disk track buffer. .TP .B \-f Normally, badblocks will refuse to do a read/write or a non-destructive -test on a device which is mounted, since this can cause the system to -potentially crash. This can be overriden using the -.B \- -flag, but this should not be done under normal circumstances. The only time -when this option might be safe is if the /etc/mtab file is incorrect, and -the device really isn't mounted. +test on a device which is mounted, since either can cause the system to +potentially crash; even a non-destructive test can damage a mounted +filesystem. This can be overriden using the +.B \-f +flag, but should almost never be used --- if you think you're smarter +than the +.B badblocks +program, you almost certainly aren't. The only time when this option +might be safe to use is if the /etc/mtab file is incorrect, and the device +really isn't mounted. .TP .BI \-i " input_file" Read a list of already existing known bad blocks.