New upstream version 1.43.6

4 files changed, 7 insertions, 56 deletions

diff --git a/.gitignore b/.gitignore
index c4e506c..527b783 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ e2fsprogs-1.41.12.tar.gz
 /e2fsprogs-1.43.3.tar.xz
 /e2fsprogs-1.43.4.tar.xz
 /e2fsprogs-1.43.5.tar.xz
+/e2fsprogs-1.43.6.tar.xz
diff --git a/e2fsprogs-1.43.5-build-fix.patch b/e2fsprogs-1.43.5-build-fix.patch
deleted file mode 100644
index 312e9bf..0000000
--- a/e2fsprogs-1.43.5-build-fix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-diff --git a/lib/support/mkquota.c b/lib/support/mkquota.c
-index 00f3a40..47b702d 100644
---- a/lib/support/mkquota.c
-+++ b/lib/support/mkquota.c
-@@ -50,7 +50,7 @@ static void print_dquot(const char *desc, struct dquot *dq)
- {
- 	if (desc)
- 		fprintf(stderr, "%s: ", desc);
--	fprintf(stderr, "%u %ld:%ld:%ld %ld:%ld:%ld\n",
-+	fprintf(stderr, "%u %lld:%lld:%lld %lld:%lld:%lld\n",
- 		dq->dq_id, dq->dq_dqb.dqb_curspace,
- 		dq->dq_dqb.dqb_bsoftlimit, dq->dq_dqb.dqb_bhardlimit,
- 		dq->dq_dqb.dqb_curinodes,
-@@ -524,7 +524,7 @@ static int scan_dquots_callback(struct dquot *dquot, void *cb_data)
- 	    dq->dq_dqb.dqb_curinodes != dquot->dq_dqb.dqb_curinodes) {
- 		scan_data->usage_is_inconsistent = 1;
- 		fprintf(stderr, "[QUOTA WARNING] Usage inconsistent for ID %u:"
--			"actual (%ld, %ld) != expected (%ld, %ld)\n",
-+			"actual (%lld, %lld) != expected (%lld, %lld)\n",
- 			dq->dq_id, dq->dq_dqb.dqb_curspace,
- 			dq->dq_dqb.dqb_curinodes,
- 			dquot->dq_dqb.dqb_curspace,
-diff --git a/lib/support/quotaio.c b/lib/support/quotaio.c
-index 2daf178..ef63056 100644
---- a/lib/support/quotaio.c
-+++ b/lib/support/quotaio.c
-@@ -230,9 +230,9 @@ errcode_t quota_file_open(quota_ctx_t qctx, struct quota_handle *h,
- 		return err;
- 
- 	if (qf_ino == 0)
--		qf_ino = *quota_sb_inump(fs->super, qtype);
-+		qf_ino = *quota_sb_inump(fs->super, qtype)
- 
--	log_debug("Opening quota ino=%u, type=%d", qf_ino, qtype);
-+	log_debug("Opening quota ino=%lu, type=%d", qf_ino, qtype);
- 	err = ext2fs_file_open(fs, qf_ino, flags, &e2_file);
- 	if (err) {
- 		log_err("ext2fs_file_open failed: %s", error_message(err));
-@@ -368,7 +368,7 @@ errcode_t quota_file_create(struct quota_handle *h, ext2_filsys fs,
- 	h->e2fs_write = quota_write_nomount;
- 	h->e2fs_read = quota_read_nomount;
- 
--	log_debug("Creating quota ino=%u, type=%d", qf_inum, qtype);
-+	log_debug("Creating quota ino=%lu, type=%d", qf_inum, type);
- 	err = ext2fs_file_open(fs, qf_inum, h->qh_file_flags, &e2_file);
- 	if (err) {
- 		log_err("ext2fs_file_open failed: %ld", err);
-
-
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 641998e..b6485d8 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for managing ext2, ext3, and ext4 filesystems
 Name: e2fsprogs
-Version: 1.43.5
-Release: 2%{?dist}
+Version: 1.43.6
+Release: 1%{?dist}
 
 # License tags based on COPYING file distinctions for various components
 License: GPLv2
@@ -11,7 +11,6 @@ Source1: ext2_types-wrapper.h
 Source2: e2fsck.conf
 
 Patch1: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
-Patch2: e2fsprogs-1.43.5-build-fix.patch
 
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -152,7 +151,6 @@ It was originally inspired by the Multics SubSystem library.
 # mildly unsafe but 'til I get something better, avoid full fsck
 # after an selinux install...
 %patch1 -p1 -b .featurecheck
-%patch2 -p1
 
 %build
 %configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
@@ -334,6 +332,9 @@ exit 0
 %{_libdir}/pkgconfig/ss.pc
 
 %changelog
+* Wed Aug 30 2017 Eric Sandeen <sandeen@redhat.com> 1.43.6-1
+- New upstream release
+
 * Fri Aug 11 2017 Kalev Lember <klember@redhat.com> 1.43.5-2
 - Bump and rebuild for an rpm signing issue
 
diff --git a/sources b/sources
index db652a7..a2798db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (e2fsprogs-1.43.5.tar.xz) = 7338e66133034fbe43efbebaf8e3004a576bd3a35c0501248fee6ddf9ffcca2ec351392c1300f8a1190b8815b16483ec6f4ca16c0e73820f8dbdf4eadd60acd8
+SHA512 (e2fsprogs-1.43.6.tar.xz) = a9d825e756f93c4b5ac2a6fae08eb27277c550c9c64ba5d86f64a06be9b5389f0b6b6dea247eb680f9881169fcdfa738bee619a55e2af286635269496255a53a