aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2013-01-01 18:50:26 -0500
committerTheodore Ts'o <tytso@mit.edu>2013-01-01 18:50:26 -0500
commitb9b5e43ea81ecf575e3d96cbf51215aba3746b32 (patch)
tree212b744b53c2277c504709d001511e4d92bd7429 /debian
parentab83252174bf450e865e76d7c7347c9c39fccadf (diff)
parent73c427d2a3f28c34280e51db76e580d9730c0cbf (diff)
downloade2fsprogs-b9b5e43ea81ecf575e3d96cbf51215aba3746b32.tar.gz
e2fsprogs-b9b5e43ea81ecf575e3d96cbf51215aba3746b32.tar.xz
e2fsprogs-b9b5e43ea81ecf575e3d96cbf51215aba3746b32.zip
Merge branch 'maint' into next
Conflicts: RELEASE-NOTES debian/changelog lib/ext2fs/crc32c.c lib/ext2fs/rw_bitmaps.c resize/resize2fs.c version.h
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog28
-rw-r--r--debian/control.in2
-rw-r--r--debian/e2fslibs-dev.files.in6
-rw-r--r--debian/e2fslibs.files.in4
-rw-r--r--debian/e2fslibs.symbols4
-rw-r--r--debian/libblkid-dev.files.in2
-rw-r--r--debian/libblkid1.files.in2
-rw-r--r--debian/libcomerr2.files.in2
-rw-r--r--debian/libss2.files.in2
-rw-r--r--debian/libuuid1.files.in2
-rwxr-xr-xdebian/rules37
11 files changed, 73 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog
index 0521c439..81ca5b7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+e2fsprogs (1.42.7-1) unstable; urgency=low
+
+ * New uptream version
+ * Added new options to filefrag to be consistent with the version from
+ Lustre
+ * 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
+ * Fix a crash while mke2fs is parsing "-E resize=NNN" with the 64bit
+ file system feature enabled
+ * Added the "zap_block", "block_dump", and "extent_open" commands to
+ debugfs
+ * Fixed e2fsck so it detects and fixes inconsistencies in the interior
+ nodes of an inode's extent tree
+ * Fixed mke2fs's handling of the mmp_update_interval option
+ * Optimized e2fsck's CPU utilization
+ * 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 e2freefrag so it works on 64-bit file systems, and so it uses
+ much less memory.
+
+ -- Theodore Y. Ts'o <tytso@mit.edu> Tue, 1 Jan 2013 10:23:04 -0500
+
e2fsprogs (1.43~WIP-2012-09-22-1) unstable; urgency=low
* Add metadata checksum feature
diff --git a/debian/control.in b/debian/control.in
index 4ba164e7..f2e496d8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,6 +13,7 @@ Build-Depends: texi2html (>= 1.76), gettext, texinfo, pkg-config, DIETLIBC_DEFIN
Standards-Version: 3.9.3
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
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 1840a2db..87e57d74 100644
--- a/debian/e2fslibs.symbols
+++ b/debian/e2fslibs.symbols
@@ -83,6 +83,7 @@ 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
@@ -162,12 +163,15 @@ libext2fs.so.2 e2fslibs #MINVER#
ext2fs_extent_block_csum_set@Base 1.43~WIP-2012-08-01
ext2fs_extent_block_csum_verify@Base 1.43~WIP-2012-08-01
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_goto@Base 1.41.0
+ ext2fs_extent_goto2@Base 1.42.7
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
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 cf8e070c..4e5c682d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -214,6 +214,12 @@ M4_ARGS+=-DDIETLIBC
WITH_DIET_LIBC = --with-diet-libc
endif
+ifneq ($(BUILD_E2FSCK_STATIC),no)
+M4_ARGS+=-DE2FSCK_STATIC
+else
+M4_ARGS+=-UE2FSCK_STATIC
+endif
+
FILES_FIXUP= libcomerr2.files comerr-dev.files libss2.files ss-dev.files \
libuuid1.files uuid-dev.files libblkid1.files libblkid-dev.files \
e2fslibs.files e2fslibs-dev.files
@@ -245,11 +251,11 @@ ${CFGSTDSTAMP}:
mkdir -p ${stdbuilddir}
ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
cd ${stdbuilddir} && AWK=/usr/bin/awk \
- ${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \
+ ${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} ${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} \
+ ${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} ${EXTRA_CONF_FLAGS} \
--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
endif
@@ -275,11 +281,11 @@ ${CFGBFSTAMP}:
mkdir -p ${bfbuilddir}
ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
cd ${bfbuilddir} && AWK=/usr/bin/awk \
- ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \
+ ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} ${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} \
+ ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} ${EXTRA_CONF_FLAGS} \
--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
endif
@@ -294,18 +300,18 @@ ${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} \
+ ${topdir}/configure ${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} \
+ ${topdir}/configure ${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} \
+ ${topdir}/configure ${COMMON_CONF_FLAGS} ${STATIC_CONF_FLAGS} ${EXTRA_CONF_FLAGS} \
--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
endif
@@ -320,7 +326,9 @@ 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 )
@@ -353,7 +361,9 @@ 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:
@@ -388,12 +398,15 @@ install-std: build
# static libs and .h files
$(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
+endif
+
# 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
+ find ${tmpdir} -name quota.pc -o -name libquota.a | xargs rm
ifeq ($(DEB_BUILD_GNU_SYSTEM), gnu)
${INSTALL} -m 0644 misc/mke2fs-hurd.conf ${tmpdir}/etc/mke2fs.conf
@@ -520,9 +533,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 \
@@ -547,9 +563,12 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
mkdir -p ${debugdir}/$(USRLIB)
mv ${maindir}/usr/lib/debug ${debugdir}/$(USRLIB)
rm -rf ${maindir}/usr/lib/debug
+
+ifneq ($(BUILD_E2FSCK_STATIC),no)
mv ${e2fsckstaticdir}/usr/lib/debug/sbin/* \
${debugdir}/$(USRLIB)/debug
rm -rf ${e2fsckstaticdir}/usr/lib
+endif
ifneq ($(UTIL_LINUX_NG),yes)
mkdir -p ${uuidruntimedbgdir}/$(USRLIB)