diff options
123 files changed, 1875 insertions, 514 deletions
diff --git a/meta-filesystems/recipes-utils/binfs/bindfs_1.18.2.bb b/meta-filesystems/recipes-utils/binfs/bindfs_1.18.3.bb index 63e5ac5aa6..1c32f443ca 100644 --- a/meta-filesystems/recipes-utils/binfs/bindfs_1.18.2.bb +++ b/meta-filesystems/recipes-utils/binfs/bindfs_1.18.3.bb | |||
@@ -8,7 +8,7 @@ DEPENDS = "fuse" | |||
8 | RDEPENDS:${PN} = "fuse" | 8 | RDEPENDS:${PN} = "fuse" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/mpartel/bindfs;protocol=https;branch=master;tag=${PV}" | 10 | SRC_URI = "git://github.com/mpartel/bindfs;protocol=https;branch=master;tag=${PV}" |
11 | SRCREV = "755e0895040bbd43a8e2f3efc7f32f366160a408" | 11 | SRCREV = "91fbfa48427c67f59c24e84f3855507531ba972c" |
12 | 12 | ||
13 | 13 | ||
14 | inherit autotools pkgconfig gettext | 14 | inherit autotools pkgconfig gettext |
diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.114.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.116.bb index 172517517e..a0c5576e03 100644 --- a/meta-gnome/recipes-gimp/babl/babl_0.1.114.bb +++ b/meta-gnome/recipes-gimp/babl/babl_0.1.116.bb | |||
@@ -10,7 +10,7 @@ inherit setuptools3 gnomebase gobject-introspection vala | |||
10 | DEPENDS += "lcms" | 10 | DEPENDS += "lcms" |
11 | 11 | ||
12 | SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" | 12 | SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" |
13 | SRC_URI[sha256sum] = "bcbb7786c1e447703db3bc7fa34d62d0d2d117b22f04d8834c7b2d5ded456487" | 13 | SRC_URI[sha256sum] = "50fae069867c7ade1259888ff1e3db85fec86d708252e5385b5a4f39a78ec483" |
14 | 14 | ||
15 | FILES:${PN} += "${libdir}/${BPN}-${@gnome_verdir("${PV}")}" | 15 | FILES:${PN} += "${libdir}/${BPN}-${@gnome_verdir("${PV}")}" |
16 | 16 | ||
diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.62.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.64.bb index 9dd9e31131..1a31f60f94 100644 --- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.62.bb +++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.64.bb | |||
@@ -28,7 +28,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | |||
28 | SHPV = "${@gnome_verdir("${PV}")}" | 28 | SHPV = "${@gnome_verdir("${PV}")}" |
29 | 29 | ||
30 | SRC_URI = "https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz" | 30 | SRC_URI = "https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz" |
31 | SRC_URI[sha256sum] = "5887576371ebf1d9e90797d10e4b9a7f1658228d4827583e79e1db3d94505c6c" | 31 | SRC_URI[sha256sum] = "0de1c9dd22c160d5e4bdfc388d292f03447cca6258541b9a12fed783d0cf7c60" |
32 | 32 | ||
33 | PACKAGECONFIG ??= "gexiv2 libraw librsvg pango poppler sdl2" | 33 | PACKAGECONFIG ??= "gexiv2 libraw librsvg pango poppler sdl2" |
34 | PACKAGECONFIG:class-native = "librsvg" | 34 | PACKAGECONFIG:class-native = "librsvg" |
diff --git a/meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb b/meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb index b04fab67ef..e2ad29eb98 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb | |||
@@ -133,4 +133,5 @@ FILES:${PN} += "${datadir}/metainfo" | |||
133 | 133 | ||
134 | RDEPENDS:${PN} = "mypaint-brushes-1.0 glib-networking python3-pygobject" | 134 | RDEPENDS:${PN} = "mypaint-brushes-1.0 glib-networking python3-pygobject" |
135 | 135 | ||
136 | CVE_STATUS[CVE-2007-3741] = "not-applicable-platform: This only applies for Mandriva Linux" | ||
136 | CVE_STATUS[CVE-2025-8672] = "not-applicable-config: the vulnerability only affects MacOS" | 137 | CVE_STATUS[CVE-2025-8672] = "not-applicable-config: the vulnerability only affects MacOS" |
diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_49.0.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_49.1.bb index 4b981125e4..b23e8bb8f3 100644 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_49.0.bb +++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_49.1.bb | |||
@@ -23,7 +23,7 @@ inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check get | |||
23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
24 | REQUIRED_DISTRO_FEATURES = "polkit" | 24 | REQUIRED_DISTRO_FEATURES = "polkit" |
25 | 25 | ||
26 | SRC_URI[archive.sha256sum] = "dcc844dd70e4a077f066524dbd14f9cfe04b09831d70b7d69a51816723cd4aa0" | 26 | SRC_URI[archive.sha256sum] = "915b6a321ada12eba7bf578c20c9fe5e41f55d532847cbd124bbddaaec11d70f" |
27 | 27 | ||
28 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | 28 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
29 | PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" | 29 | PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" |
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.8.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.9.bb index 8687244f3e..683d5f3ce0 100644 --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.8.bb +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.4.9.bb | |||
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS = "dbus ncurses" | 13 | DEPENDS = "dbus ncurses" |
14 | 14 | ||
15 | SRCREV = "8b43ed5c910e892d53de5a96aa01e9280a5b6650" | 15 | SRCREV = "fd60e04525f3a04d90bf50085222e0cc9139b4a4" |
16 | BRANCH = "${@oe.utils.trim_version('${PV}', 2)}" | 16 | BRANCH = "${@oe.utils.trim_version('${PV}', 2)}" |
17 | SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=${BRANCH};protocol=https;tag=${PV}" | 17 | SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=${BRANCH};protocol=https;tag=${PV}" |
18 | 18 | ||
diff --git a/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing-2/60.patch b/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing-2/60.patch new file mode 100644 index 0000000000..5a4c154060 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing-2/60.patch | |||
@@ -0,0 +1,619 @@ | |||
1 | From c8896801dfbfe03b56f85c1533abc077ff74a533 Mon Sep 17 00:00:00 2001 | ||
2 | From: Reilly Brogan <reilly@reillybrogan.com> | ||
3 | Date: Tue, 19 Aug 2025 14:47:03 -0500 | ||
4 | Subject: [PATCH 1/2] Fix build with abseil-cpp 202508 | ||
5 | |||
6 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/merge_requests/60] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | webrtc/api/audio/audio_processing.h | 12 +++++++++ | ||
10 | webrtc/api/make_ref_counted.h | 13 ++++++++++ | ||
11 | webrtc/api/scoped_refptr.h | 15 +++++++++++ | ||
12 | .../aec_dump/aec_dump_factory.h | 15 +++++++++++ | ||
13 | .../aec_dump/null_aec_dump_factory.cc | 25 +++++++++++++++++++ | ||
14 | .../audio_processing/audio_processing_impl.cc | 9 +++++++ | ||
15 | .../audio_processing/audio_processing_impl.h | 9 +++++++ | ||
16 | 7 files changed, 98 insertions(+) | ||
17 | |||
18 | diff --git a/webrtc/api/audio/audio_processing.h b/webrtc/api/audio/audio_processing.h | ||
19 | index dca75f2..4580ba9 100644 | ||
20 | --- a/webrtc/api/audio/audio_processing.h | ||
21 | +++ b/webrtc/api/audio/audio_processing.h | ||
22 | @@ -28,6 +28,7 @@ | ||
23 | #include <string> | ||
24 | #include <utility> | ||
25 | |||
26 | +#include "absl/base/config.h" | ||
27 | #include "absl/base/nullability.h" | ||
28 | #include "absl/strings/string_view.h" | ||
29 | #include "api/array_view.h" | ||
30 | @@ -632,6 +633,7 @@ class RTC_EXPORT AudioProcessing : public RefCountInterface { | ||
31 | // return value of true indicates that the file has been | ||
32 | // sucessfully opened, while a value of false indicates that | ||
33 | // opening the file failed. | ||
34 | +#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
35 | virtual bool CreateAndAttachAecDump( | ||
36 | absl::string_view file_name, | ||
37 | int64_t max_log_size_bytes, | ||
38 | @@ -640,6 +642,16 @@ class RTC_EXPORT AudioProcessing : public RefCountInterface { | ||
39 | absl::Nonnull<FILE*> handle, | ||
40 | int64_t max_log_size_bytes, | ||
41 | absl::Nonnull<TaskQueueBase*> worker_queue) = 0; | ||
42 | +#else | ||
43 | + virtual bool CreateAndAttachAecDump(absl::string_view file_name, | ||
44 | + int64_t max_log_size_bytes, | ||
45 | + TaskQueueBase* absl_nonnull | ||
46 | + worker_queue) = 0; | ||
47 | + virtual bool CreateAndAttachAecDump(FILE* absl_nonnull handle, | ||
48 | + int64_t max_log_size_bytes, | ||
49 | + TaskQueueBase* absl_nonnull | ||
50 | + worker_queue) = 0; | ||
51 | +#endif | ||
52 | |||
53 | // TODO(webrtc:5298) Deprecated variant. | ||
54 | // Attaches provided webrtc::AecDump for recording debugging | ||
55 | diff --git a/webrtc/api/make_ref_counted.h b/webrtc/api/make_ref_counted.h | ||
56 | index b5f4e99..080023a 100644 | ||
57 | --- a/webrtc/api/make_ref_counted.h | ||
58 | +++ b/webrtc/api/make_ref_counted.h | ||
59 | @@ -13,6 +13,7 @@ | ||
60 | #include <type_traits> | ||
61 | #include <utility> | ||
62 | |||
63 | +#include "absl/base/config.h" | ||
64 | #include "absl/base/nullability.h" | ||
65 | #include "api/ref_count.h" | ||
66 | #include "api/scoped_refptr.h" | ||
67 | @@ -86,7 +87,11 @@ template < | ||
68 | typename std::enable_if<std::is_convertible_v<T*, RefCountInterface*> && | ||
69 | std::is_abstract_v<T>, | ||
70 | T>::type* = nullptr> | ||
71 | +#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
72 | absl::Nonnull<scoped_refptr<T>> make_ref_counted(Args&&... args) { | ||
73 | +#else | ||
74 | +absl_nonnull scoped_refptr<T> make_ref_counted(Args&&... args) { | ||
75 | +#endif | ||
76 | return scoped_refptr<T>(new RefCountedObject<T>(std::forward<Args>(args)...)); | ||
77 | } | ||
78 | |||
79 | @@ -99,7 +104,11 @@ template < | ||
80 | !std::is_convertible_v<T*, RefCountInterface*> && | ||
81 | webrtc_make_ref_counted_internal::HasAddRefAndRelease<T>::value, | ||
82 | T>::type* = nullptr> | ||
83 | +#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
84 | absl::Nonnull<scoped_refptr<T>> make_ref_counted(Args&&... args) { | ||
85 | +#else | ||
86 | +absl_nonnull scoped_refptr<T> make_ref_counted(Args&&... args) { | ||
87 | +#endif | ||
88 | return scoped_refptr<T>(new T(std::forward<Args>(args)...)); | ||
89 | } | ||
90 | |||
91 | @@ -113,7 +122,11 @@ template < | ||
92 | !webrtc_make_ref_counted_internal::HasAddRefAndRelease<T>::value, | ||
93 | |||
94 | T>::type* = nullptr> | ||
95 | +#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
96 | absl::Nonnull<scoped_refptr<FinalRefCountedObject<T>>> make_ref_counted( | ||
97 | +#else | ||
98 | +absl_nonnull scoped_refptr<FinalRefCountedObject<T>> make_ref_counted( | ||
99 | +#endif | ||
100 | Args&&... args) { | ||
101 | return scoped_refptr<FinalRefCountedObject<T>>( | ||
102 | new FinalRefCountedObject<T>(std::forward<Args>(args)...)); | ||
103 | diff --git a/webrtc/api/scoped_refptr.h b/webrtc/api/scoped_refptr.h | ||
104 | index c6fb560..8c441ff 100644 | ||
105 | --- a/webrtc/api/scoped_refptr.h | ||
106 | +++ b/webrtc/api/scoped_refptr.h | ||
107 | @@ -66,6 +66,7 @@ | ||
108 | #include <cstddef> | ||
109 | #include <utility> | ||
110 | |||
111 | +#include "absl/base/config.h" | ||
112 | #include "absl/base/nullability.h" | ||
113 | |||
114 | namespace webrtc { | ||
115 | @@ -73,13 +74,19 @@ namespace webrtc { | ||
116 | template <class T> | ||
117 | class ABSL_NULLABILITY_COMPATIBLE scoped_refptr { | ||
118 | public: | ||
119 | +#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
120 | using absl_nullability_compatible = void; | ||
121 | +#endif | ||
122 | using element_type = T; | ||
123 | |||
124 | scoped_refptr() : ptr_(nullptr) {} | ||
125 | scoped_refptr(std::nullptr_t) : ptr_(nullptr) {} // NOLINT(runtime/explicit) | ||
126 | |||
127 | +#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
128 | explicit scoped_refptr(absl::Nullable<T*> p) : ptr_(p) { | ||
129 | +#else | ||
130 | + explicit scoped_refptr(T* absl_nullable p) : ptr_(p) { | ||
131 | +#endif | ||
132 | if (ptr_) | ||
133 | ptr_->AddRef(); | ||
134 | } | ||
135 | @@ -122,7 +129,11 @@ class ABSL_NULLABILITY_COMPATIBLE scoped_refptr { | ||
136 | return retVal; | ||
137 | } | ||
138 | |||
139 | +#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
140 | scoped_refptr<T>& operator=(absl::Nullable<T*> p) { | ||
141 | +#else | ||
142 | + scoped_refptr<T>& operator=(T* absl_nullable p) { | ||
143 | +#endif | ||
144 | // AddRef first so that self assignment should work | ||
145 | if (p) | ||
146 | p->AddRef(); | ||
147 | @@ -152,7 +163,11 @@ class ABSL_NULLABILITY_COMPATIBLE scoped_refptr { | ||
148 | return *this; | ||
149 | } | ||
150 | |||
151 | +#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
152 | void swap(absl::Nonnull<T**> pp) noexcept { | ||
153 | +#else | ||
154 | + void swap(T** absl_nonnull pp) noexcept { | ||
155 | +#endif | ||
156 | T* p = ptr_; | ||
157 | ptr_ = *pp; | ||
158 | *pp = p; | ||
159 | diff --git a/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h b/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h | ||
160 | index 0d258a9..14d8b39 100644 | ||
161 | --- a/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h | ||
162 | +++ b/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h | ||
163 | @@ -29,6 +29,7 @@ class RTC_EXPORT AecDumpFactory { | ||
164 | // The AecDump takes responsibility for `handle` and closes it in the | ||
165 | // destructor. A non-null return value indicates that the file has been | ||
166 | // sucessfully opened. | ||
167 | +#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
168 | static absl::Nullable<std::unique_ptr<AecDump>> Create( | ||
169 | FileWrapper file, | ||
170 | int64_t max_log_size_bytes, | ||
171 | @@ -41,6 +42,20 @@ class RTC_EXPORT AecDumpFactory { | ||
172 | absl::Nonnull<FILE*> handle, | ||
173 | int64_t max_log_size_bytes, | ||
174 | absl::Nonnull<TaskQueueBase*> worker_queue); | ||
175 | +#else | ||
176 | + static absl_nullable std::unique_ptr<AecDump> Create( | ||
177 | + FileWrapper file, | ||
178 | + int64_t max_log_size_bytes, | ||
179 | + TaskQueueBase* absl_nonnull worker_queue); | ||
180 | + static absl_nullable std::unique_ptr<AecDump> Create( | ||
181 | + absl::string_view file_name, | ||
182 | + int64_t max_log_size_bytes, | ||
183 | + TaskQueueBase* absl_nonnull worker_queue); | ||
184 | + static absl_nullable std::unique_ptr<AecDump> Create( | ||
185 | + FILE* absl_nonnull handle, | ||
186 | + int64_t max_log_size_bytes, | ||
187 | + TaskQueueBase* absl_nonnull worker_queue); | ||
188 | +#endif | ||
189 | }; | ||
190 | |||
191 | } // namespace webrtc | ||
192 | diff --git a/webrtc/modules/audio_processing/aec_dump/null_aec_dump_factory.cc b/webrtc/modules/audio_processing/aec_dump/null_aec_dump_factory.cc | ||
193 | index 63929af..658bcee 100644 | ||
194 | --- a/webrtc/modules/audio_processing/aec_dump/null_aec_dump_factory.cc | ||
195 | +++ b/webrtc/modules/audio_processing/aec_dump/null_aec_dump_factory.cc | ||
196 | @@ -16,6 +16,7 @@ | ||
197 | |||
198 | namespace webrtc { | ||
199 | |||
200 | +#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
201 | absl::Nullable<std::unique_ptr<AecDump>> AecDumpFactory::Create( | ||
202 | FileWrapper file, | ||
203 | int64_t max_log_size_bytes, | ||
204 | @@ -37,3 +38,27 @@ absl::Nullable<std::unique_ptr<AecDump>> AecDumpFactory::Create( | ||
205 | return nullptr; | ||
206 | } | ||
207 | } // namespace webrtc | ||
208 | +#else | ||
209 | +absl_nullable std::unique_ptr<AecDump> AecDumpFactory::Create( | ||
210 | + FileWrapper file, | ||
211 | + int64_t max_log_size_bytes, | ||
212 | + TaskQueueBase* absl_nonnull worker_queue) { | ||
213 | + return nullptr; | ||
214 | +} | ||
215 | + | ||
216 | +absl_nullable std::unique_ptr<AecDump> AecDumpFactory::Create( | ||
217 | + absl::string_view file_name, | ||
218 | + int64_t max_log_size_bytes, | ||
219 | + TaskQueueBase* absl_nonnull worker_queue) { | ||
220 | + return nullptr; | ||
221 | +} | ||
222 | + | ||
223 | +absl_nullable std::unique_ptr<AecDump> AecDumpFactory::Create( | ||
224 | + FILE* absl_nonnull handle, | ||
225 | + int64_t max_log_size_bytes, | ||
226 | + TaskQueueBase* absl_nonnull worker_queue) { | ||
227 | + return nullptr; | ||
228 | +} | ||
229 | +} // namespace webrtc | ||
230 | + | ||
231 | +#endif | ||
232 | diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc | ||
233 | index a1cba51..1dfe26d 100644 | ||
234 | --- a/webrtc/modules/audio_processing/audio_processing_impl.cc | ||
235 | +++ b/webrtc/modules/audio_processing/audio_processing_impl.cc | ||
236 | @@ -19,6 +19,7 @@ | ||
237 | #include <type_traits> | ||
238 | #include <utility> | ||
239 | |||
240 | +#include "absl/base/config.h" | ||
241 | #include "absl/base/nullability.h" | ||
242 | #include "absl/strings/match.h" | ||
243 | #include "absl/strings/string_view.h" | ||
244 | @@ -1787,7 +1788,11 @@ void AudioProcessingImpl::UpdateRecommendedInputVolumeLocked() { | ||
245 | bool AudioProcessingImpl::CreateAndAttachAecDump( | ||
246 | absl::string_view file_name, | ||
247 | int64_t max_log_size_bytes, | ||
248 | +#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
249 | absl::Nonnull<TaskQueueBase*> worker_queue) { | ||
250 | +#else | ||
251 | + TaskQueueBase* absl_nonnull worker_queue) { | ||
252 | +#endif | ||
253 | std::unique_ptr<AecDump> aec_dump = | ||
254 | AecDumpFactory::Create(file_name, max_log_size_bytes, worker_queue); | ||
255 | if (!aec_dump) { | ||
256 | @@ -1801,7 +1806,11 @@ bool AudioProcessingImpl::CreateAndAttachAecDump( | ||
257 | bool AudioProcessingImpl::CreateAndAttachAecDump( | ||
258 | FILE* handle, | ||
259 | int64_t max_log_size_bytes, | ||
260 | +#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
261 | absl::Nonnull<TaskQueueBase*> worker_queue) { | ||
262 | +#else | ||
263 | + TaskQueueBase* absl_nonnull worker_queue) { | ||
264 | +#endif | ||
265 | std::unique_ptr<AecDump> aec_dump = | ||
266 | AecDumpFactory::Create(handle, max_log_size_bytes, worker_queue); | ||
267 | if (!aec_dump) { | ||
268 | diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h | ||
269 | index ecdc055..51a2bfb 100644 | ||
270 | --- a/webrtc/modules/audio_processing/audio_processing_impl.h | ||
271 | +++ b/webrtc/modules/audio_processing/audio_processing_impl.h | ||
272 | @@ -20,6 +20,7 @@ | ||
273 | #include <string> | ||
274 | #include <vector> | ||
275 | |||
276 | +#include "absl/base/config.h" | ||
277 | #include "absl/base/nullability.h" | ||
278 | #include "absl/strings/string_view.h" | ||
279 | #include "api/array_view.h" | ||
280 | @@ -74,11 +75,19 @@ class AudioProcessingImpl : public AudioProcessing { | ||
281 | bool CreateAndAttachAecDump( | ||
282 | absl::string_view file_name, | ||
283 | int64_t max_log_size_bytes, | ||
284 | +#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
285 | absl::Nonnull<TaskQueueBase*> worker_queue) override; | ||
286 | +#else | ||
287 | + TaskQueueBase* absl_nonnull worker_queue) override; | ||
288 | +#endif | ||
289 | bool CreateAndAttachAecDump( | ||
290 | FILE* handle, | ||
291 | int64_t max_log_size_bytes, | ||
292 | +#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
293 | absl::Nonnull<TaskQueueBase*> worker_queue) override; | ||
294 | +#else | ||
295 | + TaskQueueBase* absl_nonnull worker_queue) override; | ||
296 | +#endif | ||
297 | // TODO(webrtc:5298) Deprecated variant. | ||
298 | void AttachAecDump(std::unique_ptr<AecDump> aec_dump) override; | ||
299 | void DetachAecDump() override; | ||
300 | -- | ||
301 | GitLab | ||
302 | |||
303 | |||
304 | From bc838790eeb6066d30f019c2a3516bd2b824a5c8 Mon Sep 17 00:00:00 2001 | ||
305 | From: Reilly Brogan <reilly@reillybrogan.com> | ||
306 | Date: Tue, 19 Aug 2025 15:25:51 -0500 | ||
307 | Subject: [PATCH 2/2] patches: Track abseil-cpp 202508 support patch | ||
308 | |||
309 | --- | ||
310 | ...001-Fix-build-with-abseil-cpp-202508.patch | 297 ++++++++++++++++++ | ||
311 | 1 file changed, 297 insertions(+) | ||
312 | create mode 100644 patches/0001-Fix-build-with-abseil-cpp-202508.patch | ||
313 | |||
314 | diff --git a/patches/0001-Fix-build-with-abseil-cpp-202508.patch b/patches/0001-Fix-build-with-abseil-cpp-202508.patch | ||
315 | new file mode 100644 | ||
316 | index 0000000..06c3794 | ||
317 | --- /dev/null | ||
318 | +++ b/patches/0001-Fix-build-with-abseil-cpp-202508.patch | ||
319 | @@ -0,0 +1,297 @@ | ||
320 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
321 | +From: Reilly Brogan <reilly@reillybrogan.com> | ||
322 | +Date: Tue, 19 Aug 2025 14:47:03 -0500 | ||
323 | +Subject: [PATCH] Fix build with abseil-cpp 202508 | ||
324 | + | ||
325 | +--- | ||
326 | + webrtc/api/audio/audio_processing.h | 12 +++++++++ | ||
327 | + webrtc/api/make_ref_counted.h | 13 ++++++++++ | ||
328 | + webrtc/api/scoped_refptr.h | 15 +++++++++++ | ||
329 | + .../aec_dump/aec_dump_factory.h | 15 +++++++++++ | ||
330 | + .../aec_dump/null_aec_dump_factory.cc | 25 +++++++++++++++++++ | ||
331 | + .../audio_processing/audio_processing_impl.cc | 9 +++++++ | ||
332 | + .../audio_processing/audio_processing_impl.h | 9 +++++++ | ||
333 | + 7 files changed, 98 insertions(+) | ||
334 | + | ||
335 | +diff --git a/webrtc/api/audio/audio_processing.h b/webrtc/api/audio/audio_processing.h | ||
336 | +index dca75f2..4580ba9 100644 | ||
337 | +--- a/webrtc/api/audio/audio_processing.h | ||
338 | ++++ b/webrtc/api/audio/audio_processing.h | ||
339 | +@@ -28,6 +28,7 @@ | ||
340 | + #include <string> | ||
341 | + #include <utility> | ||
342 | + | ||
343 | ++#include "absl/base/config.h" | ||
344 | + #include "absl/base/nullability.h" | ||
345 | + #include "absl/strings/string_view.h" | ||
346 | + #include "api/array_view.h" | ||
347 | +@@ -632,6 +633,7 @@ class RTC_EXPORT AudioProcessing : public RefCountInterface { | ||
348 | + // return value of true indicates that the file has been | ||
349 | + // sucessfully opened, while a value of false indicates that | ||
350 | + // opening the file failed. | ||
351 | ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
352 | + virtual bool CreateAndAttachAecDump( | ||
353 | + absl::string_view file_name, | ||
354 | + int64_t max_log_size_bytes, | ||
355 | +@@ -640,6 +642,16 @@ class RTC_EXPORT AudioProcessing : public RefCountInterface { | ||
356 | + absl::Nonnull<FILE*> handle, | ||
357 | + int64_t max_log_size_bytes, | ||
358 | + absl::Nonnull<TaskQueueBase*> worker_queue) = 0; | ||
359 | ++#else | ||
360 | ++ virtual bool CreateAndAttachAecDump(absl::string_view file_name, | ||
361 | ++ int64_t max_log_size_bytes, | ||
362 | ++ TaskQueueBase* absl_nonnull | ||
363 | ++ worker_queue) = 0; | ||
364 | ++ virtual bool CreateAndAttachAecDump(FILE* absl_nonnull handle, | ||
365 | ++ int64_t max_log_size_bytes, | ||
366 | ++ TaskQueueBase* absl_nonnull | ||
367 | ++ worker_queue) = 0; | ||
368 | ++#endif | ||
369 | + | ||
370 | + // TODO(webrtc:5298) Deprecated variant. | ||
371 | + // Attaches provided webrtc::AecDump for recording debugging | ||
372 | +diff --git a/webrtc/api/make_ref_counted.h b/webrtc/api/make_ref_counted.h | ||
373 | +index b5f4e99..080023a 100644 | ||
374 | +--- a/webrtc/api/make_ref_counted.h | ||
375 | ++++ b/webrtc/api/make_ref_counted.h | ||
376 | +@@ -13,6 +13,7 @@ | ||
377 | + #include <type_traits> | ||
378 | + #include <utility> | ||
379 | + | ||
380 | ++#include "absl/base/config.h" | ||
381 | + #include "absl/base/nullability.h" | ||
382 | + #include "api/ref_count.h" | ||
383 | + #include "api/scoped_refptr.h" | ||
384 | +@@ -86,7 +87,11 @@ template < | ||
385 | + typename std::enable_if<std::is_convertible_v<T*, RefCountInterface*> && | ||
386 | + std::is_abstract_v<T>, | ||
387 | + T>::type* = nullptr> | ||
388 | ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
389 | + absl::Nonnull<scoped_refptr<T>> make_ref_counted(Args&&... args) { | ||
390 | ++#else | ||
391 | ++absl_nonnull scoped_refptr<T> make_ref_counted(Args&&... args) { | ||
392 | ++#endif | ||
393 | + return scoped_refptr<T>(new RefCountedObject<T>(std::forward<Args>(args)...)); | ||
394 | + } | ||
395 | + | ||
396 | +@@ -99,7 +104,11 @@ template < | ||
397 | + !std::is_convertible_v<T*, RefCountInterface*> && | ||
398 | + webrtc_make_ref_counted_internal::HasAddRefAndRelease<T>::value, | ||
399 | + T>::type* = nullptr> | ||
400 | ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
401 | + absl::Nonnull<scoped_refptr<T>> make_ref_counted(Args&&... args) { | ||
402 | ++#else | ||
403 | ++absl_nonnull scoped_refptr<T> make_ref_counted(Args&&... args) { | ||
404 | ++#endif | ||
405 | + return scoped_refptr<T>(new T(std::forward<Args>(args)...)); | ||
406 | + } | ||
407 | + | ||
408 | +@@ -113,7 +122,11 @@ template < | ||
409 | + !webrtc_make_ref_counted_internal::HasAddRefAndRelease<T>::value, | ||
410 | + | ||
411 | + T>::type* = nullptr> | ||
412 | ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
413 | + absl::Nonnull<scoped_refptr<FinalRefCountedObject<T>>> make_ref_counted( | ||
414 | ++#else | ||
415 | ++absl_nonnull scoped_refptr<FinalRefCountedObject<T>> make_ref_counted( | ||
416 | ++#endif | ||
417 | + Args&&... args) { | ||
418 | + return scoped_refptr<FinalRefCountedObject<T>>( | ||
419 | + new FinalRefCountedObject<T>(std::forward<Args>(args)...)); | ||
420 | +diff --git a/webrtc/api/scoped_refptr.h b/webrtc/api/scoped_refptr.h | ||
421 | +index c6fb560..8c441ff 100644 | ||
422 | +--- a/webrtc/api/scoped_refptr.h | ||
423 | ++++ b/webrtc/api/scoped_refptr.h | ||
424 | +@@ -66,6 +66,7 @@ | ||
425 | + #include <cstddef> | ||
426 | + #include <utility> | ||
427 | + | ||
428 | ++#include "absl/base/config.h" | ||
429 | + #include "absl/base/nullability.h" | ||
430 | + | ||
431 | + namespace webrtc { | ||
432 | +@@ -73,13 +74,19 @@ namespace webrtc { | ||
433 | + template <class T> | ||
434 | + class ABSL_NULLABILITY_COMPATIBLE scoped_refptr { | ||
435 | + public: | ||
436 | ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
437 | + using absl_nullability_compatible = void; | ||
438 | ++#endif | ||
439 | + using element_type = T; | ||
440 | + | ||
441 | + scoped_refptr() : ptr_(nullptr) {} | ||
442 | + scoped_refptr(std::nullptr_t) : ptr_(nullptr) {} // NOLINT(runtime/explicit) | ||
443 | + | ||
444 | ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
445 | + explicit scoped_refptr(absl::Nullable<T*> p) : ptr_(p) { | ||
446 | ++#else | ||
447 | ++ explicit scoped_refptr(T* absl_nullable p) : ptr_(p) { | ||
448 | ++#endif | ||
449 | + if (ptr_) | ||
450 | + ptr_->AddRef(); | ||
451 | + } | ||
452 | +@@ -122,7 +129,11 @@ class ABSL_NULLABILITY_COMPATIBLE scoped_refptr { | ||
453 | + return retVal; | ||
454 | + } | ||
455 | + | ||
456 | ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
457 | + scoped_refptr<T>& operator=(absl::Nullable<T*> p) { | ||
458 | ++#else | ||
459 | ++ scoped_refptr<T>& operator=(T* absl_nullable p) { | ||
460 | ++#endif | ||
461 | + // AddRef first so that self assignment should work | ||
462 | + if (p) | ||
463 | + p->AddRef(); | ||
464 | +@@ -152,7 +163,11 @@ class ABSL_NULLABILITY_COMPATIBLE scoped_refptr { | ||
465 | + return *this; | ||
466 | + } | ||
467 | + | ||
468 | ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
469 | + void swap(absl::Nonnull<T**> pp) noexcept { | ||
470 | ++#else | ||
471 | ++ void swap(T** absl_nonnull pp) noexcept { | ||
472 | ++#endif | ||
473 | + T* p = ptr_; | ||
474 | + ptr_ = *pp; | ||
475 | + *pp = p; | ||
476 | +diff --git a/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h b/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h | ||
477 | +index 0d258a9..14d8b39 100644 | ||
478 | +--- a/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h | ||
479 | ++++ b/webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h | ||
480 | +@@ -29,6 +29,7 @@ class RTC_EXPORT AecDumpFactory { | ||
481 | + // The AecDump takes responsibility for `handle` and closes it in the | ||
482 | + // destructor. A non-null return value indicates that the file has been | ||
483 | + // sucessfully opened. | ||
484 | ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
485 | + static absl::Nullable<std::unique_ptr<AecDump>> Create( | ||
486 | + FileWrapper file, | ||
487 | + int64_t max_log_size_bytes, | ||
488 | +@@ -41,6 +42,20 @@ class RTC_EXPORT AecDumpFactory { | ||
489 | + absl::Nonnull<FILE*> handle, | ||
490 | + int64_t max_log_size_bytes, | ||
491 | + absl::Nonnull<TaskQueueBase*> worker_queue); | ||
492 | ++#else | ||
493 | ++ static absl_nullable std::unique_ptr<AecDump> Create( | ||
494 | ++ FileWrapper file, | ||
495 | ++ int64_t max_log_size_bytes, | ||
496 | ++ TaskQueueBase* absl_nonnull worker_queue); | ||
497 | ++ static absl_nullable std::unique_ptr<AecDump> Create( | ||
498 | ++ absl::string_view file_name, | ||
499 | ++ int64_t max_log_size_bytes, | ||
500 | ++ TaskQueueBase* absl_nonnull worker_queue); | ||
501 | ++ static absl_nullable std::unique_ptr<AecDump> Create( | ||
502 | ++ FILE* absl_nonnull handle, | ||
503 | ++ int64_t max_log_size_bytes, | ||
504 | ++ TaskQueueBase* absl_nonnull worker_queue); | ||
505 | ++#endif | ||
506 | + }; | ||
507 | + | ||
508 | + } // namespace webrtc | ||
509 | +diff --git a/webrtc/modules/audio_processing/aec_dump/null_aec_dump_factory.cc b/webrtc/modules/audio_processing/aec_dump/null_aec_dump_factory.cc | ||
510 | +index 63929af..658bcee 100644 | ||
511 | +--- a/webrtc/modules/audio_processing/aec_dump/null_aec_dump_factory.cc | ||
512 | ++++ b/webrtc/modules/audio_processing/aec_dump/null_aec_dump_factory.cc | ||
513 | +@@ -16,6 +16,7 @@ | ||
514 | + | ||
515 | + namespace webrtc { | ||
516 | + | ||
517 | ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
518 | + absl::Nullable<std::unique_ptr<AecDump>> AecDumpFactory::Create( | ||
519 | + FileWrapper file, | ||
520 | + int64_t max_log_size_bytes, | ||
521 | +@@ -37,3 +38,27 @@ absl::Nullable<std::unique_ptr<AecDump>> AecDumpFactory::Create( | ||
522 | + return nullptr; | ||
523 | + } | ||
524 | + } // namespace webrtc | ||
525 | ++#else | ||
526 | ++absl_nullable std::unique_ptr<AecDump> AecDumpFactory::Create( | ||
527 | ++ FileWrapper file, | ||
528 | ++ int64_t max_log_size_bytes, | ||
529 | ++ TaskQueueBase* absl_nonnull worker_queue) { | ||
530 | ++ return nullptr; | ||
531 | ++} | ||
532 | ++ | ||
533 | ++absl_nullable std::unique_ptr<AecDump> AecDumpFactory::Create( | ||
534 | ++ absl::string_view file_name, | ||
535 | ++ int64_t max_log_size_bytes, | ||
536 | ++ TaskQueueBase* absl_nonnull worker_queue) { | ||
537 | ++ return nullptr; | ||
538 | ++} | ||
539 | ++ | ||
540 | ++absl_nullable std::unique_ptr<AecDump> AecDumpFactory::Create( | ||
541 | ++ FILE* absl_nonnull handle, | ||
542 | ++ int64_t max_log_size_bytes, | ||
543 | ++ TaskQueueBase* absl_nonnull worker_queue) { | ||
544 | ++ return nullptr; | ||
545 | ++} | ||
546 | ++} // namespace webrtc | ||
547 | ++ | ||
548 | ++#endif | ||
549 | +diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc | ||
550 | +index a1cba51..1dfe26d 100644 | ||
551 | +--- a/webrtc/modules/audio_processing/audio_processing_impl.cc | ||
552 | ++++ b/webrtc/modules/audio_processing/audio_processing_impl.cc | ||
553 | +@@ -19,6 +19,7 @@ | ||
554 | + #include <type_traits> | ||
555 | + #include <utility> | ||
556 | + | ||
557 | ++#include "absl/base/config.h" | ||
558 | + #include "absl/base/nullability.h" | ||
559 | + #include "absl/strings/match.h" | ||
560 | + #include "absl/strings/string_view.h" | ||
561 | +@@ -1787,7 +1788,11 @@ void AudioProcessingImpl::UpdateRecommendedInputVolumeLocked() { | ||
562 | + bool AudioProcessingImpl::CreateAndAttachAecDump( | ||
563 | + absl::string_view file_name, | ||
564 | + int64_t max_log_size_bytes, | ||
565 | ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
566 | + absl::Nonnull<TaskQueueBase*> worker_queue) { | ||
567 | ++#else | ||
568 | ++ TaskQueueBase* absl_nonnull worker_queue) { | ||
569 | ++#endif | ||
570 | + std::unique_ptr<AecDump> aec_dump = | ||
571 | + AecDumpFactory::Create(file_name, max_log_size_bytes, worker_queue); | ||
572 | + if (!aec_dump) { | ||
573 | +@@ -1801,7 +1806,11 @@ bool AudioProcessingImpl::CreateAndAttachAecDump( | ||
574 | + bool AudioProcessingImpl::CreateAndAttachAecDump( | ||
575 | + FILE* handle, | ||
576 | + int64_t max_log_size_bytes, | ||
577 | ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
578 | + absl::Nonnull<TaskQueueBase*> worker_queue) { | ||
579 | ++#else | ||
580 | ++ TaskQueueBase* absl_nonnull worker_queue) { | ||
581 | ++#endif | ||
582 | + std::unique_ptr<AecDump> aec_dump = | ||
583 | + AecDumpFactory::Create(handle, max_log_size_bytes, worker_queue); | ||
584 | + if (!aec_dump) { | ||
585 | +diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h | ||
586 | +index ecdc055..51a2bfb 100644 | ||
587 | +--- a/webrtc/modules/audio_processing/audio_processing_impl.h | ||
588 | ++++ b/webrtc/modules/audio_processing/audio_processing_impl.h | ||
589 | +@@ -20,6 +20,7 @@ | ||
590 | + #include <string> | ||
591 | + #include <vector> | ||
592 | + | ||
593 | ++#include "absl/base/config.h" | ||
594 | + #include "absl/base/nullability.h" | ||
595 | + #include "absl/strings/string_view.h" | ||
596 | + #include "api/array_view.h" | ||
597 | +@@ -74,11 +75,19 @@ class AudioProcessingImpl : public AudioProcessing { | ||
598 | + bool CreateAndAttachAecDump( | ||
599 | + absl::string_view file_name, | ||
600 | + int64_t max_log_size_bytes, | ||
601 | ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
602 | + absl::Nonnull<TaskQueueBase*> worker_queue) override; | ||
603 | ++#else | ||
604 | ++ TaskQueueBase* absl_nonnull worker_queue) override; | ||
605 | ++#endif | ||
606 | + bool CreateAndAttachAecDump( | ||
607 | + FILE* handle, | ||
608 | + int64_t max_log_size_bytes, | ||
609 | ++#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20250512 | ||
610 | + absl::Nonnull<TaskQueueBase*> worker_queue) override; | ||
611 | ++#else | ||
612 | ++ TaskQueueBase* absl_nonnull worker_queue) override; | ||
613 | ++#endif | ||
614 | + // TODO(webrtc:5298) Deprecated variant. | ||
615 | + void AttachAecDump(std::unique_ptr<AecDump> aec_dump) override; | ||
616 | + void DetachAecDump() override; | ||
617 | -- | ||
618 | GitLab | ||
619 | |||
diff --git a/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing-2_2.1.bb b/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing-2_2.1.bb index 9aab57a089..4d076630aa 100644 --- a/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing-2_2.1.bb +++ b/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing-2_2.1.bb | |||
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=da08a38a32a340c5d91e13ee86a118f2" | |||
11 | SRC_URI = " \ | 11 | SRC_URI = " \ |
12 | http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-${PV}.tar.xz \ | 12 | http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-${PV}.tar.xz \ |
13 | file://e9c78dc4712fa6362b0c839ad57b6b46dce1ba83.patch \ | 13 | file://e9c78dc4712fa6362b0c839ad57b6b46dce1ba83.patch \ |
14 | file://60.patch \ | ||
14 | " | 15 | " |
15 | SRC_URI[sha256sum] = "ae9302824b2038d394f10213cab05312c564a038434269f11dbf68f511f9f9fe" | 16 | SRC_URI[sha256sum] = "ae9302824b2038d394f10213cab05312c564a038434269f11dbf68f511f9f9fe" |
16 | S = "${UNPACKDIR}/webrtc-audio-processing-${PV}" | 17 | S = "${UNPACKDIR}/webrtc-audio-processing-${PV}" |
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb b/meta-networking/recipes-connectivity/samba/samba_4.19.9.bb index a0ef63c958..ae88705668 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.19.9.bb | |||
@@ -32,7 +32,7 @@ SRC_URI:append:libc-musl = " \ | |||
32 | file://samba-4.3.9-remove-getpwent_r.patch \ | 32 | file://samba-4.3.9-remove-getpwent_r.patch \ |
33 | " | 33 | " |
34 | 34 | ||
35 | SRC_URI[sha256sum] = "1aeff76c207f383477ce4badebd154691c408d2e15b01b333c85eb775468ddf6" | 35 | SRC_URI[sha256sum] = "71ed406444714c90bb9d36c576d807b67af15449f297e91106d42b3ca2fa5549" |
36 | 36 | ||
37 | UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" | 37 | UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" |
38 | 38 | ||
diff --git a/meta-networking/recipes-daemons/squid/files/0002-squid-make-squid-conf-tests-run-on-target-device.patch b/meta-networking/recipes-daemons/squid/files/0002-squid-make-squid-conf-tests-run-on-target-device.patch index ca1c16b83e..86b454d710 100644 --- a/meta-networking/recipes-daemons/squid/files/0002-squid-make-squid-conf-tests-run-on-target-device.patch +++ b/meta-networking/recipes-daemons/squid/files/0002-squid-make-squid-conf-tests-run-on-target-device.patch | |||
@@ -7,20 +7,46 @@ Subject: [PATCH] squid: make squid-conf-tests run on target device | |||
7 | * Allow the tests to run on read-only root | 7 | * Allow the tests to run on read-only root |
8 | * Don't overwrite tests with true on success | 8 | * Don't overwrite tests with true on success |
9 | * Change logfile path to /var/log | 9 | * Change logfile path to /var/log |
10 | * skip testHeaders since it's not split to prepare/execute parts | ||
10 | 11 | ||
11 | Upstream-Status: Inappropriate [cross compile specific] | 12 | Upstream-Status: Inappropriate [cross compile specific] |
12 | 13 | ||
13 | Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com> | 14 | Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com> |
14 | 15 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | |
15 | --- | 16 | --- |
16 | test-suite/Makefile.am | 16 ++++++++-------- | 17 | src/TestHeaders.am | 6 +++--- |
17 | test-suite/test-squid-conf.sh | 2 +- | 18 | test-suite/Makefile.am | 26 +++++++++++++------------- |
18 | 2 files changed, 9 insertions(+), 9 deletions(-) | 19 | test-suite/test-squid-conf.sh | 4 ++-- |
20 | 3 files changed, 18 insertions(+), 18 deletions(-) | ||
19 | 21 | ||
22 | diff --git a/src/TestHeaders.am b/src/TestHeaders.am | ||
23 | index 0ed5f56..d668876 100644 | ||
24 | --- a/src/TestHeaders.am | ||
25 | +++ b/src/TestHeaders.am | ||
26 | @@ -14,8 +14,8 @@ EXCLUDE_FROM_HDR_TESTING = | ||
27 | # add an empty target named 'testHeaders' depending on the additional | ||
28 | # headers to test | ||
29 | |||
30 | -testHeaders: $(SOURCES) $(noinst_HEADERS) $(EXTRA_DIST) $(top_srcdir)/test-suite/testHeader.cc.in | ||
31 | - $(MAKE) $(^:.h=.hdrtest) && cp $(TRUE) $@ | ||
32 | +testHeaders: $(SOURCES) $(noinst_HEADERS) $(top_srcdir)/test-suite/testHeader.cc.in | ||
33 | + $(MAKE) $(^:.h=.hdrtest) | ||
34 | |||
35 | .h.hdrtest: | ||
36 | @SrcFilePath=`echo $< | $(SED) 's%^$(top_srcdir)/%%'`; \ | ||
37 | @@ -31,5 +31,5 @@ testHeaders: $(SOURCES) $(noinst_HEADERS) $(EXTRA_DIST) $(top_srcdir)/test-suite | ||
38 | then echo "header-test: ok - $$SrcFilePath"; $(RM) "$$TargetFileName.cc" "$$TargetFileName"; \ | ||
39 | else echo "header-test: not ok - $$SrcFilePath"; exit 1; fi | ||
40 | |||
41 | -TESTS += testHeaders | ||
42 | +#TESTS += testHeaders | ||
43 | CLEANFILES += testHeaders | ||
44 | diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am | ||
45 | index 0da5844..0bc381a 100644 | ||
20 | --- a/test-suite/Makefile.am | 46 | --- a/test-suite/Makefile.am |
21 | +++ b/test-suite/Makefile.am | 47 | +++ b/test-suite/Makefile.am |
22 | @@ -21,7 +21,7 @@ LDADD = \ | 48 | @@ -11,7 +11,7 @@ include $(top_srcdir)/src/Common.am |
23 | EXTRA_PROGRAMS = mem_node_test splay | 49 | AM_CPPFLAGS += -I$(srcdir) |
24 | 50 | ||
25 | EXTRA_DIST = \ | 51 | EXTRA_DIST = \ |
26 | - $(srcdir)/squidconf/* \ | 52 | - $(srcdir)/squidconf/* \ |
@@ -28,14 +54,27 @@ Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com> | |||
28 | test-functionality.sh \ | 54 | test-functionality.sh \ |
29 | test-sources.sh \ | 55 | test-sources.sh \ |
30 | test-squid-conf.sh \ | 56 | test-squid-conf.sh \ |
31 | @@ -134,21 +134,21 @@ VirtualDeleteOperator_SOURCES = \ | 57 | @@ -124,37 +124,37 @@ VirtualDeleteOperator_LDADD = \ |
32 | 58 | ||
33 | installcheck-local: squid-conf-tests | 59 | installcheck-local: squid-conf-tests |
34 | 60 | ||
35 | -squid-conf-tests: $(srcdir)/test-squid-conf.sh $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/* | 61 | -squid-conf-tests: $(srcdir)/test-squid-conf.sh $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/* |
36 | - @failed=0; cfglist="$(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*.conf"; rm -f $@ || $(TRUE); \ | 62 | - @instructionFiles="$(srcdir)/squidconf/*.conf.instructions"; \ |
37 | +squid-conf-tests: test-squid-conf.sh $(top_builddir)/src/squid.conf.default squidconf/* | 63 | +squid-conf-tests: test-squid-conf.sh $(top_builddir)/src/squid.conf.default squidconf/* |
38 | + @failed=0; cfglist="$(top_builddir)/src/squid.conf.default squidconf/*.conf"; rm -f $@ || $(TRUE); \ | 64 | + @instructionFiles="squidconf/*.conf.instructions"; \ |
65 | for instructionFile in $$instructionFiles; do \ | ||
66 | cfgBasename=`basename $$instructionFile .instructions`; \ | ||
67 | - cfg=$(srcdir)/squidconf/$$cfgBasename; \ | ||
68 | + cfg=squidconf/$$cfgBasename; \ | ||
69 | if ! test -f $$cfg; then \ | ||
70 | echo "FAIL: $$instructionFile has no matching $$cfg"; \ | ||
71 | exit 1; \ | ||
72 | fi; \ | ||
73 | done; \ | ||
74 | failed=0; \ | ||
75 | - cfglist="$(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*.conf"; \ | ||
76 | + cfglist="$(top_builddir)/src/squid.conf.default squidconf/*.conf"; \ | ||
77 | rm -f $@ || $(TRUE); \ | ||
39 | for cfg in $$cfglist ; do \ | 78 | for cfg in $$cfglist ; do \ |
40 | - $(srcdir)/test-squid-conf.sh $(top_builddir) $(sbindir) $$cfg || \ | 79 | - $(srcdir)/test-squid-conf.sh $(top_builddir) $(sbindir) $$cfg || \ |
41 | + ./test-squid-conf.sh $(top_builddir) $(sbindir) $$cfg || \ | 80 | + ./test-squid-conf.sh $(top_builddir) $(sbindir) $$cfg || \ |
@@ -55,11 +94,30 @@ Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com> | |||
55 | - if test "$$failed" -eq 0; then cp $(TRUE) $@ ; else exit 1; fi | 94 | - if test "$$failed" -eq 0; then cp $(TRUE) $@ ; else exit 1; fi |
56 | + exit "$$failed" | 95 | + exit "$$failed" |
57 | 96 | ||
58 | -CLEANFILES += squid-conf-tests squid-stderr.log | 97 | CLEANFILES += \ |
59 | +CLEANFILES += squid-conf-tests /var/log/squid-stderr.log | 98 | squid-conf-tests \ |
99 | - squid-expected-messages \ | ||
100 | - squid-stderr.log \ | ||
101 | - squid-stderr.log.next \ | ||
102 | - squid-stderr.log.unmatched | ||
103 | + /var/log/quid-expected-messages \ | ||
104 | + /var/log/squid-stderr.log \ | ||
105 | + /var/log/squid-stderr.log.next \ | ||
106 | + /var/log/squid-stderr.log.unmatched | ||
107 | diff --git a/test-suite/test-squid-conf.sh b/test-suite/test-squid-conf.sh | ||
108 | index 413a927..f678c5a 100755 | ||
60 | --- a/test-suite/test-squid-conf.sh | 109 | --- a/test-suite/test-squid-conf.sh |
61 | +++ b/test-suite/test-squid-conf.sh | 110 | +++ b/test-suite/test-squid-conf.sh |
62 | @@ -111,7 +111,7 @@ then | 111 | @@ -76,7 +76,7 @@ expectMessages() |
112 | exit 1 | ||
113 | fi | ||
114 | |||
115 | - messageRegexFilename="squid-expected-messages" | ||
116 | + messageRegexFilename="/var/log/squid-expected-messages" | ||
117 | if ! :> $messageRegexFilename | ||
118 | then | ||
119 | echo "$where: ERROR: Cannot create a temporary file named $messageRegexFilename" | ||
120 | @@ -241,7 +241,7 @@ then | ||
63 | done < $instructionsFile | 121 | done < $instructionsFile |
64 | fi | 122 | fi |
65 | 123 | ||
diff --git a/meta-networking/recipes-daemons/squid/files/CVE-2025-59362.patch b/meta-networking/recipes-daemons/squid/files/CVE-2025-59362.patch new file mode 100644 index 0000000000..26a3896625 --- /dev/null +++ b/meta-networking/recipes-daemons/squid/files/CVE-2025-59362.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From 0d89165ee6da10e6fa50c44998b3cd16d59400e9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Rousskov <rousskov@measurement-factory.com> | ||
3 | Date: Sat, 30 Aug 2025 06:49:36 +0000 | ||
4 | Subject: [PATCH] Fix ASN.1 encoding of long SNMP OIDs (#2149) | ||
5 | |||
6 | CVE: CVE-2025-59362 | ||
7 | Upstream-Status: Backport [https://github.com/squid-cache/squid/commit/0d89165ee6da10e6fa50c44998b3cd16d59400e9] | ||
8 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
9 | --- | ||
10 | lib/snmplib/asn1.c | 13 +++++++++++++ | ||
11 | 1 file changed, 13 insertions(+) | ||
12 | |||
13 | diff --git a/lib/snmplib/asn1.c b/lib/snmplib/asn1.c | ||
14 | index 81f2051fb..2852c26b2 100644 | ||
15 | --- a/lib/snmplib/asn1.c | ||
16 | +++ b/lib/snmplib/asn1.c | ||
17 | @@ -735,6 +735,7 @@ asn_build_objid(u_char * data, int *datalength, | ||
18 | * lastbyte ::= 0 7bitvalue | ||
19 | */ | ||
20 | u_char buf[MAX_OID_LEN]; | ||
21 | + u_char *bufEnd = buf + sizeof(buf); | ||
22 | u_char *bp = buf; | ||
23 | oid *op = objid; | ||
24 | int asnlength; | ||
25 | @@ -753,6 +754,10 @@ asn_build_objid(u_char * data, int *datalength, | ||
26 | while (objidlength-- > 0) { | ||
27 | subid = *op++; | ||
28 | if (subid < 127) { /* off by one? */ | ||
29 | + if (bp >= bufEnd) { | ||
30 | + snmp_set_api_error(SNMPERR_ASN_ENCODE); | ||
31 | + return (NULL); | ||
32 | + } | ||
33 | *bp++ = subid; | ||
34 | } else { | ||
35 | mask = 0x7F; /* handle subid == 0 case */ | ||
36 | @@ -770,8 +775,16 @@ asn_build_objid(u_char * data, int *datalength, | ||
37 | /* fix a mask that got truncated above */ | ||
38 | if (mask == 0x1E00000) | ||
39 | mask = 0xFE00000; | ||
40 | + if (bp >= bufEnd) { | ||
41 | + snmp_set_api_error(SNMPERR_ASN_ENCODE); | ||
42 | + return (NULL); | ||
43 | + } | ||
44 | *bp++ = (u_char) (((subid & mask) >> bits) | ASN_BIT8); | ||
45 | } | ||
46 | + if (bp >= bufEnd) { | ||
47 | + snmp_set_api_error(SNMPERR_ASN_ENCODE); | ||
48 | + return (NULL); | ||
49 | + } | ||
50 | *bp++ = (u_char) (subid & mask); | ||
51 | } | ||
52 | } | ||
diff --git a/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch b/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch index 18bc78e6be..f80d37de20 100644 --- a/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch +++ b/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch | |||
@@ -16,11 +16,13 @@ Upstream-Status: Pending | |||
16 | configure.ac | 1 + | 16 | configure.ac | 1 + |
17 | 1 file changed, 1 insertion(+) | 17 | 1 file changed, 1 insertion(+) |
18 | 18 | ||
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index c7312d8..3b0e9e2 100644 | ||
19 | --- a/configure.ac | 21 | --- a/configure.ac |
20 | +++ b/configure.ac | 22 | +++ b/configure.ac |
21 | @@ -29,6 +29,7 @@ m4_include([acinclude/tdb.m4]) | 23 | @@ -29,6 +29,7 @@ m4_include([acinclude/lib-checks.m4]) |
22 | m4_include([acinclude/lib-checks.m4]) | ||
23 | m4_include([acinclude/ax_cxx_compile_stdcxx.m4]) | 24 | m4_include([acinclude/ax_cxx_compile_stdcxx.m4]) |
25 | m4_include([acinclude/win32-sspi.m4]) | ||
24 | 26 | ||
25 | +HOSTCXX="$BUILD_CXX" | 27 | +HOSTCXX="$BUILD_CXX" |
26 | PRESET_CFLAGS="$CFLAGS" | 28 | PRESET_CFLAGS="$CFLAGS" |
diff --git a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch index 489850e3bd..8522a299c1 100644 --- a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch +++ b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch | |||
@@ -16,10 +16,12 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
16 | acinclude/lib-checks.m4 | 8 ++++++-- | 16 | acinclude/lib-checks.m4 | 8 ++++++-- |
17 | 2 files changed, 15 insertions(+), 3 deletions(-) | 17 | 2 files changed, 15 insertions(+), 3 deletions(-) |
18 | 18 | ||
19 | diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4 | ||
20 | index e0286fa..b3e4bc7 100644 | ||
19 | --- a/acinclude/krb5.m4 | 21 | --- a/acinclude/krb5.m4 |
20 | +++ b/acinclude/krb5.m4 | 22 | +++ b/acinclude/krb5.m4 |
21 | @@ -57,7 +57,15 @@ main(void) | 23 | @@ -98,7 +98,15 @@ main(void) |
22 | 24 | krb5_init_context(&context); | |
23 | return 0; | 25 | return 0; |
24 | } | 26 | } |
25 | -]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ]) | 27 | -]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ]) |
@@ -35,6 +37,8 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
35 | ]) | 37 | ]) |
36 | SQUID_STATE_ROLLBACK(squid_krb5_heimdal_test) | 38 | SQUID_STATE_ROLLBACK(squid_krb5_heimdal_test) |
37 | ]) | 39 | ]) |
40 | diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4 | ||
41 | index 9793b9a..4f2dc83 100644 | ||
38 | --- a/acinclude/lib-checks.m4 | 42 | --- a/acinclude/lib-checks.m4 |
39 | +++ b/acinclude/lib-checks.m4 | 43 | +++ b/acinclude/lib-checks.m4 |
40 | @@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[ | 44 | @@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[ |
diff --git a/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch b/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch index 5df006038b..d57ebe7869 100644 --- a/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch +++ b/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch | |||
@@ -14,6 +14,8 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
14 | configure.ac | 2 +- | 14 | configure.ac | 2 +- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 3b0e9e2..c730212 100644 | ||
17 | --- a/configure.ac | 19 | --- a/configure.ac |
18 | +++ b/configure.ac | 20 | +++ b/configure.ac |
19 | @@ -10,7 +10,7 @@ AC_PREREQ(2.61) | 21 | @@ -10,7 +10,7 @@ AC_PREREQ(2.61) |
diff --git a/meta-networking/recipes-daemons/squid/squid_6.12.bb b/meta-networking/recipes-daemons/squid/squid_7.1.bb index 87144fb049..bba26cc5fa 100644 --- a/meta-networking/recipes-daemons/squid/squid_6.12.bb +++ b/meta-networking/recipes-daemons/squid/squid_7.1.bb | |||
@@ -9,10 +9,9 @@ HOMEPAGE = "http://www.squid-cache.org" | |||
9 | SECTION = "web" | 9 | SECTION = "web" |
10 | LICENSE = "GPL-2.0-or-later" | 10 | LICENSE = "GPL-2.0-or-later" |
11 | 11 | ||
12 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" | 12 | PV_U = "${@d.getVar('PV').replace('.', '_')}" |
13 | MIN_VER = "${@oe.utils.trim_version("${PV}", 2)}" | ||
14 | 13 | ||
15 | SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.xz \ | 14 | SRC_URI = "https://github.com/squid-cache/${BPN}/releases/download/SQUID_${PV_U}/${BPN}-${PV}.tar.xz \ |
16 | file://Set-up-for-cross-compilation.patch \ | 15 | file://Set-up-for-cross-compilation.patch \ |
17 | file://Skip-AC_RUN_IFELSE-tests.patch \ | 16 | file://Skip-AC_RUN_IFELSE-tests.patch \ |
18 | file://squid-use-serial-tests-config-needed-by-ptest.patch \ | 17 | file://squid-use-serial-tests-config-needed-by-ptest.patch \ |
@@ -21,13 +20,18 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.xz \ | |||
21 | file://0002-squid-make-squid-conf-tests-run-on-target-device.patch \ | 20 | file://0002-squid-make-squid-conf-tests-run-on-target-device.patch \ |
22 | file://0001-libltdl-remove-reference-to-nonexisting-directory.patch \ | 21 | file://0001-libltdl-remove-reference-to-nonexisting-directory.patch \ |
23 | file://squid.nm \ | 22 | file://squid.nm \ |
23 | file://CVE-2025-59362.patch \ | ||
24 | " | 24 | " |
25 | 25 | ||
26 | SRC_URI[sha256sum] = "f3df3abb2603a513266f24a5d4699a9f0d76b9f554d1848b67f9c51cd3b3cb50" | 26 | SRC_URI[sha256sum] = "763b5a78561cedc4e47634fa42b8e6b8d46c87c949a151b4e7ac2396d2f97dea" |
27 | 27 | ||
28 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 28 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
29 | file://errors/COPYRIGHT;md5=6fbb6a2adc362e206da7b4f42846cdec \ | 29 | file://errors/COPYRIGHT;md5=c2a0e15750d3a9743af9109fecc05622 \ |
30 | " | 30 | " |
31 | |||
32 | UPSTREAM_CHECK_URI = "https://github.com/squid-cache/${BPN}/releases/" | ||
33 | UPSTREAM_CHECK_REGEX = "v?(?P<pver>\d+(\.\d+)+)" | ||
34 | |||
31 | DEPENDS = "libtool" | 35 | DEPENDS = "libtool" |
32 | 36 | ||
33 | inherit autotools pkgconfig useradd ptest perlnative systemd | 37 | inherit autotools pkgconfig useradd ptest perlnative systemd |
diff --git a/meta-networking/recipes-protocols/frr/frr_10.3.bb b/meta-networking/recipes-protocols/frr/frr_10.4.1.bb index f0f3f34ab3..ce455ab8bf 100644 --- a/meta-networking/recipes-protocols/frr/frr_10.3.bb +++ b/meta-networking/recipes-protocols/frr/frr_10.4.1.bb | |||
@@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a | |||
10 | file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" | 10 | file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" |
11 | 11 | ||
12 | 12 | ||
13 | SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.3 \ | 13 | SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.4;tag=frr-${PV} \ |
14 | file://frr.pam \ | 14 | file://frr.pam \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRCREV = "85cf1ed576deed121751e16a64970f8a652a9e1e" | 17 | SRCREV = "88f5c06cbc1cc4d62e1cba3e7791f5cea4179ba5" |
18 | 18 | ||
19 | UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" | 19 | UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" |
20 | 20 | ||
@@ -39,7 +39,6 @@ PACKAGECONFIG[zeromq] = "--enable-zeromq,--disable-zeromq,zeromq" | |||
39 | PACKAGECONFIG[protobuf] = "--enable-protobuf,--disable-protobuf,protobuf-c-native protobuf-c" | 39 | PACKAGECONFIG[protobuf] = "--enable-protobuf,--disable-protobuf,protobuf-c-native protobuf-c" |
40 | PACKAGECONFIG[capabilities] = "--enable-capabilities,--disable-capabilities,libcap" | 40 | PACKAGECONFIG[capabilities] = "--enable-capabilities,--disable-capabilities,libcap" |
41 | PACKAGECONFIG[cumulus] = "--enable-cumulus,--disable-cumulus" | 41 | PACKAGECONFIG[cumulus] = "--enable-cumulus,--disable-cumulus" |
42 | PACKAGECONFIG[datacenter] = "--enable-datacenter,--disable-datacenter" | ||
43 | PACKAGECONFIG[ospfclient] = "--enable-ospfapi --enable-ospfclient,--disable-ospfapi --disable-ospfclient" | 42 | PACKAGECONFIG[ospfclient] = "--enable-ospfapi --enable-ospfclient,--disable-ospfapi --disable-ospfclient" |
44 | 43 | ||
45 | EXTRA_OECONF:class-native = "--enable-clippy-only" | 44 | EXTRA_OECONF:class-native = "--enable-clippy-only" |
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Fix-LDFLAGS-vs-LIBS-ordering.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Fix-LDFLAGS-vs-LIBS-ordering.patch new file mode 100644 index 0000000000..51a63538e4 --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Fix-LDFLAGS-vs-LIBS-ordering.patch | |||
@@ -0,0 +1,252 @@ | |||
1 | From 10883d754750865e42327826ee90d7eda3741dda Mon Sep 17 00:00:00 2001 | ||
2 | From: Sam James <sam@gentoo.org> | ||
3 | Date: Fri, 2 Dec 2022 02:26:29 +0000 | ||
4 | Subject: [PATCH] Fix LDFLAGS vs LIBS ordering | ||
5 | |||
6 | LDFLAGS must come before both LIBS & any listed objects in order | ||
7 | for certain valid LDFLAGS, like '-Wl,--as-needed' to work correctly | ||
8 | (otherwise it'll either take no effect or discard libraries when | ||
9 | they're needed). | ||
10 | |||
11 | Gentoo has been carrying this patch for a while. | ||
12 | |||
13 | Signed-off-by: Sam James <sam@gentoo.org> | ||
14 | Upstream-Status: Backport [https://github.com/net-snmp/net-snmp/commit/72b47b9b41d2640ed4810297f2e26f5eb9d2fa31] | ||
15 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
16 | --- | ||
17 | Makefile.top | 4 ++-- | ||
18 | agent/Makefile.in | 16 ++++++------- | ||
19 | agent/helpers/Makefile.in | 2 +- | ||
20 | apps/Makefile.in | 46 ++++++++++++++++++------------------ | ||
21 | apps/snmpnetstat/Makefile.in | 2 +- | ||
22 | snmplib/Makefile.in | 4 ++-- | ||
23 | testing/Makefile.in | 8 +++---- | ||
24 | 7 files changed, 41 insertions(+), 41 deletions(-) | ||
25 | |||
26 | diff --git a/Makefile.top b/Makefile.top | ||
27 | index 53e0392..5de5648 100644 | ||
28 | --- a/Makefile.top | ||
29 | +++ b/Makefile.top | ||
30 | @@ -86,11 +86,11 @@ LIBCURRENT = 42 | ||
31 | LIBAGE = 2 | ||
32 | LIBREVISION = 1 | ||
33 | |||
34 | -LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o | ||
35 | +LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o | ||
36 | LIB_EXTENSION = la | ||
37 | LIB_VERSION = | ||
38 | LIB_LDCONFIG_CMD = echo "do not ldconfig\n" | ||
39 | -LINK = $(LIBTOOL) --mode=link $(LINKCC) | ||
40 | +LINK = $(LIBTOOL) --mode=link $(LINKCC) $(LDFLAGS) | ||
41 | # RANLIB = @RANLIB@ | ||
42 | RANLIB = : | ||
43 | |||
44 | diff --git a/agent/Makefile.in b/agent/Makefile.in | ||
45 | index 44f8818..6008eb8 100644 | ||
46 | --- a/agent/Makefile.in | ||
47 | +++ b/agent/Makefile.in | ||
48 | @@ -288,26 +288,26 @@ all: agentlib subdirs miblib $(INSTALLBINPROGS) $(INSTALLSBINPROGS) | ||
49 | # build stuff targets | ||
50 | # | ||
51 | getkstat: getkstat.o | ||
52 | - $(CC) $(CFLAGS) -o $@ $? $(LIBS) | ||
53 | + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $? $(LIBS) | ||
54 | |||
55 | getkstat.o: mibgroup/kernel_sunos5.c | ||
56 | - $(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? | ||
57 | + $(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? | ||
58 | |||
59 | getmibstat: getmibstat.o | ||
60 | - $(CC) $(CFLAGS) -o $@ $? $(LIBS) | ||
61 | + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $? $(LIBS) | ||
62 | |||
63 | getmibstat.o: mibgroup/kernel_sunos5.c | ||
64 | - $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? | ||
65 | + $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? | ||
66 | |||
67 | -snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG) | ||
68 | - $(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} ${LDFLAGS} ${OUR_AGENT_LIBS} | ||
69 | +snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG) | ||
70 | + $(LINK) $(CFLAGS) $(LDFLAGS) -o $@ ${LAGENTOBJS} ${OUR_AGENT_LIBS} | ||
71 | |||
72 | libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS) | ||
73 | - $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ | ||
74 | + $(LIB_LD_CMD) $(AGENTLIB) $(LDFLAGS) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ | ||
75 | $(RANLIB) $(AGENTLIB) | ||
76 | |||
77 | libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS) subdirs | ||
78 | - $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) $(LDFLAGS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ | ||
79 | + $(LIB_LD_CMD) $(MIBLIB) $(LDFLAGS) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ | ||
80 | $(RANLIB) $(MIBLIB) | ||
81 | |||
82 | agentlib: $(AGENTLIB) | ||
83 | diff --git a/agent/helpers/Makefile.in b/agent/helpers/Makefile.in | ||
84 | index 51f409d..05a9adc 100644 | ||
85 | --- a/agent/helpers/Makefile.in | ||
86 | +++ b/agent/helpers/Makefile.in | ||
87 | @@ -32,5 +32,5 @@ LOBJS = dummy.lo | ||
88 | all: standardall | ||
89 | |||
90 | libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION): $(LOBJS) | ||
91 | - $(LIB_LD_CMD) $@ $(LOBJS) $(LDFLAGS) | ||
92 | + $(LIB_LD_CMD) $@ $(LDFLAGS) $(LOBJS) | ||
93 | $(RANLIB) $@ | ||
94 | diff --git a/apps/Makefile.in b/apps/Makefile.in | ||
95 | index 57b8524..b5b26f9 100644 | ||
96 | --- a/apps/Makefile.in | ||
97 | +++ b/apps/Makefile.in | ||
98 | @@ -161,37 +161,37 @@ OTHERUNINSTALL=snmpinformuninstall snmptrapdperluninstall \ | ||
99 | # build rules | ||
100 | # | ||
101 | snmpwalk$(EXEEXT): snmpwalk.$(OSUFFIX) $(USELIBS) | ||
102 | - $(LINK) ${CFLAGS} -o $@ snmpwalk.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
103 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpwalk.$(OSUFFIX) ${LIBS} | ||
104 | |||
105 | snmpbulkwalk$(EXEEXT): snmpbulkwalk.$(OSUFFIX) $(USELIBS) | ||
106 | - $(LINK) ${CFLAGS} -o $@ snmpbulkwalk.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
107 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpbulkwalk.$(OSUFFIX) ${LIBS} | ||
108 | |||
109 | snmpbulkget$(EXEEXT): snmpbulkget.$(OSUFFIX) $(USELIBS) | ||
110 | - $(LINK) ${CFLAGS} -o $@ snmpbulkget.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
111 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpbulkget.$(OSUFFIX) ${LIBS} | ||
112 | |||
113 | snmptranslate$(EXEEXT): snmptranslate.$(OSUFFIX) $(USELIBS) | ||
114 | - $(LINK) ${CFLAGS} -o $@ snmptranslate.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
115 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptranslate.$(OSUFFIX) ${LIBS} | ||
116 | |||
117 | snmpstatus$(EXEEXT): snmpstatus.$(OSUFFIX) $(USELIBS) | ||
118 | - $(LINK) ${CFLAGS} -o $@ snmpstatus.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
119 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpstatus.$(OSUFFIX) ${LIBS} | ||
120 | |||
121 | snmpget$(EXEEXT): snmpget.$(OSUFFIX) $(USELIBS) | ||
122 | - $(LINK) ${CFLAGS} -o $@ snmpget.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
123 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpget.$(OSUFFIX) ${LIBS} | ||
124 | |||
125 | snmpdelta$(EXEEXT): snmpdelta.$(OSUFFIX) $(USELIBS) | ||
126 | - $(LINK) ${CFLAGS} -o $@ snmpdelta.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
127 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpdelta.$(OSUFFIX) ${LIBS} | ||
128 | |||
129 | snmptable$(EXEEXT): snmptable.$(OSUFFIX) $(USELIBS) | ||
130 | - $(LINK) ${CFLAGS} -o $@ snmptable.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
131 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptable.$(OSUFFIX) ${LIBS} | ||
132 | |||
133 | snmptest$(EXEEXT): snmptest.$(OSUFFIX) $(USELIBS) | ||
134 | - $(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
135 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptest.$(OSUFFIX) ${LIBS} | ||
136 | |||
137 | snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS) | ||
138 | - $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${LDFLAGS} ${TRAPLIBS} | ||
139 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${TRAPLIBS} | ||
140 | |||
141 | snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS) | ||
142 | - $(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
143 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LIBS} | ||
144 | |||
145 | snmpinform$(EXEEXT): snmptrap$(EXEEXT) | ||
146 | rm -f snmpinform | ||
147 | @@ -202,40 +202,40 @@ snmptop$(EXEEXT): snmpps$(EXEEXT) | ||
148 | $(LN_S) snmpps$(EXEEXT) snmptop$(EXEEXT) | ||
149 | |||
150 | snmpset$(EXEEXT): snmpset.$(OSUFFIX) $(USELIBS) | ||
151 | - $(LINK) ${CFLAGS} -o $@ snmpset.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
152 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpset.$(OSUFFIX) ${LIBS} | ||
153 | |||
154 | snmpusm$(EXEEXT): snmpusm.$(OSUFFIX) $(USELIBS) | ||
155 | - $(LINK) ${CFLAGS} -o $@ snmpusm.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
156 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpusm.$(OSUFFIX) ${LIBS} | ||
157 | |||
158 | snmpvacm$(EXEEXT): snmpvacm.$(OSUFFIX) $(USELIBS) | ||
159 | - $(LINK) ${CFLAGS} -o $@ snmpvacm.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
160 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpvacm.$(OSUFFIX) ${LIBS} | ||
161 | |||
162 | snmptls$(EXEEXT): snmptls.$(OSUFFIX) $(USELIBS) | ||
163 | - $(LINK) ${CFLAGS} -o $@ snmptls.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
164 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptls.$(OSUFFIX) ${LIBS} | ||
165 | |||
166 | agentxtrap$(EXEEXT): agentxtrap.$(OSUFFIX) $(USEAGENTLIBS) | ||
167 | - $(LINK) ${CFLAGS} -o $@ agentxtrap.$(OSUFFIX) ${LDFLAGS} $(USEAGENTLIBS) $(PERLLDOPTS_FOR_APPS) ${LIBS} | ||
168 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ agentxtrap.$(OSUFFIX) $(USEAGENTLIBS) $(PERLLDOPTS_FOR_APPS) ${LIBS} | ||
169 | |||
170 | snmpgetnext$(EXEEXT): snmpgetnext.$(OSUFFIX) $(USELIBS) | ||
171 | - $(LINK) ${CFLAGS} -o $@ snmpgetnext.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
172 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpgetnext.$(OSUFFIX) ${LIBS} | ||
173 | |||
174 | encode_keychange$(EXEEXT): encode_keychange.$(OSUFFIX) $(USELIBS) | ||
175 | - $(LINK) ${CFLAGS} -o $@ encode_keychange.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
176 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ encode_keychange.$(OSUFFIX) ${LIBS} | ||
177 | |||
178 | snmpdf$(EXEEXT): snmpdf.$(OSUFFIX) $(USELIBS) | ||
179 | - $(LINK) ${CFLAGS} -o $@ snmpdf.$(OSUFFIX) ${LDFLAGS} ${LIBS} | ||
180 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpdf.$(OSUFFIX) ${LIBS} | ||
181 | |||
182 | snmpps$(EXEEXT): snmpps.$(OSUFFIX) $(USELIBS) | ||
183 | - $(LINK) ${CFLAGS} -o $@ snmpps.$(OSUFFIX) ${LDFLAGS} @LIBCURSES@ ${LIBS} | ||
184 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpps.$(OSUFFIX) @LIBCURSES@ ${LIBS} | ||
185 | |||
186 | snmpping$(EXEEXT): snmpping.$(OSUFFIX) $(USELIBS) | ||
187 | - $(LINK) ${CFLAGS} -o $@ snmpping.$(OSUFFIX) ${LDFLAGS} ${LIBS} -lm | ||
188 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpping.$(OSUFFIX) ${LIBS} -lm | ||
189 | |||
190 | snmppcap$(EXEEXT): snmppcap.$(OSUFFIX) $(USEAGENTLIBS) | ||
191 | - $(LINK) ${CFLAGS} -o $@ snmppcap.$(OSUFFIX) ${LDFLAGS} ${USEAGENTLIBS} ${LIBS} -lpcap | ||
192 | + $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmppcap.$(OSUFFIX) ${USEAGENTLIBS} ${LIBS} -lpcap | ||
193 | |||
194 | libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION): $(LLIBTRAPD_OBJS) | ||
195 | - $(LIB_LD_CMD) $@ ${LLIBTRAPD_OBJS} $(MIBLIB) $(MYSQL_LIBS) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) $(LDFLAGS) | ||
196 | + $(LIB_LD_CMD) $@ $(LDFLAGS) ${LLIBTRAPD_OBJS} $(MIBLIB) $(MYSQL_LIBS) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) | ||
197 | $(RANLIB) $@ | ||
198 | |||
199 | snmpinforminstall: | ||
200 | diff --git a/apps/snmpnetstat/Makefile.in b/apps/snmpnetstat/Makefile.in | ||
201 | index dfb566d..8a8cb21 100644 | ||
202 | --- a/apps/snmpnetstat/Makefile.in | ||
203 | +++ b/apps/snmpnetstat/Makefile.in | ||
204 | @@ -34,4 +34,4 @@ LIBS= ../../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) $(VAL_LIBS) @LIBS | ||
205 | all: standardall | ||
206 | |||
207 | snmpnetstat$(EXEEXT): ${LOBJS} ${USELIBS} | ||
208 | - ${LINK} ${CFLAGS} -o $@ ${LOBJS} ${LOCAL_LIBS} ${LDFLAGS} ${LIBS} | ||
209 | + ${LINK} ${CFLAGS} ${LDFLAGS} -o $@ ${LOBJS} ${LOCAL_LIBS} ${LIBS} | ||
210 | diff --git a/snmplib/Makefile.in b/snmplib/Makefile.in | ||
211 | index ecbfc4d..1501636 100644 | ||
212 | --- a/snmplib/Makefile.in | ||
213 | +++ b/snmplib/Makefile.in | ||
214 | @@ -230,11 +230,11 @@ all: standardall | ||
215 | |||
216 | # how to build the libraries. | ||
217 | libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS) | ||
218 | - $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ | ||
219 | + $(LIB_LD_CMD) $@ $(LDFLAGS) $(TOBJS) @LNETSNMPLIBS@ | ||
220 | $(RANLIB) $@ | ||
221 | |||
222 | libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS) | ||
223 | - $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ | ||
224 | + $(LIB_LD_CMD) $@ $(LDFLAGS) $(TOBJS) @LNETSNMPLIBS@ | ||
225 | $(RANLIB) $@ | ||
226 | |||
227 | # | ||
228 | diff --git a/testing/Makefile.in b/testing/Makefile.in | ||
229 | index 79d069d..a6d920e 100644 | ||
230 | --- a/testing/Makefile.in | ||
231 | +++ b/testing/Makefile.in | ||
232 | @@ -61,16 +61,16 @@ test-mibs: | ||
233 | cd $(srcdir)/rfc1213 ; ./run | ||
234 | |||
235 | etest: etimetest.o $(PARSEOBJS) $(USELIBS) | ||
236 | - ${CC} -o $@ etimetest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} | ||
237 | + ${CC} ${LDFLAGS} -o $@ etimetest.o $(PARSEOBJS) ${LIBS} | ||
238 | |||
239 | ktest: keymanagetest.o $(PARSEOBJS) $(USELIBS) | ||
240 | - ${CC} -o $@ keymanagetest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} | ||
241 | + ${CC} ${LDFLAGS} -o $@ keymanagetest.o $(PARSEOBJS) ${LIBS} | ||
242 | |||
243 | misctest: misctest.o $(PARSEOBJS) $(USELIBS) | ||
244 | - ${CC} -o $@ misctest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} | ||
245 | + ${CC} ${LDFLAGS} -o $@ misctest.o $(PARSEOBJS) ${LIBS} | ||
246 | |||
247 | stest: scapitest.o $(PARSEOBJS) $(USELIBS) | ||
248 | - ${CC} -o $@ scapitest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} | ||
249 | + ${CC} ${LDFLAGS} -o $@ scapitest.o $(PARSEOBJS) ${LIBS} | ||
250 | |||
251 | clean: testclean | ||
252 | rm -f *.o core *.core $(TARG) | ||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb index 7c849cf5e7..f37bda921a 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb | |||
@@ -30,7 +30,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ | |||
30 | file://0001-Android-Fix-the-build.patch \ | 30 | file://0001-Android-Fix-the-build.patch \ |
31 | file://netsnmp-swinst-crash.patch \ | 31 | file://netsnmp-swinst-crash.patch \ |
32 | file://net-snmp-5.9.4-kernel-6.7.patch \ | 32 | file://net-snmp-5.9.4-kernel-6.7.patch \ |
33 | " | 33 | file://0001-Fix-LDFLAGS-vs-LIBS-ordering.patch \ |
34 | " | ||
34 | SRC_URI[sha256sum] = "8b4de01391e74e3c7014beb43961a2d6d6fa03acc34280b9585f4930745b0544" | 35 | SRC_URI[sha256sum] = "8b4de01391e74e3c7014beb43961a2d6d6fa03acc34280b9585f4930745b0544" |
35 | 36 | ||
36 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/" | 37 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/" |
@@ -117,6 +118,10 @@ do_configure:append() { | |||
117 | -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L${STAGING_DIR_TARGET}\$\{libdir\}@g" \ | 118 | -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L${STAGING_DIR_TARGET}\$\{libdir\}@g" \ |
118 | -e "s@^NSC_LDFLAGS=\"-L.* @NSC_LDFLAGS=\"-L${STAGING_DIR_TARGET}\$\{libdir\} @g" \ | 119 | -e "s@^NSC_LDFLAGS=\"-L.* @NSC_LDFLAGS=\"-L${STAGING_DIR_TARGET}\$\{libdir\} @g" \ |
119 | -i ${B}/net-snmp-config | 120 | -i ${B}/net-snmp-config |
121 | |||
122 | # Make libtool inject -Wl,--as-needed so that it is specified before any lib | ||
123 | # dependencies. This is needed due to libtools' reordering of the arguments. | ||
124 | [ -z "${ASNEEDED}" ] || sed -e "s@CC -shared@\0 ${ASNEEDED}@" -i ${B}/libtool | ||
120 | } | 125 | } |
121 | 126 | ||
122 | do_install:append() { | 127 | do_install:append() { |
diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.4.1-4.bb b/meta-networking/recipes-support/dovecot/dovecot_2.4.1-4.bb index a06fd45199..5894c76bac 100644 --- a/meta-networking/recipes-support/dovecot/dovecot_2.4.1-4.bb +++ b/meta-networking/recipes-support/dovecot/dovecot_2.4.1-4.bb | |||
@@ -75,3 +75,5 @@ FILES:${PN} += "${libdir}/dovecot/*plugin.so \ | |||
75 | FILES:${PN}-staticdev += "${libdir}/dovecot/*/*.a" | 75 | FILES:${PN}-staticdev += "${libdir}/dovecot/*/*.a" |
76 | FILES:${PN}-dev += "${libdir}/dovecot/libdovecot*.so" | 76 | FILES:${PN}-dev += "${libdir}/dovecot/libdovecot*.so" |
77 | FILES:${PN}-dbg += "${libdir}/dovecot/*/.debug" | 77 | FILES:${PN}-dbg += "${libdir}/dovecot/*/.debug" |
78 | |||
79 | CVE_STATUS[CVE-2016-4983] = "not-applicable-platform: Affects only postinstall script on specific distribution." | ||
diff --git a/meta-networking/recipes-support/libldb/libldb_2.8.1.bb b/meta-networking/recipes-support/libldb/libldb_2.8.2.bb index dbb27e6ba6..6038066169 100644 --- a/meta-networking/recipes-support/libldb/libldb_2.8.1.bb +++ b/meta-networking/recipes-support/libldb/libldb_2.8.2.bb | |||
@@ -9,7 +9,7 @@ RDEPENDS:pyldb += "python3" | |||
9 | export PYTHONHASHSEED = "1" | 9 | export PYTHONHASHSEED = "1" |
10 | export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}" | 10 | export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}" |
11 | 11 | ||
12 | SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ | 12 | SRC_URI = "https://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ |
13 | file://0001-do-not-import-target-module-while-cross-compile.patch \ | 13 | file://0001-do-not-import-target-module-while-cross-compile.patch \ |
14 | file://0002-ldb-Add-configure-options-for-packages.patch \ | 14 | file://0002-ldb-Add-configure-options-for-packages.patch \ |
15 | file://0003-Fix-pyext_PATTERN-for-cross-compilation.patch \ | 15 | file://0003-Fix-pyext_PATTERN-for-cross-compilation.patch \ |
@@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada | |||
34 | file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ | 34 | file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ |
35 | file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" | 35 | file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" |
36 | 36 | ||
37 | SRC_URI[sha256sum] = "b68ce6eb0ccd2870fa3c8c334f2028b5d16606fd41308696c17b71959f7bf59f" | 37 | SRC_URI[sha256sum] = "0e9aeb657aedbd048b1c0de4afe5b01a8dd33c24a6adb8361a0829374a2fc016" |
38 | 38 | ||
39 | inherit pkgconfig waf-samba ptest | 39 | inherit pkgconfig waf-samba ptest |
40 | 40 | ||
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index 5b9ceb424e..56aea73b15 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf | |||
@@ -138,7 +138,6 @@ OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += " \ | |||
138 | dhrystone-src \ | 138 | dhrystone-src \ |
139 | directfb \ | 139 | directfb \ |
140 | directfb-dbg \ | 140 | directfb-dbg \ |
141 | doxygen-src \ | ||
142 | edid-decode \ | 141 | edid-decode \ |
143 | edid-decode-dbg \ | 142 | edid-decode-dbg \ |
144 | editorconfig-core-c-dev \ | 143 | editorconfig-core-c-dev \ |
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.24.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.24.0.bb index f7b2e7485a..50fada36bf 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.24.0.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.24.0.bb | |||
@@ -11,6 +11,7 @@ DEPENDS += "bison-native \ | |||
11 | bcc \ | 11 | bcc \ |
12 | libcereal \ | 12 | libcereal \ |
13 | libbpf \ | 13 | libbpf \ |
14 | xxd-native \ | ||
14 | " | 15 | " |
15 | DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'pahole-native llvm-native', '', d)}" | 16 | DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'pahole-native llvm-native', '', d)}" |
16 | 17 | ||
@@ -34,7 +35,7 @@ PACKAGECONFIG ?= " \ | |||
34 | ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \ | 35 | ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \ |
35 | " | 36 | " |
36 | 37 | ||
37 | PACKAGECONFIG[tests] = "-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF,gtest xxd-native" | 38 | PACKAGECONFIG[tests] = "-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF,gtest" |
38 | PACKAGECONFIG[systemd] = "-DENABLE_SYSTEMD=ON,-DENABLE_SYSTEMD=OFF,systemd" | 39 | PACKAGECONFIG[systemd] = "-DENABLE_SYSTEMD=ON,-DENABLE_SYSTEMD=OFF,systemd" |
39 | 40 | ||
40 | do_install_ptest() { | 41 | do_install_ptest() { |
diff --git a/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei_1.4.4.bb b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei_1.4.4.bb index 4af2712140..bb08ad4a1c 100644 --- a/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei_1.4.4.bb +++ b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei_1.4.4.bb | |||
@@ -20,22 +20,10 @@ DEPENDS = "\ | |||
20 | DEPENDS:append:libc-musl = " libucontext" | 20 | DEPENDS:append:libc-musl = " libucontext" |
21 | LDFLAGS:append:libc-musl = " -lucontext" | 21 | LDFLAGS:append:libc-musl = " -lucontext" |
22 | 22 | ||
23 | RDEPENDS_${PN} = "\ | ||
24 | cglm (>= 0.7.8) \ | ||
25 | freetype \ | ||
26 | libsdl2 (>= 2.0.16) \ | ||
27 | libpng (>= 1.5.0) \ | ||
28 | libwebp (>= 0.5) \ | ||
29 | libzstd (>= 1.4.0) \ | ||
30 | opengl (>= 3.3) \ | ||
31 | opusfile \ | ||
32 | zlib \ | ||
33 | " | ||
34 | |||
35 | SRC_URI = "gitsm://github.com/taisei-project/taisei.git;branch=v1.4.x;protocol=https;tag=v${PV}" | 23 | SRC_URI = "gitsm://github.com/taisei-project/taisei.git;branch=v1.4.x;protocol=https;tag=v${PV}" |
36 | SRCREV = "6a484e6e61cc51a22a9943762dc2ff6883914f38" | 24 | SRCREV = "6a484e6e61cc51a22a9943762dc2ff6883914f38" |
37 | 25 | ||
38 | inherit features_check meson mime mime-xdg pkgconfig python3native | 26 | inherit features_check meson mime mime-xdg pkgconfig |
39 | 27 | ||
40 | REQUIRED_DISTRO_FEATURES = "opengl" | 28 | REQUIRED_DISTRO_FEATURES = "opengl" |
41 | 29 | ||
diff --git a/meta-oe/recipes-benchmark/fio/fio/CVE-2025-10823.patch b/meta-oe/recipes-benchmark/fio/fio/CVE-2025-10823.patch new file mode 100644 index 0000000000..c5813273c7 --- /dev/null +++ b/meta-oe/recipes-benchmark/fio/fio/CVE-2025-10823.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 6a39dfaffdb8a6c2080eec0dc7fb1ee532d54025 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jens Axboe <axboe@kernel.dk> | ||
3 | Date: Tue, 23 Sep 2025 11:50:46 -0600 | ||
4 | Subject: [PATCH] options: check for NULL input string and fail | ||
5 | |||
6 | Waste of time busy work. | ||
7 | |||
8 | Link: https://github.com/axboe/fio/issues/1982 | ||
9 | |||
10 | CVE: CVE-2025-10823 | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | https://github.com/axboe/fio/commit/6a39dfaffdb8a6c2080eec0dc7fb1ee532d54025 | ||
14 | |||
15 | Signed-off-by: Jens Axboe <axboe@kernel.dk> | ||
16 | Signed-off-by: Saravanan <saravanan.kadambathursubramaniyam@windriver.com> | ||
17 | --- | ||
18 | options.c | 3 +++ | ||
19 | 1 file changed, 3 insertions(+) | ||
20 | |||
21 | diff --git a/options.c b/options.c | ||
22 | index c35878f..562c5bc 100644 | ||
23 | --- a/options.c | ||
24 | +++ b/options.c | ||
25 | @@ -1616,6 +1616,9 @@ static int str_buffer_pattern_cb(void *data, const char *input) | ||
26 | struct thread_data *td = cb_data_to_td(data); | ||
27 | int ret; | ||
28 | |||
29 | + if (!input) | ||
30 | + return 1; | ||
31 | + | ||
32 | /* FIXME: for now buffer pattern does not support formats */ | ||
33 | ret = parse_and_fill_pattern_alloc(input, strlen(input), | ||
34 | &td->o.buffer_pattern, NULL, NULL, NULL); | ||
35 | -- | ||
36 | 2.48.1 | ||
37 | |||
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.39.bb b/meta-oe/recipes-benchmark/fio/fio_3.39.bb index 345c7f08e7..4a94aadf42 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.39.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.39.bb | |||
@@ -25,6 +25,8 @@ PACKAGECONFIG[numa] = ",--disable-numa,numactl" | |||
25 | SRC_URI = "git://git.kernel.dk/fio.git;branch=master" | 25 | SRC_URI = "git://git.kernel.dk/fio.git;branch=master" |
26 | SRCREV = "a6e474c9e896e4ba1eb40066a03402afb040710a" | 26 | SRCREV = "a6e474c9e896e4ba1eb40066a03402afb040710a" |
27 | 27 | ||
28 | SRC_URI += "file://CVE-2025-10823.patch" | ||
29 | |||
28 | UPSTREAM_CHECK_GITTAGREGEX = "fio-(?P<pver>\d+(\.\d+)+)" | 30 | UPSTREAM_CHECK_GITTAGREGEX = "fio-(?P<pver>\d+(\.\d+)+)" |
29 | 31 | ||
30 | 32 | ||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd/0001-build-certs.py-use-usr-bin-env-for-python3.patch b/meta-oe/recipes-bsp/fwupd/fwupd/0001-build-certs.py-use-usr-bin-env-for-python3.patch deleted file mode 100644 index 3a4ecb1f29..0000000000 --- a/meta-oe/recipes-bsp/fwupd/fwupd/0001-build-certs.py-use-usr-bin-env-for-python3.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 2c3896878ba8118b48c55528c6bac98f05f223f3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Rapeli <mikko.rapeli@linaro.org> | ||
3 | Date: Thu, 3 Jul 2025 13:34:21 +0000 | ||
4 | Subject: [PATCH] build-certs.py: use /usr/bin/env for python3 | ||
5 | |||
6 | Avoids errors if python3 install path is not | ||
7 | in /usr/bin. | ||
8 | |||
9 | Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> | ||
10 | --- | ||
11 | data/tests/build-certs.py | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | Upstream-Status: Submitted [https://github.com/fwupd/fwupd/pull/8998] | ||
15 | |||
16 | diff --git a/data/tests/build-certs.py b/data/tests/build-certs.py | ||
17 | index 3b8503b72bcf..222e8a4a0f8b 100755 | ||
18 | --- a/data/tests/build-certs.py | ||
19 | +++ b/data/tests/build-certs.py | ||
20 | @@ -1,4 +1,4 @@ | ||
21 | -#!/usr/bin/python3 | ||
22 | +#!/usr/bin/env python3 | ||
23 | # SPDX-License-Identifier: LGPL-2.1+ | ||
24 | |||
25 | import os | ||
26 | -- | ||
27 | 2.43.0 | ||
28 | |||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd/0001-fu-lzma-common.c-reduce-lzma-compression-level-from-.patch b/meta-oe/recipes-bsp/fwupd/fwupd/0001-fu-lzma-common.c-reduce-lzma-compression-level-from-.patch deleted file mode 100644 index b0d3863eaa..0000000000 --- a/meta-oe/recipes-bsp/fwupd/fwupd/0001-fu-lzma-common.c-reduce-lzma-compression-level-from-.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From c96668ab830d016eeff977d5ca4f99d288cf38c0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Rapeli <mikko.rapeli@linaro.org> | ||
3 | Date: Tue, 8 Jul 2025 07:05:02 +0000 | ||
4 | Subject: [PATCH] fu-lzma-common.c: reduce lzma compression level from 9 to | ||
5 | default 6 | ||
6 | |||
7 | xz manual page says default is 6 and levels higher than that can cause | ||
8 | huge CPU and memory usage. On yocto qemu target, the fwupd tests | ||
9 | fail to run with compression level 9: | ||
10 | |||
11 | FuSelfTest:ERROR:../sources/fwupd-2.0.12/libfwupdplugin/fu-self-test.c:6342:fu_lzma_func: assertion failed (error == NULL): failed to set up LZMA encoder rc=5 (FwupdError, 10) | ||
12 | not ok /fwupd/lzma - FuSelfTest:ERROR:../sources/fwupd-2.0.12/libfwupdplugin/fu-self-test.c:6342:fu_lzma_func: assertion failed (error == NULL): failed to set up LZMA encoder rc=5 (FwupdError, 10) | ||
13 | |||
14 | With default compression level 6 the tests pass. | ||
15 | |||
16 | https://linux.die.net/man/1/xz | ||
17 | |||
18 | -6 ... -9 | ||
19 | Excellent compression with medium to high memory usage. | ||
20 | These are also slower than the lower preset levels. | ||
21 | The default is -6. Unless you want to maximize the compression ratio, | ||
22 | you probably don't want a higher preset level than -7 due to | ||
23 | speed and memory usage. | ||
24 | |||
25 | Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> | ||
26 | --- | ||
27 | libfwupdplugin/fu-lzma-common.c | 2 +- | ||
28 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
29 | |||
30 | Upstream-Status: Submitted [https://github.com/fwupd/fwupd/pull/9019] | ||
31 | |||
32 | diff --git a/libfwupdplugin/fu-lzma-common.c b/libfwupdplugin/fu-lzma-common.c | ||
33 | index a64ec773da91..d381ed52e135 100644 | ||
34 | --- a/libfwupdplugin/fu-lzma-common.c | ||
35 | +++ b/libfwupdplugin/fu-lzma-common.c | ||
36 | @@ -89,7 +89,7 @@ fu_lzma_compress_bytes(GBytes *blob, GError **error) | ||
37 | strm.next_in = g_bytes_get_data(blob, NULL); | ||
38 | strm.avail_in = g_bytes_get_size(blob); | ||
39 | |||
40 | - rc = lzma_easy_encoder(&strm, 9, LZMA_CHECK_CRC64); | ||
41 | + rc = lzma_easy_encoder(&strm, 6, LZMA_CHECK_CRC64); | ||
42 | if (rc != LZMA_OK) { | ||
43 | lzma_end(&strm); | ||
44 | g_set_error(error, | ||
45 | -- | ||
46 | 2.43.0 | ||
47 | |||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb b/meta-oe/recipes-bsp/fwupd/fwupd_2.0.16.bb index eb43c3d865..31b17486cb 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd_2.0.12.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd_2.0.16.bb | |||
@@ -17,11 +17,9 @@ DEPENDS = "\ | |||
17 | 17 | ||
18 | SRC_URI = "\ | 18 | SRC_URI = "\ |
19 | https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ | 19 | https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ |
20 | file://0001-build-certs.py-use-usr-bin-env-for-python3.patch \ | ||
21 | file://0001-fu-lzma-common.c-reduce-lzma-compression-level-from-.patch \ | ||
22 | file://run-ptest \ | 20 | file://run-ptest \ |
23 | " | 21 | " |
24 | SRC_URI[sha256sum] = "83eab17ef2e65249491aef5e99419827b43ac56d40c5b0747b59ee94b147215e" | 22 | SRC_URI[sha256sum] = "79cce6b61d9ea531de0ef3b13e7f2682c699901b11f410b2ed91192618e1620e" |
25 | 23 | ||
26 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" | 24 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" |
27 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 25 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
@@ -85,7 +83,7 @@ FILES:${PN} += "\ | |||
85 | 83 | ||
86 | FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \ | 84 | FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \ |
87 | ${datadir}/installed-tests/" | 85 | ${datadir}/installed-tests/" |
88 | RDEPENDS:${PN}-ptest += "gnome-desktop-testing python3" | 86 | RDEPENDS:${PN}-ptest += "gnome-desktop-testing python3 dbus" |
89 | 87 | ||
90 | # ESP mounting, not strictly necessary | 88 | # ESP mounting, not strictly necessary |
91 | RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'udisks2', '', d)}" | 89 | RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'udisks2', '', d)}" |
diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_7.0.9.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_7.0.19.bb index a7c5478b64..28e4cc4eb0 100644 --- a/meta-oe/recipes-connectivity/zabbix/zabbix_7.0.9.bb +++ b/meta-oe/recipes-connectivity/zabbix/zabbix_7.0.19.bb | |||
@@ -27,7 +27,7 @@ SRC_URI = "https://cdn.zabbix.com/zabbix/sources/stable/7.0/${BPN}-${PV}.tar.gz | |||
27 | file://0001-Fix-configure.ac.patch \ | 27 | file://0001-Fix-configure.ac.patch \ |
28 | file://zabbix-agent.service \ | 28 | file://zabbix-agent.service \ |
29 | " | 29 | " |
30 | SRC_URI[sha256sum] = "8d7755576f30b5d6099ff5e3574549fc248229c017f9753828565174125069f6" | 30 | SRC_URI[sha256sum] = "30bef0173493b199377c9061b34e8a2e16a28eb0d6f7e9c7b942433e4b75367f" |
31 | 31 | ||
32 | inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd | 32 | inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd |
33 | 33 | ||
diff --git a/meta-oe/recipes-core/ndctl/ndctl_v82.bb b/meta-oe/recipes-core/ndctl/ndctl_v83.bb index 2603217326..ed3c639369 100644 --- a/meta-oe/recipes-core/ndctl/ndctl_v82.bb +++ b/meta-oe/recipes-core/ndctl/ndctl_v83.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74a614eac8b2657a4b8e6607421a0883" | |||
10 | 10 | ||
11 | inherit meson pkgconfig bash-completion systemd | 11 | inherit meson pkgconfig bash-completion systemd |
12 | 12 | ||
13 | SRCREV = "74b9e411bf13e87df39a517d10143fafa7e2ea92" | 13 | SRCREV = "4f7a1c63b3305c97013d3c46daa6c0f76feff10d" |
14 | SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https;tag=${PV} \ | 14 | SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https;tag=${PV} \ |
15 | file://0001-include-libgen.h-for-basename.patch" | 15 | file://0001-include-libgen.h-for-basename.patch" |
16 | 16 | ||
diff --git a/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb b/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb index a601d88e7c..178f273ae6 100644 --- a/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb +++ b/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.md;md5=ff30a1c41dfd9e6fa559a9e45ee98302" | |||
9 | SRC_URI = "https://monocypher.org/download/${BPN}-${PV}.tar.gz" | 9 | SRC_URI = "https://monocypher.org/download/${BPN}-${PV}.tar.gz" |
10 | SRC_URI[sha512sum] = "bf275d4c53ff94af6cdc723a4e002e9f080f4d1436c86c76bb37870b34807f1d7b32331d8ff8a1aeb369e946f3769021e03e63efac25b82efc5abf54dc084714" | 10 | SRC_URI[sha512sum] = "bf275d4c53ff94af6cdc723a4e002e9f080f4d1436c86c76bb37870b34807f1d7b32331d8ff8a1aeb369e946f3769021e03e63efac25b82efc5abf54dc084714" |
11 | 11 | ||
12 | MIRRORS = "https://.*/.* https://github.com/LoupVaillant/Monocypher/releases/download/${PV}/${BPN}-${PV}.tar.gz " | 12 | MIRRORS =+ "https://.*/.* https://github.com/LoupVaillant/Monocypher/releases/download/${PV}/${BPN}-${PV}.tar.gz" |
13 | 13 | ||
14 | S = "${UNPACKDIR}/${BPN}-${PV}" | 14 | S = "${UNPACKDIR}/${BPN}-${PV}" |
15 | 15 | ||
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 53a24d14bc..6e07f1ffa9 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc | |||
@@ -15,6 +15,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ | |||
15 | file://fix-arm-atomic.patch \ | 15 | file://fix-arm-atomic.patch \ |
16 | file://0001-Fix-library-LZ4-lookup.patch \ | 16 | file://0001-Fix-library-LZ4-lookup.patch \ |
17 | file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \ | 17 | file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \ |
18 | file://0001-aio_libaio-Check-if-syscall-exists-before-using-it.patch \ | ||
18 | file://ssize_t.patch \ | 19 | file://ssize_t.patch \ |
19 | file://sys_futex.patch \ | 20 | file://sys_futex.patch \ |
20 | file://cross-compiling.patch \ | 21 | file://cross-compiling.patch \ |
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_libaio-Check-if-syscall-exists-before-using-it.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_libaio-Check-if-syscall-exists-before-using-it.patch new file mode 100644 index 0000000000..ee0d1b37ae --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_libaio-Check-if-syscall-exists-before-using-it.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From a30e52fdb6507dd39b081b1218d95eb8582b81fb Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= | ||
3 | <zboszor@gmail.com> | ||
4 | Date: Mon, 13 Oct 2025 08:57:05 +0200 | ||
5 | Subject: [PATCH] aio_libaio: Check if syscall exists before using it | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | Return -ENOSYS if not implememented, fixes build on arches like RISCV32 | ||
11 | Fixes | ||
12 | tpool/aio_libaio.cc:61:20: | ||
13 | error: use of undeclared identifier ' | ||
14 | ↪ __NR_io_getevents'; did you mean 'io_getevents'? | ||
15 | | 61 | int ret= syscall(__NR_io_getevents, reinterpret_cast<long>(ctx), | ||
16 | | | ^~~~~~~~~~~~~~~~~ | ||
17 | |||
18 | Upstream-Status: Pending | ||
19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
20 | Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> | ||
21 | --- | ||
22 | tpool/aio_libaio.cc | 4 ++++ | ||
23 | 1 file changed, 4 insertions(+) | ||
24 | |||
25 | diff --git a/tpool/aio_libaio.cc b/tpool/aio_libaio.cc | ||
26 | index 2ce69384cde..60f558afa87 100644 | ||
27 | --- a/tpool/aio_libaio.cc | ||
28 | +++ b/tpool/aio_libaio.cc | ||
29 | @@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/ | ||
30 | static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev) | ||
31 | noexcept | ||
32 | { | ||
33 | +#ifdef __NR_io_getevents | ||
34 | int saved_errno= errno; | ||
35 | int ret= syscall(__NR_io_getevents, reinterpret_cast<long>(ctx), | ||
36 | min_nr, nr, ev, 0); | ||
37 | @@ -67,6 +68,9 @@ static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev) | ||
38 | errno= saved_errno; | ||
39 | } | ||
40 | return ret; | ||
41 | +#else | ||
42 | + return -ENOSYS; | ||
43 | +#endif | ||
44 | } | ||
45 | |||
46 | |||
47 | -- | ||
48 | 2.51.0 | ||
49 | |||
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250512.1.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250814.1.bb index d4e616a733..1504dacb00 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250512.1.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250814.1.bb | |||
@@ -7,13 +7,11 @@ SECTION = "libs" | |||
7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" |
9 | 9 | ||
10 | SRCREV = "76bb24329e8bf5f39704eb10d21b9a80befa7c81" | 10 | SRC_URI = "https://github.com/abseil/${BPN}/releases/download/${PV}/${BP}.tar.gz \ |
11 | BRANCH = "lts_2025_05_12" | ||
12 | SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ | ||
13 | file://0001-absl-always-use-asm-sgidefs.h.patch \ | 11 | file://0001-absl-always-use-asm-sgidefs.h.patch \ |
14 | file://0002-abseil-ppc-fixes.patch \ | 12 | file://0002-abseil-ppc-fixes.patch \ |
15 | " | 13 | " |
16 | 14 | SRC_URI[sha256sum] = "1692f77d1739bacf3f94337188b78583cf09bab7e420d2dc6c5605a4f86785a1" | |
17 | 15 | ||
18 | inherit cmake | 16 | inherit cmake |
19 | 17 | ||
diff --git a/meta-oe/recipes-devtools/b4/b4_0.14.2.bb b/meta-oe/recipes-devtools/b4/b4_0.14.3.bb index 794e1d24dd..a922f999e2 100644 --- a/meta-oe/recipes-devtools/b4/b4_0.14.2.bb +++ b/meta-oe/recipes-devtools/b4/b4_0.14.3.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
5 | 5 | ||
6 | inherit pypi python_pep517 python_setuptools_build_meta | 6 | inherit pypi python_pep517 python_setuptools_build_meta |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "4f835b6e5ae30eff6004bb25c15fd8f4f6ecd1105596e86db1871fef7d18113d" | 8 | SRC_URI[sha256sum] = "31a4927b8dfbb5c97edfc9569cda3b6737bbfd8430881e8cc48a0b088ced6147" |
9 | 9 | ||
10 | RDEPENDS:${PN} += " \ | 10 | RDEPENDS:${PN} += " \ |
11 | python3-mailbox \ | 11 | python3-mailbox \ |
diff --git a/meta-oe/recipes-devtools/ctags/ctags_6.2.20250921.0.bb b/meta-oe/recipes-devtools/ctags/ctags_6.2.20251012.0.bb index 7f87f15f9a..5fec7c2b06 100644 --- a/meta-oe/recipes-devtools/ctags/ctags_6.2.20250921.0.bb +++ b/meta-oe/recipes-devtools/ctags/ctags_6.2.20251012.0.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | |||
14 | 14 | ||
15 | inherit autotools-brokensep pkgconfig manpages | 15 | inherit autotools-brokensep pkgconfig manpages |
16 | 16 | ||
17 | SRCREV = "d45ba7971bea23a404a275a3a77c53a85f808fed" | 17 | SRCREV = "e6a4947d6e04001771d4740636f83d34a1d6f281" |
18 | SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https;tag=p${PV}" | 18 | SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https;tag=p${PV}" |
19 | 19 | ||
20 | 20 | ||
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.14.0.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.14.0.bb index 512a63549e..73594fc09f 100644 --- a/meta-oe/recipes-devtools/doxygen/doxygen_1.14.0.bb +++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.14.0.bb | |||
@@ -22,4 +22,14 @@ EXTRA_OECMAKE += "\ | |||
22 | -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ | 22 | -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ |
23 | " | 23 | " |
24 | 24 | ||
25 | do_install:append() { | ||
26 | sed -i -e 's;^#ifndef.*GENERATED_SRC_MSCGEN_LANGUAGE_HPP_INCLUDED$;#ifndef GENERATED_SRC_MSCGEN_LANGUAGE_HPP_INCLUDED;g' ${B}/generated_src/mscgen_language.hpp | ||
27 | sed -i -e 's;^# define.*GENERATED_SRC_MSCGEN_LANGUAGE_HPP_INCLUDED$;# define GENERATED_SRC_MSCGEN_LANGUAGE_HPP_INCLUDED;g' ${B}/generated_src/mscgen_language.hpp | ||
28 | sed -i -e 's;^#endif.*GENERATED_SRC_MSCGEN_LANGUAGE_HPP_INCLUDED.*$;#endif;g' ${B}/generated_src/mscgen_language.hpp | ||
29 | |||
30 | sed -i -e 's;^#ifndef.*GENERATED_SRC_CE_PARSE_HPP_INCLUDED$;#ifndef GENERATED_SRC_CE_PARSE_HPP_INCLUDED;g' ${B}/generated_src/ce_parse.hpp | ||
31 | sed -i -e 's;^# define.*GENERATED_SRC_CE_PARSE_HPP_INCLUDED$;# define GENERATED_SRC_CE_PARSE_HPP_INCLUDED;g' ${B}/generated_src/ce_parse.hpp | ||
32 | sed -i -e 's;^#endif.*GENERATED_SRC_CE_PARSE_HPP_INCLUDED.*$;#endif;g' ${B}/generated_src/ce_parse.hpp | ||
33 | } | ||
34 | |||
25 | BBCLASSEXTEND = "native nativesdk" | 35 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-oe/recipes-devtools/mpich/mpich_4.3.1.bb b/meta-oe/recipes-devtools/mpich/mpich_4.3.2.bb index ffe1791c61..f1ac212023 100644 --- a/meta-oe/recipes-devtools/mpich/mpich_4.3.1.bb +++ b/meta-oe/recipes-devtools/mpich/mpich_4.3.2.bb | |||
@@ -6,7 +6,7 @@ LICENSE = "BSD-2-Clause" | |||
6 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a296dfb961b957b0e8adf67d8478d3d" | 6 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a296dfb961b957b0e8adf67d8478d3d" |
7 | 7 | ||
8 | SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz" | 8 | SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz" |
9 | SRC_URI[sha256sum] = "acc11cb2bdc69678dc8bba747c24a28233c58596f81f03785bf2b7bb7a0ef7dc" | 9 | SRC_URI[sha256sum] = "47d774587a7156a53752218c811c852e70ac44db9c502dc3f399b4cb817e3818" |
10 | 10 | ||
11 | RDEPENDS:${PN} += "bash perl libxml2" | 11 | RDEPENDS:${PN} += "bash perl libxml2" |
12 | 12 | ||
diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-tcl-board-ti_-_swd_native.cfg-Add-support-for-direct.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-tcl-board-ti_-_swd_native.cfg-Add-support-for-direct.patch new file mode 100644 index 0000000000..8a3b72321f --- /dev/null +++ b/meta-oe/recipes-devtools/openocd/openocd/0001-tcl-board-ti_-_swd_native.cfg-Add-support-for-direct.patch | |||
@@ -0,0 +1,77 @@ | |||
1 | From 5c55d79ecfecc4a1b5a5ebcf649227ca1e1bf38e Mon Sep 17 00:00:00 2001 | ||
2 | From: Joao Lima <joao.lima@hbkworld.com> | ||
3 | Date: Tue, 30 Sep 2025 12:13:04 +0000 | ||
4 | Subject: [PATCH 1/2] tcl/board/ti_*_swd_native.cfg: Add support for direct | ||
5 | memory access via SW | ||
6 | |||
7 | Add support for SWD emulation as a transport method for | ||
8 | direct memory operations of boards TI AM64x and TI J784s4 | ||
9 | |||
10 | Upstream-Status: Submitted [http://openocd.zylin.com/#/c/9020/] | ||
11 | |||
12 | Change-Id: I17fe9b2bef5c58886625bfdb88d92645ba4d7da7 | ||
13 | Signed-off-by: Joao Lima <joao.lima@hbkworld.com> | ||
14 | --- | ||
15 | tcl/board/ti_am64xx_swd_native.cfg | 23 +++++++++++++++++++++++ | ||
16 | tcl/board/ti_j784s4_swd_native.cfg | 22 ++++++++++++++++++++++ | ||
17 | 2 files changed, 45 insertions(+) | ||
18 | create mode 100644 tcl/board/ti_am64xx_swd_native.cfg | ||
19 | create mode 100644 tcl/board/ti_j784s4_swd_native.cfg | ||
20 | |||
21 | diff --git a/tcl/board/ti_am64xx_swd_native.cfg b/tcl/board/ti_am64xx_swd_native.cfg | ||
22 | new file mode 100644 | ||
23 | index 000000000..d3727149e | ||
24 | --- /dev/null | ||
25 | +++ b/tcl/board/ti_am64xx_swd_native.cfg | ||
26 | @@ -0,0 +1,23 @@ | ||
27 | +# SPDX-License-Identifier: GPL-2.0-or-later | ||
28 | +# Copyright (C) 2022-2023 Texas Instruments Incorporated - http://www.ti.com/ | ||
29 | +# | ||
30 | +# Texas Instruments am642 | ||
31 | +# Link: https://www.ti.com/product/AM642 | ||
32 | +# | ||
33 | +# This configuration file is used as a self hosted debug configuration that | ||
34 | +# works on every AM642 platform based on firewall configuration permitted | ||
35 | +# in the system. | ||
36 | +# | ||
37 | +# In this system openOCD runs on one of the CPUs inside AM625 and provides | ||
38 | +# network ports that can then be used to debug the microcontrollers on the | ||
39 | +# SoC - either self hosted IDE OR remotely. | ||
40 | + | ||
41 | +# We are using dmem, which uses dapdirect_swd transport | ||
42 | +adapter driver dmem | ||
43 | +transport select swd | ||
44 | + | ||
45 | +if { ![info exists SOC] } { | ||
46 | + set SOC am642 | ||
47 | +} | ||
48 | + | ||
49 | +source [find target/ti_k3.cfg] | ||
50 | diff --git a/tcl/board/ti_j784s4_swd_native.cfg b/tcl/board/ti_j784s4_swd_native.cfg | ||
51 | new file mode 100644 | ||
52 | index 000000000..13b2ac3b8 | ||
53 | --- /dev/null | ||
54 | +++ b/tcl/board/ti_j784s4_swd_native.cfg | ||
55 | @@ -0,0 +1,22 @@ | ||
56 | +# SPDX-License-Identifier: GPL-2.0-or-later | ||
57 | +# Copyright (C) 2022-2023 Texas Instruments Incorporated - http://www.ti.com/ | ||
58 | +# | ||
59 | +# Texas Instruments TDA4VM/J721E | ||
60 | +# Link: https://www.ti.com/product/TDA4VM | ||
61 | +# | ||
62 | +# This configuration file is used as a self hosted debug configuration that | ||
63 | +# works on every TDA4VM platform based on firewall configuration permitted | ||
64 | +# in the system. | ||
65 | +# | ||
66 | +# In this system openOCD runs on one of the CPUs inside TDA4VM and provides | ||
67 | +# network ports that can then be used to debug the microcontrollers on the | ||
68 | +# SoC - either self hosted IDE OR remotely. | ||
69 | + | ||
70 | +# We are using dmem, which uses dapdirect_swd transport | ||
71 | +adapter driver dmem | ||
72 | +transport select swd | ||
73 | + | ||
74 | +if { ![info exists SOC] } { | ||
75 | + set SOC j784s4 | ||
76 | +} | ||
77 | +source [find target/ti_k3.cfg] | ||
diff --git a/meta-oe/recipes-devtools/openocd/openocd/0002-tcl-target-ti_k3.cfg-Add-support-for-direct-memory-a.patch b/meta-oe/recipes-devtools/openocd/openocd/0002-tcl-target-ti_k3.cfg-Add-support-for-direct-memory-a.patch new file mode 100644 index 0000000000..c879696ef5 --- /dev/null +++ b/meta-oe/recipes-devtools/openocd/openocd/0002-tcl-target-ti_k3.cfg-Add-support-for-direct-memory-a.patch | |||
@@ -0,0 +1,65 @@ | |||
1 | From 39bc4461642eaaf993d0a6cf772d51cdde8c0ae8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Joao Lima <joao.lima@hbkworld.com> | ||
3 | Date: Tue, 30 Sep 2025 12:13:30 +0000 | ||
4 | Subject: [PATCH 2/2] tcl/target/ti_k3.cfg: Add support for direct memory | ||
5 | access via SWD | ||
6 | |||
7 | Adds support for direct memory access via SWD emulation for AM64x and | ||
8 | J784s4 boards, configuring addresses and parameters required for | ||
9 | direct memory operations. | ||
10 | |||
11 | Upstream-Status: Submitted [http://openocd.zylin.com/#/c/9021/] | ||
12 | |||
13 | Change-Id: Iebc16612b3990b2ef19ddc4143b66ab1bcbfe0f3 | ||
14 | Signed-off-by: Joao Lima <joao.lima@hbkworld.com> | ||
15 | --- | ||
16 | tcl/target/ti_k3.cfg | 22 +++++++++++++++++++++- | ||
17 | 1 file changed, 21 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/tcl/target/ti_k3.cfg b/tcl/target/ti_k3.cfg | ||
20 | index 0dee74e5e..6b0ac2e52 100644 | ||
21 | --- a/tcl/target/ti_k3.cfg | ||
22 | +++ b/tcl/target/ti_k3.cfg | ||
23 | @@ -176,6 +176,16 @@ switch $_soc { | ||
24 | # Uses the same JTAG ID | ||
25 | set _armv8_cores 0 | ||
26 | } | ||
27 | + | ||
28 | + # Setup DMEM access descriptions | ||
29 | + # DAPBUS (Debugger) description | ||
30 | + set _dmem_base_address 0x740002000 | ||
31 | + set _dmem_ap_address_offset 0x100 | ||
32 | + set _dmem_max_aps 10 | ||
33 | + # Emulated AP description | ||
34 | + set _dmem_emu_base_address 0x760000000 | ||
35 | + set _dmem_emu_base_address_map_to 0x1d500000 | ||
36 | + set _dmem_emu_ap_list 1 | ||
37 | } | ||
38 | am625 { | ||
39 | set _K3_DAP_TAPID 0x0bb7e02f | ||
40 | @@ -333,7 +343,7 @@ switch $_soc { | ||
41 | set ARMV8_CTIBASE {0x90420000 0x90520000 0x90620000 0x90720000 | ||
42 | 0x90820000 0x90920000 0x90a20000 0x90b20000} | ||
43 | |||
44 | - # J721s2 has 4 clusters of 2 R5 cores each. | ||
45 | + # J784s4 has 4 clusters of 2 R5 cores each. | ||
46 | set _r5_cores 8 | ||
47 | set R5_DBGBASE {0x9d010000 0x9d012000 | ||
48 | 0x9d410000 0x9d412000 | ||
49 | @@ -348,6 +358,16 @@ switch $_soc { | ||
50 | main1_r5.0 main1_r5.1 | ||
51 | main2_r5.0 main2_r5.1} | ||
52 | |||
53 | + # Setup DMEM access descriptions | ||
54 | + # DAPBUS (Debugger) description | ||
55 | + set _dmem_base_address 0x4c40002000 | ||
56 | + set _dmem_ap_address_offset 0x100 | ||
57 | + set _dmem_max_aps 8 | ||
58 | + # Emulated AP description | ||
59 | + set _dmem_emu_base_address 0x4c60000000 | ||
60 | + set _dmem_emu_base_address_map_to 0x1d600000 | ||
61 | + set _dmem_emu_ap_list 1 | ||
62 | + | ||
63 | # sysctrl CTI base | ||
64 | set CM3_CTIBASE {0x20001000} | ||
65 | # Sysctrl power-ap unlock offsets | ||
diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index 3bbe33ca1d..fd95c9b84a 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb | |||
@@ -4,19 +4,24 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=599d2d1ee7fc84c0467b3d19801db870" | |||
4 | DEPENDS = "libusb-compat libftdi" | 4 | DEPENDS = "libusb-compat libftdi" |
5 | RDEPENDS:${PN} = "libusb1" | 5 | RDEPENDS:${PN} = "libusb1" |
6 | 6 | ||
7 | MIRRORS += " \ | ||
8 | git://repo.or.cz/openocd.git git://github.com/openocd-org/openocd.git \ | ||
9 | " | ||
10 | |||
7 | SRC_URI = " \ | 11 | SRC_URI = " \ |
8 | git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \ | 12 | git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \ |
9 | git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \ | 13 | git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \ |
10 | git://github.com/msteveb/jimtcl.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/jimtcl;name=jimtcl;branch=master \ | 14 | git://github.com/msteveb/jimtcl.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/jimtcl;name=jimtcl;branch=master \ |
11 | git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \ | 15 | git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \ |
12 | file://0001-Makefile.am-Use-SOURCE_DATE_EPOCH-environment-variab.patch \ | 16 | file://0001-tcl-board-ti_-_swd_native.cfg-Add-support-for-direct.patch \ |
17 | file://0002-tcl-target-ti_k3.cfg-Add-support-for-direct-memory-a.patch \ | ||
13 | " | 18 | " |
14 | 19 | ||
15 | SRCREV_FORMAT = "openocd" | 20 | SRCREV_FORMAT = "openocd" |
16 | SRCREV_openocd = "91bd4313444c5a949ce49d88ab487608df7d6c37" | 21 | SRCREV_openocd = "66ea461846a3a4a96687c9287c3f61ae8ce0b775" |
17 | SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" | 22 | SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" |
18 | SRCREV_jimtcl = "fcbb4499a6b46ef69e7a95da53e30796e20817f0" | 23 | SRCREV_jimtcl = "f160866171457474f7c4d6ccda70f9b77524407e" |
19 | SRCREV_libjaylink = "9aa7a5957c07bb6e862fc1a6d3153d109c7407e4" | 24 | SRCREV_libjaylink = "0d23921a05d5d427332a142d154c213d0c306eb1" |
20 | 25 | ||
21 | PV = "0.12+git" | 26 | PV = "0.12+git" |
22 | 27 | ||
@@ -24,7 +29,7 @@ inherit pkgconfig autotools-brokensep gettext | |||
24 | 29 | ||
25 | BBCLASSEXTEND += "native nativesdk" | 30 | BBCLASSEXTEND += "native nativesdk" |
26 | 31 | ||
27 | EXTRA_OECONF = "--enable-ftdi --enable-jtag_vpi --enable-buspirate --disable-doxygen-html --disable-werror" | 32 | EXTRA_OECONF = "--enable-ftdi --enable-jtag_vpi --enable-buspirate --disable-doxygen-html --disable-werror --enable-internal-jimtcl" |
28 | 33 | ||
29 | do_configure() { | 34 | do_configure() { |
30 | ./bootstrap nosubmodule | 35 | ./bootstrap nosubmodule |
diff --git a/meta-oe/recipes-devtools/sip/sip_6.12.0.bb b/meta-oe/recipes-devtools/sip/sip_6.13.1.bb index 20e705f1a6..1f7c3e9afd 100644 --- a/meta-oe/recipes-devtools/sip/sip_6.12.0.bb +++ b/meta-oe/recipes-devtools/sip/sip_6.13.1.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=236276327275fdb261636fb40b18d88d" | |||
11 | inherit pypi python_setuptools_build_meta python3native | 11 | inherit pypi python_setuptools_build_meta python3native |
12 | 12 | ||
13 | PYPI_PACKAGE = "sip" | 13 | PYPI_PACKAGE = "sip" |
14 | SRC_URI[sha256sum] = "083ced94f85315493231119a63970b2ba42b1d38b38e730a70e02a99191a89c6" | 14 | SRC_URI[sha256sum] = "d065b74eca996f29f1f0831ad321efaecf9906759b09466edc45349df7be6cd0" |
15 | 15 | ||
16 | DEPENDS += "python3-setuptools-scm-native" | 16 | DEPENDS += "python3-setuptools-scm-native" |
17 | 17 | ||
diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb index 48e6971d1a..e4078d6862 100644 --- a/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb +++ b/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb | |||
@@ -35,7 +35,7 @@ PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup keyutils nss | |||
35 | PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" | 35 | PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" |
36 | PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" | 36 | PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" |
37 | PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper" | 37 | PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper" |
38 | PACKAGECONFIG[smart] = "--with-smart,--without-smart,libatasmart" | 38 | PACKAGECONFIG[smart] = "--with-smart --with-drivedb=${RECIPE_SYSROOT}${datadir}/smartmontools,--without-smart,libatasmart smartmontools" |
39 | PACKAGECONFIG[smartmontools] = "--with-smartmontools,--without-smartmontools,json-glib,smartmontools" | 39 | PACKAGECONFIG[smartmontools] = "--with-smartmontools,--without-smartmontools,json-glib,smartmontools" |
40 | 40 | ||
41 | export GIR_EXTRA_LIBS_PATH = "${B}/src/utils/.libs" | 41 | export GIR_EXTRA_LIBS_PATH = "${B}/src/utils/.libs" |
diff --git a/meta-oe/recipes-extended/sanlock/sanlock_4.0.0.bb b/meta-oe/recipes-extended/sanlock/sanlock_4.1.0.bb index fe8592be39..2f4886057e 100644 --- a/meta-oe/recipes-extended/sanlock/sanlock_4.0.0.bb +++ b/meta-oe/recipes-extended/sanlock/sanlock_4.1.0.bb | |||
@@ -17,7 +17,7 @@ SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \ | |||
17 | file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ | 17 | file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ |
18 | file://0001-add-missing-system-header-string.h.patch \ | 18 | file://0001-add-missing-system-header-string.h.patch \ |
19 | " | 19 | " |
20 | SRCREV = "70c268a07273da78a4aadd14c40ffb75138ccebe" | 20 | SRCREV = "57013022da9c06c13f65a24684522a04323f59b6" |
21 | 21 | ||
22 | 22 | ||
23 | CVE_STATUS[CVE-2012-5638] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." | 23 | CVE_STATUS[CVE-2012-5638] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." |
diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_14.0.0.bb b/meta-oe/recipes-graphics/graphviz/graphviz_14.0.1.bb index c9e7618312..7114473ad0 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_14.0.0.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_14.0.1.bb | |||
@@ -23,7 +23,7 @@ SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-re | |||
23 | SRC_URI:append:class-nativesdk = "\ | 23 | SRC_URI:append:class-nativesdk = "\ |
24 | file://graphviz-setup.sh \ | 24 | file://graphviz-setup.sh \ |
25 | " | 25 | " |
26 | SRC_URI[sha256sum] = "2e3531733cb584668c09bebd319d42b7284278e7702581b1ffdb279f2acd2fce" | 26 | SRC_URI[sha256sum] = "2450df5d80c68f13f26362fafa797b2fbf887ebdc6733920cc5f7df5bec0cd23" |
27 | 27 | ||
28 | UPSTREAM_CHECK_URI = "https://graphviz.org/download/" | 28 | UPSTREAM_CHECK_URI = "https://graphviz.org/download/" |
29 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 29 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.22.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.24.bb index d019212a7b..f556f332f8 100644 --- a/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.22.bb +++ b/meta-oe/recipes-graphics/libsdl3/libsdl3_3.2.24.bb | |||
@@ -19,7 +19,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL3-${PV}.tar.gz" | |||
19 | 19 | ||
20 | S = "${UNPACKDIR}/SDL3-${PV}" | 20 | S = "${UNPACKDIR}/SDL3-${PV}" |
21 | 21 | ||
22 | SRC_URI[sha256sum] = "f29d00cbcee273c0a54f3f32f86bf5c595e8823a96b1d92a145aac40571ebfcc" | 22 | SRC_URI[sha256sum] = "81cc0fc17e5bf2c1754eeca9af9c47a76789ac5efdd165b3b91cbbe4b90bfb76" |
23 | 23 | ||
24 | inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even | 24 | inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even |
25 | 25 | ||
diff --git a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index 16b15f745e..80b5cd527e 100644 --- a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb | |||
@@ -24,8 +24,10 @@ SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc7 | |||
24 | inherit cmake | 24 | inherit cmake |
25 | 25 | ||
26 | DEPENDS = "libcap file bzip2" | 26 | DEPENDS = "libcap file bzip2" |
27 | RDEPENDS:dirsplit = "perl" | ||
28 | 27 | ||
28 | EXTRA_OECMAKE = "-DCMAKE_SKIP_BUILD_RPATH=ON" | ||
29 | |||
30 | RDEPENDS:dirsplit = "perl" | ||
29 | RDEPENDS:${PN}-dev = "" | 31 | RDEPENDS:${PN}-dev = "" |
30 | 32 | ||
31 | PACKAGES =+ "dirsplit genisoimage icedax wodim" | 33 | PACKAGES =+ "dirsplit genisoimage icedax wodim" |
diff --git a/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb b/meta-oe/recipes-printing/cups/cups-filters_2.0.1.bb index 2f1a772dde..e488bd3039 100644 --- a/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb +++ b/meta-oe/recipes-printing/cups/cups-filters_2.0.1.bb | |||
@@ -10,7 +10,7 @@ SRC_URI = " \ | |||
10 | file://fix-make-race.patch \ | 10 | file://fix-make-race.patch \ |
11 | file://0001-Fix-build-failure-with-GCC-15-and-std-c23.patch \ | 11 | file://0001-Fix-build-failure-with-GCC-15-and-std-c23.patch \ |
12 | " | 12 | " |
13 | SRC_URI[sha256sum] = "b5152e3dd148ed73835827ac2f219df7cf5808dbf9dbaec2aa0127b44de800d8" | 13 | SRC_URI[sha256sum] = "39e71de3ce06762b342749f1dc7cba6817738f7bf4d322c1bb9ab10b8569ab80" |
14 | 14 | ||
15 | UPSTREAM_CHECK_URI = "https://github.com/OpenPrinting/cups-filters/releases" | 15 | UPSTREAM_CHECK_URI = "https://github.com/OpenPrinting/cups-filters/releases" |
16 | 16 | ||
@@ -23,9 +23,6 @@ EXTRA_OECONF += " \ | |||
23 | --localstatedir=${localstatedir} \ | 23 | --localstatedir=${localstatedir} \ |
24 | " | 24 | " |
25 | 25 | ||
26 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" | ||
27 | PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" | ||
28 | |||
29 | FILES:${PN} += "${datadir}" | 26 | FILES:${PN} += "${datadir}" |
30 | FILES:${PN}-dev += "${datadir}/ppdc" | 27 | FILES:${PN}-dev += "${datadir}/ppdc" |
31 | 28 | ||
diff --git a/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2153-5795.patch b/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2153-5795.patch new file mode 100644 index 0000000000..4b31718dea --- /dev/null +++ b/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2153-5795.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 183c8aeb601a02a38dd6815bcb651a7317b1b647 Mon Sep 17 00:00:00 2001 | ||
2 | From: Glenn Song <43005495+glennsong09@users.noreply.github.com> | ||
3 | Date: Thu, 9 Oct 2025 07:51:49 -0500 | ||
4 | Subject: [PATCH] Fix CVE-2025-2153 (#5795) | ||
5 | |||
6 | This PR fixes #5329. Previously, the message flags field was able to be modified such that a message that is not sharable according to the share_flags field in H5O_msg_class_t could be treated as sharable. A check has been added to make sure messages that are not sharable can't be modified so that they indicate they can be shared. | ||
7 | |||
8 | The bug was first reproduced using the fuzzer and the POC file from #5329. With this change, the heap based buffer overflow no longer occurs. | ||
9 | |||
10 | CVE: CVE-2025-2153 | ||
11 | Upstream-Status: Backport [https://github.com/HDFGroup/hdf5/commit/38954615fc079538aa45d48097625a6d76aceef0] | ||
12 | |||
13 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
14 | --- | ||
15 | src/H5Ocache.c | 4 ++-- | ||
16 | src/H5Omessage.c | 3 +++ | ||
17 | 2 files changed, 5 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/src/H5Ocache.c b/src/H5Ocache.c | ||
20 | index 87f321c..12c30cf 100644 | ||
21 | --- a/src/H5Ocache.c | ||
22 | +++ b/src/H5Ocache.c | ||
23 | @@ -1399,8 +1399,8 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t chunk_size, const uint8_t | ||
24 | else { | ||
25 | /* Check for message of unshareable class marked as "shareable" | ||
26 | */ | ||
27 | - if ((flags & H5O_MSG_FLAG_SHAREABLE) && H5O_msg_class_g[id] && | ||
28 | - !(H5O_msg_class_g[id]->share_flags & H5O_SHARE_IS_SHARABLE)) | ||
29 | + if (((flags & H5O_MSG_FLAG_SHARED) || (flags & H5O_MSG_FLAG_SHAREABLE)) && | ||
30 | + H5O_msg_class_g[id] && !(H5O_msg_class_g[id]->share_flags & H5O_SHARE_IS_SHARABLE)) | ||
31 | HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, | ||
32 | "message of unshareable class flagged as shareable"); | ||
33 | |||
34 | diff --git a/src/H5Omessage.c b/src/H5Omessage.c | ||
35 | index 7190e46..fb9006c 100644 | ||
36 | --- a/src/H5Omessage.c | ||
37 | +++ b/src/H5Omessage.c | ||
38 | @@ -354,6 +354,9 @@ H5O__msg_write_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type, unsigned m | ||
39 | */ | ||
40 | assert(!(mesg_flags & H5O_MSG_FLAG_DONTSHARE)); | ||
41 | |||
42 | + /* Sanity check to see if the type is not sharable */ | ||
43 | + assert(type->share_flags & H5O_SHARE_IS_SHARABLE); | ||
44 | + | ||
45 | /* Remove the old message from the SOHM index */ | ||
46 | /* (It would be more efficient to try to share the message first, then | ||
47 | * delete it (avoiding thrashing the index in the case the ref. | ||
diff --git a/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2310-5872.patch b/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2310-5872.patch new file mode 100644 index 0000000000..f15a7f9644 --- /dev/null +++ b/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2310-5872.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 7cc3c76f681fb4ca739457950352654aecd647a9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matt L <124107509+mattjala@users.noreply.github.com> | ||
3 | Date: Thu, 9 Oct 2025 16:10:23 -0500 | ||
4 | Subject: [PATCH] Fix CVE-2025-2310 (#5872) | ||
5 | |||
6 | Malformed files can have a zero name-length, which when subtracted lead to an overflow and an out-of-bounds read. | ||
7 | |||
8 | Check that name length is not too small in addition to checking for an overflow directly. | ||
9 | |||
10 | CVE: CVE-2025-2310 | ||
11 | Upstream-Status: Backport [https://github.com/HDFGroup/hdf5/commit/6c86f97e03c6dc7d7bd2bae9acc422bdc3438ff4] | ||
12 | |||
13 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
14 | --- | ||
15 | src/H5Oattr.c | 6 ++++++ | ||
16 | 1 file changed, 6 insertions(+) | ||
17 | |||
18 | diff --git a/src/H5Oattr.c b/src/H5Oattr.c | ||
19 | index 6d1d237..2f8c259 100644 | ||
20 | --- a/src/H5Oattr.c | ||
21 | +++ b/src/H5Oattr.c | ||
22 | @@ -167,6 +167,11 @@ H5O__attr_decode(H5F_t *f, H5O_t *open_oh, unsigned H5_ATTR_UNUSED mesg_flags, u | ||
23 | if (H5_IS_BUFFER_OVERFLOW(p, 2, p_end)) | ||
24 | HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding"); | ||
25 | UINT16DECODE(p, name_len); /* Including null */ | ||
26 | + | ||
27 | + /* Verify that retrieved name length (including null byte) is valid */ | ||
28 | + if (name_len <= 1) | ||
29 | + HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, NULL, "decoded name length is invalid"); | ||
30 | + | ||
31 | if (H5_IS_BUFFER_OVERFLOW(p, 2, p_end)) | ||
32 | HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding"); | ||
33 | UINT16DECODE(p, attr->shared->dt_size); | ||
34 | @@ -190,6 +195,7 @@ H5O__attr_decode(H5F_t *f, H5O_t *open_oh, unsigned H5_ATTR_UNUSED mesg_flags, u | ||
35 | */ | ||
36 | if (H5_IS_BUFFER_OVERFLOW(p, name_len, p_end)) | ||
37 | HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding"); | ||
38 | + | ||
39 | if (NULL == (attr->shared->name = H5MM_strndup((const char *)p, name_len - 1))) | ||
40 | HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed"); | ||
41 | |||
diff --git a/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2924-5814.patch b/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2924-5814.patch new file mode 100644 index 0000000000..a86b5a491b --- /dev/null +++ b/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2924-5814.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From f76c5adea55edec75680fdd7365cc97abc112d0e Mon Sep 17 00:00:00 2001 | ||
2 | From: Glenn Song <43005495+glennsong09@users.noreply.github.com> | ||
3 | Date: Mon, 15 Sep 2025 07:56:54 -0500 | ||
4 | Subject: [PATCH] Fix CVE-2025-2924 (#5814) | ||
5 | |||
6 | CVE: CVE-2025-2924 | ||
7 | Upstream-Status: Backport [https://github.com/HDFGroup/hdf5/commit/0a57195ca67d278f1cf7d01566c121048e337a59] | ||
8 | |||
9 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
10 | --- | ||
11 | src/H5HLcache.c | 5 +++++ | ||
12 | 1 file changed, 5 insertions(+) | ||
13 | |||
14 | diff --git a/src/H5HLcache.c b/src/H5HLcache.c | ||
15 | index d0836fe..7f412d2 100644 | ||
16 | --- a/src/H5HLcache.c | ||
17 | +++ b/src/H5HLcache.c | ||
18 | @@ -225,6 +225,7 @@ H5HL__fl_deserialize(H5HL_t *heap) | ||
19 | /* check arguments */ | ||
20 | assert(heap); | ||
21 | assert(!heap->freelist); | ||
22 | + HDcompile_assert(sizeof(hsize_t) == sizeof(uint64_t)); | ||
23 | |||
24 | /* Build free list */ | ||
25 | free_block = heap->free_block; | ||
26 | @@ -232,6 +233,10 @@ H5HL__fl_deserialize(H5HL_t *heap) | ||
27 | const uint8_t *image; /* Pointer into image buffer */ | ||
28 | |||
29 | /* Sanity check */ | ||
30 | + | ||
31 | + if (free_block > UINT64_MAX - (2 * heap->sizeof_size)) | ||
32 | + HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "decoded heap block address overflow"); | ||
33 | + | ||
34 | if ((free_block + (2 * heap->sizeof_size)) > heap->dblk_size) | ||
35 | HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "bad heap free list"); | ||
36 | |||
diff --git a/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2925-5739.patch b/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2925-5739.patch new file mode 100644 index 0000000000..7a0afba423 --- /dev/null +++ b/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2925-5739.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From ad959fdac99810ea64504d7bdfc7724c5ca25e21 Mon Sep 17 00:00:00 2001 | ||
2 | From: Glenn Song <43005495+glennsong09@users.noreply.github.com> | ||
3 | Date: Thu, 9 Oct 2025 14:48:55 -0500 | ||
4 | Subject: [PATCH] Fix CVE-2025-2925 (#5739) | ||
5 | |||
6 | This PR fixes issue #5383, which was occurring due to actual_len + H5C_IMAGE_EXTRA_SPACE being 0. When realloc was called, it freed image, but gets sent to done before new_image can be assigned to image. Because the pointer for image isn't null, it attempts to free it here again, causing the double free to occur. This PR addresses Quincey's concern and fixes the issue while preserving new_image and image. | ||
7 | |||
8 | The bug was first reproduced using the fuzzer and the POC file from #5383. With this change, the double free no longer occurs. | ||
9 | |||
10 | CVE: CVE-2025-2925 | ||
11 | Upstream-Status: Backport [https://github.com/HDFGroup/hdf5/commit/4310c19608455c17a213383d07715efb2918defc] | ||
12 | |||
13 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
14 | --- | ||
15 | src/H5Centry.c | 10 ++++++++++ | ||
16 | 1 file changed, 10 insertions(+) | ||
17 | |||
18 | diff --git a/src/H5Centry.c b/src/H5Centry.c | ||
19 | index 1ca7479..77bc00d 100644 | ||
20 | --- a/src/H5Centry.c | ||
21 | +++ b/src/H5Centry.c | ||
22 | @@ -1051,9 +1051,14 @@ H5C__load_entry(H5F_t *f, | ||
23 | */ | ||
24 | do { | ||
25 | if (actual_len != len) { | ||
26 | + /* Verify that the length isn't a bad value */ | ||
27 | + if (len == 0) | ||
28 | + HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "len is a bad value"); | ||
29 | + | ||
30 | if (NULL == (new_image = H5MM_realloc(image, len + H5C_IMAGE_EXTRA_SPACE))) | ||
31 | HGOTO_ERROR(H5E_CACHE, H5E_CANTALLOC, NULL, "image null after H5MM_realloc()"); | ||
32 | image = (uint8_t *)new_image; | ||
33 | + | ||
34 | #if H5C_DO_MEMORY_SANITY_CHECKS | ||
35 | H5MM_memcpy(image + len, H5C_IMAGE_SANITY_VALUE, H5C_IMAGE_EXTRA_SPACE); | ||
36 | #endif /* H5C_DO_MEMORY_SANITY_CHECKS */ | ||
37 | @@ -1104,10 +1109,15 @@ H5C__load_entry(H5F_t *f, | ||
38 | if (H5C__verify_len_eoa(f, type, addr, &actual_len, true) < 0) | ||
39 | HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "actual_len exceeds EOA"); | ||
40 | |||
41 | + /* Verify that the length isn't 0 */ | ||
42 | + if (actual_len == 0) | ||
43 | + HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "actual_len is a bad value"); | ||
44 | + | ||
45 | /* Expand buffer to new size */ | ||
46 | if (NULL == (new_image = H5MM_realloc(image, actual_len + H5C_IMAGE_EXTRA_SPACE))) | ||
47 | HGOTO_ERROR(H5E_CACHE, H5E_CANTALLOC, NULL, "image null after H5MM_realloc()"); | ||
48 | image = (uint8_t *)new_image; | ||
49 | + | ||
50 | #if H5C_DO_MEMORY_SANITY_CHECKS | ||
51 | H5MM_memcpy(image + actual_len, H5C_IMAGE_SANITY_VALUE, H5C_IMAGE_EXTRA_SPACE); | ||
52 | #endif /* H5C_DO_MEMORY_SANITY_CHECKS */ | ||
diff --git a/meta-oe/recipes-support/hdf5/files/0001-Fixes-CVE-2025-6750-5856.patch b/meta-oe/recipes-support/hdf5/files/0001-Fixes-CVE-2025-6750-5856.patch new file mode 100644 index 0000000000..cf8687f010 --- /dev/null +++ b/meta-oe/recipes-support/hdf5/files/0001-Fixes-CVE-2025-6750-5856.patch | |||
@@ -0,0 +1,87 @@ | |||
1 | From 7159488b73fb429a78f79763f7b3775a3c160fad Mon Sep 17 00:00:00 2001 | ||
2 | From: bmribler <39579120+bmribler@users.noreply.github.com> | ||
3 | Date: Fri, 26 Sep 2025 11:46:50 -0400 | ||
4 | Subject: [PATCH] Fixes CVE-2025-6750 (#5856) | ||
5 | |||
6 | * Fixes CVE-2025-6750 | ||
7 | |||
8 | A heap buffer overflow occurred because an mtime message was not properly decoded, resulting in a buffer of size 0 being passed into the encoder. | ||
9 | |||
10 | This PR added decoding for both old and new mtime messages which will allow invalid message size to be detected. | ||
11 | |||
12 | Fixes #5549 | ||
13 | |||
14 | CVE: CVE-2025-6750 | ||
15 | Upstream-Status: Backport [https://github.com/HDFGroup/hdf5/commit/86149a098837a37b2513746e9baf84010f75fb54] | ||
16 | |||
17 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
18 | --- | ||
19 | src/H5Ocache.c | 41 +++++++++++++++++++++++++++++++++++------ | ||
20 | 1 file changed, 35 insertions(+), 6 deletions(-) | ||
21 | |||
22 | diff --git a/src/H5Ocache.c b/src/H5Ocache.c | ||
23 | index 12c30cf..e6095a7 100644 | ||
24 | --- a/src/H5Ocache.c | ||
25 | +++ b/src/H5Ocache.c | ||
26 | @@ -1265,6 +1265,9 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t chunk_size, const uint8_t | ||
27 | if (mesg_size != H5O_ALIGN_OH(oh, mesg_size)) | ||
28 | HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "message not aligned"); | ||
29 | |||
30 | + if (H5_IS_BUFFER_OVERFLOW(chunk_image, mesg_size, p_end)) | ||
31 | + HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "message size exceeds buffer end"); | ||
32 | + | ||
33 | /* Message flags */ | ||
34 | if (H5_IS_BUFFER_OVERFLOW(chunk_image, 1, p_end)) | ||
35 | HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, FAIL, "ran off end of input buffer while decoding"); | ||
36 | @@ -1297,12 +1300,6 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t chunk_size, const uint8_t | ||
37 | } | ||
38 | } | ||
39 | |||
40 | - /* Try to detect invalidly formatted object header message that | ||
41 | - * extends past end of chunk. | ||
42 | - */ | ||
43 | - if (chunk_image + mesg_size > eom_ptr) | ||
44 | - HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "corrupt object header"); | ||
45 | - | ||
46 | /* Increment count of null messages */ | ||
47 | if (H5O_NULL_ID == id) | ||
48 | nullcnt++; | ||
49 | @@ -1449,6 +1446,38 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t chunk_size, const uint8_t | ||
50 | HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't decode refcount"); | ||
51 | oh->nlink = *refcount; | ||
52 | } | ||
53 | + /* Check if message is an old mtime message */ | ||
54 | + else if (H5O_MTIME_ID == id) { | ||
55 | + time_t *mtime = NULL; | ||
56 | + | ||
57 | + /* Decode mtime message */ | ||
58 | + mtime = | ||
59 | + (time_t *)(H5O_MSG_MTIME->decode)(udata->f, NULL, 0, &ioflags, mesg->raw_size, mesg->raw); | ||
60 | + | ||
61 | + /* Save the decoded old format mtime */ | ||
62 | + if (!mtime) | ||
63 | + HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, FAIL, "can't decode old format mtime"); | ||
64 | + | ||
65 | + /* Save 'native' form of mtime message and its value */ | ||
66 | + mesg->native = mtime; | ||
67 | + oh->ctime = *mtime; | ||
68 | + } | ||
69 | + /* Check if message is an new mtime message */ | ||
70 | + else if (H5O_MTIME_NEW_ID == id) { | ||
71 | + time_t *mtime = NULL; | ||
72 | + | ||
73 | + /* Decode mtime message */ | ||
74 | + mtime = (time_t *)(H5O_MSG_MTIME_NEW->decode)(udata->f, NULL, 0, &ioflags, mesg->raw_size, | ||
75 | + mesg->raw); | ||
76 | + | ||
77 | + /* Save the decoded new format mtime */ | ||
78 | + if (!mtime) | ||
79 | + HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, FAIL, "can't decode new format mtime"); | ||
80 | + | ||
81 | + /* Save 'native' form of mtime message and its value */ | ||
82 | + mesg->native = mtime; | ||
83 | + oh->ctime = *mtime; | ||
84 | + } | ||
85 | /* Check if message is a link message */ | ||
86 | else if (H5O_LINK_ID == id) { | ||
87 | /* Increment the count of link messages */ | ||
diff --git a/meta-oe/recipes-support/hdf5/files/0001-Refix-of-the-attempts-in-PR-5209-5722.patch b/meta-oe/recipes-support/hdf5/files/0001-Refix-of-the-attempts-in-PR-5209-5722.patch new file mode 100644 index 0000000000..bb18879b5e --- /dev/null +++ b/meta-oe/recipes-support/hdf5/files/0001-Refix-of-the-attempts-in-PR-5209-5722.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 0354419c3b5c6832c994b005903372f156b5fddb Mon Sep 17 00:00:00 2001 | ||
2 | From: bmribler <39579120+bmribler@users.noreply.github.com> | ||
3 | Date: Wed, 13 Aug 2025 14:45:41 -0400 | ||
4 | Subject: [PATCH] Refix of the attempts in PR-5209 (#5722) | ||
5 | |||
6 | This PR addresses the root cause of the issue by adding a sanity-check immediately | ||
7 | after reading the file space page size from the file. | ||
8 | |||
9 | The same fuzzer in GH-5376 was used to verify that the assert before the vulnerability | ||
10 | had occurred and that an error indicating a corrupted file space page size replaced it. | ||
11 | |||
12 | CVE: CVE-2025-2914 | ||
13 | Upstream-Status: Backport [https://github.com/HDFGroup/hdf5/commit/804f3bace997e416917b235dbd3beac3652a8a05] | ||
14 | |||
15 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
16 | --- | ||
17 | src/H5Fsuper.c | 2 ++ | ||
18 | src/H5Ofsinfo.c | 3 +++ | ||
19 | 2 files changed, 5 insertions(+) | ||
20 | |||
21 | diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c | ||
22 | index d9fe3a7..1c8dc6c 100644 | ||
23 | --- a/src/H5Fsuper.c | ||
24 | +++ b/src/H5Fsuper.c | ||
25 | @@ -746,6 +746,8 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, bool initial_read) | ||
26 | if (!(flags & H5O_MSG_FLAG_WAS_UNKNOWN)) { | ||
27 | H5O_fsinfo_t fsinfo; /* File space info message from superblock extension */ | ||
28 | |||
29 | + memset(&fsinfo, 0, sizeof(H5O_fsinfo_t)); | ||
30 | + | ||
31 | /* f->shared->null_fsm_addr: Whether to drop free-space to the floor */ | ||
32 | /* The h5clear tool uses this property to tell the library | ||
33 | * to drop free-space to the floor | ||
34 | diff --git a/src/H5Ofsinfo.c b/src/H5Ofsinfo.c | ||
35 | index 5b69235..2bb6ea6 100644 | ||
36 | --- a/src/H5Ofsinfo.c | ||
37 | +++ b/src/H5Ofsinfo.c | ||
38 | @@ -182,6 +182,9 @@ H5O__fsinfo_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNU | ||
39 | if (H5_IS_BUFFER_OVERFLOW(p, H5F_sizeof_size(f), p_end)) | ||
40 | HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding"); | ||
41 | H5F_DECODE_LENGTH(f, p, fsinfo->page_size); /* File space page size */ | ||
42 | + /* Basic sanity check */ | ||
43 | + if (fsinfo->page_size == 0 || fsinfo->page_size > H5F_FILE_SPACE_PAGE_SIZE_MAX) | ||
44 | + HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "invalid page size in file space info"); | ||
45 | |||
46 | if (H5_IS_BUFFER_OVERFLOW(p, 2, p_end)) | ||
47 | HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding"); | ||
diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.14.6.bb b/meta-oe/recipes-support/hdf5/hdf5_1.14.6.bb index 974007a3e9..7d75f0e7dc 100644 --- a/meta-oe/recipes-support/hdf5/hdf5_1.14.6.bb +++ b/meta-oe/recipes-support/hdf5/hdf5_1.14.6.bb | |||
@@ -11,11 +11,16 @@ inherit cmake siteinfo qemu multilib_header multilib_script | |||
11 | 11 | ||
12 | DEPENDS += "qemu-native zlib" | 12 | DEPENDS += "qemu-native zlib" |
13 | 13 | ||
14 | SRC_URI = " \ | 14 | SRC_URI = "https://support.hdfgroup.org/releases/hdf5/v1_14/v1_14_6/downloads/${BPN}-${PV}.tar.gz \ |
15 | https://support.hdfgroup.org/releases/hdf5/v1_14/v1_14_6/downloads/${BPN}-${PV}.tar.gz \ | 15 | file://0002-Remove-suffix-shared-from-shared-library-name.patch \ |
16 | file://0002-Remove-suffix-shared-from-shared-library-name.patch \ | 16 | file://0001-cmake-remove-build-flags.patch \ |
17 | file://0001-cmake-remove-build-flags.patch \ | 17 | file://0001-Fix-CVE-2025-2153-5795.patch \ |
18 | " | 18 | file://0001-Fix-CVE-2025-2310-5872.patch \ |
19 | file://0001-Refix-of-the-attempts-in-PR-5209-5722.patch \ | ||
20 | file://0001-Fix-CVE-2025-2924-5814.patch \ | ||
21 | file://0001-Fix-CVE-2025-2925-5739.patch \ | ||
22 | file://0001-Fixes-CVE-2025-6750-5856.patch \ | ||
23 | " | ||
19 | SRC_URI[sha256sum] = "e4defbac30f50d64e1556374aa49e574417c9e72c6b1de7a4ff88c4b1bea6e9b" | 24 | SRC_URI[sha256sum] = "e4defbac30f50d64e1556374aa49e574417c9e72c6b1de7a4ff88c4b1bea6e9b" |
20 | 25 | ||
21 | FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" | 26 | FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" |
diff --git a/meta-oe/recipes-support/jsoncons/jsoncons_1.4.1.bb b/meta-oe/recipes-support/jsoncons/jsoncons_1.4.3.bb index da288a9cf6..f5e19e4191 100644 --- a/meta-oe/recipes-support/jsoncons/jsoncons_1.4.1.bb +++ b/meta-oe/recipes-support/jsoncons/jsoncons_1.4.3.bb | |||
@@ -5,7 +5,7 @@ LICENSE = "BSL-1.0" | |||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=6ee7f7ed2001e4cde4679fdb8926f820" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=6ee7f7ed2001e4cde4679fdb8926f820" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/danielaparker/jsoncons.git;protocol=https;branch=master;tag=v${PV}" | 7 | SRC_URI = "git://github.com/danielaparker/jsoncons.git;protocol=https;branch=master;tag=v${PV}" |
8 | SRCREV = "64abcff1f6a828f854e54650b106326dc328fab6" | 8 | SRCREV = "6170b71ee6f2cd64958fc7a14e6f04b36f523d90" |
9 | 9 | ||
10 | 10 | ||
11 | inherit cmake | 11 | inherit cmake |
diff --git a/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch b/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch deleted file mode 100644 index 84b5a4da9f..0000000000 --- a/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | From cb507309937958c632147de87e8f1231d6698847 Mon Sep 17 00:00:00 2001 | ||
2 | From: Antonio Sanchez <cantonios@google.com> | ||
3 | Date: Tue, 14 Sep 2021 10:57:22 -0700 | ||
4 | Subject: [PATCH] Default eigen_packet_wrapper constructor. | ||
5 | |||
6 | This makes it trivial, allowing use of `memcpy`. | ||
7 | |||
8 | Fixes #2326 | ||
9 | |||
10 | Upstream-Status: Backport [https://gitlab.com/libeigen/eigen/-/merge_requests/645/diffs?commit_id=cb507309937958c632147de87e8f1231d6698847] | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | |||
13 | * fixes build failures for arm targets with NEON enabled (e.g. -mfpu=neon-vfpv4) | ||
14 | for recipes with -Werror enabled and gcc-11, e.g. fuse-core, robot-localization, | ||
15 | prbt-ikfast-manipulator-plugin, rm-chassis-controllers in meta-ros1-noetic: | ||
16 | |||
17 | In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:214, | ||
18 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, | ||
19 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, | ||
20 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, | ||
21 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: | ||
22 | /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h: In function 'Packet Eigen::internal::pload(const typename Eigen::internal::unpacket_traits<T>::type*) [with Packet = Eigen::internal::eigen_packet_wrapper<int, 2>; typename Eigen::internal::unpacket_traits<T>::type = signed char]': | ||
23 | /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h:1671:9: error: 'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} from an array of 'const int8_t' {aka 'const signed char'} [-Werror=class-memaccess] | ||
24 | 1671 | memcpy(&res, from, sizeof(Packet4c)); | ||
25 | | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
26 | In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:172, | ||
27 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, | ||
28 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, | ||
29 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, | ||
30 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: | ||
31 | /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h:159:8: note: 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} declared here | ||
32 | 159 | struct eigen_packet_wrapper | ||
33 | | ^~~~~~~~~~~~~~~~~~~~ | ||
34 | In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:214, | ||
35 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, | ||
36 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, | ||
37 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, | ||
38 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: | ||
39 | /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h: In function 'Packet Eigen::internal::ploadu(const typename Eigen::internal::unpacket_traits<T>::type*) [with Packet = Eigen::internal::eigen_packet_wrapper<int, 2>; typename Eigen::internal::unpacket_traits<T>::type = signed char]': | ||
40 | /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h:1716:9: error: 'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} from an array of 'const int8_t' {aka 'const signed char'} [-Werror=class-memaccess] | ||
41 | 1716 | memcpy(&res, from, sizeof(Packet4c)); | ||
42 | | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
43 | In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:172, | ||
44 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, | ||
45 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, | ||
46 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, | ||
47 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: | ||
48 | /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h:159:8: note: 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} declared here | ||
49 | 159 | struct eigen_packet_wrapper | ||
50 | | ^~~~~~~~~~~~~~~~~~~~ | ||
51 | cc1plus: all warnings being treated as errors | ||
52 | |||
53 | --- | ||
54 | Eigen/src/Core/GenericPacketMath.h | 2 +- | ||
55 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
56 | |||
57 | diff --git a/Eigen/src/Core/GenericPacketMath.h b/Eigen/src/Core/GenericPacketMath.h | ||
58 | index 8f8f64f15..72234288e 100644 | ||
59 | --- a/Eigen/src/Core/GenericPacketMath.h | ||
60 | +++ b/Eigen/src/Core/GenericPacketMath.h | ||
61 | @@ -162,7 +162,7 @@ struct eigen_packet_wrapper | ||
62 | { | ||
63 | EIGEN_ALWAYS_INLINE operator T&() { return m_val; } | ||
64 | EIGEN_ALWAYS_INLINE operator const T&() const { return m_val; } | ||
65 | - EIGEN_ALWAYS_INLINE eigen_packet_wrapper() {} | ||
66 | + EIGEN_ALWAYS_INLINE eigen_packet_wrapper() = default; | ||
67 | EIGEN_ALWAYS_INLINE eigen_packet_wrapper(const T &v) : m_val(v) {} | ||
68 | EIGEN_ALWAYS_INLINE eigen_packet_wrapper& operator=(const T &v) { | ||
69 | m_val = v; | ||
70 | -- | ||
71 | 2.17.1 | ||
72 | |||
diff --git a/meta-oe/recipes-support/libeigen/libeigen/0001-Make-eigen_packet_wrapper-trivial-for-c-11.patch b/meta-oe/recipes-support/libeigen/libeigen/0001-Make-eigen_packet_wrapper-trivial-for-c-11.patch new file mode 100644 index 0000000000..855bf01ae9 --- /dev/null +++ b/meta-oe/recipes-support/libeigen/libeigen/0001-Make-eigen_packet_wrapper-trivial-for-c-11.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 0295f81a835ef69e2bacd9e75ab5782eca398720 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= <cantonios@google.com> | ||
3 | Date: Thu, 2 Oct 2025 17:53:19 +0000 | ||
4 | Subject: [PATCH] Make `eigen_packet_wrapper` trivial for c++11. | ||
5 | |||
6 | Upstream-Status: Backport [https://gitlab.com/libeigen/eigen/-/commit/0295f81a835ef69e2bacd9e75ab5782eca398720] | ||
7 | --- | ||
8 | Eigen/src/Core/GenericPacketMath.h | 4 ++++ | ||
9 | 1 file changed, 4 insertions(+) | ||
10 | |||
11 | diff --git a/Eigen/src/Core/GenericPacketMath.h b/Eigen/src/Core/GenericPacketMath.h | ||
12 | index af45f3936..4aeb77de8 100644 | ||
13 | --- a/Eigen/src/Core/GenericPacketMath.h | ||
14 | +++ b/Eigen/src/Core/GenericPacketMath.h | ||
15 | @@ -160,7 +160,11 @@ struct eigen_packet_wrapper | ||
16 | { | ||
17 | EIGEN_ALWAYS_INLINE operator T&() { return m_val; } | ||
18 | EIGEN_ALWAYS_INLINE operator const T&() const { return m_val; } | ||
19 | +#if EIGEN_HAS_CXX11 | ||
20 | + EIGEN_ALWAYS_INLINE eigen_packet_wrapper() = default; | ||
21 | +#else | ||
22 | EIGEN_ALWAYS_INLINE eigen_packet_wrapper() {}; | ||
23 | +#endif | ||
24 | EIGEN_ALWAYS_INLINE eigen_packet_wrapper(const T &v) : m_val(v) {} | ||
25 | EIGEN_ALWAYS_INLINE eigen_packet_wrapper& operator=(const T &v) { | ||
26 | m_val = v; | ||
diff --git a/meta-oe/recipes-support/libeigen/libeigen/0002-Remove-LGPL-Code-and-references.patch b/meta-oe/recipes-support/libeigen/libeigen/0001-Remove-LGPL-Code-and-references.patch index 2d19bc23c8..697f3dfa82 100644 --- a/meta-oe/recipes-support/libeigen/libeigen/0002-Remove-LGPL-Code-and-references.patch +++ b/meta-oe/recipes-support/libeigen/libeigen/0001-Remove-LGPL-Code-and-references.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e63a6950dbebf4dd95e5c74c423c06fd65df5182 Mon Sep 17 00:00:00 2001 | 1 | From 5e7b53a3268e7cdc81e358825a8c84f06289866c Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= <cantonios@google.com> | 2 | From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= <cantonios@google.com> |
3 | Date: Wed, 8 Feb 2023 01:25:06 +0000 | 3 | Date: Wed, 8 Feb 2023 01:25:06 +0000 |
4 | Subject: [PATCH] Remove LGPL Code and references. | 4 | Subject: [PATCH] Remove LGPL Code and references. |
@@ -12,12 +12,11 @@ Upstream-Status: Backport [https://gitlab.com/libeigen/eigen/-/commit/e256ad1823 | |||
12 | bench/tensors/eigen_sycl_bench.sh | 1 - | 12 | bench/tensors/eigen_sycl_bench.sh | 1 - |
13 | bench/tensors/eigen_sycl_bench_contract.sh | 2 +- | 13 | bench/tensors/eigen_sycl_bench_contract.sh | 2 +- |
14 | doc/PreprocessorDirectives.dox | 3 - | 14 | doc/PreprocessorDirectives.dox | 3 - |
15 | test/CMakeLists.txt | 1 - | ||
16 | test/mpl2only.cpp | 24 - | 15 | test/mpl2only.cpp | 24 - |
17 | unsupported/Eigen/IterativeSolvers | 6 - | 16 | unsupported/Eigen/IterativeSolvers | 6 - |
18 | .../IterativeSolvers/ConstrainedConjGrad.h | 187 ------- | 17 | .../IterativeSolvers/ConstrainedConjGrad.h | 187 ------- |
19 | .../IterativeSolvers/IterationController.h | 154 ------ | 18 | .../IterativeSolvers/IterationController.h | 154 ------ |
20 | 12 files changed, 4 insertions(+), 898 deletions(-) | 19 | 11 files changed, 4 insertions(+), 897 deletions(-) |
21 | delete mode 100644 COPYING.LGPL | 20 | delete mode 100644 COPYING.LGPL |
22 | delete mode 100644 Eigen/src/Core/util/NonMPL2.h | 21 | delete mode 100644 Eigen/src/Core/util/NonMPL2.h |
23 | delete mode 100644 test/mpl2only.cpp | 22 | delete mode 100644 test/mpl2only.cpp |
@@ -567,7 +566,7 @@ index 1af67cf18..000000000 | |||
567 | -#error Including non-MPL2 code in EIGEN_MPL2_ONLY mode | 566 | -#error Including non-MPL2 code in EIGEN_MPL2_ONLY mode |
568 | -#endif | 567 | -#endif |
569 | diff --git a/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h b/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h | 568 | diff --git a/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h b/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h |
570 | index 7803fd817..1a5d7faeb 100644 | 569 | index 5e632c4e2..8b6077601 100644 |
571 | --- a/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h | 570 | --- a/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h |
572 | +++ b/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h | 571 | +++ b/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h |
573 | @@ -24,8 +24,7 @@ namespace Eigen { | 572 | @@ -24,8 +24,7 @@ namespace Eigen { |
@@ -606,7 +605,7 @@ index 73fd6c4a0..3ab0138a1 100644 | |||
606 | ./tensor_contract_sycl_bench | 605 | ./tensor_contract_sycl_bench |
607 | 606 | ||
608 | diff --git a/doc/PreprocessorDirectives.dox b/doc/PreprocessorDirectives.dox | 607 | diff --git a/doc/PreprocessorDirectives.dox b/doc/PreprocessorDirectives.dox |
609 | index 0f545b086..b7d59ccbc 100644 | 608 | index eda0d1961..2b5cb1b92 100644 |
610 | --- a/doc/PreprocessorDirectives.dox | 609 | --- a/doc/PreprocessorDirectives.dox |
611 | +++ b/doc/PreprocessorDirectives.dox | 610 | +++ b/doc/PreprocessorDirectives.dox |
612 | @@ -92,9 +92,6 @@ run time. However, these assertions do cost time and can thus be turned off. | 611 | @@ -92,9 +92,6 @@ run time. However, these assertions do cost time and can thus be turned off. |
@@ -619,18 +618,6 @@ index 0f545b086..b7d59ccbc 100644 | |||
619 | 618 | ||
620 | \section TopicPreprocessorDirectivesPerformance Alignment, vectorization and performance tweaking | 619 | \section TopicPreprocessorDirectivesPerformance Alignment, vectorization and performance tweaking |
621 | 620 | ||
622 | diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt | ||
623 | index 5136f82aa..9f557743a 100644 | ||
624 | --- a/test/CMakeLists.txt | ||
625 | +++ b/test/CMakeLists.txt | ||
626 | @@ -277,7 +277,6 @@ ei_add_test(special_numbers) | ||
627 | ei_add_test(rvalue_types) | ||
628 | ei_add_test(dense_storage) | ||
629 | ei_add_test(ctorleak) | ||
630 | -ei_add_test(mpl2only) | ||
631 | ei_add_test(inplace_decomposition) | ||
632 | ei_add_test(half_float) | ||
633 | ei_add_test(bfloat16_float) | ||
634 | diff --git a/test/mpl2only.cpp b/test/mpl2only.cpp | 621 | diff --git a/test/mpl2only.cpp b/test/mpl2only.cpp |
635 | deleted file mode 100644 | 622 | deleted file mode 100644 |
636 | index 296350d08..000000000 | 623 | index 296350d08..000000000 |
@@ -662,11 +649,11 @@ index 296350d08..000000000 | |||
662 | - return 0; | 649 | - return 0; |
663 | -} | 650 | -} |
664 | diff --git a/unsupported/Eigen/IterativeSolvers b/unsupported/Eigen/IterativeSolvers | 651 | diff --git a/unsupported/Eigen/IterativeSolvers b/unsupported/Eigen/IterativeSolvers |
665 | index a3f58d676..f045fb607 100644 | 652 | index b53f10937..3ac64e9f8 100644 |
666 | --- a/unsupported/Eigen/IterativeSolvers | 653 | --- a/unsupported/Eigen/IterativeSolvers |
667 | +++ b/unsupported/Eigen/IterativeSolvers | 654 | +++ b/unsupported/Eigen/IterativeSolvers |
668 | @@ -19,7 +19,6 @@ | 655 | @@ -19,7 +19,6 @@ |
669 | * \defgroup IterativeLinearSolvers_Module Iterative solvers module | 656 | * \defgroup IterativeLinearSolvers_Module IterativeLinearSolvers module |
670 | * This module aims to provide various iterative linear and non linear solver algorithms. | 657 | * This module aims to provide various iterative linear and non linear solver algorithms. |
671 | * It currently provides: | 658 | * It currently provides: |
672 | - * - a constrained conjugate gradient | 659 | - * - a constrained conjugate gradient |
@@ -1038,3 +1025,6 @@ index a116e09e2..000000000 | |||
1038 | -} // end namespace Eigen | 1025 | -} // end namespace Eigen |
1039 | - | 1026 | - |
1040 | -#endif // EIGEN_ITERATION_CONTROLLER_H | 1027 | -#endif // EIGEN_ITERATION_CONTROLLER_H |
1028 | -- | ||
1029 | 2.48.1 | ||
1030 | |||
diff --git a/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb b/meta-oe/recipes-support/libeigen/libeigen_3.4.1.bb index f5f874941a..5cb7407608 100644 --- a/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb +++ b/meta-oe/recipes-support/libeigen/libeigen_3.4.1.bb | |||
@@ -13,15 +13,23 @@ LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ | |||
13 | " | 13 | " |
14 | 14 | ||
15 | SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;branch=3.4 \ | 15 | SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;branch=3.4 \ |
16 | file://0001-Default-eigen_packet_wrapper-constructor.patch \ | 16 | file://0001-Remove-LGPL-Code-and-references.patch \ |
17 | file://0002-Remove-LGPL-Code-and-references.patch \ | 17 | file://0001-Make-eigen_packet_wrapper-trivial-for-c-11.patch \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "3147391d946bb4b6c68edd901f2add6ac1f31f8c" | 20 | SRCREV = "d71c30c47858effcbd39967097a2d99ee48db464" |
21 | |||
22 | 21 | ||
23 | inherit cmake | 22 | inherit cmake |
24 | 23 | ||
24 | PACKAGECONFIG ??= "" | ||
25 | |||
26 | PACKAGECONFIG[blas] = "-DEIGEN_BUILD_BLAS=ON,-DEIGEN_BUILD_BLAS=OFF,libgfortran" | ||
27 | PACKAGECONFIG[lapack] = "-DEIGEN_BUILD_LAPACK=ON,-DEIGEN_BUILD_LAPACK=OFF,libgfortran" | ||
28 | |||
29 | EXTRA_OECMAKE += " \ | ||
30 | -DEIGEN_BUILD_TESTING=OFF \ | ||
31 | " | ||
32 | |||
25 | FILES:${PN}-dev += "${datadir}/eigen3/cmake" | 33 | FILES:${PN}-dev += "${datadir}/eigen3/cmake" |
26 | 34 | ||
27 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies | 35 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies |
diff --git a/meta-oe/recipes-support/mcelog/mcelog_206.bb b/meta-oe/recipes-support/mcelog/mcelog_207.bb index 7685de722e..b7800066ca 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_206.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_207.bb | |||
@@ -10,7 +10,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;; | |||
10 | file://run-ptest \ | 10 | file://run-ptest \ |
11 | " | 11 | " |
12 | 12 | ||
13 | SRCREV = "7aa81797e3a42973c6aca0468ca35638bbbb06dc" | 13 | SRCREV = "bcd71be7776f1fdbd043064bf3034a0cbf297666" |
14 | 14 | ||
15 | LICENSE = "GPL-2.0-only" | 15 | LICENSE = "GPL-2.0-only" |
16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
diff --git a/meta-oe/recipes-support/nss/nss_3.116.bb b/meta-oe/recipes-support/nss/nss_3.117.bb index cc115c4329..5e81441219 100644 --- a/meta-oe/recipes-support/nss/nss_3.116.bb +++ b/meta-oe/recipes-support/nss/nss_3.117.bb | |||
@@ -5,7 +5,7 @@ security-enabled client and server applications. \ | |||
5 | Applications built with NSS can support SSL v2 and v3, \ | 5 | Applications built with NSS can support SSL v2 and v3, \ |
6 | TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ | 6 | TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ |
7 | v3 certificates, and other security standards." | 7 | v3 certificates, and other security standards." |
8 | HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" | 8 | HOMEPAGE = "https://firefox-source-docs.mozilla.org/security/nss/index.html" |
9 | SECTION = "libs" | 9 | SECTION = "libs" |
10 | 10 | ||
11 | DEPENDS = "sqlite3 nspr zlib nss-native" | 11 | DEPENDS = "sqlite3 nspr zlib nss-native" |
@@ -20,7 +20,7 @@ LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ | |||
20 | 20 | ||
21 | VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" | 21 | VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" |
22 | 22 | ||
23 | SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ | 23 | SRC_URI = "https://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ |
24 | file://nss.pc.in \ | 24 | file://nss.pc.in \ |
25 | file://blank-cert9.db \ | 25 | file://blank-cert9.db \ |
26 | file://blank-key4.db \ | 26 | file://blank-key4.db \ |
@@ -33,7 +33,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/$ | |||
33 | file://0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch \ | 33 | file://0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch \ |
34 | file://0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ | 34 | file://0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ |
35 | " | 35 | " |
36 | SRC_URI[sha256sum] = "3938611de4ad1e3b71f27f3cd5ea717a5b5f83bffc9cd427e6d929dc67f2bb73" | 36 | SRC_URI[sha256sum] = "5786b523a2f2e9295ed10d711960d2e33cd620bb80d6288443eda43553a51996" |
37 | 37 | ||
38 | UPSTREAM_CHECK_URI = "https://ftp.mozilla.org/pub/security/nss/releases/" | 38 | UPSTREAM_CHECK_URI = "https://ftp.mozilla.org/pub/security/nss/releases/" |
39 | UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>\d+(\_\d+)+)" | 39 | UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>\d+(\_\d+)+)" |
diff --git a/meta-oe/recipes-support/poppler/poppler_25.08.0.bb b/meta-oe/recipes-support/poppler/poppler_25.10.0.bb index 45f94b0ae7..29a5f33e81 100644 --- a/meta-oe/recipes-support/poppler/poppler_25.08.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_25.10.0.bb | |||
@@ -8,7 +8,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ | |||
8 | file://basename-include.patch \ | 8 | file://basename-include.patch \ |
9 | file://0001-cmake-Do-not-use-isystem.patch \ | 9 | file://0001-cmake-Do-not-use-isystem.patch \ |
10 | " | 10 | " |
11 | SRC_URI[sha256sum] = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d" | 11 | SRC_URI[sha256sum] = "6b5e9bb64dabb15787a14db1675291c7afaf9387438cc93a4fb7f6aec4ee6fe0" |
12 | 12 | ||
13 | DEPENDS = "fontconfig zlib cairo lcms glib-2.0 glib-2.0-native" | 13 | DEPENDS = "fontconfig zlib cairo lcms glib-2.0 glib-2.0-native" |
14 | 14 | ||
diff --git a/meta-oe/recipes-support/pv/pv_1.9.34.bb b/meta-oe/recipes-support/pv/pv_1.9.42.bb index b6e2c42812..f60460c025 100644 --- a/meta-oe/recipes-support/pv/pv_1.9.34.bb +++ b/meta-oe/recipes-support/pv/pv_1.9.42.bb | |||
@@ -8,7 +8,7 @@ SRC_URI = "https://www.ivarch.com/programs/sources/${BP}.tar.gz \ | |||
8 | file://pv-test-system-version.patch \ | 8 | file://pv-test-system-version.patch \ |
9 | file://run-ptest \ | 9 | file://run-ptest \ |
10 | " | 10 | " |
11 | SRC_URI[sha256sum] = "c0626bed6cbef5006b53d3281e8e3ae4b2838729462b21eccf28140eefef6bb1" | 11 | SRC_URI[sha256sum] = "fbd7d1b04efee62c8241255a3fe1c5f5236f1a6e1ed85f02730b0c6448810175" |
12 | 12 | ||
13 | UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml" | 13 | UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml" |
14 | UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar" | 14 | UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar" |
diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.15.3.bb b/meta-oe/recipes-support/spdlog/spdlog_1.16.0.bb index d03f01d3a8..7efa65697f 100644 --- a/meta-oe/recipes-support/spdlog/spdlog_1.15.3.bb +++ b/meta-oe/recipes-support/spdlog/spdlog_1.16.0.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gabime/spdlog/wiki" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9573510928429ad0cbe5ba4de77546e9" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9573510928429ad0cbe5ba4de77546e9" |
5 | 5 | ||
6 | SRCREV = "6fa36017cfd5731d617e1a934f0e5ea9c4445b13" | 6 | SRCREV = "486b55554f11c9cccc913e11a87085b2a91f706f" |
7 | SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x;tag=v${PV}" | 7 | SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x;tag=v${PV}" |
8 | 8 | ||
9 | DEPENDS += "fmt" | 9 | DEPENDS += "fmt" |
diff --git a/meta-oe/recipes-support/upower/upower_1.90.6.bb b/meta-oe/recipes-support/upower/upower_1.90.10.bb index d2f58d5b22..a7effcd7de 100644 --- a/meta-oe/recipes-support/upower/upower_1.90.6.bb +++ b/meta-oe/recipes-support/upower/upower_1.90.10.bb | |||
@@ -12,7 +12,7 @@ DEPENDS = " \ | |||
12 | " | 12 | " |
13 | 13 | ||
14 | SRC_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/archive/v${PV}/${BPN}-v${PV}.tar.bz2" | 14 | SRC_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/archive/v${PV}/${BPN}-v${PV}.tar.bz2" |
15 | SRC_URI[sha256sum] = "aed4e42a21307512ad236ad58d7ee4e0196670c8524a168a0edccdc32964ea0c" | 15 | SRC_URI[sha256sum] = "c1baf418b685ffe4150c8a75c04da0cec70323fe094b5b257b287eea564d3f56" |
16 | S = "${UNPACKDIR}/${BPN}-v${PV}" | 16 | S = "${UNPACKDIR}/${BPN}-v${PV}" |
17 | 17 | ||
18 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/tags" | 18 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/tags" |
@@ -40,11 +40,13 @@ SYSTEMD_AUTO_ENABLE = "disable" | |||
40 | 40 | ||
41 | RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_dbus}" | 41 | RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_dbus}" |
42 | RRECOMMENDS:${PN} += "pm-utils" | 42 | RRECOMMENDS:${PN} += "pm-utils" |
43 | PACKAGES += "${PN}-zsh-completion" | ||
43 | FILES:${PN} += " \ | 44 | FILES:${PN} += " \ |
44 | ${datadir}/dbus-1/ \ | 45 | ${datadir}/dbus-1/ \ |
45 | ${datadir}/polkit-1/ \ | 46 | ${datadir}/polkit-1/ \ |
46 | ${base_libdir}/udev/* \ | 47 | ${base_libdir}/udev/* \ |
47 | " | 48 | " |
49 | FILES:${PN}-zsh-completion = "${datadir}/zsh" | ||
48 | 50 | ||
49 | do_install:append() { | 51 | do_install:append() { |
50 | # remove integration tests scripts | 52 | # remove integration tests scripts |
diff --git a/meta-oe/recipes-test/cukinia/cukinia_0.9.0.bb b/meta-oe/recipes-test/cukinia/cukinia_0.9.1.bb index 4e61fecd9a..720a46ad82 100644 --- a/meta-oe/recipes-test/cukinia/cukinia_0.9.0.bb +++ b/meta-oe/recipes-test/cukinia/cukinia_0.9.1.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" | |||
8 | 8 | ||
9 | SRC_URI = "git://github.com/savoirfairelinux/cukinia.git;protocol=https;branch=master;tag=v${PV}" | 9 | SRC_URI = "git://github.com/savoirfairelinux/cukinia.git;protocol=https;branch=master;tag=v${PV}" |
10 | 10 | ||
11 | SRCREV = "ce10e333d7169df80b44a0ea9bbbfaffbe4c59f9" | 11 | SRCREV = "35d621f7abbf8453b37beeab6719705dcbfb4ed2" |
12 | 12 | ||
13 | 13 | ||
14 | RRECOMMENDS:${PN} = "libgpiod-tools" | 14 | RRECOMMENDS:${PN} = "libgpiod-tools" |
diff --git a/meta-oe/recipes-test/pm-qa/pm-qa_git.bb b/meta-oe/recipes-test/pm-qa/pm-qa_git.bb index 1574bf0ce9..3c123f9294 100644 --- a/meta-oe/recipes-test/pm-qa/pm-qa_git.bb +++ b/meta-oe/recipes-test/pm-qa/pm-qa_git.bb | |||
@@ -18,11 +18,9 @@ SRC_URI = " \ | |||
18 | 18 | ||
19 | CFLAGS += "-pthread" | 19 | CFLAGS += "-pthread" |
20 | 20 | ||
21 | PATCHTOOL = "git" | ||
22 | |||
23 | do_compile () { | 21 | do_compile () { |
24 | # Find all the .c files in this project and build them. | 22 | # Find all the .c files in this project skip any directory named .pc and build them. |
25 | for x in `find . -name "*.c"` | 23 | for x in `find . -path '*/.pc' -prune -o -type f -name '*.c' -print` |
26 | do | 24 | do |
27 | util=`echo ${x} | sed s/.c$//` | 25 | util=`echo ${x} | sed s/.c$//` |
28 | oe_runmake ${util} | 26 | oe_runmake ${util} |
@@ -34,7 +32,7 @@ do_install () { | |||
34 | install -d ${D}${libdir}/${BPN} | 32 | install -d ${D}${libdir}/${BPN} |
35 | 33 | ||
36 | # Install the compiled binaries that were built in the previous step | 34 | # Install the compiled binaries that were built in the previous step |
37 | for x in `find . -name "*.c"` | 35 | for x in `find . -path '*/.pc' -prune -o -type f -name '*.c' -print` |
38 | do | 36 | do |
39 | util=`echo ${x} | sed s/.c$//` | 37 | util=`echo ${x} | sed s/.c$//` |
40 | util_basename=`basename ${util}` | 38 | util_basename=`basename ${util}` |
diff --git a/meta-perl/recipes-perl/libcgi/libcgi-perl_4.70.bb b/meta-perl/recipes-perl/libcgi/libcgi-perl_4.71.bb index 59803b403a..8e44e1ffb0 100644 --- a/meta-perl/recipes-perl/libcgi/libcgi-perl_4.70.bb +++ b/meta-perl/recipes-perl/libcgi/libcgi-perl_4.71.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=415fc49abed2728f9480cd32c8d67beb" | |||
10 | 10 | ||
11 | SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEEJO/CGI-${PV}.tar.gz" | 11 | SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEEJO/CGI-${PV}.tar.gz" |
12 | 12 | ||
13 | SRC_URI[sha256sum] = "538ad19c40402e3bbbe00e6d374c3ce2966feb391096dac883ac5104c2083bc9" | 13 | SRC_URI[sha256sum] = "9da85b30d9404d183da7ca7aedb83702cb07ed73c3078bf6f36c87f1e8a0196a" |
14 | 14 | ||
15 | S = "${UNPACKDIR}/CGI-${PV}" | 15 | S = "${UNPACKDIR}/CGI-${PV}" |
16 | 16 | ||
diff --git a/meta-perl/recipes-perl/libhtml/libhtml-parser-perl_3.75.bb b/meta-perl/recipes-perl/libhtml/libhtml-parser-perl_3.76.bb index bae4ebaa86..6205f7db0d 100644 --- a/meta-perl/recipes-perl/libhtml/libhtml-parser-perl_3.75.bb +++ b/meta-perl/recipes-perl/libhtml/libhtml-parser-perl_3.76.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | DESCRIPTION = "This package contains the Parser.pm module with friends." | 1 | DESCRIPTION = "This package contains the Parser.pm module with friends." |
2 | HOMEPAGE = "https://metacpan.org/release/CAPOEIRAB/HTML-Parser-3.75" | 2 | HOMEPAGE = "https://metacpan.org/release/OALDERS/HTML-Parser-3.76" |
3 | SECTION = "libs" | 3 | SECTION = "libs" |
4 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | 4 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" |
5 | 5 | ||
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=992;endline=996;md5=cab05784294bb47d | |||
7 | 7 | ||
8 | DEPENDS += "perl" | 8 | DEPENDS += "perl" |
9 | 9 | ||
10 | SRC_URI = "${CPAN_MIRROR}/authors/id/C/CA/CAPOEIRAB/HTML-Parser-${PV}.tar.gz" | 10 | SRC_URI = "${CPAN_MIRROR}/authors/id/O/OA/OALDERS/HTML-Parser-${PV}.tar.gz" |
11 | 11 | ||
12 | SRC_URI[sha256sum] = "ac6b5e25a8df7af54885201e91c45fb9ab6744c08cedc1a38fcc7d95d21193a9" | 12 | SRC_URI[sha256sum] = "64d9e2eb2b420f1492da01ec0e6976363245b4be9290f03f10b7d2cb63fa2f61" |
13 | 13 | ||
14 | S = "${UNPACKDIR}/HTML-Parser-${PV}" | 14 | S = "${UNPACKDIR}/HTML-Parser-${PV}" |
15 | 15 | ||
diff --git a/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.04.bb b/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.05.bb index 59bab0c748..332eabb153 100644 --- a/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.04.bb +++ b/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.05.bb | |||
@@ -6,15 +6,15 @@ libwww-perl distribution, but are now unbundled in order to facilitate \ | |||
6 | a separate development track." | 6 | a separate development track." |
7 | SECTION = "libs" | 7 | SECTION = "libs" |
8 | 8 | ||
9 | HOMEPAGE = "https://metacpan.org/release/JFEARN/HTML-Tree-5.04/source/README" | 9 | HOMEPAGE = "https://metacpan.org/release/KENTNL/HTML-Tree-5.05/source/README" |
10 | 10 | ||
11 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | 11 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" |
12 | LIC_FILES_CHKSUM = "file://README;beginline=74;endline=91;md5=260d31d31370658947ae050eef27aca9" | 12 | LIC_FILES_CHKSUM = "file://README;beginline=88;endline=105;md5=260d31d31370658947ae050eef27aca9" |
13 | 13 | ||
14 | SRC_URI = "${CPAN_MIRROR}/authors/id/J/JF/JFEARN/HTML-Tree-${PV}.tar.gz \ | 14 | SRC_URI = "${CPAN_MIRROR}/authors/id/K/KE/KENTNL/HTML-Tree-${PV}.tar.gz \ |
15 | file://bin-htmltree-fix-shebang.patch \ | 15 | file://bin-htmltree-fix-shebang.patch \ |
16 | " | 16 | " |
17 | SRC_URI[sha256sum] = "1959ea2f7a9f1491903238d3a2cbef3a8e9aaaa75963f7114dbf54dca791b7be" | 17 | SRC_URI[sha256sum] = "9c0461e9058d4d1bf1dca353bb1266cf99c99c8adabd9d3ca97d2bc4a5e8bd0f" |
18 | 18 | ||
19 | S = "${UNPACKDIR}/HTML-Tree-${PV}" | 19 | S = "${UNPACKDIR}/HTML-Tree-${PV}" |
20 | 20 | ||
diff --git a/meta-python/recipes-devtools/python/python3-alembic_1.16.5.bb b/meta-python/recipes-devtools/python/python3-alembic_1.17.0.bb index e3abce84a9..34273e6807 100644 --- a/meta-python/recipes-devtools/python/python3-alembic_1.16.5.bb +++ b/meta-python/recipes-devtools/python/python3-alembic_1.17.0.bb | |||
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d2ee18d90dcc02d96b76e9e953629936" | |||
4 | 4 | ||
5 | inherit pypi python_setuptools_build_meta | 5 | inherit pypi python_setuptools_build_meta |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "a88bb7f6e513bd4301ecf4c7f2206fe93f9913f9b48dac3b78babde2d6fe765e" | 7 | SRC_URI[sha256sum] = "4652a0b3e19616b57d652b82bfa5e38bf5dbea0813eed971612671cb9e90c0fe" |
8 | 8 | ||
9 | RDEPENDS:${PN} += "\ | 9 | RDEPENDS:${PN} += "\ |
10 | python3-dateutil \ | 10 | python3-dateutil \ |
diff --git a/meta-python/recipes-devtools/python/python3-asgiref_3.9.2.bb b/meta-python/recipes-devtools/python/python3-asgiref_3.10.0.bb index 078f425d2b..7be6156c76 100644 --- a/meta-python/recipes-devtools/python/python3-asgiref_3.9.2.bb +++ b/meta-python/recipes-devtools/python/python3-asgiref_3.10.0.bb | |||
@@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "a0249afacb66688ef258ffe503528360443e2b9a8d8c4581b6ebefa58c841ef1" | 7 | SRC_URI[sha256sum] = "d89f2d8cd8b56dada7d52fa7dc8075baa08fb836560710d38c292a7a3f78c04e" |
8 | 8 | ||
9 | export BUILD_SYS | 9 | export BUILD_SYS |
10 | export HOST_SYS | 10 | export HOST_SYS |
diff --git a/meta-python/recipes-devtools/python/python3-astroid_3.3.11.bb b/meta-python/recipes-devtools/python/python3-astroid_4.0.1.bb index cdb25a6515..be69adeee5 100644 --- a/meta-python/recipes-devtools/python/python3-astroid_3.3.11.bb +++ b/meta-python/recipes-devtools/python/python3-astroid_4.0.1.bb | |||
@@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
4 | LICENSE = "LGPL-2.1-only" | 4 | LICENSE = "LGPL-2.1-only" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "1e5a5011af2920c7c67a53f65d536d65bfa7116feeaf2354d8b94f29573bb0ce" | 7 | SRC_URI[sha256sum] = "0d778ec0def05b935e198412e62f9bcca8b3b5c39fdbe50b0ba074005e477aab" |
8 | 8 | ||
9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-awesomeversion_25.5.0.bb b/meta-python/recipes-devtools/python/python3-awesomeversion_25.8.0.bb index ae600a48b6..338ba7e97a 100644 --- a/meta-python/recipes-devtools/python/python3-awesomeversion_25.5.0.bb +++ b/meta-python/recipes-devtools/python/python3-awesomeversion_25.8.0.bb | |||
@@ -4,8 +4,8 @@ SECTION = "devel/python" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENCE.md;md5=92622b5a8e216099be741d78328bae5d" | 5 | LIC_FILES_CHKSUM = "file://LICENCE.md;md5=92622b5a8e216099be741d78328bae5d" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "d64c9f3579d2f60a5aa506a9dd0b38a74ab5f45e04800f943a547c1102280f31" | 7 | SRC_URI[sha256sum] = "e6cd08c90292a11f30b8de401863dcde7bc66a671d8173f9066ebd15d9310453" |
8 | 8 | ||
9 | RDEPENDS:${PN} += "python3-profile python3-logging" | 9 | RDEPENDS:${PN} += "python3-profile python3-logging" |
10 | 10 | ||
11 | inherit pypi python_poetry_core | 11 | inherit pypi python_hatchling python_poetry_core |
diff --git a/meta-python/recipes-devtools/python/python3-bitarray_3.7.1.bb b/meta-python/recipes-devtools/python/python3-bitarray_3.7.2.bb index a197414962..0ded3c3bd2 100644 --- a/meta-python/recipes-devtools/python/python3-bitarray_3.7.1.bb +++ b/meta-python/recipes-devtools/python/python3-bitarray_3.7.2.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/ilanschnell/bitarray" | |||
4 | LICENSE = "PSF-2.0" | 4 | LICENSE = "PSF-2.0" |
5 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=6abe80c028e4ee53045a33ae807c64fd" | 5 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=6abe80c028e4ee53045a33ae807c64fd" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "795b1760418ab750826420ae24f06f392c08e21dc234f0a369a69cc00444f8ec" | 7 | SRC_URI[sha256sum] = "27a59bb7c64c0d094057a3536e15fdd693f8520771ee75d9344b82d0a5ade2d0" |
8 | 8 | ||
9 | inherit python_setuptools_build_meta pypi | 9 | inherit python_setuptools_build_meta pypi |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-cachetools_6.2.0.bb b/meta-python/recipes-devtools/python/python3-cachetools_6.2.1.bb index 84899bd71e..78b4ab5e2e 100644 --- a/meta-python/recipes-devtools/python/python3-cachetools_6.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-cachetools_6.2.1.bb | |||
@@ -14,6 +14,6 @@ RDEPENDS:${PN} += " \ | |||
14 | python3-math \ | 14 | python3-math \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRC_URI[sha256sum] = "38b328c0889450f05f5e120f56ab68c8abaf424e1275522b138ffc93253f7e32" | 17 | SRC_URI[sha256sum] = "3f391e4bd8f8bf0931169baf7456cc822705f4e2a31f840d218f445b9a854201" |
18 | 18 | ||
19 | BBCLASSEXTEND = "native nativesdk" | 19 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-python/recipes-devtools/python/python3-cantools_40.7.0.bb b/meta-python/recipes-devtools/python/python3-cantools_40.7.1.bb index df6bbb45ff..92b6c1ca09 100644 --- a/meta-python/recipes-devtools/python/python3-cantools_40.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-cantools_40.7.1.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/cantools" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "5779113b068ab043140ea9441ad77d44ad4d382eed88de16678fb320e32146ec" | 6 | SRC_URI[sha256sum] = "467e04cc86e076307375ae9bcd83707108e998e3ea6019bf968773580b9aa95f" |
7 | 7 | ||
8 | PYPI_PACKAGE = "cantools" | 8 | PYPI_PACKAGE = "cantools" |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-configargparse_1.7.bb b/meta-python/recipes-devtools/python/python3-configargparse_1.7.1.bb index 4d18b6392d..c056109c5a 100644 --- a/meta-python/recipes-devtools/python/python3-configargparse_1.7.bb +++ b/meta-python/recipes-devtools/python/python3-configargparse_1.7.1.bb | |||
@@ -3,9 +3,9 @@ HOMEPAGE = "https://github.com/bw2/ConfigArgParse" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=da746463714cc35999ed9a42339f2943" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=da746463714cc35999ed9a42339f2943" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "e7067471884de5478c58a511e529f0f9bd1c66bfef1dea90935438d6c23306d1" | 6 | SRC_URI[sha256sum] = "79c2ddae836a1e5914b71d58e4b9adbd9f7779d4e6351a637b7d2d9b6c46d3d9" |
7 | 7 | ||
8 | PYPI_PACKAGE = "ConfigArgParse" | 8 | PYPI_PACKAGE = "configargparse" |
9 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 9 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
10 | 10 | ||
11 | inherit pypi setuptools3 | 11 | inherit pypi setuptools3 |
diff --git a/meta-python/recipes-devtools/python/python3-django_4.2.24.bb b/meta-python/recipes-devtools/python/python3-django_4.2.25.bb index 286d757733..861f7747d2 100644 --- a/meta-python/recipes-devtools/python/python3-django_4.2.24.bb +++ b/meta-python/recipes-devtools/python/python3-django_4.2.25.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require python3-django.inc | 1 | require python3-django.inc |
2 | inherit python_setuptools_build_meta | 2 | inherit python_setuptools_build_meta |
3 | 3 | ||
4 | SRC_URI[sha256sum] = "40cd7d3f53bc6cd1902eadce23c337e97200888df41e4a73b42d682f23e71d80" | 4 | SRC_URI[sha256sum] = "2391ab3d78191caaae2c963c19fd70b99e9751008da22a0adcc667c5a4f8d311" |
5 | 5 | ||
6 | RDEPENDS:${PN} += "\ | 6 | RDEPENDS:${PN} += "\ |
7 | python3-sqlparse \ | 7 | python3-sqlparse \ |
diff --git a/meta-python/recipes-devtools/python/python3-django_5.2.6.bb b/meta-python/recipes-devtools/python/python3-django_5.2.7.bb index 644d825705..a0589d9916 100644 --- a/meta-python/recipes-devtools/python/python3-django_5.2.6.bb +++ b/meta-python/recipes-devtools/python/python3-django_5.2.7.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require python3-django.inc | 1 | require python3-django.inc |
2 | inherit python_setuptools_build_meta | 2 | inherit python_setuptools_build_meta |
3 | 3 | ||
4 | SRC_URI[sha256sum] = "da5e00372763193d73cecbf71084a3848458cecf4cee36b9a1e8d318d114a87b" | 4 | SRC_URI[sha256sum] = "e0f6f12e2551b1716a95a63a1366ca91bbcd7be059862c1b18f989b1da356cdd" |
5 | 5 | ||
6 | RDEPENDS:${PN} += "\ | 6 | RDEPENDS:${PN} += "\ |
7 | python3-sqlparse \ | 7 | python3-sqlparse \ |
diff --git a/meta-python/recipes-devtools/python/python3-filelock_3.18.0.bb b/meta-python/recipes-devtools/python/python3-filelock_3.20.0.bb index 9c4721d4bf..4ce89a853e 100644 --- a/meta-python/recipes-devtools/python/python3-filelock_3.18.0.bb +++ b/meta-python/recipes-devtools/python/python3-filelock_3.20.0.bb | |||
@@ -5,7 +5,7 @@ HOMEPAGE = "https://py-filelock.readthedocs.io/" | |||
5 | LICENSE = "Unlicense" | 5 | LICENSE = "Unlicense" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "adbc88eabb99d2fec8c9c1b229b171f18afa655400173ddc653d5d01501fb9f2" | 8 | SRC_URI[sha256sum] = "711e943b4ec6be42e1d4e6690b48dc175c822967466bb31c0c293f34334c13f4" |
9 | 9 | ||
10 | BBCLASSEXTEND = "native nativesdk" | 10 | BBCLASSEXTEND = "native nativesdk" |
11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-frozenlist_1.7.0.bb b/meta-python/recipes-devtools/python/python3-frozenlist_1.8.0.bb index d832494c82..cf2ed455bf 100644 --- a/meta-python/recipes-devtools/python/python3-frozenlist_1.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-frozenlist_1.8.0.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/aio-libs/frozenlist" | |||
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=cf056e8e7a0a5477451af18b7b5aa98c" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=cf056e8e7a0a5477451af18b7b5aa98c" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "2e310d81923c2437ea8670467121cc3e9b0f76d3043cc1d2331d56c7fb7a3a8f" | 6 | SRC_URI[sha256sum] = "3ede829ed8d842f6cd48fc7081d7a41001a56f1f38603f9d49bf3020d59a31ad" |
7 | 7 | ||
8 | inherit pypi python_setuptools_build_meta cython | 8 | inherit pypi python_setuptools_build_meta cython |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-greenstalk_2.1.0.bb b/meta-python/recipes-devtools/python/python3-greenstalk_2.1.1.bb index c23c29f35d..b02e10e655 100644 --- a/meta-python/recipes-devtools/python/python3-greenstalk_2.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-greenstalk_2.1.1.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/mayhewj/greenstalk" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8f98432ba1fce3933c556430fd47298f" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8f98432ba1fce3933c556430fd47298f" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "a731ca15bc3b03dfffc438db08c96d0c4e8ce5f472403573e40a1939791c12a7" | 6 | SRC_URI[sha256sum] = "e89b7694ddabbd69562bfe11140fdac1afc9fedcbe2edf6464eaf7c355533ef8" |
7 | 7 | ||
8 | RDEPENDS:${PN} += "python3-io python3-core" | 8 | RDEPENDS:${PN} += "python3-io python3-core" |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-httptools_0.6.4.bb b/meta-python/recipes-devtools/python/python3-httptools_0.7.1.bb index d8a9f06908..f961745a1b 100644 --- a/meta-python/recipes-devtools/python/python3-httptools_0.6.4.bb +++ b/meta-python/recipes-devtools/python/python3-httptools_0.7.1.bb | |||
@@ -3,6 +3,6 @@ HOMEPAGE = "https://github.com/MagicStack/httptools" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0a2d82955bf3facdf04cb882655e840e" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0a2d82955bf3facdf04cb882655e840e" |
5 | 5 | ||
6 | inherit pypi setuptools3_legacy ptest-python-pytest | 6 | inherit pypi python_setuptools_build_meta ptest-python-pytest |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "4e93eee4add6493b59a5c514da98c939b244fce4a0d8879cd3f466562f4b7d5c" | 8 | SRC_URI[sha256sum] = "abd72556974f8e7c74a259655924a717a2365b236c882c3f6f8a45fe94703ac9" |
diff --git a/meta-python/recipes-devtools/python/python3-inline-snapshot_0.29.1.bb b/meta-python/recipes-devtools/python/python3-inline-snapshot_0.29.3.bb index d0d3049388..2a3d253e3c 100644 --- a/meta-python/recipes-devtools/python/python3-inline-snapshot_0.29.1.bb +++ b/meta-python/recipes-devtools/python/python3-inline-snapshot_0.29.3.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "MIT" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7a35eb90dfdf03953dd2074d0fdba1d4" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7a35eb90dfdf03953dd2074d0fdba1d4" |
5 | 5 | ||
6 | DEPENDS = "python3-hatchling-native" | 6 | DEPENDS = "python3-hatchling-native" |
7 | SRC_URI[sha256sum] = "17e73cb6864fa067aa94c2c1f290bbdeb25b2b807c4bdf53eee39a144f92a5a7" | 7 | SRC_URI[sha256sum] = "f11e309d3474ab5f517687288bf23092e1acadb392e1e38ddb3d5bb165a8723e" |
8 | 8 | ||
9 | inherit pypi python_hatchling | 9 | inherit pypi python_hatchling |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-invoke_2.2.0.bb b/meta-python/recipes-devtools/python/python3-invoke_2.2.1.bb index 3f2e6232d6..bcff343480 100644 --- a/meta-python/recipes-devtools/python/python3-invoke_2.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-invoke_2.2.1.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://www.pyinvoke.org/" | |||
3 | LICENSE = "BSD-2-Clause" | 3 | LICENSE = "BSD-2-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a8815068973f31b78c328dc067e297ab" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a8815068973f31b78c328dc067e297ab" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "ee6cbb101af1a859c7fe84f2a264c059020b0cb7fe3535f9424300ab568f6bd5" | 6 | SRC_URI[sha256sum] = "515bf49b4a48932b79b024590348da22f39c4942dff991ad1fb8b8baea1be707" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-ipython_9.5.0.bb b/meta-python/recipes-devtools/python/python3-ipython_9.6.0.bb index 058e83b373..b038be8a9e 100644 --- a/meta-python/recipes-devtools/python/python3-ipython_9.5.0.bb +++ b/meta-python/recipes-devtools/python/python3-ipython_9.6.0.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://ipython.org" | |||
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" | 4 | LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "129c44b941fe6d9b82d36fc7a7c18127ddb1d6f02f78f867f402e2e3adde3113" | 6 | SRC_URI[sha256sum] = "5603d6d5d356378be5043e69441a072b50a5b33b4503428c77b04cb8ce7bc731" |
7 | 7 | ||
8 | RDEPENDS:${PN} = "\ | 8 | RDEPENDS:${PN} = "\ |
9 | python3-setuptools \ | 9 | python3-setuptools \ |
diff --git a/meta-python/recipes-devtools/python/python3-isort_6.0.1.bb b/meta-python/recipes-devtools/python/python3-isort_7.0.0.bb index cf04452102..86ad769b1d 100644 --- a/meta-python/recipes-devtools/python/python3-isort_6.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-isort_7.0.0.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "MIT" | |||
4 | SECTION = "devel/python" | 4 | SECTION = "devel/python" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=197c46995787b46a2dbf0d519c1754cf" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=197c46995787b46a2dbf0d519c1754cf" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "1cb5df28dfbc742e490c5e41bad6da41b805b0a8be7bc93cd0fb2a8a890ac450" | 7 | SRC_URI[sha256sum] = "5513527951aadb3ac4292a41a16cbc50dd1642432f5e8c20057d414bdafb4187" |
8 | 8 | ||
9 | inherit pypi python_hatchling | 9 | inherit pypi python_hatchling |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.11.0.bb b/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.11.0.bb deleted file mode 100644 index ebf9f84951..0000000000 --- a/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.11.0.bb +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | SUMMARY = "A fast and thorough lazy object proxy" | ||
2 | HOMEPAGE = "https://python-lazy-object-proxy.readthedocs.io/" | ||
3 | LICENSE = "BSD-2-Clause" | ||
4 | SECTION = "devel/python" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b44e35194fc96f303ff4302a2a5759dd" | ||
6 | |||
7 | DEPENDS += "python3-setuptools-scm-native" | ||
8 | |||
9 | SRC_URI[sha256sum] = "18874411864c9fbbbaa47f9fc1dd7aea754c86cfde21278ef427639d1dd78e9c" | ||
10 | |||
11 | PYPI_PACKAGE = "lazy_object_proxy" | ||
12 | |||
13 | inherit pypi python_setuptools_build_meta | ||
diff --git a/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.12.0.bb b/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.12.0.bb new file mode 100644 index 0000000000..acd84efd21 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.12.0.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "A fast and thorough lazy object proxy" | ||
2 | HOMEPAGE = "https://python-lazy-object-proxy.readthedocs.io/" | ||
3 | LICENSE = "BSD-2-Clause" | ||
4 | SECTION = "devel/python" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f0cd92fd68aacee0503822c05a3ee6a2" | ||
6 | |||
7 | DEPENDS += "python3-setuptools-scm-native" | ||
8 | |||
9 | SRC_URI[sha256sum] = "1f5a462d92fd0cfb82f1fab28b51bfb209fabbe6aabf7f0d51472c0c124c0c61" | ||
10 | |||
11 | PYPI_PACKAGE = "lazy_object_proxy" | ||
12 | |||
13 | inherit pypi python_setuptools_build_meta | ||
14 | |||
15 | do_install:append() { | ||
16 | # contain moddate, makes is non-reproducible | ||
17 | rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/lazy_object_proxy/__pycache__/*.cpython-*.pyc | ||
18 | } | ||
diff --git a/meta-python/recipes-devtools/python/python3-lief_0.16.6.bb b/meta-python/recipes-devtools/python/python3-lief_0.16.7.bb index 2c5aeb6bb6..e511d0232b 100644 --- a/meta-python/recipes-devtools/python/python3-lief_0.16.6.bb +++ b/meta-python/recipes-devtools/python/python3-lief_0.16.7.bb | |||
@@ -5,12 +5,12 @@ LICENSE = "Apache-2.0" | |||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=be298b85ef6036ef77810ae0dce93776" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=be298b85ef6036ef77810ae0dce93776" |
6 | SECTION = "libs" | 6 | SECTION = "libs" |
7 | 7 | ||
8 | SRCREV = "a4fcb58cfb5f0016a944f7ac20dcf4fca08aa6a9" | ||
8 | SRC_URI = " \ | 9 | SRC_URI = " \ |
9 | git://github.com/lief-project/LIEF.git;protocol=https;branch=release/0.16.x;tag=${PV} \ | 10 | git://github.com/lief-project/LIEF.git;protocol=https;branch=release/0.16.x;tag=${PV} \ |
10 | file://0001-build-requirements.txt-Allow-newer-versions.patch \ | 11 | file://0001-build-requirements.txt-Allow-newer-versions.patch \ |
11 | file://0002-api-python-config-default.toml-Debug.patch \ | 12 | file://0002-api-python-config-default.toml-Debug.patch \ |
12 | " | 13 | " |
13 | SRCREV = "d52c66d6da4d67c69438989df83a5415236ae08b" | ||
14 | 14 | ||
15 | PEP517_SOURCE_PATH = "${S}/api/python" | 15 | PEP517_SOURCE_PATH = "${S}/api/python" |
16 | 16 | ||
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch index c4262985ba..12216ce46a 100644 --- a/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch +++ b/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-Make-the-cmd-available.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From eaeb95ec64762a58dde7cf368fc17188382e7df6 Mon Sep 17 00:00:00 2001 | 1 | From 6262f49de177a79bc17f8d583aa5a7acaf48bf9c Mon Sep 17 00:00:00 2001 |
2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Mingli Yu <mingli.yu@windriver.com> |
3 | Date: Fri, 28 Mar 2025 12:13:26 +0800 | 3 | Date: Fri, 28 Mar 2025 12:13:26 +0800 |
4 | Subject: [PATCH] setup.py: Make the cmd available | 4 | Subject: [PATCH] setup.py: Make the cmd available |
@@ -19,19 +19,26 @@ Upstream-Status: Inappropriate [oe specific] | |||
19 | 19 | ||
20 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 20 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
21 | --- | 21 | --- |
22 | setup.py | 2 +- | 22 | setup.py | 6 ++++-- |
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | 23 | 1 file changed, 4 insertions(+), 2 deletions(-) |
24 | 24 | ||
25 | diff --git a/setup.py b/setup.py | 25 | diff --git a/setup.py b/setup.py |
26 | index 9938e67..21e2346 100644 | 26 | index 792d7365b6ed..5b8a5d791793 100644 |
27 | --- a/setup.py | 27 | --- a/setup.py |
28 | +++ b/setup.py | 28 | +++ b/setup.py |
29 | @@ -230,7 +230,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): | 29 | @@ -208,8 +208,10 @@ class _M2CryptoBuildExt(build_ext.build_ext): |
30 | with open( | 30 | if sys.platform != "win32": |
31 | "src/SWIG/x509_v_flag.h", "w", encoding="utf-8" | 31 | # generate src/SWIG/x509_v_flag.h to overcome weaknesses of swig |
32 | ) as x509_v_h: | 32 | # https://todo.sr.ht/~mcepl/m2crypto/298 |
33 | - cmd = [shutil.which(os.environ.get('CC', 'gcc'))] | 33 | - with open("src/SWIG/x509_v_flag.h", "w", encoding="utf-8") as x509_v_h: |
34 | - cmd = [shutil.which(os.environ.get("CC", "gcc"))] | ||
35 | + with open( | ||
36 | + "src/SWIG/x509_v_flag.h", "w", encoding="utf-8" | ||
37 | + ) as x509_v_h: | ||
34 | + cmd = os.environ.get('CC', 'gcc').split() | 38 | + cmd = os.environ.get('CC', 'gcc').split() |
35 | cflags = os.environ.get("CFLAGS") | 39 | cflags = os.environ.get("CFLAGS") |
36 | if cflags is not None: | 40 | if cflags is not None: |
37 | cmd += cflags.split() | 41 | cmd += cflags.split() |
42 | -- | ||
43 | 2.34.1 | ||
44 | |||
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-timeout.py-use-qq-format-when-time_t-is-64bit-on-32b.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-timeout.py-use-qq-format-when-time_t-is-64bit-on-32b.patch deleted file mode 100644 index 120a67b6a2..0000000000 --- a/meta-python/recipes-devtools/python/python3-m2crypto/0001-timeout.py-use-qq-format-when-time_t-is-64bit-on-32b.patch +++ /dev/null | |||
@@ -1,80 +0,0 @@ | |||
1 | From 7fa4f17cc183e04b10684b28219cf15780910206 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Mon, 30 Jun 2025 16:11:16 +0800 | ||
4 | Subject: [PATCH] timeout.py: use qq format when time_t is 64bit on 32bit | ||
5 | platform | ||
6 | |||
7 | Fixes: | ||
8 | # python3 | ||
9 | Python 3.13.2 (main, Feb 4 2025, 14:51:09) [GCC 14.2.0] on linux | ||
10 | Type "help", "copyright", "credits" or "license" for more information. | ||
11 | >>> import socket | ||
12 | >>> import struct | ||
13 | >>> s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) | ||
14 | >>> seconds = 5 | ||
15 | >>> microseconds = 0 | ||
16 | >>> timeval_packed = struct.pack('ll', seconds, microseconds) | ||
17 | >>> s.setsockopt(socket.SOL_SOCKET, socket.SO_RCVTIMEO, timeval_packed) | ||
18 | Traceback (most recent call last): | ||
19 | File "<python-input-6>", line 1, in <module> | ||
20 | s.setsockopt(socket.SOL_SOCKET, socket.SO_RCVTIMEO, timeval_packed) | ||
21 | ~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
22 | OSError: [Errno 22] Invalid argument | ||
23 | |||
24 | Upstream-Status: Submitted [https://lists.sr.ht/~mcepl/m2crypto/patches/60463] | ||
25 | |||
26 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
27 | --- | ||
28 | src/M2Crypto/SSL/timeout.py | 18 ++++++++++++++---- | ||
29 | 1 file changed, 14 insertions(+), 4 deletions(-) | ||
30 | |||
31 | diff --git a/src/M2Crypto/SSL/timeout.py b/src/M2Crypto/SSL/timeout.py | ||
32 | index 298a9ca..0b38329 100644 | ||
33 | --- a/src/M2Crypto/SSL/timeout.py | ||
34 | +++ b/src/M2Crypto/SSL/timeout.py | ||
35 | @@ -15,7 +15,7 @@ __all__ = [ | ||
36 | import sys | ||
37 | import struct | ||
38 | |||
39 | -from M2Crypto import m2 | ||
40 | +from M2Crypto import m2, util | ||
41 | |||
42 | DEFAULT_TIMEOUT: int = 600 | ||
43 | |||
44 | @@ -40,7 +40,10 @@ class timeout(object): | ||
45 | if m2.time_t_bits() == 32: | ||
46 | binstr = struct.pack('ii', self.sec, self.microsec) | ||
47 | else: | ||
48 | - binstr = struct.pack('ll', self.sec, self.microsec) | ||
49 | + if util.is_32bit(): | ||
50 | + binstr = struct.pack('qq', self.sec, self.microsec) | ||
51 | + else: | ||
52 | + binstr = struct.pack('ll', self.sec, self.microsec) | ||
53 | return binstr | ||
54 | |||
55 | |||
56 | @@ -52,7 +55,10 @@ def struct_to_timeout(binstr: bytes) -> timeout: | ||
57 | sec = int(millisec / 1000) | ||
58 | microsec = (millisec % 1000) * 1000 | ||
59 | else: | ||
60 | - (sec, microsec) = struct.unpack('ll', binstr) | ||
61 | + if sys.platform == 'linux' and util.is_32bit() and m2.time_t_bits() == 64: | ||
62 | + (sec, microsec) = struct.unpack('qq', binstr) | ||
63 | + else: | ||
64 | + (sec, microsec) = struct.unpack('ll', binstr) | ||
65 | return timeout(sec, microsec) | ||
66 | |||
67 | |||
68 | @@ -60,4 +66,8 @@ def struct_size() -> int: | ||
69 | if sys.platform == 'win32': | ||
70 | return struct.calcsize('l') | ||
71 | else: | ||
72 | - return struct.calcsize('ll') | ||
73 | + if sys.platform == 'linux' and util.is_32bit() and m2.time_t_bits() == 64: | ||
74 | + return struct.calcsize('qq') | ||
75 | + else: | ||
76 | + return struct.calcsize('ll') | ||
77 | + | ||
78 | -- | ||
79 | 2.34.1 | ||
80 | |||
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto_0.45.1.bb b/meta-python/recipes-devtools/python/python3-m2crypto_0.46.2.bb index e0e9fdb2bb..0a631c7a07 100644 --- a/meta-python/recipes-devtools/python/python3-m2crypto_0.45.1.bb +++ b/meta-python/recipes-devtools/python/python3-m2crypto_0.46.2.bb | |||
@@ -1,14 +1,13 @@ | |||
1 | SUMMARY = "A Python crypto and SSL toolkit" | 1 | SUMMARY = "A Python crypto and SSL toolkit" |
2 | HOMEPAGE = "https://gitlab.com/m2crypto/m2crypto" | 2 | HOMEPAGE = "https://gitlab.com/m2crypto/m2crypto" |
3 | 3 | ||
4 | LICENSE = "MIT" | 4 | LICENSE = "BSD-2-Clause" |
5 | LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" | 5 | LIC_FILES_CHKSUM = "file://LICENSES/BSD-2-Clause.txt;md5=8099b0e569f862ece05740aef06c82a2" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "d0fc81a8828edbf4308432b3040bf06bb26bad95abb9e7d4690b6118551e76ec" | 7 | SRC_URI[sha256sum] = "13c2fa89562f7b8af40cc74b55f490be5e2ab8ccfb739f11c16d3ce6221a61ba" |
8 | 8 | ||
9 | SRC_URI += " \ | 9 | SRC_URI += " \ |
10 | file://0001-setup.py-Make-the-cmd-available.patch \ | 10 | file://0001-setup.py-Make-the-cmd-available.patch \ |
11 | file://0001-timeout.py-use-qq-format-when-time_t-is-64bit-on-32b.patch \ | ||
12 | " | 11 | " |
13 | 12 | ||
14 | inherit pypi siteinfo python_setuptools_build_meta | 13 | inherit pypi siteinfo python_setuptools_build_meta |
diff --git a/meta-python/recipes-devtools/python/python3-matplotlib_3.10.6.bb b/meta-python/recipes-devtools/python/python3-matplotlib_3.10.7.bb index 578a6b9945..b5b5250a56 100644 --- a/meta-python/recipes-devtools/python/python3-matplotlib_3.10.6.bb +++ b/meta-python/recipes-devtools/python/python3-matplotlib_3.10.7.bb | |||
@@ -22,7 +22,7 @@ SRC_URI += "file://run-ptest \ | |||
22 | file://0001-Do-not-download-external-dependency-tarballs-via-mes.patch \ | 22 | file://0001-Do-not-download-external-dependency-tarballs-via-mes.patch \ |
23 | file://0001-Change-types-for-width-height-to-match-definitions-i.patch \ | 23 | file://0001-Change-types-for-width-height-to-match-definitions-i.patch \ |
24 | " | 24 | " |
25 | SRC_URI[sha256sum] = "ec01b645840dd1996df21ee37f208cd8ba57644779fa20464010638013d3203c" | 25 | SRC_URI[sha256sum] = "a06ba7e2a2ef9131c79c49e63dad355d2d878413a0376c1727c8b9335ff731c7" |
26 | 26 | ||
27 | inherit pypi pkgconfig python3targetconfig meson ptest-python-pytest | 27 | inherit pypi pkgconfig python3targetconfig meson ptest-python-pytest |
28 | 28 | ||
diff --git a/meta-python/recipes-devtools/python/python3-msgpack_1.1.1.bb b/meta-python/recipes-devtools/python/python3-msgpack_1.1.2.bb index 6704829f7d..85ec93695d 100644 --- a/meta-python/recipes-devtools/python/python3-msgpack_1.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-msgpack_1.1.2.bb | |||
@@ -6,7 +6,7 @@ inherit pypi python_setuptools_build_meta ptest-python-pytest | |||
6 | 6 | ||
7 | PTEST_PYTEST_DIR = "test" | 7 | PTEST_PYTEST_DIR = "test" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "77b79ce34a2bdab2594f490c8e80dd62a02d650b91a75159a63ec413b8d104cd" | 9 | SRC_URI[sha256sum] = "3b60763c1373dd60f398488069bcdc703cd08a711477b5d480eecc9f9626f47e" |
10 | 10 | ||
11 | RDEPENDS:${PN}:class-target += "\ | 11 | RDEPENDS:${PN}:class-target += "\ |
12 | python3-io \ | 12 | python3-io \ |
diff --git a/meta-python/recipes-devtools/python/python3-platformdirs_4.4.0.bb b/meta-python/recipes-devtools/python/python3-platformdirs_4.5.0.bb index bc52e02d28..7c1996fbae 100644 --- a/meta-python/recipes-devtools/python/python3-platformdirs_4.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-platformdirs_4.5.0.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/platformdirs/platformdirs" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "ca753cf4d81dc309bc67b0ea38fd15dc97bc30ce419a7f58d13eb3bf14c4febf" | 6 | SRC_URI[sha256sum] = "70ddccdd7c99fc5942e9fc25636a8b34d04c24b335100223152c2803e4063312" |
7 | 7 | ||
8 | inherit pypi python_hatchling ptest-python-pytest | 8 | inherit pypi python_hatchling ptest-python-pytest |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-propcache_0.3.2.bb b/meta-python/recipes-devtools/python/python3-propcache_0.4.1.bb index 8e2394a5c4..0bb31cd5d9 100644 --- a/meta-python/recipes-devtools/python/python3-propcache_0.3.2.bb +++ b/meta-python/recipes-devtools/python/python3-propcache_0.4.1.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/aio-libs/propcache" | |||
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "20d7d62e4e7ef05f221e0db2856b979540686342e7dd9973b815599c7057e168" | 6 | SRC_URI[sha256sum] = "f48107a8c637e80362555f37ecf49abe20370e557cc4ab374f04ec4423c97c3d" |
7 | 7 | ||
8 | inherit pypi python_setuptools_build_meta ptest-python-pytest cython | 8 | inherit pypi python_setuptools_build_meta ptest-python-pytest cython |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc b/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc index 42d7a830c1..1bee2b03ea 100644 --- a/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc +++ b/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc | |||
@@ -28,11 +28,11 @@ SRC_URI += " \ | |||
28 | crate://crates.io/icu_properties_data/1.5.0 \ | 28 | crate://crates.io/icu_properties_data/1.5.0 \ |
29 | crate://crates.io/icu_provider/1.5.0 \ | 29 | crate://crates.io/icu_provider/1.5.0 \ |
30 | crate://crates.io/icu_provider_macros/1.5.0 \ | 30 | crate://crates.io/icu_provider_macros/1.5.0 \ |
31 | crate://crates.io/idna/1.0.3 \ | 31 | crate://crates.io/idna/1.1.0 \ |
32 | crate://crates.io/idna_adapter/1.2.0 \ | 32 | crate://crates.io/idna_adapter/1.2.0 \ |
33 | crate://crates.io/indoc/2.0.5 \ | 33 | crate://crates.io/indoc/2.0.5 \ |
34 | crate://crates.io/itoa/1.0.11 \ | 34 | crate://crates.io/itoa/1.0.11 \ |
35 | crate://crates.io/jiter/0.10.0 \ | 35 | crate://crates.io/jiter/0.11.0 \ |
36 | crate://crates.io/js-sys/0.3.77 \ | 36 | crate://crates.io/js-sys/0.3.77 \ |
37 | crate://crates.io/lexical-parse-float/1.0.5 \ | 37 | crate://crates.io/lexical-parse-float/1.0.5 \ |
38 | crate://crates.io/lexical-parse-integer/1.0.5 \ | 38 | crate://crates.io/lexical-parse-integer/1.0.5 \ |
@@ -45,33 +45,35 @@ SRC_URI += " \ | |||
45 | crate://crates.io/num-bigint/0.4.6 \ | 45 | crate://crates.io/num-bigint/0.4.6 \ |
46 | crate://crates.io/num-integer/0.1.46 \ | 46 | crate://crates.io/num-integer/0.1.46 \ |
47 | crate://crates.io/num-traits/0.2.19 \ | 47 | crate://crates.io/num-traits/0.2.19 \ |
48 | crate://crates.io/once_cell/1.19.0 \ | 48 | crate://crates.io/once_cell/1.21.3 \ |
49 | crate://crates.io/percent-encoding/2.3.1 \ | 49 | crate://crates.io/percent-encoding/2.3.1 \ |
50 | crate://crates.io/portable-atomic/1.6.0 \ | 50 | crate://crates.io/portable-atomic/1.6.0 \ |
51 | crate://crates.io/proc-macro2/1.0.86 \ | 51 | crate://crates.io/proc-macro2/1.0.86 \ |
52 | crate://crates.io/pyo3/0.25.1 \ | 52 | crate://crates.io/pyo3/0.26.0 \ |
53 | crate://crates.io/pyo3-build-config/0.25.1 \ | 53 | crate://crates.io/pyo3-build-config/0.26.0 \ |
54 | crate://crates.io/pyo3-ffi/0.25.1 \ | 54 | crate://crates.io/pyo3-ffi/0.26.0 \ |
55 | crate://crates.io/pyo3-macros/0.25.1 \ | 55 | crate://crates.io/pyo3-macros/0.26.0 \ |
56 | crate://crates.io/pyo3-macros-backend/0.25.1 \ | 56 | crate://crates.io/pyo3-macros-backend/0.26.0 \ |
57 | crate://crates.io/python3-dll-a/0.2.14 \ | 57 | crate://crates.io/python3-dll-a/0.2.14 \ |
58 | crate://crates.io/quote/1.0.36 \ | 58 | crate://crates.io/quote/1.0.36 \ |
59 | crate://crates.io/r-efi/5.2.0 \ | 59 | crate://crates.io/r-efi/5.2.0 \ |
60 | crate://crates.io/radium/0.7.0 \ | ||
60 | crate://crates.io/radium/1.1.0 \ | 61 | crate://crates.io/radium/1.1.0 \ |
61 | crate://crates.io/regex/1.11.1 \ | 62 | crate://crates.io/regex/1.11.3 \ |
62 | crate://crates.io/regex-automata/0.4.8 \ | 63 | crate://crates.io/regex-automata/0.4.11 \ |
63 | crate://crates.io/regex-syntax/0.8.5 \ | 64 | crate://crates.io/regex-syntax/0.8.5 \ |
64 | crate://crates.io/rustversion/1.0.17 \ | 65 | crate://crates.io/rustversion/1.0.17 \ |
65 | crate://crates.io/ryu/1.0.18 \ | 66 | crate://crates.io/ryu/1.0.18 \ |
66 | crate://crates.io/serde/1.0.219 \ | 67 | crate://crates.io/serde/1.0.228 \ |
67 | crate://crates.io/serde_derive/1.0.219 \ | 68 | crate://crates.io/serde_core/1.0.228 \ |
68 | crate://crates.io/serde_json/1.0.140 \ | 69 | crate://crates.io/serde_derive/1.0.228 \ |
70 | crate://crates.io/serde_json/1.0.145 \ | ||
69 | crate://crates.io/smallvec/1.15.1 \ | 71 | crate://crates.io/smallvec/1.15.1 \ |
70 | crate://crates.io/speedate/0.16.0 \ | 72 | crate://crates.io/speedate/0.17.0 \ |
71 | crate://crates.io/stable_deref_trait/1.2.0 \ | 73 | crate://crates.io/stable_deref_trait/1.2.0 \ |
72 | crate://crates.io/static_assertions/1.1.0 \ | 74 | crate://crates.io/static_assertions/1.1.0 \ |
73 | crate://crates.io/strum/0.27.1 \ | 75 | crate://crates.io/strum/0.27.2 \ |
74 | crate://crates.io/strum_macros/0.27.1 \ | 76 | crate://crates.io/strum_macros/0.27.2 \ |
75 | crate://crates.io/syn/2.0.82 \ | 77 | crate://crates.io/syn/2.0.82 \ |
76 | crate://crates.io/synstructure/0.13.1 \ | 78 | crate://crates.io/synstructure/0.13.1 \ |
77 | crate://crates.io/tap/1.0.1 \ | 79 | crate://crates.io/tap/1.0.1 \ |
@@ -82,7 +84,7 @@ SRC_URI += " \ | |||
82 | crate://crates.io/url/2.5.4 \ | 84 | crate://crates.io/url/2.5.4 \ |
83 | crate://crates.io/utf16_iter/1.0.5 \ | 85 | crate://crates.io/utf16_iter/1.0.5 \ |
84 | crate://crates.io/utf8_iter/1.0.4 \ | 86 | crate://crates.io/utf8_iter/1.0.4 \ |
85 | crate://crates.io/uuid/1.17.0 \ | 87 | crate://crates.io/uuid/1.18.1 \ |
86 | crate://crates.io/version_check/0.9.5 \ | 88 | crate://crates.io/version_check/0.9.5 \ |
87 | crate://crates.io/wasi/0.14.2+wasi-0.2.4 \ | 89 | crate://crates.io/wasi/0.14.2+wasi-0.2.4 \ |
88 | crate://crates.io/wasm-bindgen/0.2.100 \ | 90 | crate://crates.io/wasm-bindgen/0.2.100 \ |
@@ -130,11 +132,11 @@ SRC_URI[icu_properties-1.5.1.sha256sum] = "93d6020766cfc6302c15dbbc9c8778c37e62c | |||
130 | SRC_URI[icu_properties_data-1.5.0.sha256sum] = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" | 132 | SRC_URI[icu_properties_data-1.5.0.sha256sum] = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" |
131 | SRC_URI[icu_provider-1.5.0.sha256sum] = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" | 133 | SRC_URI[icu_provider-1.5.0.sha256sum] = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" |
132 | SRC_URI[icu_provider_macros-1.5.0.sha256sum] = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" | 134 | SRC_URI[icu_provider_macros-1.5.0.sha256sum] = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" |
133 | SRC_URI[idna-1.0.3.sha256sum] = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" | 135 | SRC_URI[idna-1.1.0.sha256sum] = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" |
134 | SRC_URI[idna_adapter-1.2.0.sha256sum] = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" | 136 | SRC_URI[idna_adapter-1.2.0.sha256sum] = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" |
135 | SRC_URI[indoc-2.0.5.sha256sum] = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" | 137 | SRC_URI[indoc-2.0.5.sha256sum] = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" |
136 | SRC_URI[itoa-1.0.11.sha256sum] = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" | 138 | SRC_URI[itoa-1.0.11.sha256sum] = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" |
137 | SRC_URI[jiter-0.10.0.sha256sum] = "1bcfb1e43bda3ba59889499ff494c5f5b6b10864b74aa0bd4593ce4d16838aa6" | 139 | SRC_URI[jiter-0.11.0.sha256sum] = "ed1be5dfeadf968b30fa03a012a2f161de8be6df2d91bd8085c62cfb5efca65a" |
138 | SRC_URI[js-sys-0.3.77.sha256sum] = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" | 140 | SRC_URI[js-sys-0.3.77.sha256sum] = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" |
139 | SRC_URI[lexical-parse-float-1.0.5.sha256sum] = "de6f9cb01fb0b08060209a057c048fcbab8717b4c1ecd2eac66ebfe39a65b0f2" | 141 | SRC_URI[lexical-parse-float-1.0.5.sha256sum] = "de6f9cb01fb0b08060209a057c048fcbab8717b4c1ecd2eac66ebfe39a65b0f2" |
140 | SRC_URI[lexical-parse-integer-1.0.5.sha256sum] = "72207aae22fc0a121ba7b6d479e42cbfea549af1479c3f3a4f12c70dd66df12e" | 142 | SRC_URI[lexical-parse-integer-1.0.5.sha256sum] = "72207aae22fc0a121ba7b6d479e42cbfea549af1479c3f3a4f12c70dd66df12e" |
@@ -147,33 +149,35 @@ SRC_URI[memoffset-0.9.1.sha256sum] = "488016bfae457b036d996092f6cb448677611ce444 | |||
147 | SRC_URI[num-bigint-0.4.6.sha256sum] = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" | 149 | SRC_URI[num-bigint-0.4.6.sha256sum] = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" |
148 | SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" | 150 | SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" |
149 | SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" | 151 | SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" |
150 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" | 152 | SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" |
151 | SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" | 153 | SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" |
152 | SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" | 154 | SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" |
153 | SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" | 155 | SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" |
154 | SRC_URI[pyo3-0.25.1.sha256sum] = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a" | 156 | SRC_URI[pyo3-0.26.0.sha256sum] = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383" |
155 | SRC_URI[pyo3-build-config-0.25.1.sha256sum] = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598" | 157 | SRC_URI[pyo3-build-config-0.26.0.sha256sum] = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f" |
156 | SRC_URI[pyo3-ffi-0.25.1.sha256sum] = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c" | 158 | SRC_URI[pyo3-ffi-0.26.0.sha256sum] = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105" |
157 | SRC_URI[pyo3-macros-0.25.1.sha256sum] = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50" | 159 | SRC_URI[pyo3-macros-0.26.0.sha256sum] = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded" |
158 | SRC_URI[pyo3-macros-backend-0.25.1.sha256sum] = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc" | 160 | SRC_URI[pyo3-macros-backend-0.26.0.sha256sum] = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf" |
159 | SRC_URI[python3-dll-a-0.2.14.sha256sum] = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8" | 161 | SRC_URI[python3-dll-a-0.2.14.sha256sum] = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8" |
160 | SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" | 162 | SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" |
161 | SRC_URI[r-efi-5.2.0.sha256sum] = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" | 163 | SRC_URI[r-efi-5.2.0.sha256sum] = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" |
164 | SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" | ||
162 | SRC_URI[radium-1.1.0.sha256sum] = "db0b76288902db304c864a12046b73d2d895cc34a4bb8137baaeebe9978a072c" | 165 | SRC_URI[radium-1.1.0.sha256sum] = "db0b76288902db304c864a12046b73d2d895cc34a4bb8137baaeebe9978a072c" |
163 | SRC_URI[regex-1.11.1.sha256sum] = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" | 166 | SRC_URI[regex-1.11.3.sha256sum] = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" |
164 | SRC_URI[regex-automata-0.4.8.sha256sum] = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" | 167 | SRC_URI[regex-automata-0.4.11.sha256sum] = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" |
165 | SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" | 168 | SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" |
166 | SRC_URI[rustversion-1.0.17.sha256sum] = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" | 169 | SRC_URI[rustversion-1.0.17.sha256sum] = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" |
167 | SRC_URI[ryu-1.0.18.sha256sum] = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" | 170 | SRC_URI[ryu-1.0.18.sha256sum] = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" |
168 | SRC_URI[serde-1.0.219.sha256sum] = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" | 171 | SRC_URI[serde-1.0.228.sha256sum] = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" |
169 | SRC_URI[serde_derive-1.0.219.sha256sum] = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" | 172 | SRC_URI[serde_core-1.0.228.sha256sum] = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" |
170 | SRC_URI[serde_json-1.0.140.sha256sum] = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" | 173 | SRC_URI[serde_derive-1.0.228.sha256sum] = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" |
174 | SRC_URI[serde_json-1.0.145.sha256sum] = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" | ||
171 | SRC_URI[smallvec-1.15.1.sha256sum] = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" | 175 | SRC_URI[smallvec-1.15.1.sha256sum] = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" |
172 | SRC_URI[speedate-0.16.0.sha256sum] = "bc823f2eb39713ef0d286058af264ce0d8ddcf62b8a78a0aec02cd0105576d87" | 176 | SRC_URI[speedate-0.17.0.sha256sum] = "aba069c070b5e213f2a094deb7e5ed50ecb092be36102a4f4042e8d2056d060e" |
173 | SRC_URI[stable_deref_trait-1.2.0.sha256sum] = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" | 177 | SRC_URI[stable_deref_trait-1.2.0.sha256sum] = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" |
174 | SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" | 178 | SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" |
175 | SRC_URI[strum-0.27.1.sha256sum] = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32" | 179 | SRC_URI[strum-0.27.2.sha256sum] = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" |
176 | SRC_URI[strum_macros-0.27.1.sha256sum] = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8" | 180 | SRC_URI[strum_macros-0.27.2.sha256sum] = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" |
177 | SRC_URI[syn-2.0.82.sha256sum] = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" | 181 | SRC_URI[syn-2.0.82.sha256sum] = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" |
178 | SRC_URI[synstructure-0.13.1.sha256sum] = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" | 182 | SRC_URI[synstructure-0.13.1.sha256sum] = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" |
179 | SRC_URI[tap-1.0.1.sha256sum] = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" | 183 | SRC_URI[tap-1.0.1.sha256sum] = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" |
@@ -184,7 +188,7 @@ SRC_URI[unindent-0.2.3.sha256sum] = "c7de7d73e1754487cb58364ee906a499937a0dfabd8 | |||
184 | SRC_URI[url-2.5.4.sha256sum] = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" | 188 | SRC_URI[url-2.5.4.sha256sum] = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" |
185 | SRC_URI[utf16_iter-1.0.5.sha256sum] = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" | 189 | SRC_URI[utf16_iter-1.0.5.sha256sum] = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" |
186 | SRC_URI[utf8_iter-1.0.4.sha256sum] = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" | 190 | SRC_URI[utf8_iter-1.0.4.sha256sum] = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" |
187 | SRC_URI[uuid-1.17.0.sha256sum] = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" | 191 | SRC_URI[uuid-1.18.1.sha256sum] = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" |
188 | SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" | 192 | SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" |
189 | SRC_URI[wasi-0.14.2+wasi-0.2.4.sha256sum] = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" | 193 | SRC_URI[wasi-0.14.2+wasi-0.2.4.sha256sum] = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" |
190 | SRC_URI[wasm-bindgen-0.2.100.sha256sum] = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" | 194 | SRC_URI[wasm-bindgen-0.2.100.sha256sum] = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" |
diff --git a/meta-python/recipes-devtools/python/python3-pydantic-core/0001-cargo.toml-Update-bitvec-to-use-radium-1.x.patch b/meta-python/recipes-devtools/python/python3-pydantic-core/0001-cargo.toml-Update-bitvec-to-use-radium-1.x.patch index 58f8514630..ccaae06b7b 100644 --- a/meta-python/recipes-devtools/python/python3-pydantic-core/0001-cargo.toml-Update-bitvec-to-use-radium-1.x.patch +++ b/meta-python/recipes-devtools/python/python3-pydantic-core/0001-cargo.toml-Update-bitvec-to-use-radium-1.x.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 41fded05f38bdb8378b98be4f1dd5392a00f3d1b Mon Sep 17 00:00:00 2001 | 1 | From c4ebe7d218f7415b7c0137c231a47455b237840b Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 19 Apr 2025 00:09:42 -0700 | 3 | Date: Sat, 19 Apr 2025 00:09:42 -0700 |
4 | Subject: [PATCH] cargo.toml: Update bitvec to use radium 1.x | 4 | Subject: [PATCH] cargo.toml: Update bitvec to use radium 1.x |
@@ -6,13 +6,14 @@ Subject: [PATCH] cargo.toml: Update bitvec to use radium 1.x | |||
6 | Upstream-Status: Submitted [https://github.com/ferrilab/bitvec/pull/220] | 6 | Upstream-Status: Submitted [https://github.com/ferrilab/bitvec/pull/220] |
7 | 7 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | ||
9 | --- | 10 | --- |
10 | Cargo.lock | 12 +++++++++++- | 11 | Cargo.lock | 12 +++++++++++- |
11 | Cargo.toml | 2 ++ | 12 | Cargo.toml | 2 ++ |
12 | 2 files changed, 13 insertions(+), 1 deletion(-) | 13 | 2 files changed, 13 insertions(+), 1 deletion(-) |
13 | 14 | ||
14 | diff --git a/Cargo.lock b/Cargo.lock | 15 | diff --git a/Cargo.lock b/Cargo.lock |
15 | index 44bdf4e..274b828 100644 | 16 | index c1d0e44..9fc5367 100644 |
16 | --- a/Cargo.lock | 17 | --- a/Cargo.lock |
17 | +++ b/Cargo.lock | 18 | +++ b/Cargo.lock |
18 | @@ -49,7 +49,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | 19 | @@ -49,7 +49,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -24,7 +25,7 @@ index 44bdf4e..274b828 100644 | |||
24 | "tap", | 25 | "tap", |
25 | "wyz", | 26 | "wyz", |
26 | ] | 27 | ] |
27 | @@ -421,6 +421,7 @@ dependencies = [ | 28 | @@ -443,6 +443,7 @@ dependencies = [ |
28 | "num-traits", | 29 | "num-traits", |
29 | "pyo3", | 30 | "pyo3", |
30 | "pyo3-build-config", | 31 | "pyo3-build-config", |
@@ -32,7 +33,7 @@ index 44bdf4e..274b828 100644 | |||
32 | "regex", | 33 | "regex", |
33 | "serde", | 34 | "serde", |
34 | "serde_json", | 35 | "serde_json", |
35 | @@ -527,6 +528,15 @@ version = "0.7.0" | 36 | @@ -548,6 +549,15 @@ version = "0.7.0" |
36 | source = "registry+https://github.com/rust-lang/crates.io-index" | 37 | source = "registry+https://github.com/rust-lang/crates.io-index" |
37 | checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" | 38 | checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" |
38 | 39 | ||
@@ -47,9 +48,9 @@ index 44bdf4e..274b828 100644 | |||
47 | + | 48 | + |
48 | [[package]] | 49 | [[package]] |
49 | name = "regex" | 50 | name = "regex" |
50 | version = "1.11.1" | 51 | version = "1.11.3" |
51 | diff --git a/Cargo.toml b/Cargo.toml | 52 | diff --git a/Cargo.toml b/Cargo.toml |
52 | index 660e06a..7ee67d6 100644 | 53 | index df90031..e671ade 100644 |
53 | --- a/Cargo.toml | 54 | --- a/Cargo.toml |
54 | +++ b/Cargo.toml | 55 | +++ b/Cargo.toml |
55 | @@ -25,6 +25,8 @@ include = [ | 56 | @@ -25,6 +25,8 @@ include = [ |
@@ -60,4 +61,4 @@ index 660e06a..7ee67d6 100644 | |||
60 | +radium = "1" | 61 | +radium = "1" |
61 | # TODO it would be very nice to remove the "py-clone" feature as it can panic, | 62 | # TODO it would be very nice to remove the "py-clone" feature as it can panic, |
62 | # but needs a bit of work to make sure it's not used in the codebase | 63 | # but needs a bit of work to make sure it's not used in the codebase |
63 | pyo3 = { version = "0.25", features = ["generate-import-lib", "num-bigint", "py-clone"] } | 64 | pyo3 = { version = "0.26", features = ["generate-import-lib", "num-bigint", "py-clone"] } |
diff --git a/meta-python/recipes-devtools/python/python3-pydantic-core_2.37.2.bb b/meta-python/recipes-devtools/python/python3-pydantic-core_2.41.1.bb index b64f781481..611199890e 100644 --- a/meta-python/recipes-devtools/python/python3-pydantic-core_2.37.2.bb +++ b/meta-python/recipes-devtools/python/python3-pydantic-core_2.41.1.bb | |||
@@ -14,7 +14,7 @@ SRC_URI += "file://0001-Upgrade-radium-to-1.0.patch;patchdir=${UNPACKDIR}/cargo_ | |||
14 | SRC_URI += "file://atomic.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/radium-1.1.0/" | 14 | SRC_URI += "file://atomic.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/radium-1.1.0/" |
15 | SRC_URI += "file://0001-musl-enable-getrandom-on-all-musl-platforms.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/libc-0.2.155/" | 15 | SRC_URI += "file://0001-musl-enable-getrandom-on-all-musl-platforms.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/libc-0.2.155/" |
16 | SRC_URI += "file://0001-cargo.toml-Update-bitvec-to-use-radium-1.x.patch" | 16 | SRC_URI += "file://0001-cargo.toml-Update-bitvec-to-use-radium-1.x.patch" |
17 | SRC_URI[sha256sum] = "78fb2a749123408fedaf540a22ca6bf0b5ec1f522a14fc00e27ede33d8ac088c" | 17 | SRC_URI[sha256sum] = "1ad375859a6d8c356b7704ec0f547a58e82ee80bb41baa811ad710e124bc8f2f" |
18 | 18 | ||
19 | DEPENDS = "python3-maturin-native python3-typing-extensions" | 19 | DEPENDS = "python3-maturin-native python3-typing-extensions" |
20 | 20 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pydantic_2.11.7.bb b/meta-python/recipes-devtools/python/python3-pydantic_2.12.0.bb index e603e7dccd..8016b55dfe 100644 --- a/meta-python/recipes-devtools/python/python3-pydantic_2.11.7.bb +++ b/meta-python/recipes-devtools/python/python3-pydantic_2.12.0.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=09280955509d1c4ca14bae02f21d49a6" | |||
11 | 11 | ||
12 | inherit python_hatchling ptest-python-pytest | 12 | inherit python_hatchling ptest-python-pytest |
13 | 13 | ||
14 | SRCREV = "9b52422377d974ffc3de4e8b0bf7faab1acf2ec4" | 14 | SRCREV = "a7928e692e5a7841c4379d1af1fd37966941dade" |
15 | PV .= "+git" | 15 | PV .= "+git" |
16 | SRC_URI = "git://github.com/pydantic/pydantic;protocol=https;branch=main" | 16 | SRC_URI = "git://github.com/pydantic/pydantic;protocol=https;branch=main" |
17 | DEPENDS += "python3-hatch-fancy-pypi-readme-native" | 17 | DEPENDS += "python3-hatch-fancy-pypi-readme-native" |
diff --git a/meta-python/recipes-devtools/python/python3-pymongo_4.15.1.bb b/meta-python/recipes-devtools/python/python3-pymongo_4.15.3.bb index cf35e810c0..70cf9c21fd 100644 --- a/meta-python/recipes-devtools/python/python3-pymongo_4.15.1.bb +++ b/meta-python/recipes-devtools/python/python3-pymongo_4.15.3.bb | |||
@@ -8,7 +8,7 @@ HOMEPAGE = "https://github.com/mongodb/mongo-python-driver" | |||
8 | LICENSE = "Apache-2.0" | 8 | LICENSE = "Apache-2.0" |
9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "b9f379a4333dc3779a6bf7adfd077d4387404ed1561472743486a9c58286f705" | 11 | SRC_URI[sha256sum] = "7a981271347623b5319932796690c2d301668ac3a1965974ac9f5c3b8a22cea5" |
12 | 12 | ||
13 | inherit pypi python_hatchling | 13 | inherit pypi python_hatchling |
14 | 14 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pynacl/0001-Build-bindings-reproducibly.patch b/meta-python/recipes-devtools/python/python3-pynacl/0001-Build-bindings-reproducibly.patch new file mode 100644 index 0000000000..3e7480b485 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pynacl/0001-Build-bindings-reproducibly.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From eccc9ea5eef13ee353de610af36fb7759b70e2e4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@debian.org> | ||
3 | Date: Mon, 26 Aug 2024 18:14:33 +0100 | ||
4 | Subject: [PATCH] Build bindings reproducibly | ||
5 | |||
6 | `glob` output isn't guaranteed to be in any particular order, so | ||
7 | `_sodium.*.so` wasn't always reproducible. | ||
8 | |||
9 | Upstream-Status: Backport [https://github.com/pyca/pynacl/pull/836] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | src/bindings/build.py | 12 ++++++++---- | ||
13 | 1 file changed, 8 insertions(+), 4 deletions(-) | ||
14 | |||
15 | diff --git a/src/bindings/build.py b/src/bindings/build.py | ||
16 | index 9634237..777237b 100644 | ||
17 | --- a/src/bindings/build.py | ||
18 | +++ b/src/bindings/build.py | ||
19 | @@ -22,12 +22,16 @@ from cffi import FFI | ||
20 | __all__ = ["ffi"] | ||
21 | |||
22 | |||
23 | -HEADERS = glob.glob( | ||
24 | - os.path.join(os.path.abspath(os.path.dirname(__file__)), "*.h") | ||
25 | +HEADERS = sorted( | ||
26 | + glob.glob(os.path.join(os.path.abspath(os.path.dirname(__file__)), "*.h")) | ||
27 | ) | ||
28 | |||
29 | -MINIMAL_HEADERS = glob.glob( | ||
30 | - os.path.join(os.path.abspath(os.path.dirname(__file__)), "minimal", "*.h") | ||
31 | +MINIMAL_HEADERS = sorted( | ||
32 | + glob.glob( | ||
33 | + os.path.join( | ||
34 | + os.path.abspath(os.path.dirname(__file__)), "minimal", "*.h" | ||
35 | + ) | ||
36 | + ) | ||
37 | ) | ||
38 | |||
39 | |||
diff --git a/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb b/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb index 77ca2e1ff4..393066de9d 100644 --- a/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb +++ b/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb | |||
@@ -4,6 +4,7 @@ HOMEPAGE = "https://github.com/pyca/pynacl" | |||
4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8cc789b082b3d97e1ccc5261f8594d3f" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8cc789b082b3d97e1ccc5261f8594d3f" |
6 | 6 | ||
7 | SRC_URI += "file://0001-Build-bindings-reproducibly.patch" | ||
7 | SRC_URI[sha256sum] = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba" | 8 | SRC_URI[sha256sum] = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba" |
8 | 9 | ||
9 | PYPI_PACKAGE = "PyNaCl" | 10 | PYPI_PACKAGE = "PyNaCl" |
diff --git a/meta-python/recipes-devtools/python/python3-pyproject-api_1.9.1.bb b/meta-python/recipes-devtools/python/python3-pyproject-api_1.10.0.bb index 02fbfbcef6..2cd48f926f 100644 --- a/meta-python/recipes-devtools/python/python3-pyproject-api_1.9.1.bb +++ b/meta-python/recipes-devtools/python/python3-pyproject-api_1.10.0.bb | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "https://pyproject-api.readthedocs.io" | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "43c9918f49daab37e302038fc1aed54a8c7a91a9fa935d00b9a485f37e0f5335" | 9 | SRC_URI[sha256sum] = "40c6f2d82eebdc4afee61c773ed208c04c19db4c4a60d97f8d7be3ebc0bbb330" |
10 | 10 | ||
11 | PYPI_PACKAGE = "pyproject_api" | 11 | PYPI_PACKAGE = "pyproject_api" |
12 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | 12 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" |
diff --git a/meta-python/recipes-devtools/python/python3-pyudev_0.24.3.bb b/meta-python/recipes-devtools/python/python3-pyudev_0.24.4.bb index a44fdad3fd..559b828fcb 100644 --- a/meta-python/recipes-devtools/python/python3-pyudev_0.24.3.bb +++ b/meta-python/recipes-devtools/python/python3-pyudev_0.24.4.bb | |||
@@ -3,7 +3,7 @@ SUMMARY = "A libudev binding" | |||
3 | LICENSE = "LGPL-2.1-or-later" | 3 | LICENSE = "LGPL-2.1-or-later" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "2e945427a21674893bb97632401db62139d91cea1ee96137cc7b07ad22198fc7" | 6 | SRC_URI[sha256sum] = "e788bb983700b1a84efc2e88862b0a51af2a995d5b86bc9997546505cf7b36bc" |
7 | 7 | ||
8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pyunormalize_16.0.0.bb b/meta-python/recipes-devtools/python/python3-pyunormalize_17.0.0.bb index 19463bc224..fe367aa112 100644 --- a/meta-python/recipes-devtools/python/python3-pyunormalize_16.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyunormalize_17.0.0.bb | |||
@@ -1,8 +1,8 @@ | |||
1 | SUMMARY = "Unicode normalization forms (NFC, NFKC, NFD, NFKD). A library independent from the Python core Unicode database." | 1 | SUMMARY = "Unicode normalization forms (NFC, NFKC, NFD, NFKD). A library independent from the Python core Unicode database." |
2 | HOMEPAGE = "https://github.com/mlodewijck/pyunormalize" | 2 | HOMEPAGE = "https://github.com/mlodewijck/pyunormalize" |
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c2ee871081d4e4c24f32e37c413c73" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1d882216fa7fde0aec58695aa05ef72f" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "2e1dfbb4a118154ae26f70710426a52a364b926c9191f764601f5a8cb12761f7" | 6 | SRC_URI[sha256sum] = "0949a3e56817e287febcaf1b0cc4b5adf0bb107628d379335938040947eec792" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
diff --git a/meta-python/recipes-devtools/python/python3-pyzstd_0.17.0.bb b/meta-python/recipes-devtools/python/python3-pyzstd_0.18.0.bb index d93411beba..2aee987efa 100644 --- a/meta-python/recipes-devtools/python/python3-pyzstd_0.17.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyzstd_0.18.0.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aedb5a2679cd1552fb61c181ef974b9e" | |||
9 | PYPI_PACKAGE = "pyzstd" | 9 | PYPI_PACKAGE = "pyzstd" |
10 | 10 | ||
11 | SRC_URI += "file://0001-Bump-setuptools-dependency-from-74-to-89.patch" | 11 | SRC_URI += "file://0001-Bump-setuptools-dependency-from-74-to-89.patch" |
12 | SRC_URI[sha256sum] = "d84271f8baa66c419204c1dd115a4dec8b266f8a2921da21b81764fa208c1db6" | 12 | SRC_URI[sha256sum] = "81b6851ab1ca2e5f2c709e896a1362e3065a64f271f43db77fb7d5e4a78e9861" |
13 | 13 | ||
14 | inherit pypi python_setuptools_build_meta ptest-python-pytest | 14 | inherit pypi python_setuptools_build_meta ptest-python-pytest |
15 | 15 | ||
diff --git a/meta-python/recipes-devtools/python/python3-setproctitle_1.3.6.bb b/meta-python/recipes-devtools/python/python3-setproctitle_1.3.7.bb index e4a392726b..6abfcf8502 100644 --- a/meta-python/recipes-devtools/python/python3-setproctitle_1.3.6.bb +++ b/meta-python/recipes-devtools/python/python3-setproctitle_1.3.7.bb | |||
@@ -5,11 +5,11 @@ Monitor)." | |||
5 | HOMEPAGE = "https://github.com/dvarrazzo/py-setproctitle" | 5 | HOMEPAGE = "https://github.com/dvarrazzo/py-setproctitle" |
6 | BUGTRACKER = "https://github.com/dvarrazzo/py-setproctitle/issues" | 6 | BUGTRACKER = "https://github.com/dvarrazzo/py-setproctitle/issues" |
7 | LICENSE = "BSD-3-Clause" | 7 | LICENSE = "BSD-3-Clause" |
8 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=86d2d41b5f4f023f43466f8cb7adebaa" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a9efff04c3ae658687dd38e20398a20d" |
9 | 9 | ||
10 | inherit pypi setuptools3 ptest | 10 | inherit pypi setuptools3 ptest |
11 | 11 | ||
12 | SRC_URI[sha256sum] = "c9f32b96c700bb384f33f7cf07954bb609d35dd82752cef57fb2ee0968409169" | 12 | SRC_URI[sha256sum] = "bc2bc917691c1537d5b9bca1468437176809c7e11e5694ca79a9ca12345dcb9e" |
13 | 13 | ||
14 | SRC_URI += " \ | 14 | SRC_URI += " \ |
15 | file://run-ptest \ | 15 | file://run-ptest \ |
diff --git a/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.43.bb b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.44.bb index 692bbd7712..5bbd79a93a 100644 --- a/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.43.bb +++ b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.44.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://www.sqlalchemy.org/" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=061025f14213ac2818ff353223d6eca6" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=061025f14213ac2818ff353223d6eca6" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "788bfcef6787a7764169cfe9859fe425bf44559619e1d9f56f5bddf2ebf6f417" | 7 | SRC_URI[sha256sum] = "0ae7454e1ab1d780aee69fd2aae7d6b8670a581d8847f2d1e0f7ddfbf47e5a22" |
8 | 8 | ||
9 | inherit pypi python_setuptools_build_meta cython | 9 | inherit pypi python_setuptools_build_meta cython |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.4.bb b/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.8.bb index e359e2d88b..46f72b8f08 100644 --- a/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.4.bb +++ b/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.8.bb | |||
@@ -1,9 +1,9 @@ | |||
1 | SUMMARY = "Telnet server and client library based on asyncio" | 1 | SUMMARY = "Telnet server and client library based on asyncio" |
2 | HOMEPAGE = "https://github.com/jquast/telnetlib3" | 2 | HOMEPAGE = "https://github.com/jquast/telnetlib3" |
3 | LICENSE = "ISC" | 3 | LICENSE = "ISC" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fc2166986ad8169d334a342e0d8db8e0" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b2cbfe1ec99d8830fa20d62c8f21d0e8" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "dbcbc16456a0e03a62431be7cfefff00515ab2f4ce2afbaf0d3a0e51a98c948d" | 6 | SRC_URI[sha256sum] = "08a2a7a3a6790f89617442b7d491da8b531d87706fffd6a33eeff57ac440b752" |
7 | 7 | ||
8 | PYPI_PACKAGE = "telnetlib3" | 8 | PYPI_PACKAGE = "telnetlib3" |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-tomli_2.2.1.bb b/meta-python/recipes-devtools/python/python3-tomli_2.3.0.bb index a3af5302ed..c810b17ff4 100644 --- a/meta-python/recipes-devtools/python/python3-tomli_2.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-tomli_2.3.0.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aaaaf0879d17df0110d1aa8c8c9f46f5" | |||
8 | 8 | ||
9 | inherit pypi python_flit_core | 9 | inherit pypi python_flit_core |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff" | 11 | SRC_URI[sha256sum] = "64be704a875d2a59753d80ee8a533c3fe183e3f06807ff7dc2232938ccb01549" |
12 | 12 | ||
13 | BBCLASSEXTEND = "native nativesdk" | 13 | BBCLASSEXTEND = "native nativesdk" |
14 | 14 | ||
diff --git a/meta-python/recipes-devtools/python/python3-typing-inspection_0.4.0.bb b/meta-python/recipes-devtools/python/python3-typing-inspection_0.4.2.bb index 52d846f799..80cacc70ef 100644 --- a/meta-python/recipes-devtools/python/python3-typing-inspection_0.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-typing-inspection_0.4.2.bb | |||
@@ -1,12 +1,12 @@ | |||
1 | SUMMARY = "Runtime typing introspection tools" | 1 | SUMMARY = "Runtime typing introspection tools" |
2 | HOMEPAGE = "https://github.com/pydantic/typing-inspection" | 2 | HOMEPAGE = "https://github.com/pydantic/typing-inspection" |
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=07cbaa23fc9dd504fc1ea5acc23b0add" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dfe2d84c58973d6a532c4e7638dbb3d8" |
5 | 5 | ||
6 | DEPENDS = "python3-hatchling-native" | 6 | DEPENDS = "python3-hatchling-native" |
7 | SRC_URI[sha256sum] = "9765c87de36671694a67904bf2c96e395be9c6439bb6c87b5142569dcdd65122" | ||
8 | 7 | ||
9 | inherit pypi python_hatchling ptest-python-pytest | 8 | inherit pypi python_hatchling ptest-python-pytest |
9 | SRC_URI[sha256sum] = "ba561c48a67c5958007083d386c3295464928b01faa735ab8547c5692e87f464" | ||
10 | 10 | ||
11 | RDEPENDS:${PN}-ptest += "python3-typing-extensions" | 11 | RDEPENDS:${PN}-ptest += "python3-typing-extensions" |
12 | 12 | ||
diff --git a/meta-python/recipes-devtools/python/python3-virtualenv_20.34.0.bb b/meta-python/recipes-devtools/python/python3-virtualenv_20.35.3.bb index fff81b2fc2..3d9b6a097f 100644 --- a/meta-python/recipes-devtools/python/python3-virtualenv_20.34.0.bb +++ b/meta-python/recipes-devtools/python/python3-virtualenv_20.35.3.bb | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/pypa/virtualenv" | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0ce089158cf60a8ab6abb452b6405538" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0ce089158cf60a8ab6abb452b6405538" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "44815b2c9dee7ed86e387b842a84f20b93f7f417f95886ca1996a72a4138eb1a" | 9 | SRC_URI[sha256sum] = "4f1a845d131133bdff10590489610c98c168ff99dc75d6c96853801f7f67af44" |
10 | 10 | ||
11 | BBCLASSEXTEND = "native nativesdk" | 11 | BBCLASSEXTEND = "native nativesdk" |
12 | inherit pypi python_hatchling | 12 | inherit pypi python_hatchling |
diff --git a/meta-python/recipes-devtools/python/python3-whitenoise_6.9.0.bb b/meta-python/recipes-devtools/python/python3-whitenoise_6.11.0.bb index 5a6b495040..142c10aa83 100644 --- a/meta-python/recipes-devtools/python/python3-whitenoise_6.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-whitenoise_6.11.0.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aba4901cc64e401cea5a267eac2a2e1e" | |||
5 | 5 | ||
6 | PYPI_PACKAGE = "whitenoise" | 6 | PYPI_PACKAGE = "whitenoise" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "8c4a7c9d384694990c26f3047e118c691557481d624f069b7f7752a2f735d609" | 8 | SRC_URI[sha256sum] = "0f5bfce6061ae6611cd9396a8231e088722e4fc67bc13a111be74c738d99375f" |
9 | 9 | ||
10 | inherit pypi python_setuptools_build_meta | 10 | inherit pypi python_setuptools_build_meta |
11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-yarl_1.21.0.bb b/meta-python/recipes-devtools/python/python3-yarl_1.22.0.bb index 595717b8ab..6be8a6773c 100644 --- a/meta-python/recipes-devtools/python/python3-yarl_1.21.0.bb +++ b/meta-python/recipes-devtools/python/python3-yarl_1.22.0.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/aio-libs/yarl/" | |||
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "866c17223f7d734377a260a2800e14791cb5e55ec252de624e053a0b36b8568a" | 6 | SRC_URI[sha256sum] = "bebf8557577d4401ba8bd9ff33906f1376c877aa78d1fe216ad01b4d6745af71" |
7 | 7 | ||
8 | PYPI_PACKAGE = "yarl" | 8 | PYPI_PACKAGE = "yarl" |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python3-nltk/python3-nltk_3.9.1.bb b/meta-python/recipes-devtools/python3-nltk/python3-nltk_3.9.2.bb index 464e578ba9..8a1e0cc047 100644 --- a/meta-python/recipes-devtools/python3-nltk/python3-nltk_3.9.1.bb +++ b/meta-python/recipes-devtools/python3-nltk/python3-nltk_3.9.2.bb | |||
@@ -21,4 +21,4 @@ RRECOMMENDS:${PN} = "\ | |||
21 | 21 | ||
22 | inherit setuptools3 pypi | 22 | inherit setuptools3 pypi |
23 | 23 | ||
24 | SRC_URI[sha256sum] = "87d127bd3de4bd89a4f81265e5fa59cb1b199b27440175370f7417d2bc7ae868" | 24 | SRC_URI[sha256sum] = "0f409e9b069ca4177c1903c3e843eef90c7e92992fa4931ae607da6de49e1419" |
diff --git a/meta-python/recipes-extended/python-rich/python3-rich_14.1.0.bb b/meta-python/recipes-extended/python-rich/python3-rich_14.2.0.bb index e68f280c82..c51d55c633 100644 --- a/meta-python/recipes-extended/python-rich/python3-rich_14.1.0.bb +++ b/meta-python/recipes-extended/python-rich/python3-rich_14.2.0.bb | |||
@@ -8,7 +8,7 @@ LICENSE = "MIT" | |||
8 | 8 | ||
9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303" |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "e497a48b844b0320d45007cdebfeaeed8db2a4f4bcf49f15e455cfc4af11eaa8" | 11 | SRC_URI[sha256sum] = "73ff50c7c0c1c77c8243079283f4edb376f0f6442433aecb8ce7e6d0b92d1fe4" |
12 | 12 | ||
13 | inherit pypi python_poetry_core | 13 | inherit pypi python_poetry_core |
14 | 14 | ||
diff --git a/meta-webserver/recipes-devtools/swagger-ui/swagger-ui_5.29.0.bb b/meta-webserver/recipes-devtools/swagger-ui/swagger-ui_5.29.4.bb index 7ac04bf493..2dca388ac2 100644 --- a/meta-webserver/recipes-devtools/swagger-ui/swagger-ui_5.29.0.bb +++ b/meta-webserver/recipes-devtools/swagger-ui/swagger-ui_5.29.4.bb | |||
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
12 | 12 | ||
13 | SRC_URI = "git://github.com/swagger-api/swagger-ui;branch=master;protocol=https;tag=v${PV}" | 13 | SRC_URI = "git://github.com/swagger-api/swagger-ui;branch=master;protocol=https;tag=v${PV}" |
14 | 14 | ||
15 | SRCREV = "26e6d3cce2a49195681116c97318b2a38c06e21c" | 15 | SRCREV = "526c9ee9227e07e55eb45a4c1749dd0880f97ea1" |
16 | 16 | ||
17 | CVE_STATUS[CVE-2016-1000229] = "fixed-version: fixed since 2.2.1" | 17 | CVE_STATUS[CVE-2016-1000229] = "fixed-version: fixed since 2.2.1" |
18 | 18 | ||
diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_349.bb index 986a924fb5..4726386f6c 100644 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_349.bb | |||
@@ -7,16 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | |||
7 | SRC_URI += " \ | 7 | SRC_URI += " \ |
8 | https://github.com/cockpit-project/cockpit/releases/download/${PV}/cockpit-${PV}.tar.xz \ | 8 | https://github.com/cockpit-project/cockpit/releases/download/${PV}/cockpit-${PV}.tar.xz \ |
9 | file://0001-Warn-not-error-if-xsltproc-is-not-found.patch \ | 9 | file://0001-Warn-not-error-if-xsltproc-is-not-found.patch \ |
10 | file://0001-Makefile-common.am-Create-src-common-directory-befor.patch \ | ||
11 | file://cockpit.pam \ | 10 | file://cockpit.pam \ |
12 | " | 11 | " |
13 | SRC_URI[sha256sum] = "df51ef5920fae69e1b435f657376aa93772c0c1720b954a3bac10ebba26bfedf" | 12 | SRC_URI[sha256sum] = "2fa8eef40968135fb6df866a415eba8d4d5adbf4d44f293f28d4f3c841b301bb" |
14 | 13 | ||
15 | inherit gettext pkgconfig autotools systemd features_check | 14 | inherit gettext pkgconfig autotools systemd features_check python3targetconfig |
16 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3targetconfig', d)} | ||
17 | 15 | ||
18 | DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd python3-setuptools-native" | 16 | DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd python3-pip-native python3-setuptools-native" |
19 | DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3-pip-native', d)}" | ||
20 | 17 | ||
21 | COMPATIBLE_HOST:libc-musl = "null" | 18 | COMPATIBLE_HOST:libc-musl = "null" |
22 | 19 | ||
@@ -112,7 +109,7 @@ FILES:${PN}-bridge = " \ | |||
112 | ${libexecdir}/cockpit-askpass \ | 109 | ${libexecdir}/cockpit-askpass \ |
113 | ${PYTHON_SITEPACKAGES_DIR} \ | 110 | ${PYTHON_SITEPACKAGES_DIR} \ |
114 | " | 111 | " |
115 | RDEPENDS:${PN}-bridge = "${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3', d)}" | 112 | RDEPENDS:${PN}-bridge = "python3" |
116 | 113 | ||
117 | FILES:${PN}-desktop = "${libexecdir}/cockpit-desktop" | 114 | FILES:${PN}-desktop = "${libexecdir}/cockpit-desktop" |
118 | RDEPENDS:${PN}-desktop += "bash" | 115 | RDEPENDS:${PN}-desktop += "bash" |
@@ -174,8 +171,8 @@ FILES:${PN} += " \ | |||
174 | ${nonarch_libdir}/firewalld \ | 171 | ${nonarch_libdir}/firewalld \ |
175 | " | 172 | " |
176 | RDEPENDS:${PN} += "${PN}-bridge" | 173 | RDEPENDS:${PN} += "${PN}-bridge" |
177 | # Needs bash for /usr/libexec/cockpit-certificate-helper | 174 | # Needs bash and mv for /usr/libexec/cockpit-certificate-helper |
178 | RDEPENDS:${PN} += "bash" | 175 | RDEPENDS:${PN} += "bash coreutils" |
179 | 176 | ||
180 | do_install:append() { | 177 | do_install:append() { |
181 | pkgdatadir=${datadir}/cockpit | 178 | pkgdatadir=${datadir}/cockpit |
diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0001-Makefile-common.am-Create-src-common-directory-befor.patch b/meta-webserver/recipes-webadmin/cockpit/files/0001-Makefile-common.am-Create-src-common-directory-befor.patch deleted file mode 100644 index 36cb6c09c7..0000000000 --- a/meta-webserver/recipes-webadmin/cockpit/files/0001-Makefile-common.am-Create-src-common-directory-befor.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From fb3b427bcbc17257ac8c38438a82435b2bd36e38 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 9 May 2025 16:17:05 -0700 | ||
4 | Subject: [PATCH] Makefile-common.am: Create src/common directory before | ||
5 | generating fail-html.c | ||
6 | |||
7 | During parallel builds, its possible that <build>/src/common directory is | ||
8 | not yet created and this codepath to generate fail-html.c is executed and | ||
9 | it will end in build failures | ||
10 | |||
11 | Fixes | ||
12 | make[1]: Entering directory 'build/tmp/work/riscv64-yoe-linux/cockpit/337/build' | ||
13 | ../cockpit-337/tools/escape-to-c cockpit_webresponse_fail_html_text < ../cockpit-337/src/common/fail.html > src/common/fail-html.c.tmp && mv src/common/fail-html.c.tmp src/common/fail-html.c | ||
14 | /bin/bash: src/common/fail-html.c.tmp: No such file or directory | ||
15 | make[1]: *** [Makefile:6044: src/common/fail-html.c] Error 1 | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | --- | ||
20 | src/common/Makefile-common.am | 1 + | ||
21 | 1 file changed, 1 insertion(+) | ||
22 | |||
23 | diff --git a/src/common/Makefile-common.am b/src/common/Makefile-common.am | ||
24 | index ec4b30d..1d55576 100644 | ||
25 | --- a/src/common/Makefile-common.am | ||
26 | +++ b/src/common/Makefile-common.am | ||
27 | @@ -94,6 +94,7 @@ libcockpit_common_a_SOURCES = \ | ||
28 | # libcockpit-common.a static-links an HTML template to use on failures | ||
29 | nodist_libcockpit_common_a_SOURCES = src/common/fail-html.c | ||
30 | src/common/fail-html.c: src/common/fail.html | ||
31 | + $(MKDIR_P) $(dir $@) | ||
32 | $(AM_V_GEN) $(top_srcdir)/tools/escape-to-c cockpit_webresponse_fail_html_text < $< > $@.tmp && mv $@.tmp $@ | ||
33 | CLEANFILES += src/common/fail-html.c | ||
34 | EXTRA_DIST += src/common/fail.html | ||