@@ -1,4 +1,4 @@
-From 680220e772dfa381829983fa73b915416f676894 Mon Sep 17 00:00:00 2001
+From 5849006f70cfa78f4eb0b3f292681c54670ae781 Mon Sep 17 00:00:00 2001
From: Joshua Watt <JPEWhacker@gmail.com>
Date: Tue, 19 Nov 2019 12:47:30 -0600
Subject: [PATCH] stdlib: Add strlcat
@@ -7,7 +7,6 @@ Adds strlcat which can be used to safely concatenate strings
Upstream-Status: Submitted [https://bugzilla.nasm.us/show_bug.cgi?id=3392635]
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
-
---
Makefile.in | 2 +-
configure.ac | 2 ++
@@ -17,10 +16,10 @@ Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
create mode 100644 stdlib/strlcat.c
diff --git a/Makefile.in b/Makefile.in
-index b85ebee..045fabe 100644
+index 68dd8f1..54abfbd 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -104,7 +104,7 @@ PROGOBJ = $(NASM) $(NDISASM)
+@@ -111,7 +111,7 @@ PROGOBJ = $(NASM) $(NDISASM)
PROGS = nasm$(X) ndisasm$(X)
LIBOBJ_NW = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
@@ -30,10 +29,10 @@ index b85ebee..045fabe 100644
nasmlib/ver.$(O) \
nasmlib/alloc.$(O) nasmlib/asprintf.$(O) nasmlib/errfile.$(O) \
diff --git a/configure.ac b/configure.ac
-index 42cd198..e206338 100644
+index e30125b..8a800f1 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -236,6 +236,7 @@ PA_FUNC_SNPRINTF
+@@ -214,6 +214,7 @@ PA_FUNC_SNPRINTF
PA_FUNC_VSNPRINTF
AC_CHECK_FUNCS([strlcpy])
AC_CHECK_FUNCS([strrchrnul])
@@ -41,7 +40,7 @@ index 42cd198..e206338 100644
dnl These types are POSIX-specific, and Windows does it differently...
AC_CHECK_TYPES([struct _stati64])
-@@ -255,6 +256,7 @@ AC_CHECK_DECLS(strsep)
+@@ -233,6 +234,7 @@ AC_CHECK_DECLS(strsep)
AC_CHECK_DECLS(strlcpy)
AC_CHECK_DECLS(strnlen)
AC_CHECK_DECLS(strrchrnul)
@@ -50,10 +49,10 @@ index 42cd198..e206338 100644
dnl Check for missing types
AC_TYPE_UINTPTR_T
diff --git a/include/compiler.h b/include/compiler.h
-index 407c160..b64da6a 100644
+index b95b1a2..eb5b984 100644
--- a/include/compiler.h
+++ b/include/compiler.h
-@@ -169,6 +169,10 @@ size_t strlcpy(char *, const char *, size_t);
+@@ -171,6 +171,10 @@ size_t strlcpy(char *, const char *, size_t);
char *strrchrnul(const char *, int);
#endif
@@ -1,4 +1,4 @@
-From e28c8883050d34d18ee2d66dfeece51e13adb6d5 Mon Sep 17 00:00:00 2001
+From 9c971e6986e0792a0aacd3fb94b9c8b9ee9f6b77 Mon Sep 17 00:00:00 2001
From: Joshua Watt <JPEWhacker@gmail.com>
Date: Tue, 19 Nov 2019 13:12:17 -0600
Subject: [PATCH] Add --debug-prefix-map option
@@ -9,7 +9,6 @@ be built in a reproducible manner regardless of the build directory.
Upstream-Status: Submitted [https://bugzilla.nasm.us/show_bug.cgi?id=3392635]
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
-
---
asm/nasm.c | 24 ++++++++++++++++++++++++
include/nasmlib.h | 9 +++++++++
@@ -27,7 +26,7 @@ Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
create mode 100644 test/elfdebugprefix.asm
diff --git a/asm/nasm.c b/asm/nasm.c
-index 76c70f6..08ff119 100644
+index 97d926f..e013c75 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -939,6 +939,7 @@ enum text_options {
@@ -83,10 +82,10 @@ index 76c70f6..08ff119 100644
fprintf(out, " %-20s %s\n",
diff --git a/include/nasmlib.h b/include/nasmlib.h
-index 87a7fc6..a3e5144 100644
+index fdfb9a9..d0d1194 100644
--- a/include/nasmlib.h
+++ b/include/nasmlib.h
-@@ -250,10 +250,19 @@ int64_t readstrnum(char *str, int length, bool *warn);
+@@ -281,10 +281,19 @@ int numstr(char *buf, size_t buflen, uint64_t n,
*/
int32_t seg_alloc(void);
similarity index 88%
rename from meta/recipes-devtools/nasm/nasm_2.16.01.bb
rename to meta/recipes-devtools/nasm/nasm_2.16.02.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 \
file://0002-Add-debug-prefix-map-option.patch \
"
-SRC_URI[sha256sum] = "35b6ad2ee048d41c4779f073f3efca7762a822b7d2d4ef4e8df24cf65747bb2e"
+SRC_URI[sha256sum] = "188d7ad38f90cb05c53daaa288eaa1eb40a8ad32eccb65e8b64ffe74f44d6f91"
EXTRA_AUTORECONF:append = " -I autoconf/m4"
Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *nasm* to *2.16.02* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-nasm-upgrade-2.16.01-2.16.02.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From afa077eeb510c7f34122871056cadc34957c130d Mon Sep 17 00:00:00 2001 From: Upgrade Helper <auh@yoctoproject.org> Date: Mon, 15 Apr 2024 18:43:56 +0000 Subject: [PATCH] nasm: upgrade 2.16.01 -> 2.16.02 --- .../nasm/nasm/0001-stdlib-Add-strlcat.patch | 17 ++++++++--------- .../nasm/0002-Add-debug-prefix-map-option.patch | 9 ++++----- .../nasm/{nasm_2.16.01.bb => nasm_2.16.02.bb} | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) rename meta/recipes-devtools/nasm/{nasm_2.16.01.bb => nasm_2.16.02.bb} (88%)