diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2024-04-01 02:22:25 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-04-02 11:28:56 -0700 |
commit | eae2a3104bf0d99c4612a2c93eb731a5c289cf6a (patch) | |
tree | 17b12ea7a073d12d14a9a13668556b6781c822d5 /meta-networking | |
parent | 3203483b5f4150dc519834725c14ed5b2f9e0cfc (diff) | |
download | meta-openembedded-eae2a3104bf0d99c4612a2c93eb731a5c289cf6a.tar.gz |
freeradius: 3.0.26 -> 3.2.3
* Add --without-rlm_json to fix:
configure: error: set --without-rlm_json to disable it explicitly
* Add --without-rlm_cache_redis to fix:
configure: error: set --without-rlm_cache_redis to disable it explicitly.
* Drop 0017-add-python.m4-for-detecting-python-3.10.patch and add
0017-Add-acinclude.m4-to-include-required-macros.patch to fix python3 related
build errors
* Rebased other patches for 3.2.3.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch | 32 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch | 331 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch | 19 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch | 21 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/freeradius/files/0017-Add-acinclude.m4-to-include-required-macros.patch | 61 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/freeradius/files/0017-add-python.m4-for-detecting-python-3.10.patch | 427 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb (renamed from meta-networking/recipes-connectivity/freeradius/freeradius_3.0.26.bb) | 9 |
7 files changed, 278 insertions, 622 deletions
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch b/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch index e5442360b..3635412d3 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0003-configure.ac-allow-cross-compilation.patch | |||
@@ -12,26 +12,28 @@ Upstream-Status: Inappropriate [embedded specific] | |||
12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
13 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 13 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
14 | 14 | ||
15 | update to new version 3.0.17 to fix patch warning | 15 | Update to new version 3.0.17 to fix patch warning |
16 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 16 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
17 | |||
18 | Rebased for 3.2.3 | ||
19 | Signed-off-by: Randy MacLeod <randy.macleod@windriver.com> | ||
20 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
21 | |||
17 | --- | 22 | --- |
18 | src/modules/rlm_krb5/configure.ac | 3 ++- | 23 | src/modules/rlm_krb5/configure.ac | 3 ++- |
19 | 1 file changed, 2 insertions(+), 1 deletion(-) | 24 | 1 file changed, 2 insertions(+), 1 deletion(-) |
20 | 25 | ||
21 | diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac | 26 | diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac |
22 | index a0f510cfb3..d2f3eca03e 100644 | 27 | index 9ee6379ea4..1dad481da8 100644 |
23 | --- a/src/modules/rlm_krb5/configure.ac | 28 | --- a/src/modules/rlm_krb5/configure.ac |
24 | +++ b/src/modules/rlm_krb5/configure.ac | 29 | +++ b/src/modules/rlm_krb5/configure.ac |
25 | @@ -140,7 +140,8 @@ if test x$with_[]modname != xno; then | 30 | @@ -143,7 +143,8 @@ if test "$krb5threadsafe" != "no"; then |
26 | FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) | 31 | FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) |
27 | if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then | 32 | if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then |
28 | AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <krb5.h>]], [[return krb5_is_thread_safe() ? 0 : 1]])], | 33 | AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <krb5.h>]], [[return krb5_is_thread_safe() ? 0 : 1]])], |
29 | - [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])]) | 34 | - [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])]) |
30 | + [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])], | 35 | + [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])], |
31 | + [AC_MSG_WARN(cross compiling: not checking)]) | 36 | + [AC_MSG_WARN(cross compiling: not checking)]) |
32 | fi | 37 | fi |
33 | else | 38 | else |
34 | krb5threadsafe="" | 39 | krb5threadsafe="" |
35 | -- | ||
36 | 2.25.1 | ||
37 | |||
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch b/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch index 8fd0dca44..510136da1 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0006-Avoid-searching-host-dirs.patch | |||
@@ -10,189 +10,214 @@ Upstream-Status: Inappropriate [embedded specific] | |||
10 | 10 | ||
11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
12 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 12 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
13 | |||
14 | Rebased for 3.2.3 | ||
15 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
13 | --- | 16 | --- |
14 | acinclude.m4 | 4 ++-- | 17 | m4/fr_smart_check_include.m4 | 2 +- |
15 | src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac | 4 ++-- | 18 | m4/fr_smart_check_lib.m4 | 22 ---------------------- |
16 | src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac | 4 ++-- | 19 | src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac | 4 ++-- |
17 | src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac | 4 ++-- | 20 | src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac | 4 ++-- |
18 | src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac | 6 +++--- | 21 | src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac | 4 ++-- |
19 | src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac | 2 +- | 22 | src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac | 6 +++--- |
20 | src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac | 4 ++-- | 23 | src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac | 2 +- |
21 | src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac | 4 ++-- | 24 | src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac | 4 ++-- |
22 | 8 files changed, 16 insertions(+), 16 deletions(-) | 25 | src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac | 4 ++-- |
26 | 9 files changed, 15 insertions(+), 37 deletions(-) | ||
23 | 27 | ||
24 | diff --git a/acinclude.m4 b/acinclude.m4 | 28 | diff --git a/m4/fr_smart_check_include.m4 b/m4/fr_smart_check_include.m4 |
25 | index a953d0e1b6..ede143d3c2 100644 | 29 | index e7d4443f9c..2b69704f98 100644 |
26 | --- a/acinclude.m4 | 30 | --- a/m4/fr_smart_check_include.m4 |
27 | +++ b/acinclude.m4 | 31 | +++ b/m4/fr_smart_check_include.m4 |
28 | @@ -115,7 +115,7 @@ dnl # | 32 | @@ -9,7 +9,7 @@ ac_safe=`echo "$1" | sed 'y%./+-%__pm%'` |
29 | dnl # Try to guess possible locations. | ||
30 | dnl # | ||
31 | if test "x$smart_lib" = "x"; then | ||
32 | - for try in /usr/local/lib /opt/lib; do | ||
33 | + for try in $smart_lib_dir; do | ||
34 | AC_MSG_CHECKING([for $2 in -l$1 in $try]) | ||
35 | LIBS="-l$1 $old_LIBS" | ||
36 | CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS" | ||
37 | @@ -155,7 +155,7 @@ ac_safe=`echo "$1" | sed 'y%./+-%__pm%'` | ||
38 | old_CPPFLAGS="$CPPFLAGS" | 33 | old_CPPFLAGS="$CPPFLAGS" |
39 | smart_include= | 34 | smart_include= |
40 | dnl # The default directories we search in (in addition to the compilers search path) | 35 | dnl # The default directories we search in (in addition to the compilers search path) |
41 | -smart_include_dir="/usr/local/include /opt/include" | 36 | -smart_include_dir="/usr/local/include /opt/include" |
42 | +smart_include_dir= | 37 | +smart_include_dir="" |
43 | 38 | ||
44 | dnl # Our local versions | 39 | dnl # Our local versions |
45 | _smart_try_dir= | 40 | _smart_try_dir= |
46 | diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac | 41 | diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac |
47 | index 44f84aa27e..23a1899591 100644 | 42 | index 0d94ee9bf6..6108e62054 100644 |
48 | --- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac | 43 | --- a/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac |
49 | +++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac | 44 | +++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/configure.ac |
50 | @@ -61,14 +61,14 @@ if test x$with_[]modname != xno; then | 45 | @@ -58,14 +58,14 @@ AC_ARG_WITH(ibmdb2-dir, |
51 | esac]) | 46 | esac]) |
52 | 47 | ||
53 | dnl Check for SQLConnect in -ldb2 | 48 | dnl Check for SQLConnect in -ldb2 |
54 | - smart_try_dir="$ibmdb2_lib_dir /usr/local/db2/lib /usr/IBMdb2/V7.1/lib" | 49 | -smart_try_dir="$ibmdb2_lib_dir /usr/local/db2/lib /usr/IBMdb2/V7.1/lib" |
55 | + smart_try_dir="$ibmdb2_lib_dir" | 50 | +smart_try_dir="$ibmdb2_lib_dir" |
56 | FR_SMART_CHECK_LIB(db2, SQLConnect) | 51 | FR_SMART_CHECK_LIB(db2, SQLConnect) |
57 | if test "x$ac_cv_lib_db2_SQLConnect" != xyes; then | 52 | if test "x$ac_cv_lib_db2_SQLConnect" != xyes; then |
58 | fail="$fail libdb2" | 53 | FR_MODULE_FAIL([libdb2]) |
59 | fi | 54 | fi |
60 | 55 | ||
61 | dnl Check for sqlcli.h | 56 | dnl Check for sqlcli.h |
62 | - smart_try_dir="$ibmdb2_include_dir /usr/local/db2/include /usr/IBMdb2/V7.1/include" | 57 | -smart_try_dir="$ibmdb2_include_dir /usr/local/db2/include /usr/IBMdb2/V7.1/include" |
63 | + smart_try_dir="$ibmdb2_include_dir" | 58 | +smart_try_dir="$ibmdb2_include_dir" |
64 | FR_SMART_CHECK_INCLUDE(sqlcli.h) | 59 | FR_SMART_CHECK_INCLUDE(sqlcli.h) |
65 | if test "x$ac_cv_header_sqlcli_h" != xyes; then | 60 | if test "x$ac_cv_header_sqlcli_h" != xyes; then |
66 | fail="$fail sqlcli.h" | 61 | FR_MODULE_FAIL([sqlcli.h]) |
67 | diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac | 62 | diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac |
68 | index 4c2fd7ba9e..10c864def5 100644 | 63 | index 5aa7b4b6ee..2eda5b6cc5 100644 |
69 | --- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac | 64 | --- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac |
70 | +++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac | 65 | +++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/configure.ac |
71 | @@ -60,14 +60,14 @@ if test x$with_[]modname != xno; then | 66 | @@ -58,14 +58,14 @@ AC_ARG_WITH(firebird-dir, |
72 | esac]) | 67 | esac]) |
73 | 68 | ||
74 | dnl Check for isc_attach_database in -lfbclient | 69 | dnl Check for isc_attach_database in -lfbclient |
75 | - smart_try_dir="$firebird_lib_dir /usr/lib/firebird2/lib /usr/local/firebird/lib" | 70 | -smart_try_dir="$firebird_lib_dir /usr/lib/firebird2/lib /usr/local/firebird/lib" |
76 | + smart_try_dir="$firebird_lib_dir" | 71 | +smart_try_dir="$firebird_lib_dir" |
77 | FR_SMART_CHECK_LIB(fbclient, isc_attach_database) | 72 | FR_SMART_CHECK_LIB(fbclient, isc_attach_database) |
78 | if test "x$ac_cv_lib_fbclient_isc_attach_database" != xyes; then | 73 | if test "x$ac_cv_lib_fbclient_isc_attach_database" != xyes; then |
79 | fail="$fail libfbclient" | 74 | FR_MODULE_FAIL([libfbclient]) |
80 | fi | 75 | fi |
81 | 76 | ||
82 | dnl Check for ibase.h | 77 | dnl Check for ibase.h |
83 | - smart_try_dir="$firebird_include_dir /usr/lib/firebird2/include /usr/local/firebird/include" | 78 | -smart_try_dir="$firebird_include_dir /usr/lib/firebird2/include /usr/local/firebird/include" |
84 | + smart_try_dir="$firebird_include_dir" | 79 | +smart_try_dir="$firebird_include_dir" |
85 | FR_SMART_CHECK_INCLUDE(ibase.h) | 80 | FR_SMART_CHECK_INCLUDE(ibase.h) |
86 | if test "x$ac_cv_header_ibase_h" != xyes; then | 81 | if test "x$ac_cv_header_ibase_h" != xyes; then |
87 | fail="$fail ibase.h" | 82 | FR_MODULE_FAIL([ibase.h]) |
88 | diff --git a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac | 83 | diff --git a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac |
89 | index d26ac9c431..6e4500e948 100644 | 84 | index d96216aca8..88cbc469f7 100644 |
90 | --- a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac | 85 | --- a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac |
91 | +++ b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac | 86 | +++ b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.ac |
92 | @@ -61,14 +61,14 @@ if test x$with_[]modname != xno; then | 87 | @@ -58,14 +58,14 @@ AC_ARG_WITH(iodbc-dir, |
93 | esac]) | 88 | esac]) |
94 | 89 | ||
95 | dnl Check for SQLConnect in -liodbc | 90 | dnl Check for SQLConnect in -liodbc |
96 | - smart_try_dir="$iodbc_lib_dir /usr/lib /usr/lib/iodbc /usr/local/lib/iodbc /usr/local/iodbc/lib/iodbc" | 91 | -smart_try_dir="$iodbc_lib_dir /usr/lib /usr/lib/iodbc /usr/local/lib/iodbc /usr/local/iodbc/lib/iodbc" |
97 | + smart_try_dir="$iodbc_lib_dir" | 92 | +smart_try_dir="$iodbc_lib_dir" |
98 | FR_SMART_CHECK_LIB(iodbc, SQLConnect) | 93 | FR_SMART_CHECK_LIB(iodbc, SQLConnect) |
99 | if test "x$ac_cv_lib_iodbc_SQLConnect" != xyes; then | 94 | if test "x$ac_cv_lib_iodbc_SQLConnect" != xyes; then |
100 | fail="$fail libiodbc" | 95 | FR_MODULE_FAIL([libiodbc]) |
101 | fi | 96 | fi |
102 | 97 | ||
103 | dnl Check for isql.h | 98 | dnl Check for isql.h |
104 | - smart_try_dir="$iodbc_include_dir /usr/include /usr/include/iodbc /usr/local/iodbc/include" | 99 | -smart_try_dir="$iodbc_include_dir /usr/include /usr/include/iodbc /usr/local/iodbc/include" |
105 | + smart_try_dir="$iodbc_include_dir" | 100 | +smart_try_dir="$iodbc_include_dir" |
106 | FR_SMART_CHECK_INCLUDE(isql.h) | 101 | FR_SMART_CHECK_INCLUDE(isql.h) |
107 | if test "x$ac_cv_header_isql_h" != xyes; then | 102 | if test "x$ac_cv_header_isql_h" != xyes; then |
108 | fail="$fail isql.h" | 103 | FR_MODULE_FAIL([isql.h]) |
109 | diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac | 104 | diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac |
110 | index df36da77bf..31359041c7 100644 | 105 | index d36aecbda6..201a623d4e 100644 |
111 | --- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac | 106 | --- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac |
112 | +++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac | 107 | +++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/configure.ac |
113 | @@ -140,7 +140,7 @@ if test x$with_[]modname != xno; then | 108 | @@ -138,7 +138,7 @@ fi |
114 | 109 | ||
115 | dnl # Check for libmysqlclient_r | 110 | dnl # Check for libmysqlclient_r |
116 | if test "x$have_a_libmysqlclient" != "xyes"; then | 111 | if test "x$have_a_libmysqlclient" != "xyes"; then |
117 | - smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql" | 112 | - smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql" |
118 | + smart_try_dir="$mysql_lib_dir" | 113 | + smart_try_dir="$mysql_lib_dir" |
119 | FR_SMART_CHECK_LIB(mysqlclient_r, mysql_init) | 114 | FR_SMART_CHECK_LIB(mysqlclient_r, mysql_init) |
120 | if test "x$ac_cv_lib_mysqlclient_r_mysql_init" = "xyes"; then | 115 | if test "x$ac_cv_lib_mysqlclient_r_mysql_init" = "xyes"; then |
121 | have_a_libmysqlclient='yes' | 116 | have_a_libmysqlclient='yes' |
122 | @@ -149,7 +149,7 @@ if test x$with_[]modname != xno; then | 117 | @@ -147,7 +147,7 @@ fi |
123 | 118 | ||
124 | dnl # Check for libmysqlclient | 119 | dnl # Check for libmysqlclient |
125 | if test "x$have_a_libmysqlclient" != "xyes"; then | 120 | if test "x$have_a_libmysqlclient" != "xyes"; then |
126 | - smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql" | 121 | - smart_try_dir="$mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib/mysql /usr/local/mysql/lib/mysql" |
127 | + smart_try_dir="$mysql_lib_dir" | 122 | + smart_try_dir="$mysql_lib_dir" |
128 | FR_SMART_CHECK_LIB(mysqlclient, mysql_init) | 123 | FR_SMART_CHECK_LIB(mysqlclient, mysql_init) |
129 | if test "x$ac_cv_lib_mysqlclient_mysql_init" = "xyes"; then | 124 | if test "x$ac_cv_lib_mysqlclient_mysql_init" = "xyes"; then |
130 | have_a_libmysqlclient='yes' | 125 | have_a_libmysqlclient='yes' |
131 | @@ -243,7 +243,7 @@ if test x$with_[]modname != xno; then | 126 | @@ -242,7 +242,7 @@ if test "x$have_mysql_h" != "xyes"; then |
132 | fi | 127 | fi |
133 | 128 | ||
134 | if test "x$have_mysql_h" != "xyes"; then | 129 | if test "x$have_mysql_h" != "xyes"; then |
135 | - smart_try_dir="$mysql_include_dir /usr/local/include /usr/local/mysql/include" | 130 | - smart_try_dir="$mysql_include_dir /usr/local/include /usr/local/mysql/include" |
136 | + smart_try_dir="$mysql_include_dir" | 131 | + smart_try_dir="$mysql_include_dir" |
137 | FR_SMART_CHECK_INCLUDE(mysql/mysql.h) | 132 | FR_SMART_CHECK_INCLUDE(mysql/mysql.h) |
138 | if test "x$ac_cv_header_mysql_mysql_h" = "xyes"; then | 133 | if test "x$ac_cv_header_mysql_mysql_h" = "xyes"; then |
139 | AC_DEFINE(HAVE_MYSQL_MYSQL_H, [], [Define if you have <mysql/mysql.h>]) | 134 | AC_DEFINE(HAVE_MYSQL_MYSQL_H, [], [Define if you have <mysql/mysql.h>]) |
140 | diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac | 135 | diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac |
141 | index 3b45da582a..03e6607d2b 100644 | 136 | index f31b7d2c5a..67bbf66df5 100644 |
142 | --- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac | 137 | --- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac |
143 | +++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac | 138 | +++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.ac |
144 | @@ -68,7 +68,7 @@ if test x$with_[]modname != xno; then | 139 | @@ -66,7 +66,7 @@ dnl ############################################################ |
145 | dnl # Check for header files | 140 | dnl # Check for header files |
146 | dnl ############################################################ | 141 | dnl ############################################################ |
147 | 142 | ||
148 | - smart_try_dir="$oracle_include_dir /usr/local/instaclient/include" | 143 | -smart_try_dir="$oracle_include_dir /usr/local/instaclient/include" |
149 | + smart_try_dir="$oracle_include_dir" | 144 | +smart_try_dir="$oracle_include_dir" |
150 | 145 | ||
151 | if test "x$ORACLE_HOME" != "x"; then | 146 | if test "x$ORACLE_HOME" != "x"; then |
152 | smart_try_dir="${smart_try_dir} ${ORACLE_HOME}/include" | 147 | smart_try_dir="${smart_try_dir} ${ORACLE_HOME}/include" |
153 | diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac | 148 | diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac |
154 | index 8ac1022e89..d46c0f66bf 100644 | 149 | index 46587e4099..b41c51bda7 100644 |
155 | --- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac | 150 | --- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac |
156 | +++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac | 151 | +++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/configure.ac |
157 | @@ -45,7 +45,7 @@ if test x$with_[]modname != xno; then | 152 | @@ -43,7 +43,7 @@ AC_ARG_WITH(rlm-sql-postgresql-include-dir, |
158 | esac ] | 153 | ;; |
159 | ) | 154 | esac]) |
160 | 155 | ||
161 | - smart_try_dir="$rlm_sql_postgresql_include_dir /usr/include/postgresql /usr/local/pgsql/include /usr/include/pgsql" | 156 | -smart_try_dir="$rlm_sql_postgresql_include_dir /usr/include/postgresql /usr/local/pgsql/include /usr/include/pgsql" |
162 | + smart_try_dir="$rlm_sql_postgresql_include_dir" | 157 | +smart_try_dir="$rlm_sql_postgresql_include_dir" |
163 | FR_SMART_CHECK_INCLUDE(libpq-fe.h) | 158 | FR_SMART_CHECK_INCLUDE(libpq-fe.h) |
164 | if test "x$ac_cv_header_libpqmfe_h" != "xyes"; then | 159 | if test "x$ac_cv_header_libpqmfe_h" != "xyes"; then |
165 | fail="$fail libpq-fe.h" | 160 | FR_MODULE_FAIL([libpq-fe.h]) |
166 | @@ -94,7 +94,7 @@ if test x$with_[]modname != xno; then | 161 | @@ -95,7 +95,7 @@ else |
167 | ]) | 162 | ]) |
168 | fi | 163 | fi |
169 | 164 | ||
170 | - smart_try_dir="$rlm_sql_postgresql_lib_dir /usr/lib /usr/local/pgsql/lib" | 165 | -smart_try_dir="$rlm_sql_postgresql_lib_dir /usr/lib /usr/local/pgsql/lib" |
171 | + smart_try_dir="$rlm_sql_postgresql_lib_dir" | 166 | +smart_try_dir="$rlm_sql_postgresql_lib_dir" |
172 | FR_SMART_CHECK_LIB(pq, PQconnectdb) | 167 | FR_SMART_CHECK_LIB(pq, PQconnectdb) |
173 | if test "x$ac_cv_lib_pq_PQconnectdb" != "xyes"; then | 168 | if test "x$ac_cv_lib_pq_PQconnectdb" != "xyes"; then |
174 | fail="$fail libpq" | 169 | FR_MODULE_FAIL([libpq]) |
175 | diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac | 170 | diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac |
176 | index f10279fe1f..0081a338c8 100644 | 171 | index 3bdfae6032..ce68c312c6 100644 |
177 | --- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac | 172 | --- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac |
178 | +++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac | 173 | +++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/configure.ac |
179 | @@ -61,14 +61,14 @@ if test x$with_[]modname != xno; then | 174 | @@ -58,14 +58,14 @@ AC_ARG_WITH(unixodbc-dir, |
180 | esac]) | 175 | esac]) |
181 | 176 | ||
182 | dnl Check for SQLConnect in -lodbc | 177 | dnl Check for SQLConnect in -lodbc |
183 | - smart_try_dir="$unixodbc_lib_dir /usr/local/unixodbc/lib" | 178 | -smart_try_dir="$unixodbc_lib_dir /usr/local/unixodbc/lib" |
184 | + smart_try_dir="$unixodbc_lib_dir" | 179 | +smart_try_dir="$unixodbc_lib_dir" |
185 | FR_SMART_CHECK_LIB(odbc, SQLConnect) | 180 | FR_SMART_CHECK_LIB(odbc, SQLConnect) |
186 | if test "x$ac_cv_lib_odbc_SQLConnect" != xyes; then | 181 | if test "x$ac_cv_lib_odbc_SQLConnect" != xyes; then |
187 | fail="$fail libodbc" | 182 | FR_MODULE_FAIL([libodbc]) |
188 | fi | 183 | fi |
189 | 184 | ||
190 | dnl Check for sql.h | 185 | dnl Check for sql.h |
191 | - smart_try_dir="$unixodbc_include_dir /usr/local/unixodbc/include" | 186 | -smart_try_dir="$unixodbc_include_dir /usr/local/unixodbc/include" |
192 | + smart_try_dir="$unixodbc_include_dir" | 187 | +smart_try_dir="$unixodbc_include_dir" |
193 | FR_SMART_CHECK_INCLUDE(sql.h) | 188 | FR_SMART_CHECK_INCLUDE(sql.h) |
194 | if test "x$ac_cv_header_sql_h" != xyes; then | 189 | if test "x$ac_cv_header_sql_h" != xyes; then |
195 | fail="$fail sql.h" | 190 | FR_MODULE_FAIL([sql.h]) |
196 | -- | 191 | diff --git a/m4/fr_smart_check_lib.m4 b/m4/fr_smart_check_lib.m4 |
197 | 2.25.1 | 192 | index 16ac5b3c5e..0f5e9fc6d6 100644 |
198 | 193 | --- a/m4/fr_smart_check_lib.m4 | |
194 | +++ b/m4/fr_smart_check_lib.m4 | ||
195 | @@ -64,28 +64,6 @@ if test "x$smart_lib" = "x"; then | ||
196 | LIBS="$old_LIBS" | ||
197 | fi | ||
198 | |||
199 | -dnl # | ||
200 | -dnl # Try to guess possible locations. | ||
201 | -dnl # | ||
202 | -if test "x$smart_lib" = "x"; then | ||
203 | - for try in /usr/local/lib /opt/lib; do | ||
204 | - AC_MSG_CHECKING([for $2 in -l$1 in $try]) | ||
205 | - LIBS="-l$1 $old_LIBS" | ||
206 | - CPPFLAGS="-L$try -Wl,-rpath,$try $old_CPPFLAGS" | ||
207 | - AC_TRY_LINK([extern char $2();], | ||
208 | - [$2()], | ||
209 | - [ | ||
210 | - smart_lib="-l$1" | ||
211 | - smart_ldflags="-L$try -Wl,-rpath,$try" | ||
212 | - AC_MSG_RESULT(yes) | ||
213 | - break | ||
214 | - ], | ||
215 | - [AC_MSG_RESULT(no)]) | ||
216 | - done | ||
217 | - LIBS="$old_LIBS" | ||
218 | - CPPFLAGS="$old_CPPFLAGS" | ||
219 | -fi | ||
220 | - | ||
221 | dnl # | ||
222 | dnl # Found it, set the appropriate variable. | ||
223 | dnl # | ||
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch b/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch index cb71fb137..78259d7d7 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch | |||
@@ -16,18 +16,15 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 17 | ||
18 | diff --git a/src/modules/rlm_python/configure.ac b/src/modules/rlm_python/configure.ac | 18 | diff --git a/src/modules/rlm_python/configure.ac b/src/modules/rlm_python/configure.ac |
19 | index 08ecb62518..d5c0944ff1 100644 | 19 | index c79c327064..5f4d274990 100644 |
20 | --- a/src/modules/rlm_python/configure.ac | 20 | --- a/src/modules/rlm_python/configure.ac |
21 | +++ b/src/modules/rlm_python/configure.ac | 21 | +++ b/src/modules/rlm_python/configure.ac |
22 | @@ -98,7 +98,7 @@ if test x$with_[]modname != xno; then | 22 | @@ -103,7 +103,7 @@ FR_MODULE_TEST_PASS_DO([ |
23 | 23 | ||
24 | old_CFLAGS=$CFLAGS | 24 | old_CFLAGS=$CFLAGS |
25 | CFLAGS="$CFLAGS $PY_CFLAGS" | 25 | CFLAGS="$CFLAGS $PY_CFLAGS" |
26 | - smart_try_dir="$PY_PREFIX/include/python$PY_SYS_VERSION" | 26 | - smart_try_dir="$PY_PREFIX/include/python$PY_SYS_VERSION" |
27 | + smart_try_dir="$PY_PREFIX/include/python$PY_SYS_VERSION $PY_INC_DIR" | 27 | + smart_try_dir="$PY_PREFIX/include/python$PY_SYS_VERSION $PY_INC_DIR" |
28 | FR_SMART_CHECK_INCLUDE(Python.h) | 28 | FR_SMART_CHECK_INCLUDE(Python.h) |
29 | CFLAGS=$old_CFLAGS | 29 | CFLAGS=$old_CFLAGS |
30 | 30 | ||
31 | -- | ||
32 | 2.25.1 | ||
33 | |||
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch b/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch index 69125eb3c..efa5c53c9 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch | |||
@@ -14,18 +14,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/src/modules/rlm_mschap/configure.ac b/src/modules/rlm_mschap/configure.ac | 16 | diff --git a/src/modules/rlm_mschap/configure.ac b/src/modules/rlm_mschap/configure.ac |
17 | index 0fd105d7e6..6ab15509e5 100644 | 17 | index 953336f475..77a18af55d 100644 |
18 | --- a/src/modules/rlm_mschap/configure.ac | 18 | --- a/src/modules/rlm_mschap/configure.ac |
19 | +++ b/src/modules/rlm_mschap/configure.ac | 19 | +++ b/src/modules/rlm_mschap/configure.ac |
20 | @@ -75,7 +75,7 @@ if test x$with_[]modname != xno; then | 20 | @@ -77,7 +77,7 @@ else |
21 | mod_ldflags="-F /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks -framework DirectoryService" | 21 | FR_MODULE_FEATURE([opendirectory], [without opendirectory support]) |
22 | fi | 22 | fi |
23 | 23 | ||
24 | - smart_try_dir="$winbind_include_dir /usr/include/samba-4.0" | 24 | -smart_try_dir="$winbind_include_dir /usr/include/samba-4.0" |
25 | + smart_try_dir="$winbind_include_dir =/usr/include/samba-4.0" | 25 | +smart_try_dir="$winbind_include_dir =/usr/include/samba-4.0" |
26 | FR_SMART_CHECK_INCLUDE(wbclient.h, [#include <stdint.h> | 26 | FR_SMART_CHECK_INCLUDE(wbclient.h, [#include <stdint.h> |
27 | #include <stdbool.h>]) | 27 | #include <stdbool.h>]) |
28 | if test "x$ac_cv_header_wbclient_h" != "xyes"; then | 28 | if test "x$ac_cv_header_wbclient_h" != "xyes"; then |
29 | -- | ||
30 | 2.25.1 | ||
31 | |||
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0017-Add-acinclude.m4-to-include-required-macros.patch b/meta-networking/recipes-connectivity/freeradius/files/0017-Add-acinclude.m4-to-include-required-macros.patch new file mode 100644 index 000000000..f5c399e58 --- /dev/null +++ b/meta-networking/recipes-connectivity/freeradius/files/0017-Add-acinclude.m4-to-include-required-macros.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | From 40abff4062d0521cf2b2a8a4660a3d2933f86f9d Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Mon, 1 Apr 2024 09:09:07 +0000 | ||
4 | Subject: [PATCH] Add acinclude.m4 to include required macros | ||
5 | |||
6 | * These micro files are in the m4 directories, but the aclocal didn't | ||
7 | add them to aclocal.m4 automatically, so add them to acinclude.m4 | ||
8 | manually. | ||
9 | |||
10 | * The runlog.m4 is added for python.m4. | ||
11 | |||
12 | Upstream-Status: Inappropriate [OE Specific] | ||
13 | |||
14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
15 | --- | ||
16 | acinclude.m4 | 8 ++++++++ | ||
17 | m4/runlog.m4 | 17 +++++++++++++++++ | ||
18 | 2 files changed, 25 insertions(+) | ||
19 | create mode 100644 acinclude.m4 | ||
20 | create mode 100644 m4/runlog.m4 | ||
21 | |||
22 | diff --git a/acinclude.m4 b/acinclude.m4 | ||
23 | new file mode 100644 | ||
24 | index 0000000000..118b7f0e5f | ||
25 | --- /dev/null | ||
26 | +++ b/acinclude.m4 | ||
27 | @@ -0,0 +1,8 @@ | ||
28 | +m4_include([m4/fr_init_module.m4]) | ||
29 | +m4_include([m4/ax_with_prog.m4]) | ||
30 | +m4_include([m4/runlog.m4]) | ||
31 | +m4_include([m4/python.m4]) | ||
32 | +m4_include([m4/ax_compare_version.m4]) | ||
33 | +m4_include([m4/libcurl_check_config.m4]) | ||
34 | +m4_include([m4/ax_ruby_devel.m4]) | ||
35 | +m4_include([m4/ax_prog_ruby_version.m4]) | ||
36 | diff --git a/m4/runlog.m4 b/m4/runlog.m4 | ||
37 | new file mode 100644 | ||
38 | index 0000000000..690efc3258 | ||
39 | --- /dev/null | ||
40 | +++ b/m4/runlog.m4 | ||
41 | @@ -0,0 +1,17 @@ | ||
42 | +## -*- Autoconf -*- | ||
43 | +# Copyright (C) 2001-2018 Free Software Foundation, Inc. | ||
44 | +# | ||
45 | +# This file is free software; the Free Software Foundation | ||
46 | +# gives unlimited permission to copy and/or distribute it, | ||
47 | +# with or without modifications, as long as this notice is preserved. | ||
48 | + | ||
49 | +# AM_RUN_LOG(COMMAND) | ||
50 | +# ------------------- | ||
51 | +# Run COMMAND, save the exit status in ac_status, and log it. | ||
52 | +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) | ||
53 | +AC_DEFUN([AM_RUN_LOG], | ||
54 | +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD | ||
55 | + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD | ||
56 | + ac_status=$? | ||
57 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | ||
58 | + (exit $ac_status); }]) | ||
59 | -- | ||
60 | 2.35.5 | ||
61 | |||
diff --git a/meta-networking/recipes-connectivity/freeradius/files/0017-add-python.m4-for-detecting-python-3.10.patch b/meta-networking/recipes-connectivity/freeradius/files/0017-add-python.m4-for-detecting-python-3.10.patch deleted file mode 100644 index 62a4869c9..000000000 --- a/meta-networking/recipes-connectivity/freeradius/files/0017-add-python.m4-for-detecting-python-3.10.patch +++ /dev/null | |||
@@ -1,427 +0,0 @@ | |||
1 | From f1418e1b46cb1cbd130935b76f5c78c577d1ad28 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matthew Newton <matthew-git@newtoncomputing.co.uk> | ||
3 | Date: Wed, 28 Sep 2022 23:49:32 +0100 | ||
4 | Subject: [PATCH] add python.m4 for detecting python > 3.10 | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | [https://github.com/FreeRADIUS/freeradius-server/commit/86584d2753829756cc73aadce5d48f703af472b1] | ||
8 | |||
9 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
10 | --- | ||
11 | src/modules/rlm_python3/configure.ac | 4 + | ||
12 | src/modules/rlm_python3/m4/python.m4 | 363 +++++++++++++++++++++++++++ | ||
13 | src/modules/rlm_python3/m4/runlog.m4 | 17 ++ | ||
14 | 3 files changed, 384 insertions(+) | ||
15 | create mode 100644 src/modules/rlm_python3/m4/python.m4 | ||
16 | create mode 100644 src/modules/rlm_python3/m4/runlog.m4 | ||
17 | |||
18 | diff --git a/src/modules/rlm_python3/configure.ac b/src/modules/rlm_python3/configure.ac | ||
19 | index bc0e97f9ba..90f2116e73 100644 | ||
20 | --- a/src/modules/rlm_python3/configure.ac | ||
21 | +++ b/src/modules/rlm_python3/configure.ac | ||
22 | @@ -3,6 +3,10 @@ AC_INIT(rlm_python3.c) | ||
23 | AC_REVISION($Revision$) | ||
24 | AC_DEFUN(modname,[rlm_python3]) | ||
25 | |||
26 | +m4_include([ax_compare_version.m4]) | ||
27 | +m4_include([runlog.m4]) | ||
28 | +m4_include([python.m4]) | ||
29 | + | ||
30 | AC_ARG_WITH([]modname, | ||
31 | [ --with-[]modname build []modname. (default=yes)]) | ||
32 | |||
33 | diff --git a/src/modules/rlm_python3/m4/python.m4 b/src/modules/rlm_python3/m4/python.m4 | ||
34 | new file mode 100644 | ||
35 | index 0000000000..78ca7635ab | ||
36 | --- /dev/null | ||
37 | +++ b/src/modules/rlm_python3/m4/python.m4 | ||
38 | @@ -0,0 +1,363 @@ | ||
39 | +## ------------------------ -*- Autoconf -*- | ||
40 | +## Python file handling | ||
41 | +## From Andrew Dalke | ||
42 | +## Updated by James Henstridge and other contributors. | ||
43 | +## ------------------------ | ||
44 | +# Copyright (C) 1999-2021 Free Software Foundation, Inc. | ||
45 | +# | ||
46 | +# This file is free software; the Free Software Foundation | ||
47 | +# gives unlimited permission to copy and/or distribute it, | ||
48 | +# with or without modifications, as long as this notice is preserved. | ||
49 | + | ||
50 | + | ||
51 | +# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) | ||
52 | +# --------------------------------------------------------------------------- | ||
53 | +# Adds support for distributing Python modules and packages. To | ||
54 | +# install modules, copy them to $(pythondir), using the python_PYTHON | ||
55 | +# automake variable. To install a package with the same name as the | ||
56 | +# automake package, install to $(pkgpythondir), or use the | ||
57 | +# pkgpython_PYTHON automake variable. | ||
58 | +# | ||
59 | +# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as | ||
60 | +# locations to install python extension modules (shared libraries). | ||
61 | +# Another macro is required to find the appropriate flags to compile | ||
62 | +# extension modules. | ||
63 | +# | ||
64 | +# If your package is configured with a different prefix to python, | ||
65 | +# users will have to add the install directory to the PYTHONPATH | ||
66 | +# environment variable, or create a .pth file (see the python | ||
67 | +# documentation for details). | ||
68 | +# | ||
69 | +# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will | ||
70 | +# cause an error if the version of python installed on the system | ||
71 | +# doesn't meet the requirement. MINIMUM-VERSION should consist of | ||
72 | +# numbers and dots only. | ||
73 | +AC_DEFUN([AM_PATH_PYTHON], | ||
74 | + [ | ||
75 | + dnl Find a Python interpreter. Python versions prior to 2.0 are not | ||
76 | + dnl supported. (2.0 was released on October 16, 2000). | ||
77 | + m4_define_default([_AM_PYTHON_INTERPRETER_LIST], | ||
78 | +[python python2 python3 dnl | ||
79 | + python3.11 python3.10 dnl | ||
80 | + python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl | ||
81 | + python3.2 python3.1 python3.0 dnl | ||
82 | + python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl | ||
83 | + python2.0]) | ||
84 | + | ||
85 | + AC_ARG_VAR([PYTHON], [the Python interpreter]) | ||
86 | + | ||
87 | + m4_if([$1],[],[ | ||
88 | + dnl No version check is needed. | ||
89 | + # Find any Python interpreter. | ||
90 | + if test -z "$PYTHON"; then | ||
91 | + AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) | ||
92 | + fi | ||
93 | + am_display_PYTHON=python | ||
94 | + ], [ | ||
95 | + dnl A version check is needed. | ||
96 | + if test -n "$PYTHON"; then | ||
97 | + # If the user set $PYTHON, use it and don't search something else. | ||
98 | + AC_MSG_CHECKING([whether $PYTHON version is >= $1]) | ||
99 | + AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], | ||
100 | + [AC_MSG_RESULT([yes])], | ||
101 | + [AC_MSG_RESULT([no]) | ||
102 | + AC_MSG_ERROR([Python interpreter is too old])]) | ||
103 | + am_display_PYTHON=$PYTHON | ||
104 | + else | ||
105 | + # Otherwise, try each interpreter until we find one that satisfies | ||
106 | + # VERSION. | ||
107 | + AC_CACHE_CHECK([for a Python interpreter with version >= $1], | ||
108 | + [am_cv_pathless_PYTHON],[ | ||
109 | + for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do | ||
110 | + test "$am_cv_pathless_PYTHON" = none && break | ||
111 | + AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) | ||
112 | + done]) | ||
113 | + # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. | ||
114 | + if test "$am_cv_pathless_PYTHON" = none; then | ||
115 | + PYTHON=: | ||
116 | + else | ||
117 | + AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) | ||
118 | + fi | ||
119 | + am_display_PYTHON=$am_cv_pathless_PYTHON | ||
120 | + fi | ||
121 | + ]) | ||
122 | + | ||
123 | + if test "$PYTHON" = :; then | ||
124 | + dnl Run any user-specified action, or abort. | ||
125 | + m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) | ||
126 | + else | ||
127 | + | ||
128 | + dnl Query Python for its version number. Although site.py simply uses | ||
129 | + dnl sys.version[:3], printing that failed with Python 3.10, since the | ||
130 | + dnl trailing zero was eliminated. So now we output just the major | ||
131 | + dnl and minor version numbers, as numbers. Apparently the tertiary | ||
132 | + dnl version is not of interest. | ||
133 | + dnl | ||
134 | + AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], | ||
135 | + [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`]) | ||
136 | + AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) | ||
137 | + | ||
138 | + dnl At times, e.g., when building shared libraries, you may want | ||
139 | + dnl to know which OS platform Python thinks this is. | ||
140 | + dnl | ||
141 | + AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], | ||
142 | + [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) | ||
143 | + AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) | ||
144 | + | ||
145 | + dnl emacs-page | ||
146 | + dnl If --with-python-sys-prefix is given, use the values of sys.prefix | ||
147 | + dnl and sys.exec_prefix for the corresponding values of PYTHON_PREFIX | ||
148 | + dnl and PYTHON_EXEC_PREFIX. Otherwise, use the GNU ${prefix} and | ||
149 | + dnl ${exec_prefix} variables. | ||
150 | + dnl | ||
151 | + dnl The two are made distinct variables so they can be overridden if | ||
152 | + dnl need be, although general consensus is that you shouldn't need | ||
153 | + dnl this separation. | ||
154 | + dnl | ||
155 | + dnl Also allow directly setting the prefixes via configure options, | ||
156 | + dnl overriding any default. | ||
157 | + dnl | ||
158 | + if test "x$prefix" = xNONE; then | ||
159 | + am__usable_prefix=$ac_default_prefix | ||
160 | + else | ||
161 | + am__usable_prefix=$prefix | ||
162 | + fi | ||
163 | + | ||
164 | + # Allow user to request using sys.* values from Python, | ||
165 | + # instead of the GNU $prefix values. | ||
166 | + AC_ARG_WITH([python-sys-prefix], | ||
167 | + [AS_HELP_STRING([--with-python-sys-prefix], | ||
168 | + [use Python's sys.prefix and sys.exec_prefix values])], | ||
169 | + [am_use_python_sys=:], | ||
170 | + [am_use_python_sys=false]) | ||
171 | + | ||
172 | + # Allow user to override whatever the default Python prefix is. | ||
173 | + AC_ARG_WITH([python_prefix], | ||
174 | + [AS_HELP_STRING([--with-python_prefix], | ||
175 | + [override the default PYTHON_PREFIX])], | ||
176 | + [am_python_prefix_subst=$withval | ||
177 | + am_cv_python_prefix=$withval | ||
178 | + AC_MSG_CHECKING([for explicit $am_display_PYTHON prefix]) | ||
179 | + AC_MSG_RESULT([$am_cv_python_prefix])], | ||
180 | + [ | ||
181 | + if $am_use_python_sys; then | ||
182 | + # using python sys.prefix value, not GNU | ||
183 | + AC_CACHE_CHECK([for python default $am_display_PYTHON prefix], | ||
184 | + [am_cv_python_prefix], | ||
185 | + [am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`]) | ||
186 | + | ||
187 | + dnl If sys.prefix is a subdir of $prefix, replace the literal value of | ||
188 | + dnl $prefix with a variable reference so it can be overridden. | ||
189 | + case $am_cv_python_prefix in | ||
190 | + $am__usable_prefix*) | ||
191 | + am__strip_prefix=`echo "$am__usable_prefix" | sed 's|.|.|g'` | ||
192 | + am_python_prefix_subst=`echo "$am_cv_python_prefix" | sed "s,^$am__strip_prefix,\\${prefix},"` | ||
193 | + ;; | ||
194 | + *) | ||
195 | + am_python_prefix_subst=$am_cv_python_prefix | ||
196 | + ;; | ||
197 | + esac | ||
198 | + else # using GNU prefix value, not python sys.prefix | ||
199 | + am_python_prefix_subst='${prefix}' | ||
200 | + am_python_prefix=$am_python_prefix_subst | ||
201 | + AC_MSG_CHECKING([for GNU default $am_display_PYTHON prefix]) | ||
202 | + AC_MSG_RESULT([$am_python_prefix]) | ||
203 | + fi]) | ||
204 | + # Substituting python_prefix_subst value. | ||
205 | + AC_SUBST([PYTHON_PREFIX], [$am_python_prefix_subst]) | ||
206 | + | ||
207 | + # emacs-page Now do it all over again for Python exec_prefix, but with yet | ||
208 | + # another conditional: fall back to regular prefix if that was specified. | ||
209 | + AC_ARG_WITH([python_exec_prefix], | ||
210 | + [AS_HELP_STRING([--with-python_exec_prefix], | ||
211 | + [override the default PYTHON_EXEC_PREFIX])], | ||
212 | + [am_python_exec_prefix_subst=$withval | ||
213 | + am_cv_python_exec_prefix=$withval | ||
214 | + AC_MSG_CHECKING([for explicit $am_display_PYTHON exec_prefix]) | ||
215 | + AC_MSG_RESULT([$am_cv_python_exec_prefix])], | ||
216 | + [ | ||
217 | + # no explicit --with-python_exec_prefix, but if | ||
218 | + # --with-python_prefix was given, use its value for python_exec_prefix too. | ||
219 | + AS_IF([test -n "$with_python_prefix"], | ||
220 | + [am_python_exec_prefix_subst=$with_python_prefix | ||
221 | + am_cv_python_exec_prefix=$with_python_prefix | ||
222 | + AC_MSG_CHECKING([for python_prefix-given $am_display_PYTHON exec_prefix]) | ||
223 | + AC_MSG_RESULT([$am_cv_python_exec_prefix])], | ||
224 | + [ | ||
225 | + # Set am__usable_exec_prefix whether using GNU or Python values, | ||
226 | + # since we use that variable for pyexecdir. | ||
227 | + if test "x$exec_prefix" = xNONE; then | ||
228 | + am__usable_exec_prefix=$am__usable_prefix | ||
229 | + else | ||
230 | + am__usable_exec_prefix=$exec_prefix | ||
231 | + fi | ||
232 | + # | ||
233 | + if $am_use_python_sys; then # using python sys.exec_prefix, not GNU | ||
234 | + AC_CACHE_CHECK([for python default $am_display_PYTHON exec_prefix], | ||
235 | + [am_cv_python_exec_prefix], | ||
236 | + [am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`]) | ||
237 | + dnl If sys.exec_prefix is a subdir of $exec_prefix, replace the | ||
238 | + dnl literal value of $exec_prefix with a variable reference so it can | ||
239 | + dnl be overridden. | ||
240 | + case $am_cv_python_exec_prefix in | ||
241 | + $am__usable_exec_prefix*) | ||
242 | + am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'` | ||
243 | + am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"` | ||
244 | + ;; | ||
245 | + *) | ||
246 | + am_python_exec_prefix_subst=$am_cv_python_exec_prefix | ||
247 | + ;; | ||
248 | + esac | ||
249 | + else # using GNU $exec_prefix, not python sys.exec_prefix | ||
250 | + am_python_exec_prefix_subst='${exec_prefix}' | ||
251 | + am_python_exec_prefix=$am_python_exec_prefix_subst | ||
252 | + AC_MSG_CHECKING([for GNU default $am_display_PYTHON exec_prefix]) | ||
253 | + AC_MSG_RESULT([$am_python_exec_prefix]) | ||
254 | + fi])]) | ||
255 | + # Substituting python_exec_prefix_subst. | ||
256 | + AC_SUBST([PYTHON_EXEC_PREFIX], [$am_python_exec_prefix_subst]) | ||
257 | + | ||
258 | + # Factor out some code duplication into this shell variable. | ||
259 | + am_python_setup_sysconfig="\ | ||
260 | +import sys | ||
261 | +# Prefer sysconfig over distutils.sysconfig, for better compatibility | ||
262 | +# with python 3.x. See automake bug#10227. | ||
263 | +try: | ||
264 | + import sysconfig | ||
265 | +except ImportError: | ||
266 | + can_use_sysconfig = 0 | ||
267 | +else: | ||
268 | + can_use_sysconfig = 1 | ||
269 | +# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: | ||
270 | +# <https://github.com/pypa/virtualenv/issues/118> | ||
271 | +try: | ||
272 | + from platform import python_implementation | ||
273 | + if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7': | ||
274 | + can_use_sysconfig = 0 | ||
275 | +except ImportError: | ||
276 | + pass" | ||
277 | + | ||
278 | + dnl emacs-page Set up 4 directories: | ||
279 | + | ||
280 | + dnl 1. pythondir: where to install python scripts. This is the | ||
281 | + dnl site-packages directory, not the python standard library | ||
282 | + dnl directory like in previous automake betas. This behavior | ||
283 | + dnl is more consistent with lispdir.m4 for example. | ||
284 | + dnl Query distutils for this directory. | ||
285 | + dnl | ||
286 | + AC_CACHE_CHECK([for $am_display_PYTHON script directory (pythondir)], | ||
287 | + [am_cv_python_pythondir], | ||
288 | + [if test "x$am_cv_python_prefix" = x; then | ||
289 | + am_py_prefix=$am__usable_prefix | ||
290 | + else | ||
291 | + am_py_prefix=$am_cv_python_prefix | ||
292 | + fi | ||
293 | + am_cv_python_pythondir=`$PYTHON -c " | ||
294 | +$am_python_setup_sysconfig | ||
295 | +if can_use_sysconfig: | ||
296 | + if hasattr(sysconfig, 'get_default_scheme'): | ||
297 | + scheme = sysconfig.get_default_scheme() | ||
298 | + else: | ||
299 | + scheme = sysconfig._get_default_scheme() | ||
300 | + if scheme == 'posix_local': | ||
301 | + # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/ | ||
302 | + scheme = 'posix_prefix' | ||
303 | + sitedir = sysconfig.get_path('purelib', scheme, vars={'base':'$am_py_prefix'}) | ||
304 | +else: | ||
305 | + from distutils import sysconfig | ||
306 | + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') | ||
307 | +sys.stdout.write(sitedir)"` | ||
308 | + # | ||
309 | + case $am_cv_python_pythondir in | ||
310 | + $am_py_prefix*) | ||
311 | + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` | ||
312 | + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"` | ||
313 | + ;; | ||
314 | + *) | ||
315 | + case $am_py_prefix in | ||
316 | + /usr|/System*) ;; | ||
317 | + *) am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages" | ||
318 | + ;; | ||
319 | + esac | ||
320 | + ;; | ||
321 | + esac | ||
322 | + ]) | ||
323 | + AC_SUBST([pythondir], [$am_cv_python_pythondir]) | ||
324 | + | ||
325 | + dnl 2. pkgpythondir: $PACKAGE directory under pythondir. Was | ||
326 | + dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is | ||
327 | + dnl more consistent with the rest of automake. | ||
328 | + dnl | ||
329 | + AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) | ||
330 | + | ||
331 | + dnl 3. pyexecdir: directory for installing python extension modules | ||
332 | + dnl (shared libraries). | ||
333 | + dnl Query distutils for this directory. | ||
334 | + dnl | ||
335 | + AC_CACHE_CHECK([for $am_display_PYTHON extension module directory (pyexecdir)], | ||
336 | + [am_cv_python_pyexecdir], | ||
337 | + [if test "x$am_cv_python_exec_prefix" = x; then | ||
338 | + am_py_exec_prefix=$am__usable_exec_prefix | ||
339 | + else | ||
340 | + am_py_exec_prefix=$am_cv_python_exec_prefix | ||
341 | + fi | ||
342 | + am_cv_python_pyexecdir=`$PYTHON -c " | ||
343 | +$am_python_setup_sysconfig | ||
344 | +if can_use_sysconfig: | ||
345 | + if hasattr(sysconfig, 'get_default_scheme'): | ||
346 | + scheme = sysconfig.get_default_scheme() | ||
347 | + else: | ||
348 | + scheme = sysconfig._get_default_scheme() | ||
349 | + if scheme == 'posix_local': | ||
350 | + # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/ | ||
351 | + scheme = 'posix_prefix' | ||
352 | + sitedir = sysconfig.get_path('platlib', scheme, vars={'platbase':'$am_py_exec_prefix'}) | ||
353 | +else: | ||
354 | + from distutils import sysconfig | ||
355 | + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix') | ||
356 | +sys.stdout.write(sitedir)"` | ||
357 | + # | ||
358 | + case $am_cv_python_pyexecdir in | ||
359 | + $am_py_exec_prefix*) | ||
360 | + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` | ||
361 | + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"` | ||
362 | + ;; | ||
363 | + *) | ||
364 | + case $am_py_exec_prefix in | ||
365 | + /usr|/System*) ;; | ||
366 | + *) am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages" | ||
367 | + ;; | ||
368 | + esac | ||
369 | + ;; | ||
370 | + esac | ||
371 | + ]) | ||
372 | + AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) | ||
373 | + | ||
374 | + dnl 4. pkgpyexecdir: $(pyexecdir)/$(PACKAGE) | ||
375 | + dnl | ||
376 | + AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) | ||
377 | + | ||
378 | + dnl Run any user-specified action. | ||
379 | + $2 | ||
380 | + fi | ||
381 | +]) | ||
382 | + | ||
383 | + | ||
384 | +# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) | ||
385 | +# --------------------------------------------------------------------------- | ||
386 | +# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. | ||
387 | +# Run ACTION-IF-FALSE otherwise. | ||
388 | +# This test uses sys.hexversion instead of the string equivalent (first | ||
389 | +# word of sys.version), in order to cope with versions such as 2.2c1. | ||
390 | +# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000). | ||
391 | +AC_DEFUN([AM_PYTHON_CHECK_VERSION], | ||
392 | + [prog="import sys | ||
393 | +# split strings by '.' and convert to numeric. Append some zeros | ||
394 | +# because we need at least 4 digits for the hex conversion. | ||
395 | +# map returns an iterator in Python 3.0 and a list in 2.x | ||
396 | +minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]] | ||
397 | +minverhex = 0 | ||
398 | +# xrange is not present in Python 3.0 and range returns an iterator | ||
399 | +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] | ||
400 | +sys.exit(sys.hexversion < minverhex)" | ||
401 | + AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) | ||
402 | diff --git a/src/modules/rlm_python3/m4/runlog.m4 b/src/modules/rlm_python3/m4/runlog.m4 | ||
403 | new file mode 100644 | ||
404 | index 0000000000..690efc3258 | ||
405 | --- /dev/null | ||
406 | +++ b/src/modules/rlm_python3/m4/runlog.m4 | ||
407 | @@ -0,0 +1,17 @@ | ||
408 | +## -*- Autoconf -*- | ||
409 | +# Copyright (C) 2001-2018 Free Software Foundation, Inc. | ||
410 | +# | ||
411 | +# This file is free software; the Free Software Foundation | ||
412 | +# gives unlimited permission to copy and/or distribute it, | ||
413 | +# with or without modifications, as long as this notice is preserved. | ||
414 | + | ||
415 | +# AM_RUN_LOG(COMMAND) | ||
416 | +# ------------------- | ||
417 | +# Run COMMAND, save the exit status in ac_status, and log it. | ||
418 | +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) | ||
419 | +AC_DEFUN([AM_RUN_LOG], | ||
420 | +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD | ||
421 | + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD | ||
422 | + ac_status=$? | ||
423 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | ||
424 | + (exit $ac_status); }]) | ||
425 | -- | ||
426 | 2.25.1 | ||
427 | |||
diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.26.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb index e3730cfaa..7ea63a65d 100644 --- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.26.bb +++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb | |||
@@ -13,7 +13,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.0-or-later" | |||
13 | LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" | 13 | LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" |
14 | DEPENDS = "openssl-native openssl libidn libtool libpcap libtalloc" | 14 | DEPENDS = "openssl-native openssl libidn libtool libpcap libtalloc" |
15 | 15 | ||
16 | SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0;;protocol=https \ | 16 | SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0;;protocol=https \ |
17 | file://freeradius \ | 17 | file://freeradius \ |
18 | file://volatiles.58_radiusd \ | 18 | file://volatiles.58_radiusd \ |
19 | file://radiusd.service \ | 19 | file://radiusd.service \ |
@@ -34,12 +34,12 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0 | |||
34 | file://0014-Workaround-error-with-autoconf-2.7.patch \ | 34 | file://0014-Workaround-error-with-autoconf-2.7.patch \ |
35 | file://0015-bootstrap-check-commands-of-openssl-exist.patch \ | 35 | file://0015-bootstrap-check-commands-of-openssl-exist.patch \ |
36 | file://0016-version.c-don-t-print-build-flags.patch \ | 36 | file://0016-version.c-don-t-print-build-flags.patch \ |
37 | file://0017-add-python.m4-for-detecting-python-3.10.patch \ | 37 | file://0017-Add-acinclude.m4-to-include-required-macros.patch \ |
38 | " | 38 | " |
39 | 39 | ||
40 | raddbdir = "${sysconfdir}/${MLPREFIX}raddb" | 40 | raddbdir = "${sysconfdir}/${MLPREFIX}raddb" |
41 | 41 | ||
42 | SRCREV = "d956f683d37ea40e7977cc5907361f3e6988a439" | 42 | SRCREV = "db3d1924d9a2e8d37c43872932621f69cfdbb099" |
43 | 43 | ||
44 | UPSTREAM_CHECK_GITTAGREGEX = "release_(?P<pver>\d+(\_\d+)+)" | 44 | UPSTREAM_CHECK_GITTAGREGEX = "release_(?P<pver>\d+(\_\d+)+)" |
45 | 45 | ||
@@ -69,6 +69,7 @@ EXTRA_OECONF = " --enable-strict-dependencies \ | |||
69 | --without-rlm_opendirectory \ | 69 | --without-rlm_opendirectory \ |
70 | --without-rlm_redis \ | 70 | --without-rlm_redis \ |
71 | --without-rlm_rediswho \ | 71 | --without-rlm_rediswho \ |
72 | --without-rlm_cache_redis \ | ||
72 | --without-rlm_sql_db2 \ | 73 | --without-rlm_sql_db2 \ |
73 | --without-rlm_sql_firebird \ | 74 | --without-rlm_sql_firebird \ |
74 | --without-rlm_sql_freetds \ | 75 | --without-rlm_sql_freetds \ |
@@ -103,7 +104,7 @@ PACKAGECONFIG[postgresql] = "--with-rlm_sql_postgresql,--without-rlm_sql_postgre | |||
103 | PACKAGECONFIG[pcre] = "--with-pcre,--without-pcre,libpcre" | 104 | PACKAGECONFIG[pcre] = "--with-pcre,--without-pcre,libpcre" |
104 | PACKAGECONFIG[perl] = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl --with-rlm_perl,--without-rlm_perl,perl-native perl,perl" | 105 | PACKAGECONFIG[perl] = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl --with-rlm_perl,--without-rlm_perl,perl-native perl,perl" |
105 | PACKAGECONFIG[python3] = "--with-rlm_python3 --with-rlm-python3-bin=${STAGING_BINDIR_NATIVE}/python3-native/python3 --with-rlm-python3-include-dir=${STAGING_INCDIR}/${PYTHON_DIR},--without-rlm_python3,python3-native python3" | 106 | PACKAGECONFIG[python3] = "--with-rlm_python3 --with-rlm-python3-bin=${STAGING_BINDIR_NATIVE}/python3-native/python3 --with-rlm-python3-include-dir=${STAGING_INCDIR}/${PYTHON_DIR},--without-rlm_python3,python3-native python3" |
106 | PACKAGECONFIG[rest] = "--with-rlm_rest,--without-rlm_rest,curl json-c" | 107 | PACKAGECONFIG[rest] = "--with-rlm_rest,--without-rlm_rest --without-rlm_json,curl json-c" |
107 | PACKAGECONFIG[ruby] = "--with-rlm_ruby,--without-rlm_ruby,ruby" | 108 | PACKAGECONFIG[ruby] = "--with-rlm_ruby,--without-rlm_ruby,ruby" |
108 | PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl" | 109 | PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl" |
109 | PACKAGECONFIG[rlm-eap-fast] = "--with-rlm_eap_fast, --without-rlm_eap_fast" | 110 | PACKAGECONFIG[rlm-eap-fast] = "--with-rlm_eap_fast, --without-rlm_eap_fast" |