Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openembedded/meta-openembedded
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dd3d2293ffdf2559f8a433f241765a8ab50cd085
Choose a base ref
...
head repository: openembedded/meta-openembedded
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 66ec16850573a7ec69248b81f9904cdfba79b930
Choose a head ref
Loading
Showing with 4,861 additions and 811 deletions.
  1. +42 −0 ...-filesystems/ntfs-3g-ntfsprogs/files/0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch
  2. +1 −0 meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.10.3.bb
  3. +4 −5 meta-gnome/recipes-gnome/libgsf/{libgsf_1.14.49.bb → libgsf_1.14.53.bb}
  4. +2 −32 meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
  5. +47 −0 meta-networking/recipes-connectivity/freeradius/files/0001-Add-autogen.sh.patch
  6. +8 −4 ...adius-enble-user-in-conf.patch → 0002-Enable-and-change-user-and-group-of-freeradius-serve.patch}
  7. +5 −5 ...ius-configure.ac-allow-cross-compilation.patch → 0003-configure.ac-allow-cross-compilation.patch}
  8. +7 −26 ...ectivity/freeradius/files/{freeradius-libtool-detection.patch → 0004-Fix-libtool-detection.patch}
  9. +6 −6 ...eradius-configure.ac-add-option-for-libcap.patch → 0005-configure.ac-add-option-for-libcap.patch}
  10. +29 −28 ...eradius/files/{freeradius-avoid-searching-host-dirs.patch → 0006-Avoid-searching-host-dirs.patch}
  11. +6 −6 ...{freeradius-rlm_python-add-PY_INC_DIR.patch → 0007-rlm_python-add-PY_INC_DIR-in-search-dir.patch}
  12. +12 −12 ...ius/files/{freeradius-libtool-do-not-use-jlibtool.patch → 0008-libtool-do-not-use-jlibtool.patch}
  13. +8 −5 ...adius/files/{freeradius-fix-quoting-for-BUILT_WITH.patch → 0009-Fix-quoting-for-BUILD_WITH.patch}
  14. +3 −3 ...fix-error-for-expansion-of-macro.patch → 0010-fix-error-for-expansion-of-macro-in-thread.h.patch}
  15. +10 −7 ...stead-of-hardcoding-usr-.patch → 0011-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch}
  16. +5 −5 ...-existed-certificate-err.patch → 0012-raddb-certs-Makefile-fix-the-existed-certificate-err.patch}
  17. +9 −8 ...-occasional-verification.patch → 0013-raddb-certs-Makefile-fix-the-occasional-verification.patch}
  18. +7 −7 ...s/{0001-workaround-error-with-autoconf-2.7.patch → 0014-Workaround-error-with-autoconf-2.7.patch}
  19. +8 −2 ...ck-openssl-cmds-in-script-bootstrap.patch → 0015-bootstrap-check-commands-of-openssl-exist.patch}
  20. +3 −3 ...les/{0001-version.c-don-t-print-build-flags.patch → 0016-version.c-don-t-print-build-flags.patch}
  21. +0 −118 meta-networking/recipes-connectivity/freeradius/files/CVE-2022-41860.patch
  22. +0 −53 meta-networking/recipes-connectivity/freeradius/files/CVE-2022-41861.patch
  23. +19 −18 meta-networking/recipes-connectivity/freeradius/{freeradius_3.0.21.bb → freeradius_3.0.27.bb}
  24. +1 −1 meta-networking/recipes-connectivity/mbedtls/{mbedtls_2.28.8.bb → mbedtls_2.28.9.bb}
  25. +0 −22 meta-networking/recipes-connectivity/mosquitto/files/1571.patch
  26. +0 −25 meta-networking/recipes-connectivity/mosquitto/files/2894.patch
  27. +1 −3 meta-networking/recipes-connectivity/mosquitto/{mosquitto_2.0.18.bb → mosquitto_2.0.20.bb}
  28. +26 −0 meta-networking/recipes-daemons/lldpd/files/CVE-2023-41910.patch
  29. +1 −0 meta-networking/recipes-daemons/lldpd/lldpd_1.0.8.bb
  30. +3 −0 meta-networking/recipes-daemons/squid/squid_4.15.bb
  31. +68 −0 meta-networking/recipes-extended/tgt/files/CVE-2024-45751.patch
  32. +1 −0 meta-networking/recipes-extended/tgt/tgt_git.bb
  33. +1 −1 meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb
  34. +43 −0 meta-networking/recipes-protocols/frr/frr/CVE-2024-27913.patch
  35. +130 −0 meta-networking/recipes-protocols/frr/frr/CVE-2024-31948.patch
  36. +69 −0 meta-networking/recipes-protocols/frr/frr/CVE-2024-31950.patch
  37. +111 −0 meta-networking/recipes-protocols/frr/frr/CVE-2024-31951.patch
  38. +84 −0 meta-networking/recipes-protocols/frr/frr/CVE-2024-34088.patch
  39. +69 −0 meta-networking/recipes-protocols/frr/frr/CVE-2024-44070.patch
  40. +6 −0 meta-networking/recipes-protocols/frr/frr_8.2.2.bb
  41. +188 −0 meta-networking/recipes-support/open-vm-tools/open-vm-tools/CVE-2023-34059.patch
  42. +1 −0 meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb
  43. +0 −41 ...orking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch
  44. +7 −4 meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
  45. +0 −49 meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
  46. +6 −9 meta-networking/recipes-support/openipmi/{openipmi_2.0.32.bb → openipmi_2.0.36.bb}
  47. +0 −49 meta-networking/recipes-support/openvpn/openvpn/CVE-2024-24974.patch
  48. +0 −99 meta-networking/recipes-support/openvpn/openvpn/CVE-2024-27459.patch
  49. +0 −119 meta-networking/recipes-support/openvpn/openvpn/CVE-2024-27903.patch
  50. +2 −5 meta-networking/recipes-support/openvpn/{openvpn_2.5.6.bb → openvpn_2.5.11.bb}
  51. +1 −1 meta-oe/classes/gitpkgv.bbclass
  52. +52 −0 ...ipes-connectivity/hostapd/hostapd/0001-SAE-Check-for-invalid-Rejected-Groups-element-length.patch
  53. +38 −0 ...ipes-connectivity/hostapd/hostapd/0003-SAE-Reject-invalid-Rejected-Groups-element-in-the-pa.patch
  54. +198 −0 meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2023-52160.patch
  55. +82 −0 meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2024-3596_00.patch
  56. +165 −0 meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2024-3596_01.patch
  57. +62 −0 meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2024-3596_02.patch
  58. +52 −0 meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2024-3596_04.patch
  59. +51 −0 meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2024-3596_05.patch
  60. +46 −0 meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2024-3596_06.patch
  61. +105 −0 meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2024-3596_07.patch
  62. +47 −0 meta-oe/recipes-connectivity/hostapd/hostapd/CVE-2024-3596_08.patch
  63. +11 −0 meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb
  64. +4 −3 meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch
  65. +1 −1 meta-oe/recipes-dbs/postgresql/{postgresql_14.13.bb → postgresql_14.14.bb}
  66. +12 −0 meta-oe/recipes-dbs/rocksdb/files/run-ptest
  67. +17 −2 meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb
  68. +1 −1 meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service
  69. +1 −1 meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
  70. +1 −1 meta-oe/recipes-devtools/cjson/{cjson_1.7.17.bb → cjson_1.7.18.bb}
  71. +27 −0 ...-devtools/flatbuffers/flatbuffers/0001-C-stl_emulation-span-count_-is-not-const-anymore-722.patch
  72. +3 −1 meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb
  73. +1 −1 meta-oe/recipes-devtools/php/{php_8.1.29.bb → php_8.1.31.bb}
  74. +795 −0 ...ecipes-devtools/protobuf/protobuf/0001-Add-recursion-check-when-parsing-unknown-fields-in-J.patch
  75. +1 −0 meta-oe/recipes-devtools/protobuf/protobuf_3.19.6.bb
  76. +1 −1 meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb
  77. +123 −0 meta-oe/recipes-extended/indent/indent/0001-Fix-a-heap-buffer-underread-in-set_buf_break.patch
  78. +1 −0 meta-oe/recipes-extended/indent/indent_2.2.12.bb
  79. +455 −0 meta-oe/recipes-extended/p7zip/files/0001-Fix-two-buffer-overflow-vulnerabilities.patch
  80. +1 −0 meta-oe/recipes-extended/p7zip/p7zip_16.02.bb
  81. +3 −3 meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
  82. +1 −1 meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
  83. +1 −1 meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb
  84. +45 −0 meta-oe/recipes-support/asio/asio/0001-tests-Remove-blocking_adaptation.cpp.patch
  85. +19 −0 meta-oe/recipes-support/asio/asio/run-ptest
  86. +17 −4 meta-oe/recipes-support/asio/asio_1.20.0.bb
  87. +1 −1 meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb
  88. +1 −1 meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.1.bb
  89. +2 −0 meta-oe/recipes-support/lvm2/libdevmapper_2.03.11.bb
  90. +39 −0 meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch
  91. +1 −0 meta-oe/recipes-support/nspr/nspr_4.29.bb
  92. +65 −0 meta-oe/recipes-support/nss/nss/CVE-2024-6602.patch
  93. +30 −0 meta-oe/recipes-support/nss/nss/CVE-2024-6609.patch
  94. +2 −0 meta-oe/recipes-support/nss/nss_3.74.bb
  95. +1 −1 meta-oe/recipes-support/poco/poco_1.11.2.bb
  96. +96 −0 meta-python/recipes-devtools/python/python3-aiohttp/CVE-2023-49081.patch
  97. +105 −0 meta-python/recipes-devtools/python/python3-aiohttp/CVE-2023-49082.patch
  98. +81 −0 meta-python/recipes-devtools/python/python3-aiohttp/CVE-2024-27306.patch
  99. +522 −0 meta-python/recipes-devtools/python/python3-aiohttp/CVE-2024-30251.patch
  100. +46 −0 meta-python/recipes-devtools/python/python3-aiohttp/CVE-2024-52304.patch
  101. +5 −0 meta-python/recipes-devtools/python/python3-aiohttp_3.8.6.bb
  102. +1 −4 meta-python/recipes-devtools/python/python3-geomet_0.3.0.bb
  103. +2 −0 meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb
  104. +149 −0 meta-python/recipes-devtools/python/python3-werkzeug/CVE-2024-34069-0001.patch
  105. +120 −0 meta-python/recipes-devtools/python/python3-werkzeug/CVE-2024-34069-0002.patch
  106. +87 −0 meta-python/recipes-devtools/python/python3-werkzeug/CVE-2024-49767.patch
  107. +4 −1 meta-python/recipes-devtools/python/python3-werkzeug_2.1.1.bb
  108. +1 −1 meta-webserver/recipes-httpd/apache2/{apache2_2.4.60.bb → apache2_2.4.62.bb}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
