aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2024-07-11 06:10:24 +0000
committerKyle Evans <kevans@FreeBSD.org>2024-07-11 06:10:24 +0000
commit7f3a903b679fafe2e0979481f79e2b54648371c8 (patch)
tree216092f4f291557d3f87f4b9c53eab408d5f68a7
parent813f3dc7b302324a361326c2583f37b002100968 (diff)
downloadsrc-vendor/bsddialog.tar.gz
src-vendor/bsddialog.zip
bsddialog: import version 1.0.4vendor/bsddialog/1.0.4vendor/bsddialog
Version 1.0.4 simply renames a local enum value to avoid a conflict with some header pollution that will be introduced by in-flight _FORTIFY_SOURCE changes -- namely, <stdlib.h> needs PATH_MAX from <limits.h> to validate the buffer size used for realpath(3) when fortified.
-rw-r--r--CHANGELOG7
-rw-r--r--Makefile2
-rw-r--r--README.md2
-rw-r--r--lib/bsddialog.h2
-rw-r--r--utility/util_cli.c6
5 files changed, 13 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6877297d4358..a4cf4d01c077 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+2024-07-01 1.0.4
+
+ Utility internal refactoring (no functional change):
+ * change: rename an internal constant to avoid a future conflict
+ because FreeBSD is changing headers files for _FORTIFY_SOURCE.
+ Reported and fixed by Kyle Evans.
+
2024-05-27 1.0.3
Utility:
diff --git a/Makefile b/Makefile
index f1b2da675f9e..a6af8813a48e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
# Written in 2023 by Alfonso Sabato Siciliano
OUTPUT = bsddialog
-export VERSION=1.0.3
+export VERSION=1.0.4
.CURDIR ?= ${CURDIR}
LIBPATH = ${.CURDIR}/lib
LIBBSDDIALOG = ${LIBPATH}/libbsddialog.so
diff --git a/README.md b/README.md
index f984b488b232..7b9b6cf8e84d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# BSDDialog 1.0.3
+# BSDDialog 1.0.4
This project provides **bsddialog** and **libbsddialog**, an utility
and a library to build scripts and tools with TUI dialogs and widgets.
diff --git a/lib/bsddialog.h b/lib/bsddialog.h
index c797f918fb89..fd0e2bc02580 100644
--- a/lib/bsddialog.h
+++ b/lib/bsddialog.h
@@ -30,7 +30,7 @@
#include <stdbool.h>
-#define LIBBSDDIALOG_VERSION "1.0.3"
+#define LIBBSDDIALOG_VERSION "1.0.4"
/* Return values */
#define BSDDIALOG_ERROR -1
diff --git a/utility/util_cli.c b/utility/util_cli.c
index 22bed6550fb5..a70de36a699e 100644
--- a/utility/util_cli.c
+++ b/utility/util_cli.c
@@ -85,7 +85,7 @@ enum OPTS {
LEFT3_BUTTON,
LEFT3_EXIT_CODE,
LOAD_THEME,
- MAX_INPUT,
+ MAX_INPUT_FORM,
NO_CANCEL,
NO_DESCRIPTIONS,
NO_LINES,
@@ -202,7 +202,7 @@ static struct option longopts[] = {
{"left3-button", required_argument, NULL, LEFT3_BUTTON},
{"left3-exit-code", required_argument, NULL, LEFT3_EXIT_CODE},
{"load-theme", required_argument, NULL, LOAD_THEME},
- {"max-input", required_argument, NULL, MAX_INPUT},
+ {"max-input", required_argument, NULL, MAX_INPUT_FORM},
{"no-cancel", no_argument, NULL, NO_CANCEL},
{"nocancel", no_argument, NULL, NO_CANCEL},
{"no-descriptions", no_argument, NULL, NO_DESCRIPTIONS},
@@ -546,7 +546,7 @@ parseargs(int argc, char **argv, struct bsddialog_conf *conf,
case LOAD_THEME:
opt->loadthemefile = optarg;
break;
- case MAX_INPUT:
+ case MAX_INPUT_FORM:
opt->max_input_form = (u_int)strtoul(optarg, NULL, 10);
break;
case NO_CANCEL: