From 14c2e67f8764203531c024b1b81c4604287b03bc Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Wed, 1 May 2024 01:06:19 -0400 Subject: Remove debian/patches for v1.47.1-rc2 release Signed-off-by: Theodore Ts'o --- .../0001-Remove-duplicated-word-in-release-notes | 27 --- ...size2fs-fix-last-bg-s-free-clusters-calculation | 30 --- .../0003-configure-add-without-libarchive-option | 202 --------------------- debian/patches/series | 3 - 4 files changed, 262 deletions(-) delete mode 100644 debian/patches/0001-Remove-duplicated-word-in-release-notes delete mode 100644 debian/patches/0002-resize2fs-fix-last-bg-s-free-clusters-calculation delete mode 100644 debian/patches/0003-configure-add-without-libarchive-option delete mode 100644 debian/patches/series diff --git a/debian/patches/0001-Remove-duplicated-word-in-release-notes b/debian/patches/0001-Remove-duplicated-word-in-release-notes deleted file mode 100644 index dc2b25a84..000000000 --- a/debian/patches/0001-Remove-duplicated-word-in-release-notes +++ /dev/null @@ -1,27 +0,0 @@ -From 0b44576eaf51eb12141dd6079db5af1743cd06bc Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o -Date: Sun, 28 Apr 2024 12:34:42 -0400 -Subject: [PATCH 1/6] Remove duplicated word in release notes - -Signed-off-by: Theodore Ts'o ---- - debian/changelog | 2 +- - doc/RelNotes/v1.47.1.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/doc/RelNotes/v1.47.1.txt b/doc/RelNotes/v1.47.1.txt -index 53eeee9e6..82998f984 100644 ---- a/doc/RelNotes/v1.47.1.txt -+++ b/doc/RelNotes/v1.47.1.txt -@@ -87,7 +87,7 @@ 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 --file systems. -+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 --- -2.43.0 - diff --git a/debian/patches/0002-resize2fs-fix-last-bg-s-free-clusters-calculation b/debian/patches/0002-resize2fs-fix-last-bg-s-free-clusters-calculation deleted file mode 100644 index 434ccc844..000000000 --- a/debian/patches/0002-resize2fs-fix-last-bg-s-free-clusters-calculation +++ /dev/null @@ -1,30 +0,0 @@ -From 1da249a125cb2ae138a6dd1d262754e2b4d45175 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o -Date: Sun, 28 Apr 2024 23:26:19 -0400 -Subject: [PATCH 2/6] resize2fs: fix last bg's free clusters calculation on - 64-bit file systems - -Fixes-Coverity-bug: 1596645 -Fixes: d43fb24ca0db ("resize2fs: fix r_bigalloc_big_expand test failure") -Signed-off-by: Theodore Ts'o ---- - resize/resize2fs.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/resize/resize2fs.c b/resize/resize2fs.c -index 4daa068b8..f4a409805 100644 ---- a/resize/resize2fs.c -+++ b/resize/resize2fs.c -@@ -2870,7 +2870,8 @@ static errcode_t resize2fs_calculate_summary_stats(ext2_filsys fs) - if ((group == fs->group_desc_count - 1) && (max & 7)) { - n = 0; - for (b = (fs->super->s_first_data_block + -- (fs->super->s_blocks_per_group * group)); -+ ((blk64_t) fs->super->s_blocks_per_group * -+ group)); - b < ext2fs_blocks_count(fs->super); - b += EXT2FS_CLUSTER_RATIO(fs)) { - if (ext2fs_test_block_bitmap2(fs->block_map, b)) --- -2.43.0 - diff --git a/debian/patches/0003-configure-add-without-libarchive-option b/debian/patches/0003-configure-add-without-libarchive-option deleted file mode 100644 index 413977a92..000000000 --- a/debian/patches/0003-configure-add-without-libarchive-option +++ /dev/null @@ -1,202 +0,0 @@ -From 7272a9724468622129978507c70efc68769aaf9f Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o -Date: Mon, 29 Apr 2024 01:23:29 -0400 -Subject: [PATCH 3/6] configure: add --without-libarchive option - -Teach configure the --without-libarchive option, which forcibly -disables use of the libarchive library. - -The option --with-libarchive=direct will disable the use of dlopen, -and will link mke2fs with -larchive directly. This doesn't work when -building mke2f.static, since -larchive has a large number of -depedencies, and even "pkgconf --libs --static libarchive" doesn't -provide all of the appropriate library dependencies. :-( - -Signed-off-by: Theodore Ts'o ---- - configure | 49 +++++++++++++++++++++++++++++++--- - configure.ac | 37 ++++++++++++++++++++++--- - lib/config.h.in | 3 +++ - misc/Makefile.in | 2 +- - misc/create_inode_libarchive.c | 2 +- - 5 files changed, 83 insertions(+), 10 deletions(-) - -diff --git a/configure b/configure -index 866eca252..2b712e5d3 100755 ---- a/configure -+++ b/configure -@@ -930,6 +930,7 @@ enable_rpath - with_libiconv_prefix - with_libintl_prefix - enable_largefile -+with_libarchive - enable_fuse2fs - enable_lto - enable_ubsan -@@ -1646,6 +1647,7 @@ Optional Packages: - --without-libiconv-prefix don't search for libiconv in includedir and libdir - --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib - --without-libintl-prefix don't search for libintl in includedir and libdir -+ --without-libarchive disable use of libarchive - --with-multiarch=ARCH specify the multiarch triplet - --with-udev-rules-dir[=DIR] - Install udev rules into DIR. -@@ -13734,7 +13736,37 @@ if test "$ac_cv_func_dlopen" = yes ; then - MAGIC_LIB=$DLOPEN_LIB - fi - --{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archive_read_new in -larchive" >&5 -+ -+# Check whether --with-libarchive was given. -+if test ${with_libarchive+y} -+then : -+ withval=$with_libarchive; if test "$withval" = "no" -+then -+ try_libarchive="" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Disabling libarchive support" >&5 -+printf "%s\n" "Disabling libarchive support" >&6; } -+elif test "$withval" = "direct" -+then -+ try_libarchive="direct" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Testing for libarchive support (forced direct link)" >&5 -+printf "%s\n" "Testing for libarchive support (forced direct link)" >&6; } -+else -+ try_libarchive="yes" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Testing for libarchive support (with dlopen)" >&5 -+printf "%s\n" "Testing for libarchive support (with dlopen)" >&6; } -+fi -+ -+else $as_nop -+ try_libarchive="yes" -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Try testing for libarchive support (with dlopen) by default" >&5 -+printf "%s\n" "Try testing for libarchive support (with dlopen) by default" >&6; } -+ -+fi -+ -+ARCHIVE_LIB= -+if test -n "$try_libarchive" -+then -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archive_read_new in -larchive" >&5 - printf %s "checking for archive_read_new in -larchive... " >&6; } - if test ${ac_cv_lib_archive_archive_read_new+y} - then : -@@ -13772,7 +13804,7 @@ printf "%s\n" "$ac_cv_lib_archive_archive_read_new" >&6; } - if test "x$ac_cv_lib_archive_archive_read_new" = xyes - then : - ARCHIVE_LIB=-larchive --ac_fn_c_check_header_compile "$LINENO" "archive.h" "ac_cv_header_archive_h" "$ac_includes_default" -+ ac_fn_c_check_header_compile "$LINENO" "archive.h" "ac_cv_header_archive_h" "$ac_includes_default" - if test "x$ac_cv_header_archive_h" = xyes - then : - printf "%s\n" "#define HAVE_ARCHIVE_H 1" >>confdefs.h -@@ -13781,8 +13813,17 @@ fi - - fi - --if test "$ac_cv_func_dlopen" = yes ; then -- ARCHIVE_LIB=$DLOPEN_LIB -+ if test "$ac_cv_func_dlopen" = yes -a "$try_libarchive" != "direct"; then -+ ARCHIVE_LIB=$DLOPEN_LIB -+ -+printf "%s\n" "#define CONFIG_DLOPEN_LIBARCHIVE 1" >>confdefs.h -+ -+ -+ fi -+ if test "$ac_cv_header_archive_h" != "yes" -+ then -+ ARCHIVE_LIB= -+ fi - fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 -diff --git a/configure.ac b/configure.ac -index cc204031d..e00e8d0e0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1301,10 +1301,39 @@ AC_SUBST(MAGIC_LIB) - dnl - dnl libarchive - dnl --AC_CHECK_LIB(archive, archive_read_new, [ARCHIVE_LIB=-larchive --AC_CHECK_HEADERS([archive.h])]) --if test "$ac_cv_func_dlopen" = yes ; then -- ARCHIVE_LIB=$DLOPEN_LIB -+AC_ARG_WITH([libarchive], -+AS_HELP_STRING([--without-libarchive],[disable use of libarchive]), -+[if test "$withval" = "no" -+then -+ try_libarchive="" -+ AC_MSG_RESULT([Disabling libarchive support]) -+elif test "$withval" = "direct" -+then -+ try_libarchive="direct" -+ AC_MSG_RESULT([Testing for libarchive support (forced direct link)]) -+else -+ try_libarchive="yes" -+ AC_MSG_RESULT([Testing for libarchive support (with dlopen)]) -+fi] -+, -+try_libarchive="yes" -+AC_MSG_RESULT([Try testing for libarchive support (with dlopen) by default]) -+) -+ARCHIVE_LIB= -+if test -n "$try_libarchive" -+then -+ AC_CHECK_LIB(archive, archive_read_new, [ARCHIVE_LIB=-larchive -+ AC_CHECK_HEADERS([archive.h])]) -+ if test "$ac_cv_func_dlopen" = yes -a "$try_libarchive" != "direct"; then -+ ARCHIVE_LIB=$DLOPEN_LIB -+ AC_DEFINE(CONFIG_DLOPEN_LIBARCHIVE, 1, -+ [Define to 1 if using dlopen to access libarchive]) -+ -+ fi -+ if test "$ac_cv_header_archive_h" != "yes" -+ then -+ ARCHIVE_LIB= -+ fi - fi - AC_SUBST(ARCHIVE_LIB) - dnl -diff --git a/lib/config.h.in b/lib/config.h.in -index 9a4058ec5..04cec72b8 100644 ---- a/lib/config.h.in -+++ b/lib/config.h.in -@@ -12,6 +12,9 @@ - /* Define to 1 for features for use by ext4 developers */ - #undef CONFIG_DEVELOPER_FEATURES - -+/* Define to 1 if using dlopen to access libarchive */ -+#undef CONFIG_DLOPEN_LIBARCHIVE -+ - /* Define to 1 if debugging ext3/4 journal code */ - #undef CONFIG_JBD_DEBUG - -diff --git a/misc/Makefile.in b/misc/Makefile.in -index 814e7064d..37c269991 100644 ---- a/misc/Makefile.in -+++ b/misc/Makefile.in -@@ -290,7 +290,7 @@ mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIB - $(Q) $(CC) $(LDFLAGS_STATIC) -o mke2fs.static $(MKE2FS_OBJS) \ - $(STATIC_LIBS) $(STATIC_LIBE2P) \ - $(STATIC_LIBBLKID) $(STATIC_LIBUUID) $(LIBINTL) $(SYSLIBS) \ -- $(LIBMAGIC) -+ $(LIBMAGIC) $(LIBARCHIVE) - - mke2fs.profiled: $(MKE2FS_OBJS) $(PROFILED_DEPLIBS) \ - $(PROFILED_LIBE2P) $(PROFILED_DEPLIBBLKID) $(PROFILED_DEPLIBUUID) -diff --git a/misc/create_inode_libarchive.c b/misc/create_inode_libarchive.c -index 6ca0f9f2c..ebd62d449 100644 ---- a/misc/create_inode_libarchive.c -+++ b/misc/create_inode_libarchive.c -@@ -51,7 +51,7 @@ static int (*dl_archive_read_open_filename)(struct archive *, - static int (*dl_archive_read_support_filter_all)(struct archive *); - static int (*dl_archive_read_support_format_all)(struct archive *); - --#ifdef HAVE_DLOPEN -+#ifdef CONFIG_DLOPEN_LIBARCHIVE - #include - - static void *libarchive_handle; --- -2.43.0 - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index d03f5850f..000000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -0001-Remove-duplicated-word-in-release-notes -0002-resize2fs-fix-last-bg-s-free-clusters-calculation -0003-configure-add-without-libarchive-option -- cgit 1.2.3-korg