Skip to contentSkip to conversation

package/exfatprogs: bump to version 1.0.3

PATCH New James Hilliard 2 participants 2 messages May 13, 2020 – May 15, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/exfatprogs: bump to version 1.0.3

Drop patches that are now upstream.

We don't need to autoreconf since we are using a release tarball.

---
 ...rogs-add-missing-include-sys-types.h.patch |  49 ------
 ...PRIu64-PRIx64-to-printf-64-bit-types.patch | 144 ------------------
 ...k-fix-node-may-be-used-uninitialized.patch |  63 --------
 .../0004-fsck-Zero-init-using-memset.patch    |  37 -----
 package/exfatprogs/exfatprogs.hash            |   2 +-
 package/exfatprogs/exfatprogs.mk              |   5 +-
 6 files changed, 3 insertions(+), 297 deletions(-)
 delete mode 100644 package/exfatprogs/0001-exfatprogs-add-missing-include-sys-types.h.patch
 delete mode 100644 package/exfatprogs/0002-mkfs-fsck-use-PRIu64-PRIx64-to-printf-64-bit-types.patch
 delete mode 100644 package/exfatprogs/0003-fsck-fix-node-may-be-used-uninitialized.patch
 delete mode 100644 package/exfatprogs/0004-fsck-Zero-init-using-memset.patch
