diff options
| -rw-r--r-- | debian/.gitignore | 1 | ||||
| -rw-r--r-- | debian/changelog | 120 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/copyright | 87 | ||||
| -rwxr-xr-x | debian/e2fsprogs.install | 4 | ||||
| -rw-r--r-- | debian/e2fsprogs.lintian-overrides | 1 | ||||
| -rw-r--r-- | debian/libext2fs2t64.symbols | 4 | ||||
| -rw-r--r-- | debian/patches/disable-metadata_csum_seed-and-orphan_file-by-default | 34 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 19 |
10 files changed, 232 insertions, 43 deletions
diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 0000000..91d8482 --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1 @@ +!patches diff --git a/debian/changelog b/debian/changelog index b5bef5e..7d8ba53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,123 @@ +e2fsprogs (1.47.1-1) unstable; urgency=medium + + * New upstream version + * Clarify the lsattr and mklost+found man pages that they are applicable + for ext2, ext3, and ext4 file systems and not just for ext2. (Closes: + #1041115) + * Replace the build-depend on pkg-config with pkgconf to fix a Lintian + warning. + * E2fsck will now perform more consistency checks on EA (extended + attribute value) inodes. + * Fix a big where e2fsck could potentially leak an acl block when + releasing an orphan inode. + * Avoid a divide by zero crash in libext2fs if the container + infrastructure, such as lxcfs, reports that the system has zero CPU's + via sysconf(_SC_NPROCESSORS_CONF). + + -- Theodore Y. Ts'o <tytso@mit.edu> Mon, 20 May 2024 15:28:06 -0400 + +e2fsprogs (1.47.1~rc2-1) unstable; urgency=medium + + * New upstream version + * Update Chinese, Czech, French, Polish Romainian, Swedish, and + Ukrainian translations + * Fix libarchive support in mke2fs on mips64el (Closes: #1070042) + * Fix e2scrub when the "systemctl" package is installed instead of + systemd. (Closes: #1070107) + * Update to standards 4.7.0 + + -- Theodore Y. Ts'o <tytso@mit.edu> Mon, 20 May 2024 15:24:47 -0400 + +e2fsprogs (1.47.1~rc1-3) unstable; urgency=medium + + * Remove duplicated work in release notes + * Fix resize2fs's calculation of free clusters in the last block group + for file systems larger than 4TB + * Fix FTBFS on Hurd caused by trying to install e2scrub's systemd unit + files which aren't built since e2scrub isn't supported on Hurd + * Don't build mke2fs with libarchive support on mips64el since a bug in + libarchive only on that architecture causes a FTBFS due to the + regression test suite failing. (See Debian Bug 1070042 for more details) + + -- Theodore Y. Ts'o <tytso@mit.edu> Mon, 29 Apr 2024 21:57:42 -0400 + +e2fsprogs (1.47.1~rc1-1) unstable; urgency=medium + + * Re-enable metadata_csum_seed and orphan_file by default now that + Debian Bookworm is released + * New upstream version + * Add support for post-2038 timestamps on platforms with 64-bit time_t. + * Mke2fs -d can now support an input tar file if the libarchive library + is available. + * Install a udev rule to inihibit ext4 file systesm from being + automounted by udisks. + * Debugfs's 'hash' command has been enhanced to use the hash seed and + algorithm from a superblock if a file system is opened and to display + the hash seed and algorithm if the -v flag is given. + * Teach mke2fs with a new extended options, root_perms, which overrides + the permissions for the root directory for the new file system. + * Preserve any error indicator in the superblock when replaying the + journal so that a subsequent fsck can repair the file system afterwards. + * Fix potential mke2fs failures when creating a file system with an + orphan file when the storage device has a previous file system and + does not support discard/trim commands. + * E2fsck will clear the orphan_present feature silently in preen mode. + * Fix potential checksum failures when performing an online resize when + the mounted file system is actively modifying the superblock. + * Fix a bug where a checksum failure in an htree directory can cause + e2fsck's preen mode to abort unnecessarily. + * Fix e2fsck's handling of an invalid symlink in an inline_data + directory. + * Fix e4crypt from issuing a spurious "success" error message when + trying to set a policy on a non-directory. + * Fix a potential infinite loop in debugfs's logdump command in some + edge cases. + * Fix e2fsck to correctly update quota usage after optimizing + directories or deleting corrupted inodes. + * Fix fuse2fs so that directories are created with the correct + permissions instead of having the other and group write permissions + masked off. + * Fix a potential e2fsck divide by zero crash caused by a maliciously + fuzzed file system. + * Fix dumpe2fs to report free block ranges correctly for bigalloc file + systems. + * Fix resize2fs where resizing a bigalloc file system can result in the + free cluster count in the last block group and the total free clusters + count to be incorrect. + * Avoid spurious e2scrub failures caused by trying to scrub file + syustems that do not have the journal enabled, and by aborting scrub + runs while upgrading the e2fsprogs package + * Teach tune2fs to detect a file system which is mounted but is not + mentioned in the mount namespace where tune2fs is run by treating a + block device which is busy as if it is mounted. + * If tune2fs can't find the mountpoint for a file system which is + apparently mounted (perhaps because it's not present in the current + mount namespace) when attempting to set the label or UUID in the + superblock, fall back to the old method of modifying block device and + silence printing any error messages. + * If both the primary superblock and first block group's backup + superblock are corrupted, e2fsck will now try additional backup + superblocks if they are available. + * Avoid mke2fs from creating an invalid file system with an insufficient + number of inodes when creating a file system which is very small + (100k), a block size of 1k, and an inode size of 256 bytes. + * Fix a potential deadlock caused by e2fsck being run in Direct I/O mode + with the threading optimization enabled. + * Update and clarify various man pages. (Closes: #1038286) + * Add support for SOURCE_DATE_EPOCH environment variable + * Improve resize2fs's performance by eliminating extra cache flushes. + * Improve mke2fs's performance when zeroing a large number of inode + table blocks (when lazy inode table initialization is not enabled) by + batching calls to ext2fs_zero_blocks. + * Use a safe_getenv function for all calls to fetch the environment + variable in libext2fs. + * Upgrade fuse2fs to use fuse v3. + * Build the binaries using FORTIFY_SOURCE=3 for better hardening + * Add Romainian translation. + * Update Malay translation. + + -- Theodore Y. Ts'o <tytso@mit.edu> Fri, 26 Apr 2024 22:23:25 -0400 + e2fsprogs (1.47.0-2.4) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index f874264..e641b37 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: e2fsprogs Section: admin Priority: required Maintainer: Theodore Y. Ts'o <tytso@mit.edu> -Build-Depends: dpkg-dev (>= 1.22.5), gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any] <!pkg.e2fsprogs.no-fuse2fs>, debhelper-compat (= 12), dh-exec, libblkid-dev, uuid-dev, m4, udev [linux-any], systemd [linux-any], systemd-dev [linux-any], cron [linux-any], dh-sequence-movetousr +Build-Depends: dpkg-dev (>= 1.22.5), gettext, texinfo, pkgconf, libarchive-dev, libfuse3-dev [linux-any kfreebsd-any] <!pkg.e2fsprogs.no-fuse2fs>, debhelper-compat (= 12), dh-exec, libblkid-dev, uuid-dev, m4, udev [linux-any], systemd [linux-any], systemd-dev [linux-any], cron [linux-any], dh-sequence-movetousr Rules-Requires-Root: no -Standards-Version: 4.6.2 +Standards-Version: 4.7.0 Homepage: http://e2fsprogs.sourceforge.net Vcs-Browser: https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git Vcs-Git: https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git -b debian/master diff --git a/debian/copyright b/debian/copyright index f18058e..77bd5ea 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,7 +8,7 @@ Comment: written by Theodore Ts'o <tytso@mit.edu> and Remy Card <card@masi.ibp.fr>. Files: * -Copyright: 1993-2018 Theodore Ts'o <tytso@mit.edu> +Copyright: 1993-2022 Theodore Ts'o <tytso@mit.edu> License: GPL-2 Comment: Some files are GPL-2+ licensed or do not carry any license version. They are distributable as GPL-2 and listed as such for simplification. @@ -21,6 +21,47 @@ Copyright: 2003-2007 Theodore Ts'o <tytso@mit.edu> 1995-1996 Michael Nonweiler <mrn20@cam.ac.uk> License: GPL-2 +Files: lib/et/* + lib/ss/* +Copyright: 1987-1988 MIT Student Information Processing Board + 2003 Theodore Ts'o +License: Expat + Permission to use, copy, modify, and distribute this software and + its documentation for any purpose is hereby granted, provided that + the names of M.I.T. and the M.I.T. S.I.P.B. not be used in + advertising or publicity pertaining to distribution of the software + without specific, written prior permission. M.I.T. and the + M.I.T. S.I.P.B. make no representations about the suitability of + this software for any purpose. It is provided "as is" without + express or implied warranty. + +Files: lib/et/vfprintf.c +Copyright: 1988 Regents of the University of California +License: BSD-3-Clause-Variant + Redistribution and use in source and binary forms are permitted + provided that the above copyright notice and this paragraph are + duplicated in all such forms and that any documentation, + advertising materials, and other materials related to such + distribution and use acknowledge that the software was developed + by the University of California, Berkeley. The name of the + University may not be used to endorse or promote products derived + from this software without specific prior written permission. + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +Files: lib/et/com_right.c +Comment: Taken from lib/com_err/error.c from Kerberos4kth distribution. +Copyright: (c) 2003 by Theodore Ts'o + Copyright (c) 1997, 1998, 2001 Kungliga Tekniska Högskolan + (Royal Institute of Technology, Stockholm, Sweden). + All rights reserved. +License: BSD-3-Clause + +Files: lib/et/test_cases/imap_err.et +Copyright: 1994-2008 Carnegie Mellon University. +License: BSD-4-Clause-CMU + Files: lib/ext2fs/* lib/e2p/* lib/support/print_fs_flags.c @@ -211,6 +252,12 @@ Copyright: 1995-1999 by Theodore Ts'o Linus Torvalds <Linus.Torvalds@cs.helsinki.fi> License: GPL-2 +Files: po/fr.po + po/vi.po +Copyright: 2008, 2014 Theodore Ts'o + 1996, 2014 Free Software Foundation, Inc. +License: GPL-2 + Files: resize/* Copyright: 1997-2000 by Theodore Ts'o and PowerQuest, Inc. License: GPL-2 @@ -370,6 +417,44 @@ License: BSD-3-Clause USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +License: BSD-4-Clause-CMU + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + . + 3. The name "Carnegie Mellon University" must not be used to + endorse or promote products derived from this software without + prior written permission. For permission or any legal + details, please contact + Carnegie Mellon University + Center for Technology Transfer and Enterprise Creation + 4615 Forbes Avenue + Suite 302 + Pittsburgh, PA 15213 + (412) 268-7393, fax: (412) 268-7395 + innovation@andrew.cmu.edu + . + 4. Redistributions of any form whatsoever must retain the following + acknowledgment: + "This product includes software developed by Computing Services + at Carnegie Mellon University (http://www.cmu.edu/computing/)." + . + CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO + THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE + FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + License: GPL-2 This program is free software; you can redistribute it and/or modify it under the terms version 2 of the GNU General Public License diff --git a/debian/e2fsprogs.install b/debian/e2fsprogs.install index 47f1fac..17a80e3 100755 --- a/debian/e2fsprogs.install +++ b/debian/e2fsprogs.install @@ -16,8 +16,8 @@ sbin/resize2fs sbin/tune2fs usr/bin/chattr usr/bin/lsattr -[linux-any] usr/lib/*/e2fsprogs/e2scrub_all_cron -[linux-any] usr/lib/*/e2fsprogs/e2scrub_fail +[linux-any] usr/libexec/e2fsprogs/e2scrub_all_cron +[linux-any] usr/libexec/e2fsprogs/e2scrub_fail usr/sbin/e2freefrag [linux-any] usr/sbin/e4crypt [linux-any] usr/sbin/e4defrag diff --git a/debian/e2fsprogs.lintian-overrides b/debian/e2fsprogs.lintian-overrides deleted file mode 100644 index b40d113..0000000 --- a/debian/e2fsprogs.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -e2fsprogs: package-supports-alternative-init-but-no-init.d-script diff --git a/debian/libext2fs2t64.symbols b/debian/libext2fs2t64.symbols index 050dbf9..b056869 100644 --- a/debian/libext2fs2t64.symbols +++ b/debian/libext2fs2t64.symbols @@ -149,6 +149,7 @@ libext2fs.so.2 libext2fs2t64 #MINVER# ext2fs_copy_generic_bitmap@Base 1.41.0 ext2fs_copy_generic_bmap@Base 1.42 ext2fs_count_blocks@Base 1.46.0 + ext2fs_count_used_blocks@Base 1.47.1~rc1 ext2fs_count_used_clusters@Base 1.46.0 ext2fs_crc16@Base 1.41.1 ext2fs_crc32_be@Base 1.43 @@ -413,6 +414,7 @@ libext2fs.so.2 libext2fs2t64 #MINVER# ext2fs_is_fast_symlink@Base 1.44.0~rc1 ext2fs_journal_sb_start@Base 1.42.12 ext2fs_link@Base 1.37 + ext2fs_list_backups@Base 1.47.1~rc1 ext2fs_llseek@Base 1.37 ext2fs_lookup@Base 1.37 ext2fs_make_generic_bitmap@Base 1.41.0 @@ -496,6 +498,7 @@ libext2fs.so.2 libext2fs2t64 #MINVER# ext2fs_read_inode_bitmap@Base 1.37 ext2fs_read_inode_full@Base 1.37 ext2fs_remove_exit_fn@Base 1.43 + ext2fs_reserve_super_and_bgd2@Base 1.47.1~rc1 ext2fs_reserve_super_and_bgd@Base 1.37 ext2fs_resize_array@Base 1.45.6 ext2fs_resize_block_bitmap2@Base 1.42 @@ -508,6 +511,7 @@ libext2fs.so.2 libext2fs2t64 #MINVER# ext2fs_rewrite_to_io@Base 1.37 ext2fs_rw_bitmaps@Base 1.46.0 ext2fs_set_alloc_block_callback@Base 1.41.0 + ext2fs_safe_getenv@Base 1.47.1~rc1 ext2fs_set_bit64@Base 1.42 ext2fs_set_bit@Base 1.37 ext2fs_set_bitmap_padding@Base 1.37 diff --git a/debian/patches/disable-metadata_csum_seed-and-orphan_file-by-default b/debian/patches/disable-metadata_csum_seed-and-orphan_file-by-default deleted file mode 100644 index 2176f4d..0000000 --- a/debian/patches/disable-metadata_csum_seed-and-orphan_file-by-default +++ /dev/null @@ -1,34 +0,0 @@ -Description: Disable metadata_csum_seed and orphan_file by default for Debian - . - There are a lot of debian packages that assume that mkfs.ext4 for - Debian N will work on Debian N-1 (and sometimes N-2, N-3, etc.). This - is a bad assumption, but it's too late to fix this for Debian - Bookworm. - . - So revert making these feature a default for now. We will enable it - again post Bookworm. -Author: Theodore Ts'o <tytso@mit.edu> -Origin: vendor -Forwarded: not-needed -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1031622 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1030939 ---- - misc/mke2fs.conf.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in -index b7fc95df..05680992 100644 ---- a/misc/mke2fs.conf.in -+++ b/misc/mke2fs.conf.in -@@ -11,7 +11,7 @@ - features = has_journal - } - ext4 = { -- features = has_journal,extent,huge_file,flex_bg,metadata_csum,metadata_csum_seed,64bit,dir_nlink,extra_isize,orphan_file -+ features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize - } - small = { - blocksize = 1024 --- -2.31.0 - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index e3c2ee0..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -disable-metadata_csum_seed-and-orphan_file-by-default diff --git a/debian/rules b/debian/rules index 73337d3..d449eca 100755 --- a/debian/rules +++ b/debian/rules @@ -23,6 +23,11 @@ ifneq ($(filter pkg.e2fsprogs.no-fuse2fs,$(DEB_BUILD_PROFILES)),) SKIP_FUSE2FS=yes endif +ifneq (,$(filter-out parallel=1,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + JOBS = -j$(NUMJOBS) +endif + COMERR_VERSION ?= $(shell grep ELF_VERSION lib/et/Makefile.in | cut '-d ' -f3) SS_VERSION ?= $(shell grep ELF_VERSION lib/ss/Makefile.in | cut '-d ' -f3) @@ -61,6 +66,11 @@ CC ?= $(DEB_HOST_GNU_TYPE)-gcc COMMON_CONF_FLAGS += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) endif +# work around Debian Bug #1070042 +ifeq ($(DEB_HOST_ARCH),mips64el) +COMMON_CONF_FLAGS += --without-libarchive +endif + %: dh $@ -B${stdbuilddir} @@ -72,7 +82,7 @@ override_dh_auto_configure: ../../configure ${COMMON_CONF_FLAGS} override_dh_auto_build: - $(MAKE) -C ${stdbuilddir} V=1 all + $(MAKE) -C ${stdbuilddir} V=1 $(JOBS) all ifeq (,$(filter pkg.e2fsprogs.no-static,$(DEB_BUILD_PROFILES))) $(MAKE) -C ${stdbuilddir}/e2fsck V=1 e2fsck.static endif @@ -153,6 +163,11 @@ override_dh_installinfo: dh_installinfo -pcomerr-dev ${stdbuilddir}/lib/et/com_err.info dh_installinfo -plibext2fs-dev ${stdbuilddir}/doc/libext2fs.info +ifneq ($(DEB_HOST_ARCH_OS), hurd) +override_dh_installsystemd: + dh_installsystemd -p e2fsprogs --no-restart-after-upgrade --no-stop-on-upgrade e2scrub_all.timer e2scrub_reap.service +endif + override_dh_makeshlibs: for i in $(SYMBOL_LIBS); \ do \ @@ -184,7 +199,7 @@ override_dh_gencontrol: override_dh_auto_test: ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) - PRINT_FAILED=yes $(MAKE) -C ${stdbuilddir} V=1 check + PRINT_FAILED=yes $(MAKE) -C ${stdbuilddir} V=1 $(JOBS) check endif test_printenv: |