From 7b6210c5be46e5120b42c09f910e8f104bf3edf1 Mon Sep 17 00:00:00 2001
From: Erik Larsson <erik@tuxera.com>
Date: Tue, 13 Jun 2023 17:47:15 +0300
Subject: [PATCH] unistr.c: Fix use-after-free in 'ntfs_uppercase_mbs'.

If 'utf8_to_unicode' throws an error due to an invalid UTF-8 sequence,
then 'n' will be less than 0 and the loop will terminate without storing
anything in '*t'. After the loop the uppercase string's allocation is
freed, however after it is freed it is unconditionally accessed through
'*t', which points into the freed allocation, for the purpose of NULL-
terminating the string. This leads to a use-after-free.
Fixed by only NULL-terminating the string when no error has been thrown.

Thanks for Jeffrey Bencteux for reporting this issue:
https://github.com/tuxera/ntfs-3g/issues/84

Upstream-Status: Backport [https://github.com/tuxera/ntfs-3g/commit/75dcdc2cf37478fad6c0e3427403d198b554951d]
CVE: CVE-2023-52890
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>

---
libntfs-3g/unistr.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libntfs-3g/unistr.c b/libntfs-3g/unistr.c
index 5854b3b..db8ddf4 100644
--- a/libntfs-3g/unistr.c
+++ b/libntfs-3g/unistr.c
@@ -1189,8 +1189,9 @@ char *ntfs_uppercase_mbs(const char *low,
free(upp);
upp = (char*)NULL;
errno = EILSEQ;
+ } else {
+ *t = 0;
}
- *t = 0;
}
return (upp);
}
--
2.34.1

Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \

SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \
file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \
file://0001-unistr.c-Fix-use-after-free-in-ntfs_uppercase_mbs.patch \
"
S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}"
SRC_URI[sha256sum] = "f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c"
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
SUMMARY = "GNOME Structured File Library"
LICENSE = "GPL-2.0-only & LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \
file://COPYING.LIB;md5=61464cfe342798eeced82efe9ae55f63"
LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=61464cfe342798eeced82efe9ae55f63"

SECTION = "libs"

DEPENDS= "libxml2 bzip2 glib-2.0 zlib gnome-common-native"
DEPENDS= "libxml2 bzip2 glib-2.0 zlib"

inherit gnomebase gobject-introspection gettext gtk-doc

SRC_URI[archive.sha256sum] = "e9ebe36688f010c9e6e40c8903f3732948deb8aca032578d07d0751bd82cf857"
SRC_URI[archive.sha256sum] = "0eb59a86e0c50f97ac9cfe4d8cc1969f623f2ae8c5296f2414571ff0a9e8bcba"
SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch"

PACKAGECONFIG ??= ""
Original file line number Diff line number Diff line change
@@ -25,67 +25,45 @@ RDEPENDS:packagegroup-meta-multimedia = "\
bluealsa \
caps \
cdparanoia \
dcadec \
dleyna-connector-dbus \
dleyna-core \
dleyna-renderer \
dleyna-server \
dvb-apps \
${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faac fdk-aac mpd", "", d)} \
${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faac mpd", "", d)} \
gerbera \
libao \
libavc1394 \
libdc1394 \
libdvbpsi \
libdvdnav \
libiec61883 \
fluidsynth \
libmusicbrainz \
libmpdclient \
mpc \
ncmpc \
libmpd \
${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "opencore-amr vo-aacenc vo-amrwbenc", "", d)} \
gst-shark \
${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "opencore-amr", "", d)} \
gstd \
rtmpdump \
bigbuckbunny-1080p \
bigbuckbunny-480p \
bigbuckbunny-720p \
tearsofsteel-1080p \
schroedinger \
pipewire \
${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d), "", d)} \
libcamera \
${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libde265 openh264", "", d)} \
vorbis-tools \
libdvbcsa \
libopenmpt \
libuvc \
mimic \
${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "minidlna", "", d)} \
mycroft \
openal-soft \
opusfile \
opus-tools \
libdvdcss \
${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "vlc", "", d), "", d)} \
${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "sox streamripper", "", d)} \
tinyalsa \
tremor \
webrtc-audio-processing \
${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \
"
RDEPENDS:packagegroup-meta-multimedia:remove:libc-musl = "projucer"
RDEPENDS:packagegroup-meta-multimedia:remove:powerpc64le = "openh264"

RDEPENDS:packagegroup-meta-multimedia-connectivity = "\
gssdp \
gupnp-av \
gupnp-dlna \
gupnp-igd \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "gupnp-tools", "", d)} \
gupnp \
libupnp \
${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "rygel", "", d)} \
"
@@ -94,17 +72,9 @@ RDEPENDS:packagegroup-meta-multimedia-dvb = "\
tvheadend \
"

RDEPENDS:packagegroup-meta-multimedia-mkv = "\
libebml \
libmatroska \
"

RDEPENDS:packagegroup-meta-multimedia-support = "\
crossguid \
${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "libmediaart-2.0", "", d)} \
gst-instruments \
libsrtp \
srt \
"
# devel headers/libraries only packages
# libsquish
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
From 3be3b9a1345942d1578ec73efa9b2e3c41bd67c5 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Fri, 21 Jan 2022 13:22:24 +0800
Subject: [PATCH] Add autogen.sh

The autogen.sh has been removed since 3.0.22[1]. But we still need it in
do_configure. Add it back.

[1] https://github.com/FreeRADIUS/freeradius-server/commit/2e9b6227efd19e2b0926541aa26874908e7b7314

Upstream-Status: Inappropriate [embedded specific]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Haixiao Yan <haixiao.yan.cn@windriver.com>
---
autogen.sh | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100755 autogen.sh

diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000000..959182b39e
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+parentdir=`dirname $0`
+
+cd $parentdir
+parentdir=`pwd`
+m4include="-I$parentdir -I$parentdir/m4 -Im4"
+
+autoreconf -Wcross --verbose --install --force
+
+mysubdirs="$mysubdirs `find src/modules/ -name configure -print | sed 's%/configure%%'`"
+mysubdirs=`echo $mysubdirs`
+
+for F in $mysubdirs
+do
+ echo "Configuring in $F..."
+ (cd $F && grep "^AC_CONFIG_HEADER" configure.ac > /dev/null || exit 0; autoheader $m4include)
+ (cd $F && autoconf $m4include)
+done
--
2.25.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
Enable and change user and group of freeradius server to radiusd
From 2a74c10836c0d2d19248ca40d113936f4a56b039 Mon Sep 17 00:00:00 2001
From: "Roy.Li" <rongqing.li@windriver.com>
Date: Sun, 8 Jan 2023 22:47:11 +0800
Subject: [PATCH] Enable and change user and group of freeradius server to
radiusd

Upstream-Status: Inappropriate [configuration]

@@ -9,10 +13,10 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index c62f4ff..0b4a84e 100644
index 154b50d610..4594d6d2d2 100644
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in
@@ -436,8 +436,8 @@ security {
@@ -557,8 +557,8 @@ security {
# member. This can allow for some finer-grained access
# controls.
#
@@ -24,5 +28,5 @@ index c62f4ff..0b4a84e 100644
# Core dumps are a bad thing. This should only be set to
# 'yes' if you're debugging a problem with the server.
--
1.9.1
2.25.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0780b7053fb0d33d721aa70ab2ecd75299e5ba31 Mon Sep 17 00:00:00 2001
From ba1390a80662ff2ab7bfda978cde7df9a871f6ae Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Tue, 24 Jul 2018 15:03:39 +0800
Subject: [PATCH] configure.ac: allow cross-compilation
@@ -7,7 +7,7 @@ The checking OpenSSL library and header version consistency will
always fail in cross compiling, skip the check and give a warning
instead for cross compiling.

Upstream-Status: Inappropriate[embedded specific]
Upstream-Status: Inappropriate [embedded specific]

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
@@ -19,10 +19,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac
index efc9f29..98a97e4 100644
index a0f510cfb3..d2f3eca03e 100644
--- a/src/modules/rlm_krb5/configure.ac
+++ b/src/modules/rlm_krb5/configure.ac
@@ -137,7 +137,8 @@ if test x$with_[]modname != xno; then
@@ -140,7 +140,8 @@ if test x$with_[]modname != xno; then
FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe)
if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then
AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <krb5.h>]], [[return krb5_is_thread_safe() ? 0 : 1]])],
@@ -33,5 +33,5 @@ index efc9f29..98a97e4 100644
else
krb5threadsafe=""
--
2.7.4
2.25.1

Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
From bfe4d7ed72edc9d4ae1a0f0d2dd84367d6214886 Mon Sep 17 00:00:00 2001
From 5ba3d140842268cbbdd983266efecb1fba5bdd59 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
Subject: [PATCH] Fix libtool detection

