From 9163a41894f967050494b2f55e6c240fb7b7182e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 17 2022 08:57:41 +0000 Subject: import mdevctl-1.1.0-4.el9 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..37fd8ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +SOURCES/mdevctl-1.1.0-vendor.tar.gz +SOURCES/mdevctl-1.1.0.tar.gz diff --git a/.mdevctl.metadata b/.mdevctl.metadata new file mode 100644 index 0000000..88d5cc6 --- /dev/null +++ b/.mdevctl.metadata @@ -0,0 +1,2 @@ +3741595d871a00830c5b3c50f383eeda9f948469 SOURCES/mdevctl-1.1.0-vendor.tar.gz +4bbd9e344db7324765572def56201d6fd6611057 SOURCES/mdevctl-1.1.0.tar.gz diff --git a/SOURCES/0001-Report-root-error-when-a-callout-can-t-be-executed.patch b/SOURCES/0001-Report-root-error-when-a-callout-can-t-be-executed.patch new file mode 100644 index 0000000..f0eb44f --- /dev/null +++ b/SOURCES/0001-Report-root-error-when-a-callout-can-t-be-executed.patch @@ -0,0 +1,43 @@ +From ff69f6c64b14282172716d4e97b4b81da7606483 Mon Sep 17 00:00:00 2001 +From: Jonathon Jongsma +Date: Wed, 1 Dec 2021 16:37:36 -0600 +Subject: [PATCH 1/2] Report root error when a callout can't be executed + +We were ignoring the error result when a callout script failed to +execute. In order to debug issues more easily, handle the error and +print it to the debug output. + +Signed-off-by: Jonathon Jongsma +--- + src/callouts.rs | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/callouts.rs b/src/callouts.rs +index 1c92d85..17b733b 100644 +--- a/src/callouts.rs ++++ b/src/callouts.rs +@@ -240,8 +240,8 @@ impl Callout { + for s in dir.as_ref().read_dir().ok()? { + let path = s.ok()?.path(); + +- match self.invoke_script(dev, &path, event, action).ok() { +- Some(res) => { ++ match self.invoke_script(dev, &path, event, action) { ++ Ok(res) => { + if res.status.code().is_none() { + warn!("callout script {:?} was terminated by a signal", path); + continue; +@@ -255,8 +255,8 @@ impl Callout { + ); + } + } +- _ => { +- debug!("failed to execute callout script {:?}", path); ++ Err(e) => { ++ debug!("failed to execute callout script {:?}: {:?}", path, e); + continue; + } + } +-- +2.33.1 + diff --git a/SOURCES/0002-tests-read-stdin-in-callout-test-scripts.patch b/SOURCES/0002-tests-read-stdin-in-callout-test-scripts.patch new file mode 100644 index 0000000..9cd616b --- /dev/null +++ b/SOURCES/0002-tests-read-stdin-in-callout-test-scripts.patch @@ -0,0 +1,57 @@ +From 70ba0298a49ccffc085da051ad553a1242f0bfe1 Mon Sep 17 00:00:00 2001 +From: Jonathon Jongsma +Date: Wed, 1 Dec 2021 16:39:06 -0600 +Subject: [PATCH 2/2] tests: read stdin in callout test scripts + +Callout scripts are intended to be passed a JSON device configuration +string on stdin. For our simple callout tests, we used single-line +test scripts that unconditionally returned a constant response code +(either error or success). This sometimes causes the tests to fail due +to the following error: + + [2021-12-01T20:33:25Z DEBUG mdevctl::callouts] failed to execute callout script "/tmp/mdevctl-testZg8CPd/etc/mdevctl.d/scripts.d/callouts/rc1.sh": Failed to write to stdin of command + + Caused by: + Broken pipe (os error 32) + +What seems to be happening is that mdevctl spawns the callout script and +then attempts to write the JSON device configuration to its stdin pipe. +However, the test scripts are so short that they may have exited before +mdevctl can finish writing to stdin, which results in the command +failing with a broken pipe error. In order to avoid this, make sure that +the test scripts read from stdin before exiting. + +Signed-off-by: Jonathon Jongsma +--- + tests/callouts/rc0.sh | 1 + + tests/callouts/rc1.sh | 1 + + tests/callouts/rc2.sh | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/tests/callouts/rc0.sh b/tests/callouts/rc0.sh +index 039e4d0..669d0ec 100755 +--- a/tests/callouts/rc0.sh ++++ b/tests/callouts/rc0.sh +@@ -1,2 +1,3 @@ + #!/usr/bin/env bash ++json=$( - 1.1.0-4 +- fix gating.yaml indentation and rebuild + +* Thu Jan 13 2022 Jonathon Jongsma - 1.1.0-3 +- add gating.yml and rpminspect.yml and rebuild + Related: rhbz#1999686 + +* Wed Dec 01 2021 Eduardo Lima (Etrunko) - 1.1.0-2 +- Create additonal directories required by installation. + Related: rhbz#1999686 + +* Thu Nov 18 2021 Eduardo Lima (Etrunko) - 1.1.0-1 +- Rebase mdevctl to 1.1.0 + Resolves: rhbz#1999686 + +* Mon Aug 09 2021 Mohan Boddu - 0.78-4 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Fri Apr 16 2021 Mohan Boddu - 0.78-3 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Tue Jan 26 2021 Fedora Release Engineering - 0.78-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + + +* Tue Nov 24 2020 Alex Williamson - 0.78-1 +- e029640033d3 ("Automatic version commit for tag 0.78") +- e32f506656fd ("use standard bash path") +- 70690b64401f ("avoid other tags spilling into the .spec changelog") +- 70b89c18cf5b ("Merge pull request #31 from awilliam/20201113.0") +- 80187bc9ba03 ("Merge pull request #30 from fiuczy/fix-error-cleanup") +- 97ea8bbeefb7 ("mdevctl: fix cleanup on error when creating and removing mdev") +- b45d33dfd36c ("version support") +- 2b1c16ce6fb0 ("Fix attributes getting applied via start-parent-mdevs") +- 25d5e8d24d57 ("mdevctl: fix cleanup on error when writing to attribute") + +* Fri Jul 17 2020 Cornelia Huck - 0.69-1 +- a2621934aa37 ("Merge pull request #18 from cohuck/validate") +- ffbcef5a1c84 ("Merge pull request #25 from etrunko/master") +- 5ec75a83bf30 ("Remove never used 'available' option") +- d49b0f0db6b3 ("Merge pull request #23 from eskultety/man-fix") +- 4cfe37eb2d99 ("man: Point --verbose to the 'list' command rather than 'types'") +- a0ae49eb7178 ("Merge pull request #17 from cohuck/install_symlinks") +- 504beba6e8f9 ("Force symlink cretion") +- 522c5ded00ff ("Fix attribute validation") + +* Thu Dec 19 2019 Alex Williamson - 0.61-1 +- d7dfac5f5bfb ("Merge pull request #15 from cohuck/attr_sanity") +- 28a9fa17b51e ("validate attribute names") + +* Thu Dec 05 2019 Alex Williamson - 0.59-1 +- 3e10c587173c ("Restore BuildRequires") + +* Thu Dec 05 2019 Alex Williamson - 0.58-1 +- 3d6d2b1780f3 ("Remove systemd reference from README") + +* Thu Dec 05 2019 Alex Williamson - 0.57-1 +- 13f1322e576c ("Remove systemd support") +- d84a2737e79c ("Fix device udev tagging") +- 68c92c7beaca ("Tag before generating spec file") +- c34c4f1ade60 ("Update mdevctl.spec.in for lsmdev.8") +- ed86d345aae0 ("Fix systemd UUID escaping") +- d4e83f08161d ("Merge pull request #13 from cpaelzer/fix-lsmdev-man-page") +- 3c0d285b75ab ("lsmdev - add the alternative name to the man page") + +* Wed Oct 02 2019 Alex Williamson - 0.50-1 +- 18c33dfd136d ("Reformat changelog to match Linux commit reference style") + +* Tue Oct 01 2019 Alex Williamson - 0.49-1 +- e2bda0996bd3 ("Fedora integration") + +* Fri Sep 27 2019 Alex Williamson - 0.48-1 +- a6372fc0bd9e ("Create an lsmdev alias") + +* Wed Jul 17 2019 Alex Williamson - 0.47-1 +- 52654b4f6f85 ("Update spec Source0 url") + +* Mon Jul 15 2019 Alex Williamson - 0.46-1 +- 6bfe7b0a22c4 ("Add back BuildRequires for systemd") +- 9cf1afc50b2c ("Allow advanced JSON output from the list command") +- 1c98f58ff505 ("Fixup Makefile and spec for README.md") +- 838cac5ac9f0 ("Merge pull request #12 from cohuck/markdown") +- 2eeda7456288 ("README: convert to markdown") +- 70efa0a3a2ab ("Merge pull request #11 from cohuck/example-verbose") +- 28fe248613c8 ("fix attribute output examples") +- 37bb8f26d1c2 ("Update man page") +- 8f9798a32884 ("Let --index be abbreviated with -i") +- 7ea03365a192 ("Split mdev types from list command") +- b323cf96e4e7 ("Consistent, gratuitous quoting") +- 84044a178502 ("Fix man page install") +- 4e4e45a03154 ("Merge pull request #10 from cohuck/manpage") +- f37b1aa5625d ("add a man page") +- 840c86d1f79c ("simplify attribute handling") +- 1226ba8e4b39 ("Merge pull request #7 from cohuck/json-import-export-doc") +- 02ddfca4d1a2 ("README: update with JSON") +- 0ca6019ba007 ("help text: fix typos") +- 02ca8f9756cd ("Dump and import support") +- a2417e68246d ("Merge pull request #6 from cohuck/print_index") +- a7c759ea3788 ("print index when listing attributes") +- 386af2db03a7 ("Interpret escapes") +- 88033494334e ("Attribute support") +- b08f4939634c ("Rework start logic, add uuidgen support and list active feature") +- b2cf2d1bf1f8 ("Note 'make rpm' support") +- d90876b93f5f ("JSON config files") +- ead45a253a2e ("Merge pull request #5 from cohuck/improve-comments") +- 4d533d8adee5 ("Merge pull request #4 from cohuck/realpath") +- 2a101c6de4e4 ("tweak some comments") +- 387eb4fc84e0 ("use realpath for canonicalization") +- d74bf93dbc79 ("mdevctl: Respin") +- b8c98109e307 ("Merge pull request #3 from cohuck/readme-uuidgen") +- 47e4d255baf2 ("README: avoid inline `uuidgen`") +- 863417ee7a52 ("Merge pull request #2 from c3d/whitespace-and-usage-cleanup") +- dc1d6fc95118 ("Trailing whitespace cleanup") +- 97b393552ab4 ("Put usage message in a single large blob of text") +- b439f53017f3 ("Merge pull request #1 from cohuck/destdir") +- 205040b3c006 ("Makefile: drop extra '/'") +- c51ebb40d3f6 ("mdevctl: Move to https://github.com/mdevctl/mdevctl") +- 914c0076535b ("mdevctl: Don't start mdevs created with --manual") +- 9e84529a5ddd ("mdevctl: Implement defaults and per mdev start option") +- bb5135475bd8 ("mdevctl: Add RPM build support") +- d1f6110c59d4 ("mdevctl: Minor usage fixes") +- 42ba1670288f ("Merge pull request #1 from cohuck/improve_cmdline") +- d27ba583f77b ("mdevctl: improve commandline handling") +- 5114f9eb8268 ("mdevctl: Initial commit")