Drop debian patches that have landed in v1.43.5

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/debian/patches/e2fsprogs-1.43.4-release-fixup b/debian/patches/e2fsprogs-1.43.4-release-fixup
deleted file mode 100644 (file)
index bbd895c..0000000
--- a/debian/patches/e2fsprogs-1.43.4-release-fixup
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: E2fsprogs 1.43.4 release fixup
- The orig tar.gz that was uploaded to e2fsprogs 1.43.4-1 was not the
- final release tarball; it had an outdated version of e2fsprogs.lsm
- and e2fsprogs.spec.  This doesn't affect generated binary packages of
- e2fsprogs at all, but let's correct it to make it easier generate
- updated packages.
-From: Theodore Y. Ts'o <tytso@mit.edu>
-
-diff -ru e2fsprogs-1.43.4/e2fsprogs.lsm /tmp/e2fsprogs-1.43.4/e2fsprogs.lsm
---- e2fsprogs-1.43.4/e2fsprogs.lsm     2017-01-31 17:58:16.000000000 -0500
-+++ /tmp/e2fsprogs-1.43.4/e2fsprogs.lsm        2017-01-31 19:58:05.000000000 -0500
-@@ -8,8 +8,8 @@
- Author:         tytso@mit.edu (Theodore Tso)
- Maintained-by:  tytso@mit.edu (Theodore Tso)
- Primary-site:   ftp.kernel.org /pub/linux/kernel/people/tytso/e2fsprogs
--                7224kB e2fsprogs-1.43.4.tar.gz
--                644kB  e2fsprogs-libs-1.43.4.tar.gz
-+                7376kB e2fsprogs-1.43.4.tar.gz
-+                588kB  e2fsprogs-libs-1.43.4.tar.gz
-                 1kB    e2fsprogs-1.43.4.lsm
- Alternate-site: download.sourceforge.net /pub/sourceforge/e2fsprogs
- Platforms:    linux 1.2.x/1.3.x/2.0.x/2.1.x/2.2.x/2.3.x/2.4.x/2.5.x/2.6.x/3.x/4.x
-diff -ru e2fsprogs-1.43.4/e2fsprogs.spec /tmp/e2fsprogs-1.43.4/e2fsprogs.spec
---- e2fsprogs-1.43.4/e2fsprogs.spec    2017-01-31 17:46:32.000000000 -0500
-+++ /tmp/e2fsprogs-1.43.4/e2fsprogs.spec       2017-01-31 20:03:06.000000000 -0500
-@@ -5,7 +5,7 @@
- 
- Summary: Utilities for managing ext2/ext3/ext4 filesystems
- Name: e2fsprogs
--Version: 1.43.4~WIP.2017.01.30
-+Version: 1.43.4
- Release: 0
- License: GPLv2
- Group: System Environment/Base

diff --git a/debian/patches/series b/debian/patches/series
index 8fa1f64..7725d99 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-e2fsprogs-1.43.4-release-fixup
 enable-metadata_csum-by-default
-tune2fs-fix-quota-enablement-regression

diff --git a/debian/patches/tune2fs-fix-quota-enablement-regression b/debian/patches/tune2fs-fix-quota-enablement-regression
deleted file mode 100644 (file)
index f46ad03..0000000
--- a/debian/patches/tune2fs-fix-quota-enablement-regression
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Eric Whitney <enwlinux@gmail.com>
-Description: tune2fs: fix quota enablement regression
- Commit 5c2a665afa (Avoid dereferencing beyond allocated memory in quota
- handling) induced a quota enablement regression in tune2fs.  Attempts
- to enable a particular quota type (tune2fs -O project <dev>, for
- example) set the appropriate feature flag in the superblock but the
- quota file for the type is not initialized.
- . 
- The regression prevents the current version of xfstests from running
- generic/383, 384, 385, and 386 (all project quota tests) with e2fsprogs
- 1.43.4.  These tests exit with the message "Installed kernel does not
- support project quotas", but the actual problem is that the project
- quota file is not present.
-Origin: upstream, commit: 5f82cc95b31f87c62f18848142597d094fe966ee
----
- misc/tune2fs.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/misc/tune2fs.c b/misc/tune2fs.c
-index 62395776..f1bad606 100644
---- a/misc/tune2fs.c
-+++ b/misc/tune2fs.c
-@@ -1483,7 +1483,7 @@ static void handle_quota_options(ext2_filsys fs)
-       quota_ctx_t qctx;
-       ext2_ino_t qf_ino;
-       enum quota_type qtype;
--      int enable = 0;
-+      unsigned int qtype_bits = 0;
- 
-       for (qtype = 0 ; qtype < MAXQUOTAS; qtype++)
-               if (quota_enable[qtype] != 0)
-@@ -1492,19 +1492,19 @@ static void handle_quota_options(ext2_filsys fs)
-               /* Nothing to do. */
-               return;
- 
--      retval = quota_init_context(&qctx, fs, 0);
-+      for (qtype = 0; qtype < MAXQUOTAS; qtype++) {
-+              if (quota_enable[qtype] == QOPT_ENABLE)
-+                      qtype_bits |= 1 << qtype;
-+      }
-+
-+      retval = quota_init_context(&qctx, fs, qtype_bits);
-       if (retval) {
-               com_err(program_name, retval,
-                       _("while initializing quota context in support library"));
-               exit(1);
-       }
--      for (qtype = 0 ; qtype < MAXQUOTAS; qtype++) {
--              if (quota_enable[qtype] == QOPT_ENABLE) {
--                      enable = 1;
--                      break;
--              }
--      }
--      if (enable)
-+
-+      if (qtype_bits)
-               quota_compute_usage(qctx);
- 
-       for (qtype = 0 ; qtype < MAXQUOTAS; qtype++) {
-@@ -1540,7 +1540,7 @@ static void handle_quota_options(ext2_filsys fs)
- 
-       quota_release_context(&qctx);
- 
--      if (enable) {
-+      if (qtype_bits) {
-               ext2fs_set_feature_quota(fs->super);
-               ext2fs_mark_super_dirty(fs);
-       } else {
--- 
-2.11.0.rc0.7.gbe5a750
-