git: 5769468b4ba3 - main - java/openjdk18-24: fix printf in configure output

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Ronald Klop <ronald_at_FreeBSD.org>
Date: Thu, 29 May 2025 16:51:34 UTC
The branch main has been updated by ronald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5769468b4ba38b5d24dcba7aaa0b0131cc5d10d6

commit 5769468b4ba38b5d24dcba7aaa0b0131cc5d10d6
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2025-05-28 14:46:11 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2025-05-29 16:51:09 +0000

    java/openjdk18-24: fix printf in configure output
    
    Printf was confused because the argument was used as format string
    and contained a %.
    The issue is only cosmetical so not bumping port revision.
    
    It is mentioned in the PR that an upstream fix is in openjdk25.
    
    PR:     287053
    Approved by:    java@
---
 java/openjdk18/files/patch-make_autoconf_help.m4 | 11 +++++++++++
 java/openjdk19/files/patch-make_autoconf_help.m4 | 11 +++++++++++
 java/openjdk20/files/patch-make_autoconf_help.m4 | 11 +++++++++++
 java/openjdk21/files/patch-make_autoconf_help.m4 | 11 +++++++++++
 java/openjdk22/files/patch-make_autoconf_help.m4 | 11 +++++++++++
 java/openjdk23/files/patch-make_autoconf_help.m4 | 11 +++++++++++
 java/openjdk24/files/patch-make_autoconf_help.m4 | 11 +++++++++++
 7 files changed, 77 insertions(+)

diff --git a/java/openjdk18/files/patch-make_autoconf_help.m4 b/java/openjdk18/files/patch-make_autoconf_help.m4
new file mode 100644
index 000000000000..6581b3fef247
--- /dev/null
+++ b/java/openjdk18/files/patch-make_autoconf_help.m4
@@ -0,0 +1,11 @@
+--- make/autoconf/help.m4.orig	2025-05-24 21:54:30 UTC
++++ make/autoconf/help.m4
+@@ -269,7 +269,7 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
+     fi
+   fi
+   if test "x$CONFIGURE_COMMAND_LINE" != x; then
+-    printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n"
++    printf "using configure arguments '%s'.\n" "$CONFIGURE_COMMAND_LINE"
+   else
+     printf "using default settings.\n"
+   fi
diff --git a/java/openjdk19/files/patch-make_autoconf_help.m4 b/java/openjdk19/files/patch-make_autoconf_help.m4
new file mode 100644
index 000000000000..6581b3fef247
--- /dev/null
+++ b/java/openjdk19/files/patch-make_autoconf_help.m4
@@ -0,0 +1,11 @@
+--- make/autoconf/help.m4.orig	2025-05-24 21:54:30 UTC
++++ make/autoconf/help.m4
+@@ -269,7 +269,7 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
+     fi
+   fi
+   if test "x$CONFIGURE_COMMAND_LINE" != x; then
+-    printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n"
++    printf "using configure arguments '%s'.\n" "$CONFIGURE_COMMAND_LINE"
+   else
+     printf "using default settings.\n"
+   fi
diff --git a/java/openjdk20/files/patch-make_autoconf_help.m4 b/java/openjdk20/files/patch-make_autoconf_help.m4
new file mode 100644
index 000000000000..6581b3fef247
--- /dev/null
+++ b/java/openjdk20/files/patch-make_autoconf_help.m4
@@ -0,0 +1,11 @@
+--- make/autoconf/help.m4.orig	2025-05-24 21:54:30 UTC
++++ make/autoconf/help.m4
+@@ -269,7 +269,7 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
+     fi
+   fi
+   if test "x$CONFIGURE_COMMAND_LINE" != x; then
+-    printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n"
++    printf "using configure arguments '%s'.\n" "$CONFIGURE_COMMAND_LINE"
+   else
+     printf "using default settings.\n"
+   fi
diff --git a/java/openjdk21/files/patch-make_autoconf_help.m4 b/java/openjdk21/files/patch-make_autoconf_help.m4
new file mode 100644
index 000000000000..6581b3fef247
--- /dev/null
+++ b/java/openjdk21/files/patch-make_autoconf_help.m4
@@ -0,0 +1,11 @@
+--- make/autoconf/help.m4.orig	2025-05-24 21:54:30 UTC
++++ make/autoconf/help.m4
+@@ -269,7 +269,7 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
+     fi
+   fi
+   if test "x$CONFIGURE_COMMAND_LINE" != x; then
+-    printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n"
++    printf "using configure arguments '%s'.\n" "$CONFIGURE_COMMAND_LINE"
+   else
+     printf "using default settings.\n"
+   fi
diff --git a/java/openjdk22/files/patch-make_autoconf_help.m4 b/java/openjdk22/files/patch-make_autoconf_help.m4
new file mode 100644
index 000000000000..6581b3fef247
--- /dev/null
+++ b/java/openjdk22/files/patch-make_autoconf_help.m4
@@ -0,0 +1,11 @@
+--- make/autoconf/help.m4.orig	2025-05-24 21:54:30 UTC
++++ make/autoconf/help.m4
+@@ -269,7 +269,7 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
+     fi
+   fi
+   if test "x$CONFIGURE_COMMAND_LINE" != x; then
+-    printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n"
++    printf "using configure arguments '%s'.\n" "$CONFIGURE_COMMAND_LINE"
+   else
+     printf "using default settings.\n"
+   fi
diff --git a/java/openjdk23/files/patch-make_autoconf_help.m4 b/java/openjdk23/files/patch-make_autoconf_help.m4
new file mode 100644
index 000000000000..6581b3fef247
--- /dev/null
+++ b/java/openjdk23/files/patch-make_autoconf_help.m4
@@ -0,0 +1,11 @@
+--- make/autoconf/help.m4.orig	2025-05-24 21:54:30 UTC
++++ make/autoconf/help.m4
+@@ -269,7 +269,7 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
+     fi
+   fi
+   if test "x$CONFIGURE_COMMAND_LINE" != x; then
+-    printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n"
++    printf "using configure arguments '%s'.\n" "$CONFIGURE_COMMAND_LINE"
+   else
+     printf "using default settings.\n"
+   fi
diff --git a/java/openjdk24/files/patch-make_autoconf_help.m4 b/java/openjdk24/files/patch-make_autoconf_help.m4
new file mode 100644
index 000000000000..6581b3fef247
--- /dev/null
+++ b/java/openjdk24/files/patch-make_autoconf_help.m4
@@ -0,0 +1,11 @@
+--- make/autoconf/help.m4.orig	2025-05-24 21:54:30 UTC
++++ make/autoconf/help.m4
+@@ -269,7 +269,7 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
+     fi
+   fi
+   if test "x$CONFIGURE_COMMAND_LINE" != x; then
+-    printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n"
++    printf "using configure arguments '%s'.\n" "$CONFIGURE_COMMAND_LINE"
+   else
+     printf "using default settings.\n"
+   fi