diff --git a/.gitignore b/.gitignore index 99cc85b..5d06100 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,5 @@ /snapd_2.58.3.only-vendor.tar.xz /snapd_2.61.1.no-vendor.tar.xz /snapd_2.61.1.only-vendor.tar.xz +/snapd_2.61.2.no-vendor.tar.xz +/snapd_2.61.2.only-vendor.tar.xz diff --git a/snapd.spec b/snapd.spec index c813eca..b1d8eaa 100644 --- a/snapd.spec +++ b/snapd.spec @@ -101,8 +101,8 @@ %endif Name: snapd -Version: 2.61.1 -Release: 1%{?dist}.3 +Version: 2.61.2 +Release: 1%{?dist}.1 Summary: A transactional software package manager License: GPLv3 URL: https://%{provider_prefix} @@ -500,6 +500,8 @@ providing packages with %{import_path} prefix. %prep %if ! 0%{?with_bundled} %setup -q +# Ensure there's no bundled stuff accidentally leaking in... +rm -rf vendor/* %else # Extract each tarball properly %setup -q -D -b 1 @@ -517,7 +519,7 @@ mkdir -p src/github.com/snapcore ln -s ../../../ src/github.com/snapcore/snapd export GOPATH=$(pwd):%{gopath} -# remove the mod file, we are building without go modules support +# FIXME: move spec file really to a go.mod world instead of this hack rm -f go.mod export GO111MODULE=off @@ -723,11 +725,6 @@ rm %{buildroot}%{_libexecdir}/snapd/system-shutdown rm -f %{buildroot}%{_unitdir}/snapd.apparmor.service rm -f %{buildroot}%{_libexecdir}/snapd/snapd-apparmor -# Remove prompt services -rm %{buildroot}%{_unitdir}/snapd.aa-prompt-listener.service -rm %{buildroot}%{_userunitdir}/snapd.aa-prompt-ui.service -rm %{buildroot}%{_datadir}/dbus-1/services/io.snapcraft.Prompt.service - # Install Polkit configuration install -m 644 -D data/polkit/io.snapcraft.snapd.policy %{buildroot}%{_datadir}/polkit-1/actions @@ -789,6 +786,7 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath} %else export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif +# FIXME: we are in the go.mod world now but without this things fall apart export GO111MODULE=off %gotest %{import_path}/... %endif @@ -999,13 +997,39 @@ fi %changelog -* Tue Jan 30 2024 Maciek Borzecki - 2.61.1-1.%{dist}.3 +* Wed Feb 28 2024 Maciek Borzecki - 2.61.2-1%{dist}.1 +- Rebuild for Amazon Linux + +* Fri Feb 16 2024 Ernest Lotter +- New upstream release 2.61.2 + - Fix to enable plug/slot sanitization for prepare-image + - Fix panic when device-service.access=offline + - Support offline remodeling + - Allow offline update only remodels without serial + - Fail early when remodeling to old model revision + - Fix to enable plug/slot sanitization for validate-seed + - Allow removal of core snap on classic systems + - Fix network-control interface denial for file lock on /run/netns + - Add well-known core24 snap-id + - Fix remodel snap installation order + - Prevent remodeling from UC18+ to UC16 + - Fix cups auto-connect on classic with cups snap installed + - u2f-devices interface support for GoTrust Idem Key with USB-C + - Fix to restore services after unlink failure + - Add libcudnn.so to Nvidia libraries + - Fix skipping base snap download due to false snapd downgrade + conflict + +* Sun Feb 11 2024 Maxwell G - 2.61.1-2 +- Rebuild for golang 1.22.0 + +* Tue Jan 30 2024 Maciek Borzecki - 2.61.1-1%{dist}.3 - Drop dependency on xdelta where on target where it is not available -* Mon Jan 29 2024 Maciek Borzecki - 2.61.1-1.%{dist}.2 +* Mon Jan 29 2024 Maciek Borzecki - 2.61.1-1%{dist}.2 - Refine packaging for Amazon Linux 2023 -* Mon Jan 29 2024 Maciek Borzecki - 2.61.1-1.%{dist}.1 +* Mon Jan 29 2024 Maciek Borzecki - 2.61.1-1%{dist}.1 - Rebuild for Amazon Linux * Sat Jan 27 2024 Fedora Release Engineering - 2.61.1-1 diff --git a/snapd_2.61.1.no-vendor.tar.xz b/snapd_2.61.1.no-vendor.tar.xz deleted file mode 100644 index e36e270..0000000 Binary files a/snapd_2.61.1.no-vendor.tar.xz and /dev/null differ diff --git a/snapd_2.61.1.only-vendor.tar.xz b/snapd_2.61.1.only-vendor.tar.xz deleted file mode 100644 index 07344cc..0000000 Binary files a/snapd_2.61.1.only-vendor.tar.xz and /dev/null differ diff --git a/snapd_2.61.2.no-vendor.tar.xz b/snapd_2.61.2.no-vendor.tar.xz new file mode 100644 index 0000000..4c904e4 Binary files /dev/null and b/snapd_2.61.2.no-vendor.tar.xz differ diff --git a/snapd_2.61.2.only-vendor.tar.xz b/snapd_2.61.2.only-vendor.tar.xz new file mode 100644 index 0000000..fc75b2f Binary files /dev/null and b/snapd_2.61.2.only-vendor.tar.xz differ diff --git a/sources b/sources index 753ce09..cabce25 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (snapd_2.61.1.no-vendor.tar.xz) = 22f4550604392b04dd4ca903ebabf5631e87a6e11ac3ee8c6afcdf59f18ae2244967e3c9f2da01ddda883f33385b2c9e39648e3a9199efad6df75fff1b7106f9 -SHA512 (snapd_2.61.1.only-vendor.tar.xz) = 74d1ae7a1430f6215d7b8af28b877cb1af0ffaf62d7b4d102aba4f94aa97d81275250c573faa3922e160cd5e2545ea16da0afdc270f855aa20293973c2b23033 +SHA512 (snapd_2.61.2.no-vendor.tar.xz) = f9d1e5777b48af0144f7c92de63f7669dc58296e63dae0156d67e37178fad3c50c860a1d41bab468da3640a4e827a2a0fc07c427984d4f290e5100fe0d2c9a0d +SHA512 (snapd_2.61.2.only-vendor.tar.xz) = 7463f4dc8e9ecaca682104ff1d32162452c12801eeb9b528a44e6a1267de0bfe998dcbd15c76af932c8fdb88a9358e7a921910d3293618b3e44e8b4d2c0e19aa diff --git a/tool b/tool index d9b0b52..38e17c4 100755 --- a/tool +++ b/tool @@ -57,6 +57,7 @@ spin_container() { -w /mnt \ -e IN_CONTAINER=1 \ -t \ + ${EXTRA_FLAGS} \ "$DOCKER_IMG" \ /mnt/tool "$@" } @@ -116,6 +117,33 @@ case "$cmd" in repoconf) make_repo_file "$1" ;; + shell) + set -x + if [ "$IN_CONTAINER" = "1" ]; then + exec /bin/bash + else + EXTRA_FLAGS=-i spin_container shell "$@" + fi + ;; + pack) + if [ ! -d "$PWD/repo" ]; then + echo "repo directory does not exist, run 'createrepo' first" + exit 1 + fi + case "$TARGET" in + amazonlinux:2) + tarball_name="amazon-linux-2-repo.tar.xz" + ;; + amazonlinux:2023) + tarball_name="amazon-linux-2023-repo.tar.xz" + ;; + *) + echo "unsupported target $TARGET" + exit 1 + ;; + esac + tar -cJv repo > "$tarball_name" + ;; help|-h|--help|*) grep -E '^#HELP: ' "$0" | sed -e 's/#HELP: //' exit 1