88 lines
5.7 KiB
Diff
88 lines
5.7 KiB
Diff
diff --git rpm-ostree-2021.5/vendor/libsystemd-sys/.cargo-checksum.json rpm-ostree-2021.5/vendor/libsystemd-sys/.cargo-checksum.json
|
|
index ef0104f..18671cd 100644
|
|
--- rpm-ostree-2021.5/vendor/libsystemd-sys/.cargo-checksum.json
|
|
+++ rpm-ostree-2021.5/vendor/libsystemd-sys/.cargo-checksum.json
|
|
@@ -1 +1 @@
|
|
-{"files": {"Cargo.toml": "29598137eb17a38f964952574d6f13f17d30b1f6d262a35ae5a1e9cc6f7ee180", "build.rs": "cb99af17b48e1874905513f956e99a1e5d7d55305b4d587c219719481d37ba1c", "src/bus/mod.rs": "ecd83596dd27674a43369dbeb88b9446e0907abb146e9f17e0499cda77aec22c", "src/bus/protocol.rs": "db8b3f47ba396b12868b4700b627683748682936ad4aad98ec4489c7c29450bd", "src/bus/vtable.rs": "547c322b93466b1919de3086304fa7f0ed650bde3556b349b5eebf35ec5fd0d1", "src/daemon.rs": "8ac4c744fe37beca7dfcd3e3d2ccab7150a709969d41ed38b980635a4f585f4b", "src/event.rs": "defaeb91eaddf36aa848e05d54def27351e35605dde5b451230866ce35c8a242", "src/id128.rs": "b7d7767fef5e2799450f694a4b7bfaf483819ffdc6b1fc3b9b21b41d0e9cfa30", "src/journal.rs": "af4a90da1bf57d2601248588766df3ad92a44558e026092850e7b555088787fa", "src/lib.rs": "7239092e42a3e7d0039f8436402a946a2cc8ffd3070fe4b6d81e255533cc4088", "src/login.rs": "eae9145e5ffe7f5050c58fa4757202a6eb5a5885b52d8ff1ebe44484608065c8", "tests/journal-send.rs": "ca18cc28bad06f8a55e910501de9681b410718afb6e1bd603c6b5063a07b6a63"}, "package": "6e03fd580bcecda68dcdcd5297085ade6a3dc552cd8b030d2b94a9b089ef7ab8"}
|
|
\ No newline at end of file
|
|
+{"files": {}, "package": "6e03fd580bcecda68dcdcd5297085ade6a3dc552cd8b030d2b94a9b089ef7ab8"}
|
|
diff --git rpm-ostree-2021.5/vendor/libsystemd-sys/src/journal.rs rpm-ostree-2021.5/vendor/libsystemd-sys/src/journal.rs
|
|
index 5980b81..68e4e68 100644
|
|
--- rpm-ostree-2021.5/vendor/libsystemd-sys/src/journal.rs
|
|
+++ rpm-ostree-2021.5/vendor/libsystemd-sys/src/journal.rs
|
|
@@ -27,11 +27,6 @@ extern "C" {
|
|
// (we don't need to do c-style format strings)
|
|
|
|
pub fn sd_journal_open(ret: *mut *mut sd_journal, flags: c_int) -> c_int;
|
|
- pub fn sd_journal_open_namespace(
|
|
- ret: *mut *mut sd_journal,
|
|
- namespace: *const c_char,
|
|
- flags: c_int,
|
|
- ) -> c_int;
|
|
pub fn sd_journal_open_directory(
|
|
ret: *mut *mut sd_journal,
|
|
path: *const c_char,
|
|
diff --git rpm-ostree-2021.5/vendor/systemd/.cargo-checksum.json rpm-ostree-2021.5/vendor/systemd/.cargo-checksum.json
|
|
index bc8d44c..9136865 100644
|
|
--- rpm-ostree-2021.5/vendor/systemd/.cargo-checksum.json
|
|
+++ rpm-ostree-2021.5/vendor/systemd/.cargo-checksum.json
|
|
@@ -1 +1 @@
|
|
-{"files": {"Cargo.toml": "70c57c11076fa8ba3826afe5db35c07ebc7312286ac4586b5387dc80d2adf719", "README.md": "13664522a229dc1e862dc11dd1f840cf4aa238c64578a0fc906f0caa3f7f494d", "src/bus/mod.rs": "559f1e10c6eb881629cfa3eb936890cdfbe1a44c186de95ea720c765be83cb39", "src/bus/types.rs": "25abd29a6c8695a37f42e708aa6cf26d7f833941742a80a78b3fc9012ad9e981", "src/daemon.rs": "f8d5e7584ea6543c3b5d8f45033d125af4511d8a0014f783944323458b693db3", "src/id128.rs": "a58b281ab0e52dd378bffd3fe161b9c73f2983a795e951ed70b3b0a8b333c62f", "src/journal.rs": "2281b81cfd7dc6c614b7a5fea4a4851a0f61e1dc780b11e10270264398d00345", "src/lib.rs": "6ee64a876e7b4157b2edea726e4bdf086f294df5a44c4d7eb09eee8883945755", "src/login.rs": "abed971dba12598f062cb78da3fc97e3c73db71eab3dade46c4f68fe9e4d7ca4"}, "package": "f722cabda922e471742300045f56dbaa53fafbb4520fca304e51258019bfe91d"}
|
|
\ No newline at end of file
|
|
+{"files": {}, "package": "f722cabda922e471742300045f56dbaa53fafbb4520fca304e51258019bfe91d"}
|
|
diff --git rpm-ostree-2021.5/vendor/systemd/src/journal.rs rpm-ostree-2021.5/vendor/systemd/src/journal.rs
|
|
index c49e891..6757a40 100644
|
|
--- rpm-ostree-2021.5/vendor/systemd/src/journal.rs
|
|
+++ rpm-ostree-2021.5/vendor/systemd/src/journal.rs
|
|
@@ -396,22 +396,7 @@ impl OpenOptions {
|
|
///
|
|
/// `sd_journal_open()`: https://www.freedesktop.org/software/systemd/man/sd_journal_open.html
|
|
pub fn open(&self) -> Result<Journal> {
|
|
- Journal::open_with_opts_ns::<&std::ffi::CStr>(None, self)
|
|
- }
|
|
-
|
|
- /// Open the log journal for reading in the given namespace. Entries included are dependent on
|
|
- /// options.
|
|
- ///
|
|
- /// Note that some options (`SD_JOURNAL_ALL_NAMESPACES`) affect whether `namespace` is
|
|
- /// considered. Our API doesn't check for unused data here, but users are encouraged to avoid
|
|
- /// passing unused data by using [`OpenOptions::open()`] instead when a namespace argument is
|
|
- /// not required.
|
|
- ///
|
|
- /// This corresponds to [`sd_journal_open_namespace()`]
|
|
- ///
|
|
- /// `sd_journal_open_namespace()`: https://www.freedesktop.org/software/systemd/man/sd_journal_open.html
|
|
- pub fn open_namespace<A: CStrArgument>(&self, namespace: A) -> Result<Journal> {
|
|
- Journal::open_with_opts_ns(Some(namespace), self)
|
|
+ Journal::open_with_opts::<&std::ffi::CStr>(self)
|
|
}
|
|
}
|
|
|
|
@@ -508,10 +493,7 @@ impl OpenFilesOptions {
|
|
}
|
|
|
|
impl Journal {
|
|
- fn open_with_opts_ns<A: CStrArgument>(
|
|
- namespace: Option<A>,
|
|
- opts: &OpenOptions,
|
|
- ) -> Result<Journal> {
|
|
+ fn open_with_opts<A: CStrArgument>(opts: &OpenOptions) -> Result<Journal> {
|
|
let mut flags = opts.extra_raw_flags;
|
|
if opts.current_user {
|
|
flags |= ffi::SD_JOURNAL_CURRENT_USER;
|
|
@@ -535,13 +517,8 @@ impl Journal {
|
|
flags |= ffi::SD_JOURNAL_INCLUDE_DEFAULT_NAMESPACE;
|
|
}
|
|
|
|
- let ns = namespace.map(|a| a.into_cstr());
|
|
- let ns_p = ns
|
|
- .as_ref()
|
|
- .map(|a| a.as_ref().as_ptr())
|
|
- .unwrap_or(ptr::null());
|
|
let mut jp = MaybeUninit::uninit();
|
|
- crate::ffi_result(unsafe { ffi::sd_journal_open_namespace(jp.as_mut_ptr(), ns_p, flags) })?;
|
|
+ crate::ffi_result(unsafe { ffi::sd_journal_open(jp.as_mut_ptr(), flags) })?;
|
|
Ok(unsafe { Journal::from_ptr(jp.assume_init()) })
|
|
}
|
|
|