diff options
author | Changqing Li <changqing.li@windriver.com> | 2018-07-25 11:27:26 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-07-27 07:19:11 -0700 |
commit | d4610b9d971abf35fdc25c03f65c557a3b487d42 (patch) | |
tree | e1805607a5bdae71716a292c15f2bbe4f92bf5a8 /meta-networking | |
parent | d4f05ee52ec3a09b54ccdd7d3c9176d574b52267 (diff) | |
download | meta-openembedded-d4610b9d971abf35fdc25c03f65c557a3b487d42.tar.gz |
freeradius: upgrade 3.0.15 -> 3.0.17
Signed-off-by: Changqing Li <changqing.li@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/freeradius-configure.ac-allow-cross-compilation.patch | 12 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch | 106 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/freeradius/freeradius_3.0.17.bb (renamed from meta-networking/recipes-connectivity/freeradius/freeradius_3.0.15.bb) | 4 |
3 files changed, 39 insertions, 83 deletions
diff --git a/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-allow-cross-compilation.patch b/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-allow-cross-compilation.patch index 30497a6029..38e7c36227 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-allow-cross-compilation.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-allow-cross-compilation.patch | |||
@@ -1,3 +1,6 @@ | |||
1 | From 0780b7053fb0d33d721aa70ab2ecd75299e5ba31 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Tue, 24 Jul 2018 15:03:39 +0800 | ||
1 | Subject: [PATCH] configure.ac: allow cross-compilation | 4 | Subject: [PATCH] configure.ac: allow cross-compilation |
2 | 5 | ||
3 | The checking OpenSSL library and header version consistency will | 6 | The checking OpenSSL library and header version consistency will |
@@ -8,17 +11,20 @@ Upstream-Status: Inappropriate[embedded specific] | |||
8 | 11 | ||
9 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
10 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 13 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
14 | |||
15 | update to new version 3.0.17 to fix patch warning | ||
16 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
11 | --- | 17 | --- |
12 | src/modules/rlm_krb5/configure.ac | 3 ++- | 18 | src/modules/rlm_krb5/configure.ac | 3 ++- |
13 | 1 file changed, 2 insertions(+), 1 deletion(-) | 19 | 1 file changed, 2 insertions(+), 1 deletion(-) |
14 | 20 | ||
15 | diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac | 21 | diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac |
16 | index eb43534..113a079 100644 | 22 | index efc9f29..98a97e4 100644 |
17 | --- a/src/modules/rlm_krb5/configure.ac | 23 | --- a/src/modules/rlm_krb5/configure.ac |
18 | +++ b/src/modules/rlm_krb5/configure.ac | 24 | +++ b/src/modules/rlm_krb5/configure.ac |
19 | @@ -137,7 +137,8 @@ if test x$with_[]modname != xno; then | 25 | @@ -137,7 +137,8 @@ if test x$with_[]modname != xno; then |
20 | FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) | 26 | FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) |
21 | if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" == xyes; then | 27 | if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then |
22 | AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <krb5.h>]], [[return krb5_is_thread_safe() ? 0 : 1]])], | 28 | AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <krb5.h>]], [[return krb5_is_thread_safe() ? 0 : 1]])], |
23 | - [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])]) | 29 | - [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])]) |
24 | + [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]])], |
@@ -27,5 +33,5 @@ index eb43534..113a079 100644 | |||
27 | else | 33 | else |
28 | krb5threadsafe="" | 34 | krb5threadsafe="" |
29 | -- | 35 | -- |
30 | 2.10.2 | 36 | 2.7.4 |
31 | 37 | ||
diff --git a/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch b/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch index d29b2ac39d..638d950765 100644 --- a/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch +++ b/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch | |||
@@ -1,32 +1,33 @@ | |||
1 | From d8e251ef97869ab2c1c82bd374016f402083997c Mon Sep 17 00:00:00 2001 | 1 | From 69cb6d4bb5dd56a48695c0581a7d853e427b0ea3 Mon Sep 17 00:00:00 2001 |
2 | From: Jorge Pereira <jpereiran@gmail.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Mon, 7 Dec 2015 16:51:07 -0200 | 3 | Date: Tue, 24 Jul 2018 14:54:41 +0800 |
4 | Subject: [PATCH] Fixing issues related to m4 include path | 4 | Subject: [PATCH] freeradius: Fixing issues related to m4 include path |
5 | 5 | ||
6 | Upstream-Status: Submitted [1] | 6 | Upstream-Status: Submitted [1] |
7 | 7 | ||
8 | [1]: https://github.com/FreeRADIUS/freeradius-server/pull/1428 | 8 | [1]: https://github.com/FreeRADIUS/freeradius-server/pull/1428 |
9 | 9 | ||
10 | Submmited by: Jorge Pereira <jpereiran@gmail.com> | 10 | Submmited by: Jorge Pereira <jpereiran@gmail.com> |
11 | |||
12 | Update to version 3.0.17 | ||
13 | |||
14 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
11 | --- | 15 | --- |
12 | src/modules/rlm_example/config.h.in | 39 ++-------------------- | 16 | src/modules/rlm_example/config.h.in | 35 +++-------------------------------- |
13 | src/modules/rlm_ldap/configure | 2 +- | 17 | src/modules/rlm_pam/config.h.in | 3 +++ |
14 | src/modules/rlm_pam/config.h.in | 3 ++ | 18 | src/modules/rlm_perl/config.h.in | 3 +++ |
15 | src/modules/rlm_perl/config.h.in | 3 ++ | 19 | src/modules/rlm_perl/configure.ac | 2 +- |
16 | src/modules/rlm_perl/configure.ac | 2 +- | 20 | src/modules/rlm_radutmp/config.h.in | 3 +++ |
17 | src/modules/rlm_radutmp/config.h.in | 3 ++ | 21 | src/modules/rlm_ruby/configure.ac | 8 ++++---- |
18 | src/modules/rlm_ruby/configure | 1 + | 22 | src/modules/rlm_smsotp/config.h.in | 3 +++ |
19 | src/modules/rlm_ruby/configure.ac | 9 ++--- | 23 | src/modules/rlm_unix/config.h.in | 3 +++ |
20 | src/modules/rlm_smsotp/config.h.in | 3 ++ | 24 | 8 files changed, 23 insertions(+), 37 deletions(-) |
21 | .../rlm_sql/drivers/rlm_sql_mysql/config.h.in | 3 ++ | ||
22 | src/modules/rlm_unix/config.h.in | 6 ++++ | ||
23 | 11 files changed, 32 insertions(+), 42 deletions(-) | ||
24 | 25 | ||
25 | diff --git a/src/modules/rlm_example/config.h.in b/src/modules/rlm_example/config.h.in | 26 | diff --git a/src/modules/rlm_example/config.h.in b/src/modules/rlm_example/config.h.in |
26 | index 2a81ef5..f80de9c 100644 | 27 | index 2a81ef5..4dbb8f4 100644 |
27 | --- a/src/modules/rlm_example/config.h.in | 28 | --- a/src/modules/rlm_example/config.h.in |
28 | +++ b/src/modules/rlm_example/config.h.in | 29 | +++ b/src/modules/rlm_example/config.h.in |
29 | @@ -1,38 +1,5 @@ | 30 | @@ -1,37 +1,5 @@ |
30 | /* config.h.in. Generated from configure.ac by autoheader. */ | 31 | /* config.h.in. Generated from configure.ac by autoheader. */ |
31 | 32 | ||
32 | -/* Define to 1 if you have the <inttypes.h> header file. */ | 33 | -/* Define to 1 if you have the <inttypes.h> header file. */ |
@@ -61,11 +62,10 @@ index 2a81ef5..f80de9c 100644 | |||
61 | - | 62 | - |
62 | -/* Define to 1 if you have the <unistd.h> header file. */ | 63 | -/* Define to 1 if you have the <unistd.h> header file. */ |
63 | -#undef HAVE_UNISTD_H | 64 | -#undef HAVE_UNISTD_H |
64 | - | 65 | |
65 | /* Define to the address where bug reports for this package should be sent. */ | 66 | /* Define to the address where bug reports for this package should be sent. */ |
66 | #undef PACKAGE_BUGREPORT | 67 | #undef PACKAGE_BUGREPORT |
67 | 68 | @@ -45,6 +13,9 @@ | |
68 | @@ -45,8 +12,8 @@ | ||
69 | /* Define to the one symbol short name of this package. */ | 69 | /* Define to the one symbol short name of this package. */ |
70 | #undef PACKAGE_TARNAME | 70 | #undef PACKAGE_TARNAME |
71 | 71 | ||
@@ -74,22 +74,7 @@ index 2a81ef5..f80de9c 100644 | |||
74 | + | 74 | + |
75 | /* Define to the version of this package. */ | 75 | /* Define to the version of this package. */ |
76 | #undef PACKAGE_VERSION | 76 | #undef PACKAGE_VERSION |
77 | - | 77 | |
78 | -/* Define to 1 if you have the ANSI C header files. */ | ||
79 | -#undef STDC_HEADERS | ||
80 | diff --git a/src/modules/rlm_ldap/configure b/src/modules/rlm_ldap/configure | ||
81 | index e0c15d9..cdf96d5 100755 | ||
82 | --- a/src/modules/rlm_ldap/configure | ||
83 | +++ b/src/modules/rlm_ldap/configure | ||
84 | @@ -3992,7 +3992,7 @@ smart_prefix= | ||
85 | $as_echo "#define WITH_SASL 1" >>confdefs.h | ||
86 | |||
87 | SASL=sasl.c | ||
88 | - fi | ||
89 | + fi | ||
90 | fi | ||
91 | |||
92 | targetname=rlm_ldap | ||
93 | diff --git a/src/modules/rlm_pam/config.h.in b/src/modules/rlm_pam/config.h.in | 78 | diff --git a/src/modules/rlm_pam/config.h.in b/src/modules/rlm_pam/config.h.in |
94 | index 32ef6ff..1ad20c5 100644 | 79 | index 32ef6ff..1ad20c5 100644 |
95 | --- a/src/modules/rlm_pam/config.h.in | 80 | --- a/src/modules/rlm_pam/config.h.in |
@@ -118,7 +103,7 @@ index 989ed53..f80de9c 100644 | |||
118 | /* Define to the version of this package. */ | 103 | /* Define to the version of this package. */ |
119 | #undef PACKAGE_VERSION | 104 | #undef PACKAGE_VERSION |
120 | diff --git a/src/modules/rlm_perl/configure.ac b/src/modules/rlm_perl/configure.ac | 105 | diff --git a/src/modules/rlm_perl/configure.ac b/src/modules/rlm_perl/configure.ac |
121 | index 44c5fc9..6b2a043 100644 | 106 | index 4b3ff42..69c79cb 100644 |
122 | --- a/src/modules/rlm_perl/configure.ac | 107 | --- a/src/modules/rlm_perl/configure.ac |
123 | +++ b/src/modules/rlm_perl/configure.ac | 108 | +++ b/src/modules/rlm_perl/configure.ac |
124 | @@ -3,7 +3,7 @@ AC_INIT(rlm_perl.c) | 109 | @@ -3,7 +3,7 @@ AC_INIT(rlm_perl.c) |
@@ -144,23 +129,11 @@ index 9a883cc..750b434 100644 | |||
144 | /* Define to the version of this package. */ | 129 | /* Define to the version of this package. */ |
145 | #undef PACKAGE_VERSION | 130 | #undef PACKAGE_VERSION |
146 | 131 | ||
147 | diff --git a/src/modules/rlm_ruby/configure b/src/modules/rlm_ruby/configure | ||
148 | index 15868ab..c728af2 100755 | ||
149 | --- a/src/modules/rlm_ruby/configure | ||
150 | +++ b/src/modules/rlm_ruby/configure | ||
151 | @@ -1875,6 +1875,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
152 | |||
153 | |||
154 | |||
155 | + | ||
156 | # =========================================================================== | ||
157 | # http://www.gnu.org/software/autoconf-archive/ax_compare_version.html | ||
158 | # =========================================================================== | ||
159 | diff --git a/src/modules/rlm_ruby/configure.ac b/src/modules/rlm_ruby/configure.ac | 132 | diff --git a/src/modules/rlm_ruby/configure.ac b/src/modules/rlm_ruby/configure.ac |
160 | index 9306382..f1c8118 100644 | 133 | index 9306382..ae86a14 100644 |
161 | --- a/src/modules/rlm_ruby/configure.ac | 134 | --- a/src/modules/rlm_ruby/configure.ac |
162 | +++ b/src/modules/rlm_ruby/configure.ac | 135 | +++ b/src/modules/rlm_ruby/configure.ac |
163 | @@ -3,15 +3,16 @@ AC_INIT(rlm_ruby.c) | 136 | @@ -3,15 +3,15 @@ AC_INIT(rlm_ruby.c) |
164 | AC_REVISION($Revision: 1.9 $) | 137 | AC_REVISION($Revision: 1.9 $) |
165 | AC_DEFUN(modname,[rlm_ruby]) | 138 | AC_DEFUN(modname,[rlm_ruby]) |
166 | 139 | ||
@@ -174,7 +147,6 @@ index 9306382..f1c8118 100644 | |||
174 | -m4_include([ax_compare_version.m4]) | 147 | -m4_include([ax_compare_version.m4]) |
175 | -m4_include([ax_prog_ruby_version.m4]) | 148 | -m4_include([ax_prog_ruby_version.m4]) |
176 | -m4_include([ax_ruby_devel.m4]) | 149 | -m4_include([ax_ruby_devel.m4]) |
177 | + | ||
178 | +m4_include([m4/ax_compare_version.m4]) | 150 | +m4_include([m4/ax_compare_version.m4]) |
179 | +m4_include([m4/ax_prog_ruby_version.m4]) | 151 | +m4_include([m4/ax_prog_ruby_version.m4]) |
180 | +m4_include([m4/ax_ruby_devel.m4]) | 152 | +m4_include([m4/ax_ruby_devel.m4]) |
@@ -195,33 +167,11 @@ index 5feaf91..9e69f85 100644 | |||
195 | /* Define to the version of this package. */ | 167 | /* Define to the version of this package. */ |
196 | #undef PACKAGE_VERSION | 168 | #undef PACKAGE_VERSION |
197 | 169 | ||
198 | diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/config.h.in b/src/modules/rlm_sql/drivers/rlm_sql_mysql/config.h.in | ||
199 | index e03d1a9..6262c48 100644 | ||
200 | --- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/config.h.in | ||
201 | +++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/config.h.in | ||
202 | @@ -18,5 +18,8 @@ | ||
203 | /* Define to the one symbol short name of this package. */ | ||
204 | #undef PACKAGE_TARNAME | ||
205 | |||
206 | +/* Define to the home page for this package. */ | ||
207 | +#undef PACKAGE_URL | ||
208 | + | ||
209 | /* Define to the version of this package. */ | ||
210 | #undef PACKAGE_VERSION | ||
211 | diff --git a/src/modules/rlm_unix/config.h.in b/src/modules/rlm_unix/config.h.in | 170 | diff --git a/src/modules/rlm_unix/config.h.in b/src/modules/rlm_unix/config.h.in |
212 | index dcb9aa2..70b4680 100644 | 171 | index dcb9aa2..16107b8 100644 |
213 | --- a/src/modules/rlm_unix/config.h.in | 172 | --- a/src/modules/rlm_unix/config.h.in |
214 | +++ b/src/modules/rlm_unix/config.h.in | 173 | +++ b/src/modules/rlm_unix/config.h.in |
215 | @@ -1,5 +1,8 @@ | 174 | @@ -54,6 +54,9 @@ |
216 | /* config.h.in. Generated from configure.ac by autoheader. */ | ||
217 | |||
218 | +/* Define to 1 if you have the `getpwnam' function. */ | ||
219 | +#undef HAVE_GETPWNAM | ||
220 | + | ||
221 | /* Define to 1 if you have the `getspnam' function. */ | ||
222 | #undef HAVE_GETSPNAM | ||
223 | |||
224 | @@ -54,6 +57,9 @@ | ||
225 | /* Define to the one symbol short name of this package. */ | 175 | /* Define to the one symbol short name of this package. */ |
226 | #undef PACKAGE_TARNAME | 176 | #undef PACKAGE_TARNAME |
227 | 177 | ||
@@ -232,5 +182,5 @@ index dcb9aa2..70b4680 100644 | |||
232 | #undef PACKAGE_VERSION | 182 | #undef PACKAGE_VERSION |
233 | 183 | ||
234 | -- | 184 | -- |
235 | 2.3.5 | 185 | 2.7.4 |
236 | 186 | ||
diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.15.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.17.bb index 4155a4059e..1b45e780ac 100644 --- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.15.bb +++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.17.bb | |||
@@ -30,8 +30,8 @@ SRC_URI = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${PV}.tar.b | |||
30 | file://radiusd.service \ | 30 | file://radiusd.service \ |
31 | file://radiusd-volatiles.conf \ | 31 | file://radiusd-volatiles.conf \ |
32 | " | 32 | " |
33 | SRC_URI[md5sum] = "0c81a4464ccf1d04f7ef1218a029d37a" | 33 | SRC_URI[md5sum] = "1f4ad38f32101a7d50d818afa6f17339" |
34 | SRC_URI[sha256sum] = "23267d8505e7b2909f5bdbf3938ca077c1fe122290dc969304d4f3b594f7e3ba" | 34 | SRC_URI[sha256sum] = "3f03404b6e4a4f410e1f15ea2ababfec7f8a7ae8a49836d8a0c137436d913b96" |
35 | 35 | ||
36 | PARALLEL_MAKE = "" | 36 | PARALLEL_MAKE = "" |
37 | 37 | ||