MSVSphere Packaging Team
3 months ago
parent
f5657a21f3
commit
7f12c3d26b
GPG Key ID:
B2B0B9F29E528FE8
@ -1 +1 @@
|
|||||||
SOURCES/rpm-ostree-2024.3.tar.xz
|
SOURCES/rpm-ostree-2024.7.tar.xz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
dc6e0ea9f33f162b5ca2d1ea1cb79ec7f9f7d71c SOURCES/rpm-ostree-2024.3.tar.xz
|
d9cceab814a10d116e41911a00ca5d5134715da1 SOURCES/rpm-ostree-2024.7.tar.xz
|
||||||
|
|||||||
@ -1,56 +0,0 @@
|
|||||||
From d02993e30078db2a04820065ccbf22bd56d0d064 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jonathan Lebon <jonathan@jlebon.com>
|
|
||||||
Date: Thu, 22 Feb 2024 14:44:50 -0500
|
|
||||||
Subject: [PATCH] cliwrap/rpm: mark `--eval`/`-E` as safe
|
|
||||||
|
|
||||||
This is sometimes used in scripts to query aspects of the host system.
|
|
||||||
E.g. this is used by Fedora's pkg-config:
|
|
||||||
|
|
||||||
https://src.fedoraproject.org/rpms/pkgconf/blob/95c0bbee/f/pkg-config.in#_6
|
|
||||||
|
|
||||||
This in turn gets hit by kdump which runs dracut which has modules that
|
|
||||||
runs `pkgconf` to query some directory paths.
|
|
||||||
---
|
|
||||||
rust/src/cliwrap/rpm.rs | 19 +++++++++++++++++++
|
|
||||||
1 file changed, 19 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/rust/src/cliwrap/rpm.rs b/rust/src/cliwrap/rpm.rs
|
|
||||||
index c6ed5901..3332f76c 100644
|
|
||||||
--- a/rust/src/cliwrap/rpm.rs
|
|
||||||
+++ b/rust/src/cliwrap/rpm.rs
|
|
||||||
@@ -19,6 +19,12 @@ fn new_rpm_app() -> Command {
|
|
||||||
.long("version")
|
|
||||||
.action(clap::ArgAction::Version),
|
|
||||||
)
|
|
||||||
+ .arg(
|
|
||||||
+ Arg::new("eval")
|
|
||||||
+ .long("eval")
|
|
||||||
+ .short('E')
|
|
||||||
+ .action(clap::ArgAction::Set),
|
|
||||||
+ )
|
|
||||||
.arg(
|
|
||||||
Arg::new("package")
|
|
||||||
.help("package")
|
|
||||||
@@ -130,6 +136,19 @@ mod tests {
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
+ #[test]
|
|
||||||
+ fn test_eval() -> Result<()> {
|
|
||||||
+ assert_eq!(
|
|
||||||
+ disposition(SystemHostType::OstreeHost, &["-E", "%{_target_cpu}"])?,
|
|
||||||
+ RunDisposition::Ok
|
|
||||||
+ );
|
|
||||||
+ assert_eq!(
|
|
||||||
+ disposition(SystemHostType::OstreeHost, &["--eval=%{_target_cpu}}"])?,
|
|
||||||
+ RunDisposition::Ok
|
|
||||||
+ );
|
|
||||||
+ Ok(())
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
#[test]
|
|
||||||
fn test_query_file() -> Result<()> {
|
|
||||||
assert_eq!(
|
|
||||||
--
|
|
||||||
2.43.2
|
|
||||||
|
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
From 96ddae1acba59cf5249dcfff1157e44b5ed69650 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Colin Walters <walters@verbum.org>
|
||||||
|
Date: Thu, 15 Aug 2024 11:41:43 -0400
|
||||||
|
Subject: [PATCH 1/1] core: Fix Coverity WRAPPER_ESCAPE
|
||||||
|
|
||||||
|
This should fix:
|
||||||
|
|
||||||
|
```
|
||||||
|
32. rpm-ostree-2024.7/src/libpriv/rpmostree-core.cxx:1786:15: use_after_free: Using internal representation of destroyed object temporary of type "std::string".
|
||||||
|
```
|
||||||
|
|
||||||
|
Signed-off-by: Colin Walters <walters@verbum.org>
|
||||||
|
---
|
||||||
|
src/libpriv/rpmostree-core.cxx | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/libpriv/rpmostree-core.cxx b/src/libpriv/rpmostree-core.cxx
|
||||||
|
index a2de7262..615e2636 100644
|
||||||
|
--- a/src/libpriv/rpmostree-core.cxx
|
||||||
|
+++ b/src/libpriv/rpmostree-core.cxx
|
||||||
|
@@ -1782,7 +1782,8 @@ rpmostree_context_prepare (RpmOstreeContext *self, gboolean enable_filelists,
|
||||||
|
auto pkg = "";
|
||||||
|
for (auto &pkg_str : packages)
|
||||||
|
{
|
||||||
|
- pkg = std::string (pkg_str).c_str ();
|
||||||
|
+ auto pkg_buf = std::string (pkg_str);
|
||||||
|
+ pkg = pkg_buf.c_str ();
|
||||||
|
char *query = strchr ((char *)pkg, '/');
|
||||||
|
if (query)
|
||||||
|
{
|
||||||
|
--
|
||||||
|
2.46.0
|
||||||
|
|
||||||
Loading…
Reference in new issue