diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files')
6 files changed, 83 insertions, 255 deletions
diff --git a/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-freeradius-correct-version-number-of-libssl-defect.patch b/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-freeradius-correct-version-number-of-libssl-defect.patch deleted file mode 100644 index 9e1f5b2e..00000000 --- a/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-freeradius-correct-version-number-of-libssl-defect.patch +++ /dev/null @@ -1,44 +0,0 @@ -From fecf974b63f72eeb12d3b43522e948ca2bc704d4 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Thu, 11 Oct 2018 09:45:52 +0800 -Subject: [PATCH] freeradius: correct version number of libssl defect - -Upstream-Status: Backport [https://github.com/FreeRADIUS/freeradius-server - /commit/ad039347beca4ded297813a1da6eabb61fcf2ddd] - -upstream have refactored this part code into -src/lib/tls/base.c, and problem also have fixed -by commit ad039347beca - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - src/main/tls.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/main/tls.c b/src/main/tls.c -index acbfe79..d9c91f1 100644 ---- a/src/main/tls.c -+++ b/src/main/tls.c -@@ -72,15 +72,15 @@ typedef struct libssl_defect { - static libssl_defect_t libssl_defects[] = - { - { -- .low = 0x01010101f, /* 1.1.0a */ -- .high = 0x01010101f, /* 1.1.0a */ -+ .low = 0x01010001f, /* 1.1.0a */ -+ .high = 0x01010001f, /* 1.1.0a */ - .id = "CVE-2016-6309", - .name = "OCSP status request extension", - .comment = "For more information see https://www.openssl.org/news/secadv/20160926.txt" - }, - { -- .low = 0x01010100f, /* 1.1.0 */ -- .high = 0x01010100f, /* 1.1.0 */ -+ .low = 0x010100000f, /* 1.1.0 */ -+ .high = 0x01010000f, /* 1.1.0 */ - .id = "CVE-2016-6304", - .name = "OCSP status request extension", - .comment = "For more information see https://www.openssl.org/news/secadv/20160922.txt" --- -2.7.4 - diff --git a/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_python3-add-PY_INC_DIR-in-search-dir.patch b/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_python3-add-PY_INC_DIR-in-search-dir.patch new file mode 100644 index 00000000..d6302316 --- /dev/null +++ b/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_python3-add-PY_INC_DIR-in-search-dir.patch @@ -0,0 +1,58 @@ +From 733330888fff49e4d2b6c2121a6050fdd9f11a87 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Thu, 6 Feb 2020 09:32:04 +0800 +Subject: [PATCH] rlm_python3: add PY_INC_DIR in search dir + +The configure option --with-rlm-python3-include-dir is used to set +PY_INC_DIR which is never used and it fails to find Python.h, +so add it into search dir to fix it. + +Also remove SMART_LIBS from mod_flags because it introduces rpath +to LDFALGS which causes a do_package_qa error: + +ERROR: freeradius-3.0.20-r0 do_package_qa: QA Issue: package freeradius-python contains bad RPATH +/buildarea/build/tmp/work/core2-64-poky-linux/freeradius/3.0.20-r0/recipe-sysroot-native/usr/lib/python3.8/config in file +/buildarea/build/tmp/work/core2-64-poky-linux/freeradius/3.0.20-r0/packages-split/freeradius-python/usr/lib/rlm_python3.so.0.0.0 +package freeradius-python contains bad RPATH +/buildarea/build/tmp/work/core2-64-poky-linux/freeradius/3.0.20-r0/recipe-sysroot-native/usr/lib/python3.8/config in file +/buildarea/build/tmp/work/core2-64-poky-linux/freeradius/3.0.20-r0/packages-split/freeradius-python/usr/lib/rlm_python3.so.0.0.0 [rpaths] + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + src/modules/rlm_python3/configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/modules/rlm_python3/configure.ac b/src/modules/rlm_python3/configure.ac +index a00320f..adbdf19 100644 +--- a/src/modules/rlm_python3/configure.ac ++++ b/src/modules/rlm_python3/configure.ac +@@ -95,7 +95,7 @@ if test x$with_[]modname != xno; then + + old_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $PY_CFLAGS" +- smart_try_dir="$PY_PREFIX/include/python$PY_SYS_VERSION" ++ smart_try_dir="$PY_PREFIX/include/python$PY_SYS_VERSION $PY_INC_DIR" + FR_SMART_CHECK_INCLUDE(Python.h) + CFLAGS=$old_CFLAGS + +@@ -114,13 +114,13 @@ if test x$with_[]modname != xno; then + + eval t=\${ac_cv_lib_${sm_lib_safe}_${sm_func_safe}} + if test "x$t" = "xyes"; then +- mod_ldflags="$PY_LIB_LOC $PY_EXTRA_LIBS $SMART_LIBS -lm" ++ mod_ldflags="$PY_LIB_LOC $PY_EXTRA_LIBS -lm" + targetname=modname + else + FR_SMART_CHECK_LIB(python${PY_SYS_VERSION}m, Py_Initialize) + eval t=\${ac_cv_lib_${sm_lib_safe}_${sm_func_safe}} + if test "x$t" = "xyes"; then +- mod_ldflags="$PY_LIB_LOC $PY_EXTRA_LIBS $SMART_LIBS -lm" ++ mod_ldflags="$PY_LIB_LOC $PY_EXTRA_LIBS -lm" + targetname=modname + else + targetname= +-- +2.7.4 + diff --git a/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch b/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch index 71b78090..47193587 100644 --- a/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch +++ b/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch @@ -1,20 +1,21 @@ -From 74eed61dec8702c89f3e121d577ea9db25c961a4 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Mon, 11 Jan 2016 02:52:16 -0500 -Subject: [PATCH] configure.ac: add option for libcap +From 98a9eff357959d1113e33a615c2178751d5b2054 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 22 Aug 2019 10:50:21 +0800 +Subject: [PATCH 2/2] configure.ac: add option for libcap Upstream-Status: Pending Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - configure.ac | 37 ++++++++++++++++++++++++++++--------- - 1 file changed, 28 insertions(+), 9 deletions(-) + configure.ac | 36 +++++++++++++++++++++++++++--------- + 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac -index 066d3d7..6e4266b 100644 +index 65db61e..6486aac 100644 --- a/configure.ac +++ b/configure.ac -@@ -948,6 +948,23 @@ fi +@@ -977,6 +977,22 @@ fi dnl Set by FR_SMART_CHECKLIB LIBS="${old_LIBS}" @@ -34,11 +35,10 @@ index 066d3d7..6e4266b 100644 + esac ] +) + -+ dnl Check for cap dnl extra argument: --with-cap-lib-dir=DIR cap_lib_dir= -@@ -981,15 +998,17 @@ AC_ARG_WITH(cap-include-dir, +@@ -1010,15 +1026,17 @@ AC_ARG_WITH(cap-include-dir, ;; esac]) @@ -64,7 +64,7 @@ index 066d3d7..6e4266b 100644 + fi fi - VL_LIB_READLINE + dnl # -- -1.9.1 +2.7.4 diff --git a/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch b/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch deleted file mode 100644 index 638d9507..00000000 --- a/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch +++ /dev/null @@ -1,186 +0,0 @@ -From 69cb6d4bb5dd56a48695c0581a7d853e427b0ea3 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 24 Jul 2018 14:54:41 +0800 -Subject: [PATCH] freeradius: Fixing issues related to m4 include path - -Upstream-Status: Submitted [1] - -[1]: https://github.com/FreeRADIUS/freeradius-server/pull/1428 - -Submmited by: Jorge Pereira <jpereiran@gmail.com> - -Update to version 3.0.17 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - src/modules/rlm_example/config.h.in | 35 +++-------------------------------- - src/modules/rlm_pam/config.h.in | 3 +++ - src/modules/rlm_perl/config.h.in | 3 +++ - src/modules/rlm_perl/configure.ac | 2 +- - src/modules/rlm_radutmp/config.h.in | 3 +++ - src/modules/rlm_ruby/configure.ac | 8 ++++---- - src/modules/rlm_smsotp/config.h.in | 3 +++ - src/modules/rlm_unix/config.h.in | 3 +++ - 8 files changed, 23 insertions(+), 37 deletions(-) - -diff --git a/src/modules/rlm_example/config.h.in b/src/modules/rlm_example/config.h.in -index 2a81ef5..4dbb8f4 100644 ---- a/src/modules/rlm_example/config.h.in -+++ b/src/modules/rlm_example/config.h.in -@@ -1,37 +1,5 @@ - /* config.h.in. Generated from configure.ac by autoheader. */ - --/* Define to 1 if you have the <inttypes.h> header file. */ --#undef HAVE_INTTYPES_H -- --/* Define to 1 if you have the <memory.h> header file. */ --#undef HAVE_MEMORY_H -- --/* Define to 1 if you have the `printf' function. */ --#undef HAVE_PRINTF -- --/* Define to 1 if you have the <stdint.h> header file. */ --#undef HAVE_STDINT_H -- --/* Define to 1 if you have the <stdio.h> header file. */ --#undef HAVE_STDIO_H -- --/* Define to 1 if you have the <stdlib.h> header file. */ --#undef HAVE_STDLIB_H -- --/* Define to 1 if you have the <strings.h> header file. */ --#undef HAVE_STRINGS_H -- --/* Define to 1 if you have the <string.h> header file. */ --#undef HAVE_STRING_H -- --/* Define to 1 if you have the <sys/stat.h> header file. */ --#undef HAVE_SYS_STAT_H -- --/* Define to 1 if you have the <sys/types.h> header file. */ --#undef HAVE_SYS_TYPES_H -- --/* Define to 1 if you have the <unistd.h> header file. */ --#undef HAVE_UNISTD_H - - /* Define to the address where bug reports for this package should be sent. */ - #undef PACKAGE_BUGREPORT -@@ -45,6 +13,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -diff --git a/src/modules/rlm_pam/config.h.in b/src/modules/rlm_pam/config.h.in -index 32ef6ff..1ad20c5 100644 ---- a/src/modules/rlm_pam/config.h.in -+++ b/src/modules/rlm_pam/config.h.in -@@ -45,6 +45,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -diff --git a/src/modules/rlm_perl/config.h.in b/src/modules/rlm_perl/config.h.in -index 989ed53..f80de9c 100644 ---- a/src/modules/rlm_perl/config.h.in -+++ b/src/modules/rlm_perl/config.h.in -@@ -12,5 +12,8 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION -diff --git a/src/modules/rlm_perl/configure.ac b/src/modules/rlm_perl/configure.ac -index 4b3ff42..69c79cb 100644 ---- a/src/modules/rlm_perl/configure.ac -+++ b/src/modules/rlm_perl/configure.ac -@@ -3,7 +3,7 @@ AC_INIT(rlm_perl.c) - AC_REVISION($Revision$) - AC_DEFUN(modname,[rlm_perl]) - --m4_include([ax_with_prog.m4]) -+m4_include([m4/ax_with_prog.m4]) - - if test x$with_[]modname != xno; then - AC_PROG_CC -diff --git a/src/modules/rlm_radutmp/config.h.in b/src/modules/rlm_radutmp/config.h.in -index 9a883cc..750b434 100644 ---- a/src/modules/rlm_radutmp/config.h.in -+++ b/src/modules/rlm_radutmp/config.h.in -@@ -42,6 +42,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -diff --git a/src/modules/rlm_ruby/configure.ac b/src/modules/rlm_ruby/configure.ac -index 9306382..ae86a14 100644 ---- a/src/modules/rlm_ruby/configure.ac -+++ b/src/modules/rlm_ruby/configure.ac -@@ -3,15 +3,15 @@ AC_INIT(rlm_ruby.c) - AC_REVISION($Revision: 1.9 $) - AC_DEFUN(modname,[rlm_ruby]) - --m4_include([ax_with_prog.m4]) -+m4_include([m4/ax_with_prog.m4]) - - AC_DEFUN([AX_WITH_RUBY],[ - AX_WITH_PROG([RUBY],[ruby],[not-found],[${PATH}:/usr/bin:/usr/local/bin]) - ]) - --m4_include([ax_compare_version.m4]) --m4_include([ax_prog_ruby_version.m4]) --m4_include([ax_ruby_devel.m4]) -+m4_include([m4/ax_compare_version.m4]) -+m4_include([m4/ax_prog_ruby_version.m4]) -+m4_include([m4/ax_ruby_devel.m4]) - - targetname=modname - mod_cflags= -diff --git a/src/modules/rlm_smsotp/config.h.in b/src/modules/rlm_smsotp/config.h.in -index 5feaf91..9e69f85 100644 ---- a/src/modules/rlm_smsotp/config.h.in -+++ b/src/modules/rlm_smsotp/config.h.in -@@ -42,6 +42,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -diff --git a/src/modules/rlm_unix/config.h.in b/src/modules/rlm_unix/config.h.in -index dcb9aa2..16107b8 100644 ---- a/src/modules/rlm_unix/config.h.in -+++ b/src/modules/rlm_unix/config.h.in -@@ -54,6 +54,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - --- -2.7.4 - diff --git a/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch b/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch index 4eb61ff2..4265f9d0 100644 --- a/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch +++ b/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch @@ -1,7 +1,7 @@ -From 56ef434e454bcc82c162a83d9bcb076d4fc72b7f Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Thu, 9 Jan 2014 14:30:26 +0800 -Subject: [PATCH] Fix libtool detection +From bfe4d7ed72edc9d4ae1a0f0d2dd84367d6214886 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Thu, 22 Aug 2019 10:45:46 +0800 +Subject: [PATCH 1/2] Fix libtool detection Upstream-Status: pending @@ -16,18 +16,19 @@ Also patch autogen.sh so it uses autoreconf, which handles libtoolize better. Signed-off-by: Jesse Zhang <sen.zhang@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- autogen.sh | 5 +---- configure.ac | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh -index 3418673..e42c3d5 100755 +index a1d08a6..959182b 100755 --- a/autogen.sh +++ b/autogen.sh -@@ -5,10 +5,7 @@ parentdir=`dirname $0` - cd $parentdir +@@ -6,10 +6,7 @@ cd $parentdir parentdir=`pwd` + m4include="-I$parentdir -I$parentdir/m4 -Im4" -libtoolize -f -c -#aclocal @@ -38,10 +39,10 @@ index 3418673..e42c3d5 100755 mysubdirs="$mysubdirs `find src/modules/ -name configure -print | sed 's%/configure%%'`" mysubdirs=`echo $mysubdirs` diff --git a/configure.ac b/configure.ac -index e73e4ad..066d3d7 100644 +index a7abf00..65db61e 100644 --- a/configure.ac +++ b/configure.ac -@@ -205,6 +205,42 @@ dnl # See if we have Git. +@@ -220,6 +220,42 @@ dnl # See if we have Git. dnl # AC_CHECK_PROG(GIT, git, yes, no) @@ -85,5 +86,5 @@ index e73e4ad..066d3d7 100644 dnl AC_ARG_WITH(disablemodulefoo, dnl [ --without-rlm_foo Disables module compilation. Module list:] -- -1.8.3 +2.7.4 diff --git a/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd.service b/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd.service index 899c4e49..2d766488 100644 --- a/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd.service +++ b/external/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd.service @@ -4,9 +4,8 @@ After=syslog.target network.target [Service] Type=forking -PIDFile=@STATEDIR@/run/radiusd/radiusd.pid -ExecStartPre=-@BASE_BINDIR@/chown -R radiusd.radiusd @STATEDIR@/run/radiusd -ExecStartPre=-@BASE_BINDIR@/sh -c "if [ ! -f @SYSCONFDIR@/raddb/certs/server.pem ]; then sudo -u radiusd @SYSCONFDIR@/raddb/certs/bootstrap; fi" +PIDFile=/run/radiusd/radiusd.pid +ExecStartPre=-@BASE_BINDIR@/chown -R radiusd.radiusd /run/radiusd ExecStartPre=@SBINDIR@/radiusd -C ExecStart=@SBINDIR@/radiusd -d @SYSCONFDIR@/raddb ExecReload=@SBINDIR@/radiusd -C |