diff --git a/0002-add-riscv-support.patch b/0001-add-riscv-support.patch similarity index 100% rename from 0002-add-riscv-support.patch rename to 0001-add-riscv-support.patch diff --git a/0001-fix-wrong-path-of-os-release.patch b/0001-fix-wrong-path-of-os-release.patch deleted file mode 100644 index cb378d17232180175c4e58c8f07e35f6b3dc0f4b..0000000000000000000000000000000000000000 --- a/0001-fix-wrong-path-of-os-release.patch +++ /dev/null @@ -1,58 +0,0 @@ -From d4da0320234814ec17a817d049440cfd17833ecf Mon Sep 17 00:00:00 2001 -From: duyiwei -Date: Thu, 15 Sep 2022 15:32:58 +0800 -Subject: [PATCH] fix-wrong-path-of-os-release - -Signed-off-by: duyiwei ---- - profile.d/toolbox.sh | 2 +- - toolbox | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/profile.d/toolbox.sh b/profile.d/toolbox.sh -index d43f6c7..5489cda 100644 ---- a/profile.d/toolbox.sh -+++ b/profile.d/toolbox.sh -@@ -8,7 +8,7 @@ toolbox_welcome_stub="$toolbox_config/toolbox-welcome-shown" - # shellcheck disable=2046 - # shellcheck disable=SC1091 - eval $( -- . /usr/lib/os-release -+ . /etc/os-release - - echo ID="$ID" - echo VARIANT_ID="$VARIANT_ID" -diff --git a/toolbox b/toolbox -index c6ae396..2848c19 100755 ---- a/toolbox -+++ b/toolbox -@@ -531,7 +531,7 @@ get_group_for_sudo() - get_host_id() - ( - # shellcheck disable=SC1091 -- . /usr/lib/os-release -+ . /etc/os-release - echo "$ID" - ) - -@@ -539,7 +539,7 @@ get_host_id() - get_host_variant_id() - ( - # shellcheck disable=SC1091 -- . /usr/lib/os-release -+ . /etc/os-release - echo "$VARIANT_ID" - ) - -@@ -547,7 +547,7 @@ get_host_variant_id() - get_host_version_id() - ( - # shellcheck disable=SC1091 -- . /usr/lib/os-release -+ . /etc/os-release - echo "$VERSION_ID" - ) - --- -2.33.0 - diff --git a/toolbox-0.0.99.3.tar.xz b/toolbox-0.0.99.3.tar.xz deleted file mode 100644 index 95f814360bdc793ba72d82bc0041396f4535095c..0000000000000000000000000000000000000000 Binary files a/toolbox-0.0.99.3.tar.xz and /dev/null differ diff --git a/toolbox-0.0.99.5-vendored.tar.xz b/toolbox-0.0.99.5-vendored.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..fc32a5921af076b9ebe9ac4545b42b000773e217 Binary files /dev/null and b/toolbox-0.0.99.5-vendored.tar.xz differ diff --git a/toolbox.spec b/toolbox.spec index 743102c4af5674d055ec961c4016ecf31e5ac966..ce9c0b6cac9e2301daabf3d73c694fa2d44c987f 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -1,25 +1,28 @@ +%define debug_package %{nil} + Name: toolbox -Version: 0.0.99 +Version: 0.0.99.5 %global goipath github.com/containers/%{name} -Release: 5 -Summary: Unprivileged development environment +Release: 1 +Summary: Tool for interactive command line environments on Linux License: Apache-2.0 URL: https://github.com/containers/toolbox -Source0: toolbox-0.0.99.3.tar.xz +Source0: toolbox-0.0.99.5-vendored.tar.xz Source1: https://github.com/cpuguy83/go-md2man/archive/v1.0.10.tar.gz -Patch0: 0001-fix-wrong-path-of-os-release.patch %ifarch riscv64 -Patch1: 0002-add-riscv-support.patch +Patch0: 0001-add-riscv-support.patch %endif -BuildRequires: golang >= 1.13 meson +BuildRequires: golang >= 1.20 meson >= 0.58.0 BuildRequires: pkgconfig(bash-completion) systemd - -Requires: podman >= 1.4.0 +BuildRequires: gcc shadow + +Recommends: skopeo +Requires: podman >= 1.4.0 containers-common %description @@ -32,6 +35,13 @@ other standard container technologies from OCI. Summary: Tests for toolbox. Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: coreutils +Requires: grep +Requires: bats >= 1.7.0 +# for htpasswd +Requires: httpd-tools +Requires: openssl +Requires: skopeo %description tests The toolbox-tests package contains system tests for toolbox. @@ -39,9 +49,8 @@ The toolbox-tests package contains system tests for toolbox. %prep %setup -q -%patch0 -p 1 %ifarch riscv64 -%patch1 -p1 +%patch0 -p1 %endif GOBUILDDIR="$(pwd)/_build" @@ -73,7 +82,10 @@ export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_ ln -s src/cmd cmd ln -s src/pkg pkg ln -s src/vendor vendor -%meson --buildtype=plain -Dprofile_dir=%{_sysconfdir}/profile.d +%meson \ + -Dprofile_dir=%{_sysconfdir}/profile.d \ + -Dtmpfiles_dir=%{_tmpfilesdir} \ + -Dzsh_completions_dir=%{_datadir}/zsh/site-functions %meson_build @@ -86,8 +98,11 @@ ln -s src/vendor vendor %license COPYING %{_bindir}/%{name} %{_datadir}/bash-completion +%{_datadir}/zsh %{_mandir}/man1/%{name}.1* %{_mandir}/man1/%{name}-*.1* +%{_mandir}/man5/%{name}.conf.5* +%config(noreplace) %{_sysconfdir}/containers/%{name}.conf %{_sysconfdir}/profile.d/%{name}.sh %{_tmpfilesdir}/%{name}.conf @@ -95,6 +110,9 @@ ln -s src/vendor vendor %{_datadir}/%{name} %changelog +* Thu Jan 04 2024 duyiwei - 0.0.99.5-1 +- upgrade version to 0.0.99.5 + * Fri Jul 14 2023 zhangxiang - 0.0.99-5 - add riscv64 support