From: Wang Mingyu Date: Wed, 23 Jul 2025 03:29:30 +0000 (+0800) Subject: mtools: upgrade 4.0.45 -> 4.0.46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daab05bc863611c83223a383dd83ff2134cae6f8;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git mtools: upgrade 4.0.45 -> 4.0.46 clang_UNUSED.patch mtools-makeinfo.patch refreshed for 4.0.46 Changelog: ============= - iconv buffer overflow fixes - removed references to mread and mwrite (obsolete subcommands from mcopy) - documented mdoctorfat, and addressed 2 bugs/oversights - removed references to obsolete mread and mwrite - portability fixes (dietlibc and MacOS X) & simplification Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie (From OE-Core rev: f5a5b2372669d8be4ae3f19ed6892264ea3999d0) Signed-off-by: Jinfeng Wang Signed-off-by: Steve Sakoman --- diff --git a/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch b/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch index 20a6d1b8b3..1420d84b86 100644 --- a/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch +++ b/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch @@ -1,4 +1,4 @@ -From c72d075cb0c3a65ef17621c7ed1ffac35ca3b68e Mon Sep 17 00:00:00 2001 +From 6654edfb1eee416b58bcb6490658f80071a353c2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 19 Sep 2018 11:55:41 -0700 Subject: [PATCH] Undefine UNUSED macros with clang @@ -10,10 +10,10 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysincludes.h b/sysincludes.h -index e16ab45..8d285d4 100644 +index 6b322ff..48daecd 100644 --- a/sysincludes.h +++ b/sysincludes.h -@@ -98,7 +98,7 @@ typedef void *caddr_t; +@@ -85,7 +85,7 @@ ac_cv_func_setpgrp_void=yes ../mtools/configure --build=i386-linux-gnu --host=i3 #if defined __GNUC__ && defined __STDC__ /* gcc -traditional doesn't have PACKED, UNUSED and NORETURN */ # define PACKED __attribute__ ((packed)) diff --git a/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch index 3771f94c59..8c80040f91 100644 --- a/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch +++ b/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch @@ -1,4 +1,4 @@ -From 184b76e9742ff89f90a066edb0f46b4a150351cf Mon Sep 17 00:00:00 2001 +From fd1e84c66852c2c906ee292aad942b4bfbd9e306 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 8 Jun 2007 08:35:12 +0000 Subject: [PATCH] mtools: imported from OE @@ -6,11 +6,11 @@ Subject: [PATCH] mtools: imported from OE Upstream-Status: Inappropriate [licensing] --- Makefile.in | 11 ++++++----- - configure.in | 27 +++++++++++++++++++++++++++ + configure.ac | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 5db50d7..92ad461 100644 +index 7b305b0..70c8c74 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,10 +26,11 @@ USERCFLAGS = @@ -38,11 +38,11 @@ index 5db50d7..92ad461 100644 pdf: mtools.pdf %.pdf: %.texi sysconfdir.texi -diff --git a/configure.in b/configure.in -index 1de916e..fd6cb08 100644 ---- a/configure.in -+++ b/configure.in -@@ -32,6 +32,33 @@ AC_CANONICAL_TARGET +diff --git a/configure.ac b/configure.ac +index de108a8..0fd9ef0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -33,6 +33,33 @@ AC_CANONICAL_TARGET AC_C_CONST AC_C_INLINE diff --git a/meta/recipes-devtools/mtools/mtools_4.0.45.bb b/meta/recipes-devtools/mtools/mtools_4.0.46.bb similarity index 93% rename from meta/recipes-devtools/mtools/mtools_4.0.45.bb rename to meta/recipes-devtools/mtools/mtools_4.0.46.bb index 34040d7a0d..1173718662 100644 --- a/meta/recipes-devtools/mtools/mtools_4.0.45.bb +++ b/meta/recipes-devtools/mtools/mtools_4.0.46.bb @@ -24,7 +24,7 @@ RRECOMMENDS:${PN}:libc-glibc = "\ glibc-gconv-ibm866 \ glibc-gconv-ibm869 \ " -SRC_URI[sha256sum] = "0b008a96bd0efe0e542fa4383d469af66bc4a93394990b103730a8160a67d618" +SRC_URI[sha256sum] = "9aad8dd859f88fb7787924ec47590192d3abf7bad6c840509c854290d6bc16c0" SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ file://mtools-makeinfo.patch \