diff --git a/freeradius.spec b/freeradius.spec index 5a941479e73b301fb1a023b5c2d04ab9d0e0f325..39272a891638e1fed54fcc280c0ff21282174c43 100644 --- a/freeradius.spec +++ b/freeradius.spec @@ -4,7 +4,7 @@ Name: freeradius Version: 3.2.3 -Release: 3 +Release: 4 Summary: Remote Authentication Dial-In User Service License: GPLv2+ and LGPLv2+ @@ -15,6 +15,7 @@ Source2: freeradius-logrotate Source3: freeradius-pam-conf Source4: freeradius-tmpfiles.conf Patch0: CVE-2024-3596.patch +Patch1: jlibtool-avoid-conflict-with-Clang-s-config-option.patch BuildRequires: autoconf gdbm-devel openssl openssl-devel pam-devel zlib-devel net-snmp-devel BuildRequires: net-snmp-utils readline-devel libpcap-devel systemd-units libtalloc-devel @@ -497,6 +498,9 @@ exit 0 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/ldap %changelog +* Wed Sep 25 2024 yanying <201250106@smail.nju.edu.cn> - 3.2.3-4 +- Fix clang build: avoid conflict with clang's "--config" option in jlibtool + * Tue Jul 16 2024 wangkai <13474090681@163.com> - 3.2.3-3 - Fix CVE-2024-3596 diff --git a/jlibtool-avoid-conflict-with-Clang-s-config-option.patch b/jlibtool-avoid-conflict-with-Clang-s-config-option.patch new file mode 100644 index 0000000000000000000000000000000000000000..b3a5c230ada6ed823e7803ec701e229a89eefd20 --- /dev/null +++ b/jlibtool-avoid-conflict-with-Clang-s-config-option.patch @@ -0,0 +1,35 @@ +From 9aa6f2fc116bf3cc04a4b50a55d82a96fdd92b3f Mon Sep 17 00:00:00 2001 +From: yanying <201250106@smail.nju.edu.cn> +Date: Wed, 25 Sep 2024 21:18:29 +0800 +Subject: [PATCH] jlibtool: avoid conflict with Clang's --config option + +Replace "--config" with "--print-config" in jlibtool to avoid conflict with Clang's command-line arguments. +--- + scripts/jlibtool.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/jlibtool.c b/scripts/jlibtool.c +index 77b7db21c4..5957ef98c1 100644 +--- a/scripts/jlibtool.c ++++ b/scripts/jlibtool.c +@@ -327,7 +327,7 @@ static void usage(int code) + printf("Usage: jlibtool [OPTIONS...] COMMANDS...\n"); + printf("jlibtool is a replacement for GNU libtool with similar functionality.\n\n"); + +- printf(" --config show all configuration variables\n"); ++ printf(" --print-config show all configuration variables\n"); + printf(" --debug enable verbose shell tracing\n"); + printf(" --dry-run display commands without modifying any files\n"); + printf(" --help display this help message and exit\n"); +@@ -780,7 +780,7 @@ static int parse_long_opt(char const *arg, command_t *cmd) + } else if (strcmp(var, "help") == 0) { + usage(0); + +- } else if (strcmp(var, "config") == 0) { ++ } else if (strcmp(var, "print-config") == 0) { + print_config(value); + + exit(0); +-- +2.41.0.windows.1 +