package/exfatprogs/0001-exfatprogs-add-missing-include-sys-types.h.patch deleted +0 -49
deleted file mode 100644
index f3705d2ebc..0000000000
@@ -1,49 +0,0 @@
-From c00522e0a890265d18dcdc92738e524d48297ed5 Mon Sep 17 00:00:00 2001
-From: James Hilliard <[email protected]>
-Date: Fri, 17 Apr 2020 13:10:49 -0600
-Subject: [PATCH] exfatprogs: add missing #include <sys/types.h>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-../include/libexfat.h:72:1: error: unknown type name ?ssize_t?
- ssize_t exfat_read(int fd, void *buf, size_t size, off_t offset);
- ^
-../include/libexfat.h:72:52: error: unknown type name ?off_t?
- ssize_t exfat_read(int fd, void *buf, size_t size, off_t offset);
-                                                    ^
-../include/libexfat.h:73:1: error: unknown type name ?ssize_t?
- ssize_t exfat_write(int fd, void *buf, size_t size, off_t offset);
- ^
-../include/libexfat.h:73:53: error: unknown type name ?off_t?
- ssize_t exfat_write(int fd, void *buf, size_t size, off_t offset);
-                                                     ^
-../include/libexfat.h:75:1: error: unknown type name ?ssize_t?
- ssize_t exfat_utf16_enc(const char *in_str, __u16 *out_str, size_t out_size);
- ^
-../include/libexfat.h:76:1: error: unknown type name ?ssize_t?
- ssize_t exfat_utf16_dec(const __u16 *in_str, size_t in_len,
- ^
-
-Signed-off-by: James Hilliard <[email protected]>
-[Upstream status: https://github.com/exfatprogs/exfatprogs/pull/50]
----
- include/libexfat.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/libexfat.h b/include/libexfat.h
-index ed1fb4c..36c8bdd 100644
---- a/include/libexfat.h
-+++ b/include/libexfat.h
-@@ -6,6 +6,7 @@
- #ifndef _LIBEXFAT_H
- 
- #include <stdbool.h>
-+#include <sys/types.h>
- #include <wchar.h>
- 
- #define KB			(1024)
--- 
-2.20.1
-
package/exfatprogs/0002-mkfs-fsck-use-PRIu64-PRIx64-to-printf-64-bit-types.patch deleted +0 -144

144 lines not on this page · raw message

package/exfatprogs/0003-fsck-fix-node-may-be-used-uninitialized.patch deleted +0 -63

63 lines not on this page · raw message

package/exfatprogs/0004-fsck-Zero-init-using-memset.patch deleted +0 -37
deleted file mode 100644
index 0ba15149c9..0000000000
@@ -1,37 +0,0 @@
-From 2a60e32258e6eb34a68d29202855d98661c78abb Mon Sep 17 00:00:00 2001
-From: Luca Stefani <[email protected]>
-Date: Sun, 26 Apr 2020 15:28:21 +0200
-Subject: [PATCH] fsck: Zero-init using memset
-
-* Clang 9.0 incorrectly issues the -Wmissing-braces warning
-
-[Upstream: https://github.com/exfatprogs/exfatprogs/commit/b0519f4fa7ce513d65d0f94c4d5a05be42730e7d.patch]
-Signed-off-by: Peter Seiderer <[email protected]>
----
- fsck/fsck.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/fsck/fsck.c b/fsck/fsck.c
-index 6b48a17..67d7946 100644
---- a/fsck/fsck.c
-+++ b/fsck/fsck.c
-@@ -1211,11 +1211,14 @@ void exfat_show_stat(void)
- int main(int argc, char * const argv[])
- {
- 	int c, ret;
--	struct fsck_user_input ui = {0,};
--	struct exfat_blk_dev bd = {0,};
-+	struct fsck_user_input ui;
-+	struct exfat_blk_dev bd;
- 	struct exfat *exfat = NULL;
- 	bool version_only = false;
- 
-+	memset(&ui, 0, sizeof(ui));
-+	memset(&bd, 0, sizeof(bd));
-+
- 	print_level = EXFAT_ERROR;
- 
- 	if (!setlocale(LC_CTYPE, ""))
--- 
-2.26.2
-
package/exfatprogs/exfatprogs.hash +1 -1
index 654366d865..6beb2777c2 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  e7f14f32dd67601ff42717f432093a400de878774796f6f1684fb9dbf0d499e1  exfatprogs-1.0.2.tar.gz
+sha256  e73863d2f27901834e0dae678ecbb3d899e206d6036cca27d9b24b9479487f65  exfatprogs-1.0.3.tar.gz
 sha256  576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de  COPYING
package/exfatprogs/exfatprogs.mk +2 -3
index 508f4ffff5..a78cde3373 100644
@@ -4,11 +4,10 @@
 #
 ################################################################################
 
-EXFATPROGS_VERSION = 1.0.2
-EXFATPROGS_SITE = $(call github,exfatprogs,exfatprogs,$(EXFATPROGS_VERSION))
+EXFATPROGS_VERSION = 1.0.3
+EXFATPROGS_SITE = https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION)
 EXFATPROGS_LICENSE = GPL-2.0+
 EXFATPROGS_LICENSE_FILES = COPYING
-EXFATPROGS_AUTORECONF = YES
 EXFATPROGS_DEPENDENCIES = host-pkgconf
 HOST_EXFATPROGS_DEPENDENCIES = host-pkgconf
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/exfatprogs: bump to version 1.0.3

Quoted 5 lines · On Tue, 12 May 2020 21:28:59 -0600 James Hilliard <[email protected]>…

Drop patches that are now upstream.

We don't need to autoreconf since we are using a release tarball.

Quoted 12 lines
---
 ...rogs-add-missing-include-sys-types.h.patch |  49 ------
 ...PRIu64-PRIx64-to-printf-64-bit-types.patch | 144 ------------------
 ...k-fix-node-may-be-used-uninitialized.patch |  63 --------
 .../0004-fsck-Zero-init-using-memset.patch    |  37 -----
 package/exfatprogs/exfatprogs.hash            |   2 +-
 package/exfatprogs/exfatprogs.mk              |   5 +-
 6 files changed, 3 insertions(+), 297 deletions(-)
 delete mode 100644 package/exfatprogs/0001-exfatprogs-add-missing-include-sys-types.h.patch
 delete mode 100644 package/exfatprogs/0002-mkfs-fsck-use-PRIu64-PRIx64-to-printf-64-bit-types.patch
 delete mode 100644 package/exfatprogs/0003-fsck-fix-node-may-be-used-uninitialized.patch
 delete mode 100644 package/exfatprogs/0004-fsck-Zero-init-using-memset.patch

We normally don't take version bumps in master, but I looked through the changes between 1.0.2 and 1.0.3 and all of them are fixes, and this patch allows to drop a number of patches. So, I've applied to master. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com