Merge branch 'coreos:main' into 4176-detect-container-updates

Cargo.toml

@@ -63,26 +63,26 @@ fail = { version = "0.5", features = ["failpoints"] }
 fn-error-context = "0.2.0"
 futures = "0.3.28"
 indoc = "2.0.1"
-indicatif = "0.17.3"
+indicatif = "0.17.5"
 is-terminal = "0.4"
 libc = "0.2.146"
 libdnf-sys = { path = "rust/libdnf-sys", version = "0.1.0" }
 maplit = "1.0"
 memfd = "0.6.0"
 nix = "0.26.1"
-openssl = "0.10.49"
+openssl = "0.10.54"
 once_cell = "1.18.0"
 os-release = "0.1.0"
 ostree-ext = "0.11.0"
 paste = "1.0"
 phf = { version = "0.11", features = ["macros"] }
 rand = "0.8.5"
 rayon = "1.6.0"
-regex = "1.7"
+regex = "1.8"
 reqwest = { version = "0.11", features = ["native-tls", "blocking", "gzip"] }
 rpmostree-client = { path = "rust/rpmostree-client", version = "0.1.0" }
 rust-ini = "0.19.0"
-serde = { version = "1.0.163", features = ["derive"] }
+serde = { version = "1.0.164", features = ["derive"] }
 serde_derive = "1.0.118"
 serde_json = "1.0.96"
 serde_yaml = "0.9.16"

ci/test-container.sh

@@ -58,8 +58,6 @@ versionid=$(. /usr/lib/os-release && echo $VERSION_ID)
 # Let's start by trying to install a bona fide module.
 # NOTE: If changing this also change the layering-modules test
 case $versionid in
-  36) module=cri-o:1.23/default;;
-  37) module=cri-o:1.24/default;;
   38) module=cri-o:1.25/default;;
   *) assert_not_reached "Unsupported Fedora version: $versionid";;
 esac
@@ -77,16 +75,8 @@ fi
 versionid=$(grep -E '^VERSION_ID=' /etc/os-release)
 versionid=${versionid:11} # trim off VERSION_ID=
 case $versionid in
-  37)
-    url_suffix=2.14.0/3.fc37/x86_64/ignition-2.14.0-3.fc37.x86_64.rpm
-    # 2.14.0-4
-    koji_url="https://koji.fedoraproject.org/koji/buildinfo?buildID=2013062"
-    koji_kernel_url="https://koji.fedoraproject.org/koji/buildinfo?buildID=2084352"
-    kver=6.0.7
-    krev=301
-    ;;
   38)
-    url_suffix=2.15.0/2.fc38/x86_64/ignition-2.15.0-2.fc38.x86_64.rpm
+    url_suffix=2.15.0/4.fc37/x86_64/ignition-2.15.0-4.fc37.x86_64.rpm
     # 2.15.0-3
     koji_url="https://koji.fedoraproject.org/koji/buildinfo?buildID=2158585"
     koji_kernel_url="https://koji.fedoraproject.org/koji/buildinfo?buildID=2174317"

configure.ac

@@ -3,7 +3,7 @@ dnl
 dnl SEE RELEASE.md FOR INSTRUCTIONS ON HOW TO DO A RELEASE.
 dnl
 m4_define([year_version], [2023])
-m4_define([release_version], [4])
+m4_define([release_version], [5])
 m4_define([package_version], [year_version.release_version])
 AC_INIT([rpm-ostree], [package_version], [[email protected]])
 AC_CONFIG_HEADER([config.h])

docs/_config.yml

@@ -1,9 +1,12 @@
-title: coreos/rpm-ostree
+# Template generated by https://github.com/coreos/repo-templates; do not edit downstream
+
+# To test documentation changes locally or using GitHub Pages, see:
+# https://github.com/coreos/fedora-coreos-tracker/blob/main/docs/testing-project-documentation-changes.md
+
+title: rpm-ostree
 description: rpm-ostree documentation
 baseurl: "/rpm-ostree"
 url: "https://coreos.github.io"
-# Comment above and use below for local development
-# url: "http://localhost:4000"
 permalink: /:title/
 markdown: kramdown
 kramdown:

man/rpm-ostree.xml

@@ -328,6 +328,20 @@ Boston, MA 02111-1307, USA.
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><command>search</command></term>
+
+        <listitem>
+          <para>
+            Takes one or more query terms as arguments. The packages are
+            searched within the enabled repositories in
+            <filename>/etc/yum.repos.d/</filename>. Packages can be
+            overlayed and removed using the <command>install</command> 
+            and <command>uninstall</command> commands.
+          </para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><command>rebase</command></term>
 

packaging/rpm-ostree.spec.in

@@ -3,9 +3,9 @@
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2023.4
+Version: 2023.5
 Release: 1%{?dist}
-License: LGPLv2+
+License: LGPL-2.0-or-later
 URL: https://github.com/coreos/rpm-ostree
 # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
 # in the upstream git.  It also contains vendored Rust sources.

rust/rpmostree-client/Cargo.toml

@@ -12,6 +12,6 @@ publish = false
 
 [dependencies]
 anyhow = "1.0.69"
-serde = { version = "1.0.163", features = ["derive"] }
+serde = { version = "1.0.164", features = ["derive"] }
 serde_derive = "1.0.118"
 serde_json = "1.0.96"

rust/src/builtins/scriptlet_intercept/groupadd.rs

@@ -46,7 +46,12 @@ fn cli_cmd() -> Command {
     Command::new(name)
         .bin_name(name)
         .about("create a new group")
-        .arg(Arg::new("force").short('f').long("force"))
+        .arg(
+            Arg::new("force")
+                .short('f')
+                .long("force")
+                .action(ArgAction::SetTrue),
+        )
         .arg(
             Arg::new("gid")
                 .short('g')