freeradius: 3.2.5 -> 3.2.7

ChangeLog:
https://github.com/FreeRADIUS/freeradius-server/releases/tag/release_3_2_6
https://github.com/FreeRADIUS/freeradius-server/releases/tag/release_3_2_7

* Refresh local patches.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao
2025-03-21 21:00:00 +08:00
committed by Khem Raj
parent 0b1e0f24f2
commit 053d73ffd6
18 changed files with 118 additions and 101 deletions
@@ -1,4 +1,4 @@
From 3be3b9a1345942d1578ec73efa9b2e3c41bd67c5 Mon Sep 17 00:00:00 2001 From 1e43b309183f2cca627d1995908aeb9bb0b5bf97 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com> From: Yi Zhao <yi.zhao@windriver.com>
Date: Fri, 21 Jan 2022 13:22:24 +0800 Date: Fri, 21 Jan 2022 13:22:24 +0800
Subject: [PATCH] Add autogen.sh Subject: [PATCH] Add autogen.sh
@@ -1,4 +1,4 @@
From 2a74c10836c0d2d19248ca40d113936f4a56b039 Mon Sep 17 00:00:00 2001 From 77e9dbe0d0d175deead427793192ffb4ffad2825 Mon Sep 17 00:00:00 2001
From: "Roy.Li" <rongqing.li@windriver.com> From: "Roy.Li" <rongqing.li@windriver.com>
Date: Sun, 8 Jan 2023 22:47:11 +0800 Date: Sun, 8 Jan 2023 22:47:11 +0800
Subject: [PATCH] Enable and change user and group of freeradius server to Subject: [PATCH] Enable and change user and group of freeradius server to
@@ -13,10 +13,10 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index 154b50d610..4594d6d2d2 100644 index 376892e151..63c49a224c 100644
--- a/raddb/radiusd.conf.in --- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in +++ b/raddb/radiusd.conf.in
@@ -557,8 +557,8 @@ security { @@ -562,8 +562,8 @@ security {
# member. This can allow for some finer-grained access # member. This can allow for some finer-grained access
# controls. # controls.
# #
@@ -1,4 +1,4 @@
From ba1390a80662ff2ab7bfda978cde7df9a871f6ae Mon Sep 17 00:00:00 2001 From 0a9e26096b1e93f9202f83ecf7302cfcf138b7cf Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com> From: Changqing Li <changqing.li@windriver.com>
Date: Tue, 24 Jul 2018 15:03:39 +0800 Date: Tue, 24 Jul 2018 15:03:39 +0800
Subject: [PATCH] configure.ac: allow cross-compilation Subject: [PATCH] configure.ac: allow cross-compilation
@@ -18,7 +18,6 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
Rebased for 3.2.3 Rebased for 3.2.3
Signed-off-by: Randy MacLeod <randy.macleod@windriver.com> Signed-off-by: Randy MacLeod <randy.macleod@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
--- ---
src/modules/rlm_krb5/configure.ac | 3 ++- src/modules/rlm_krb5/configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
@@ -37,3 +36,6 @@ index 9ee6379ea4..1dad481da8 100644
fi fi
else else
krb5threadsafe="" krb5threadsafe=""
--
2.25.1
@@ -1,4 +1,4 @@
From 5ba3d140842268cbbdd983266efecb1fba5bdd59 Mon Sep 17 00:00:00 2001 From 864316403192a3e93a2b1f37de479437964eb7f3 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com> From: Changqing Li <changqing.li@windriver.com>
Date: Thu, 22 Aug 2019 10:45:46 +0800 Date: Thu, 22 Aug 2019 10:45:46 +0800
Subject: [PATCH] Fix libtool detection Subject: [PATCH] Fix libtool detection
@@ -20,10 +20,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
1 file changed, 36 insertions(+) 1 file changed, 36 insertions(+)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index ad8bc8cdda..ef8fced680 100644 index 6f29206646..c0d6ea99ca 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -321,6 +321,42 @@ dnl # See if we have Git. @@ -319,6 +319,42 @@ dnl # See if we have Git.
dnl # dnl #
AC_CHECK_PROG(GIT, git, yes, no) AC_CHECK_PROG(GIT, git, yes, no)
@@ -1,4 +1,4 @@
From 9548dc5e1a6c835cd4f387ba384d8f3f14c3fc8b Mon Sep 17 00:00:00 2001 From f655b4b6a89ae3bb183c659e61cc78539c2c4e81 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com> From: Changqing Li <changqing.li@windriver.com>
Date: Thu, 22 Aug 2019 10:50:21 +0800 Date: Thu, 22 Aug 2019 10:50:21 +0800
Subject: [PATCH] configure.ac: add option for libcap Subject: [PATCH] configure.ac: add option for libcap
@@ -12,10 +12,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
1 file changed, 27 insertions(+), 9 deletions(-) 1 file changed, 27 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index ef8fced680..263098f7fd 100644 index c0d6ea99ca..64aa9e4293 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1161,6 +1161,22 @@ fi @@ -1209,6 +1209,22 @@ fi
dnl Set by FR_SMART_CHECKLIB dnl Set by FR_SMART_CHECKLIB
LIBS="${old_LIBS}" LIBS="${old_LIBS}"
@@ -38,7 +38,7 @@ index ef8fced680..263098f7fd 100644
dnl Check for cap dnl Check for cap
dnl extra argument: --with-cap-lib-dir=DIR dnl extra argument: --with-cap-lib-dir=DIR
cap_lib_dir= cap_lib_dir=
@@ -1194,15 +1210,17 @@ AC_ARG_WITH(cap-include-dir, @@ -1242,15 +1258,17 @@ AC_ARG_WITH(cap-include-dir,
;; ;;
esac]) esac])
@@ -1,4 +1,4 @@
From 8fe25b30b6fbb3170705f4468eb4c92eef3a968f Mon Sep 17 00:00:00 2001 From d8631a433abf7336b065ecfaa5161e408ea47255 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com> From: Jackie Huang <jackie.huang@windriver.com>
Date: Mon, 4 Jan 2016 01:44:04 -0500 Date: Mon, 4 Jan 2016 01:44:04 -0500
Subject: [PATCH] Avoid searching host dirs Subject: [PATCH] Avoid searching host dirs
@@ -14,15 +14,15 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Rebased for 3.2.3 Rebased for 3.2.3
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
--- ---
m4/fr_smart_check_include.m4 | 2 +- m4/fr_smart_check_include.m4 | 2 +-
m4/fr_smart_check_lib.m4 | 22 ---------------------- m4/fr_smart_check_lib.m4 | 22 -------------------
src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac | 4 ++-- .../rlm_sql/drivers/rlm_sql_db2/configure.ac | 4 ++--
src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac | 4 ++-- .../drivers/rlm_sql_firebird/configure.ac | 4 ++--
src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac | 4 ++-- .../drivers/rlm_sql_iodbc/configure.ac | 4 ++--
src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac | 6 +++--- .../drivers/rlm_sql_mysql/configure.ac | 6 ++---
src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac | 2 +- .../drivers/rlm_sql_oracle/configure.ac | 2 +-
src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac | 4 ++-- .../drivers/rlm_sql_postgresql/configure.ac | 4 ++--
src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac | 4 ++-- .../drivers/rlm_sql_unixodbc/configure.ac | 4 ++--
9 files changed, 15 insertions(+), 37 deletions(-) 9 files changed, 15 insertions(+), 37 deletions(-)
diff --git a/m4/fr_smart_check_include.m4 b/m4/fr_smart_check_include.m4 diff --git a/m4/fr_smart_check_include.m4 b/m4/fr_smart_check_include.m4
@@ -38,6 +38,39 @@ index e7d4443f9c..2b69704f98 100644
dnl # Our local versions dnl # Our local versions
_smart_try_dir= _smart_try_dir=
diff --git a/m4/fr_smart_check_lib.m4 b/m4/fr_smart_check_lib.m4
index 16ac5b3c5e..0f5e9fc6d6 100644
--- a/m4/fr_smart_check_lib.m4
+++ b/m4/fr_smart_check_lib.m4
@@ -64,28 +64,6 @@ if test "x$smart_lib" = "x"; then
LIBS="$old_LIBS"
fi
-dnl #
-dnl # Try to guess possible locations.
-dnl #
-if test "x$smart_lib" = "x"; then
- for try in /usr/local/lib /opt/lib; do
- AC_MSG_CHECKING([for $2 in -l$1 in $try])
- LIBS="-l$1 $old_LIBS"
- CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS"
- AC_TRY_LINK([extern char $2();],
- [$2()],
- [
- smart_lib="-l$1"
- smart_ldflags="-L$try -Wl,-rpath,$try"
- AC_MSG_RESULT(yes)
- break
- ],
- [AC_MSG_RESULT(no)])
- done
- LIBS="$old_LIBS"
- CPPFLAGS="$old_CPPFLAGS"
-fi
-
dnl #
dnl # Found it, set the appropriate variable.
dnl #
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac
index 0d94ee9bf6..6108e62054 100644 index 0d94ee9bf6..6108e62054 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac --- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac
@@ -146,7 +179,7 @@ index f31b7d2c5a..67bbf66df5 100644
if test "x$ORACLE_HOME" != "x"; then if test "x$ORACLE_HOME" != "x"; then
smart_try_dir="${smart_try_dir} ${ORACLE_HOME}/include" smart_try_dir="${smart_try_dir} ${ORACLE_HOME}/include"
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
index 46587e4099..b41c51bda7 100644 index 6b1c9e964e..1937d81134 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac --- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac +++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac
@@ -43,7 +43,7 @@ AC_ARG_WITH(rlm-sql-postgresql-include-dir, @@ -43,7 +43,7 @@ AC_ARG_WITH(rlm-sql-postgresql-include-dir,
@@ -158,7 +191,7 @@ index 46587e4099..b41c51bda7 100644
FR_SMART_CHECK_INCLUDE(libpq-fe.h) FR_SMART_CHECK_INCLUDE(libpq-fe.h)
if test "x$ac_cv_header_libpqmfe_h" != "xyes"; then if test "x$ac_cv_header_libpqmfe_h" != "xyes"; then
FR_MODULE_FAIL([libpq-fe.h]) FR_MODULE_FAIL([libpq-fe.h])
@@ -95,7 +95,7 @@ else @@ -110,7 +110,7 @@ else
]) ])
fi fi
@@ -188,36 +221,6 @@ index 3bdfae6032..ce68c312c6 100644
FR_SMART_CHECK_INCLUDE(sql.h) FR_SMART_CHECK_INCLUDE(sql.h)
if test "x$ac_cv_header_sql_h" != xyes; then if test "x$ac_cv_header_sql_h" != xyes; then
FR_MODULE_FAIL([sql.h]) FR_MODULE_FAIL([sql.h])
diff --git a/m4/fr_smart_check_lib.m4 b/m4/fr_smart_check_lib.m4 --
index 16ac5b3c5e..0f5e9fc6d6 100644 2.25.1
--- a/m4/fr_smart_check_lib.m4
+++ b/m4/fr_smart_check_lib.m4
@@ -64,28 +64,6 @@ if test "x$smart_lib" = "x"; then
LIBS="$old_LIBS"
fi
-dnl #
-dnl # Try to guess possible locations.
-dnl #
-if test "x$smart_lib" = "x"; then
- for try in /usr/local/lib /opt/lib; do
- AC_MSG_CHECKING([for $2 in -l$1 in $try])
- LIBS="-l$1 $old_LIBS"
- CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS"
- AC_TRY_LINK([extern char $2();],
- [$2()],
- [
- smart_lib="-l$1"
- smart_ldflags="-L$try -Wl,-rpath,$try"
- AC_MSG_RESULT(yes)
- break
- ],
- [AC_MSG_RESULT(no)])
- done
- LIBS="$old_LIBS"
- CPPFLAGS="$old_CPPFLAGS"
-fi
-
dnl #
dnl # Found it, set the appropriate variable.
dnl #
@@ -1,4 +1,4 @@
From e4ff7a2a9834e2589bc7bdda4b74f5bc962b15e6 Mon Sep 17 00:00:00 2001 From 0aab0817acf2179d99c516d7933c80c411855eb7 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com> From: Jackie Huang <jackie.huang@windriver.com>
Date: Wed, 27 Jan 2016 05:07:19 -0500 Date: Wed, 27 Jan 2016 05:07:19 -0500
Subject: [PATCH] rlm_python: add PY_INC_DIR in search dir Subject: [PATCH] rlm_python: add PY_INC_DIR in search dir
@@ -28,3 +28,6 @@ index c79c327064..5f4d274990 100644
FR_SMART_CHECK_INCLUDE(Python.h) FR_SMART_CHECK_INCLUDE(Python.h)
CFLAGS=$old_CFLAGS CFLAGS=$old_CFLAGS
--
2.25.1
@@ -1,4 +1,4 @@
From d0fa5b259c2dc942d0a43a9cf1bfc32f40c184f9 Mon Sep 17 00:00:00 2001 From c47048a68eec6838c87e5cde5fddc7e7500b7742 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com> From: Jackie Huang <jackie.huang@windriver.com>
Date: Thu, 7 Jan 2016 22:37:30 -0800 Date: Thu, 7 Jan 2016 22:37:30 -0800
Subject: [PATCH] libtool: do not use jlibtool Subject: [PATCH] libtool: do not use jlibtool
@@ -12,26 +12,25 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
--- ---
Make.inc.in | 4 ++-- Make.inc.in | 3 ++-
scripts/boiler.mk | 2 ++ scripts/boiler.mk | 2 ++
scripts/install.mk | 14 +++++++------- scripts/install.mk | 14 +++++++-------
scripts/libtool.mk | 22 ++++++++++++++++------ scripts/libtool.mk | 22 +++++++++++++++-------
4 files changed, 27 insertions(+), 15 deletions(-) 4 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/Make.inc.in b/Make.inc.in diff --git a/Make.inc.in b/Make.inc.in
index 05f82776ff..e78f3fe9dc 100644 index 6d5cc1c343..7944aa7143 100644
--- a/Make.inc.in --- a/Make.inc.in
+++ b/Make.inc.in +++ b/Make.inc.in
@@ -57,7 +57,7 @@ CPPFLAGS = @CPPFLAGS@ @@ -57,6 +57,7 @@ CPPFLAGS = @CPPFLAGS@
LIBPREFIX = @LIBPREFIX@ LIBPREFIX = @LIBPREFIX@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
-LIBTOOL = JLIBTOOL
+LIBTOOL = @LIBTOOL@ +LIBTOOL = @LIBTOOL@
ACLOCAL = @ACLOCAL@ ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
@@ -168,7 +168,7 @@ ANALYZE.c := @clang_path@ @@ -168,7 +169,7 @@ ANALYZE.c := @clang_path@
# #
ifeq "$(USE_SHARED_LIBS)" "yes" ifeq "$(USE_SHARED_LIBS)" "yes"
TESTBINDIR = ./$(BUILD_DIR)/bin/local TESTBINDIR = ./$(BUILD_DIR)/bin/local
@@ -41,10 +40,10 @@ index 05f82776ff..e78f3fe9dc 100644
TESTBINDIR = ./$(BUILD_DIR)/bin TESTBINDIR = ./$(BUILD_DIR)/bin
TESTBIN = ./$(BUILD_DIR)/bin TESTBIN = ./$(BUILD_DIR)/bin
diff --git a/scripts/boiler.mk b/scripts/boiler.mk diff --git a/scripts/boiler.mk b/scripts/boiler.mk
index 2ce0c18f34..567cc0f22f 100644 index 9d70104747..a882e5ce2b 100644
--- a/scripts/boiler.mk --- a/scripts/boiler.mk
+++ b/scripts/boiler.mk +++ b/scripts/boiler.mk
@@ -272,6 +272,7 @@ define COMPILE_C_CMDS @@ -271,6 +271,7 @@ define COMPILE_C_CMDS
$(Q)$(ECHO) CC $< $(Q)$(ECHO) CC $<
$(Q)$(strip ${COMPILE.c} -o $@ -c -MD ${CPPFLAGS} ${CFLAGS} ${SRC_CFLAGS} ${INCDIRS} \ $(Q)$(strip ${COMPILE.c} -o $@ -c -MD ${CPPFLAGS} ${CFLAGS} ${SRC_CFLAGS} ${INCDIRS} \
$(addprefix -I, ${SRC_INCDIRS}) ${SRC_DEFS} ${DEFS} $<) $(addprefix -I, ${SRC_INCDIRS}) ${SRC_DEFS} ${DEFS} $<)
@@ -52,7 +51,7 @@ index 2ce0c18f34..567cc0f22f 100644
endef endef
else else
# #
@@ -287,6 +288,7 @@ define COMPILE_C_CMDS @@ -286,6 +287,7 @@ define COMPILE_C_CMDS
$(Q)cppcheck --enable=style -q ${CHECKFLAGS} $(filter -isystem%,${SRC_CFLAGS}) \ $(Q)cppcheck --enable=style -q ${CHECKFLAGS} $(filter -isystem%,${SRC_CFLAGS}) \
$(filter -I%,${SRC_CFLAGS}) $(filter -D%,${SRC_CFLAGS}) ${INCDIRS} \ $(filter -I%,${SRC_CFLAGS}) $(filter -D%,${SRC_CFLAGS}) ${INCDIRS} \
$(addprefix -I,${SRC_INCDIRS}) ${SRC_DEFS} ${DEFS} --suppress=variableScope --suppress=invalidscanf $< $(addprefix -I,${SRC_INCDIRS}) ${SRC_DEFS} ${DEFS} --suppress=variableScope --suppress=invalidscanf $<
@@ -116,21 +115,28 @@ index 916411563b..e38c1ed697 100644
diff --git a/scripts/libtool.mk b/scripts/libtool.mk diff --git a/scripts/libtool.mk b/scripts/libtool.mk
index 381127ec2d..e83d7e6ad7 100644 index 64c2fe0804..05ed2292f0 100644
--- a/scripts/libtool.mk --- a/scripts/libtool.mk
+++ b/scripts/libtool.mk +++ b/scripts/libtool.mk
@@ -60,7 +60,9 @@ ifeq "${LIBTOOL}" "JLIBTOOL" @@ -33,7 +33,7 @@ JLIBTOOL := ${BUILD_DIR}/make/jlibtool
# Tell GNU Make to use this value, rather than anything specified
# on the command line. # Add a rule to build jlibtool BEFORE any other targets. This
override LIBTOOL := ${JLIBTOOL} # means that we can use it to build the later targets.
-endif # else we're not using jlibtool -all install: ${JLIBTOOL}
+else # else we're not using jlibtool +all install: ${LIBTOOL}
+ all install: ${LIBTOOL}
+endif # Note that we need to use a compilation rule that does NOT
# include referencing ${LIBTOOL}, as we don't have a jlibtool
@@ -51,7 +51,7 @@ jlibtool_clean:
# Tell GNU Make to use this value, rather than anything specified
# on the command line.
-override LIBTOOL := ${JLIBTOOL}
+#override LIBTOOL := ${JLIBTOOL}
# When using libtool, it produces a '.libs' directory. Ensure that it # When using libtool, it produces a '.libs' directory. Ensure that it
# is removed on "make clean", too. # is removed on "make clean", too.
@@ -74,11 +76,19 @@ clean: .libs_clean @@ -65,11 +65,19 @@ clean: .libs_clean
# Re-define compilers and linkers # Re-define compilers and linkers
# #
OBJ_EXT = lo OBJ_EXT = lo
@@ -1,4 +1,4 @@
From 3e701d6274924adaed568e22af2362aa5af1f055 Mon Sep 17 00:00:00 2001 From 33ef5c4e285796c5f208b2b091d4b75e0849f282 Mon Sep 17 00:00:00 2001
From: Peter Seebach <peter.seebach@windriver.com> From: Peter Seebach <peter.seebach@windriver.com>
Date: Sun, 8 Jan 2023 23:01:28 +0800 Date: Sun, 8 Jan 2023 23:01:28 +0800
Subject: [PATCH] Fix quoting for BUILD_WITH Subject: [PATCH] Fix quoting for BUILD_WITH
@@ -1,4 +1,4 @@
From 30ce5ccd62446349d432ff65d3fe8d46872423c8 Mon Sep 17 00:00:00 2001 From 0475d948ceab91b22172f0fae3bc01e0a1502ae8 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com> From: Yi Zhao <yi.zhao@windriver.com>
Date: Wed, 18 Jan 2017 14:59:39 +0800 Date: Wed, 18 Jan 2017 14:59:39 +0800
Subject: [PATCH] fix error for expansion of macro in thread.h Subject: [PATCH] fix error for expansion of macro in thread.h
@@ -22,10 +22,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
1 file changed, 5 insertions(+), 5 deletions(-) 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/include/threads.h b/src/include/threads.h diff --git a/src/include/threads.h b/src/include/threads.h
index e36d81dac0..2bcb6aadcb 100644 index f2aea776d6..1c4e526797 100644
--- a/src/include/threads.h --- a/src/include/threads.h
+++ b/src/include/threads.h +++ b/src/include/threads.h
@@ -89,7 +89,7 @@ static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ @@ -92,7 +92,7 @@ static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\
# define fr_thread_local_get(_n) _n # define fr_thread_local_get(_n) _n
#elif defined(HAVE_PTHREAD_H) #elif defined(HAVE_PTHREAD_H)
# include <pthread.h> # include <pthread.h>
@@ -34,7 +34,7 @@ index e36d81dac0..2bcb6aadcb 100644
static pthread_key_t __fr_thread_local_key_##_n;\ static pthread_key_t __fr_thread_local_key_##_n;\
static pthread_once_t __fr_thread_local_once_##_n = PTHREAD_ONCE_INIT;\ static pthread_once_t __fr_thread_local_once_##_n = PTHREAD_ONCE_INIT;\
static pthread_destructor_t __fr_thread_local_destructor_##_n = NULL;\ static pthread_destructor_t __fr_thread_local_destructor_##_n = NULL;\
@@ -100,17 +100,17 @@ static void __fr_thread_local_destroy_##_n(UNUSED void *unused)\ @@ -103,17 +103,17 @@ static void __fr_thread_local_destroy_##_n(UNUSED void *unused)\
static void __fr_thread_local_key_init_##_n(void)\ static void __fr_thread_local_key_init_##_n(void)\
{\ {\
(void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destroy_##_n);\ (void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destroy_##_n);\
@@ -1,4 +1,4 @@
From f0e764826e3a85488047f7f4e94ebf91460d2c12 Mon Sep 17 00:00:00 2001 From f742496305018629be88eaac14cc6e1fa80d7594 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com> From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 16 Jun 2017 20:10:49 -0700 Date: Fri, 16 Jun 2017 20:10:49 -0700
Subject: [PATCH] rlm_mschap: Use includedir instead of hardcoding /usr/include Subject: [PATCH] rlm_mschap: Use includedir instead of hardcoding /usr/include
@@ -26,3 +26,6 @@ index 953336f475..77a18af55d 100644
FR_SMART_CHECK_INCLUDE(wbclient.h, [#include <stdint.h> FR_SMART_CHECK_INCLUDE(wbclient.h, [#include <stdint.h>
#include <stdbool.h>]) #include <stdbool.h>])
if test "x$ac_cv_header_wbclient_h" != "xyes"; then if test "x$ac_cv_header_wbclient_h" != "xyes"; then
--
2.25.1
@@ -1,4 +1,4 @@
From 0f9f18fc330fe88080be13e43f300fbf7ba4a85a Mon Sep 17 00:00:00 2001 From de2b9e3b8f9ad8b8ac3e7e820b8b831e91c2dd71 Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli.yu@windriver.com> From: Mingli Yu <mingli.yu@windriver.com>
Date: Mon, 13 Jul 2020 07:01:45 +0000 Date: Mon, 13 Jul 2020 07:01:45 +0000
Subject: [PATCH] raddb/certs/Makefile: fix the existed certificate error Subject: [PATCH] raddb/certs/Makefile: fix the existed certificate error
@@ -29,7 +29,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile
index c9fbc9e864..d064fe252d 100644 index 34948bd924..cae939668e 100644
--- a/raddb/certs/Makefile --- a/raddb/certs/Makefile
+++ b/raddb/certs/Makefile +++ b/raddb/certs/Makefile
@@ -92,7 +92,7 @@ server.csr server.key: server.cnf @@ -92,7 +92,7 @@ server.csr server.key: server.cnf
@@ -1,4 +1,4 @@
From bb1cb2ffc7a31c0a2bb2de51ef82d304b0a107c3 Mon Sep 17 00:00:00 2001 From 38cbab566143b9e002ee24a1f08a52ec74186eca Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli.yu@windriver.com> From: Mingli Yu <mingli.yu@windriver.com>
Date: Wed, 5 Aug 2020 07:23:11 +0000 Date: Wed, 5 Aug 2020 07:23:11 +0000
Subject: [PATCH] raddb/certs/Makefile: fix the occasional verification failure Subject: [PATCH] raddb/certs/Makefile: fix the occasional verification failure
@@ -29,7 +29,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
1 file changed, 15 insertions(+), 15 deletions(-) 1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile
index d064fe252d..86f4547804 100644 index cae939668e..52ae65755f 100644
--- a/raddb/certs/Makefile --- a/raddb/certs/Makefile
+++ b/raddb/certs/Makefile +++ b/raddb/certs/Makefile
@@ -59,7 +59,7 @@ passwords.mk: server.cnf ca.cnf client.cnf inner-server.cnf @@ -59,7 +59,7 @@ passwords.mk: server.cnf ca.cnf client.cnf inner-server.cnf
@@ -1,4 +1,4 @@
From c591da4a361496eec93625cf8c4f89bddfedaca7 Mon Sep 17 00:00:00 2001 From 9fed86858d8d2045f3de77405059d786bb2d50ac Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Sun, 7 Feb 2021 16:02:36 +0800 Date: Sun, 7 Feb 2021 16:02:36 +0800
Subject: [PATCH] Workaround error with autoconf 2.7 Subject: [PATCH] Workaround error with autoconf 2.7
@@ -19,12 +19,12 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
1 file changed, 8 deletions(-) 1 file changed, 8 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 263098f7fd..fc296832d8 100644 index 64aa9e4293..0861514ef7 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -878,14 +878,6 @@ fi @@ -926,14 +926,6 @@ if test "x$WITH_RADLAST" != "xyes"; then
fi
AC_PATH_PROG(RUSERS, rusers, /usr/bin/rusers)
-dnl # -dnl #
-dnl # FIXME This is truly gross. -dnl # FIXME This is truly gross.
@@ -1,4 +1,4 @@
From 78494ea005bd38324953b05176d6eb2c3f55af2c Mon Sep 17 00:00:00 2001 From e8802c019085c743dc691e9329f05f7e559d1fa5 Mon Sep 17 00:00:00 2001
From: Kai Kang <kai.kang@windriver.com> From: Kai Kang <kai.kang@windriver.com>
Date: Sun, 8 Jan 2023 23:21:24 +0800 Date: Sun, 8 Jan 2023 23:21:24 +0800
Subject: [PATCH] bootstrap: check commands of openssl exist Subject: [PATCH] bootstrap: check commands of openssl exist
@@ -1,4 +1,4 @@
From cbbb62ddda5c189c225f96bf6b599b3b3e8c8252 Mon Sep 17 00:00:00 2001 From 99ea83d998d3b8957830afa15cec42ba265b67ca Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli.yu@windriver.com> From: Mingli Yu <mingli.yu@windriver.com>
Date: Wed, 3 Aug 2022 16:44:29 +0800 Date: Wed, 3 Aug 2022 16:44:29 +0800
Subject: [PATCH] version.c: don't print build flags Subject: [PATCH] version.c: don't print build flags
@@ -13,10 +13,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
1 file changed, 13 deletions(-) 1 file changed, 13 deletions(-)
diff --git a/src/main/version.c b/src/main/version.c diff --git a/src/main/version.c b/src/main/version.c
index f1f1e87810..3ffcbb25a0 100644 index 44a6edc699..a0e6f26911 100644
--- a/src/main/version.c --- a/src/main/version.c
+++ b/src/main/version.c +++ b/src/main/version.c
@@ -589,19 +589,6 @@ void version_print(void) @@ -614,19 +614,6 @@ void version_print(void)
DEBUG2(" unknown"); DEBUG2(" unknown");
#endif #endif
@@ -1,4 +1,4 @@
From 40abff4062d0521cf2b2a8a4660a3d2933f86f9d Mon Sep 17 00:00:00 2001 From f48b2887ef2ecff333a5d00551e108fc283c2ba5 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com> From: Robert Yang <liezhi.yang@windriver.com>
Date: Mon, 1 Apr 2024 09:09:07 +0000 Date: Mon, 1 Apr 2024 09:09:07 +0000
Subject: [PATCH] Add acinclude.m4 to include required macros Subject: [PATCH] Add acinclude.m4 to include required macros
@@ -57,5 +57,5 @@ index 0000000000..690efc3258
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ (exit $ac_status); }]) + (exit $ac_status); }])
-- --
2.35.5 2.25.1
@@ -39,7 +39,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0
raddbdir = "${sysconfdir}/${MLPREFIX}raddb" raddbdir = "${sysconfdir}/${MLPREFIX}raddb"
SRCREV = "a7acce80f5ba2271d9aeb737a4a91a5bf8317f31" SRCREV = "694a97dddbdd26423504afe7c530e8e1502b7354"
UPSTREAM_CHECK_GITTAGREGEX = "release_(?P<pver>\d+(\_\d+)+)" UPSTREAM_CHECK_GITTAGREGEX = "release_(?P<pver>\d+(\_\d+)+)"