Use LT_INIT instead of the deprecated AC_PROG_LIBTOOL to detect libtool, so it
can work with our libtoolize and libtool.
@@ -12,37 +10,20 @@ Simplify the detection of ltdl. It will find the ltdl from the sysroot; the
switch --with-system-libltdl is no longer needed. The code is copied from
pulseaudio configure.ac, together with the comment paragraph.

Also patch autogen.sh so it uses autoreconf, which handles libtoolize better.
Upstream-Status: Inappropriate [embedded specific]

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(-)
1 file changed, 36 insertions(+)

diff --git a/autogen.sh b/autogen.sh
index a1d08a6..959182b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,10 +6,7 @@ cd $parentdir
parentdir=`pwd`
m4include="-I$parentdir -I$parentdir/m4 -Im4"

-libtoolize -f -c
-#aclocal
-autoheader
-autoconf
+autoreconf -Wcross --verbose --install --force

mysubdirs="$mysubdirs `find src/modules/ -name configure -print | sed 's%/configure%%'`"
mysubdirs=`echo $mysubdirs`
diff --git a/configure.ac b/configure.ac
index a7abf00..65db61e 100644
index ad8bc8cdda..ef8fced680 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,6 +220,42 @@ dnl # See if we have Git.
@@ -321,6 +321,42 @@ dnl # See if we have Git.
dnl #
AC_CHECK_PROG(GIT, git, yes, no)

@@ -86,5 +67,5 @@ index a7abf00..65db61e 100644
dnl AC_ARG_WITH(disablemodulefoo,
dnl [ --without-rlm_foo Disables module compilation. Module list:]
--
2.7.4
2.25.1

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 98a9eff357959d1113e33a615c2178751d5b2054 Mon Sep 17 00:00:00 2001
From 9548dc5e1a6c835cd4f387ba384d8f3f14c3fc8b 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
Subject: [PATCH] configure.ac: add option for libcap

Upstream-Status: Pending

@@ -12,10 +12,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 65db61e..6486aac 100644
index ef8fced680..263098f7fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -977,6 +977,22 @@ fi
@@ -1161,6 +1161,22 @@ fi
dnl Set by FR_SMART_CHECKLIB
LIBS="${old_LIBS}"

@@ -38,7 +38,7 @@ index 65db61e..6486aac 100644
dnl Check for cap
dnl extra argument: --with-cap-lib-dir=DIR
cap_lib_dir=
@@ -1010,15 +1026,17 @@ AC_ARG_WITH(cap-include-dir,
@@ -1194,15 +1210,17 @@ AC_ARG_WITH(cap-include-dir,
;;
esac])

@@ -66,5 +66,5 @@ index 65db61e..6486aac 100644

dnl #
--
2.7.4
2.25.1

Loading