diff --git a/anda/apps/anki-bin/anki-bin.spec b/anda/apps/anki-bin/anki-bin.spec index 0b12dde112..893936a1ff 100644 --- a/anda/apps/anki-bin/anki-bin.spec +++ b/anda/apps/anki-bin/anki-bin.spec @@ -4,7 +4,7 @@ Release: 1%{?dist} Summary: Flashcard program for using space repetition learning (Installed with wheel) License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5 URL: https://apps.ankiweb.net/ -BuildRequires: python3-installer python3.11 rpm_macro(fdupes) +BuildRequires: python3-pip rpm_macro(fdupes) Requires: python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema Requires: python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash @@ -29,28 +29,33 @@ Anki is based on a theory called spaced repetition. %build %install -python3.11 -m installer --destdir="%{buildroot}" %{SOURCE0} -python3.11 -m installer --destdir="%{buildroot}" %{SOURCE1} +pip3 install --root=%{buildroot} %SOURCE0 %SOURCE1 install -Dm755 %{SOURCE2} "%{buildroot}/usr/bin/anki" install -Dm644 %{SOURCE3} "%{buildroot}/usr/share/applications/anki.desktop" install -Dm644 %{SOURCE4} "%{buildroot}/usr/share/pixmaps/anki.png" install -Dm644 %{SOURCE5} "%{buildroot}/%{_datadir}/licenses/%{name}/LICENSE" install -Dm644 %{SOURCE6} "%{buildroot}/%{_datadir}/doc/%{name}/README.md" -%fdupes %_libdir/python*/site-packages/_aqt/data/ +cp -r %buildroot%_libdir/python3*/site-packages/{_aqt,anki*,aqt*} . +rm -rf %buildroot{%_libdir,/usr/lib}/python3*/site-packages/* +cp -r ./{_aqt,anki*,aqt*} %buildroot/usr/lib/python3*/site-packages/ + +rm -rf %buildroot%_bindir/{distro,flask,jsonschema,markdown_py,normalizer,send2trash,waitress-serve} + +%fdupes %buildroot%_libdir/python*/site-packages/_aqt/data/ %files %license LICENSE %doc README.md -/usr/bin/anki -/usr/lib64/python*/site-packages/_aqt/ -/usr/lib64/python*/site-packages/anki-%{version}.dist-info/ -/usr/lib64/python*/site-packages/anki/ -/usr/lib64/python*/site-packages/aqt-%{version}.dist-info/ -/usr/lib64/python*/site-packages/aqt/ -/usr/share/applications/anki.desktop -/usr/share/pixmaps/anki.png +%_bindir/anki +/usr/lib/python*/site-packages/_aqt/ +/usr/lib/python*/site-packages/anki-%{version}.dist-info/ +/usr/lib/python*/site-packages/anki/ +/usr/lib/python*/site-packages/aqt-%{version}.dist-info/ +/usr/lib/python*/site-packages/aqt/ +%_datadir/applications/anki.desktop +%_datadir/pixmaps/anki.png %changelog * Fri Nov 10 2023 hazel-bunny - 23.10-2 diff --git a/anda/others/blackbox-terminal/anda.hcl b/anda/apps/blackbox-terminal/anda.hcl similarity index 100% rename from anda/others/blackbox-terminal/anda.hcl rename to anda/apps/blackbox-terminal/anda.hcl diff --git a/anda/others/blackbox-terminal/blackbox-terminal.spec b/anda/apps/blackbox-terminal/blackbox-terminal.spec similarity index 100% rename from anda/others/blackbox-terminal/blackbox-terminal.spec rename to anda/apps/blackbox-terminal/blackbox-terminal.spec diff --git a/anda/others/blackbox-terminal/update.rhai b/anda/apps/blackbox-terminal/update.rhai similarity index 100% rename from anda/others/blackbox-terminal/update.rhai rename to anda/apps/blackbox-terminal/update.rhai diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index ae62f3caf2..1d81550474 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.209 +Version: 0.0.233 Release: 1%{?dist} Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index db633b8a00..1ca0a157f8 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.209 +Version: 0.0.233 Release: 1%{?dist} Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/apps/discord-openasar/discord-openasar.spec b/anda/apps/discord-openasar/discord-openasar.spec index 70f32a2f6c..3c55cf8287 100644 --- a/anda/apps/discord-openasar/discord-openasar.spec +++ b/anda/apps/discord-openasar/discord-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-openasar -Version: 0.0.34 +Version: 0.0.39 Release: 1%{?dist} Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index 58cc84f192..34f71c549f 100644 --- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec +++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb-openasar -Version: 0.0.58 +Version: 0.0.63 Release: 1%{?dist} Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec index 5c5f55fdaf..921d11f8ea 100644 --- a/anda/apps/discord-ptb/discord-ptb.spec +++ b/anda/apps/discord-ptb/discord-ptb.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb -Version: 0.0.58 +Version: 0.0.63 Release: 1%{?dist} Summary: Free Voice and Text Chat for Gamers. URL: https://discord.com diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec index 36ed22a3d8..7fa7a1a1d0 100644 --- a/anda/apps/discord/discord.spec +++ b/anda/apps/discord/discord.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord -Version: 0.0.34 +Version: 0.0.39 Release: 1%{?dist} Summary: Free Voice and Text Chat for Gamers URL: https://discord.com diff --git a/anda/apps/sccache/anda.hcl b/anda/apps/sccache/anda.hcl new file mode 100644 index 0000000000..665fb9cf1a --- /dev/null +++ b/anda/apps/sccache/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "rust-sccache.spec" + } +} diff --git a/anda/apps/sccache/rust-sccache.spec b/anda/apps/sccache/rust-sccache.spec new file mode 100644 index 0000000000..ae15a5a33a --- /dev/null +++ b/anda/apps/sccache/rust-sccache.spec @@ -0,0 +1,601 @@ +# Generated by rust2rpm 25 +%bcond_with check +# aarch64 dist is not available +%ifarch aarch64 +%bcond_with dist_server +%else +%bcond_without dist_server +%endif + +# Don't mangle shebangs +%global __brp_mangle_shebangs %{nil} + +%global crate sccache + +Name: rust-sccache +Version: 0.7.4 +Release: 1%{?dist} +Summary: Ccache-like tool + +License: Apache-2.0 +URL: https://crates.io/crates/sccache +Source: %{crates_source} +# Automatically generated patch to strip dependencies and normalize metadata +Patch: sccache-fix-metadata-auto.diff + +ExclusiveArch: %{rust_arches} + +BuildRequires: cargo-rpm-macros >= 24 +BuildRequires: anda-srpm-macros +BuildRequires: openssl-devel +BuildRequires: gcc +BuildRequires: perl +BuildRequires: rust-packaging + +%global _description %{expand: +Sccache is a ccache-like tool. It is used as a compiler wrapper and +avoids compilation when possible, storing a cache in a remote storage +using various cloud storage.} + +%description %{_description} + +%package -n %{crate} +Summary: %{summary} +# FIXME: paste output of %%cargo_license_summary here +License: # FIXME +# LICENSE.dependencies contains a full license breakdown + +%description -n %{crate} %{_description} + +%files -n %{crate} +%license LICENSE +%doc CODE_OF_CONDUCT.md +%doc README.md +%{_bindir}/sccache +%if %{with dist_server} +%{_bindir}/sccache-dist +%endif + +%package devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache) = 0.7.4 +Requires: cargo +Requires: rust >= 1.67.1 + +%description devel %{_description} + +This package contains library source intended for building other packages which +use the "%{crate}" crate. + +%files devel +%license %{crate_instdir}/LICENSE +%doc %{crate_instdir}/CODE_OF_CONDUCT.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/default) = 0.7.4 +Requires: cargo +Requires: crate(sccache) = 0.7.4 +Requires: crate(sccache/all) = 0.7.4 + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+all-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/all) = 0.7.4 +Requires: cargo +Requires: crate(sccache) = 0.7.4 +Requires: crate(sccache/azure) = 0.7.4 +Requires: crate(sccache/dist-client) = 0.7.4 +Requires: crate(sccache/gcs) = 0.7.4 +Requires: crate(sccache/gha) = 0.7.4 +Requires: crate(sccache/memcached) = 0.7.4 +Requires: crate(sccache/redis) = 0.7.4 +Requires: crate(sccache/s3) = 0.7.4 +Requires: crate(sccache/webdav) = 0.7.4 + +%description -n %{name}+all-devel %{_description} + +This package contains library source intended for building other packages which +use the "all" feature of the "%{crate}" crate. + +%files -n %{name}+all-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+azure-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/azure) = 0.7.4 +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+azure-devel %{_description} + +This package contains library source intended for building other packages which +use the "azure" feature of the "%{crate}" crate. + +%files -n %{name}+azure-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+dist-client-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/dist-client) = 0.7.4 +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+dist-client-devel %{_description} + +This package contains library source intended for building other packages which +use the "dist-client" feature of the "%{crate}" crate. + +%files -n %{name}+dist-client-devel +%ghost %{crate_instdir}/Cargo.toml +%if %{with dist_server} +%package -n %{name}+dist-server-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/dist-server) = 0.7.4 +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+dist-server-devel %{_description} + +This package contains library source intended for building other packages which +use the "dist-server" feature of the "%{crate}" crate. + +%files -n %{name}+dist-server-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+dist-tests-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/dist-tests) = 0.7.4 +Requires: cargo +Requires: crate(sccache) = 0.7.4 +Requires: crate(sccache/dist-client) = 0.7.4 +Requires: crate(sccache/dist-server) = 0.7.4 + +%description -n %{name}+dist-tests-devel %{_description} + +This package contains library source intended for building other packages which +use the "dist-tests" feature of the "%{crate}" crate. + +%files -n %{name}+dist-tests-devel +%ghost %{crate_instdir}/Cargo.toml +%endif +%package -n %{name}+flate2-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/flate2) = 0.7.4 +Requires: (crate(flate2) >= 1.0.0 with crate(flate2) < 2.0.0~) +Requires: (crate(flate2/rust_backend) >= 1.0.0 with crate(flate2/rust_backend) < 2.0.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+flate2-devel %{_description} + +This package contains library source intended for building other packages which +use the "flate2" feature of the "%{crate}" crate. + +%files -n %{name}+flate2-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+gcs-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/gcs) = 0.7.4 +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+gcs-devel %{_description} + +This package contains library source intended for building other packages which +use the "gcs" feature of the "%{crate}" crate. + +%files -n %{name}+gcs-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+gha-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/gha) = 0.7.4 +Requires: cargo +Requires: crate(sccache) = 0.7.4 +Requires: crate(sccache/opendal) = 0.7.4 + +%description -n %{name}+gha-devel %{_description} + +This package contains library source intended for building other packages which +use the "gha" feature of the "%{crate}" crate. + +%files -n %{name}+gha-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+hyper-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/hyper) = 0.7.4 +Requires: (crate(hyper/default) >= 0.14.27 with crate(hyper/default) < 0.15.0~) +Requires: (crate(hyper/server) >= 0.14.27 with crate(hyper/server) < 0.15.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+hyper-devel %{_description} + +This package contains library source intended for building other packages which +use the "hyper" feature of the "%{crate}" crate. + +%files -n %{name}+hyper-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+jwt-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/jwt) = 0.7.4 +Requires: (crate(jsonwebtoken/default) >= 8.0.0 with crate(jsonwebtoken/default) < 9.0.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+jwt-devel %{_description} + +This package contains library source intended for building other packages which +use the "jwt" feature of the "%{crate}" crate. + +%files -n %{name}+jwt-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+libmount-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/libmount) = 0.7.4 +Requires: (crate(libmount/default) >= 0.1.10 with crate(libmount/default) < 0.2.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+libmount-devel %{_description} + +This package contains library source intended for building other packages which +use the "libmount" feature of the "%{crate}" crate. + +%files -n %{name}+libmount-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+memcached-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/memcached) = 0.7.4 +Requires: (crate(opendal/default) >= 0.40.0 with crate(opendal/default) < 0.41.0~) +Requires: (crate(opendal/services-memcached) >= 0.40.0 with crate(opendal/services-memcached) < 0.41.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+memcached-devel %{_description} + +This package contains library source intended for building other packages which +use the "memcached" feature of the "%{crate}" crate. + +%files -n %{name}+memcached-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+native-zlib-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/native-zlib) = 0.7.4 +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+native-zlib-devel %{_description} + +This package contains library source intended for building other packages which +use the "native-zlib" feature of the "%{crate}" crate. + +%files -n %{name}+native-zlib-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+nix-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/nix) = 0.7.4 +Requires: (crate(nix/default) >= 0.26.2 with crate(nix/default) < 0.27.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+nix-devel %{_description} + +This package contains library source intended for building other packages which +use the "nix" feature of the "%{crate}" crate. + +%files -n %{name}+nix-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+opendal-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/opendal) = 0.7.4 +Requires: (crate(opendal/default) >= 0.40.0 with crate(opendal/default) < 0.41.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+opendal-devel %{_description} + +This package contains library source intended for building other packages which +use the "opendal" feature of the "%{crate}" crate. + +%files -n %{name}+opendal-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+openssl-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/openssl) = 0.7.4 +Requires: (crate(openssl/default) >= 0.10.55 with crate(openssl/default) < 0.11.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+openssl-devel %{_description} + +This package contains library source intended for building other packages which +use the "openssl" feature of the "%{crate}" crate. + +%files -n %{name}+openssl-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+redis-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/redis) = 0.7.4 +Requires: (crate(opendal/default) >= 0.40.0 with crate(opendal/default) < 0.41.0~) +Requires: (crate(opendal/services-redis) >= 0.40.0 with crate(opendal/services-redis) < 0.41.0~) +Requires: (crate(opendal/services-redis-rustls) >= 0.40.0 with crate(opendal/services-redis-rustls) < 0.41.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 +Requires: crate(sccache/url) = 0.7.4 + +%description -n %{name}+redis-devel %{_description} + +This package contains library source intended for building other packages which +use the "redis" feature of the "%{crate}" crate. + +%files -n %{name}+redis-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+reqsign-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/reqsign) = 0.7.4 +Requires: (crate(reqsign/default) >= 0.14.1 with crate(reqsign/default) < 0.15.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+reqsign-devel %{_description} + +This package contains library source intended for building other packages which +use the "reqsign" feature of the "%{crate}" crate. + +%files -n %{name}+reqsign-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+reqwest-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/reqwest) = 0.7.4 +Requires: (crate(reqwest/blocking) >= 0.11.0 with crate(reqwest/blocking) < 0.12.0~) +Requires: (crate(reqwest/default) >= 0.11.0 with crate(reqwest/default) < 0.12.0~) +Requires: (crate(reqwest/json) >= 0.11.0 with crate(reqwest/json) < 0.12.0~) +Requires: (crate(reqwest/rustls-tls) >= 0.11.0 with crate(reqwest/rustls-tls) < 0.12.0~) +Requires: (crate(reqwest/stream) >= 0.11.0 with crate(reqwest/stream) < 0.12.0~) +Requires: (crate(reqwest/trust-dns) >= 0.11.0 with crate(reqwest/trust-dns) < 0.12.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+reqwest-devel %{_description} + +This package contains library source intended for building other packages which +use the "reqwest" feature of the "%{crate}" crate. + +%files -n %{name}+reqwest-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+rouille-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/rouille) = 0.7.4 +Requires: (crate(rouille) >= 3.6.0 with crate(rouille) < 4.0.0~) +Requires: (crate(rouille/ssl) >= 3.6.0 with crate(rouille/ssl) < 4.0.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+rouille-devel %{_description} + +This package contains library source intended for building other packages which +use the "rouille" feature of the "%{crate}" crate. + +%files -n %{name}+rouille-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+s3-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/s3) = 0.7.4 +Requires: cargo +Requires: crate(sccache) = 0.7.4 +Requires: crate(sccache/opendal) = 0.7.4 +Requires: crate(sccache/reqsign) = 0.7.4 + +%description -n %{name}+s3-devel %{_description} + +This package contains library source intended for building other packages which +use the "s3" feature of the "%{crate}" crate. + +%files -n %{name}+s3-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+sha2-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/sha2) = 0.7.4 +Requires: (crate(sha2/default) >= 0.10.6 with crate(sha2/default) < 0.11.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+sha2-devel %{_description} + +This package contains library source intended for building other packages which +use the "sha2" feature of the "%{crate}" crate. + +%files -n %{name}+sha2-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+syslog-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/syslog) = 0.7.4 +Requires: (crate(syslog/default) >= 6.0.0 with crate(syslog/default) < 7.0.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+syslog-devel %{_description} + +This package contains library source intended for building other packages which +use the "syslog" feature of the "%{crate}" crate. + +%files -n %{name}+syslog-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+trust-dns-resolver-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/trust-dns-resolver) = 0.7.4 +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+trust-dns-resolver-devel %{_description} + +This package contains library source intended for building other packages which +use the "trust-dns-resolver" feature of the "%{crate}" crate. + +%files -n %{name}+trust-dns-resolver-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+unstable-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/unstable) = 0.7.4 +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+unstable-devel %{_description} + +This package contains library source intended for building other packages which +use the "unstable" feature of the "%{crate}" crate. + +%files -n %{name}+unstable-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+url-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/url) = 0.7.4 +Requires: (crate(url/default) >= 2.0.0 with crate(url/default) < 3.0.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+url-devel %{_description} + +This package contains library source intended for building other packages which +use the "url" feature of the "%{crate}" crate. + +%files -n %{name}+url-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+vendored-openssl-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/vendored-openssl) = 0.7.4 +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+vendored-openssl-devel %{_description} + +This package contains library source intended for building other packages which +use the "vendored-openssl" feature of the "%{crate}" crate. + +%files -n %{name}+vendored-openssl-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+version-compare-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/version-compare) = 0.7.4 +Requires: (crate(version-compare/default) >= 0.1.1 with crate(version-compare/default) < 0.2.0~) +Requires: cargo +Requires: crate(sccache) = 0.7.4 + +%description -n %{name}+version-compare-devel %{_description} + +This package contains library source intended for building other packages which +use the "version-compare" feature of the "%{crate}" crate. + +%files -n %{name}+version-compare-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+webdav-devel +Summary: %{summary} +BuildArch: noarch +Provides: crate(sccache/webdav) = 0.7.4 +Requires: cargo +Requires: crate(sccache) = 0.7.4 +Requires: crate(sccache/opendal) = 0.7.4 + +%description -n %{name}+webdav-devel %{_description} + +This package contains library source intended for building other packages which +use the "webdav" feature of the "%{crate}" crate. + +%files -n %{name}+webdav-devel +%ghost %{crate_instdir}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep_online + + +%build +%if %{with dist_server} +%cargo_build -f dist-server +%else +%cargo_build +%endif + +%install +%if %{with dist_server} +%cargo_install -f dist-server +%else +%cargo_install +%endif + +%if %{with check} +%check +%if %{with dist_server} +%cargo_test -f dist-server +%else +%cargo_test +%endif + +%endif + +%changelog +* Mon Dec 18 2023 Cappy Ishihara - 0.7.4-1 +- Initial package diff --git a/anda/apps/sccache/sccache-fix-metadata-auto.diff b/anda/apps/sccache/sccache-fix-metadata-auto.diff new file mode 100644 index 0000000000..9b96ebe2e2 --- /dev/null +++ b/anda/apps/sccache/sccache-fix-metadata-auto.diff @@ -0,0 +1,14 @@ +--- sccache-0.7.4/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ sccache-0.7.4/Cargo.toml 2023-12-18T06:08:52.420382+00:00 +@@ -384,11 +384,3 @@ + [target."cfg(unix)".dependencies.daemonize] + version = "0.5" + +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = [ +- "fileapi", +- "handleapi", +- "stringapiset", +- "winnls", +-] diff --git a/anda/tools/uutils-coreutils/.gitignore b/anda/apps/vencord-desktop/.gitignore similarity index 100% rename from anda/tools/uutils-coreutils/.gitignore rename to anda/apps/vencord-desktop/.gitignore diff --git a/anda/apps/vencord-desktop/anda.hcl b/anda/apps/vencord-desktop/anda.hcl new file mode 100644 index 0000000000..3c5a144b6a --- /dev/null +++ b/anda/apps/vencord-desktop/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "vencord-desktop.spec" + } +} \ No newline at end of file diff --git a/anda/apps/vencord-desktop/update.rhai b/anda/apps/vencord-desktop/update.rhai new file mode 100644 index 0000000000..f0b5f6ecf3 --- /dev/null +++ b/anda/apps/vencord-desktop/update.rhai @@ -0,0 +1 @@ +rpm.version(gh_tag("Vencord/Vesktop")); \ No newline at end of file diff --git a/anda/apps/vencord-desktop/vencord-desktop.spec b/anda/apps/vencord-desktop/vencord-desktop.spec new file mode 100644 index 0000000000..507a91e602 --- /dev/null +++ b/anda/apps/vencord-desktop/vencord-desktop.spec @@ -0,0 +1,74 @@ +%define debug_package %nil + +# Exclude private libraries +%global __requires_exclude libffmpeg.so +%global __provides_exclude_from %{_datadir}/vesktop/.*\\.so + +Name: vencord-desktop +Provides: VencordDesktop = %{version}-%{release} +Version: 0.4.4 +Release: 1%{?dist} +License: GPL-3.0 +Summary: Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed +URL: https://github.com/Vencord/Vesktop +Group: Applications/Internet +#Source1: launch.sh +Source0: https://github.com/Vencord/Vesktop/archive/refs/tags/v%{version}.tar.gz +Requires: xdg-utils +BuildRequires: nodejs-npm git +# Conflicts: vesktop-bin + +%description +vesktop is a custom client designed to enhance your Discord experience +while keeping everything lightweight. + +%prep +git init +git remote add origin %url || : +git reset --hard +git fetch +git checkout v%version + +cat < vesktop.desktop +[Desktop Entry] +Name=Vesktop +Comment=%summary +GenericName=Internet Messenger +Type=Application +Exec=/usr/bin/vencorddesktop +Icon=vesktop +Categories=Network;InstantMessaging; +StartupWMClass=VencordDesktop + +Keywords=discord;vesktop;vencord;shelter;armcord;electron; +EOF + + +%build +npx pnpm@8 install --no-frozen-lockfile +npx pnpm@8 package:dir + + +%install + +mkdir -p %buildroot/usr/share/vesktop +cp -r dist/*-unpacked/. %buildroot/usr/share/vesktop/. + +install -Dm755 dist/*-unpacked/vencorddesktop %buildroot/usr/bin/vencorddesktop +ln -sf /usr/share/vesktop/vencorddesktop %buildroot/usr/bin/vencorddesktop +install -Dm644 vesktop.desktop %buildroot/usr/share/applications/vesktop.desktop +install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/vesktop.png + +%files +%doc README.md +%license LICENSE +/usr/bin/vencorddesktop +/usr/share/applications/vesktop.desktop +/usr/share/pixmaps/vesktop.png +/usr/share/vesktop/* + +%changelog +* Tue Nov 07 2023 Cappy Ishihara - 0.4.3-1 +- Initial package + + diff --git a/anda/audio/voicevox/0001-feat-add-repository-entry-in-package.json.patch b/anda/apps/voicevox/0001-feat-add-repository-entry-in-package.json.patch similarity index 100% rename from anda/audio/voicevox/0001-feat-add-repository-entry-in-package.json.patch rename to anda/apps/voicevox/0001-feat-add-repository-entry-in-package.json.patch diff --git a/anda/audio/voicevox/anda.hcl b/anda/apps/voicevox/anda.hcl similarity index 100% rename from anda/audio/voicevox/anda.hcl rename to anda/apps/voicevox/anda.hcl diff --git a/anda/audio/voicevox/update.rhai b/anda/apps/voicevox/update.rhai similarity index 100% rename from anda/audio/voicevox/update.rhai rename to anda/apps/voicevox/update.rhai diff --git a/anda/audio/voicevox/voicevox.spec b/anda/apps/voicevox/voicevox.spec similarity index 100% rename from anda/audio/voicevox/voicevox.spec rename to anda/apps/voicevox/voicevox.spec diff --git a/anda/desktops/budgie/budgie-extras/budgie-extras.spec b/anda/desktops/budgie/budgie-extras/budgie-extras.spec index c386178868..05c6970173 100644 --- a/anda/desktops/budgie/budgie-extras/budgie-extras.spec +++ b/anda/desktops/budgie/budgie-extras/budgie-extras.spec @@ -51,7 +51,6 @@ Requires: budgie-applet-recentlyused Requires: budgie-applet-rotation-lock Requires: budgie-applet-showtime Requires: budgie-applet-takeabreak -Requires: budgie-applet-trash Requires: budgie-applet-visualspace Requires: budgie-applet-wallstreet Requires: budgie-applet-window-shuffler @@ -208,14 +207,6 @@ upside down, dim the screen, lock screen or show a countdown message on break time. The applet can be accessed quickly from the panel to temporarily switch it off. -%package -n budgie-applet-trash -Requires: budgie-extras-common -Summary: Applet allows access to trash capabilities for the Budgie Desktop -%description -n budgie-applet-trash -The trash applet allows the user access the desktop trash capabilities -from the panel including the ability to delete and restore files stored -in the trash folder. - %package -n budgie-applet-visualspace Requires: budgie-extras-common Summary: Shows the current workspace(s), as bullet(s) @@ -393,9 +384,6 @@ rm -f %{buildroot}%{_bindir}/quickchar %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.plugins.takeabreak.gschema.xml %{_datadir}/pixmaps/takeabreak*.svg -%files -n budgie-applet-trash -%{_libdir}/budgie-desktop/plugins/budgie-trash - %files -n budgie-applet-visualspace %config %{_sysconfdir}/xdg/autostart/visualspace-autostart.desktop %{_libdir}/budgie-desktop/plugins/budgie-visualspace diff --git a/anda/desktops/elementary/elementary-files/elementary-files.spec b/anda/desktops/elementary/elementary-files/elementary-files.spec index f834e23e2d..aa00286e73 100644 --- a/anda/desktops/elementary/elementary-files/elementary-files.spec +++ b/anda/desktops/elementary/elementary-files/elementary-files.spec @@ -5,7 +5,7 @@ Name: elementary-files Summary: File manager from elementary -Version: 6.5.2 +Version: 6.5.3 Release: 1%{?dist} License: GPL-3.0 diff --git a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec index f439a76a57..7883426b40 100644 --- a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec +++ b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec @@ -11,6 +11,8 @@ URL: https://github.com/elementary/greeter Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz Source1: 40-%{appname}.conf +Patch0: https://github.com/elementary/greeter/commit/dbd9b6f9701f5992c3b3257c025b9cd80d041cc8.patch + BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libappstream-glib @@ -34,9 +36,9 @@ BuildRequires: pkgconfig(granite) >= 5.0 BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libhandy-1) BuildRequires: pkgconfig(liblightdm-gobject-1) -BuildRequires: pkgconfig(mutter-clutter-12) -BuildRequires: pkgconfig(mutter-cogl-12) -BuildRequires: pkgconfig(mutter-cogl-pango-12) +BuildRequires: pkgconfig(mutter-clutter-13) +BuildRequires: pkgconfig(mutter-cogl-13) +BuildRequires: pkgconfig(mutter-cogl-pango-13) BuildRequires: pkgconfig(x11) Provides: pantheon-greeter = %{version}-%{release} @@ -68,7 +70,7 @@ The elementary Greeter is a styled Login Screen for LightDM. %prep -%autosetup -n %{srcname}-%{version} +%autosetup -p1 -n %{srcname}-%{version} %build diff --git a/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec b/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec index 5a6d6ff03f..7a3bbb3242 100644 --- a/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec +++ b/anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec @@ -4,7 +4,7 @@ Name: elementary-icon-theme Summary: Icons from the Elementary Project Version: 7.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later URL: https://github.com/elementary/icons @@ -89,9 +89,7 @@ gtk-update-icon-cache --force %{_datadir}/icons/elementary &>/dev/null || : %dir %{_datadir}/icons/elementary %ghost %{_datadir}/icons/elementary/icon-theme.cache -%{_datadir}/icons/elementary/*/ -%{_datadir}/icons/elementary/*@2x -%{_datadir}/icons/elementary/*@3x +%{_datadir}/icons/elementary/* %{_datadir}/icons/elementary/cursor.theme %{_datadir}/icons/elementary/index.theme diff --git a/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec b/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec index 1c8b0cd882..90fe9558d5 100644 --- a/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec +++ b/anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec @@ -4,7 +4,7 @@ Name: elementary-onboarding Summary: Onboarding app for new users Version: 7.2.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later URL: https://github.com/elementary/onboarding diff --git a/anda/desktops/elementary/elementary-photos/elementary-photos.spec b/anda/desktops/elementary/elementary-photos/elementary-photos.spec index 705849d3b3..8d533c0138 100644 --- a/anda/desktops/elementary/elementary-photos/elementary-photos.spec +++ b/anda/desktops/elementary/elementary-photos/elementary-photos.spec @@ -12,15 +12,19 @@ License: LGPL-2.0-or-later URL: https://github.com/elementary/photos Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz +# RIP the publishing plugins (sorry for the "wide" patch, having issues with just the relevant commits) +Patch0: https://github.com/elementary/photos/compare/7261606a05d1f41116aba5c86b62d1f739419ed1..09e55943b266bc2861b913251cb834169d81743e.patch + BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: meson >= 0.46.0 BuildRequires: vala BuildRequires: fdupes +BuildRequires: git-core BuildRequires: pkgconfig(gee-0.8) >= 0.8.5 -BuildRequires: pkgconfig(geocode-glib-1.0) +BuildRequires: pkgconfig(geocode-glib-2.0) BuildRequires: pkgconfig(gexiv2) >= 0.4.90 BuildRequires: pkgconfig(gio-2.0) >= 2.20 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.20 @@ -33,17 +37,12 @@ BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= 1.0.0 BuildRequires: pkgconfig(gstreamer-pbutils-1.0) >= 1.0.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.6.0 BuildRequires: pkgconfig(gudev-1.0) >= 145 -BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libexif) >= 0.6.16 BuildRequires: pkgconfig(libgphoto2) >= 2.4.2 BuildRequires: pkgconfig(libhandy-1) BuildRequires: pkgconfig(libraw) >= 0.13.2 -BuildRequires: pkgconfig(libsoup-2.4) >= 2.26.0 BuildRequires: pkgconfig(libwebp) >= 0.4.4 -BuildRequires: pkgconfig(libxml-2.0) >= 2.6.32 -BuildRequires: pkgconfig(rest-0.7) >= 0.7 BuildRequires: pkgconfig(sqlite3) >= 3.5.9 -BuildRequires: pkgconfig(webkit2gtk-4.0) >= 2.0.0 Requires: hicolor-icon-theme @@ -53,7 +52,8 @@ Foundation. %prep -%autosetup -n %{srcname}-%{version} -p1 +%autosetup -n %{srcname}-%{version} -N +git apply %PATCH0 # The .patch file has Git binary patches, so we need to apply it manually with Git %build @@ -94,7 +94,6 @@ appstream-util validate-relax --nonet \ %{_datadir}/applications/%{appname}.desktop %{_datadir}/applications/%{appname}-viewer.desktop %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml -%{_datadir}/glib-2.0/schemas/%{appname}-extras.gschema.xml %{_datadir}/icons/hicolor/*/apps/%{appname}.svg %{_datadir}/icons/hicolor/*/apps/%{appname}-viewer.svg %{_datadir}/metainfo/%{appname}.appdata.xml diff --git a/anda/desktops/elementary/gala/gala.spec b/anda/desktops/elementary/gala/gala.spec index 3c7211c469..5e0b61dabd 100644 --- a/anda/desktops/elementary/gala/gala.spec +++ b/anda/desktops/elementary/gala/gala.spec @@ -31,9 +31,9 @@ BuildRequires: pkgconfig(granite) >= 5.4.0 BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libbamf3) BuildRequires: pkgconfig(libcanberra) -BuildRequires: pkgconfig(mutter-clutter-12) -BuildRequires: pkgconfig(mutter-cogl-12) -BuildRequires: pkgconfig(mutter-cogl-pango-12) +BuildRequires: pkgconfig(mutter-clutter-13) +BuildRequires: pkgconfig(mutter-cogl-13) +BuildRequires: pkgconfig(mutter-cogl-pango-13) Requires: %{name}-libs%{?_isa} = %{version}-%{release} diff --git a/anda/desktops/elementary/pantheon-session-settings/pantheon-session-settings.spec b/anda/desktops/elementary/pantheon-session-settings/pantheon-session-settings.spec index de173d65ad..251119d0fb 100644 --- a/anda/desktops/elementary/pantheon-session-settings/pantheon-session-settings.spec +++ b/anda/desktops/elementary/pantheon-session-settings/pantheon-session-settings.spec @@ -13,10 +13,11 @@ BuildArch: noarch Requires: elementary-settings-daemon Requires: gala +# Gala has a hard runtime dependency on... GNOME Disks' DBus service!?! Requires: gnome-disk-utility Requires: gnome-keyring Requires: gnome-session -Requires: gnome-session-xsession +#Requires: gnome-session-xsession # this pulls in gnome-shell Requires: gnome-settings-daemon Requires: orca Requires: pantheon-agent-geoclue2 @@ -41,6 +42,8 @@ Requires: elementary-sound-theme Requires: elementary-theme Requires: open-sans-fonts +Source1: https://github.com/elementary/default-settings/raw/master/xdg-desktop-portal/pantheon-portals.conf + %description Configuration files and settings overrides for the Pantheon desktop session. @@ -84,6 +87,9 @@ mkdir -p %{buildroot}/%{_datadir}/accountsservice/interfaces ln -s ../../dbus-1/interfaces/io.elementary.pantheon.AccountsService.xml \ %{buildroot}/%{_datadir}/accountsservice/interfaces/io.elementary.pantheon.AccountsService.xml +mkdir -p %{buildroot}/%{_datadir}/xdg-desktop-portal +install -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/xdg-desktop-portal/ + # these scriptlets are apparently still necessary, because # .override files don't seem to trigger schema recompilation @@ -109,6 +115,7 @@ fi %{_datadir}/gnome-session/sessions/pantheon.session %{_datadir}/polkit-1/actions/io.elementary.pantheon.AccountsService.policy %{_datadir}/xsessions/pantheon.desktop +%{_datadir}/xdg-desktop-portal/pantheon-portals.conf %changelog diff --git a/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec b/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec index 63cff5bcee..51ff8dccb4 100644 --- a/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec +++ b/anda/desktops/elementary/switchboard-plug-networking/switchboard-plug-networking.spec @@ -15,6 +15,8 @@ License: GPL-3.0-or-later URL: https://github.com/elementary/switchboard-plug-network Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz +Patch0: https://github.com/elementary/switchboard-plug-network/pull/357.patch + BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: meson diff --git a/anda/desktops/elementary/switchboard-plug-pantheon-shell/dark-theme-wallpaper.patch b/anda/desktops/elementary/switchboard-plug-pantheon-shell/dark-theme-wallpaper.patch new file mode 100644 index 0000000000..ff00a8aeb5 --- /dev/null +++ b/anda/desktops/elementary/switchboard-plug-pantheon-shell/dark-theme-wallpaper.patch @@ -0,0 +1,23 @@ +From a3be778d1c4137d30af6ed9a08d0b54ee828687f Mon Sep 17 00:00:00 2001 +From: madomado +Date: Tue, 21 Nov 2023 19:45:14 +0800 +Subject: [PATCH] fix(wallpaper): change wallpaper for dark theme settings + +Previously before the fix, the wallpaper cannot be changed via settings because it only sets the wallpaper for the light theme, not the dark theme. +This fixes the issue. +--- + src/Views/Wallpaper.vala | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Views/Wallpaper.vala b/src/Views/Wallpaper.vala +index 07251444..7141cad8 100644 +--- a/src/Views/Wallpaper.vala ++++ b/src/Views/Wallpaper.vala +@@ -206,6 +206,7 @@ public class PantheonShell.Wallpaper : Gtk.Box { + } + + gnome_background_settings.set_string ("picture-uri", uri); ++ gnome_background_settings.set_string ("picture-uri-dark", uri); + } + + private void update_checked_wallpaper (Gtk.FlowBox box, Gtk.FlowBoxChild child) { diff --git a/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec b/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec index eadfa19306..dbafb315db 100644 --- a/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec +++ b/anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec @@ -14,6 +14,7 @@ License: GPL-3.0 URL: https://github.com/elementary/switchboard-plug-pantheon-shell Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz +Patch0: dark-theme-wallpaper.patch BuildRequires: gettext BuildRequires: libappstream-glib diff --git a/anda/desktops/elementary/wingpanel/wingpanel.spec b/anda/desktops/elementary/wingpanel/wingpanel.spec index 59ef67a72d..cda694cc5a 100644 --- a/anda/desktops/elementary/wingpanel/wingpanel.spec +++ b/anda/desktops/elementary/wingpanel/wingpanel.spec @@ -27,9 +27,9 @@ BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(glib-2.0) >= 2.32 BuildRequires: pkgconfig(granite) >= 5.4.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.10 -BuildRequires: pkgconfig(mutter-clutter-12) -BuildRequires: pkgconfig(mutter-cogl-12) -BuildRequires: pkgconfig(mutter-cogl-pango-12) +BuildRequires: pkgconfig(mutter-clutter-13) +BuildRequires: pkgconfig(mutter-cogl-13) +BuildRequires: pkgconfig(mutter-cogl-pango-13) Requires: %{name}-libs%{?_isa} = %{version}-%{release} diff --git a/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/anda.hcl b/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/anda.hcl new file mode 100644 index 0000000000..ede91daf20 --- /dev/null +++ b/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "gnome-shell-extension-appmenu-is-back.spec" + } +} diff --git a/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/gnome-shell-extension-appmenu-is-back.spec b/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/gnome-shell-extension-appmenu-is-back.spec new file mode 100644 index 0000000000..a7a3ab0f8d --- /dev/null +++ b/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/gnome-shell-extension-appmenu-is-back.spec @@ -0,0 +1,34 @@ +%global extension appmenu-is-back +%global uuid %{extension}@fthx + +Name: gnome-shell-extension-%{extension} +Version: 2 +Release: 1%{?dist} +Summary: GNOME Shell extension to bring back the app menu +License: GPL-3.0-only +URL: https://github.com/fthx/appmenu-is-back + +BuildArch: noarch + +Source0: https://github.com/fthx/appmenu-is-back/archive/refs/tags/v%{version}.tar.gz + +Requires: (gnome-shell >= 45~ with gnome-shell < 46~) +Recommends: gnome-extensions-app + +%description +This extension brings back the app menu in the top panel, for GNOME 45 and later. + +%prep +%autosetup -n appmenu-is-back-%{version} + +%install +install -Dm644 metadata.json %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}/metadata.json +install -Dm644 extension.js %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}/extension.js + +%files +%license LICENSE +%{_datadir}/gnome-shell/extensions/%{uuid} + +%changelog +* Thu Nov 16 2023 Lleyton Gray - 2-1 +- Initial Release diff --git a/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/update.rhai b/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/update.rhai new file mode 100644 index 0000000000..56ea942c51 --- /dev/null +++ b/anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/update.rhai @@ -0,0 +1,2 @@ +let version = find("v(.+)", gh("fthx/appmenu-is-back"), 1); +rpm.version(version); diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/0001-Remove-schema-handling-from-transpile.sh.patch b/anda/desktops/gnome/gnome-shell-extension-pop-shell/0001-Remove-schema-handling-from-transpile.sh.patch new file mode 100644 index 0000000000..eb41bed4d5 --- /dev/null +++ b/anda/desktops/gnome/gnome-shell-extension-pop-shell/0001-Remove-schema-handling-from-transpile.sh.patch @@ -0,0 +1,34 @@ +From 3f8b19139bf3f13b4285fd9d949cb5460a0909df Mon Sep 17 00:00:00 2001 +From: Carl George +Date: Fri, 25 Jun 2021 22:26:50 -0500 +Subject: [PATCH] Remove schema handling from transpile.sh + +--- + scripts/transpile.sh | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/scripts/transpile.sh b/scripts/transpile.sh +index e619a8c..8977c29 100755 +--- a/scripts/transpile.sh ++++ b/scripts/transpile.sh +@@ -15,8 +15,6 @@ transpile() { + + rm -rf _build + +-glib-compile-schemas schemas & +- + # Transpile to JavaScript + + for proj in ${PROJECTS}; do +@@ -30,7 +28,7 @@ wait + + # Convert JS to GJS-compatible scripts + +-cp -r metadata.json icons schemas *.css _build & ++cp -r metadata.json icons *.css _build & + + for src in $(find target -name '*.js'); do + dest=$(echo "$src" | sed s#target#_build#g) +-- +2.31.1 + diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.desktop.wm.keybindings.pop-shell.gschema.override b/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.desktop.wm.keybindings.pop-shell.gschema.override new file mode 100644 index 0000000000..ca2303ab0d --- /dev/null +++ b/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.desktop.wm.keybindings.pop-shell.gschema.override @@ -0,0 +1,18 @@ +[org.gnome.desktop.wm.keybindings] +close = ['F4', 'q'] +maximize = [] +minimize = [] +move-to-monitor-down = [] +move-to-monitor-left = [] +move-to-monitor-right = [] +move-to-monitor-up = [] +move-to-workspace-down = [] +move-to-workspace-left = [] +move-to-workspace-right = [] +move-to-workspace-up = [] +switch-to-workspace-down = ['Down', 'KP_Down', 'j'] +switch-to-workspace-left = [] +switch-to-workspace-right = [] +switch-to-workspace-up = ['Up', 'KP_Up', 'k'] +toggle-maximized = ['m'] +unmaximize = [] diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.mutter.pop-shell.gschema.override b/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.mutter.pop-shell.gschema.override new file mode 100644 index 0000000000..4238624854 --- /dev/null +++ b/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.mutter.pop-shell.gschema.override @@ -0,0 +1,7 @@ +[org.gnome.mutter:GNOME] +attach-modal-dialogs = false +workspaces-only-on-primary = false + +[org.gnome.mutter.keybindings] +toggle-tiled-left = ['Left', 'KP_Left', 'h'] +toggle-tiled-right = ['Right', 'KP_Right', 'l'] diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.mutter.wayland.pop-shell.gschema.override b/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.mutter.wayland.pop-shell.gschema.override new file mode 100644 index 0000000000..18566ed983 --- /dev/null +++ b/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.mutter.wayland.pop-shell.gschema.override @@ -0,0 +1,2 @@ +[org.gnome.mutter.wayland.keybindings] +restore-shortcuts = [] diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.settings-daemon.plugins.media-keys.pop-shell.gschema.override b/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.settings-daemon.plugins.media-keys.pop-shell.gschema.override new file mode 100644 index 0000000000..bee7aa9219 --- /dev/null +++ b/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.settings-daemon.plugins.media-keys.pop-shell.gschema.override @@ -0,0 +1,6 @@ +[org.gnome.settings-daemon.plugins.media-keys] +email = ['e'] +home = ['f'] +screensaver = ['Escape'] +www = ['b'] +rotate-video-lock-static = ['XF86RotationLockToggle'] diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.shell.pop-shell.gschema.override b/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.shell.pop-shell.gschema.override new file mode 100644 index 0000000000..03ba5c5f8b --- /dev/null +++ b/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.shell.pop-shell.gschema.override @@ -0,0 +1,18 @@ +[org.gnome.shell.keybindings] +open-application-menu = [] +shift-overview-down = [] +shift-overview-up = [] +switch-to-application-1 = [] +switch-to-application-2 = [] +switch-to-application-3 = [] +switch-to-application-4 = [] +switch-to-application-5 = [] +switch-to-application-6 = [] +switch-to-application-7 = [] +switch-to-application-8 = [] +switch-to-application-9 = [] +toggle-message-tray = ['v'] + +[org.gnome.shell.overrides] +attach-modal-dialogs = false +workspaces-only-on-primary = false diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/anda.hcl b/anda/desktops/gnome/gnome-shell-extension-pop-shell/anda.hcl new file mode 100644 index 0000000000..8acef3b5c2 --- /dev/null +++ b/anda/desktops/gnome/gnome-shell-extension-pop-shell/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "terra-gnome-shell-extension-pop-shell.spec" + } + labels { + nightly = "1" + } +} diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec b/anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec new file mode 100644 index 0000000000..aea3bb6e3b --- /dev/null +++ b/anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec @@ -0,0 +1,89 @@ +# from Fedora upstream +%global extension pop-shell +%global uuid %{extension}@system76.com +%global commit cf3c932b55d5c247906efe9d81f988ee092d9f51 +%global shortcommit %{lua:print(macros.commit:sub(1,7))} +%global ver 1.2.0 + +Name: terra-gnome-shell-extension-%{extension} +Version: %{ver}^%{shortcommit} +Release: 1%?dist +Summary: GNOME Shell extension for advanced tiling window management +License: GPL-3.0-only +URL: https://github.com/pop-os/shell +BuildArch: noarch + +Source0: %{url}/archive/%{commit}/%{extension}-%{shortcommit}.tar.gz +Source1: 50_org.gnome.desktop.wm.keybindings.%{extension}.gschema.override +Source2: 50_org.gnome.mutter.%{extension}.gschema.override +Source3: 50_org.gnome.mutter.wayland.%{extension}.gschema.override +Source4: 50_org.gnome.settings-daemon.plugins.media-keys.%{extension}.gschema.override +Source5: 50_org.gnome.shell.%{extension}.gschema.override +# downstream-only +Patch0: 0001-Remove-schema-handling-from-transpile.sh.patch + +BuildRequires: typescript >= 3.8 +BuildRequires: make + +Requires: (gnome-shell >= 45~ with gnome-shell < 46~) +Recommends: gnome-extensions-app +Recommends: %{name}-shortcut-overrides = %{version}-%{release} +Provides: %{extension} = %{version}-%{release} + + +%description +Pop Shell is a keyboard-driven layer for GNOME Shell which allows for quick and +sensible navigation and management of windows. The core feature of Pop Shell +is the addition of advanced tiling window management - a feature that has been +highly sought within our community. For many - ourselves included - i3wm has +become the leading competitor to the GNOME desktop. + + +%package shortcut-overrides +Summary: Shortcut overrides for %{name} + + +%description shortcut-overrides +Shortcut overrides for %{name}. + + +%prep +%autosetup -p 1 -n shell-%{commit} + + +%build +%make_build compile + + +%install +# install main extension files +%make_install + +# install the schema file +install -D -p -m 0644 \ + schemas/org.gnome.shell.extensions.%{extension}.gschema.xml \ + %{buildroot}%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.%{extension}.gschema.xml + +# install the gnome-control-center keybindings +install -d -m 0755 %{buildroot}%{_datadir}/gnome-control-center/keybindings +install -p -m 0644 keybindings/*.xml %{buildroot}%{_datadir}/gnome-control-center/keybindings/ + +# install the schema override files +install -d -m 0755 %{buildroot}%{_datadir}/glib-2.0/schemas +install -p -m 0644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{buildroot}%{_datadir}/glib-2.0/schemas/ + + +%files +%license LICENSE +%doc README.md +%{_datadir}/gnome-shell/extensions/%{uuid} +%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.%{extension}.gschema.xml +%{_datadir}/gnome-control-center/keybindings/*.xml + + +%files shortcut-overrides +%{_datadir}/glib-2.0/schemas/*.%{extension}.gschema.override + + +%changelog +%autochangelog diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/update.rhai b/anda/desktops/gnome/gnome-shell-extension-pop-shell/update.rhai new file mode 100644 index 0000000000..5c4ac207fe --- /dev/null +++ b/anda/desktops/gnome/gnome-shell-extension-pop-shell/update.rhai @@ -0,0 +1,4 @@ +if filters.contains("nightly") { + rpm.global("commit", get("https://api.github.com/repos/pop-os/shell/commits/HEAD").json().sha); + rpm.global("ver", gh("pop-os/shell")); +} diff --git a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec index 0ca9dc84db..8c2714f839 100644 --- a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec +++ b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/KDE/latte-dock/ -%global commit 755676d75272b51202bf31409ee013bc612a7f69 +%global commit 8d64858029e556cc83e0a413537630ee8735162c %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date %(date '+%Y%m%d') %global snapshot_info %{commit_date}.%{shortcommit} diff --git a/anda/lib/lomiri-api/anda.hcl b/anda/desktops/lomiri-unity/lomiri-api/anda.hcl similarity index 100% rename from anda/lib/lomiri-api/anda.hcl rename to anda/desktops/lomiri-unity/lomiri-api/anda.hcl diff --git a/anda/lib/lomiri-api/lomiri-api.spec b/anda/desktops/lomiri-unity/lomiri-api/lomiri-api.spec similarity index 100% rename from anda/lib/lomiri-api/lomiri-api.spec rename to anda/desktops/lomiri-unity/lomiri-api/lomiri-api.spec diff --git a/anda/lib/lomiri-api/update.rhai b/anda/desktops/lomiri-unity/lomiri-api/update.rhai similarity index 100% rename from anda/lib/lomiri-api/update.rhai rename to anda/desktops/lomiri-unity/lomiri-api/update.rhai diff --git a/anda/lib/lomiri-app-launch/anda.hcl b/anda/desktops/lomiri-unity/lomiri-app-launch/anda.hcl similarity index 100% rename from anda/lib/lomiri-app-launch/anda.hcl rename to anda/desktops/lomiri-unity/lomiri-app-launch/anda.hcl diff --git a/anda/lib/lomiri-app-launch/lomiri-app-launch.spec b/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec similarity index 97% rename from anda/lib/lomiri-app-launch/lomiri-app-launch.spec rename to anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec index 3420f74c0e..3caa745e7d 100644 --- a/anda/lib/lomiri-app-launch/lomiri-app-launch.spec +++ b/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch -%global commit fc4bfff014a3b83640d0fca787aeefc84c055614 +%global commit 1a7a0ef6a8ab966b664f3515aba539b422f35849 %forgemeta Name: lomiri-app-launch diff --git a/anda/lib/lomiri-app-launch/update.rhai b/anda/desktops/lomiri-unity/lomiri-app-launch/update.rhai similarity index 100% rename from anda/lib/lomiri-app-launch/update.rhai rename to anda/desktops/lomiri-unity/lomiri-app-launch/update.rhai diff --git a/anda/lib/lomiri-download-manager/anda.hcl b/anda/desktops/lomiri-unity/lomiri-download-manager/anda.hcl similarity index 100% rename from anda/lib/lomiri-download-manager/anda.hcl rename to anda/desktops/lomiri-unity/lomiri-download-manager/anda.hcl diff --git a/anda/lib/lomiri-download-manager/lomiri-download-manager.spec b/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec similarity index 100% rename from anda/lib/lomiri-download-manager/lomiri-download-manager.spec rename to anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec diff --git a/anda/lib/lomiri-indicator-network/anda.hcl b/anda/desktops/lomiri-unity/lomiri-indicator-network/anda.hcl similarity index 100% rename from anda/lib/lomiri-indicator-network/anda.hcl rename to anda/desktops/lomiri-unity/lomiri-indicator-network/anda.hcl diff --git a/anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec b/anda/desktops/lomiri-unity/lomiri-indicator-network/lomiri-indicator-network.spec similarity index 97% rename from anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec rename to anda/desktops/lomiri-unity/lomiri-indicator-network/lomiri-indicator-network.spec index 768f6eb8f7..1766b5074b 100644 --- a/anda/lib/lomiri-indicator-network/lomiri-indicator-network.spec +++ b/anda/desktops/lomiri-unity/lomiri-indicator-network/lomiri-indicator-network.spec @@ -1,9 +1,9 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-indicator-network -%global commit ac0ae8ec8968c934f81c2664879ab10f76ab0fc2 +%global commit 7d0fd44108cfb74da3fcb26e7de07f7610302f5c %forgemeta Name: lomiri-indicator-network -Version: 1.0.0 +Version: 1.0.1 Release: %autorelease Summary: The Network indicator for Ubuntu Touch License: GPL-3.0 AND LGPL-3.0 diff --git a/anda/desktops/lomiri-unity/lomiri-indicator-network/update.rhai b/anda/desktops/lomiri-unity/lomiri-indicator-network/update.rhai new file mode 100644 index 0000000000..297a4e1eeb --- /dev/null +++ b/anda/desktops/lomiri-unity/lomiri-indicator-network/update.rhai @@ -0,0 +1,7 @@ +let o = get("https://gitlab.com/api/v4/projects/31038307/repository/tags").json_arr()[0]; +let f = rpm.f; +rpm.version(o.name); +// check if changed +if rpm.f != f { + rpm.global("commit", o.commit.id); +} diff --git a/anda/lib/lomiri-settings-components/anda.hcl b/anda/desktops/lomiri-unity/lomiri-settings-components/anda.hcl similarity index 100% rename from anda/lib/lomiri-settings-components/anda.hcl rename to anda/desktops/lomiri-unity/lomiri-settings-components/anda.hcl diff --git a/anda/lib/lomiri-settings-components/lomiri-settings-components.spec b/anda/desktops/lomiri-unity/lomiri-settings-components/lomiri-settings-components.spec similarity index 93% rename from anda/lib/lomiri-settings-components/lomiri-settings-components.spec rename to anda/desktops/lomiri-unity/lomiri-settings-components/lomiri-settings-components.spec index 83431340f8..00cbb0027c 100644 --- a/anda/lib/lomiri-settings-components/lomiri-settings-components.spec +++ b/anda/desktops/lomiri-unity/lomiri-settings-components/lomiri-settings-components.spec @@ -1,9 +1,9 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-settings-components -%global commit 5041243d56fb7aaab270b4d07284687ec33f75c6 +%global commit a2ce1155d385218a4b493f801867a45d2a41df02 %forgemeta Name: lomiri-settings-components -Version: 1.0.1 +Version: 1.1.0 Release: %autorelease Summary: The system settings components for Lomiri License: GPLv3 AND LGPLv3 diff --git a/anda/desktops/lomiri-unity/lomiri-settings-components/update.rhai b/anda/desktops/lomiri-unity/lomiri-settings-components/update.rhai new file mode 100644 index 0000000000..a58f909140 --- /dev/null +++ b/anda/desktops/lomiri-unity/lomiri-settings-components/update.rhai @@ -0,0 +1,7 @@ +let o = get("https://gitlab.com/api/v4/projects/25770169/repository/tags").json_arr()[0]; +let f = rpm.f; +rpm.version(o.name); +// check if changed +if rpm.f != f { + rpm.global("commit", o.commit.id); +} diff --git a/anda/apps/lomiri-system-settings/anda.hcl b/anda/desktops/lomiri-unity/lomiri-system-settings/anda.hcl similarity index 100% rename from anda/apps/lomiri-system-settings/anda.hcl rename to anda/desktops/lomiri-unity/lomiri-system-settings/anda.hcl diff --git a/anda/apps/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec similarity index 98% rename from anda/apps/lomiri-system-settings/lomiri-system-settings.spec rename to anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 44f7e9c29e..2e455d0084 100644 --- a/anda/apps/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 87ffe4bf29b3b220f66e34611f381e0d15054a89 +%global commit 745a715f40ee8c0392986531594ec00f00d4a4d9 %forgemeta Name: lomiri-system-settings diff --git a/anda/apps/lomiri-system-settings/update.rhai b/anda/desktops/lomiri-unity/lomiri-system-settings/update.rhai similarity index 100% rename from anda/apps/lomiri-system-settings/update.rhai rename to anda/desktops/lomiri-unity/lomiri-system-settings/update.rhai diff --git a/anda/lib/lomiri-ui-toolkit/anda.hcl b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/anda.hcl similarity index 100% rename from anda/lib/lomiri-ui-toolkit/anda.hcl rename to anda/desktops/lomiri-unity/lomiri-ui-toolkit/anda.hcl diff --git a/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec similarity index 98% rename from anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec rename to anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec index 4b84a4a3a1..99d37bfd9f 100644 --- a/anda/lib/lomiri-ui-toolkit/lomiri-ui-toolkit.spec +++ b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit -%global commit c8062dca48c6ce3fc26a243f0641e4f0ed4b6e3a +%global commit f94a659f0c7588de7e61173b5301af325d9936ea %forgemeta Name: lomiri-ui-toolkit diff --git a/anda/lib/lomiri-ui-toolkit/update.rhai b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/update.rhai similarity index 100% rename from anda/lib/lomiri-ui-toolkit/update.rhai rename to anda/desktops/lomiri-unity/lomiri-ui-toolkit/update.rhai diff --git a/anda/lib/lomiri-url-dispatcher/anda.hcl b/anda/desktops/lomiri-unity/lomiri-url-dispatcher/anda.hcl similarity index 100% rename from anda/lib/lomiri-url-dispatcher/anda.hcl rename to anda/desktops/lomiri-unity/lomiri-url-dispatcher/anda.hcl diff --git a/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec b/anda/desktops/lomiri-unity/lomiri-url-dispatcher/lomiri-url-dispatcher.spec similarity index 98% rename from anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec rename to anda/desktops/lomiri-unity/lomiri-url-dispatcher/lomiri-url-dispatcher.spec index bda29ec7d1..8181cc05ce 100644 --- a/anda/lib/lomiri-url-dispatcher/lomiri-url-dispatcher.spec +++ b/anda/desktops/lomiri-unity/lomiri-url-dispatcher/lomiri-url-dispatcher.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-url-dispatcher -%global commit 1ac312239a088e5a797b786a22bec42cb0037039 +%global commit 6b6f2277e2a63fe0893c1fddd1cc75da5da87eb7 %forgemeta Name: lomiri-url-dispatcher diff --git a/anda/lib/lomiri-url-dispatcher/update.rhai b/anda/desktops/lomiri-unity/lomiri-url-dispatcher/update.rhai similarity index 100% rename from anda/lib/lomiri-url-dispatcher/update.rhai rename to anda/desktops/lomiri-unity/lomiri-url-dispatcher/update.rhai diff --git a/anda/desktops/lomiri/0001-Add-support-for-both-older-qtmir-and-newer-qtmir-wit.patch b/anda/desktops/lomiri-unity/lomiri/0001-Add-support-for-both-older-qtmir-and-newer-qtmir-wit.patch similarity index 100% rename from anda/desktops/lomiri/0001-Add-support-for-both-older-qtmir-and-newer-qtmir-wit.patch rename to anda/desktops/lomiri-unity/lomiri/0001-Add-support-for-both-older-qtmir-and-newer-qtmir-wit.patch diff --git a/anda/desktops/lomiri/anda.hcl b/anda/desktops/lomiri-unity/lomiri/anda.hcl similarity index 100% rename from anda/desktops/lomiri/anda.hcl rename to anda/desktops/lomiri-unity/lomiri/anda.hcl diff --git a/anda/desktops/lomiri/lomiri.spec b/anda/desktops/lomiri-unity/lomiri/lomiri.spec similarity index 99% rename from anda/desktops/lomiri/lomiri.spec rename to anda/desktops/lomiri-unity/lomiri/lomiri.spec index 0385bc0161..61263a28f8 100644 --- a/anda/desktops/lomiri/lomiri.spec +++ b/anda/desktops/lomiri-unity/lomiri/lomiri.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri -%global commit de472d04a682e1dc3d317c94b08a14facdf673e7 +%global commit ecd34e0588e7a69e1de19f66e261484803abb205 %forgemeta Name: lomiri diff --git a/anda/desktops/lomiri/update.rhai b/anda/desktops/lomiri-unity/lomiri/update.rhai similarity index 100% rename from anda/desktops/lomiri/update.rhai rename to anda/desktops/lomiri-unity/lomiri/update.rhai diff --git a/anda/others/unity-greeter/0001-Remove-libido.patch b/anda/desktops/lomiri-unity/unity-greeter/0001-Remove-libido.patch similarity index 100% rename from anda/others/unity-greeter/0001-Remove-libido.patch rename to anda/desktops/lomiri-unity/unity-greeter/0001-Remove-libido.patch diff --git a/anda/others/unity-greeter/anda.hcl b/anda/desktops/lomiri-unity/unity-greeter/anda.hcl similarity index 100% rename from anda/others/unity-greeter/anda.hcl rename to anda/desktops/lomiri-unity/unity-greeter/anda.hcl diff --git a/anda/others/unity-greeter/unity-greeter.spec b/anda/desktops/lomiri-unity/unity-greeter/unity-greeter.spec similarity index 100% rename from anda/others/unity-greeter/unity-greeter.spec rename to anda/desktops/lomiri-unity/unity-greeter/unity-greeter.spec diff --git a/anda/others/unity-greeter/update.rhai b/anda/desktops/lomiri-unity/unity-greeter/update.rhai similarity index 100% rename from anda/others/unity-greeter/update.rhai rename to anda/desktops/lomiri-unity/unity-greeter/update.rhai diff --git a/anda/others/unity-scope-home/anda.hcl b/anda/desktops/lomiri-unity/unity-scope-home/anda.hcl similarity index 100% rename from anda/others/unity-scope-home/anda.hcl rename to anda/desktops/lomiri-unity/unity-scope-home/anda.hcl diff --git a/anda/others/unity-scope-home/unity-scope-home.spec b/anda/desktops/lomiri-unity/unity-scope-home/unity-scope-home.spec similarity index 100% rename from anda/others/unity-scope-home/unity-scope-home.spec rename to anda/desktops/lomiri-unity/unity-scope-home/unity-scope-home.spec diff --git a/anda/others/unity-session/anda.hcl b/anda/desktops/lomiri-unity/unity-session/anda.hcl similarity index 100% rename from anda/others/unity-session/anda.hcl rename to anda/desktops/lomiri-unity/unity-session/anda.hcl diff --git a/anda/others/unity-session/unity-session.spec b/anda/desktops/lomiri-unity/unity-session/unity-session.spec similarity index 100% rename from anda/others/unity-session/unity-session.spec rename to anda/desktops/lomiri-unity/unity-session/unity-session.spec diff --git a/anda/others/unity-session/update.rhai b/anda/desktops/lomiri-unity/unity-session/update.rhai similarity index 100% rename from anda/others/unity-session/update.rhai rename to anda/desktops/lomiri-unity/unity-session/update.rhai diff --git a/anda/lib/unity-settings-daemon/anda.hcl b/anda/desktops/lomiri-unity/unity-settings-daemon/anda.hcl similarity index 100% rename from anda/lib/unity-settings-daemon/anda.hcl rename to anda/desktops/lomiri-unity/unity-settings-daemon/anda.hcl diff --git a/anda/lib/unity-settings-daemon/unity-settings-daemon.1 b/anda/desktops/lomiri-unity/unity-settings-daemon/unity-settings-daemon.1 similarity index 100% rename from anda/lib/unity-settings-daemon/unity-settings-daemon.1 rename to anda/desktops/lomiri-unity/unity-settings-daemon/unity-settings-daemon.1 diff --git a/anda/lib/unity-settings-daemon/unity-settings-daemon.service b/anda/desktops/lomiri-unity/unity-settings-daemon/unity-settings-daemon.service similarity index 100% rename from anda/lib/unity-settings-daemon/unity-settings-daemon.service rename to anda/desktops/lomiri-unity/unity-settings-daemon/unity-settings-daemon.service diff --git a/anda/lib/unity-settings-daemon/unity-settings-daemon.spec b/anda/desktops/lomiri-unity/unity-settings-daemon/unity-settings-daemon.spec similarity index 100% rename from anda/lib/unity-settings-daemon/unity-settings-daemon.spec rename to anda/desktops/lomiri-unity/unity-settings-daemon/unity-settings-daemon.spec diff --git a/anda/desktops/unity-shell/0001-Remove-xpathselect-dependency.patch b/anda/desktops/lomiri-unity/unity-shell/0001-Remove-xpathselect-dependency.patch similarity index 100% rename from anda/desktops/unity-shell/0001-Remove-xpathselect-dependency.patch rename to anda/desktops/lomiri-unity/unity-shell/0001-Remove-xpathselect-dependency.patch diff --git a/anda/desktops/unity-shell/0002-Remove-ido-dependency.patch b/anda/desktops/lomiri-unity/unity-shell/0002-Remove-ido-dependency.patch similarity index 100% rename from anda/desktops/unity-shell/0002-Remove-ido-dependency.patch rename to anda/desktops/lomiri-unity/unity-shell/0002-Remove-ido-dependency.patch diff --git a/anda/desktops/unity-shell/0003-Remove-social-scope.patch b/anda/desktops/lomiri-unity/unity-shell/0003-Remove-social-scope.patch similarity index 100% rename from anda/desktops/unity-shell/0003-Remove-social-scope.patch rename to anda/desktops/lomiri-unity/unity-shell/0003-Remove-social-scope.patch diff --git a/anda/desktops/unity-shell/anda.hcl b/anda/desktops/lomiri-unity/unity-shell/anda.hcl similarity index 100% rename from anda/desktops/unity-shell/anda.hcl rename to anda/desktops/lomiri-unity/unity-shell/anda.hcl diff --git a/anda/desktops/unity-shell/unity-shell.spec b/anda/desktops/lomiri-unity/unity-shell/unity-shell.spec similarity index 99% rename from anda/desktops/unity-shell/unity-shell.spec rename to anda/desktops/lomiri-unity/unity-shell/unity-shell.spec index 47f233e22b..ebe040278a 100644 --- a/anda/desktops/unity-shell/unity-shell.spec +++ b/anda/desktops/lomiri-unity/unity-shell/unity-shell.spec @@ -2,7 +2,7 @@ Name: unity-shell Version: 7.7.0 -Release: %autorelease +Release: 1%?dist Summary: Unity is a shell that sings License: GPL-3.0-or-later diff --git a/anda/desktops/unity-shell/update.rhai b/anda/desktops/lomiri-unity/unity-shell/update.rhai similarity index 100% rename from anda/desktops/unity-shell/update.rhai rename to anda/desktops/lomiri-unity/unity-shell/update.rhai diff --git a/anda/desktops/unityx-shell/0001-Remove-social-scope.patch b/anda/desktops/lomiri-unity/unityx-shell/0001-Remove-social-scope.patch similarity index 100% rename from anda/desktops/unityx-shell/0001-Remove-social-scope.patch rename to anda/desktops/lomiri-unity/unityx-shell/0001-Remove-social-scope.patch diff --git a/anda/desktops/unityx-shell/anda.hcl b/anda/desktops/lomiri-unity/unityx-shell/anda.hcl similarity index 100% rename from anda/desktops/unityx-shell/anda.hcl rename to anda/desktops/lomiri-unity/unityx-shell/anda.hcl diff --git a/anda/desktops/unityx-shell/unityx-shell.spec b/anda/desktops/lomiri-unity/unityx-shell/unityx-shell.spec similarity index 99% rename from anda/desktops/unityx-shell/unityx-shell.spec rename to anda/desktops/lomiri-unity/unityx-shell/unityx-shell.spec index 2c52fd5bac..08f800c1ac 100644 --- a/anda/desktops/unityx-shell/unityx-shell.spec +++ b/anda/desktops/lomiri-unity/unityx-shell/unityx-shell.spec @@ -6,7 +6,7 @@ Name: unityx-shell Version: 1.7.7 -Release: 2%?dist +Release: 1%?dist Summary: UnityX is a smaller shell based on Unity7 License: GPL-3.0 AND LGPL-3.0 diff --git a/anda/lib/ayatana-indicator-datetime/anda.hcl b/anda/desktops/mate/indicators/datetime/anda.hcl similarity index 100% rename from anda/lib/ayatana-indicator-datetime/anda.hcl rename to anda/desktops/mate/indicators/datetime/anda.hcl diff --git a/anda/lib/ayatana-indicator-datetime/ayatana-indicator-datetime.spec b/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec similarity index 100% rename from anda/lib/ayatana-indicator-datetime/ayatana-indicator-datetime.spec rename to anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec diff --git a/anda/lib/ayatana-indicator-datetime/update.rhai b/anda/desktops/mate/indicators/datetime/update.rhai similarity index 100% rename from anda/lib/ayatana-indicator-datetime/update.rhai rename to anda/desktops/mate/indicators/datetime/update.rhai diff --git a/anda/lib/ayatana-indicator-messages/anda.hcl b/anda/desktops/mate/indicators/messages/anda.hcl similarity index 100% rename from anda/lib/ayatana-indicator-messages/anda.hcl rename to anda/desktops/mate/indicators/messages/anda.hcl diff --git a/anda/lib/ayatana-indicator-messages/ayatana-indicator-messages.spec b/anda/desktops/mate/indicators/messages/ayatana-indicator-messages.spec similarity index 100% rename from anda/lib/ayatana-indicator-messages/ayatana-indicator-messages.spec rename to anda/desktops/mate/indicators/messages/ayatana-indicator-messages.spec diff --git a/anda/lib/ayatana-indicator-messages/update.rhai b/anda/desktops/mate/indicators/messages/update.rhai similarity index 100% rename from anda/lib/ayatana-indicator-messages/update.rhai rename to anda/desktops/mate/indicators/messages/update.rhai diff --git a/anda/indicators/ayatana-indicator-notifications/anda.hcl b/anda/desktops/mate/indicators/notifications/anda.hcl similarity index 100% rename from anda/indicators/ayatana-indicator-notifications/anda.hcl rename to anda/desktops/mate/indicators/notifications/anda.hcl diff --git a/anda/indicators/ayatana-indicator-notifications/ayatana-indicator-notifications.spec b/anda/desktops/mate/indicators/notifications/ayatana-indicator-notifications.spec similarity index 100% rename from anda/indicators/ayatana-indicator-notifications/ayatana-indicator-notifications.spec rename to anda/desktops/mate/indicators/notifications/ayatana-indicator-notifications.spec diff --git a/anda/indicators/ayatana-indicator-notifications/update.rhai b/anda/desktops/mate/indicators/notifications/update.rhai similarity index 100% rename from anda/indicators/ayatana-indicator-notifications/update.rhai rename to anda/desktops/mate/indicators/notifications/update.rhai diff --git a/anda/indicators/ayatana-indicator-session/0001-fix-tests-import-cstdint.patch b/anda/desktops/mate/indicators/session/0001-fix-tests-import-cstdint.patch similarity index 100% rename from anda/indicators/ayatana-indicator-session/0001-fix-tests-import-cstdint.patch rename to anda/desktops/mate/indicators/session/0001-fix-tests-import-cstdint.patch diff --git a/anda/indicators/ayatana-indicator-session/anda.hcl b/anda/desktops/mate/indicators/session/anda.hcl similarity index 100% rename from anda/indicators/ayatana-indicator-session/anda.hcl rename to anda/desktops/mate/indicators/session/anda.hcl diff --git a/anda/indicators/ayatana-indicator-session/ayatana-indicator-session.spec b/anda/desktops/mate/indicators/session/ayatana-indicator-session.spec similarity index 97% rename from anda/indicators/ayatana-indicator-session/ayatana-indicator-session.spec rename to anda/desktops/mate/indicators/session/ayatana-indicator-session.spec index 6f44975ab6..c53dda622d 100644 --- a/anda/indicators/ayatana-indicator-session/ayatana-indicator-session.spec +++ b/anda/desktops/mate/indicators/session/ayatana-indicator-session.spec @@ -1,6 +1,6 @@ Name: ayatana-indicator-session Summary: Ayatana Indicator Session Applet -Version: 23.10.2 +Version: 23.10.3 Release: 1%{?dist} License: GPL-3.0 URL: https://github.com/AyatanaIndicators/ayatana-indicator-session @@ -18,6 +18,7 @@ BuildRequires: pkgconfig(dbustest-1) BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(rda) BuildRequires: intltool %description diff --git a/anda/indicators/ayatana-indicator-session/update.rhai b/anda/desktops/mate/indicators/session/update.rhai similarity index 100% rename from anda/indicators/ayatana-indicator-session/update.rhai rename to anda/desktops/mate/indicators/session/update.rhai diff --git a/anda/indicators/ayatana-indicator-sound/anda.hcl b/anda/desktops/mate/indicators/sound/anda.hcl similarity index 100% rename from anda/indicators/ayatana-indicator-sound/anda.hcl rename to anda/desktops/mate/indicators/sound/anda.hcl diff --git a/anda/indicators/ayatana-indicator-sound/ayatana-indicator-sound.spec b/anda/desktops/mate/indicators/sound/ayatana-indicator-sound.spec similarity index 100% rename from anda/indicators/ayatana-indicator-sound/ayatana-indicator-sound.spec rename to anda/desktops/mate/indicators/sound/ayatana-indicator-sound.spec diff --git a/anda/indicators/ayatana-indicator-sound/update.rhai b/anda/desktops/mate/indicators/sound/update.rhai similarity index 100% rename from anda/indicators/ayatana-indicator-sound/update.rhai rename to anda/desktops/mate/indicators/sound/update.rhai diff --git a/anda/desktops/mate/tweak/mate-tweak.spec b/anda/desktops/mate/tweak/mate-tweak.spec index 69f0099d3b..3a84b0eea5 100644 --- a/anda/desktops/mate/tweak/mate-tweak.spec +++ b/anda/desktops/mate/tweak/mate-tweak.spec @@ -2,7 +2,7 @@ Name: mate-tweak Version: 22.10.0 -Release: 1%?dist +Release: 2%?dist Summary: Tweak tool for the MATE Desktop License: GPL-2.0 URL: https://github.com/ubuntu-mate/mate-tweak @@ -39,9 +39,9 @@ desktop-file-validate %buildroot%_datadir/applications/*.desktop %_datadir/applications/%name.desktop %_datadir/applications/marco-{glx,no-composite,xr_glx_hybrid,xrender}.desktop %_datadir/polkit-1/actions/org.mate.%name.policy -%ghost %_prefix/lib/python3.11/site-packages/__pycache__ -%ghost %_prefix/lib/python3.11/site-packages/setup.py -%ghost %_prefix/lib/python3.11/site-packages/mate_tweak-%version-py%python3_version.egg-info/ +%ghost %_prefix/lib/python3.*/site-packages/__pycache__ +%ghost %_prefix/lib/python3.*/site-packages/setup.py +%ghost %_prefix/lib/python3.*/site-packages/mate_tweak-%version-py3.*.egg-info/ %changelog %autochangelog diff --git a/anda/tools/blueprint-compiler/anda.hcl b/anda/devs/blueprint-compiler/anda.hcl similarity index 100% rename from anda/tools/blueprint-compiler/anda.hcl rename to anda/devs/blueprint-compiler/anda.hcl diff --git a/anda/tools/blueprint-compiler/terra-blueprint-compiler.spec b/anda/devs/blueprint-compiler/terra-blueprint-compiler.spec similarity index 100% rename from anda/tools/blueprint-compiler/terra-blueprint-compiler.spec rename to anda/devs/blueprint-compiler/terra-blueprint-compiler.spec diff --git a/anda/tools/blueprint-compiler/update.rhai b/anda/devs/blueprint-compiler/update.rhai similarity index 100% rename from anda/tools/blueprint-compiler/update.rhai rename to anda/devs/blueprint-compiler/update.rhai diff --git a/anda/tools/codium/anda.hcl b/anda/devs/codium/anda.hcl similarity index 100% rename from anda/tools/codium/anda.hcl rename to anda/devs/codium/anda.hcl diff --git a/anda/tools/codium/codium.spec b/anda/devs/codium/codium.spec similarity index 99% rename from anda/tools/codium/codium.spec rename to anda/devs/codium/codium.spec index 6989389df8..d0994f4177 100644 --- a/anda/tools/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.84.2.23314 +Version: 1.85.1.23348 Release: 1%{?dist} Summary: Code editing. Redefined. License: MIT diff --git a/anda/tools/codium/update.rhai b/anda/devs/codium/update.rhai similarity index 100% rename from anda/tools/codium/update.rhai rename to anda/devs/codium/update.rhai diff --git a/anda/apps/flutter/anda.hcl b/anda/devs/flutter/anda.hcl similarity index 100% rename from anda/apps/flutter/anda.hcl rename to anda/devs/flutter/anda.hcl diff --git a/anda/apps/flutter/flutter.spec b/anda/devs/flutter/flutter.spec similarity index 88% rename from anda/apps/flutter/flutter.spec rename to anda/devs/flutter/flutter.spec index b72cf549fe..f7e7f4213d 100644 --- a/anda/apps/flutter/flutter.spec +++ b/anda/devs/flutter/flutter.spec @@ -1,11 +1,12 @@ Name: flutter -Version: 3.16.0.0.5.pre +Version: 3.16.5 Release: 1%{?dist} Summary: SDK for crafting beautiful, fast user experiences from a single codebase License: BSD-3-Clause URL: https://flutter.dev +Group: Development/Building Source0: https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_%version-stable.tar.xz -Requires: bash curl git file which zip xz-utils +Requires: bash curl git file which zip xz Recommends: mesa-libGLU %description diff --git a/anda/apps/flutter/update.rhai b/anda/devs/flutter/update.rhai similarity index 100% rename from anda/apps/flutter/update.rhai rename to anda/devs/flutter/update.rhai diff --git a/anda/rust/neovide/anda.hcl b/anda/devs/neovide/anda.hcl similarity index 100% rename from anda/rust/neovide/anda.hcl rename to anda/devs/neovide/anda.hcl diff --git a/anda/rust/neovide/neovide.spec b/anda/devs/neovide/neovide.spec similarity index 93% rename from anda/rust/neovide/neovide.spec rename to anda/devs/neovide/neovide.spec index a60536edd3..0eeaca47d5 100644 --- a/anda/rust/neovide/neovide.spec +++ b/anda/devs/neovide/neovide.spec @@ -1,7 +1,7 @@ %define debug_package %nil Name: neovide -Version: 0.11.2 +Version: 0.12.0 Release: 1%{?dist} Summary: No Nonsense Neovim Client in Rust License: MIT @@ -27,7 +27,7 @@ but functionally it should act like the terminal UI. %install %cargo_install -install -Dm755 -t %buildroot%_bindir target/release/%name +%dnl install -Dm755 -t %buildroot%_bindir target/rpm/%name install -Dm644 -t %buildroot%_datadir/applications/ assets/%name.desktop for px in 16 32 48 256; do install -Dm644 assets/%name-${px}x${px}.png %buildroot%_datadir/icons/hicolor/${px}x${px}/apps/%name.png diff --git a/anda/rust/neovide/update.rhai b/anda/devs/neovide/update.rhai similarity index 100% rename from anda/rust/neovide/update.rhai rename to anda/devs/neovide/update.rhai diff --git a/anda/docker/containerd/.gitignore b/anda/docker/containerd/.gitignore new file mode 100644 index 0000000000..cd976ef07f --- /dev/null +++ b/anda/docker/containerd/.gitignore @@ -0,0 +1,2 @@ +containerd-*.tar.gz +clog diff --git a/anda/docker/containerd/0001-Add-reaper-StartLocked.patch b/anda/docker/containerd/0001-Add-reaper-StartLocked.patch new file mode 100644 index 0000000000..610ec0005d --- /dev/null +++ b/anda/docker/containerd/0001-Add-reaper-StartLocked.patch @@ -0,0 +1,33 @@ +From 788f2f928c1d0099d3861553bf82e83169811a29 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Tue, 1 Nov 2022 22:09:38 +0100 +Subject: [PATCH] Add reaper StartLocked + +--- + sys/reaper/reaper_unix.go | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/sys/reaper/reaper_unix.go b/sys/reaper/reaper_unix.go +index 6c4f13b90..a6d6a1e77 100644 +--- a/sys/reaper/reaper_unix.go ++++ b/sys/reaper/reaper_unix.go +@@ -101,6 +101,16 @@ func (m *Monitor) Start(c *exec.Cmd) (chan runc.Exit, error) { + return ec, nil + } + ++// StartLocked starts the command a registers the process with the reaper ++func (m *Monitor) StartLocked(c *exec.Cmd) (chan runc.Exit, error) { ++ ec := m.Subscribe() ++ if err := c.Start(); err != nil { ++ m.Unsubscribe(ec) ++ return nil, err ++ } ++ return ec, nil ++} ++ + // Wait blocks until a process is signal as dead. + // User should rely on the value of the exit status to determine if the + // command was successful or not. +-- +2.38.1 + diff --git a/anda/docker/containerd/0001-Revert-commit-for-Windows-metrics.patch b/anda/docker/containerd/0001-Revert-commit-for-Windows-metrics.patch new file mode 100644 index 0000000000..568f98ff13 --- /dev/null +++ b/anda/docker/containerd/0001-Revert-commit-for-Windows-metrics.patch @@ -0,0 +1,157 @@ +From beb23ffb0624b40b2ee1bc56730e54943bd3020f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Thu, 1 Oct 2020 07:19:45 +0200 +Subject: [PATCH] Revert commit for Windows metrics +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Robert-André Mauchin +--- + cmd/ctr/commands/tasks/metrics.go | 113 ------------------------------ + 1 file changed, 113 deletions(-) + +diff --git a/cmd/ctr/commands/tasks/metrics.go b/cmd/ctr/commands/tasks/metrics.go +index a83e45ef..f8371401 100644 +--- a/cmd/ctr/commands/tasks/metrics.go ++++ b/cmd/ctr/commands/tasks/metrics.go +@@ -23,9 +23,6 @@ import ( + "os" + "text/tabwriter" + +- wstats "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats" +- v1 "github.com/containerd/cgroups/stats/v1" +- v2 "github.com/containerd/cgroups/v2/stats" + "github.com/containerd/containerd/cmd/ctr/commands" + "github.com/containerd/typeurl" + "github.com/urfave/cli" +@@ -77,42 +74,12 @@ var metricsCommand = cli.Command{ + if err != nil { + return err + } +- var ( +- data *v1.Metrics +- data2 *v2.Metrics +- windowsStats *wstats.Statistics +- ) +- switch v := anydata.(type) { +- case *v1.Metrics: +- data = v +- case *v2.Metrics: +- data2 = v +- case *wstats.Statistics: +- windowsStats = v +- default: +- return errors.New("cannot convert metric data to cgroups.Metrics or windows.Statistics") +- } + + switch context.String(formatFlag) { + case formatTable: + w := tabwriter.NewWriter(os.Stdout, 1, 8, 4, ' ', 0) + fmt.Fprintf(w, "ID\tTIMESTAMP\t\n") + fmt.Fprintf(w, "%s\t%s\t\n\n", metric.ID, metric.Timestamp) +- if data != nil { +- printCgroupMetricsTable(w, data) +- } else if data2 != nil { +- printCgroup2MetricsTable(w, data2) +- } else { +- if windowsStats.GetLinux() != nil { +- printCgroupMetricsTable(w, windowsStats.GetLinux()) +- } else if windowsStats.GetWindows() != nil { +- printWindowsContainerStatistics(w, windowsStats.GetWindows()) +- } +- // Print VM stats if its isolated +- if windowsStats.VM != nil { +- printWindowsVMStatistics(w, windowsStats.VM) +- } +- } + return w.Flush() + case formatJSON: + marshaledJSON, err := json.MarshalIndent(anydata, "", " ") +@@ -126,83 +93,3 @@ var metricsCommand = cli.Command{ + } + }, + } +- +-func printCgroupMetricsTable(w *tabwriter.Writer, data *v1.Metrics) { +- fmt.Fprintf(w, "METRIC\tVALUE\t\n") +- if data.Memory != nil { +- fmt.Fprintf(w, "memory.usage_in_bytes\t%d\t\n", data.Memory.Usage.Usage) +- fmt.Fprintf(w, "memory.limit_in_bytes\t%d\t\n", data.Memory.Usage.Limit) +- fmt.Fprintf(w, "memory.stat.cache\t%d\t\n", data.Memory.TotalCache) +- } +- if data.CPU != nil { +- fmt.Fprintf(w, "cpuacct.usage\t%d\t\n", data.CPU.Usage.Total) +- fmt.Fprintf(w, "cpuacct.usage_percpu\t%v\t\n", data.CPU.Usage.PerCPU) +- } +- if data.Pids != nil { +- fmt.Fprintf(w, "pids.current\t%v\t\n", data.Pids.Current) +- fmt.Fprintf(w, "pids.limit\t%v\t\n", data.Pids.Limit) +- } +-} +- +-func printCgroup2MetricsTable(w *tabwriter.Writer, data *v2.Metrics) { +- fmt.Fprintf(w, "METRIC\tVALUE\t\n") +- if data.Pids != nil { +- fmt.Fprintf(w, "pids.current\t%v\t\n", data.Pids.Current) +- fmt.Fprintf(w, "pids.limit\t%v\t\n", data.Pids.Limit) +- } +- if data.CPU != nil { +- fmt.Fprintf(w, "cpu.usage_usec\t%v\t\n", data.CPU.UsageUsec) +- fmt.Fprintf(w, "cpu.user_usec\t%v\t\n", data.CPU.UserUsec) +- fmt.Fprintf(w, "cpu.system_usec\t%v\t\n", data.CPU.SystemUsec) +- fmt.Fprintf(w, "cpu.nr_periods\t%v\t\n", data.CPU.NrPeriods) +- fmt.Fprintf(w, "cpu.nr_throttled\t%v\t\n", data.CPU.NrThrottled) +- fmt.Fprintf(w, "cpu.throttled_usec\t%v\t\n", data.CPU.ThrottledUsec) +- } +- if data.Memory != nil { +- fmt.Fprintf(w, "memory.usage\t%v\t\n", data.Memory.Usage) +- fmt.Fprintf(w, "memory.usage_limit\t%v\t\n", data.Memory.UsageLimit) +- fmt.Fprintf(w, "memory.swap_usage\t%v\t\n", data.Memory.SwapUsage) +- fmt.Fprintf(w, "memory.swap_limit\t%v\t\n", data.Memory.SwapLimit) +- } +-} +- +-func printWindowsContainerStatistics(w *tabwriter.Writer, stats *wstats.WindowsContainerStatistics) { +- fmt.Fprintf(w, "METRIC\tVALUE\t\n") +- fmt.Fprintf(w, "timestamp\t%s\t\n", stats.Timestamp) +- fmt.Fprintf(w, "start_time\t%s\t\n", stats.ContainerStartTime) +- fmt.Fprintf(w, "uptime_ns\t%d\t\n", stats.UptimeNS) +- if stats.Processor != nil { +- fmt.Fprintf(w, "cpu.total_runtime_ns\t%d\t\n", stats.Processor.TotalRuntimeNS) +- fmt.Fprintf(w, "cpu.runtime_user_ns\t%d\t\n", stats.Processor.RuntimeUserNS) +- fmt.Fprintf(w, "cpu.runtime_kernel_ns\t%d\t\n", stats.Processor.RuntimeKernelNS) +- } +- if stats.Memory != nil { +- fmt.Fprintf(w, "memory.commit_bytes\t%d\t\n", stats.Memory.MemoryUsageCommitBytes) +- fmt.Fprintf(w, "memory.commit_peak_bytes\t%d\t\n", stats.Memory.MemoryUsageCommitPeakBytes) +- fmt.Fprintf(w, "memory.private_working_set_bytes\t%d\t\n", stats.Memory.MemoryUsagePrivateWorkingSetBytes) +- } +- if stats.Storage != nil { +- fmt.Fprintf(w, "storage.read_count_normalized\t%d\t\n", stats.Storage.ReadCountNormalized) +- fmt.Fprintf(w, "storage.read_size_bytes\t%d\t\n", stats.Storage.ReadSizeBytes) +- fmt.Fprintf(w, "storage.write_count_normalized\t%d\t\n", stats.Storage.WriteCountNormalized) +- fmt.Fprintf(w, "storage.write_size_bytes\t%d\t\n", stats.Storage.WriteSizeBytes) +- } +-} +- +-func printWindowsVMStatistics(w *tabwriter.Writer, stats *wstats.VirtualMachineStatistics) { +- fmt.Fprintf(w, "METRIC\tVALUE\t\n") +- if stats.Processor != nil { +- fmt.Fprintf(w, "vm.cpu.total_runtime_ns\t%d\t\n", stats.Processor.TotalRuntimeNS) +- } +- if stats.Memory != nil { +- fmt.Fprintf(w, "vm.memory.working_set_bytes\t%d\t\n", stats.Memory.WorkingSetBytes) +- fmt.Fprintf(w, "vm.memory.virtual_node_count\t%d\t\n", stats.Memory.VirtualNodeCount) +- fmt.Fprintf(w, "vm.memory.available\t%d\t\n", stats.Memory.VmMemory.AvailableMemory) +- fmt.Fprintf(w, "vm.memory.available_buffer\t%d\t\n", stats.Memory.VmMemory.AvailableMemoryBuffer) +- fmt.Fprintf(w, "vm.memory.reserved\t%d\t\n", stats.Memory.VmMemory.ReservedMemory) +- fmt.Fprintf(w, "vm.memory.assigned\t%d\t\n", stats.Memory.VmMemory.AssignedMemory) +- fmt.Fprintf(w, "vm.memory.slp_active\t%t\t\n", stats.Memory.VmMemory.SlpActive) +- fmt.Fprintf(w, "vm.memory.balancing_enabled\t%t\t\n", stats.Memory.VmMemory.BalancingEnabled) +- fmt.Fprintf(w, "vm.memory.dm_operation_in_progress\t%t\t\n", stats.Memory.VmMemory.DmOperationInProgress) +- } +-} +-- +2.28.0 + diff --git a/anda/docker/containerd/0001-Use-typeurl.Any-instead-of-github.com-gogo-protobuf-.patch b/anda/docker/containerd/0001-Use-typeurl.Any-instead-of-github.com-gogo-protobuf-.patch new file mode 100644 index 0000000000..5577569579 --- /dev/null +++ b/anda/docker/containerd/0001-Use-typeurl.Any-instead-of-github.com-gogo-protobuf-.patch @@ -0,0 +1,1467 @@ +From 92d2d9b8ed28b3918ad902219245b6c737e9dee4 Mon Sep 17 00:00:00 2001 +From: Davanum Srinivas +Date: Fri, 25 Aug 2023 11:11:35 -0400 +Subject: [PATCH] [PATCH] Use typeurl.Any instead of + github.com/gogo/protobuf/types.Any + +This commit upgrades github.com/containerd/typeurl to use typeurl.Any. +The interface hides gogo/protobuf/types.Any from containerd's Go client. + +Signed-off-by: Kazuyoshi Kato +Signed-off-by: Davanum Srinivas +--- + cmd/containerd-shim/main_unix.go | 4 +- + cmd/ctr/commands/containers/containers.go | 2 +- + container.go | 10 +-- + container_checkpoint_opts.go | 8 +-- + container_opts.go | 10 +-- + containers/containers.go | 8 +-- + containerstore.go | 19 ++++-- + events.go | 5 +- + events/events.go | 3 +- + events/exchange/exchange.go | 8 +-- + go.mod | 2 +- + go.sum | 3 +- + integration/client/container_test.go | 8 +-- + integration/client/go.mod | 2 +- + integration/client/go.sum | 3 +- + metadata/boltutil/helpers.go | 21 +++--- + metadata/containers.go | 3 +- + metadata/containers_test.go | 83 ++++++++++++++--------- + metrics/cgroups/metrics_test.go | 6 +- + pkg/cri/server/events.go | 3 +- + pkg/cri/server/helpers.go | 5 +- + pkg/cri/server/helpers_test.go | 13 ++++ + pkg/cri/server/restart.go | 4 +- + protobuf/any.go | 47 +++++++++++++ + protobuf/any_test.go | 26 +++++++ + runtime/runtime.go | 8 +-- + runtime/v1/linux/runtime.go | 9 +-- + runtime/v1/linux/task.go | 4 +- + runtime/v1/shim/service.go | 3 +- + runtime/v2/manager.go | 7 +- + runtime/v2/runc/container.go | 6 +- + runtime/v2/runc/task/service.go | 5 +- + runtime/v2/runc/v1/service.go | 5 +- + runtime/v2/shim.go | 5 +- + runtime/v2/shim/publisher.go | 4 +- + services/containers/helpers.go | 20 ++++-- + services/events/service.go | 3 +- + services/tasks/local.go | 5 +- + task.go | 7 +- + 39 files changed, 270 insertions(+), 127 deletions(-) + create mode 100644 protobuf/any.go + create mode 100644 protobuf/any_test.go + +diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go +index 024611bf3bdf..ef32ae38bb51 100644 +--- a/cmd/containerd-shim/main_unix.go ++++ b/cmd/containerd-shim/main_unix.go +@@ -38,12 +38,12 @@ import ( + "github.com/containerd/containerd/events" + "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/pkg/process" ++ "github.com/containerd/containerd/protobuf" + shimlog "github.com/containerd/containerd/runtime/v1" + "github.com/containerd/containerd/runtime/v1/shim" + shimapi "github.com/containerd/containerd/runtime/v1/shim/v1" + "github.com/containerd/containerd/sys/reaper" + "github.com/containerd/ttrpc" +- "github.com/containerd/typeurl" + ptypes "github.com/gogo/protobuf/types" + "github.com/sirupsen/logrus" + exec "golang.org/x/sys/execabs" +@@ -286,7 +286,7 @@ type remoteEventsPublisher struct { + + func (l *remoteEventsPublisher) Publish(ctx context.Context, topic string, event events.Event) error { + ns, _ := namespaces.Namespace(ctx) +- encoded, err := typeurl.MarshalAny(event) ++ encoded, err := protobuf.MarshalAnyToProto(event) + if err != nil { + return err + } +diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go +index d1025344e0a0..3f2d55d6c10c 100644 +--- a/cmd/ctr/commands/containers/containers.go ++++ b/cmd/ctr/commands/containers/containers.go +@@ -280,7 +280,7 @@ var infoCommand = cli.Command{ + return nil + } + +- if info.Spec != nil && info.Spec.Value != nil { ++ if info.Spec != nil && info.Spec.GetValue() != nil { + v, err := typeurl.UnmarshalAny(info.Spec) + if err != nil { + return err +diff --git a/container.go b/container.go +index 2cf15666f132..8511d863dc1c 100644 +--- a/container.go ++++ b/container.go +@@ -32,10 +32,10 @@ import ( + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/oci" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/fifo" + "github.com/containerd/typeurl" +- prototypes "github.com/gogo/protobuf/types" + ver "github.com/opencontainers/image-spec/specs-go" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" + "github.com/opencontainers/selinux/go-selinux/label" +@@ -74,7 +74,7 @@ type Container interface { + // SetLabels sets the provided labels for the container and returns the final label set + SetLabels(context.Context, map[string]string) (map[string]string, error) + // Extensions returns the extensions set on the container +- Extensions(context.Context) (map[string]prototypes.Any, error) ++ Extensions(context.Context) (map[string]typeurl.Any, error) + // Update a container + Update(context.Context, ...UpdateContainerOpts) error + // Checkpoint creates a checkpoint image of the current container +@@ -120,7 +120,7 @@ func (c *container) Info(ctx context.Context, opts ...InfoOpts) (containers.Cont + return c.metadata, nil + } + +-func (c *container) Extensions(ctx context.Context) (map[string]prototypes.Any, error) { ++func (c *container) Extensions(ctx context.Context) (map[string]typeurl.Any, error) { + r, err := c.get(ctx) + if err != nil { + return nil, err +@@ -163,7 +163,7 @@ func (c *container) Spec(ctx context.Context) (*oci.Spec, error) { + return nil, err + } + var s oci.Spec +- if err := json.Unmarshal(r.Spec.Value, &s); err != nil { ++ if err := json.Unmarshal(r.Spec.GetValue(), &s); err != nil { + return nil, err + } + return &s, nil +@@ -285,7 +285,7 @@ func (c *container) NewTask(ctx context.Context, ioCreate cio.Creator, opts ...N + if err != nil { + return nil, err + } +- request.Options = any ++ request.Options = protobuf.FromAny(any) + } + t := &task{ + client: c.client, +diff --git a/container_checkpoint_opts.go b/container_checkpoint_opts.go +index a64ef618ba62..ee2fa1b977eb 100644 +--- a/container_checkpoint_opts.go ++++ b/container_checkpoint_opts.go +@@ -28,9 +28,9 @@ import ( + "github.com/containerd/containerd/diff" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/platforms" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/rootfs" + "github.com/containerd/containerd/runtime/v2/runc/options" +- "github.com/containerd/typeurl" + imagespec "github.com/opencontainers/image-spec/specs-go/v1" + ) + +@@ -56,7 +56,7 @@ func WithCheckpointImage(ctx context.Context, client *Client, c *containers.Cont + + // WithCheckpointTask includes the running task + func WithCheckpointTask(ctx context.Context, client *Client, c *containers.Container, index *imagespec.Index, copts *options.CheckpointOptions) error { +- any, err := typeurl.MarshalAny(copts) ++ any, err := protobuf.MarshalAnyToProto(copts) + if err != nil { + return nil + } +@@ -97,8 +97,8 @@ func WithCheckpointTask(ctx context.Context, client *Client, c *containers.Conta + + // WithCheckpointRuntime includes the container runtime info + func WithCheckpointRuntime(ctx context.Context, client *Client, c *containers.Container, index *imagespec.Index, copts *options.CheckpointOptions) error { +- if c.Runtime.Options != nil { +- data, err := c.Runtime.Options.Marshal() ++ if c.Runtime.Options != nil && c.Runtime.Options.GetValue() != nil { ++ data, err := protobuf.FromAny(c.Runtime.Options).Marshal() + if err != nil { + return err + } +diff --git a/container_opts.go b/container_opts.go +index 4d630ea6c9d2..f005fe1c7730 100644 +--- a/container_opts.go ++++ b/container_opts.go +@@ -27,9 +27,9 @@ import ( + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/images" + "github.com/containerd/containerd/oci" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/snapshots" + "github.com/containerd/typeurl" +- "github.com/gogo/protobuf/types" + "github.com/opencontainers/image-spec/identity" + v1 "github.com/opencontainers/image-spec/specs-go/v1" + ) +@@ -57,7 +57,7 @@ type InfoConfig struct { + func WithRuntime(name string, options interface{}) NewContainerOpts { + return func(ctx context.Context, client *Client, c *containers.Container) error { + var ( +- any *types.Any ++ any typeurl.Any + err error + ) + if options != nil { +@@ -288,9 +288,9 @@ func WithContainerExtension(name string, extension interface{}) NewContainerOpts + } + + if c.Extensions == nil { +- c.Extensions = make(map[string]types.Any) ++ c.Extensions = make(map[string]typeurl.Any) + } +- c.Extensions[name] = *any ++ c.Extensions[name] = any + return nil + } + } +@@ -315,7 +315,7 @@ func WithSpec(s *oci.Spec, opts ...oci.SpecOpts) NewContainerOpts { + } + + var err error +- c.Spec, err = typeurl.MarshalAny(s) ++ c.Spec, err = protobuf.MarshalAnyToProto(s) + return err + } + } +diff --git a/containers/containers.go b/containers/containers.go +index 7174bbd6aa6f..275f8069ea12 100644 +--- a/containers/containers.go ++++ b/containers/containers.go +@@ -20,7 +20,7 @@ import ( + "context" + "time" + +- "github.com/gogo/protobuf/types" ++ "github.com/containerd/typeurl" + ) + + // Container represents the set of data pinned by a container. Unless otherwise +@@ -53,7 +53,7 @@ type Container struct { + // container. + // + // This field is required but mutable. +- Spec *types.Any ++ Spec typeurl.Any + + // SnapshotKey specifies the snapshot key to use for the container's root + // filesystem. When starting a task from this container, a caller should +@@ -75,13 +75,13 @@ type Container struct { + UpdatedAt time.Time + + // Extensions stores client-specified metadata +- Extensions map[string]types.Any ++ Extensions map[string]typeurl.Any + } + + // RuntimeInfo holds runtime specific information + type RuntimeInfo struct { + Name string +- Options *types.Any ++ Options typeurl.Any + } + + // Store interacts with the underlying container storage +diff --git a/containerstore.go b/containerstore.go +index bdd1c6066a79..2a154e26590d 100644 +--- a/containerstore.go ++++ b/containerstore.go +@@ -24,6 +24,8 @@ import ( + containersapi "github.com/containerd/containerd/api/services/containers/v1" + "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" ++ "github.com/containerd/containerd/protobuf" ++ "github.com/containerd/typeurl" + ptypes "github.com/gogo/protobuf/types" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +@@ -148,18 +150,22 @@ func (r *remoteContainers) Delete(ctx context.Context, id string) error { + } + + func containerToProto(container *containers.Container) containersapi.Container { ++ extensions := make(map[string]ptypes.Any) ++ for k, v := range container.Extensions { ++ extensions[k] = *protobuf.FromAny(v) ++ } + return containersapi.Container{ + ID: container.ID, + Labels: container.Labels, + Image: container.Image, + Runtime: &containersapi.Container_Runtime{ + Name: container.Runtime.Name, +- Options: container.Runtime.Options, ++ Options: protobuf.FromAny(container.Runtime.Options), + }, +- Spec: container.Spec, ++ Spec: protobuf.FromAny(container.Spec), + Snapshotter: container.Snapshotter, + SnapshotKey: container.SnapshotKey, +- Extensions: container.Extensions, ++ Extensions: extensions, + } + } + +@@ -171,6 +177,11 @@ func containerFromProto(containerpb *containersapi.Container) containers.Contain + Options: containerpb.Runtime.Options, + } + } ++ extensions := make(map[string]typeurl.Any) ++ for k, v := range containerpb.Extensions { ++ v := v ++ extensions[k] = &v ++ } + return containers.Container{ + ID: containerpb.ID, + Labels: containerpb.Labels, +@@ -181,7 +192,7 @@ func containerFromProto(containerpb *containersapi.Container) containers.Contain + SnapshotKey: containerpb.SnapshotKey, + CreatedAt: containerpb.CreatedAt, + UpdatedAt: containerpb.UpdatedAt, +- Extensions: containerpb.Extensions, ++ Extensions: extensions, + } + } + +diff --git a/events.go b/events.go +index 3577b7c3a9fc..d6499ad3b3a8 100644 +--- a/events.go ++++ b/events.go +@@ -22,6 +22,7 @@ import ( + eventsapi "github.com/containerd/containerd/api/services/events/v1" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/events" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/typeurl" + ) + +@@ -51,7 +52,7 @@ func (e *eventRemote) Publish(ctx context.Context, topic string, event events.Ev + } + req := &eventsapi.PublishRequest{ + Topic: topic, +- Event: any, ++ Event: protobuf.FromAny(any), + } + if _, err := e.client.Publish(ctx, req); err != nil { + return errdefs.FromGRPC(err) +@@ -65,7 +66,7 @@ func (e *eventRemote) Forward(ctx context.Context, envelope *events.Envelope) er + Timestamp: envelope.Timestamp, + Namespace: envelope.Namespace, + Topic: envelope.Topic, +- Event: envelope.Event, ++ Event: protobuf.FromAny(envelope.Event), + }, + } + if _, err := e.client.Forward(ctx, req); err != nil { +diff --git a/events/events.go b/events/events.go +index b7eb86f1eb65..8af0ec03a483 100644 +--- a/events/events.go ++++ b/events/events.go +@@ -21,7 +21,6 @@ import ( + "time" + + "github.com/containerd/typeurl" +- "github.com/gogo/protobuf/types" + ) + + // Envelope provides the packaging for an event. +@@ -29,7 +28,7 @@ type Envelope struct { + Timestamp time.Time + Namespace string + Topic string +- Event *types.Any ++ Event typeurl.Any + } + + // Field returns the value for the given fieldpath as a string, if defined. +diff --git a/events/exchange/exchange.go b/events/exchange/exchange.go +index a1f385d7abd3..7f085dc91774 100644 +--- a/events/exchange/exchange.go ++++ b/events/exchange/exchange.go +@@ -30,7 +30,6 @@ import ( + "github.com/containerd/containerd/namespaces" + "github.com/containerd/typeurl" + goevents "github.com/docker/go-events" +- "github.com/gogo/protobuf/types" + "github.com/sirupsen/logrus" + ) + +@@ -63,7 +62,7 @@ func (e *Exchange) Forward(ctx context.Context, envelope *events.Envelope) (err + logger := log.G(ctx).WithFields(logrus.Fields{ + "topic": envelope.Topic, + "ns": envelope.Namespace, +- "type": envelope.Event.TypeUrl, ++ "type": envelope.Event.GetTypeUrl(), + }) + + if err != nil { +@@ -82,7 +81,6 @@ func (e *Exchange) Forward(ctx context.Context, envelope *events.Envelope) (err + func (e *Exchange) Publish(ctx context.Context, topic string, event events.Event) (err error) { + var ( + namespace string +- encoded *types.Any + envelope events.Envelope + ) + +@@ -94,7 +92,7 @@ func (e *Exchange) Publish(ctx context.Context, topic string, event events.Event + return fmt.Errorf("envelope topic %q: %w", topic, err) + } + +- encoded, err = typeurl.MarshalAny(event) ++ encoded, err := typeurl.MarshalAny(event) + if err != nil { + return err + } +@@ -108,7 +106,7 @@ func (e *Exchange) Publish(ctx context.Context, topic string, event events.Event + logger := log.G(ctx).WithFields(logrus.Fields{ + "topic": envelope.Topic, + "ns": envelope.Namespace, +- "type": envelope.Event.TypeUrl, ++ "type": envelope.Event.GetTypeUrl(), + }) + + if err != nil { +diff --git a/go.mod b/go.mod +index 26b0ae08bcc9..fc5ebe10e783 100644 +--- a/go.mod ++++ b/go.mod +@@ -17,7 +17,7 @@ require ( + github.com/containerd/imgcrypt v1.1.4 + github.com/containerd/nri v0.1.0 + github.com/containerd/ttrpc v1.1.2 +- github.com/containerd/typeurl v1.0.2 ++ github.com/containerd/typeurl v1.0.3-0.20220324183432-6193a0e03259 + github.com/containerd/zfs v1.1.0 + github.com/containernetworking/cni v1.1.1 + github.com/containernetworking/plugins v1.1.1 +diff --git a/go.sum b/go.sum +index 7f42e83a3b68..0bf0cb6c63e1 100644 +--- a/go.sum ++++ b/go.sum +@@ -260,8 +260,9 @@ github.com/containerd/ttrpc v1.1.2/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Ev + github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= + github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk= + github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= +-github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= + github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= ++github.com/containerd/typeurl v1.0.3-0.20220324183432-6193a0e03259 h1:bJv9qgjarrsdd4XIIczeRdYXON88Fgn3GdXVfnQjcSo= ++github.com/containerd/typeurl v1.0.3-0.20220324183432-6193a0e03259/go.mod h1:HDkcKOXRnX6yKnXv3P0QrogFi0DoiauK/LpQi961f0A= + github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod h1:8IgZOBdv8fAgXddBT4dBXJPtxyRsejFIpXoklgxgEjw= + github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod h1:A9zfAbMlQwE+/is6hi0Xw8ktpL+6glmqZYtevJgaB8Y= + github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= +diff --git a/integration/client/container_test.go b/integration/client/container_test.go +index 53cffb6874d1..cdf3c1fd0296 100644 +--- a/integration/client/container_test.go ++++ b/integration/client/container_test.go +@@ -1570,11 +1570,11 @@ func TestContainerExtensions(t *testing.T) { + if len(cExts) != 1 { + t.Errorf("expected 1 container extension") + } +- if cExts["hello"].TypeUrl != ext.TypeUrl { +- t.Errorf("got unexpected type url for extension: %s", cExts["hello"].TypeUrl) ++ if actual := cExts["hello"].GetTypeUrl(); actual != ext.TypeUrl { ++ t.Errorf("got unexpected type url for extension: %s", actual) + } +- if !bytes.Equal(cExts["hello"].Value, ext.Value) { +- t.Errorf("expected extension value %q, got: %q", ext.Value, cExts["hello"].Value) ++ if actual := cExts["hello"].GetValue(); !bytes.Equal(actual, ext.Value) { ++ t.Errorf("expected extension value %q, got: %q", ext.Value, actual) + } + } + +diff --git a/integration/client/go.mod b/integration/client/go.mod +index f5defa51018c..fcbbdee846ee 100644 +--- a/integration/client/go.mod ++++ b/integration/client/go.mod +@@ -11,7 +11,7 @@ require ( + github.com/containerd/continuity v0.3.0 + github.com/containerd/go-runc v1.0.0 + github.com/containerd/ttrpc v1.1.2 +- github.com/containerd/typeurl v1.0.2 ++ github.com/containerd/typeurl v1.0.3-0.20220324183432-6193a0e03259 + github.com/gogo/protobuf v1.3.2 + github.com/opencontainers/go-digest v1.0.0 + github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b +diff --git a/integration/client/go.sum b/integration/client/go.sum +index 5e37298cff45..8c3099b3f5f6 100644 +--- a/integration/client/go.sum ++++ b/integration/client/go.sum +@@ -148,8 +148,9 @@ github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Ev + github.com/containerd/ttrpc v1.1.2 h1:4jH6OQDQqjfVD2b5TJS5TxmGuLGmp5WW7KtW2TWOP7c= + github.com/containerd/ttrpc v1.1.2/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ= + github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= +-github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= + github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= ++github.com/containerd/typeurl v1.0.3-0.20220324183432-6193a0e03259 h1:bJv9qgjarrsdd4XIIczeRdYXON88Fgn3GdXVfnQjcSo= ++github.com/containerd/typeurl v1.0.3-0.20220324183432-6193a0e03259/go.mod h1:HDkcKOXRnX6yKnXv3P0QrogFi0DoiauK/LpQi961f0A= + github.com/containerd/zfs v1.1.0/go.mod h1:oZF9wBnrnQjpWLaPKEinrx3TQ9a+W/RJO7Zb41d8YLE= + github.com/containernetworking/cni v1.0.1/go.mod h1:AKuhXbN5EzmD4yTNtfSsX3tPcmtrBI6QcRV0NiNt15Y= + github.com/containernetworking/cni v1.1.1/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw= +diff --git a/metadata/boltutil/helpers.go b/metadata/boltutil/helpers.go +index 4201d7ba9ee1..2b2b0ad1e523 100644 +--- a/metadata/boltutil/helpers.go ++++ b/metadata/boltutil/helpers.go +@@ -20,6 +20,8 @@ import ( + "fmt" + "time" + ++ "github.com/containerd/containerd/protobuf" ++ "github.com/containerd/typeurl" + "github.com/gogo/protobuf/proto" + "github.com/gogo/protobuf/types" + bolt "go.etcd.io/bbolt" +@@ -151,7 +153,7 @@ func WriteTimestamps(bkt *bolt.Bucket, created, updated time.Time) error { + + // WriteExtensions will write a KV map to the given bucket, + // where `K` is a string key and `V` is a protobuf's Any type that represents a generic extension. +-func WriteExtensions(bkt *bolt.Bucket, extensions map[string]types.Any) error { ++func WriteExtensions(bkt *bolt.Bucket, extensions map[string]typeurl.Any) error { + if len(extensions) == 0 { + return nil + } +@@ -162,8 +164,8 @@ func WriteExtensions(bkt *bolt.Bucket, extensions map[string]types.Any) error { + } + + for name, ext := range extensions { +- ext := ext +- p, err := proto.Marshal(&ext) ++ ext := protobuf.FromAny(ext) ++ p, err := proto.Marshal(ext) + if err != nil { + return err + } +@@ -177,9 +179,9 @@ func WriteExtensions(bkt *bolt.Bucket, extensions map[string]types.Any) error { + } + + // ReadExtensions will read back a map of extensions from the given bucket, previously written by WriteExtensions +-func ReadExtensions(bkt *bolt.Bucket) (map[string]types.Any, error) { ++func ReadExtensions(bkt *bolt.Bucket) (map[string]typeurl.Any, error) { + var ( +- extensions = make(map[string]types.Any) ++ extensions = make(map[string]typeurl.Any) + ebkt = bkt.Bucket(bucketKeyExtensions) + ) + +@@ -193,7 +195,7 @@ func ReadExtensions(bkt *bolt.Bucket) (map[string]types.Any, error) { + return err + } + +- extensions[string(k)] = t ++ extensions[string(k)] = &t + return nil + }); err != nil { + return nil, err +@@ -203,12 +205,13 @@ func ReadExtensions(bkt *bolt.Bucket) (map[string]types.Any, error) { + } + + // WriteAny write a protobuf's Any type to the bucket +-func WriteAny(bkt *bolt.Bucket, name []byte, any *types.Any) error { +- if any == nil { ++func WriteAny(bkt *bolt.Bucket, name []byte, any typeurl.Any) error { ++ pbany := protobuf.FromAny(any) ++ if pbany == nil { + return nil + } + +- data, err := proto.Marshal(any) ++ data, err := proto.Marshal(pbany) + if err != nil { + return err + } +diff --git a/metadata/containers.go b/metadata/containers.go +index 97002e5886e1..b27dc0f87208 100644 +--- a/metadata/containers.go ++++ b/metadata/containers.go +@@ -30,6 +30,7 @@ import ( + "github.com/containerd/containerd/labels" + "github.com/containerd/containerd/metadata/boltutil" + "github.com/containerd/containerd/namespaces" ++ "github.com/containerd/typeurl" + "github.com/gogo/protobuf/proto" + "github.com/gogo/protobuf/types" + bolt "go.etcd.io/bbolt" +@@ -211,7 +212,7 @@ func (s *containerStore) Update(ctx context.Context, container containers.Contai + + if strings.HasPrefix(path, "extensions.") { + if updated.Extensions == nil { +- updated.Extensions = map[string]types.Any{} ++ updated.Extensions = map[string]typeurl.Any{} + } + key := strings.TrimPrefix(path, "extensions.") + updated.Extensions[key] = container.Extensions[key] +diff --git a/metadata/containers_test.go b/metadata/containers_test.go +index b45d54cf5234..409bd8478763 100644 +--- a/metadata/containers_test.go ++++ b/metadata/containers_test.go +@@ -31,10 +31,13 @@ import ( + "github.com/containerd/containerd/filters" + "github.com/containerd/containerd/log/logtest" + "github.com/containerd/containerd/namespaces" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/typeurl" + "github.com/gogo/protobuf/types" ++ "github.com/google/go-cmp/cmp" + specs "github.com/opencontainers/runtime-spec/specs-go" + bolt "go.etcd.io/bbolt" ++ "gotest.tools/v3/assert" + ) + + func init() { +@@ -48,7 +51,7 @@ func TestContainersList(t *testing.T) { + store := NewContainerStore(NewDB(db, nil, nil)) + + spec := &specs.Spec{} +- encoded, err := typeurl.MarshalAny(spec) ++ encoded, err := protobuf.MarshalAnyToProto(spec) + if err != nil { + t.Fatal(err) + } +@@ -180,13 +183,13 @@ func TestContainersCreateUpdateDelete(t *testing.T) { + store := NewContainerStore(NewDB(db, nil, nil)) + + spec := &specs.Spec{} +- encoded, err := typeurl.MarshalAny(spec) ++ encoded, err := protobuf.MarshalAnyToProto(spec) + if err != nil { + t.Fatal(err) + } + + spec.Annotations = map[string]string{"updated": "true"} +- encodedUpdated, err := typeurl.MarshalAny(spec) ++ encodedUpdated, err := protobuf.MarshalAnyToProto(spec) + if err != nil { + t.Fatal(err) + } +@@ -468,8 +471,8 @@ func TestContainersCreateUpdateDelete(t *testing.T) { + Runtime: containers.RuntimeInfo{ + Name: "testruntime", + }, +- Extensions: map[string]types.Any{ +- "hello": { ++ Extensions: map[string]typeurl.Any{ ++ "hello": &types.Any{ + TypeUrl: "test.update.extensions", + Value: []byte("hello"), + }, +@@ -480,8 +483,8 @@ func TestContainersCreateUpdateDelete(t *testing.T) { + Runtime: containers.RuntimeInfo{ + Name: "testruntime", + }, +- Extensions: map[string]types.Any{ +- "hello": { ++ Extensions: map[string]typeurl.Any{ ++ "hello": &types.Any{ + TypeUrl: "test.update.extensions", + Value: []byte("world"), + }, +@@ -492,8 +495,8 @@ func TestContainersCreateUpdateDelete(t *testing.T) { + Runtime: containers.RuntimeInfo{ + Name: "testruntime", + }, +- Extensions: map[string]types.Any{ +- "hello": { ++ Extensions: map[string]typeurl.Any{ ++ "hello": &types.Any{ + TypeUrl: "test.update.extensions", + Value: []byte("world"), + }, +@@ -507,8 +510,8 @@ func TestContainersCreateUpdateDelete(t *testing.T) { + Runtime: containers.RuntimeInfo{ + Name: "testruntime", + }, +- Extensions: map[string]types.Any{ +- "hello": { ++ Extensions: map[string]typeurl.Any{ ++ "hello": &types.Any{ + TypeUrl: "test.update.extensions", + Value: []byte("hello"), + }, +@@ -519,8 +522,8 @@ func TestContainersCreateUpdateDelete(t *testing.T) { + Runtime: containers.RuntimeInfo{ + Name: "testruntime", + }, +- Extensions: map[string]types.Any{ +- "hello": { ++ Extensions: map[string]typeurl.Any{ ++ "hello": &types.Any{ + TypeUrl: "test.update.extensions", + Value: []byte("world"), + }, +@@ -532,8 +535,8 @@ func TestContainersCreateUpdateDelete(t *testing.T) { + Runtime: containers.RuntimeInfo{ + Name: "testruntime", + }, +- Extensions: map[string]types.Any{ +- "hello": { ++ Extensions: map[string]typeurl.Any{ ++ "hello": &types.Any{ + TypeUrl: "test.update.extensions", + Value: []byte("hello"), + }, +@@ -547,8 +550,8 @@ func TestContainersCreateUpdateDelete(t *testing.T) { + Runtime: containers.RuntimeInfo{ + Name: "testruntime", + }, +- Extensions: map[string]types.Any{ +- "hello": { ++ Extensions: map[string]typeurl.Any{ ++ "hello": &types.Any{ + TypeUrl: "test.update.extensions", + Value: []byte("hello"), + }, +@@ -558,8 +561,8 @@ func TestContainersCreateUpdateDelete(t *testing.T) { + Labels: map[string]string{ + "foo": "one", + }, +- Extensions: map[string]types.Any{ +- "hello": { ++ Extensions: map[string]typeurl.Any{ ++ "hello": &types.Any{ + TypeUrl: "test.update.extensions", + Value: []byte("world"), + }, +@@ -571,8 +574,8 @@ func TestContainersCreateUpdateDelete(t *testing.T) { + Runtime: containers.RuntimeInfo{ + Name: "testruntime", + }, +- Extensions: map[string]types.Any{ +- "hello": { ++ Extensions: map[string]typeurl.Any{ ++ "hello": &types.Any{ + TypeUrl: "test.update.extensions", + Value: []byte("world"), + }, +@@ -586,21 +589,21 @@ func TestContainersCreateUpdateDelete(t *testing.T) { + Runtime: containers.RuntimeInfo{ + Name: "testruntime", + }, +- Extensions: map[string]types.Any{ ++ Extensions: map[string]typeurl.Any{ + // leaves hello in place. +- "hello": { ++ "hello": &types.Any{ + TypeUrl: "test.update.extensions", + Value: []byte("hello"), + }, + }, + }, + input: containers.Container{ +- Extensions: map[string]types.Any{ +- "hello": { ++ Extensions: map[string]typeurl.Any{ ++ "hello": &types.Any{ + TypeUrl: "test.update.extensions", + Value: []byte("universe"), // this will be ignored + }, +- "bar": { ++ "bar": &types.Any{ + TypeUrl: "test.update.extensions", + Value: []byte("foo"), // this will be added + }, +@@ -612,12 +615,12 @@ func TestContainersCreateUpdateDelete(t *testing.T) { + Runtime: containers.RuntimeInfo{ + Name: "testruntime", + }, +- Extensions: map[string]types.Any{ +- "hello": { ++ Extensions: map[string]typeurl.Any{ ++ "hello": &types.Any{ + TypeUrl: "test.update.extensions", + Value: []byte("hello"), // remains as world + }, +- "bar": { ++ "bar": &types.Any{ + TypeUrl: "test.update.extensions", + Value: []byte("foo"), // this will be added + }, +@@ -708,10 +711,26 @@ func checkContainerTimestamps(t *testing.T, c *containers.Container, now time.Ti + } + } + +-func checkContainersEqual(t *testing.T, a, b *containers.Container, format string, args ...interface{}) { +- if !reflect.DeepEqual(a, b) { +- t.Fatalf("containers not equal \n\t%v != \n\t%v: "+format, append([]interface{}{a, b}, args...)...) ++// isNil returns true if the given parameter is nil or typed nil. ++func isNil(x interface{}) bool { ++ if x == nil { ++ return true + } ++ v := reflect.ValueOf(x) ++ return v.Kind() == reflect.Ptr && v.IsNil() ++} ++ ++func checkContainersEqual(t *testing.T, a, b *containers.Container, format string, args ...interface{}) { ++ // Ignore the difference of nil and typed nil. ++ opt := cmp.FilterValues( ++ func(x, y interface{}) bool { ++ return isNil(x) && isNil(y) ++ }, ++ cmp.Comparer(func(_, _ interface{}) bool { ++ return true ++ }), ++ ) ++ assert.DeepEqual(t, a, b, opt) + } + + func testEnv(t *testing.T) (context.Context, *bolt.DB, func()) { +diff --git a/metrics/cgroups/metrics_test.go b/metrics/cgroups/metrics_test.go +index c71ea60a523a..c362ea3b9d65 100644 +--- a/metrics/cgroups/metrics_test.go ++++ b/metrics/cgroups/metrics_test.go +@@ -32,7 +32,7 @@ import ( + v2 "github.com/containerd/containerd/metrics/cgroups/v2" + v1types "github.com/containerd/containerd/metrics/types/v1" + v2types "github.com/containerd/containerd/metrics/types/v2" +- "github.com/containerd/typeurl" ++ "github.com/containerd/containerd/protobuf" + "github.com/prometheus/client_golang/prometheus" + + metrics "github.com/docker/go-metrics" +@@ -152,7 +152,7 @@ func (t *mockStatT) Namespace() string { + + func (t *mockStatT) Stats(context.Context) (*types.Any, error) { + if t.isV1 { +- return typeurl.MarshalAny(&v1types.Metrics{}) ++ return protobuf.MarshalAnyToProto(&v1types.Metrics{}) + } +- return typeurl.MarshalAny(&v2types.Metrics{}) ++ return protobuf.MarshalAnyToProto(&v2types.Metrics{}) + } +diff --git a/pkg/cri/server/events.go b/pkg/cri/server/events.go +index c8ffdadbfd21..fbecb29a049a 100644 +--- a/pkg/cri/server/events.go ++++ b/pkg/cri/server/events.go +@@ -32,7 +32,6 @@ import ( + sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" + ctrdutil "github.com/containerd/containerd/pkg/cri/util" + "github.com/containerd/typeurl" +- gogotypes "github.com/gogo/protobuf/types" + "github.com/sirupsen/logrus" + "golang.org/x/net/context" + "k8s.io/utils/clock" +@@ -207,7 +206,7 @@ func (em *eventMonitor) startContainerExitMonitor(ctx context.Context, id string + return stopCh + } + +-func convertEvent(e *gogotypes.Any) (string, interface{}, error) { ++func convertEvent(e typeurl.Any) (string, interface{}, error) { + id := "" + evt, err := typeurl.UnmarshalAny(e) + if err != nil { +diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go +index 4ee0ae8ffc12..8937739540a5 100644 +--- a/pkg/cri/server/helpers.go ++++ b/pkg/cri/server/helpers.go +@@ -371,10 +371,11 @@ func getRuntimeOptionsType(t string) interface{} { + + // getRuntimeOptions get runtime options from container metadata. + func getRuntimeOptions(c containers.Container) (interface{}, error) { +- if c.Runtime.Options == nil { ++ from := c.Runtime.Options ++ if from == nil || from.GetValue() == nil { + return nil, nil + } +- opts, err := typeurl.UnmarshalAny(c.Runtime.Options) ++ opts, err := typeurl.UnmarshalAny(from) + if err != nil { + return nil, err + } +diff --git a/pkg/cri/server/helpers_test.go b/pkg/cri/server/helpers_test.go +index f73e174dcc47..8fa9af8c1767 100644 +--- a/pkg/cri/server/helpers_test.go ++++ b/pkg/cri/server/helpers_test.go +@@ -23,6 +23,7 @@ import ( + "testing" + "time" + ++ "github.com/containerd/containerd/containers" + "github.com/containerd/containerd/errdefs" + "github.com/containerd/containerd/oci" + criconfig "github.com/containerd/containerd/pkg/cri/config" +@@ -32,6 +33,8 @@ import ( + "github.com/containerd/containerd/reference/docker" + "github.com/containerd/containerd/runtime/linux/runctypes" + runcoptions "github.com/containerd/containerd/runtime/v2/runc/options" ++ "github.com/containerd/typeurl" ++ "github.com/gogo/protobuf/types" + + imagedigest "github.com/opencontainers/go-digest" + runtimespec "github.com/opencontainers/runtime-spec/specs-go" +@@ -599,3 +602,13 @@ func TestValidateTargetContainer(t *testing.T) { + } + + } ++ ++func TestGetRuntimeOptions(t *testing.T) { ++ _, err := getRuntimeOptions(containers.Container{}) ++ require.NoError(t, err) ++ ++ var pbany *types.Any // This is nil. ++ var typeurlAny typeurl.Any = pbany // This is typed nil. ++ _, err = getRuntimeOptions(containers.Container{Runtime: containers.RuntimeInfo{Options: typeurlAny}}) ++ require.NoError(t, err) ++} +diff --git a/pkg/cri/server/restart.go b/pkg/cri/server/restart.go +index f5f3e5083e2c..f7db3f7b3064 100644 +--- a/pkg/cri/server/restart.go ++++ b/pkg/cri/server/restart.go +@@ -166,7 +166,7 @@ func (c *criService) loadContainer(ctx context.Context, cntr containerd.Containe + if !ok { + return container, fmt.Errorf("metadata extension %q not found", containerMetadataExtension) + } +- data, err := typeurl.UnmarshalAny(&ext) ++ data, err := typeurl.UnmarshalAny(ext) + if err != nil { + return container, fmt.Errorf("failed to unmarshal metadata extension %q: %w", ext, err) + } +@@ -335,7 +335,7 @@ func (c *criService) loadSandbox(ctx context.Context, cntr containerd.Container) + if !ok { + return sandbox, fmt.Errorf("metadata extension %q not found", sandboxMetadataExtension) + } +- data, err := typeurl.UnmarshalAny(&ext) ++ data, err := typeurl.UnmarshalAny(ext) + if err != nil { + return sandbox, fmt.Errorf("failed to unmarshal metadata extension %q: %w", ext, err) + } +diff --git a/protobuf/any.go b/protobuf/any.go +new file mode 100644 +index 000000000000..0f667176502e +--- /dev/null ++++ b/protobuf/any.go +@@ -0,0 +1,47 @@ ++/* ++ Copyright The containerd Authors. ++ ++ Licensed under the Apache License, Version 2.0 (the "License"); ++ you may not use this file except in compliance with the License. ++ You may obtain a copy of the License at ++ ++ http://www.apache.org/licenses/LICENSE-2.0 ++ ++ Unless required by applicable law or agreed to in writing, software ++ distributed under the License is distributed on an "AS IS" BASIS, ++ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ See the License for the specific language governing permissions and ++ limitations under the License. ++*/ ++ ++package protobuf ++ ++import ( ++ "github.com/containerd/typeurl" ++ "github.com/gogo/protobuf/types" ++) ++ ++// FromAny converts typeurl.Any to github.com/gogo/protobuf/types.Any. ++func FromAny(from typeurl.Any) *types.Any { ++ if from == nil { ++ return nil ++ } ++ ++ if pbany, ok := from.(*types.Any); ok { ++ return pbany ++ } ++ ++ return &types.Any{ ++ TypeUrl: from.GetTypeUrl(), ++ Value: from.GetValue(), ++ } ++} ++ ++// FromAny converts an arbitrary interface to github.com/gogo/protobuf/types.Any. ++func MarshalAnyToProto(from interface{}) (*types.Any, error) { ++ any, err := typeurl.MarshalAny(from) ++ if err != nil { ++ return nil, err ++ } ++ return FromAny(any), nil ++} +diff --git a/protobuf/any_test.go b/protobuf/any_test.go +new file mode 100644 +index 000000000000..7a74ec16c28b +--- /dev/null ++++ b/protobuf/any_test.go +@@ -0,0 +1,26 @@ ++/* ++ Copyright The containerd Authors. ++ ++ Licensed under the Apache License, Version 2.0 (the "License"); ++ you may not use this file except in compliance with the License. ++ You may obtain a copy of the License at ++ ++ http://www.apache.org/licenses/LICENSE-2.0 ++ ++ Unless required by applicable law or agreed to in writing, software ++ distributed under the License is distributed on an "AS IS" BASIS, ++ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ See the License for the specific language governing permissions and ++ limitations under the License. ++*/ ++ ++package protobuf ++ ++import "testing" ++ ++func TestFromAny(t *testing.T) { ++ actual := FromAny(nil) ++ if actual != nil { ++ t.Fatalf("expected nil, got %v", actual) ++ } ++} +diff --git a/runtime/runtime.go b/runtime/runtime.go +index 84aaa8ac67f5..1ca22ee2bccc 100644 +--- a/runtime/runtime.go ++++ b/runtime/runtime.go +@@ -21,7 +21,7 @@ import ( + "time" + + "github.com/containerd/containerd/mount" +- "github.com/gogo/protobuf/types" ++ "github.com/containerd/typeurl" + ) + + // IO holds process IO information +@@ -35,7 +35,7 @@ type IO struct { + // CreateOpts contains task creation data + type CreateOpts struct { + // Spec is the OCI runtime spec +- Spec *types.Any ++ Spec typeurl.Any + // Rootfs mounts to perform to gain access to the container's filesystem + Rootfs []mount.Mount + // IO for the container's main process +@@ -43,9 +43,9 @@ type CreateOpts struct { + // Checkpoint digest to restore container state + Checkpoint string + // RuntimeOptions for the runtime +- RuntimeOptions *types.Any ++ RuntimeOptions typeurl.Any + // TaskOptions received for the task +- TaskOptions *types.Any ++ TaskOptions typeurl.Any + // Runtime name to use (e.g. `io.containerd.NAME.VERSION`). + // As an alternative full abs path to binary may be specified instead. + Runtime string +diff --git a/runtime/v1/linux/runtime.go b/runtime/v1/linux/runtime.go +index b6d53820a859..ad7a0b67ec0b 100644 +--- a/runtime/v1/linux/runtime.go ++++ b/runtime/v1/linux/runtime.go +@@ -41,6 +41,7 @@ import ( + "github.com/containerd/containerd/pkg/process" + "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/plugin" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/runtime" + "github.com/containerd/containerd/runtime/linux/runctypes" + v1 "github.com/containerd/containerd/runtime/v1" +@@ -178,7 +179,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts + bundle, err := newBundle(id, + filepath.Join(r.state, namespace), + filepath.Join(r.root, namespace), +- opts.Spec.Value) ++ opts.Spec.GetValue()) + if err != nil { + return nil, err + } +@@ -191,7 +192,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts + shimopt := ShimLocal(r.config, r.events) + if !r.config.NoShim { + var cgroup string +- if opts.TaskOptions != nil { ++ if opts.TaskOptions != nil && opts.TaskOptions.GetValue() != nil { + v, err := typeurl.UnmarshalAny(opts.TaskOptions) + if err != nil { + return nil, err +@@ -244,7 +245,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts + Stderr: opts.IO.Stderr, + Terminal: opts.IO.Terminal, + Checkpoint: opts.Checkpoint, +- Options: opts.TaskOptions, ++ Options: protobuf.FromAny(opts.TaskOptions), + } + for _, m := range opts.Rootfs { + sopts.Rootfs = append(sopts.Rootfs, &types.Mount{ +@@ -537,7 +538,7 @@ func (r *Runtime) getRuncOptions(ctx context.Context, id string) (*runctypes.Run + return nil, err + } + +- if container.Runtime.Options != nil { ++ if container.Runtime.Options != nil && container.Runtime.Options.GetValue() != nil { + v, err := typeurl.UnmarshalAny(container.Runtime.Options) + if err != nil { + return nil, err +diff --git a/runtime/v1/linux/task.go b/runtime/v1/linux/task.go +index 3ac7839ff02b..44c89e5c27c2 100644 +--- a/runtime/v1/linux/task.go ++++ b/runtime/v1/linux/task.go +@@ -32,11 +32,11 @@ import ( + "github.com/containerd/containerd/events/exchange" + "github.com/containerd/containerd/identifiers" + "github.com/containerd/containerd/log" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/runtime" + "github.com/containerd/containerd/runtime/v1/shim/client" + "github.com/containerd/containerd/runtime/v1/shim/v1" + "github.com/containerd/ttrpc" +- "github.com/containerd/typeurl" + "github.com/gogo/protobuf/types" + ) + +@@ -340,7 +340,7 @@ func (t *Task) Stats(ctx context.Context) (*types.Any, error) { + if err != nil { + return nil, err + } +- return typeurl.MarshalAny(stats) ++ return protobuf.MarshalAnyToProto(stats) + } + + // Cgroup returns the underlying cgroup for a linux task +diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go +index a08757d0a7b9..926134821d38 100644 +--- a/runtime/v1/shim/service.go ++++ b/runtime/v1/shim/service.go +@@ -37,6 +37,7 @@ import ( + "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/pkg/process" + "github.com/containerd/containerd/pkg/stdio" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/runtime" + "github.com/containerd/containerd/runtime/linux/runctypes" + shimapi "github.com/containerd/containerd/runtime/v1/shim/v1" +@@ -412,7 +413,7 @@ func (s *Service) ListPids(ctx context.Context, r *shimapi.ListPidsRequest) (*sh + if err != nil { + return nil, fmt.Errorf("failed to marshal process %d info: %w", pid, err) + } +- pInfo.Info = a ++ pInfo.Info = protobuf.FromAny(a) + break + } + } +diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go +index 1927cbb3f0c3..505d5d896995 100644 +--- a/runtime/v2/manager.go ++++ b/runtime/v2/manager.go +@@ -33,6 +33,7 @@ import ( + "github.com/containerd/containerd/pkg/timeout" + "github.com/containerd/containerd/platforms" + "github.com/containerd/containerd/plugin" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/runtime" + shimbinary "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/containerd/runtime/v2/task" +@@ -156,7 +157,7 @@ func (m *ShimManager) ID() string { + + // Start launches a new shim instance + func (m *ShimManager) Start(ctx context.Context, id string, opts runtime.CreateOpts) (_ ShimProcess, retErr error) { +- bundle, err := NewBundle(ctx, m.root, m.state, id, opts.Spec.Value) ++ bundle, err := NewBundle(ctx, m.root, m.state, id, opts.Spec.GetValue()) + if err != nil { + return nil, err + } +@@ -197,7 +198,7 @@ func (m *ShimManager) startShim(ctx context.Context, bundle *Bundle, id string, + } + + topts := opts.TaskOptions +- if topts == nil { ++ if topts == nil || topts.GetValue() == nil { + topts = opts.RuntimeOptions + } + +@@ -212,7 +213,7 @@ func (m *ShimManager) startShim(ctx context.Context, bundle *Bundle, id string, + ttrpcAddress: m.containerdTTRPCAddress, + schedCore: m.schedCore, + }) +- shim, err := b.Start(ctx, topts, func() { ++ shim, err := b.Start(ctx, protobuf.FromAny(topts), func() { + log.G(ctx).WithField("id", id).Info("shim disconnected") + + cleanupAfterDeadShim(context.Background(), id, ns, m.shims, m.events, b) +diff --git a/runtime/v2/runc/container.go b/runtime/v2/runc/container.go +index aac9dad7e916..c7e82b610695 100644 +--- a/runtime/v2/runc/container.go ++++ b/runtime/v2/runc/container.go +@@ -49,12 +49,14 @@ func NewContainer(ctx context.Context, platform stdio.Platform, r *task.CreateTa + } + + var opts options.Options +- if r.Options != nil && r.Options.GetTypeUrl() != "" { ++ if r.Options.GetValue() != nil { + v, err := typeurl.UnmarshalAny(r.Options) + if err != nil { + return nil, err + } +- opts = *v.(*options.Options) ++ if v != nil { ++ opts = *v.(*options.Options) ++ } + } + + var mounts []process.Mount +diff --git a/runtime/v2/runc/task/service.go b/runtime/v2/runc/task/service.go +index d6af20fb03f0..25ec6d1f9df5 100644 +--- a/runtime/v2/runc/task/service.go ++++ b/runtime/v2/runc/task/service.go +@@ -38,6 +38,7 @@ import ( + "github.com/containerd/containerd/pkg/shutdown" + "github.com/containerd/containerd/pkg/stdio" + "github.com/containerd/containerd/pkg/userns" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/runtime/v2/runc" + "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/containerd/runtime/v2/shim" +@@ -475,7 +476,7 @@ func (s *service) Pids(ctx context.Context, r *taskAPI.PidsRequest) (*taskAPI.Pi + d := &options.ProcessDetails{ + ExecID: p.ID(), + } +- a, err := typeurl.MarshalAny(d) ++ a, err := protobuf.MarshalAnyToProto(d) + if err != nil { + return nil, fmt.Errorf("failed to marshal process %d info: %w", pid, err) + } +@@ -603,7 +604,7 @@ func (s *service) Stats(ctx context.Context, r *taskAPI.StatsRequest) (*taskAPI. + return nil, err + } + return &taskAPI.StatsResponse{ +- Stats: data, ++ Stats: protobuf.FromAny(data), + }, nil + } + +diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go +index 8c473430e218..8fdac3f8a2fd 100644 +--- a/runtime/v2/runc/v1/service.go ++++ b/runtime/v2/runc/v1/service.go +@@ -41,6 +41,7 @@ import ( + "github.com/containerd/containerd/pkg/process" + "github.com/containerd/containerd/pkg/schedcore" + "github.com/containerd/containerd/pkg/stdio" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/runtime/v2/runc" + "github.com/containerd/containerd/runtime/v2/runc/options" + "github.com/containerd/containerd/runtime/v2/shim" +@@ -507,7 +508,7 @@ func (s *service) Pids(ctx context.Context, r *taskAPI.PidsRequest) (*taskAPI.Pi + d := &options.ProcessDetails{ + ExecID: p.ID(), + } +- a, err := typeurl.MarshalAny(d) ++ a, err := protobuf.MarshalAnyToProto(d) + if err != nil { + return nil, fmt.Errorf("failed to marshal process %d info: %w", pid, err) + } +@@ -621,7 +622,7 @@ func (s *service) Stats(ctx context.Context, r *taskAPI.StatsRequest) (*taskAPI. + return nil, err + } + return &taskAPI.StatsResponse{ +- Stats: data, ++ Stats: protobuf.FromAny(data), + }, nil + } + +diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go +index 456ffb4409bd..18cc9a0ed6cc 100644 +--- a/runtime/v2/shim.go ++++ b/runtime/v2/shim.go +@@ -34,6 +34,7 @@ import ( + "github.com/containerd/containerd/log" + "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/pkg/timeout" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/runtime" + client "github.com/containerd/containerd/runtime/v2/shim" + "github.com/containerd/containerd/runtime/v2/task" +@@ -324,7 +325,7 @@ func (s *shimTask) delete(ctx context.Context, removeTask func(ctx context.Conte + + func (s *shimTask) Create(ctx context.Context, opts runtime.CreateOpts) (runtime.Task, error) { + topts := opts.TaskOptions +- if topts == nil { ++ if topts == nil || topts.GetValue() == nil { + topts = opts.RuntimeOptions + } + request := &task.CreateTaskRequest{ +@@ -335,7 +336,7 @@ func (s *shimTask) Create(ctx context.Context, opts runtime.CreateOpts) (runtime + Stderr: opts.IO.Stderr, + Terminal: opts.IO.Terminal, + Checkpoint: opts.Checkpoint, +- Options: topts, ++ Options: protobuf.FromAny(topts), + } + for _, m := range opts.Rootfs { + request.Rootfs = append(request.Rootfs, &types.Mount{ +diff --git a/runtime/v2/shim/publisher.go b/runtime/v2/shim/publisher.go +index ed1ebdd58b9c..20856f115bd6 100644 +--- a/runtime/v2/shim/publisher.go ++++ b/runtime/v2/shim/publisher.go +@@ -25,8 +25,8 @@ import ( + "github.com/containerd/containerd/events" + "github.com/containerd/containerd/namespaces" + "github.com/containerd/containerd/pkg/ttrpcutil" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/ttrpc" +- "github.com/containerd/typeurl" + "github.com/sirupsen/logrus" + ) + +@@ -110,7 +110,7 @@ func (l *RemoteEventsPublisher) Publish(ctx context.Context, topic string, event + if err != nil { + return err + } +- any, err := typeurl.MarshalAny(event) ++ any, err := protobuf.MarshalAnyToProto(event) + if err != nil { + return err + } +diff --git a/services/containers/helpers.go b/services/containers/helpers.go +index aece9ca41471..a75d5d62bbc0 100644 +--- a/services/containers/helpers.go ++++ b/services/containers/helpers.go +@@ -19,6 +19,9 @@ package containers + import ( + api "github.com/containerd/containerd/api/services/containers/v1" + "github.com/containerd/containerd/containers" ++ "github.com/containerd/containerd/protobuf" ++ "github.com/containerd/typeurl" ++ "github.com/gogo/protobuf/types" + ) + + func containersToProto(containers []containers.Container) []api.Container { +@@ -33,20 +36,24 @@ func containersToProto(containers []containers.Container) []api.Container { + } + + func containerToProto(container *containers.Container) api.Container { ++ extensions := make(map[string]types.Any) ++ for k, v := range container.Extensions { ++ extensions[k] = *protobuf.FromAny(v) ++ } + return api.Container{ + ID: container.ID, + Labels: container.Labels, + Image: container.Image, + Runtime: &api.Container_Runtime{ + Name: container.Runtime.Name, +- Options: container.Runtime.Options, ++ Options: protobuf.FromAny(container.Runtime.Options), + }, +- Spec: container.Spec, ++ Spec: protobuf.FromAny(container.Spec), + Snapshotter: container.Snapshotter, + SnapshotKey: container.SnapshotKey, + CreatedAt: container.CreatedAt, + UpdatedAt: container.UpdatedAt, +- Extensions: container.Extensions, ++ Extensions: extensions, + } + } + +@@ -58,6 +65,11 @@ func containerFromProto(containerpb *api.Container) containers.Container { + Options: containerpb.Runtime.Options, + } + } ++ extensions := make(map[string]typeurl.Any) ++ for k, v := range containerpb.Extensions { ++ v := v ++ extensions[k] = &v ++ } + return containers.Container{ + ID: containerpb.ID, + Labels: containerpb.Labels, +@@ -66,6 +78,6 @@ func containerFromProto(containerpb *api.Container) containers.Container { + Spec: containerpb.Spec, + Snapshotter: containerpb.Snapshotter, + SnapshotKey: containerpb.SnapshotKey, +- Extensions: containerpb.Extensions, ++ Extensions: extensions, + } + } +diff --git a/services/events/service.go b/services/events/service.go +index 3b5f811382b7..b1992a1ab716 100644 +--- a/services/events/service.go ++++ b/services/events/service.go +@@ -26,6 +26,7 @@ import ( + "github.com/containerd/containerd/events" + "github.com/containerd/containerd/events/exchange" + "github.com/containerd/containerd/plugin" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/ttrpc" + ptypes "github.com/gogo/protobuf/types" + "google.golang.org/grpc" +@@ -115,7 +116,7 @@ func toProto(env *events.Envelope) *api.Envelope { + Timestamp: env.Timestamp, + Namespace: env.Namespace, + Topic: env.Topic, +- Event: env.Event, ++ Event: protobuf.FromAny(env.Event), + } + } + +diff --git a/services/tasks/local.go b/services/tasks/local.go +index 96ed36ca4a34..34cb23d1672c 100644 +--- a/services/tasks/local.go ++++ b/services/tasks/local.go +@@ -41,6 +41,7 @@ import ( + "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/pkg/timeout" + "github.com/containerd/containerd/plugin" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/runtime" + "github.com/containerd/containerd/runtime/linux/runctypes" + "github.com/containerd/containerd/runtime/v2/runc/options" +@@ -461,7 +462,7 @@ func (l *local) ListPids(ctx context.Context, r *api.ListPidsRequest, _ ...grpc. + Pid: p.Pid, + } + if p.Info != nil { +- a, err := typeurl.MarshalAny(p.Info) ++ a, err := protobuf.MarshalAnyToProto(p.Info) + if err != nil { + return nil, fmt.Errorf("failed to marshal process %d info: %w", p.Pid, err) + } +@@ -576,7 +577,7 @@ func (l *local) Checkpoint(ctx context.Context, r *api.CheckpointTaskRequest, _ + return nil, err + } + // write the config to the content store +- data, err := container.Spec.Marshal() ++ data, err := protobuf.FromAny(container.Spec).Marshal() + if err != nil { + return nil, err + } +diff --git a/task.go b/task.go +index ef8cd44942cf..bcb522c52e30 100644 +--- a/task.go ++++ b/task.go +@@ -38,6 +38,7 @@ import ( + "github.com/containerd/containerd/mount" + "github.com/containerd/containerd/oci" + "github.com/containerd/containerd/plugin" ++ "github.com/containerd/containerd/protobuf" + "github.com/containerd/containerd/rootfs" + "github.com/containerd/containerd/runtime/linux/runctypes" + "github.com/containerd/containerd/runtime/v2/runc/options" +@@ -365,7 +366,7 @@ func (t *task) Exec(ctx context.Context, id string, spec *specs.Process, ioCreat + i.Close() + } + }() +- any, err := typeurl.MarshalAny(spec) ++ any, err := protobuf.MarshalAnyToProto(spec) + if err != nil { + return nil, err + } +@@ -465,7 +466,7 @@ func (t *task) Checkpoint(ctx context.Context, opts ...CheckpointTaskOpts) (Imag + } + request.ParentCheckpoint = i.ParentCheckpoint + if i.Options != nil { +- any, err := typeurl.MarshalAny(i.Options) ++ any, err := protobuf.MarshalAnyToProto(i.Options) + if err != nil { + return nil, err + } +@@ -554,7 +555,7 @@ func (t *task) Update(ctx context.Context, opts ...UpdateTaskOpts) error { + if err != nil { + return err + } +- request.Resources = any ++ request.Resources = protobuf.FromAny(any) + } + if i.Annotations != nil { + request.Annotations = i.Annotations +-- +2.41.0 + diff --git a/anda/docker/containerd/0001-opencontainers-image-spec-v1.1.0-rc3.patch b/anda/docker/containerd/0001-opencontainers-image-spec-v1.1.0-rc3.patch new file mode 100644 index 0000000000..dafb32e536 --- /dev/null +++ b/anda/docker/containerd/0001-opencontainers-image-spec-v1.1.0-rc3.patch @@ -0,0 +1,162 @@ +From 4347fc8bc2ac225117a3280c0445e855ca7a69f3 Mon Sep 17 00:00:00 2001 +From: Akihiro Suda +Date: Tue, 9 May 2023 22:24:47 +0900 +Subject: [PATCH] go.mod: github.com/opencontainers/image-spec v1.1.0-rc3 + +Signed-off-by: Akihiro Suda +--- + go.mod | 2 +- + go.sum | 4 +-- + images/converter/default.go | 4 +-- + images/converter/uncompress/uncompress.go | 6 ++-- + images/diffid.go | 2 +- + images/mediatypes.go | 2 +- + integration/client/go.mod | 2 +- + integration/client/go.sum | 4 +-- + integration/client/import_test.go | 8 +++-- + oci/spec_opts.go | 1 + + pkg/cri/opts/spec_windows.go | 4 +-- + remotes/handlers_test.go | 1 + + .../image-spec/specs-go/v1/annotations.go | 3 -- + .../image-spec/specs-go/v1/artifact.go | 34 ------------------- + .../image-spec/specs-go/v1/config.go | 34 ++++++------------- + .../image-spec/specs-go/v1/manifest.go | 11 ++++++ + .../image-spec/specs-go/v1/mediatype.go | 19 +++++++++-- + .../image-spec/specs-go/version.go | 2 +- + vendor/modules.txt | 4 +-- + 19 files changed, 64 insertions(+), 83 deletions(-) + delete mode 100644 vendor/github.com/opencontainers/image-spec/specs-go/v1/artifact.go + +diff --git a/images/converter/default.go b/images/converter/default.go +index c67617e4ccfc..4a887242ce40 100644 +--- a/images/converter/default.go ++++ b/images/converter/default.go +@@ -431,11 +431,11 @@ func ConvertDockerMediaTypeToOCI(mt stri + case images.MediaTypeDockerSchema2LayerGzip: + return ocispec.MediaTypeImageLayerGzip + case images.MediaTypeDockerSchema2LayerForeignGzip: +- return ocispec.MediaTypeImageLayerNonDistributableGzip ++ return ocispec.MediaTypeImageLayerNonDistributableGzip //nolint:staticcheck // deprecated + case images.MediaTypeDockerSchema2Layer: + return ocispec.MediaTypeImageLayer + case images.MediaTypeDockerSchema2LayerForeign: +- return ocispec.MediaTypeImageLayerNonDistributable ++ return ocispec.MediaTypeImageLayerNonDistributable //nolint:staticcheck // deprecated + case images.MediaTypeDockerSchema2Config: + return ocispec.MediaTypeImageConfig + default: +diff --git a/images/converter/uncompress/uncompress.go b/images/converter/uncompress/uncompress.go +index 30ae02cf5ef9..ceb998fb8ff6 100644 +--- a/images/converter/uncompress/uncompress.go ++++ b/images/converter/uncompress/uncompress.go +@@ -99,7 +99,7 @@ func IsUncompressedType(mt string) bool + images.MediaTypeDockerSchema2Layer, + images.MediaTypeDockerSchema2LayerForeign, + ocispec.MediaTypeImageLayer, +- ocispec.MediaTypeImageLayerNonDistributable: ++ ocispec.MediaTypeImageLayerNonDistributable: //nolint:staticcheck // deprecated + return true + default: + return false +@@ -114,8 +114,8 @@ func convertMediaType(mt string) string + return images.MediaTypeDockerSchema2LayerForeign + case ocispec.MediaTypeImageLayerGzip, ocispec.MediaTypeImageLayerZstd: + return ocispec.MediaTypeImageLayer +- case ocispec.MediaTypeImageLayerNonDistributableGzip, ocispec.MediaTypeImageLayerNonDistributableZstd: +- return ocispec.MediaTypeImageLayerNonDistributable ++ case ocispec.MediaTypeImageLayerNonDistributableGzip, ocispec.MediaTypeImageLayerNonDistributableZstd: //nolint:staticcheck // deprecated ++ return ocispec.MediaTypeImageLayerNonDistributable //nolint:staticcheck // deprecated + default: + return mt + } +diff --git a/images/diffid.go b/images/diffid.go +index 1bd5256e2b37..c031f8e36377 100644 +--- a/images/diffid.go ++++ b/images/diffid.go +@@ -36,7 +36,7 @@ func GetDiffID(ctx context.Context, cs c + MediaTypeDockerSchema2Layer, + ocispec.MediaTypeImageLayer, + MediaTypeDockerSchema2LayerForeign, +- ocispec.MediaTypeImageLayerNonDistributable: ++ ocispec.MediaTypeImageLayerNonDistributable: //nolint:staticcheck // deprecated + return desc.Digest, nil + } + info, err := cs.Info(ctx, desc.Digest) +diff --git a/images/mediatypes.go b/images/mediatypes.go +index 067963babba1..d3b28d42dc61 100644 +--- a/images/mediatypes.go ++++ b/images/mediatypes.go +@@ -76,7 +76,7 @@ func DiffCompression(ctx context.Context + return "", nil + } + return "gzip", nil +- case ocispec.MediaTypeImageLayer, ocispec.MediaTypeImageLayerNonDistributable: ++ case ocispec.MediaTypeImageLayer, ocispec.MediaTypeImageLayerNonDistributable: //nolint:staticcheck // Non-distributable layers are deprecated + if len(ext) > 0 { + switch ext[len(ext)-1] { + case "gzip": +diff --git a/integration/client/import_test.go b/integration/client/import_test.go +index f2ba3db35f89..9f2cc46e624e 100644 +--- a/integration/client/import_test.go ++++ b/integration/client/import_test.go +@@ -370,9 +370,11 @@ func createContent(size int64, seed int6 + + func createConfig(osName, archName string) ([]byte, digest.Digest) { + image := ocispec.Image{ +- OS: osName, +- Architecture: archName, +- Author: "test", ++ Platform: ocispec.Platform{ ++ OS: osName, ++ Architecture: archName, ++ }, ++ Author: author, + } + b, _ := json.Marshal(image) + +diff --git a/oci/spec_opts.go b/oci/spec_opts.go +index f38828988577..8c4abd0bd876 100644 +--- a/oci/spec_opts.go ++++ b/oci/spec_opts.go +@@ -446,6 +446,7 @@ func WithImageConfigArgs(image Image, ar + return errors.New("no arguments specified") + } + ++ //nolint:staticcheck // ArgsEscaped is deprecated + if config.ArgsEscaped && (len(config.Entrypoint) > 0 || cmdFromImage) { + s.Process.Args = nil + s.Process.CommandLine = cmd[0] +diff --git a/pkg/cri/opts/spec_windows.go b/pkg/cri/opts/spec_windows.go +index 0964084ca107..0f7307bd0a6f 100644 +--- a/pkg/cri/opts/spec_windows.go ++++ b/pkg/cri/opts/spec_windows.go +@@ -260,7 +260,7 @@ func escapeAndCombineArgsWindows(args [] + // If image.ArgsEscaped field is set, this function sets the process command line and if not, it sets the + // process args field + func WithProcessCommandLineOrArgsForWindows(config *runtime.ContainerConfig, image *imagespec.ImageConfig) oci.SpecOpts { +- if image.ArgsEscaped { ++ if image.ArgsEscaped { //nolint:staticcheck // ArgsEscaped is deprecated + return func(ctx context.Context, client oci.Client, c *containers.Container, s *runtimespec.Spec) (err error) { + // firstArgFromImg is a flag that is returned to indicate that the first arg in the slice comes from either the + // image Entrypoint or Cmd. If the first arg instead comes from the container config (e.g. overriding the image values), +@@ -273,7 +273,7 @@ func WithProcessCommandLineOrArgsForWind + } + + var cmdLine string +- if image.ArgsEscaped && firstArgFromImg { ++ if image.ArgsEscaped && firstArgFromImg { //nolint:staticcheck // ArgsEscaped is deprecated + cmdLine = args[0] + if len(args) > 1 { + cmdLine += " " + escapeAndCombineArgsWindows(args[1:]) +diff --git a/remotes/handlers_test.go b/remotes/handlers_test.go +index c0446e1a52e6..9acf54680bf3 100644 +--- a/remotes/handlers_test.go ++++ b/remotes/handlers_test.go +@@ -78,6 +78,7 @@ func TestContextCustomKeyPrefix(t *testi + }) + } + ++//nolint:staticcheck // Non-distributable layers are deprecated + func TestSkipNonDistributableBlobs(t *testing.T) { + ctx := context.Background() + diff --git a/anda/docker/containerd/0002-Remove-windows-only-dep.patch b/anda/docker/containerd/0002-Remove-windows-only-dep.patch new file mode 100644 index 0000000000..92a2856cfb --- /dev/null +++ b/anda/docker/containerd/0002-Remove-windows-only-dep.patch @@ -0,0 +1,24 @@ +diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go +index a8498116d..3682be668 100644 +--- a/pkg/cri/server/helpers.go ++++ b/pkg/cri/server/helpers.go +@@ -40,7 +40,7 @@ import ( + runtimespec "github.com/opencontainers/runtime-spec/specs-go" + "github.com/sirupsen/logrus" + +- runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" ++ // runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" + imagedigest "github.com/opencontainers/go-digest" + "github.com/pelletier/go-toml" + "golang.org/x/net/context" +@@ -366,8 +366,8 @@ func getRuntimeOptionsType(t string) interface{} { + return &runcoptions.Options{} + case plugin.RuntimeLinuxV1: + return &runctypes.RuncOptions{} +- case runtimeRunhcsV1: +- return &runhcsoptions.Options{} ++ // case runtimeRunhcsV1: ++ // return &runhcsoptions.Options{} + default: + return &runtimeoptions.Options{} + } diff --git a/anda/docker/containerd/anda.hcl b/anda/docker/containerd/anda.hcl new file mode 100644 index 0000000000..595cb36095 --- /dev/null +++ b/anda/docker/containerd/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "containerd.spec" + } +} \ No newline at end of file diff --git a/anda/docker/containerd/changelog b/anda/docker/containerd/changelog new file mode 100644 index 0000000000..eef50d4496 --- /dev/null +++ b/anda/docker/containerd/changelog @@ -0,0 +1,167 @@ +* Mon Jun 06 2022 Maxwell G 1.6.6-1 +- Update to 1.6.6. +- Mitigates GHSA-5ffw-gxpp-mxpf / CVE-2022-31030. + +* Sun Jun 05 2022 Maxwell G 1.6.5-2 +- Bump release + +* Sat Jun 04 2022 Maxwell G 1.6.5-1 +- Update to 1.6.5. Fixes rhbz#2093608. + +* Wed May 11 2022 Maxwell G 1.6.4-1 +- Update to 1.6.4. Fixes rhbz#079050 and rhbz#2079779. + +* Sat Apr 16 2022 Fabio Alessandro Locati 1.6.2-2 +- Rebuilt for CVE-2022-27191 + +* Sun Apr 03 2022 Maxwell G 1.6.2-1 +- Update to 1.6.2 (rhbz#2068277). Mitigates CVE-2022-24769 / + GHSA-c9cp-9c75-9v8c. + +* Sat Mar 12 2022 Maxwell G 1.6.1-1 +- Update to 1.6.1 (rhbz#2060228). Mitigates CVE-2022-23648. + +* Thu Feb 17 2022 Maxwell G 1.6.0-1 +- Update to 1.6.0 (rhbz#2054935). Use unbundled deps. + +* Sun Feb 06 2022 Robert-André Mauchin 1.6.0~rc.2-2 +- Disable platform tests + +* Sat Feb 05 2022 Robert-André Mauchin 1.6.0~rc.2-1 +- Update to 1.6.0~rc.2 Close: rhbz#1731597 Close: rhbz#1798419 + +* Mon Jan 31 2022 Maxwell G - 1.5.9-1 +- Update to 1.5.9. Fixes FTBFS. Closes rhbz#2045277. +- Mitigates CVE-2021-43816. Closes rhbz#2044434. Closes rhbz#2044436. +- Temporarily build using vendored dependencies. + +* Wed Jan 19 2022 Fedora Release Engineering - 1.5.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Nov 22 2021 Olivier Lemasle - 1.5.8-1 +- Update to upstream 1.5.8 (fixes rhbz#2013807) +- Mitigate CVE-2021-41190 (fixes GHSA-5j5w-g665-5m35, fixes rhbz#2024941) + +* Sun Oct 10 2021 Olivier Lemasle - 1.5.7-1 +- Update to upstream 1.5.7 (fixes rhbz#2009149) +- Fixes CVE-2021-41103 (fixes rhbz#2011014, rhbz#2011007) + +* Sun Aug 15 2021 Olivier Lemasle - 1.5.5-1 +- Update to upstream 1.5.5 (fixes rhbz#1983820) +- Fixes CVE-2021-32760 (rhbz#1983932) + +* Wed Jul 21 2021 Fedora Release Engineering - 1.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jul 14 11:28:54 CEST 2021 Olivier Lemasle - 1.5.3-1 +- Update to upstream 1.5.3 (fixes rhbz#1956638) + +* Tue May 04 2021 Olivier Lemasle - 1.5.0-1 +- Update to upstream 1.5.0 (#1956638) + +* Mon Apr 19 2021 Olivier Lemasle - 1.5.0~rc.1-1 +- Update to 1.5.0~rc.1 (#1948041) + +* Wed Mar 17 2021 Olivier Lemasle - 1.5.0~beta.4-1 +- Update to upstream 1.5.0-beta.4 + +* Sat Mar 06 2021 Olivier Lemasle - 1.5.0~beta.3-1 +- Update to upstream 1.5.0-beta.3 + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.5.0~beta.0-2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Thu Jan 28 2021 Olivier Lemasle 1.5.0~beta.0-1 +- Update to 1.5.0~beta.0 (#1918993) + +* Tue Jan 26 2021 Fedora Release Engineering - 1.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Dec 01 2020 Olivier Lemasle - 1.4.3-1 +- Fix CVE-2020-15257 (#1903050) +- Update to latest upstream - 1.4.3 (#1901908) + +* Mon Nov 2 23:23:57 CET 2020 Olivier Lemasle - 1.4.1-2 +- Fix man pages + +* Wed Sep 30 2020 Robert-André Mauchin - 1.4.1-1 +- Update to 1.4.1 + +* Sat Aug 01 2020 Fedora Release Engineering - 1.3.3-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Apr 01 2020 Olivier Lemasle - 1.3.3-1 +- Update to 1.3.3 + +* Sun Mar 22 2020 Olivier Lemasle - 1.2.13-2 +- Remove version requirement on golang-github-containerd-cri + +* Sun Mar 22 2020 Olivier Lemasle - 1.2.13-1 +- Exclude failing integration tests +- Update to containerd 1.2.13 + +* Tue Jan 28 2020 Fedora Release Engineering - 1.2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 1.2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed May 01 15:33:19 CEST 2019 Robert-André Mauchin - 1.2.6-1.20190501gitd68b593 +- Release 1.2.6, commit d68b593de4ab10bb8b4fd64560e10d43c7156db2 + +* Tue Feb 26 2019 Carl George - 1.2.4-1 +- Latest upstream + +* Thu Jan 31 2019 Fedora Release Engineering - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jan 03 2019 Carl George - 1.2.1-1 +- Latest upstream +- Run test suite (except on el7 or %%arm) + +* Thu Oct 25 2018 Carl George - 1.2.0-1 +- Latest upstream + +* Mon Aug 13 2018 Carl George - 1.1.2-1 +- Latest upstream + +* Thu Jul 12 2018 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Apr 26 2018 Carl George - 1.1.0-1 +- Latest upstream +- Build and include man pages + +* Wed Apr 04 2018 Carl George - 1.0.3-1 +- Latest upstream + +* Wed Feb 07 2018 Fedora Release Engineering - 1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 22 2018 Carl George - 1.0.1-1 +- Latest upstream + +* Wed Dec 06 2017 Carl George - 1.0.0-1 +- Latest upstream + +* Fri Nov 10 2017 Carl George - 1.0.0-0.5.beta.3 +- Latest upstream + +* Thu Oct 19 2017 Carl George - 1.0.0-0.4.beta.2 +- Own /etc/containerd + +* Thu Oct 12 2017 Carl George - 1.0.0-0.3.beta.2 +- Latest upstream +- Require runc 1.0.0 https://github.com/containerd/containerd/issues/1508#issuecomment-335566293 + +* Mon Oct 09 2017 Carl George - 1.0.0-0.2.beta.1 +- Add provides for vendored dependencies +- Add ctr command + +* Wed Oct 04 2017 Carl George - 1.0.0-0.1.beta.1 +- Initial package diff --git a/anda/docker/containerd/containerd.spec b/anda/docker/containerd/containerd.spec new file mode 100644 index 0000000000..6a79f2ca9f --- /dev/null +++ b/anda/docker/containerd/containerd.spec @@ -0,0 +1,127 @@ +# This is a simplified version of the containerd.spec file from Fedora +# designed to build from upstream containerd, not Fedora + +# Created due to https://bugzilla.redhat.com/show_bug.cgi?id=2237396 + +%global debug_package %{nil} + +# https://github.com/containerd/containerd +%global goipath github.com/containerd/containerd +Version: 1.7.11 + +%gometa + +%global goname containerd +%global godevelname containerd-devel + +%global common_description %{expand: +Containerd is an industry-standard container runtime with an emphasis on +simplicity, robustness and portability. It is available as a daemon for Linux +and Windows, which can manage the complete container lifecycle of its host +system: image transfer and storage, container execution and supervision, +low-level storage and network attachments, etc.} + +%global golicenses LICENSE NOTICE +%global godocs docs ROADMAP.md SCOPE.md code-of-conduct.md\\\ + BUILDING.md README.md RELEASES.md + +Name: %{goname} +Release: 1%{?dist} +Summary: Open and reliable container runtime + +License: Apache-2.0 +URL: https://github.com/containerd/containerd +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz#/containerd-%{version}.tar.gz +Source2: containerd.toml +# Carve out code requiring github.com/Microsoft/hcsshim +#Patch0: 0001-Revert-commit-for-Windows-metrics.patch +#Patch1: 0002-Remove-windows-only-dep.patch +# Backport for github.com/containerd/typeurl update +#Patch2: 0001-Use-typeurl.Any-instead-of-github.com-gogo-protobuf-.patch +# To use with latest go-runc +#Patch3: 0001-Add-reaper-StartLocked.patch +# To use with latest opencontainers/image-spec +#Patch4: 0001-opencontainers-image-spec-v1.1.0-rc3.patch + +BuildRequires: btrfs-progs-devel +BuildRequires: go-md2man +BuildRequires: systemd-rpm-macros +BuildRequires: git-core + +Requires: runc + +%description +%{common_description} + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + + +%description devel +%{common_description} + +This package contains library source intended for +building other packages which use import path with +%{goname} prefix. + +%prep +%autosetup -p1 -n %{goname}-%{version} +# Used only for generation: +#rm -rf cmd/protoc-gen-gogoctrd +# Replace default bin directory +sed -i "s|/usr/local/bin/containerd|/usr/bin/containerd|" containerd.service + +%build +#pushd containerd +export GOFLAGS="-buildmode=pie -v -x" +%make_build +mkdir _man +go-md2man -in docs/man/containerd-config.8.md -out _man/containerd-config.8 +go-md2man -in docs/man/containerd-config.toml.5.md -out _man/containerd-config.toml.5 +go run cmd/gen-manpages/main.go containerd.8 _man +go run cmd/gen-manpages/main.go ctr.8 _man + +%install +export GOFLAGS="-buildmode=pie -v -x" +%make_install PREFIX=%{_prefix} DESTDIR=%{buildroot} + + + +install -D -p -m 0644 _man/containerd.8 %{buildroot}%{_mandir}/man8/containerd.8 +install -D -p -m 0644 _man/containerd-config.8 %{buildroot}%{_mandir}/man8/containerd-config.8 +install -D -p -m 0644 _man/ctr.8 %{buildroot}%{_mandir}/man8/ctr.8 +install -D -p -m 0644 _man/containerd-config.toml.5 %{buildroot}%{_mandir}/man5/containerd-config.toml.5 +install -D -p -m 0644 containerd.service %{buildroot}%{_unitdir}/containerd.service +install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml +mkdir -p %{buildroot}%{_sharedstatedir}/containerd/opt + +%post +%systemd_post containerd.service + +%preun +%systemd_preun containerd.service + +%postun +%systemd_postun_with_restart containerd.service + + + +%files +%license LICENSE NOTICE +%doc docs ROADMAP.md SCOPE.md code-of-conduct.md BUILDING.md +%doc README.md RELEASES.md +%{_bindir}/* +%{_mandir}/man8/containerd.8* +%{_mandir}/man8/containerd-config.8* +%{_mandir}/man8/ctr.8* +%{_mandir}/man5/containerd-config.toml.5* +%{_unitdir}/containerd.service +%dir %{_sysconfdir}/containerd +%config(noreplace) %{_sysconfdir}/containerd/config.toml +%dir %{_sharedstatedir}/containerd +%dir %{_sharedstatedir}/containerd/opt + + +%changelog +%autochangelog diff --git a/anda/docker/containerd/containerd.toml b/anda/docker/containerd/containerd.toml new file mode 100644 index 0000000000..4a76ac46c2 --- /dev/null +++ b/anda/docker/containerd/containerd.toml @@ -0,0 +1,9 @@ +version = 2 + +[plugins] + [plugins."io.containerd.grpc.v1.cri"] + [plugins."io.containerd.grpc.v1.cri".cni] + bin_dir = "/usr/libexec/cni/" + conf_dir = "/etc/cni/net.d" + [plugins."io.containerd.internal.v1.opt"] + path = "/var/lib/containerd/opt" diff --git a/anda/docker/containerd/update.rhai b/anda/docker/containerd/update.rhai new file mode 100644 index 0000000000..2ff7c6b2db --- /dev/null +++ b/anda/docker/containerd/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("containerd/containerd")); diff --git a/anda/moby-extras/moby-buildx/anda.hcl b/anda/docker/moby-buildx/anda.hcl similarity index 100% rename from anda/moby-extras/moby-buildx/anda.hcl rename to anda/docker/moby-buildx/anda.hcl diff --git a/anda/moby-extras/moby-buildx/moby-buildx.spec b/anda/docker/moby-buildx/moby-buildx.spec similarity index 100% rename from anda/moby-extras/moby-buildx/moby-buildx.spec rename to anda/docker/moby-buildx/moby-buildx.spec diff --git a/anda/moby-extras/moby-buildx/update.rhai b/anda/docker/moby-buildx/update.rhai similarity index 100% rename from anda/moby-extras/moby-buildx/update.rhai rename to anda/docker/moby-buildx/update.rhai diff --git a/anda/moby-extras/moby-compose/anda.hcl b/anda/docker/moby-compose/anda.hcl similarity index 100% rename from anda/moby-extras/moby-compose/anda.hcl rename to anda/docker/moby-compose/anda.hcl diff --git a/anda/moby-extras/moby-compose/moby-compose.spec b/anda/docker/moby-compose/moby-compose.spec similarity index 98% rename from anda/moby-extras/moby-compose/moby-compose.spec rename to anda/docker/moby-compose/moby-compose.spec index cec8f78e98..14756e2dfd 100644 --- a/anda/moby-extras/moby-compose/moby-compose.spec +++ b/anda/docker/moby-compose/moby-compose.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: moby-compose -Version: 2.23.1 +Version: 2.23.3 Release: 1%{?dist} Summary: Define and run multi-container applications with Docker diff --git a/anda/moby-extras/moby-compose/update.rhai b/anda/docker/moby-compose/update.rhai similarity index 100% rename from anda/moby-extras/moby-compose/update.rhai rename to anda/docker/moby-compose/update.rhai diff --git a/anda/docker/moby-engine/.gitignore b/anda/docker/moby-engine/.gitignore new file mode 100644 index 0000000000..d310b090e3 --- /dev/null +++ b/anda/docker/moby-engine/.gitignore @@ -0,0 +1,59 @@ +/2d0083d657f82c47044c8d3948ba434b622fe2fd.tar.gz +/425e105d5a03fabd737a126ad93d62a9eeede87f.tar.gz +/894b81a4b802e4eb2a91d1ce216b8817763c29fb.tar.gz +/e7933d41e7b206756115aa9df5e0599fc5169742.tar.gz +/fec3683b971d9c3ef73f284f176672c44b448662.tar.gz +/0dd43dd87fd530113bf44c9bba9ad8b20ce4637f.tar.gz +/7141c199a2edb2a90b778175f836f9dd2a22c95a.tar.gz +/264bffcb88c1b6b7471c04e3c6b3f301233a544b.tar.gz +/afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3.tar.gz +/bf2bd42abc0a3734f12b5ec724e571434e42c669.tar.gz +/2e24aed516bd5c836e11378bb457dd612aa868ed.tar.gz +/42e35e61f352e527082521280d5ea3761f0dee50.tar.gz +/4484c46d9d1a2d10b8fc662923ad586daeedb04f.tar.gz +/026aabaa659832804b01754aaadd2c0f420c68b6.tar.gz +/de40ad007797e0dcd8b7126f27bb87401d224240.tar.gz +/moby-v20.10.5.tar.gz +/cli-v20.10.5.tar.gz +/moby-v20.10.6.tar.gz +/cli-v20.10.6.tar.gz +/moby-v20.10.7.tar.gz +/cli-v20.10.7.tar.gz +/cli-v20.10.8.tar.gz +/moby-v20.10.8.tar.gz +/cli-v20.10.9.tar.gz +/moby-v20.10.9.tar.gz +/cli-v20.10.10.tar.gz +moby-v20.10.10.tar.gz +/cli-v20.10.11.tar.gz +/moby-v20.10.11.tar.gz +/cli-v20.10.12.tar.gz +/moby-v20.10.12.tar.gz +/cli-20.10.12.tar.gz +/moby-20.10.12.tar.gz +/tini-de40ad0.tar.gz +/cli-20.10.14.tar.gz +/moby-20.10.14.tar.gz +/cli-20.10.15.tar.gz +/moby-20.10.15.tar.gz +/cli-20.10.16.tar.gz +/moby-20.10.16.tar.gz +/cli-20.10.17.tar.gz +/moby-20.10.17.tar.gz +/cli-20.10.18.tar.gz +/moby-20.10.18.tar.gz +/cli-20.10.19.tar.gz +/moby-20.10.19.tar.gz +/cli-20.10.20.tar.gz +/moby-20.10.20.tar.gz +/cli-20.10.21.tar.gz +/moby-20.10.21.tar.gz +/cli-20.10.22.tar.gz +/moby-20.10.22.tar.gz +/moby-20.10.23.tar.gz +/cli-20.10.23.tar.gz +/moby-23.0.4.tar.gz +/cli-23.0.4.tar.gz +/tini-0b44d36.tar.gz +/cli-24.0.5.tar.gz +/moby-24.0.5.tar.gz diff --git a/anda/docker/moby-engine/README.md b/anda/docker/moby-engine/README.md new file mode 100644 index 0000000000..57607ed02e --- /dev/null +++ b/anda/docker/moby-engine/README.md @@ -0,0 +1,3 @@ +# moby-engine + +The moby-engine package \ No newline at end of file diff --git a/anda/docker/moby-engine/anda.hcl b/anda/docker/moby-engine/anda.hcl new file mode 100644 index 0000000000..be47166b46 --- /dev/null +++ b/anda/docker/moby-engine/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "moby-engine.spec" + } +} \ No newline at end of file diff --git a/anda/docker/moby-engine/docker.service b/anda/docker/moby-engine/docker.service new file mode 100644 index 0000000000..41cb0e397e --- /dev/null +++ b/anda/docker/moby-engine/docker.service @@ -0,0 +1,38 @@ +[Unit] +Description=Docker Application Container Engine +Documentation=https://docs.docker.com +After=docker.socket network-online.target firewalld.service +Requires=docker.socket +Wants=network-online.target + +[Service] +Type=notify +EnvironmentFile=-/etc/sysconfig/docker +# the default is not to use systemd for cgroups because the delegate issues still +# exists and systemd currently does not support the cgroup feature set required +# for containers run by docker +ExecStart=/usr/bin/dockerd \ + --host=fd:// \ + --exec-opt native.cgroupdriver=systemd \ + $OPTIONS +ExecReload=/bin/kill -s HUP $MAINPID +# Having non-zero Limit*s causes performance problems due to accounting overhead +# in the kernel. We recommend using cgroups to do container-local accounting. +LimitNOFILE=infinity +LimitNPROC=infinity +LimitCORE=infinity +# Uncomment TasksMax if your systemd version supports it. +# Only systemd 226 and above support this version. +#TasksMax=infinity +TimeoutStartSec=0 +# set delegate yes so that systemd does not reset the cgroups of docker containers +#Delegate=yes +# kill only the docker process, not all processes in the cgroup +KillMode=process +# restart the docker process if it exits prematurely +Restart=on-failure +StartLimitBurst=3 +StartLimitInterval=60s + +[Install] +WantedBy=multi-user.target diff --git a/anda/docker/moby-engine/docker.sysconfig b/anda/docker/moby-engine/docker.sysconfig new file mode 100644 index 0000000000..6ba9fd7e8c --- /dev/null +++ b/anda/docker/moby-engine/docker.sysconfig @@ -0,0 +1,10 @@ +# /etc/sysconfig/docker + +# Modify these options if you want to change the way the docker daemon runs +OPTIONS="--selinux-enabled \ + --log-driver=journald \ + --live-restore \ + --default-ulimit nofile=1024:1024 \ + --init-path /usr/libexec/docker/docker-init \ + --userland-proxy-path /usr/libexec/docker/docker-proxy \ +" diff --git a/anda/docker/moby-engine/generate-docs.sh b/anda/docker/moby-engine/generate-docs.sh new file mode 100644 index 0000000000..09fb5cb7bd --- /dev/null +++ b/anda/docker/moby-engine/generate-docs.sh @@ -0,0 +1,12 @@ +cd man +for FILE in *.md; do + base="$(basename "$FILE")" + name="${base%.md}" + num="${name##*.}" + if [ -z "$num" ] || [ "$name" = "$num" ]; then + # skip files that aren't of the format xxxx.N.md (like README.md) + continue + fi + mkdir -p "./man${num}" + (set -x ;go-md2man -in "$FILE" -out "./man${num}/${name}") +done diff --git a/anda/docker/moby-engine/moby-engine-systemd-sysusers.conf b/anda/docker/moby-engine/moby-engine-systemd-sysusers.conf new file mode 100644 index 0000000000..fafc51244a --- /dev/null +++ b/anda/docker/moby-engine/moby-engine-systemd-sysusers.conf @@ -0,0 +1,2 @@ +#Type Name ID +g docker - diff --git a/anda/docker/moby-engine/moby-engine.spec b/anda/docker/moby-engine/moby-engine.spec new file mode 100644 index 0000000000..3dfaa45ece --- /dev/null +++ b/anda/docker/moby-engine/moby-engine.spec @@ -0,0 +1,559 @@ +# This specfile is licensed under: +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: Fedora Project Authors +# SPDX-FileCopyrightText: 2022 Maxwell G +# See %%{name}.spec.license for the full license text. + +# disable debuginfo for now +%global debug_package %{nil} + +# moby +%global goipath_moby github.com/docker/docker +%global git_moby https://%%{goipath_moby} +#%%global commit_moby 9fdeb9c3de2f2d9f5799be373f27b2f9df44609d +#%%global shortcommit_moby %%(c=%%{commit_moby}; echo ${c:0:7}) + +# cli +%global goipath_cli github.com/docker/cli +%global git_cli https://%%{goipath_cli} +#%%global commit_cli baeda1f82a10204ec5708d5fbba130ad76cfee49 +#%%global shortcommit_cli %%(c=%%{commit_cli}; echo ${c:0:7}) + +# tini +%global git_tini https://github.com/krallin/tini +%global commit_tini 0b44d3665869e46ccbac7414241b8256d6234dc4 +%global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7}) + +%global anda_go_build go build -buildmode=pie -v -x + +Name: moby-engine +Version: 24.0.5 +Release: 1%{?dist} +Summary: The open-source application container engine +License: Apache-2.0 +Source0: %{git_moby}/archive/v%{version}/moby-%{version}.tar.gz +Source1: %{git_cli}/archive/v%{version}/cli-%{version}.tar.gz +Source2: %{git_tini}/archive/%{commit_tini}/tini-%{shortcommit_tini}.tar.gz +Source3: docker.service +Source4: docker.sysconfig +Source5: moby-engine-systemd-sysusers.conf +Source6: generate-docs.sh + +# Seperate file containing virtual provides for bundled deps that's %%include'd in the specfile. +#Source100: provides.spec.inc +# Specfile license +Source200: moby-engine.spec.license + +URL: https://www.docker.com + +ExclusiveArch: %{golang_arches} + +BuildRequires: pkgconfig(libbtrfsutil) +BuildRequires: pkgconfig(devmapper) +BuildRequires: golang +BuildRequires: go-rpm-macros +BuildRequires: go-md2man +BuildRequires: pkgconfig(libseccomp) >= 2.3.0 +BuildRequires: make +BuildRequires: pkgconfig(audit) +BuildRequires: pkgconfig(systemd) +BuildRequires: systemd-rpm-macros +BuildRequires: firewalld-filesystem + +# Build dependencies for tini +BuildRequires: cmake +BuildRequires: glibc-static + +# required packages on install +Requires: container-selinux +Requires: containerd +Requires: iptables +Requires: pigz +Requires: runc +Requires: systemd +Requires: tar +Requires: xz + +# Resolves: rhbz#1165615 +Requires: device-mapper-libs >= 1.02.90-1 + +# Replace the old Docker packages +Provides: docker = %{version}-%{release} +Provides: docker-latest = %{version}-%{release} + +# conflicting packages +Conflicts: docker-ce +Conflicts: docker-ce-cli +Conflicts: docker-common +Conflicts: docker-ee +Conflicts: docker-engine-cs +Conflicts: docker-io +Conflicts: podman-docker + +%description +Docker is an open source project to build, ship and run any application as a +lightweight container. + +Docker containers are both hardware-agnostic and platform-agnostic. This means +they can run anywhere, from your laptop to the largest EC2 compute instance and +everything in between - and they don't require you to use a particular +language, framework or packaging system. That makes them great building blocks +for deploying and scaling web apps, databases, and backend services without +depending on a particular stack or provider. + +%package fish-completion +Summary: Fish completion files for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Requires: fish +Provides: docker-fish-completion = %{version}-%{release} + +%description fish-completion +This package installs %{summary}. + +%package zsh-completion +Summary: Zsh completion files for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Requires: zsh +Provides: docker-zsh-completion = %{version}-%{release} + +%description zsh-completion +This package installs %{summary}. + +%package nano +Summary: GNU nano syntax highlighting files for Moby +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Requires: nano + +%description nano +This package installs %{summary}. + +%prep +%setup -q -a 1 -a 2 -n moby-%{version} +ln -s vendor.mod go.mod +#export GOPATH="$PWD" +#go get -x +#go mod vendor +# correct rpmlint errors for bash completion +sed -i '/env bash/d' cli-%{version}/contrib/completion/bash/docker +cp %{SOURCE6} cli-%{version}/scripts/docs/generate-man.sh +%build +mkdir -p _build/bin +export CGO_ENABLED=1 + +export DISABLE_WARN_OUTSIDE_CONTAINER=1 + +#go mod download + + +# build docker-proxy / libnetwork +( + + # Link source and vendored deps into local GOPATH. + #ln -fns ../../.. src/%{goipath_moby} + #export GOPATH="${PWD}" + %anda_go_build -o _build/bin/docker-proxy github.com/docker/docker/cmd/docker-proxy +) + +# build tini (installed as docker-init) +( + cd tini-%{commit_tini} + %cmake + make tini-static -C "%{__cmake_builddir}" +) + +%global buildtime %(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +"%Y-%m-%dT%H:%M:%SZ") +# build engine +( + mkdir -p src/github.com/docker + # Link source and vendored deps into local GOPATH. + ln -fns ../../.. src/%{goipath_moby} + # Build using source and vendored deps in local GOPATH. + export GOPATH="${PWD}" + export GO111MODULE=off + export LDFLAGS="-w" + export LDFLAGS+=" -X github.com/docker/docker/dockerversion.Version=%{version}" + export LDFLAGS+=" -X github.com/docker/docker/dockerversion.GitCommit=%{shortcommit_moby}" + export LDFLAGS+=" -X github.com/docker/docker/dockerversion.IAmStatic=false" + export LDFLAGS+=" -X 'github.com/docker/docker/dockerversion.BuildTime=%{buildtime}'" + export DOCKER_BUILDTAGS="seccomp selinux journald" + export BUILDTAGS="${DOCKER_BUILDTAGS}" + export GOBUILDTAGS="${BUILDTAGS}" + %anda_go_build -o _build/bin/dockerd %{goipath_moby}/cmd/dockerd + # VERSION=%%{version} DOCKER_GITCOMMIT=%%{shortcommit_moby} bash sh dynbinary + # mv bundles/dynbinary-daemon/dockerd-%%{version} _build/bin/dockerd +) + +# build cli +( + cd cli-%{version} + mkdir -p src/github.com/docker + # Link source and vendored deps into local GOPATH. + ln -fns ../../.. src/%{goipath_cli} + # export DISABLE_WARN_OUTSIDE_CONTAINER=1 + # Build using source and vendored deps in local GOPATH. + export GOPATH="${PWD}" + export GO111MODULE=off + export LDFLAGS="\ + -w \ + -X \"github.com/docker/cli/cli/version.GitCommit=%{shortcommit_cli}\" \ + -X \"github.com/docker/cli/cli/version.BuildTime=%{buildtime}\" \ + -X \"github.com/docker/cli/cli/version.Version=%{version}\" \ + " + export BUILDTAGS="pkcs11" + export GOBUILDTAGS="${BUILDTAGS}" + %anda_go_build -o ../_build/bin/docker %{goipath_cli}/cmd/docker + # make VERSION=%%{version} GITCOMMIT=%%{shortcommit_cli} dynbinary + + scripts/docs/generate-man.sh +) + +%install +# install binary +install -Dpm 755 _build/bin/docker _build/bin/dockerd -t %{buildroot}%{_bindir}/ + +# install proxy +install -Dpm 755 _build/bin/docker-proxy -t %{buildroot}%{_libexecdir}/docker/ + +# install tini +install -Dpm 755 tini-%{commit_tini}/%{__cmake_builddir}/tini-static %{buildroot}%{_libexecdir}/docker/docker-init + +# install udev rules +install -Dpm 644 contrib/udev/80-docker.rules -t %{buildroot}%{_usr}/lib/udev/rules.d/ + +# add init scripts +install -Dpm 644 %{SOURCE3} contrib/init/systemd/docker.socket -t %{buildroot}%{_unitdir}/ + +# for additional args +install -Dpm 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/docker + +# Install sysusers configuration +install -Dpm 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/moby-engine.conf + +# add bash, zsh, and fish completions +install -Dpm 644 cli-%{version}/contrib/completion/bash/docker -t %{buildroot}%{_datadir}/bash-completion/completions/ +install -Dpm 644 cli-%{version}/contrib/completion/zsh/_docker -t %{buildroot}%{_datadir}/zsh/site-functions/ +install -Dpm 644 cli-%{version}/contrib/completion/fish/docker.fish -t %{buildroot}%{_datadir}/fish/vendor_completions.d/ + +# install manpages +install -Dpm 644 cli-%{version}/man/man1/*.1 -t %{buildroot}%{_mandir}/man1/ +install -Dpm 644 cli-%{version}/man/man5/*.5 -t %{buildroot}%{_mandir}/man5/ +install -Dpm 644 cli-%{version}/man/man8/*.8 -t %{buildroot}%{_mandir}/man8/ + +# add nano files +install -Dpm 644 contrib/syntax/nano/Dockerfile.nanorc -t %{buildroot}%{_datadir}/nano/ + +for cli_file in LICENSE MAINTAINERS NOTICE README.md; do + cp "cli-%{version}/$cli_file" "cli-$cli_file" +done + +%pre +%sysusers_create_compat %{SOURCE5} + +%post +%systemd_post docker.service docker.socket +%firewalld_reload + +%preun +%systemd_preun docker.service docker.socket + +%postun +%systemd_postun_with_restart docker.service + +%files +%license LICENSE cli-LICENSE +%doc AUTHORS CONTRIBUTING.md MAINTAINERS NOTICE README.md +%doc cli-MAINTAINERS cli-NOTICE cli-README.md +%config(noreplace) %{_sysconfdir}/sysconfig/docker +%{_bindir}/docker +%{_bindir}/dockerd +%dir %{_libexecdir}/docker/ +%{_libexecdir}/docker/docker-proxy +%{_libexecdir}/docker/docker-init +%{_usr}/lib/udev/rules.d/80-docker.rules +%{_unitdir}/docker.service +%{_unitdir}/docker.socket +%{_sysusersdir}/moby-engine.conf +%{_datadir}/bash-completion/completions/docker +%{_mandir}/man1/docker*.1* +%{_mandir}/man5/{Dockerfile,docker-config-json}.5* +%{_mandir}/man8/dockerd.8* + +%files zsh-completion +%{_datadir}/zsh/site-functions/_docker + +%files fish-completion +%{_datadir}/fish/vendor_completions.d/docker.fish + +%files nano +%dir %{_datadir}/nano +%{_datadir}/nano/Dockerfile.nanorc + +%changelog +* Wed Aug 23 2023 LuK1337 - 24.0.5-1 +- Update moby-engine to 24.0.5 + +* Thu Jul 20 2023 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sun Jan 29 2023 John Ghatas +- Update moby-engine to 23.0.4 + +* Sun Jan 29 2023 Sérgio Basto +- Update moby-engine to 20.10.23 + +* Thu Jan 19 2023 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sun Jan 01 2023 Sérgio Basto +- Update moby-engine to 20.10.22 + +* Wed Dec 14 2022 Dan Čermák - 20.10.21-1 +- Update to 20.10.21 +- Fix build, use libnetwork from golang-github-docker-0:22.06.0~beta + +* Thu Oct 20 2022 Jan Kuparinen - 20.10.20-1 +- Update to 20.10.20. +- Mitigates CVE-2022-39253 + +* Tue Oct 18 2022 Jan Kuparinen - 20.10.19-1 +- Update to 20.10.19. + +* Sat Sep 10 2022 Maxwell G - 20.10.18-1 +- Update to 20.10.18. +- Mitigates CVE-2022-36109 / GHSA-rc4r-wh2q-q6c4 + +* Tue Aug 30 2022 Luca BRUNO - 20.10.17-8 +- Move 'docker' group creation logic to a sysusers.d fragment + Resolves: rhbz#1745936 + +* Fri Aug 05 2022 Maxwell G - 20.10.17-7 +- Migrate to SPDX license identifiers +- Generate debuginfo +- Specfile improvements + +* Thu Jul 21 2022 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jul 19 2022 Maxwell G - 20.10.17-5 +- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in + golang + +* Mon Jul 04 2022 Maxwell G - 20.10.17-4 +- Only build on %%golang_arches (i.e. where golang is available). + +* Sun Jun 19 2022 Maxwell G - 20.10.17-3 +- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, + CVE-2022-29526, CVE-2022-30629. + +* Sat Jun 11 2022 Maxwell G - 20.10.17-2 +- Rebuild for new golang-github-docker-libnetwork + +* Fri Jun 10 2022 Maxwell G - 20.10.17-1 +- Update to 20.10.17. Fixes rhbz#2095714. + +* Fri May 13 2022 Maxwell G - 20.10.16-1 +- Update to 20.10.16. + +* Sat May 07 2022 Maxwell G - 20.10.15-1 +- Update to 20.10.15 (rhbz#2082501). +- Fix BUILDTAGS (rhbz#2082924). +- Make non-binary subpackages noarch. + +* Mon Apr 11 2022 Maxwell G - 20.10.14-1 +- Update to 20.10.14. Fixes rhbz#2063052. +- Mitigate CVE-2022-24769. + +* Mon Jan 31 2022 Maxwell G - 20.10.12-3 +- Fixes FTBFS. Closes rhbz#2046748. +- Use %%anda_go_build instead of Makefile to build binaries +- Add explanatory comments. +- Normalize install commands +- Make compliant with SourceURL Guidelines +- Remove no longer necessary `ExcludeArch: ppc64`. + +* Thu Jan 20 2022 Fedora Release Engineering - 20.10.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Jan 11 2022 Maxwell G - 20.10.12-1 +- Update to 20.10.12. Fixes rhbz#2032534. +- Install zsh completions to the correct directory. Fixes rhbz#2038888. + +* Mon Nov 22 2021 Olivier Lemasle - 20.10-11-1 +- Update to upstream 20.10.11 (fixes rhbz#2024384) +- Mitigates CVE-2021-41190 (fixes rhbz#2024940) + +* Fri Oct 29 2021 Maxwell G - 20.10.10-1 +- Update to 20.10.10 (fixes rhbz#2015385) +- Update virtual provides + +* Fri Oct 08 2021 Maxwell G - 20.10.9-1 +- Update to 20.10.9 (fixes rhbz#2010508) +- Patch seccomp policy to fix clone3() issue (fixes rhbz#2011523 and rhbz#1988199) + +* Sun Aug 15 2021 Olivier Lemasle - 20.10.8-1 +- Update to upstream 20.10.8 (fixes rhbz#1990148) +- Fix seccomp support (fixes rhbz#1986092) + +* Sun Aug 15 2021 Dusty Mabe - 20.10.7-3 +- Remove `Requires(post)` on firewalld-filesystem. + +* Thu Jul 22 2021 Fedora Release Engineering - 20.10.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jul 16 2021 Olivier Lemasle - 20.10.7-1 +- Update to upstream 20.10.7 (fixes rhbz#1967390) + +* Tue May 04 2021 Olivier Lemasle - 20.10.6-2 +- Add conflict with podman-docker + +* Tue Apr 20 2021 Olivier Lemasle - 20.10.6-1 +- Update to upstream 20.10.6 (#1948605) +- Re-bundle moby dependencies to fix gRPC issues with Swarm + (https://github.com/coreos/fedora-coreos-tracker/issues/793) + +* Sun Mar 14 2021 Olivier Lemasle - 20.10.5-1 +- Update to latest upstream 20.10.5 - fixes #1903426 +- Upstream brings compatibility with cgroups v2 - fixes #1746355 +- Remove package moby-engine-vim (dockerfile.vim has been merged in upstream vim) +- Remove firewalld docker zone, since dockerd can now communicate with firewalld - fixes #1852680 +- Build dockerd and docker-proxy from unbundled source packages +- Remove fixed storage-driver (cf. https://src.fedoraproject.org/rpms/moby-engine/pull-request/6) + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 19.03.13-3.ce.git4484c46 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Tue Jan 26 2021 Fedora Release Engineering - 19.03.13-2.ce.git4484c46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Oct 02 2020 Olivier Lemasle - 19.03.13-1.ce.git4484c46 +- Update to upstream 19.03.13 (#1837641) + +* Fri Oct 02 2020 Olivier Lemasle - 19.03.11-4.ce.git42e35e6 +- Fix FTBFS: adapt to change to CMake builds (#1864160) + +* Sat Aug 01 2020 Fedora Release Engineering - 19.03.11-3.ce.git42e35e6 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 19.03.11-2.ce.git42e35e6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun Jun 07 2020 Olivier Lemasle - 19.03.11-1.ce.git42e35e6 +- Update to upstream 19.03.11 to prevent CVE-2020-13401 + +* Thu May 07 2020 Olivier Lemasle - 19.03.8-2.ce.gitafacb8b +- Configure storage-driver explicitely (fixes #1832301) +- Add firewalld zone: trust interface docker0, as firewalld now uses nftables + by default and docker communicates with iptables (fixes #1817022) + +* Mon Mar 16 2020 Olivier Lemasle - 19.03.8-1.ce.gitafacb8b +- Update to latest upstream release - Docker CE 19.03.8 +- Prune unused BuildRequires + +* Sun Mar 8 2020 Olivier Lemasle - 19.03.7-2.ce.git7141c19 +- Add Conflicts with docker-ce-cli and Obsoletes docker-common + +* Sat Mar 7 2020 Olivier Lemasle - 19.03.7-1.ce.git7141c19 +- Update to latest upstream release - Docker CE 19.03.7 +- Add Epoch: 2 to Obsoletes for docker and docker-latest + +* Wed Jan 29 2020 Fedora Release Engineering - 18.09.8-3.ce.git0dd43dd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 18.09.8-2.ce.git0dd43dd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 18 2019 Olivier Lemasle - 18.09.8-1.ce.git0dd43dd +- Update to latest upstream release - Docker CE 18.09.8 + +* Sat Jul 13 2019 Olivier Lemasle - 18.09.7-5.ce.git2d0083d +- Move docker-init and docker-proxy to /usr/libexec/docker +- Update moby-engine-nano summary to follow guidelines + +* Sat Jul 13 2019 Olivier Lemasle - 18.09.7-4.ce.git2d0083d +- Add nofile ulimit to default docker daemon options (#1715254, #1708115) + +* Fri Jul 12 2019 Olivier Lemasle - 18.09.7-3.ce.git2d0083d +- rebuilt + +* Fri Jul 12 2019 Olivier Lemasle - 18.09.7-2.ce.git2d0083d +- Depend on packaged versions "runc" and "containerd" instead of building them. + +* Thu Jun 27 2019 David Michael - 18.09.7-1.ce.git2d0083d +- Update docker-ce to commit 2d0083d (version 18.09.7). +- Update runc to commit 425e105. +- Update containerd to commit 894b81a (1.2.6). +- Update docker-proxy to commit e7933d4. + +* Tue May 14 2019 David Michael - 18.09.6-1.ce.git481bc77 +- Update docker-ce to commit 481bc77 (version 18.09.6). +- Update docker-proxy to commit 872f0a8. +- Obsolete and provide the docker and docker-latest packages. (#1700006) + +* Thu Apr 11 2019 David Michael - 18.09.5-1.ce.gite8ff056 +- Update docker-ce to commit e8ff056 (version 18.09.5). +- Update docker-runc to commit 2b18fe1. +- Update docker-containerd to commit bb71b10 (version 1.2.5). +- Update docker-proxy to commit 4725f21. +- Report the correct engine version. +- Install symlinks to unprefixed runc/containerd program names. + +* Thu Mar 28 2019 David Michael - 18.06.3-2.ce.gitd7080c1 +- Conflict with docker-common. (#1693397) + +* Thu Feb 21 2019 David Michael - 18.06.3-1.ce.gitd7080c1 +- Update docker-ce to commit d7080c1 (version 18.06.3). + +* Tue Feb 12 2019 David Michael - 18.06.2-1.ce.git6d37f41 +- Update docker-ce to commit 6d37f41 (version 18.06.2). +- Update docker-runc to commit a592beb. + +* Mon Feb 11 2019 David Michael - 18.06.1-3.ce.gite68fc7a +- Apply a runc patch for CVE-2019-5736. + +* Fri Feb 01 2019 Fedora Release Engineering - 18.06.1-2.ce.gite68fc7a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Nov 29 2018 David Michael - 18.06.1-1.ce.gite68fc7a +- Update docker-ce to commit e68fc7a (version 18.06.1). +- Update docker-runc to commit 69663f0. +- Update docker-containerd to commit 468a545 (version 1.1.2). +- Update docker-proxy to commit 3ac297b. +- Backport a fix for mounting named volumes. +- Create a "docker" group for non-root Docker access. +- Support systemd socket-activation. +- Make runc and containerd commit IDs match their expected values. +- Preserve containerd debuginfo. + +* Mon Nov 12 2018 Marcin Skarbek - 18.06.0-2.ce.git0ffa825 +- add configuration file +- update service file + +* Sat Aug 18 2018 Lokesh Mandvekar - 18.06.0-1.ce.git0ffa825 +- Resolves: #1539161 - first upload to Fedora +- built docker-ce commit 0ffa825 +- built docker-runc commit ad0f5255 +- built docker-containerd commit a88b631 +- built docker-proxy commit a79d368 +- built docker-init commit fec3683 + +* Tue Mar 20 2018 Lokesh Mandvekar - 17.03.2-4.ce.gitf5ec1e2 +- correct some rpmlint errors + +* Wed Feb 21 2018 Lokesh Mandvekar - 17.03.2-3.ce +- docker-* symlinks to moby-* (RE: gh PR 34226) + +* Wed Feb 21 2018 Lokesh Mandvekar - 17.03.2-2.ce +- rename binaries as per upstream gh PR 34226 + +* Fri Jan 26 2018 Lokesh Mandvekar - 17.03.2-1 +- initial build +- built moby commit f5ec1e2 +- built cli commit 4b61f56 +- built docker-runc commit 2d41c047 +- built docker-containerd commit 3addd84 +- built docker-proxy commit 7b2b1fe diff --git a/anda/docker/moby-engine/moby-engine.spec.license b/anda/docker/moby-engine/moby-engine.spec.license new file mode 100644 index 0000000000..2071b23b0e --- /dev/null +++ b/anda/docker/moby-engine/moby-engine.spec.license @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/anda/docker/moby-engine/provides.spec.inc b/anda/docker/moby-engine/provides.spec.inc new file mode 100644 index 0000000000..847f007ed0 --- /dev/null +++ b/anda/docker/moby-engine/provides.spec.inc @@ -0,0 +1,108 @@ +# Bundled dependencies +Provides: bundled(tini-static) +Provides: bundled(golang(github.com/docker/docker)) +Provides: bundled(golang(github.com/docker/cli)) +# grep -v -e '^$' -e '^#' cli-24.0.5/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +Provides: bundled(golang(github.com/aws/aws-sdk-go)) = f831d5a0822a1ad72420ab18c6269bca1ddaf490 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go)) = 4650843026a7fdec254a8d9cf893693a254edd0b +Provides: bundled(golang(github.com/Azure/go-autorest)) = eaa7994b2278094c904d31993d26f56324db3052 +Provides: bundled(golang(github.com/beorn7/perks)) = 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 +Provides: bundled(golang(github.com/bshuster-repo/logrus-logstash-hook)) = d2c0ecc1836d91814e15e23bb5dc309c3ef51f4a +Provides: bundled(golang(github.com/bugsnag/bugsnag-go)) = b1d153021fcd90ca3f080db36bec96dc690fb274 +Provides: bundled(golang(github.com/bugsnag/osext)) = 0dd3f918b21bec95ace9dc86c7e70266cfc5c702 +Provides: bundled(golang(github.com/bugsnag/panicwrap)) = e2c28503fcd0675329da73bf48b33404db873782 +Provides: bundled(golang(github.com/denverdino/aliyungo)) = afedced274aa9a7fcdd47ac97018f0f8db4e5de2 +Provides: bundled(golang(github.com/dgrijalva/jwt-go)) = 4bbdd8ac624fc7a9ef7aec841c43d99b5fe65a29 +Provides: bundled(golang(github.com/docker/go-metrics)) = 399ea8c73916000c64c2c76e8da00ca82f8387ab +Provides: bundled(golang(github.com/docker/libtrust)) = fa567046d9b14f6aa788882a950d69651d230b21 +Provides: bundled(golang(github.com/garyburd/redigo)) = 535138d7bcd717d6531c701ef5933d98b1866257 +Provides: bundled(golang(github.com/go-ini/ini)) = 2ba15ac2dc9cdf88c110ec2dc0ced7fa45f5678c +Provides: bundled(golang(github.com/golang/protobuf)) = 8d92cf5fc15a4382f8964b08e1f42a75c0591aa3 +Provides: bundled(golang(github.com/gorilla/handlers)) = 60c7bfde3e33c201519a200a4507a158cc03a17b +Provides: bundled(golang(github.com/gorilla/mux)) = 599cba5e7b6137d46ddf58fb1765f5d928e69604 +Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 +Provides: bundled(golang(github.com/jmespath/go-jmespath)) = bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d +Provides: bundled(golang(github.com/marstr/guid)) = 8bd9a64bf37eb297b492a4101fb28e80ac0b290f +Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = c12348ce28de40eed0136aa2b644d0ee0650e56c +Provides: bundled(golang(github.com/miekg/dns)) = 271c58e0c14f552178ea321a545ff9af38930f39 +Provides: bundled(golang(github.com/mitchellh/mapstructure)) = 482a9fd5fa83e8c4e7817413b80f3eb8feec03ef +Provides: bundled(golang(github.com/ncw/swift)) = a0320860b16212c2b59b4912bb6508cda1d7cee6 +Provides: bundled(golang(github.com/opencontainers/go-digest)) = a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb +Provides: bundled(golang(github.com/opencontainers/image-spec)) = 67d2d5658fe0476ab9bf414cec164077ebff3920 +Provides: bundled(golang(github.com/prometheus/client_golang)) = c332b6f63c0658a65eca15c0e5247ded801cf564 +Provides: bundled(golang(github.com/prometheus/client_model)) = 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c +Provides: bundled(golang(github.com/prometheus/common)) = 89604d197083d4781071d3c65855d24ecfb0a563 +Provides: bundled(golang(github.com/prometheus/procfs)) = cb4147076ac75738c9a7d279075a253c0cc5acbd +Provides: bundled(golang(github.com/satori/go.uuid)) = f58768cc1a7a7e77a3bd49e98cdd21419399b6a3 +Provides: bundled(golang(github.com/Shopify/logrus-bugsnag)) = 577dee27f20dd8f1a529f82210094af593be12bd +Provides: bundled(golang(github.com/sirupsen/logrus)) = 3d4380f53a34dcdc95f0c1db702615992b38d9a4 +Provides: bundled(golang(github.com/spf13/cobra)) = 312092086bed4968099259622145a0c9ae280064 +Provides: bundled(golang(github.com/spf13/pflag)) = 5644820622454e71517561946e3d94b9f9db6842 +Provides: bundled(golang(github.com/xenolf/lego)) = a9d8cec0e6563575e5868a005359ac97911b5985 +Provides: bundled(golang(github.com/yvasiyarov/go-metrics)) = 57bccd1ccd43f94bb17fdd8bf3007059b802f85e +Provides: bundled(golang(github.com/yvasiyarov/gorelic)) = a9bba5b9ab508a086f9a12b8c51fab68478e2128 +Provides: bundled(golang(github.com/yvasiyarov/newrelic_platform_go)) = b21fdbd4370f3717f3bbd2bf41c223bc273068e6 +Provides: bundled(golang(golang.org/x/crypto)) = c10c31b5e94b6f7a0283272dc2bb27163dcea24b +Provides: bundled(golang(golang.org/x/net)) = 4876518f9e71663000c348837735820161a42df7 +Provides: bundled(golang(golang.org/x/oauth2)) = 045497edb6234273d67dbc25da3f2ddbc4c4cacf +Provides: bundled(golang(golang.org/x/time)) = a4bde12657593d5e90d0533a3e4fd95e635124cb +Provides: bundled(golang(google.golang.org/api)) = 9bf6e6e569ff057f75d9604a46c52928f17d2b54 +Provides: bundled(golang(google.golang.org/appengine)) = 12d5545dc1cfa6047a286d5e853841b6471f4c19 +Provides: bundled(golang(google.golang.org/cloud)) = 975617b05ea8a58727e6c1a06b6161ff4185a9f2 +Provides: bundled(golang(google.golang.org/grpc)) = d3ddb4469d5a1b949fc7a7da7c1d6a0d1b6de994 +Provides: bundled(golang(gopkg.in/check.v1)) = 64131543e7896d5bcc6bd5a76287eb75ea96c673 +Provides: bundled(golang(gopkg.in/square/go-jose.v1)) = 40d457b439244b546f023d056628e5184136899b +Provides: bundled(golang(gopkg.in/yaml.v2)) = v2.2.1 +Provides: bundled(golang(rsc.io/letsencrypt)) = e770c10b0f1a64775ae91d240407ce00d1a5bdeb +# grep -v -e '^$' -e '^#' moby-24.0.5/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' +Provides: bundled(golang(github.com/aws/aws-sdk-go)) = f831d5a0822a1ad72420ab18c6269bca1ddaf490 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go)) = 4650843026a7fdec254a8d9cf893693a254edd0b +Provides: bundled(golang(github.com/Azure/go-autorest)) = eaa7994b2278094c904d31993d26f56324db3052 +Provides: bundled(golang(github.com/beorn7/perks)) = 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 +Provides: bundled(golang(github.com/bshuster-repo/logrus-logstash-hook)) = d2c0ecc1836d91814e15e23bb5dc309c3ef51f4a +Provides: bundled(golang(github.com/bugsnag/bugsnag-go)) = b1d153021fcd90ca3f080db36bec96dc690fb274 +Provides: bundled(golang(github.com/bugsnag/osext)) = 0dd3f918b21bec95ace9dc86c7e70266cfc5c702 +Provides: bundled(golang(github.com/bugsnag/panicwrap)) = e2c28503fcd0675329da73bf48b33404db873782 +Provides: bundled(golang(github.com/denverdino/aliyungo)) = afedced274aa9a7fcdd47ac97018f0f8db4e5de2 +Provides: bundled(golang(github.com/dgrijalva/jwt-go)) = 4bbdd8ac624fc7a9ef7aec841c43d99b5fe65a29 +Provides: bundled(golang(github.com/docker/go-metrics)) = 399ea8c73916000c64c2c76e8da00ca82f8387ab +Provides: bundled(golang(github.com/docker/libtrust)) = fa567046d9b14f6aa788882a950d69651d230b21 +Provides: bundled(golang(github.com/garyburd/redigo)) = 535138d7bcd717d6531c701ef5933d98b1866257 +Provides: bundled(golang(github.com/go-ini/ini)) = 2ba15ac2dc9cdf88c110ec2dc0ced7fa45f5678c +Provides: bundled(golang(github.com/golang/protobuf)) = 8d92cf5fc15a4382f8964b08e1f42a75c0591aa3 +Provides: bundled(golang(github.com/gorilla/handlers)) = 60c7bfde3e33c201519a200a4507a158cc03a17b +Provides: bundled(golang(github.com/gorilla/mux)) = 599cba5e7b6137d46ddf58fb1765f5d928e69604 +Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 +Provides: bundled(golang(github.com/jmespath/go-jmespath)) = bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d +Provides: bundled(golang(github.com/marstr/guid)) = 8bd9a64bf37eb297b492a4101fb28e80ac0b290f +Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = c12348ce28de40eed0136aa2b644d0ee0650e56c +Provides: bundled(golang(github.com/miekg/dns)) = 271c58e0c14f552178ea321a545ff9af38930f39 +Provides: bundled(golang(github.com/mitchellh/mapstructure)) = 482a9fd5fa83e8c4e7817413b80f3eb8feec03ef +Provides: bundled(golang(github.com/ncw/swift)) = a0320860b16212c2b59b4912bb6508cda1d7cee6 +Provides: bundled(golang(github.com/opencontainers/go-digest)) = a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb +Provides: bundled(golang(github.com/opencontainers/image-spec)) = 67d2d5658fe0476ab9bf414cec164077ebff3920 +Provides: bundled(golang(github.com/prometheus/client_golang)) = c332b6f63c0658a65eca15c0e5247ded801cf564 +Provides: bundled(golang(github.com/prometheus/client_model)) = 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c +Provides: bundled(golang(github.com/prometheus/common)) = 89604d197083d4781071d3c65855d24ecfb0a563 +Provides: bundled(golang(github.com/prometheus/procfs)) = cb4147076ac75738c9a7d279075a253c0cc5acbd +Provides: bundled(golang(github.com/satori/go.uuid)) = f58768cc1a7a7e77a3bd49e98cdd21419399b6a3 +Provides: bundled(golang(github.com/Shopify/logrus-bugsnag)) = 577dee27f20dd8f1a529f82210094af593be12bd +Provides: bundled(golang(github.com/sirupsen/logrus)) = 3d4380f53a34dcdc95f0c1db702615992b38d9a4 +Provides: bundled(golang(github.com/spf13/cobra)) = 312092086bed4968099259622145a0c9ae280064 +Provides: bundled(golang(github.com/spf13/pflag)) = 5644820622454e71517561946e3d94b9f9db6842 +Provides: bundled(golang(github.com/xenolf/lego)) = a9d8cec0e6563575e5868a005359ac97911b5985 +Provides: bundled(golang(github.com/yvasiyarov/go-metrics)) = 57bccd1ccd43f94bb17fdd8bf3007059b802f85e +Provides: bundled(golang(github.com/yvasiyarov/gorelic)) = a9bba5b9ab508a086f9a12b8c51fab68478e2128 +Provides: bundled(golang(github.com/yvasiyarov/newrelic_platform_go)) = b21fdbd4370f3717f3bbd2bf41c223bc273068e6 +Provides: bundled(golang(golang.org/x/crypto)) = c10c31b5e94b6f7a0283272dc2bb27163dcea24b +Provides: bundled(golang(golang.org/x/net)) = 4876518f9e71663000c348837735820161a42df7 +Provides: bundled(golang(golang.org/x/oauth2)) = 045497edb6234273d67dbc25da3f2ddbc4c4cacf +Provides: bundled(golang(golang.org/x/time)) = a4bde12657593d5e90d0533a3e4fd95e635124cb +Provides: bundled(golang(google.golang.org/api)) = 9bf6e6e569ff057f75d9604a46c52928f17d2b54 +Provides: bundled(golang(google.golang.org/appengine)) = 12d5545dc1cfa6047a286d5e853841b6471f4c19 +Provides: bundled(golang(google.golang.org/cloud)) = 975617b05ea8a58727e6c1a06b6161ff4185a9f2 +Provides: bundled(golang(google.golang.org/grpc)) = d3ddb4469d5a1b949fc7a7da7c1d6a0d1b6de994 +Provides: bundled(golang(gopkg.in/check.v1)) = 64131543e7896d5bcc6bd5a76287eb75ea96c673 +Provides: bundled(golang(gopkg.in/square/go-jose.v1)) = 40d457b439244b546f023d056628e5184136899b +Provides: bundled(golang(gopkg.in/yaml.v2)) = v2.2.1 +Provides: bundled(golang(rsc.io/letsencrypt)) = e770c10b0f1a64775ae91d240407ce00d1a5bdeb diff --git a/anda/docker/moby-engine/sources b/anda/docker/moby-engine/sources new file mode 100644 index 0000000000..185f3bb5a2 --- /dev/null +++ b/anda/docker/moby-engine/sources @@ -0,0 +1,3 @@ +SHA512 (cli-24.0.5.tar.gz) = 765c67634d91d248b156d3e407398b98b7a0a89507bbac0310d4a68b95aa1a05e3af43c8b90bc10166748749d8cc36670619fc9efca110beefbdcd4385dc96be +SHA512 (moby-24.0.5.tar.gz) = cde2e47e7658b153399ee29154ec21eebf54b292185e07d43b968895dcfdfead95e4507fefb713859a4540f21d8007116d3ebeaa1fb7ba305fb2a0449ba1bee6 +SHA512 (tini-0b44d36.tar.gz) = 5294e877c369177b09c2a34f759e911f612f6977e960a63d46b6e5ebea790455dad972e91ca10c478693da637a5479d4e0b904efcfb5ae291e87e7e66674c752 diff --git a/anda/docker/moby-engine/update.sh b/anda/docker/moby-engine/update.sh new file mode 100755 index 0000000000..3089ca4027 --- /dev/null +++ b/anda/docker/moby-engine/update.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash +# SPDX-FileCopyrightText: 2022 Maxwell G (@gotmax23) +# SPDX-License-Identifier: MIT + +# USAGE: After bumping the version in moby-engine.spec and downloading the new +# sources, run this script in moby-engine's distgit repository to update the +# package's virtual Provides. + +set -euo pipefail + +# Note(gotmax23): I have a separate update.sh script in my $PATH. +# When that exists, this script will run that first. +# You can ignore this. +if command -v update.sh && [ "$#" -gt 0 ]; then + update.sh "$@" +fi + +spectool -g moby-engine.spec --define "_sourcedir ." +fedpkg prep + +version="$(rpmspec -D '_sourcedir %(pwd)' -q --srpm --qf '%{version}\n' *.spec)" + +cat << EOF > provides.spec.inc +# Bundled dependencies +Provides: bundled(tini-static) +Provides: bundled(golang(github.com/docker/docker)) +Provides: bundled(golang(github.com/docker/cli)) +# grep -v -e '^$' -e '^#' cli-${version}/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' +EOF + +grep -v -e '^$' -e '^#' "moby-${version}/cli-${version}/vendor/github.com/docker/distribution/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc + +cat << EOF >> provides.spec.inc +# grep -v -e '^$' -e '^#' moby-${version}/vendor/github.com/docker/distribution/vendor.conf | sort | awk '{print "Provides: bundled(golang("\$1")) = "\$2}' +EOF + +grep -v -e '^$' -e '^#' "moby-${version}/vendor/github.com/docker/distribution/vendor.conf" | sort | awk '{print "Provides: bundled(golang("$1")) = "$2}' >> provides.spec.inc + +# Note(gotmax23): Ignore this also. My script commits the specfile, +# and then this ammends that commit to add the updated provides.spec.inc. +if command -v update.sh && [ "$#" -gt 0 ]; then + git add provides.spec.inc + git commit --gpg-sign --amend --no-edit +fi diff --git a/anda/fonts/maple/anda.hcl b/anda/fonts/maple/anda.hcl new file mode 100644 index 0000000000..8f35f91125 --- /dev/null +++ b/anda/fonts/maple/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "maple-fonts.spec" + } +} \ No newline at end of file diff --git a/anda/fonts/maple/maple-fonts.spec b/anda/fonts/maple/maple-fonts.spec new file mode 100644 index 0000000000..2da3872a72 --- /dev/null +++ b/anda/fonts/maple/maple-fonts.spec @@ -0,0 +1,40 @@ +%define debug_package %nil +%define _ttfontsdir %{_datadir}/fonts/maple + +Name: maple-fonts +Version: 6.4 +Release: %autorelease +Summary: Open source monospace & nerd font with round corner and ligatures. +License: OFL-1.1 +URL: https://github.com/subframe7536/Maple-font +Source0: %{url}/releases/download/v%{version}/MapleMono-SC-NF.zip +Source1: %{url}/releases/download/v%{version}/MapleMono-ttf.zip +Source2: %{url}/releases/download/v%{version}/MapleMono-NF.zip +Source3: https://raw.githubusercontent.com/subframe7536/maple-font/main/OFL.txt +BuildArch: noarch +BuildRequires: unzip + +%description +%summary + +%prep +%setup -q -c -n %{name}-%{version} +unzip %{S:1} +unzip %{S:2} +cp %{S:3} . + +%build + +%install +install -d %{buildroot}%{_ttfontsdir} +# by default install command uses 755 umask +install -m 644 *.ttf %{buildroot}%{_ttfontsdir} + +%files +%license OFL.txt +%dir %{_ttfontsdir} +%{_ttfontsdir}/*.ttf + +%changelog +* Tue Dec 26 2023 madoka773 - 6.4 +- Initial package diff --git a/anda/fonts/maple/update.rhai b/anda/fonts/maple/update.rhai new file mode 100644 index 0000000000..4e3626dc03 --- /dev/null +++ b/anda/fonts/maple/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("subframe7536/Maple-font")); \ No newline at end of file diff --git a/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec b/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec index 11cb2772cf..90e6bc3baa 100644 --- a/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec +++ b/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec @@ -1,9 +1,9 @@ Name: sarasa-gothic-fonts -Version: 1.0.0 +Version: 1.0.2 Release: 1%{?dist} URL: https://github.com/be5invis/Sarasa-Gothic -Source0: %url/releases/download/v%version/sarasa-gothic-ttc-%version.7z -Source1: %url/releases/download/v%version/sarasa-gothic-super-ttc-%version.7z +Source0: %url/releases/download/v%version/Sarasa-TTC-%version.7z +Source1: %url/releases/download/v%version/Sarasa-SuperTTC-%version.7z Source2: https://raw.githubusercontent.com/be5invis/Sarasa-Gothic/v%version/LICENSE Source3: https://raw.githubusercontent.com/be5invis/Sarasa-Gothic/v%version/README.md License: OFL-1.1 @@ -57,5 +57,4 @@ install -Dm644 %SOURCE3 %buildroot/%_datadir/doc/sarasa-gothic-super-fonts/ /%{_datadir}/fonts/sarasa-gothic-super/ %changelog -* Wed Apr 26 2023 windowsboy111 - 0.40.6-1 -- Initial package +%autochangelog diff --git a/anda/rust/2048-rs/anda.hcl b/anda/games/2048-rs/anda.hcl similarity index 100% rename from anda/rust/2048-rs/anda.hcl rename to anda/games/2048-rs/anda.hcl diff --git a/anda/rust/2048-rs/rust-game-2048.spec b/anda/games/2048-rs/rust-game-2048.spec similarity index 100% rename from anda/rust/2048-rs/rust-game-2048.spec rename to anda/games/2048-rs/rust-game-2048.spec diff --git a/anda/rust/2048-rs/update.rhai b/anda/games/2048-rs/update.rhai similarity index 100% rename from anda/rust/2048-rs/update.rhai rename to anda/games/2048-rs/update.rhai diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index d52ffd1dae..d5df043cd3 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,7 +1,7 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit a991d48c762dbc0432b6ec24bcab335fad76c945 +%global commit 0cf9b6537b055e85759a0b0ecb7d06338cb00478 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index b6125648b9..6a58b17c58 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -1,7 +1,7 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit a991d48c762dbc0432b6ec24bcab335fad76c945 +%global commit 0cf9b6537b055e85759a0b0ecb7d06338cb00478 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 diff --git a/anda/rust/typeracer/anda.hcl b/anda/games/typeracer/anda.hcl similarity index 100% rename from anda/rust/typeracer/anda.hcl rename to anda/games/typeracer/anda.hcl diff --git a/anda/rust/typeracer/rust-typeracer.spec b/anda/games/typeracer/rust-typeracer.spec similarity index 100% rename from anda/rust/typeracer/rust-typeracer.spec rename to anda/games/typeracer/rust-typeracer.spec diff --git a/anda/rust/typeracer/update.rhai b/anda/games/typeracer/update.rhai similarity index 100% rename from anda/rust/typeracer/update.rhai rename to anda/games/typeracer/update.rhai diff --git a/anda/gleam/gleam.spec b/anda/gleam/gleam.spec deleted file mode 100644 index f8ca10dc2a..0000000000 --- a/anda/gleam/gleam.spec +++ /dev/null @@ -1,31 +0,0 @@ -%undefine __brp_mangle_shebangs - -Name: gleam -Version: 0.32.4 -Release: 1%{?dist} -Summary: A friendly language for building type-safe, scalable systems -License: Apache-2.0 -URL: https://gleam.run/ -Source0: https://github.com/gleam-lang/gleam/archive/v%version.tar.gz -Requires: erlang elixir -BuildRequires: cargo-rpm-macros anda-srpm-macros - -%description -Gleam is a friendly language for building type-safe, scalable systems! -It compiles to Erlang (or JavaScript) and has straightforward interop with other BEAM languages such as Erlang, Elixir, and LFE. - -%prep -%autosetup -%cargo_prep_online - -%build -%cargo_build - -%install -install -Dm755 target/rpm/gleam %buildroot%_bindir/gleam - -%files -%_bindir/gleam - -%changelog -%autochangelog diff --git a/anda/gleam/update.rhai b/anda/gleam/update.rhai deleted file mode 100644 index 503768b86f..0000000000 --- a/anda/gleam/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh("gleam-lang/gleam")); diff --git a/anda/crystal/blahaj/anda.hcl b/anda/langs/crystal/blahaj/anda.hcl similarity index 100% rename from anda/crystal/blahaj/anda.hcl rename to anda/langs/crystal/blahaj/anda.hcl diff --git a/anda/crystal/blahaj/blahaj.spec b/anda/langs/crystal/blahaj/blahaj.spec similarity index 98% rename from anda/crystal/blahaj/blahaj.spec rename to anda/langs/crystal/blahaj/blahaj.spec index 6a73152c84..c867a022a9 100644 --- a/anda/crystal/blahaj/blahaj.spec +++ b/anda/langs/crystal/blahaj/blahaj.spec @@ -1,7 +1,7 @@ %define debug_package %nil Name: blahaj -Version: 2.1.0 +Version: 2.2.0 Release: 1%{?dist} Summary: Gay sharks at your local terminal - lolcat-like CLI tool License: BSD-2-Clause diff --git a/anda/crystal/blahaj/update.rhai b/anda/langs/crystal/blahaj/update.rhai similarity index 100% rename from anda/crystal/blahaj/update.rhai rename to anda/langs/crystal/blahaj/update.rhai diff --git a/anda/crystal/crystal/anda.hcl b/anda/langs/crystal/crystal/anda.hcl similarity index 100% rename from anda/crystal/crystal/anda.hcl rename to anda/langs/crystal/crystal/anda.hcl diff --git a/anda/crystal/crystal/crystal.spec b/anda/langs/crystal/crystal/crystal.spec similarity index 100% rename from anda/crystal/crystal/crystal.spec rename to anda/langs/crystal/crystal/crystal.spec diff --git a/anda/crystal/crystal/update.rhai b/anda/langs/crystal/crystal/update.rhai similarity index 100% rename from anda/crystal/crystal/update.rhai rename to anda/langs/crystal/crystal/update.rhai diff --git a/anda/dart/anda.hcl b/anda/langs/dart/anda.hcl similarity index 100% rename from anda/dart/anda.hcl rename to anda/langs/dart/anda.hcl diff --git a/anda/dart/dart.spec b/anda/langs/dart/dart.spec similarity index 98% rename from anda/dart/dart.spec rename to anda/langs/dart/dart.spec index 26248a279f..721191434d 100644 --- a/anda/dart/dart.spec +++ b/anda/langs/dart/dart.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: dart -Version: 3.2.3 +Version: 3.2.4 Release: 1%{?dist} Summary: The Dart Language License: BSD-3-Clause diff --git a/anda/dart/update.rhai b/anda/langs/dart/update.rhai similarity index 100% rename from anda/dart/update.rhai rename to anda/langs/dart/update.rhai diff --git a/anda/go/curlie/anda.hcl b/anda/langs/go/curlie/anda.hcl similarity index 100% rename from anda/go/curlie/anda.hcl rename to anda/langs/go/curlie/anda.hcl diff --git a/anda/go/curlie/golang-github-rs-curlie.spec b/anda/langs/go/curlie/golang-github-rs-curlie.spec similarity index 100% rename from anda/go/curlie/golang-github-rs-curlie.spec rename to anda/langs/go/curlie/golang-github-rs-curlie.spec diff --git a/anda/go/curlie/update.rhai b/anda/langs/go/curlie/update.rhai similarity index 100% rename from anda/go/curlie/update.rhai rename to anda/langs/go/curlie/update.rhai diff --git a/anda/go/gendesk/anda.hcl b/anda/langs/go/gendesk/anda.hcl similarity index 100% rename from anda/go/gendesk/anda.hcl rename to anda/langs/go/gendesk/anda.hcl diff --git a/anda/go/gendesk/golang-github-xyproto-gendesk.spec b/anda/langs/go/gendesk/golang-github-xyproto-gendesk.spec similarity index 100% rename from anda/go/gendesk/golang-github-xyproto-gendesk.spec rename to anda/langs/go/gendesk/golang-github-xyproto-gendesk.spec diff --git a/anda/go/gendesk/update.rhai b/anda/langs/go/gendesk/update.rhai similarity index 100% rename from anda/go/gendesk/update.rhai rename to anda/langs/go/gendesk/update.rhai diff --git a/anda/langs/go/u-root/anda.hcl b/anda/langs/go/u-root/anda.hcl new file mode 100644 index 0000000000..1f398cf712 --- /dev/null +++ b/anda/langs/go/u-root/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "golang-github-u-root.spec" + } +} diff --git a/anda/langs/go/u-root/golang-github-u-root.spec b/anda/langs/go/u-root/golang-github-u-root.spec new file mode 100644 index 0000000000..e246b5b71c --- /dev/null +++ b/anda/langs/go/u-root/golang-github-u-root.spec @@ -0,0 +1,78 @@ +# Generated by go2rpm 1.9.0 +%bcond_without check +%define debug_package %nil + +# https://github.com/u-root/u-root +%global goipath github.com/u-root/u-root +Version: 0.11.0 + +%gometa -f + + +%global common_description %{expand: +A fully Go userland with Linux bootloaders! u-root can create a one-binary root +file system (initramfs) containing a busybox-like set of tools written in Go.} + +%global golicenses LICENSE +%global godocs docs examples AUTHORS SECURITY.md tricksandtips.md\\\ + CONTRIBUTING.md README.md roadmap.md\\\ + cmds/core/tail/test_samples/read_backwards.txt\\\ + cmds/core/tail/test_samples/read_from_beginning.txt\\\ + cmds/exp/esxiboot/README.md\\\ + configs/README.md\\\ + configs/amd64_config.txt configs/arm_config.txt\\\ + configs/generic_config.txt integration/README.md\\\ + pkg/boot/systembooter/README.md pkg/smbios/README.md\\\ + pkg/tarutil/test2.txt pkg/tarutil/test0/a.txt\\\ + pkg/tarutil/test0/dir/b.txt pkg/tarutil/test1/a1.txt\\\ + tools/golang_patched_dce/README.md + +Name: %{goname} +Release: %autorelease +Summary: A fully Go userland with Linux bootloaders! u-root can create a one-binary root file system (initramfs) containing a busybox-like set of tools written in Go + +License: BSD-3-Clause +URL: %{gourl} +Source: %{gosource} + +BuildRequires: anda-srpm-macros + +%description %{common_description} + +%gopkg + +%prep +%goprep +%autopatch -p1 + +go mod download + +%build +go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -s -w -extldflags '--static-pie'" -buildmode=pie -tags 'osusergo,netgo,static_build' -v -x -o %{gobuilddir}/bin/u-root %{goipath} + +%install +%gopkginstall +install -m 0755 -vd %{buildroot}%{_bindir} +install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ + +# if {with check} +# check +# gocheck +# endif + +%files +%license LICENSE +%doc docs examples AUTHORS SECURITY.md tricksandtips.md CONTRIBUTING.md +%doc README.md roadmap.md cmds/core/tail/test_samples/read_backwards.txt +%doc cmds/core/tail/test_samples/read_from_beginning.txt +%doc configs/README.md +%doc configs/amd64_config.txt configs/arm_config.txt configs/generic_config.txt +%doc integration/README.md pkg/boot/systembooter/README.md pkg/smbios/README.md +%doc pkg/tarutil/test2.txt pkg/tarutil/test0/a.txt pkg/tarutil/test0/dir/b.txt +%doc pkg/tarutil/test1/a1.txt tools/golang_patched_dce/README.md +%{_bindir}/* + +%gopkgfiles + +%changelog +%autochangelog diff --git a/anda/langs/go/u-root/update.rhai b/anda/langs/go/u-root/update.rhai new file mode 100644 index 0000000000..d510f97887 --- /dev/null +++ b/anda/langs/go/u-root/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("u-root/u-root")); diff --git a/anda/go/xyproto-env/anda.hcl b/anda/langs/go/xyproto-env/anda.hcl similarity index 100% rename from anda/go/xyproto-env/anda.hcl rename to anda/langs/go/xyproto-env/anda.hcl diff --git a/anda/go/xyproto-env/golang-github-xyproto-env.spec b/anda/langs/go/xyproto-env/golang-github-xyproto-env.spec similarity index 96% rename from anda/go/xyproto-env/golang-github-xyproto-env.spec rename to anda/langs/go/xyproto-env/golang-github-xyproto-env.spec index 3f9995f5f7..82afcff3c7 100644 --- a/anda/go/xyproto-env/golang-github-xyproto-env.spec +++ b/anda/langs/go/xyproto-env/golang-github-xyproto-env.spec @@ -4,7 +4,7 @@ # https://github.com/xyproto/env %global goipath github.com/xyproto/env -Version: 2.2.4 +Version: 2.2.5 %gometa -f diff --git a/anda/go/xyproto-env/update.rhai b/anda/langs/go/xyproto-env/update.rhai similarity index 100% rename from anda/go/xyproto-env/update.rhai rename to anda/langs/go/xyproto-env/update.rhai diff --git a/anda/go/xyproto-env/v1/anda.hcl b/anda/langs/go/xyproto-env/v1/anda.hcl similarity index 100% rename from anda/go/xyproto-env/v1/anda.hcl rename to anda/langs/go/xyproto-env/v1/anda.hcl diff --git a/anda/go/xyproto-env/v1/golang-github-xyproto-env.spec b/anda/langs/go/xyproto-env/v1/golang-github-xyproto-env.spec similarity index 100% rename from anda/go/xyproto-env/v1/golang-github-xyproto-env.spec rename to anda/langs/go/xyproto-env/v1/golang-github-xyproto-env.spec diff --git a/anda/go/xyproto-textoutput/anda.hcl b/anda/langs/go/xyproto-textoutput/anda.hcl similarity index 100% rename from anda/go/xyproto-textoutput/anda.hcl rename to anda/langs/go/xyproto-textoutput/anda.hcl diff --git a/anda/go/xyproto-textoutput/golang-github-xyproto-textoutput.spec b/anda/langs/go/xyproto-textoutput/golang-github-xyproto-textoutput.spec similarity index 96% rename from anda/go/xyproto-textoutput/golang-github-xyproto-textoutput.spec rename to anda/langs/go/xyproto-textoutput/golang-github-xyproto-textoutput.spec index 1d6f5b5a10..7667e0d0eb 100644 --- a/anda/go/xyproto-textoutput/golang-github-xyproto-textoutput.spec +++ b/anda/langs/go/xyproto-textoutput/golang-github-xyproto-textoutput.spec @@ -3,7 +3,7 @@ # https://github.com/xyproto/textoutput %global goipath github.com/xyproto/textoutput -Version: 1.15.10 +Version: 1.16.2 %gometa -f diff --git a/anda/go/xyproto-textoutput/update.rhai b/anda/langs/go/xyproto-textoutput/update.rhai similarity index 100% rename from anda/go/xyproto-textoutput/update.rhai rename to anda/langs/go/xyproto-textoutput/update.rhai diff --git a/anda/go/xyproto-vt100/anda.hcl b/anda/langs/go/xyproto-vt100/anda.hcl similarity index 100% rename from anda/go/xyproto-vt100/anda.hcl rename to anda/langs/go/xyproto-vt100/anda.hcl diff --git a/anda/go/xyproto-vt100/golang-github-xyproto-vt100.spec b/anda/langs/go/xyproto-vt100/golang-github-xyproto-vt100.spec similarity index 97% rename from anda/go/xyproto-vt100/golang-github-xyproto-vt100.spec rename to anda/langs/go/xyproto-vt100/golang-github-xyproto-vt100.spec index 1a4577ab31..df9b90e00f 100644 --- a/anda/go/xyproto-vt100/golang-github-xyproto-vt100.spec +++ b/anda/langs/go/xyproto-vt100/golang-github-xyproto-vt100.spec @@ -3,7 +3,7 @@ # https://github.com/xyproto/vt100 %global goipath github.com/xyproto/vt100 -Version: 1.12.9 +Version: 1.14.2 %gometa -f diff --git a/anda/go/xyproto-vt100/update.rhai b/anda/langs/go/xyproto-vt100/update.rhai similarity index 100% rename from anda/go/xyproto-vt100/update.rhai rename to anda/langs/go/xyproto-vt100/update.rhai diff --git a/anda/go/yhat-scrape/anda.hcl b/anda/langs/go/yhat-scrape/anda.hcl similarity index 100% rename from anda/go/yhat-scrape/anda.hcl rename to anda/langs/go/yhat-scrape/anda.hcl diff --git a/anda/go/yhat-scrape/golang-github-yhat-scrape.spec b/anda/langs/go/yhat-scrape/golang-github-yhat-scrape.spec similarity index 100% rename from anda/go/yhat-scrape/golang-github-yhat-scrape.spec rename to anda/langs/go/yhat-scrape/golang-github-yhat-scrape.spec diff --git a/anda/groovy/anda.hcl b/anda/langs/groovy/anda.hcl similarity index 100% rename from anda/groovy/anda.hcl rename to anda/langs/groovy/anda.hcl diff --git a/anda/groovy/groovy-docs/anda.hcl b/anda/langs/groovy/groovy-docs/anda.hcl similarity index 100% rename from anda/groovy/groovy-docs/anda.hcl rename to anda/langs/groovy/groovy-docs/anda.hcl diff --git a/anda/groovy/groovy-docs/groovy-docs.spec b/anda/langs/groovy/groovy-docs/groovy-docs.spec similarity index 97% rename from anda/groovy/groovy-docs/groovy-docs.spec rename to anda/langs/groovy/groovy-docs/groovy-docs.spec index b68bf8891d..a6b01ea1e8 100644 --- a/anda/groovy/groovy-docs/groovy-docs.spec +++ b/anda/langs/groovy/groovy-docs/groovy-docs.spec @@ -1,5 +1,5 @@ Name: groovy-docs -Version: 4.0.16 +Version: 4.0.17 Release: 1%{?dist} Summary: Documentation for the Groovy programming language URL: https://groovy-lang.org/ diff --git a/anda/groovy/groovy-docs/update.rhai b/anda/langs/groovy/groovy-docs/update.rhai similarity index 100% rename from anda/groovy/groovy-docs/update.rhai rename to anda/langs/groovy/groovy-docs/update.rhai diff --git a/anda/groovy/groovy.spec b/anda/langs/groovy/groovy.spec similarity index 99% rename from anda/groovy/groovy.spec rename to anda/langs/groovy/groovy.spec index b44584c90d..4d3d8e31df 100644 --- a/anda/groovy/groovy.spec +++ b/anda/langs/groovy/groovy.spec @@ -1,5 +1,5 @@ Name: groovy -Version: 4.0.16 +Version: 4.0.17 Release: 1%{?dist} Summary: A multi-faceted language for the Java platform BuildArch: noarch diff --git a/anda/groovy/update.rhai b/anda/langs/groovy/update.rhai similarity index 100% rename from anda/groovy/update.rhai rename to anda/langs/groovy/update.rhai diff --git a/anda/kotlin/kotlin-native/anda.hcl b/anda/langs/kotlin/kotlin-native/anda.hcl similarity index 100% rename from anda/kotlin/kotlin-native/anda.hcl rename to anda/langs/kotlin/kotlin-native/anda.hcl diff --git a/anda/kotlin/kotlin-native/kotlin-native.spec b/anda/langs/kotlin/kotlin-native/kotlin-native.spec similarity index 99% rename from anda/kotlin/kotlin-native/kotlin-native.spec rename to anda/langs/kotlin/kotlin-native/kotlin-native.spec index 66b2d5a053..dab8e146f8 100644 --- a/anda/kotlin/kotlin-native/kotlin-native.spec +++ b/anda/langs/kotlin/kotlin-native/kotlin-native.spec @@ -2,7 +2,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Name: kotlin-native -Version: 1.9.21 +Version: 1.9.22 Release: 1%{?dist} Summary: LLVM backend for the Kotlin compiler ExclusiveArch: x86_64 diff --git a/anda/kotlin/kotlin-native/update.rhai b/anda/langs/kotlin/kotlin-native/update.rhai similarity index 100% rename from anda/kotlin/kotlin-native/update.rhai rename to anda/langs/kotlin/kotlin-native/update.rhai diff --git a/anda/kotlin/kotlin/anda.hcl b/anda/langs/kotlin/kotlin/anda.hcl similarity index 100% rename from anda/kotlin/kotlin/anda.hcl rename to anda/langs/kotlin/kotlin/anda.hcl diff --git a/anda/kotlin/kotlin/kotlin.spec b/anda/langs/kotlin/kotlin/kotlin.spec similarity index 99% rename from anda/kotlin/kotlin/kotlin.spec rename to anda/langs/kotlin/kotlin/kotlin.spec index 9d5c612728..92df279e4a 100644 --- a/anda/kotlin/kotlin/kotlin.spec +++ b/anda/langs/kotlin/kotlin/kotlin.spec @@ -1,7 +1,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Name: kotlin -Version: 1.9.21 +Version: 1.9.22 Release: 1%{?dist} Summary: Statically typed programming language diff --git a/anda/kotlin/kotlin/update.rhai b/anda/langs/kotlin/kotlin/update.rhai similarity index 100% rename from anda/kotlin/kotlin/update.rhai rename to anda/langs/kotlin/kotlin/update.rhai diff --git a/anda/nim/choosenim/anda.hcl b/anda/langs/nim/choosenim/anda.hcl similarity index 100% rename from anda/nim/choosenim/anda.hcl rename to anda/langs/nim/choosenim/anda.hcl diff --git a/anda/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec similarity index 100% rename from anda/nim/choosenim/choosenim.spec rename to anda/langs/nim/choosenim/choosenim.spec diff --git a/anda/nim/choosenim/update.rhai b/anda/langs/nim/choosenim/update.rhai similarity index 100% rename from anda/nim/choosenim/update.rhai rename to anda/langs/nim/choosenim/update.rhai diff --git a/anda/nim/nim-nightly/anda.hcl b/anda/langs/nim/nim-nightly/anda.hcl similarity index 100% rename from anda/nim/nim-nightly/anda.hcl rename to anda/langs/nim/nim-nightly/anda.hcl diff --git a/anda/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec similarity index 98% rename from anda/nim/nim-nightly/nim-nightly.spec rename to anda/langs/nim/nim-nightly/nim-nightly.spec index 1c4573db5d..36e4c7187e 100644 --- a/anda/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,5 +1,5 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 57ffeafda016a9772f6548d462f8d9acdcad33bd +%global commit 20d79c9fb0cd2e72473f5fb08134cf72d0fdd9e7 %global ver 2.1.1 %global debug_package %nil diff --git a/anda/nim/nim-nightly/nim.1 b/anda/langs/nim/nim-nightly/nim.1 similarity index 100% rename from anda/nim/nim-nightly/nim.1 rename to anda/langs/nim/nim-nightly/nim.1 diff --git a/anda/nim/nim-nightly/nimble.1 b/anda/langs/nim/nim-nightly/nimble.1 similarity index 100% rename from anda/nim/nim-nightly/nimble.1 rename to anda/langs/nim/nim-nightly/nimble.1 diff --git a/anda/nim/nim-nightly/nimgrep.1 b/anda/langs/nim/nim-nightly/nimgrep.1 similarity index 100% rename from anda/nim/nim-nightly/nimgrep.1 rename to anda/langs/nim/nim-nightly/nimgrep.1 diff --git a/anda/nim/nim-nightly/nimsuggest.1 b/anda/langs/nim/nim-nightly/nimsuggest.1 similarity index 100% rename from anda/nim/nim-nightly/nimsuggest.1 rename to anda/langs/nim/nim-nightly/nimsuggest.1 diff --git a/anda/nim/nim-nightly/update.rhai b/anda/langs/nim/nim-nightly/update.rhai similarity index 100% rename from anda/nim/nim-nightly/update.rhai rename to anda/langs/nim/nim-nightly/update.rhai diff --git a/anda/nim/nim/anda.hcl b/anda/langs/nim/nim/anda.hcl similarity index 100% rename from anda/nim/nim/anda.hcl rename to anda/langs/nim/nim/anda.hcl diff --git a/anda/nim/nim/nim.1 b/anda/langs/nim/nim/nim.1 similarity index 100% rename from anda/nim/nim/nim.1 rename to anda/langs/nim/nim/nim.1 diff --git a/anda/nim/nim/nim.spec b/anda/langs/nim/nim/nim.spec similarity index 99% rename from anda/nim/nim/nim.spec rename to anda/langs/nim/nim/nim.spec index 51a97db01c..4240576b43 100644 --- a/anda/nim/nim/nim.spec +++ b/anda/langs/nim/nim/nim.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: nim -Version: 2.0.0 +Version: 2.0.2 Release: 1%{?dist} Summary: Imperative, multi-paradigm, compiled programming language License: MIT and BSD diff --git a/anda/nim/nim/nimble.1 b/anda/langs/nim/nim/nimble.1 similarity index 100% rename from anda/nim/nim/nimble.1 rename to anda/langs/nim/nim/nimble.1 diff --git a/anda/nim/nim/nimgrep.1 b/anda/langs/nim/nim/nimgrep.1 similarity index 100% rename from anda/nim/nim/nimgrep.1 rename to anda/langs/nim/nim/nimgrep.1 diff --git a/anda/nim/nim/nimsuggest.1 b/anda/langs/nim/nim/nimsuggest.1 similarity index 100% rename from anda/nim/nim/nimsuggest.1 rename to anda/langs/nim/nim/nimsuggest.1 diff --git a/anda/nim/nim/update.rhai b/anda/langs/nim/nim/update.rhai similarity index 100% rename from anda/nim/nim/update.rhai rename to anda/langs/nim/nim/update.rhai diff --git a/anda/tools/ffmpeg/anda.hcl b/anda/langs/python/mpv/anda.hcl similarity index 51% rename from anda/tools/ffmpeg/anda.hcl rename to anda/langs/python/mpv/anda.hcl index 59a107e452..78b5dbc445 100644 --- a/anda/tools/ffmpeg/anda.hcl +++ b/anda/langs/python/mpv/anda.hcl @@ -1,5 +1,5 @@ project pkg { rpm { - spec = "ffmpeg.spec" + spec = "python-mpv.spec" } } diff --git a/anda/langs/python/mpv/python-mpv.spec b/anda/langs/python/mpv/python-mpv.spec new file mode 100644 index 0000000000..779d243f44 --- /dev/null +++ b/anda/langs/python/mpv/python-mpv.spec @@ -0,0 +1,40 @@ +%define debug_package %nil + +Name: python3-mpv +Version: 1.0.5 +Release: 1%{?dist} +Summary: Python interface to the awesome mpv media player +License: GPL-2.0+ OR LGPL-2.1+ +URL: https://github.com/jaseg/python-mpv +Source0: https://github.com/jaseg/python-mpv/archive/refs/tags/v%version.tar.gz +Requires: mpv-devel +BuildRequires: python3-devel +BuildRequires: python3dist(setuptools) + +%description +python-mpv is a ctypes-based python interface to the mpv media player. +It gives you more or less full control of all features of the player, just as the lua interface does. + +%prep +%autosetup -n python-mpv-%version +cat< setup.py +from setuptools import setup + +setup() +EOL + +%build +%py3_build + +%install +%py3_install + +%files +%doc README.rst +%license LICENSE.GPL LICENSE.LGPL +%ghost %python3_sitelib/__pycache__/mpv.cpython-*.pyc +%python3_sitelib/mpv-%version-py%python3_version.egg-info/ +%python3_sitelib/mpv.py + +%changelog +%autochangelog diff --git a/anda/langs/python/mpv/update.rhai b/anda/langs/python/mpv/update.rhai new file mode 100644 index 0000000000..838b801614 --- /dev/null +++ b/anda/langs/python/mpv/update.rhai @@ -0,0 +1 @@ +rpm.version(gh_tag("jaseg/python-mpv")); diff --git a/anda/python/protobuf/anda.hcl b/anda/langs/python/protobuf/anda.hcl similarity index 100% rename from anda/python/protobuf/anda.hcl rename to anda/langs/python/protobuf/anda.hcl diff --git a/anda/python/protobuf/python3-protobuf.spec b/anda/langs/python/protobuf/python3-protobuf.spec similarity index 100% rename from anda/python/protobuf/python3-protobuf.spec rename to anda/langs/python/protobuf/python3-protobuf.spec diff --git a/anda/python/protobuf/update.rhai b/anda/langs/python/protobuf/update.rhai similarity index 100% rename from anda/python/protobuf/update.rhai rename to anda/langs/python/protobuf/update.rhai diff --git a/anda/python/ruff/anda.hcl b/anda/langs/python/ruff/anda.hcl similarity index 100% rename from anda/python/ruff/anda.hcl rename to anda/langs/python/ruff/anda.hcl diff --git a/anda/python/ruff/python3-ruff.spec b/anda/langs/python/ruff/python3-ruff.spec similarity index 66% rename from anda/python/ruff/python3-ruff.spec rename to anda/langs/python/ruff/python3-ruff.spec index bc736af83d..c2970f8bd0 100644 --- a/anda/python/ruff/python3-ruff.spec +++ b/anda/langs/python/ruff/python3-ruff.spec @@ -1,13 +1,13 @@ %define debug_package %{nil} Name: python3-ruff -Version: 0.1.7 +Version: 0.1.11 Release: 1%{?dist} Summary: An extremely fast Python linter, written in Rust License: MIT URL: https://beta.ruff.rs/ Source0: https://github.com/astral-sh/ruff/archive/refs/tags/v%{version}.tar.gz -BuildRequires: python3-installer python3.11 python3-pip maturin cargo +BuildRequires: python3-installer python3-pip maturin cargo Provides: python3.11dist(ruff) = %{version} %description @@ -18,10 +18,10 @@ integrating more functionality behind a single, common interface. %autosetup -n ruff-%{version} %build -maturin build --release --strip --locked --all-features +maturin build --release --strip --all-features # --locked %install -python3.11 -m installer --destdir="%{buildroot}" target/wheels/*.whl +pip3 install --root=%{buildroot} target/wheels/*.whl rm -rf %{python3_sitelib}/ruff/__pycache__ %files @@ -30,12 +30,14 @@ rm -rf %{python3_sitelib}/ruff/__pycache__ /usr/lib64/python*/site-packages/ruff-%{version}.dist-info/METADATA /usr/lib64/python*/site-packages/ruff-%{version}.dist-info/RECORD /usr/lib64/python*/site-packages/ruff-%{version}.dist-info/WHEEL -/usr/lib64/python*/site-packages/ruff/__pycache__/__init__.cpython-*.pyc +/usr/lib64/python*/site-packages/ruff-%{version}.dist-info/INSTALLER +/usr/lib64/python*/site-packages/ruff-%{version}.dist-info/REQUESTED +/usr/lib64/python*/site-packages/ruff-%{version}.dist-info/direct_url.json /usr/lib64/python*/site-packages/ruff-%{version}.dist-info/license_files/LICENSE /usr/lib64/python*/site-packages/ruff/__init__.py /usr/lib64/python*/site-packages/ruff/__main__.py -/usr/lib64/python*/site-packages/ruff/__pycache__/__main__.cpython-*.opt-1.pyc -/usr/lib64/python*/site-packages/ruff/__pycache__/__main__.cpython-*.pyc +/usr/lib64/python*/site-packages/ruff/__pycache__/*.cpython-*.opt-1.pyc +/usr/lib64/python*/site-packages/ruff/__pycache__/*.cpython-*.pyc /usr/bin/ruff %changelog diff --git a/anda/python/ruff/update.rhai b/anda/langs/python/ruff/update.rhai similarity index 100% rename from anda/python/ruff/update.rhai rename to anda/langs/python/ruff/update.rhai diff --git a/anda/rust/bandwhich/anda.hcl b/anda/langs/rust/bandwhich/anda.hcl similarity index 100% rename from anda/rust/bandwhich/anda.hcl rename to anda/langs/rust/bandwhich/anda.hcl diff --git a/anda/rust/bandwhich/bandwhich-fix-metadata-auto.diff b/anda/langs/rust/bandwhich/bandwhich-fix-metadata-auto.diff similarity index 100% rename from anda/rust/bandwhich/bandwhich-fix-metadata-auto.diff rename to anda/langs/rust/bandwhich/bandwhich-fix-metadata-auto.diff diff --git a/anda/rust/bandwhich/rust-bandwhich.spec b/anda/langs/rust/bandwhich/rust-bandwhich.spec similarity index 100% rename from anda/rust/bandwhich/rust-bandwhich.spec rename to anda/langs/rust/bandwhich/rust-bandwhich.spec diff --git a/anda/rust/bandwhich/update.rhai b/anda/langs/rust/bandwhich/update.rhai similarity index 100% rename from anda/rust/bandwhich/update.rhai rename to anda/langs/rust/bandwhich/update.rhai diff --git a/anda/rust/bat-extras/anda.hcl b/anda/langs/rust/bat-extras/anda.hcl similarity index 100% rename from anda/rust/bat-extras/anda.hcl rename to anda/langs/rust/bat-extras/anda.hcl diff --git a/anda/rust/bat-extras/bat-extras.spec b/anda/langs/rust/bat-extras/bat-extras.spec similarity index 100% rename from anda/rust/bat-extras/bat-extras.spec rename to anda/langs/rust/bat-extras/bat-extras.spec diff --git a/anda/rust/bat-extras/update.rhai b/anda/langs/rust/bat-extras/update.rhai similarity index 100% rename from anda/rust/bat-extras/update.rhai rename to anda/langs/rust/bat-extras/update.rhai diff --git a/anda/rust/felix/anda.hcl b/anda/langs/rust/felix/anda.hcl similarity index 100% rename from anda/rust/felix/anda.hcl rename to anda/langs/rust/felix/anda.hcl diff --git a/anda/rust/felix/rust-felix.spec b/anda/langs/rust/felix/rust-felix.spec similarity index 97% rename from anda/rust/felix/rust-felix.spec rename to anda/langs/rust/felix/rust-felix.spec index 7716b41b68..8185cdd65d 100644 --- a/anda/rust/felix/rust-felix.spec +++ b/anda/langs/rust/felix/rust-felix.spec @@ -2,7 +2,7 @@ %global crate felix Name: rust-felix -Version: 2.10.1 +Version: 2.11.1 Release: 1%{?dist} Summary: Tui file manager with vim-like key mapping diff --git a/anda/rust/felix/update.rhai b/anda/langs/rust/felix/update.rhai similarity index 100% rename from anda/rust/felix/update.rhai rename to anda/langs/rust/felix/update.rhai diff --git a/anda/rust/gitoxide/anda.hcl b/anda/langs/rust/gitoxide/anda.hcl similarity index 100% rename from anda/rust/gitoxide/anda.hcl rename to anda/langs/rust/gitoxide/anda.hcl diff --git a/anda/rust/gitoxide/rust-gitoxide.spec b/anda/langs/rust/gitoxide/rust-gitoxide.spec similarity index 99% rename from anda/rust/gitoxide/rust-gitoxide.spec rename to anda/langs/rust/gitoxide/rust-gitoxide.spec index b9f1eed12f..7be592cc1f 100644 --- a/anda/rust/gitoxide/rust-gitoxide.spec +++ b/anda/langs/rust/gitoxide/rust-gitoxide.spec @@ -4,7 +4,7 @@ %global crate gitoxide Name: rust-gitoxide -Version: 0.32.0 +Version: 0.33.0 Release: 1%{?dist} Summary: Command-line application for interacting with git repositories @@ -27,7 +27,6 @@ Summary: %{summary} %files -n %{crate} %license LICENSE-APACHE %license LICENSE-MIT -%doc CHANGELOG.md %doc README.md %{_bindir}/ein %{_bindir}/gix @@ -44,7 +43,6 @@ use the "%{crate}" crate. %files devel %license %{crate_instdir}/LICENSE-APACHE %license %{crate_instdir}/LICENSE-MIT -%doc %{crate_instdir}/CHANGELOG.md %doc %{crate_instdir}/README.md %{crate_instdir}/ diff --git a/anda/rust/gitoxide/update.rhai b/anda/langs/rust/gitoxide/update.rhai similarity index 100% rename from anda/rust/gitoxide/update.rhai rename to anda/langs/rust/gitoxide/update.rhai diff --git a/anda/rust/gping/anda.hcl b/anda/langs/rust/gping/anda.hcl similarity index 100% rename from anda/rust/gping/anda.hcl rename to anda/langs/rust/gping/anda.hcl diff --git a/anda/rust/gping/rust-gping.spec b/anda/langs/rust/gping/rust-gping.spec similarity index 100% rename from anda/rust/gping/rust-gping.spec rename to anda/langs/rust/gping/rust-gping.spec diff --git a/anda/rust/gping/update.rhai b/anda/langs/rust/gping/update.rhai similarity index 100% rename from anda/rust/gping/update.rhai rename to anda/langs/rust/gping/update.rhai diff --git a/anda/rust/joshuto/anda.hcl b/anda/langs/rust/joshuto/anda.hcl similarity index 100% rename from anda/rust/joshuto/anda.hcl rename to anda/langs/rust/joshuto/anda.hcl diff --git a/anda/rust/joshuto/rust-joshuto.spec b/anda/langs/rust/joshuto/rust-joshuto.spec similarity index 100% rename from anda/rust/joshuto/rust-joshuto.spec rename to anda/langs/rust/joshuto/rust-joshuto.spec diff --git a/anda/rust/joshuto/update.rhai b/anda/langs/rust/joshuto/update.rhai similarity index 100% rename from anda/rust/joshuto/update.rhai rename to anda/langs/rust/joshuto/update.rhai diff --git a/anda/rust/kondo-ui/anda.hcl b/anda/langs/rust/kondo-ui/anda.hcl similarity index 100% rename from anda/rust/kondo-ui/anda.hcl rename to anda/langs/rust/kondo-ui/anda.hcl diff --git a/anda/rust/kondo-ui/rust-kondo-ui.spec b/anda/langs/rust/kondo-ui/rust-kondo-ui.spec similarity index 98% rename from anda/rust/kondo-ui/rust-kondo-ui.spec rename to anda/langs/rust/kondo-ui/rust-kondo-ui.spec index 07fbbd84cf..e96222e791 100644 --- a/anda/rust/kondo-ui/rust-kondo-ui.spec +++ b/anda/langs/rust/kondo-ui/rust-kondo-ui.spec @@ -2,7 +2,7 @@ %global crate kondo-ui Name: rust-kondo-ui -Version: 0.7.0 +Version: 0.8.0 Release: 1%{?dist} Summary: Filesystem cleaning tool that recursively searches directories for known project structures and allows you to clean them of unnecessary files like build artifacts diff --git a/anda/rust/kondo-ui/update.rhai b/anda/langs/rust/kondo-ui/update.rhai similarity index 100% rename from anda/rust/kondo-ui/update.rhai rename to anda/langs/rust/kondo-ui/update.rhai diff --git a/anda/rust/kondo/anda.hcl b/anda/langs/rust/kondo/anda.hcl similarity index 100% rename from anda/rust/kondo/anda.hcl rename to anda/langs/rust/kondo/anda.hcl diff --git a/anda/rust/kondo/rust-kondo.spec b/anda/langs/rust/kondo/rust-kondo.spec similarity index 98% rename from anda/rust/kondo/rust-kondo.spec rename to anda/langs/rust/kondo/rust-kondo.spec index 427e4fb3f8..ede9507850 100644 --- a/anda/rust/kondo/rust-kondo.spec +++ b/anda/langs/rust/kondo/rust-kondo.spec @@ -4,7 +4,7 @@ %global crate kondo Name: rust-kondo -Version: 0.7 +Version: 0.8 Release: 1%{?dist} Summary: Filesystem cleaning tool for projects diff --git a/anda/rust/kondo/update.rhai b/anda/langs/rust/kondo/update.rhai similarity index 100% rename from anda/rust/kondo/update.rhai rename to anda/langs/rust/kondo/update.rhai diff --git a/anda/rust/maturin/anda.hcl b/anda/langs/rust/maturin/anda.hcl similarity index 100% rename from anda/rust/maturin/anda.hcl rename to anda/langs/rust/maturin/anda.hcl diff --git a/anda/rust/maturin/rust-terra-maturin.spec b/anda/langs/rust/maturin/rust-terra-maturin.spec similarity index 100% rename from anda/rust/maturin/rust-terra-maturin.spec rename to anda/langs/rust/maturin/rust-terra-maturin.spec diff --git a/anda/rust/maturin/update.rhai b/anda/langs/rust/maturin/update.rhai similarity index 100% rename from anda/rust/maturin/update.rhai rename to anda/langs/rust/maturin/update.rhai diff --git a/anda/rust/nushell/anda.hcl b/anda/langs/rust/nushell/anda.hcl similarity index 100% rename from anda/rust/nushell/anda.hcl rename to anda/langs/rust/nushell/anda.hcl diff --git a/anda/rust/nushell/nushell.spec b/anda/langs/rust/nushell/nushell.spec similarity index 94% rename from anda/rust/nushell/nushell.spec rename to anda/langs/rust/nushell/nushell.spec index 6f7d66f7aa..0425d2de9d 100644 --- a/anda/rust/nushell/nushell.spec +++ b/anda/langs/rust/nushell/nushell.spec @@ -1,12 +1,12 @@ Name: nushell -Version: 0.86.0 +Version: 0.88.1 Release: 1%{?dist} Summary: A new type of shell License: MIT URL: https://www.nushell.sh/ Source0: https://github.com/nushell/nushell/archive/refs/tags/%version.tar.gz BuildRequires: anda-srpm-macros rust-packaging openssl-devel -Requires: glibc gcc-libs openssl zlib +Requires: glibc openssl zlib %description %summary. @@ -30,6 +30,7 @@ if [ "$1" = 1 ]; then else grep -q "^%{_bindir}/nu$" %{_sysconfdir}/shells || echo "%{_bindir}/nu" >> %{_sysconfdir}/shells grep -q "^/bin/nu$" %{_sysconfdir}/shells || echo "/bin/nu" >> %{_sysconfdir}/shells + fi fi %postun diff --git a/anda/rust/nushell/update.rhai b/anda/langs/rust/nushell/update.rhai similarity index 100% rename from anda/rust/nushell/update.rhai rename to anda/langs/rust/nushell/update.rhai diff --git a/anda/rust/ouch/anda.hcl b/anda/langs/rust/ouch/anda.hcl similarity index 100% rename from anda/rust/ouch/anda.hcl rename to anda/langs/rust/ouch/anda.hcl diff --git a/anda/langs/rust/ouch/ouch-fix-metadata-auto.diff b/anda/langs/rust/ouch/ouch-fix-metadata-auto.diff new file mode 100644 index 0000000000..4b23e58e2d --- /dev/null +++ b/anda/langs/rust/ouch/ouch-fix-metadata-auto.diff @@ -0,0 +1,8 @@ +--- ouch-0.5.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ ouch-0.5.1/Cargo.toml 2023-12-10T09:36:31.446957+00:00 +@@ -176,5 +176,3 @@ + ] + use_zstd_thin = ["zstd/thin"] + +-[target."cfg(not(unix))".dependencies.is_executable] +-version = "1.0.1" diff --git a/anda/rust/ouch/rust-ouch.spec b/anda/langs/rust/ouch/rust-ouch.spec similarity index 79% rename from anda/rust/ouch/rust-ouch.spec rename to anda/langs/rust/ouch/rust-ouch.spec index 9e72ae86cc..b745ec90d9 100644 --- a/anda/rust/ouch/rust-ouch.spec +++ b/anda/langs/rust/ouch/rust-ouch.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global crate ouch @@ -11,10 +11,11 @@ Summary: Command-line utility for easily compressing and decompressing fi License: MIT URL: https://crates.io/crates/ouch Source: %{crates_source} -# Automatically generated patch to strip foreign dependencies +# Automatically generated patch to strip dependencies and normalize metadata Patch: ouch-fix-metadata-auto.diff -BuildRequires: anda-srpm-macros rust-packaging >= 21 +BuildRequires: anda-srpm-macros cargo-rpm-macros >= 24 +BuildRequires: gcc-c++ %global _description %{expand: A command-line utility for easily compressing and decompressing files @@ -35,7 +36,7 @@ Summary: %{summary} %{_bindir}/ouch %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep_online %build diff --git a/anda/rust/ouch/update.rhai b/anda/langs/rust/ouch/update.rhai similarity index 100% rename from anda/rust/ouch/update.rhai rename to anda/langs/rust/ouch/update.rhai diff --git a/anda/rust/oxipng/anda.hcl b/anda/langs/rust/oxipng/anda.hcl similarity index 100% rename from anda/rust/oxipng/anda.hcl rename to anda/langs/rust/oxipng/anda.hcl diff --git a/anda/rust/oxipng/oxipng-fix-metadata-auto.diff b/anda/langs/rust/oxipng/oxipng-fix-metadata-auto.diff similarity index 100% rename from anda/rust/oxipng/oxipng-fix-metadata-auto.diff rename to anda/langs/rust/oxipng/oxipng-fix-metadata-auto.diff diff --git a/anda/rust/oxipng/rust-oxipng.spec b/anda/langs/rust/oxipng/rust-oxipng.spec similarity index 100% rename from anda/rust/oxipng/rust-oxipng.spec rename to anda/langs/rust/oxipng/rust-oxipng.spec diff --git a/anda/rust/oxipng/update.rhai b/anda/langs/rust/oxipng/update.rhai similarity index 100% rename from anda/rust/oxipng/update.rhai rename to anda/langs/rust/oxipng/update.rhai diff --git a/anda/rust/pop-launcher/.gitignore b/anda/langs/rust/pop-launcher/.gitignore similarity index 100% rename from anda/rust/pop-launcher/.gitignore rename to anda/langs/rust/pop-launcher/.gitignore diff --git a/anda/rust/pop-launcher/0001-Copy-instead-of-symlink.patch b/anda/langs/rust/pop-launcher/0001-Copy-instead-of-symlink.patch similarity index 100% rename from anda/rust/pop-launcher/0001-Copy-instead-of-symlink.patch rename to anda/langs/rust/pop-launcher/0001-Copy-instead-of-symlink.patch diff --git a/anda/rust/pop-launcher/0001-Remove-frozen-lock.patch b/anda/langs/rust/pop-launcher/0001-Remove-frozen-lock.patch similarity index 100% rename from anda/rust/pop-launcher/0001-Remove-frozen-lock.patch rename to anda/langs/rust/pop-launcher/0001-Remove-frozen-lock.patch diff --git a/anda/rust/pop-launcher/anda.hcl b/anda/langs/rust/pop-launcher/anda.hcl similarity index 100% rename from anda/rust/pop-launcher/anda.hcl rename to anda/langs/rust/pop-launcher/anda.hcl diff --git a/anda/rust/pop-launcher/pop-launcher.spec b/anda/langs/rust/pop-launcher/pop-launcher.spec similarity index 100% rename from anda/rust/pop-launcher/pop-launcher.spec rename to anda/langs/rust/pop-launcher/pop-launcher.spec diff --git a/anda/rust/pop-launcher/prepare.sh b/anda/langs/rust/pop-launcher/prepare.sh similarity index 100% rename from anda/rust/pop-launcher/prepare.sh rename to anda/langs/rust/pop-launcher/prepare.sh diff --git a/anda/rust/pop-launcher/umpkg.cfg b/anda/langs/rust/pop-launcher/umpkg.cfg similarity index 100% rename from anda/rust/pop-launcher/umpkg.cfg rename to anda/langs/rust/pop-launcher/umpkg.cfg diff --git a/anda/rust/pop-launcher/umpkg.toml b/anda/langs/rust/pop-launcher/umpkg.toml similarity index 100% rename from anda/rust/pop-launcher/umpkg.toml rename to anda/langs/rust/pop-launcher/umpkg.toml diff --git a/anda/rust/pop-launcher/update.rhai b/anda/langs/rust/pop-launcher/update.rhai similarity index 100% rename from anda/rust/pop-launcher/update.rhai rename to anda/langs/rust/pop-launcher/update.rhai diff --git a/anda/rust/rnote/anda.hcl b/anda/langs/rust/rnote/anda.hcl similarity index 100% rename from anda/rust/rnote/anda.hcl rename to anda/langs/rust/rnote/anda.hcl diff --git a/anda/rust/rnote/rnote.spec b/anda/langs/rust/rnote/rnote.spec similarity index 98% rename from anda/rust/rnote/rnote.spec rename to anda/langs/rust/rnote/rnote.spec index 223625f1ef..1dbd2b29a5 100644 --- a/anda/rust/rnote/rnote.spec +++ b/anda/langs/rust/rnote/rnote.spec @@ -1,5 +1,5 @@ Name: rnote -Version: 0.9.3 +Version: 0.9.4 Release: 1%{?dist} Summary: Sketch and take handwritten notes. License: GPL-3.0 diff --git a/anda/rust/rnote/update.rhai b/anda/langs/rust/rnote/update.rhai similarity index 100% rename from anda/rust/rnote/update.rhai rename to anda/langs/rust/rnote/update.rhai diff --git a/anda/rust/starship/anda.hcl b/anda/langs/rust/starship/anda.hcl similarity index 100% rename from anda/rust/starship/anda.hcl rename to anda/langs/rust/starship/anda.hcl diff --git a/anda/rust/starship/rust-starship.spec b/anda/langs/rust/starship/rust-starship.spec similarity index 99% rename from anda/rust/starship/rust-starship.spec rename to anda/langs/rust/starship/rust-starship.spec index d8ed88bcaa..43afbec1ef 100644 --- a/anda/rust/starship/rust-starship.spec +++ b/anda/langs/rust/starship/rust-starship.spec @@ -5,7 +5,7 @@ %global crate starship Name: rust-starship -Version: 1.16.0 +Version: 1.17.1 Release: 1%{?dist} Summary: Minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️ diff --git a/anda/rust/starship/starship-fix-metadata-auto.diff b/anda/langs/rust/starship/starship-fix-metadata-auto.diff similarity index 100% rename from anda/rust/starship/starship-fix-metadata-auto.diff rename to anda/langs/rust/starship/starship-fix-metadata-auto.diff diff --git a/anda/rust/starship/update.rhai b/anda/langs/rust/starship/update.rhai similarity index 100% rename from anda/rust/starship/update.rhai rename to anda/langs/rust/starship/update.rhai diff --git a/anda/rust/tectonic/anda.hcl b/anda/langs/rust/tectonic/anda.hcl similarity index 100% rename from anda/rust/tectonic/anda.hcl rename to anda/langs/rust/tectonic/anda.hcl diff --git a/anda/rust/tectonic/rust-tectonic.spec b/anda/langs/rust/tectonic/rust-tectonic.spec similarity index 100% rename from anda/rust/tectonic/rust-tectonic.spec rename to anda/langs/rust/tectonic/rust-tectonic.spec diff --git a/anda/rust/tectonic/update.rhai b/anda/langs/rust/tectonic/update.rhai similarity index 100% rename from anda/rust/tectonic/update.rhai rename to anda/langs/rust/tectonic/update.rhai diff --git a/anda/rust/youki/anda.hcl b/anda/langs/rust/youki/anda.hcl similarity index 100% rename from anda/rust/youki/anda.hcl rename to anda/langs/rust/youki/anda.hcl diff --git a/anda/rust/youki/dep-protobuf.diff b/anda/langs/rust/youki/dep-protobuf.diff similarity index 100% rename from anda/rust/youki/dep-protobuf.diff rename to anda/langs/rust/youki/dep-protobuf.diff diff --git a/anda/langs/rust/youki/rust-youki.spec b/anda/langs/rust/youki/rust-youki.spec new file mode 100644 index 0000000000..03ddf728ec --- /dev/null +++ b/anda/langs/rust/youki/rust-youki.spec @@ -0,0 +1,58 @@ +# Generated by rust2rpm 25 +#bcond_without check + +%global crate youki + +Name: rust-youki +Version: 0.3.0 +Release: %autorelease +Summary: Container runtime written in Rust + +License: None +URL: https://crates.io/crates/youki +Source: %{crates_source} + +BuildRequires: anda-srpm-macros cargo-rpm-macros >= 24 +BuildRequires: pkg-config +BuildRequires: systemd-devel +BuildRequires: dbus-devel +BuildRequires: libseccomp-devel +BuildRequires: elfutils-libelf-devel +BuildRequires: binutils + +%global _description %{expand: +A container runtime written in Rust.} + +%description %{_description} + +%package -n %{crate} +Summary: %{summary} +License: Apache-2.0 + +%description -n %{crate} %{_description} + +%files -n %{crate} +%license LICENSE +%license LICENSE.dependencies +%doc README.md +%{_bindir}/youki + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep_online + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +%autochangelog diff --git a/anda/rust/youki/update.rhai b/anda/langs/rust/youki/update.rhai similarity index 100% rename from anda/rust/youki/update.rhai rename to anda/langs/rust/youki/update.rhai diff --git a/anda/rust/youki/youki.spec b/anda/langs/rust/youki/youki.spec similarity index 87% rename from anda/rust/youki/youki.spec rename to anda/langs/rust/youki/youki.spec index b8ab7999f3..1bc9773b13 100644 --- a/anda/rust/youki/youki.spec +++ b/anda/langs/rust/youki/youki.spec @@ -1,12 +1,11 @@ Name: youki -Version: 0.3.0 +Version: 0.3.1 Release: 1%{?dist} Summary: A container runtime written in Rust License: Apache-2.0 URL: https://github.com/containers/youki Source0: https://github.com/containers/youki/archive/refs/tags/v%{version}.tar.gz -Patch0: dep-protobuf.diff BuildRequires: pkg-config BuildRequires: rust-packaging @@ -38,13 +37,12 @@ git checkout v%{version} # mkdir -p ~/.ssh # ssh-keyscan github.com >> ~/.ssh/known_hosts -git submodule set-url integration_tests/oci-runtime-tests https://github.com/opencontainers/runtime-tools -git submodule sync +#git submodule set-url integration_tests/oci-runtime-tests https://github.com/opencontainers/runtime-tools +#git submodule sync # download git submodules git submodule update --init --recursive -%patch 0 -p1 %cargo_prep_online diff --git a/anda/rust/zellij/.gitignore b/anda/langs/rust/zellij/.gitignore similarity index 100% rename from anda/rust/zellij/.gitignore rename to anda/langs/rust/zellij/.gitignore diff --git a/anda/rust/zellij/anda.hcl b/anda/langs/rust/zellij/anda.hcl similarity index 100% rename from anda/rust/zellij/anda.hcl rename to anda/langs/rust/zellij/anda.hcl diff --git a/anda/rust/zellij/rust-zellij.spec b/anda/langs/rust/zellij/rust-zellij.spec similarity index 95% rename from anda/rust/zellij/rust-zellij.spec rename to anda/langs/rust/zellij/rust-zellij.spec index 193288b67f..af75cf782e 100644 --- a/anda/rust/zellij/rust-zellij.spec +++ b/anda/langs/rust/zellij/rust-zellij.spec @@ -18,6 +18,8 @@ ExclusiveArch: %{rust_arches} BuildRequires: anda-srpm-macros BuildRequires: rust-packaging BuildRequires: openssl-devel +BuildRequires: gcc +BuildRequires: perl #BuildRequires: external:crate:sccache diff --git a/anda/rust/zellij/umpkg.toml b/anda/langs/rust/zellij/umpkg.toml similarity index 100% rename from anda/rust/zellij/umpkg.toml rename to anda/langs/rust/zellij/umpkg.toml diff --git a/anda/rust/zellij/update.rhai b/anda/langs/rust/zellij/update.rhai similarity index 100% rename from anda/rust/zellij/update.rhai rename to anda/langs/rust/zellij/update.rhai diff --git a/anda/vala/vala-language-server-nightly/anda.hcl b/anda/langs/vala/vala-language-server-nightly/anda.hcl similarity index 100% rename from anda/vala/vala-language-server-nightly/anda.hcl rename to anda/langs/vala/vala-language-server-nightly/anda.hcl diff --git a/anda/vala/vala-language-server-nightly/update.rhai b/anda/langs/vala/vala-language-server-nightly/update.rhai similarity index 100% rename from anda/vala/vala-language-server-nightly/update.rhai rename to anda/langs/vala/vala-language-server-nightly/update.rhai diff --git a/anda/vala/vala-language-server-nightly/vala-language-server-nightly.spec b/anda/langs/vala/vala-language-server-nightly/vala-language-server-nightly.spec similarity index 100% rename from anda/vala/vala-language-server-nightly/vala-language-server-nightly.spec rename to anda/langs/vala/vala-language-server-nightly/vala-language-server-nightly.spec diff --git a/anda/vala/vala-lint-nightly/anda.hcl b/anda/langs/vala/vala-lint-nightly/anda.hcl similarity index 100% rename from anda/vala/vala-lint-nightly/anda.hcl rename to anda/langs/vala/vala-lint-nightly/anda.hcl diff --git a/anda/vala/vala-lint-nightly/update.rhai b/anda/langs/vala/vala-lint-nightly/update.rhai similarity index 100% rename from anda/vala/vala-lint-nightly/update.rhai rename to anda/langs/vala/vala-lint-nightly/update.rhai diff --git a/anda/vala/vala-lint-nightly/vala-lint-nightly.spec b/anda/langs/vala/vala-lint-nightly/vala-lint-nightly.spec similarity index 96% rename from anda/vala/vala-lint-nightly/vala-lint-nightly.spec rename to anda/langs/vala/vala-lint-nightly/vala-lint-nightly.spec index c3fe93dd99..ac636e8f3e 100644 --- a/anda/vala/vala-lint-nightly/vala-lint-nightly.spec +++ b/anda/langs/vala/vala-lint-nightly/vala-lint-nightly.spec @@ -1,6 +1,6 @@ %global real_name vala-lint -%global commit 95cf9e61a73fe4a0f69fd8c275c9548703f79838 +%global commit 8ae2bb65fe66458263d94711ae4ddd978faece00 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date %(date '+%Y%m%d') diff --git a/anda/vala/vala-nightly/anda.hcl b/anda/langs/vala/vala-nightly/anda.hcl similarity index 100% rename from anda/vala/vala-nightly/anda.hcl rename to anda/langs/vala/vala-nightly/anda.hcl diff --git a/anda/vala/vala-nightly/update.rhai b/anda/langs/vala/vala-nightly/update.rhai similarity index 100% rename from anda/vala/vala-nightly/update.rhai rename to anda/langs/vala/vala-nightly/update.rhai diff --git a/anda/vala/vala-nightly/vala-nightly.spec b/anda/langs/vala/vala-nightly/vala-nightly.spec similarity index 99% rename from anda/vala/vala-nightly/vala-nightly.spec rename to anda/langs/vala/vala-nightly/vala-nightly.spec index 72b9d7791a..d081a0b67f 100644 --- a/anda/vala/vala-nightly/vala-nightly.spec +++ b/anda/langs/vala/vala-nightly/vala-nightly.spec @@ -3,7 +3,7 @@ %global priority 90 %global real_name vala -%global commit f25dc811e83dc539add58ee35ab2b164868f0959 +%global commit 729d2993dc1844f7120b7123de8f41c4be0111cd %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git diff --git a/anda/apps/vala-panel-appmenu/anda.hcl b/anda/langs/vala/vala-panel-appmenu/anda.hcl similarity index 100% rename from anda/apps/vala-panel-appmenu/anda.hcl rename to anda/langs/vala/vala-panel-appmenu/anda.hcl diff --git a/anda/apps/vala-panel-appmenu/update.rhai b/anda/langs/vala/vala-panel-appmenu/update.rhai similarity index 100% rename from anda/apps/vala-panel-appmenu/update.rhai rename to anda/langs/vala/vala-panel-appmenu/update.rhai diff --git a/anda/apps/vala-panel-appmenu/vala-panel-appmenu.spec b/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec similarity index 99% rename from anda/apps/vala-panel-appmenu/vala-panel-appmenu.spec rename to anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec index aee519f693..0b7a2317be 100644 --- a/anda/apps/vala-panel-appmenu/vala-panel-appmenu.spec +++ b/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec @@ -7,6 +7,7 @@ Version: 0.7.6 Release: 2%?dist License: LGPL-3.0-or-later Summary: Application Menu plugin for vala-panel +Group: System/GUI/Other URL: %{forgeurl} Source: %{forgesource} diff --git a/anda/apps/vala-panel/anda.hcl b/anda/langs/vala/vala-panel/anda.hcl similarity index 100% rename from anda/apps/vala-panel/anda.hcl rename to anda/langs/vala/vala-panel/anda.hcl diff --git a/anda/apps/vala-panel/vala-panel.spec b/anda/langs/vala/vala-panel/vala-panel.spec similarity index 98% rename from anda/apps/vala-panel/vala-panel.spec rename to anda/langs/vala/vala-panel/vala-panel.spec index 5f403e84fd..43e5868d87 100644 --- a/anda/apps/vala-panel/vala-panel.spec +++ b/anda/langs/vala/vala-panel/vala-panel.spec @@ -1,6 +1,5 @@ %global forgeurl https://gitlab.com/vala-panel-project/vala-panel %global commit ead4e7a36b0e4b0a2ac43c5d9ca17eb753461afe - %forgemeta Name: vala-panel @@ -8,6 +7,7 @@ Version: 0.5.0 Release: 2%?dist License: LGPL-3.0-or-later Summary: This package provides Application Menu plugin for vala-panel +Group: System/GUI/Other URL: %{forgeurl} Source: %{forgesource} diff --git a/anda/lib/libayatana-common/libayatana-common.spec b/anda/lib/libayatana-common/libayatana-common.spec index 3063b480ca..e2c1367b5c 100644 --- a/anda/lib/libayatana-common/libayatana-common.spec +++ b/anda/lib/libayatana-common/libayatana-common.spec @@ -1,6 +1,6 @@ Name: libayatana-common Summary: Common functions for Ayatana System Indicators -Version: 0.9.9 +Version: 0.9.10 Release: 1%{?dist} License: GPL-3.0 URL: https://github.com/AyatanaIndicators/libayatana-common diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index e5bdfc40d8..cce7e6b7a9 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -1,6 +1,6 @@ Summary: The Application Framework for tauOS apps Name: libhelium -Version: 1.8.1 +Version: 1.8.2 Release: 1%{?dist} License: GPL-3.0 URL: https://github.com/tau-OS/libhelium diff --git a/anda/lib/openh264/openh264.spec b/anda/lib/openh264/openh264.spec index c2c742282b..a755ceeb11 100644 --- a/anda/lib/openh264/openh264.spec +++ b/anda/lib/openh264/openh264.spec @@ -2,8 +2,8 @@ %global commit1 e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global openh264_version 2.3.1 -%global gst_version 1.22.7 +%global openh264_version 2.4.0 +%global gst_version 1.22.8 Name: openh264 Version: %{openh264_version} diff --git a/anda/lib/placebo/anda.hcl b/anda/lib/placebo/anda.hcl new file mode 100644 index 0000000000..43b027d77c --- /dev/null +++ b/anda/lib/placebo/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "terra-libplacebo.spec" + } +} diff --git a/anda/lib/placebo/terra-libplacebo.spec b/anda/lib/placebo/terra-libplacebo.spec new file mode 100644 index 0000000000..4a83b812c2 --- /dev/null +++ b/anda/lib/placebo/terra-libplacebo.spec @@ -0,0 +1,80 @@ +Name: terra-libplacebo +Version: 6.338.1 +Release: %autorelease +Summary: Reusable library for GPU-accelerated video/image rendering primitives + +License: LGPLv2+ +URL: https://github.com/haasn/libplacebo +Source0: %{url}/archive/v%{version}%{?prerelease}/libplacebo-%{version}%{?prerelease}.tar.gz + +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: meson +BuildRequires: glad2 >= 2.0.0 +BuildRequires: lcms2-devel +BuildRequires: libdovi-devel +BuildRequires: libepoxy-devel +BuildRequires: libunwind-devel +BuildRequires: libshaderc-devel >= 2018.0-1 +BuildRequires: python3-mako +BuildRequires: spirv-tools-devel +BuildRequires: vulkan-devel +BuildRequires: glslang-devel +BuildRequires: xxhash-devel + + +%description +libplacebo is essentially the core rendering algorithms and ideas of +mpv turned into a library. This grew out of an interest to accomplish +the following goals: + +- Clean up mpv's internal API and make it reusable for other projects. +- Provide a standard library of useful GPU-accelerated image processing + primitives based on GLSL, so projects like VLC or Firefox can use them + without incurring a heavy dependency on `libmpv`. +- Rewrite core parts of mpv's GPU-accelerated video renderer on top of + redesigned abstractions. (Basically, I wanted to eliminate code smell + like `shader_cache.c` and totally redesign `gpu/video.c`) + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%prep +%autosetup -p1 -n libplacebo-%{version}%{?prerelease} + + +%build +%meson \ + -Dd3d11=disabled \ + -Ddemos=False + +%meson_build + + +%install +%meson_install + + +%ldconfig_scriptlets + + +%files +%license LICENSE +%doc README.md +%{_libdir}/libplacebo.so.338 + +%files devel +%{_includedir}/* +%{_libdir}/*.so +%{_libdir}/pkgconfig/libplacebo.pc + + +%changelog +%autochangelog diff --git a/anda/lib/placebo/update.rhai b/anda/lib/placebo/update.rhai new file mode 100644 index 0000000000..9db2da940d --- /dev/null +++ b/anda/lib/placebo/update.rhai @@ -0,0 +1,4 @@ +// let txt = get("https://code.videolan.org/api/v4/projects/380/releases/"); +// rpm.version(txt.json_arr()[0].tag_name); +// apparently their API doesn't work (for sake) +rpm.version(gh("haasn/libplacebo")); diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index fbeed60a12..99b00d1e2d 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,5 +1,5 @@ -%global commit 6ee64289f3666774fb694c9d33f83ed8bd52b60c -%global ver 1.8.21 +%global commit d963044eb9b8bb075e3f63b8bfd8da735c4c37d9 +%global ver 1.8.23 Name: tdlib-nightly Version: %ver^%commit Release: 1%{?dist} diff --git a/anda/misc/alsa-ucm-cros/alsa-ucm-cros.spec b/anda/misc/alsa-ucm-cros/alsa-ucm-cros.spec new file mode 100644 index 0000000000..32a4be1e9e --- /dev/null +++ b/anda/misc/alsa-ucm-cros/alsa-ucm-cros.spec @@ -0,0 +1,30 @@ +%define debug_package %nil + +Name: alsa-ucm-cros +Version: 0.3 +Release: 1%?dist +Summary: ALSA Use Case Manager configuration +License: BSD-3-Clause +URL: https://github.com/WeirdTreeThing/alsa-ucm-conf-cros/tree/standalone +Source0: https://github.com/WeirdTreeThing/alsa-ucm-conf-cros/archive/refs/tags/%version.tar.gz +BuildArch: noarch + +%description +%summary for chromebooks. + +%prep +%autosetup -n alsa-ucm-conf-cros-%version + +%build + +%install +mkdir -p %buildroot%_datadir/alsa +cp -r ucm2 %buildroot%_datadir/alsa/ + +%files +%doc README.md +%license LICENSE +%_datadir/alsa/ucm2/ + +%changelog +%autochangelog diff --git a/anda/misc/alsa-ucm-cros/anda.hcl b/anda/misc/alsa-ucm-cros/anda.hcl new file mode 100644 index 0000000000..e18b43c937 --- /dev/null +++ b/anda/misc/alsa-ucm-cros/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "alsa-ucm-cros.spec" + } +} diff --git a/anda/misc/alsa-ucm-cros/update.rhai b/anda/misc/alsa-ucm-cros/update.rhai new file mode 100644 index 0000000000..b33bd290c6 --- /dev/null +++ b/anda/misc/alsa-ucm-cros/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("WeirdTreeThing/alsa-ucm-conf-cros")); diff --git a/anda/others/click/anda.hcl b/anda/misc/click/anda.hcl similarity index 100% rename from anda/others/click/anda.hcl rename to anda/misc/click/anda.hcl diff --git a/anda/others/click/click.spec b/anda/misc/click/click.spec similarity index 98% rename from anda/others/click/click.spec rename to anda/misc/click/click.spec index e46ec81cf9..00627fae3d 100644 --- a/anda/others/click/click.spec +++ b/anda/misc/click/click.spec @@ -1,9 +1,9 @@ %global forgeurl https://gitlab.com/ubports/development/core/click -%global commit 0de0e0748ecfdf29997e6167f71fca0e2b03151b +%global commit 6ab489306b1d76628a1bcf413debba1c238ec703 %forgemeta Name: click -Version: 0.5.0 +Version: 0.5.1 Release: %autorelease Summary: An app building method License: LGPL-3.0 diff --git a/anda/misc/click/update.rhai b/anda/misc/click/update.rhai new file mode 100644 index 0000000000..8afb40a9b2 --- /dev/null +++ b/anda/misc/click/update.rhai @@ -0,0 +1,7 @@ +let o = get("https://gitlab.com/api/v4/projects/25034025/repository/tags").json_arr()[0]; +let f = rpm.f; +rpm.version(o.name); +// check if changed +if rpm.f != f { + rpm.global("commit", o.commit.id); +} diff --git a/anda/audio/distrho/anda.hcl b/anda/misc/distrho/anda.hcl similarity index 100% rename from anda/audio/distrho/anda.hcl rename to anda/misc/distrho/anda.hcl diff --git a/anda/audio/distrho/distrho.spec b/anda/misc/distrho/distrho.spec similarity index 100% rename from anda/audio/distrho/distrho.spec rename to anda/misc/distrho/distrho.spec diff --git a/anda/others/gsettings-ubuntu-touch-schemas/anda.hcl b/anda/misc/gsettings-ubuntu-touch-schemas/anda.hcl similarity index 100% rename from anda/others/gsettings-ubuntu-touch-schemas/anda.hcl rename to anda/misc/gsettings-ubuntu-touch-schemas/anda.hcl diff --git a/anda/others/gsettings-ubuntu-touch-schemas/gsettings-ubuntu-touch-schemas.spec b/anda/misc/gsettings-ubuntu-touch-schemas/gsettings-ubuntu-touch-schemas.spec similarity index 100% rename from anda/others/gsettings-ubuntu-touch-schemas/gsettings-ubuntu-touch-schemas.spec rename to anda/misc/gsettings-ubuntu-touch-schemas/gsettings-ubuntu-touch-schemas.spec diff --git a/anda/others/gsettings-ubuntu-touch-schemas/update.rhai b/anda/misc/gsettings-ubuntu-touch-schemas/update.rhai similarity index 100% rename from anda/others/gsettings-ubuntu-touch-schemas/update.rhai rename to anda/misc/gsettings-ubuntu-touch-schemas/update.rhai diff --git a/anda/others/katsu-systemd-sysusers-presets/anda.hcl b/anda/misc/katsu-systemd-sysusers-presets/anda.hcl similarity index 100% rename from anda/others/katsu-systemd-sysusers-presets/anda.hcl rename to anda/misc/katsu-systemd-sysusers-presets/anda.hcl diff --git a/anda/others/katsu-systemd-sysusers-presets/katsu-systemd-sysusers-presets.spec b/anda/misc/katsu-systemd-sysusers-presets/katsu-systemd-sysusers-presets.spec similarity index 100% rename from anda/others/katsu-systemd-sysusers-presets/katsu-systemd-sysusers-presets.spec rename to anda/misc/katsu-systemd-sysusers-presets/katsu-systemd-sysusers-presets.spec diff --git a/anda/others/katsu-systemd-sysusers-presets/polkit.conf b/anda/misc/katsu-systemd-sysusers-presets/polkit.conf similarity index 100% rename from anda/others/katsu-systemd-sysusers-presets/polkit.conf rename to anda/misc/katsu-systemd-sysusers-presets/polkit.conf diff --git a/anda/others/katsu-systemd-sysusers-presets/rpcbind.conf b/anda/misc/katsu-systemd-sysusers-presets/rpcbind.conf similarity index 100% rename from anda/others/katsu-systemd-sysusers-presets/rpcbind.conf rename to anda/misc/katsu-systemd-sysusers-presets/rpcbind.conf diff --git a/anda/others/kwin-system76-scheduler-integration/anda.hcl b/anda/misc/kwin-system76-scheduler-integration/anda.hcl similarity index 100% rename from anda/others/kwin-system76-scheduler-integration/anda.hcl rename to anda/misc/kwin-system76-scheduler-integration/anda.hcl diff --git a/anda/others/kwin-system76-scheduler-integration/com.system76.Scheduler.dbusproxy.service b/anda/misc/kwin-system76-scheduler-integration/com.system76.Scheduler.dbusproxy.service similarity index 75% rename from anda/others/kwin-system76-scheduler-integration/com.system76.Scheduler.dbusproxy.service rename to anda/misc/kwin-system76-scheduler-integration/com.system76.Scheduler.dbusproxy.service index b2943dbf89..92411334ec 100644 --- a/anda/others/kwin-system76-scheduler-integration/com.system76.Scheduler.dbusproxy.service +++ b/anda/misc/kwin-system76-scheduler-integration/com.system76.Scheduler.dbusproxy.service @@ -4,7 +4,7 @@ StartLimitIntervalSec=60 StartLimitBurst=5 [Service] -ExecStart=/usr/local/bin/system76-scheduler-dbus-proxy.sh +ExecStart=/usr/libexec/system76-scheduler-dbus-proxy.sh [Install] WantedBy=default.target diff --git a/anda/others/kwin-system76-scheduler-integration/kwin-system76-scheduler-integration.spec b/anda/misc/kwin-system76-scheduler-integration/kwin-system76-scheduler-integration.spec similarity index 87% rename from anda/others/kwin-system76-scheduler-integration/kwin-system76-scheduler-integration.spec rename to anda/misc/kwin-system76-scheduler-integration/kwin-system76-scheduler-integration.spec index cabe12438f..9cdd7beae2 100644 --- a/anda/others/kwin-system76-scheduler-integration/kwin-system76-scheduler-integration.spec +++ b/anda/misc/kwin-system76-scheduler-integration/kwin-system76-scheduler-integration.spec @@ -2,10 +2,10 @@ Name: kwin-system76-scheduler-integration Version: 0.1 -Release: 2%?dist +Release: 3%?dist Summary: Notify the System76 Scheduler which app has focus so it can be prioritized License: MIT -URL: https://github.com/maxiberta/kwin-system76-scheduler-integration +URL: https://github.com/maxiberta/kwin-system76-scheduler-integration Source0: %url/archive/refs/tags/%version.tar.gz Source1: system76-scheduler-dbus-proxy.sh Source2: com.system76.Scheduler.dbusproxy.service @@ -27,7 +27,7 @@ via D-Bus, so it is prioritized. %install mkdir -p %buildroot%_datadir/kwin/scripts/kwin-system76-scheduler-integration/ cp -r * %buildroot%_datadir/kwin/scripts/kwin-system76-scheduler-integration/ -install -Dm755 %SOURCE1 %buildroot/usr/local/bin/system76-scheduler-dbus-proxy.sh +install -Dm755 %SOURCE1 %buildroot%_libexecdir/system76-scheduler-dbus-proxy.sh install -Dm644 %SOURCE2 %buildroot%_userunitdir/com.system76.Scheduler.dbusproxy.service install -Dm644 metadata.desktop %buildroot%_datadir/kservices5/kwin-system76-scheduler-integration.desktop @@ -41,7 +41,7 @@ install -Dm644 metadata.desktop %buildroot%_datadir/kservices5/kwin-system76-sch %files %config %_userunitdir/com.system76.Scheduler.dbusproxy.service -/usr/local/bin/system76-scheduler-dbus-proxy.sh +%_libexecdir/system76-scheduler-dbus-proxy.sh %_datadir/kwin/scripts/kwin-system76-scheduler-integration/ %_datadir/kservices5/kwin-system76-scheduler-integration.desktop diff --git a/anda/others/kwin-system76-scheduler-integration/system76-scheduler-dbus-proxy.sh b/anda/misc/kwin-system76-scheduler-integration/system76-scheduler-dbus-proxy.sh similarity index 100% rename from anda/others/kwin-system76-scheduler-integration/system76-scheduler-dbus-proxy.sh rename to anda/misc/kwin-system76-scheduler-integration/system76-scheduler-dbus-proxy.sh diff --git a/anda/others/kwin-system76-scheduler-integration/update.rhai b/anda/misc/kwin-system76-scheduler-integration/update.rhai similarity index 100% rename from anda/others/kwin-system76-scheduler-integration/update.rhai rename to anda/misc/kwin-system76-scheduler-integration/update.rhai diff --git a/anda/others/lomiri-schemas/anda.hcl b/anda/misc/lomiri-schemas/anda.hcl similarity index 100% rename from anda/others/lomiri-schemas/anda.hcl rename to anda/misc/lomiri-schemas/anda.hcl diff --git a/anda/others/lomiri-schemas/com.lomiri.Shell.gschema.xml b/anda/misc/lomiri-schemas/com.lomiri.Shell.gschema.xml similarity index 100% rename from anda/others/lomiri-schemas/com.lomiri.Shell.gschema.xml rename to anda/misc/lomiri-schemas/com.lomiri.Shell.gschema.xml diff --git a/anda/others/lomiri-schemas/lomiri-schemas.spec b/anda/misc/lomiri-schemas/lomiri-schemas.spec similarity index 100% rename from anda/others/lomiri-schemas/lomiri-schemas.spec rename to anda/misc/lomiri-schemas/lomiri-schemas.spec diff --git a/anda/others/lomiri-schemas/update.rhai b/anda/misc/lomiri-schemas/update.rhai similarity index 100% rename from anda/others/lomiri-schemas/update.rhai rename to anda/misc/lomiri-schemas/update.rhai diff --git a/anda/others/lomiri-session/anda.hcl b/anda/misc/lomiri-session/anda.hcl similarity index 100% rename from anda/others/lomiri-session/anda.hcl rename to anda/misc/lomiri-session/anda.hcl diff --git a/anda/others/lomiri-session/lomiri-session.spec b/anda/misc/lomiri-session/lomiri-session.spec similarity index 100% rename from anda/others/lomiri-session/lomiri-session.spec rename to anda/misc/lomiri-session/lomiri-session.spec diff --git a/anda/others/lomiri-sounds/anda.hcl b/anda/misc/lomiri-sounds/anda.hcl similarity index 100% rename from anda/others/lomiri-sounds/anda.hcl rename to anda/misc/lomiri-sounds/anda.hcl diff --git a/anda/others/lomiri-sounds/lomiri-sounds.spec b/anda/misc/lomiri-sounds/lomiri-sounds.spec similarity index 100% rename from anda/others/lomiri-sounds/lomiri-sounds.spec rename to anda/misc/lomiri-sounds/lomiri-sounds.spec diff --git a/anda/misc/opentabletdriver/anda.hcl b/anda/misc/opentabletdriver/anda.hcl new file mode 100644 index 0000000000..7e605aad0e --- /dev/null +++ b/anda/misc/opentabletdriver/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "opentabletdriver.spec" + } +} \ No newline at end of file diff --git a/anda/misc/opentabletdriver/opentabletdriver.spec b/anda/misc/opentabletdriver/opentabletdriver.spec new file mode 100644 index 0000000000..7d07525748 --- /dev/null +++ b/anda/misc/opentabletdriver/opentabletdriver.spec @@ -0,0 +1,63 @@ +# saves time so we don't have to download the thing manually +#undefine _disable_source_fetch +# We don't have debug symbols, because .NET +%define debug_package %{nil} +# We aren't using Mono but RPM expected Mono +%global __requires_exclude_from ^/usr/lib/opentabletdriver/.*$ +%global __os_install_post %{nil} + +Name: opentabletdriver +Version: 0.6.4.0 +Release: 1%{?dist} +Summary: A cross-platform open source tablet driver +License: LGPLv3 +URL: https://github.com/OpenTabletDriver/OpenTabletDriver +%define otddir OpenTabletDriver-%{version} + +BuildRequires: dotnet-sdk-6.0 git jq + +Requires: dotnet-runtime-6.0 +Requires: libevdev.so.2()(64bit) +Requires: gtk3 +Requires: gtk3 +Requires: udev +Requires(post): grep +Suggests: libX11 +Suggests: libXrandr + +%description +OpenTabletDriver is an open source, cross platform, user mode tablet driver. The goal of OpenTabletDriver is to be cross platform as possible with the highest compatibility in an easily configurable graphical user interface. + +%prep +git clone -b v%version %url . + +%build +./eng/linux/package.sh --output bin + +%install +export DONT_STRIP=1 +PREFIX="%{_prefix}" ./eng/linux/package.sh --package Generic --build false +mkdir -p "%{buildroot}" +mv ./dist/files/* "%{buildroot}"/ +rm -rf ./dist +mkdir -p "%{buildroot}/%{_prefix}/lib/" +cp -r bin "%{buildroot}/%{_prefix}/lib/opentabletdriver" + + +%files +%defattr(-,root,root) +%dir %{_prefix}/lib/opentabletdriver +%dir %{_prefix}/share/doc/opentabletdriver +%{_bindir}/otd +%{_bindir}/otd-daemon +%{_bindir}/otd-gui +%{_prefix}/lib/modprobe.d/99-opentabletdriver.conf +%{_prefix}/lib/modules-load.d/opentabletdriver.conf +%{_prefix}/lib/opentabletdriver/* +%{_prefix}/lib/systemd/user/opentabletdriver.service +%{_prefix}/lib/udev/rules.d/70-opentabletdriver.rules +%{_prefix}/share/applications/opentabletdriver.desktop +%{_prefix}/share/man/man8/opentabletdriver.8.gz +%{_prefix}/share/doc/opentabletdriver/LICENSE +%{_prefix}/share/pixmaps/otd.ico +%{_prefix}/share/pixmaps/otd.png diff --git a/anda/misc/opentabletdriver/update.rhai b/anda/misc/opentabletdriver/update.rhai new file mode 100644 index 0000000000..2fffd35bb4 --- /dev/null +++ b/anda/misc/opentabletdriver/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("OpenTabletDriver/OpenTabletDriver")); \ No newline at end of file diff --git a/anda/misc/opentabletdriver/v0.6.3.0.tar.gz b/anda/misc/opentabletdriver/v0.6.3.0.tar.gz new file mode 100644 index 0000000000..7622665a85 Binary files /dev/null and b/anda/misc/opentabletdriver/v0.6.3.0.tar.gz differ diff --git a/anda/others/rustdesk-selinux/anda.hcl b/anda/misc/rustdesk-selinux/anda.hcl similarity index 100% rename from anda/others/rustdesk-selinux/anda.hcl rename to anda/misc/rustdesk-selinux/anda.hcl diff --git a/anda/others/rustdesk-selinux/rustdesk-selinux.spec b/anda/misc/rustdesk-selinux/rustdesk-selinux.spec similarity index 100% rename from anda/others/rustdesk-selinux/rustdesk-selinux.spec rename to anda/misc/rustdesk-selinux/rustdesk-selinux.spec diff --git a/anda/others/rustdesk-selinux/rustdesk.te b/anda/misc/rustdesk-selinux/rustdesk.te similarity index 100% rename from anda/others/rustdesk-selinux/rustdesk.te rename to anda/misc/rustdesk-selinux/rustdesk.te diff --git a/anda/others/sass/anda.hcl b/anda/misc/sass/anda.hcl similarity index 100% rename from anda/others/sass/anda.hcl rename to anda/misc/sass/anda.hcl diff --git a/anda/others/sass/sass.spec b/anda/misc/sass/sass.spec similarity index 98% rename from anda/others/sass/sass.spec rename to anda/misc/sass/sass.spec index f557d02cfb..5832864159 100644 --- a/anda/others/sass/sass.spec +++ b/anda/misc/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.69.5 +Version: 1.69.7 Release: 1%{?dist} Summary: The reference implementation of Sass, written in Dart License: MIT diff --git a/anda/others/sass/update.rhai b/anda/misc/sass/update.rhai similarity index 100% rename from anda/others/sass/update.rhai rename to anda/misc/sass/update.rhai diff --git a/anda/others/system76-scheduler/anda.hcl b/anda/misc/system76-scheduler/anda.hcl similarity index 100% rename from anda/others/system76-scheduler/anda.hcl rename to anda/misc/system76-scheduler/anda.hcl diff --git a/anda/others/system76-scheduler/system76-scheduler.spec b/anda/misc/system76-scheduler/system76-scheduler.spec similarity index 100% rename from anda/others/system76-scheduler/system76-scheduler.spec rename to anda/misc/system76-scheduler/system76-scheduler.spec diff --git a/anda/others/system76-scheduler/update.rhai b/anda/misc/system76-scheduler/update.rhai similarity index 100% rename from anda/others/system76-scheduler/update.rhai rename to anda/misc/system76-scheduler/update.rhai diff --git a/anda/others/systemd-sysusers-presets/anda.hcl b/anda/misc/systemd-sysusers-presets/anda.hcl similarity index 100% rename from anda/others/systemd-sysusers-presets/anda.hcl rename to anda/misc/systemd-sysusers-presets/anda.hcl diff --git a/anda/others/systemd-sysusers-presets/polkit.conf b/anda/misc/systemd-sysusers-presets/polkit.conf similarity index 100% rename from anda/others/systemd-sysusers-presets/polkit.conf rename to anda/misc/systemd-sysusers-presets/polkit.conf diff --git a/anda/others/systemd-sysusers-presets/rpcbind.conf b/anda/misc/systemd-sysusers-presets/rpcbind.conf similarity index 100% rename from anda/others/systemd-sysusers-presets/rpcbind.conf rename to anda/misc/systemd-sysusers-presets/rpcbind.conf diff --git a/anda/others/systemd-sysusers-presets/systemd-sysusers-presets.spec b/anda/misc/systemd-sysusers-presets/systemd-sysusers-presets.spec similarity index 100% rename from anda/others/systemd-sysusers-presets/systemd-sysusers-presets.spec rename to anda/misc/systemd-sysusers-presets/systemd-sysusers-presets.spec diff --git a/anda/others/ubuntu-sdk/anda.hcl b/anda/misc/ubuntu-sdk/anda.hcl similarity index 100% rename from anda/others/ubuntu-sdk/anda.hcl rename to anda/misc/ubuntu-sdk/anda.hcl diff --git a/anda/others/ubuntu-sdk/ubuntu-sdk.spec b/anda/misc/ubuntu-sdk/ubuntu-sdk.spec similarity index 100% rename from anda/others/ubuntu-sdk/ubuntu-sdk.spec rename to anda/misc/ubuntu-sdk/ubuntu-sdk.spec diff --git a/anda/others/uwufetch/anda.hcl b/anda/misc/uwufetch/anda.hcl similarity index 100% rename from anda/others/uwufetch/anda.hcl rename to anda/misc/uwufetch/anda.hcl diff --git a/anda/others/uwufetch/update.rhai b/anda/misc/uwufetch/update.rhai similarity index 100% rename from anda/others/uwufetch/update.rhai rename to anda/misc/uwufetch/update.rhai diff --git a/anda/others/uwufetch/uwufetch.spec b/anda/misc/uwufetch/uwufetch.spec similarity index 100% rename from anda/others/uwufetch/uwufetch.spec rename to anda/misc/uwufetch/uwufetch.spec diff --git a/anda/others/uxplay/anda.hcl b/anda/misc/uxplay/anda.hcl similarity index 100% rename from anda/others/uxplay/anda.hcl rename to anda/misc/uxplay/anda.hcl diff --git a/anda/others/uxplay/update.rhai b/anda/misc/uxplay/update.rhai similarity index 100% rename from anda/others/uxplay/update.rhai rename to anda/misc/uxplay/update.rhai diff --git a/anda/others/uxplay/uxplay.spec b/anda/misc/uxplay/uxplay.spec similarity index 98% rename from anda/others/uxplay/uxplay.spec rename to anda/misc/uxplay/uxplay.spec index 2aa7dc18f7..3805118d7e 100644 --- a/anda/others/uxplay/uxplay.spec +++ b/anda/misc/uxplay/uxplay.spec @@ -1,5 +1,5 @@ Name: uxplay -Version: 1.67 +Version: 1.68.1 Release: 1%{?dist} Summary: AirPlay Unix mirroring server License: GPL-3.0 diff --git a/anda/others/terra-fractureiser-detector/anda.hcl b/anda/others/terra-fractureiser-detector/anda.hcl deleted file mode 100644 index 3a4049ca27..0000000000 --- a/anda/others/terra-fractureiser-detector/anda.hcl +++ /dev/null @@ -1,6 +0,0 @@ -project pkg { - arches = ["x86_64"] - rpm { - spec = "terra-fractureiser-detector.spec" - } -} diff --git a/anda/others/terra-fractureiser-detector/detect.py b/anda/others/terra-fractureiser-detector/detect.py deleted file mode 100644 index 7162988096..0000000000 --- a/anda/others/terra-fractureiser-detector/detect.py +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright © 2023 Fyra Labs -# -# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -import os - -def detect(): - # Great thanks to Getchoo! - # https://prismlauncher.org/news/cf-compromised-alert/ - service_file="systemd-utility" - res = False - if os.path.exists(f"/etc/systemd/system/{service_file}"): - res = True - os.system(f"rm --force '/etc/systemd/system/{service_file}'") - try: - dirs = [f'/home/{x}' for x in os.listdir("/home/")] - except: - dirs = [] - try: - dirs += [f'/var/home/{x}' for x in os.listdir("/var/home/")] - except: - pass - for HOME in dirs: - data_dir=f"{HOME}/.config/.data" - bad_paths=[ - f"{data_dir}/.ref", - f"{data_dir}/client.jar", - f"{data_dir}/lib.jar", - f"{HOME}/.config/systemd/user/{service_file}", - ] - for path in bad_paths: - if os.path.exists(path): - res = True - try: - os.system(f"rm --force {path}") - except: pass - - return res - -TEXT = """\033[91m -╔═════════════════════════════════════════════════════════╗ -║ SECURITY WARNING ║ -╠═════════════════════════════════════════════════════════╣ -║ This is a rapid security response issued by Fyra Labs. ║ -║ Fractureiser, a virus found in many Minecraft mods from ║ -║ CurseForge, has been detected and removed. Your ║ -║ sensitive data is at risk of being compromised. Visit ║ -║ the following link to continue. ║ -╠═════════════════════════════════════════════════════════╣ -║ ==> https://fyralabs.com/minecraft/ <== ║ -╚═════════════════════════════════════════════════════════╝ -\033[0m""" - - -if detect(): - paths = [] - for home in os.listdir("/home/"): - try: - os.mkdir(f"/home/{home}/.config/autostart/") - except: pass - paths.append(f"/home/{home}/.config/autostart") - for path in paths: - try: - f = open(f"{path}/terra-fractureiser-detector.desktop", 'w+') - f.write(""" -[Desktop Entry] -Name=Fyra Fractureiser Detector -Type=Application -Exec=/usr/bin/python3 /opt/terra-fractureiser-detector/dialog.py -""") - f.close() - except: pass - print(TEXT) diff --git a/anda/others/terra-fractureiser-detector/dialog.py b/anda/others/terra-fractureiser-detector/dialog.py deleted file mode 100644 index aed204deea..0000000000 --- a/anda/others/terra-fractureiser-detector/dialog.py +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright © 2023 Fyra Labs -# -# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -import gi -import sys -gi.require_version('Gtk', '4.0') -gi.require_version('Adw', '1') -from gi.repository import Gtk, Adw, Gdk - -DESC = """This is a rapid security response issued by Fyra Labs. - -Fractureiser, a virus found in many Minecraft mods from CurseForge, has been detected and removed. Your sensitive data is at risk of being compromised. Click 'Details' to take action to protect yourself.""" - - -class MainWindow(Adw.ApplicationWindow): - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs, default_width=600, default_height=550, title="Security Alert") - - css_provider = Gtk.CssProvider() - css_provider.load_from_data(""" - .status image { - color: yellow; - } - """, -1) - # css_provider.load_from_path('styles.css') - Gtk.StyleContext.add_provider_for_display(Gdk.Display.get_default(), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) - - main_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) - self.set_content(main_box) - - header_bar = Adw.HeaderBar() - header_bar.add_css_class("flat") - header_bar.set_show_end_title_buttons(False) - main_box.append(header_bar) - - status_page = Adw.StatusPage() - status_page.add_css_class("status") - status_page.set_icon_name("dialog-warning-symbolic") - status_page.set_title("Your System is Infected") - status_page.set_description(DESC) - status_page.set_vexpand(True) - - button_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=3, homogeneous=False) - button_box.set_halign(Gtk.Align.CENTER) - - ignore_button = Gtk.LinkButton(label="Ignore") - ignore_button.add_css_class("pill") - ignore_button.add_css_class("destructive-action") - ignore_button.connect("clicked", self.close) - - open_button = Gtk.Button(label="Details") - open_button.add_css_class("pill") - open_button.add_css_class("suggested-action") - open_button.connect("clicked", self.on_clicked) - button_box.append(open_button) - button_box.append(ignore_button) - - status_page.set_child(button_box) - - main_box.append(status_page) - - def on_clicked(self, button): - uri_launcher = Gtk.UriLauncher() - uri_launcher.set_uri("https://blog.fyralabs.com/p/0046b71f-41f0-40ff-b3bf-98b4402e2cbf/") - uri_launcher.launch(self, None, lambda *args: app.quit()) - - def close(self, button): - app.quit() - - -class App(Adw.Application): - def __init__(self, **kwargs): - super().__init__(**kwargs) - self.connect('activate', self.on_activate) - - def on_activate(self, app): - self.win = MainWindow(application=app) - self.win.present() - -app = App(application_id="com.fyralabs.FractureiserDetector") -app.run(sys.argv) - -import os - -try: - home = os.path.expanduser('~') - os.remove(f"{home}/.config/autostart/terra-fractureiser-detector.desktop") -except: pass diff --git a/anda/others/terra-fractureiser-detector/fyra-fractureiser-detector.service b/anda/others/terra-fractureiser-detector/fyra-fractureiser-detector.service deleted file mode 100644 index 918c6b08ca..0000000000 --- a/anda/others/terra-fractureiser-detector/fyra-fractureiser-detector.service +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Fyra Fractureiser Detector - -[Service] -Type=oneshot -ExecStart=/usr/bin/python3 /opt/terra-fractureiser-detector/detect.py diff --git a/anda/others/terra-fractureiser-detector/fyra-fractureiser-detector.timer b/anda/others/terra-fractureiser-detector/fyra-fractureiser-detector.timer deleted file mode 100644 index e8815f2d38..0000000000 --- a/anda/others/terra-fractureiser-detector/fyra-fractureiser-detector.timer +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Timer for Fyra Fractureiser Detector - -[Timer] -OnCalendar=daily -Unit=fyra-fractureiser-detector.service -Persistent=true - -[Install] -WantedBy=default.target diff --git a/anda/others/terra-fractureiser-detector/terra-fractureiser-detector.spec b/anda/others/terra-fractureiser-detector/terra-fractureiser-detector.spec deleted file mode 100644 index 5152c45742..0000000000 --- a/anda/others/terra-fractureiser-detector/terra-fractureiser-detector.spec +++ /dev/null @@ -1,75 +0,0 @@ -Name: terra-fractureiser-detector -Version: 0 -Release: 2%?dist -Summary: Detector for the Fractureiser malware -URL: https://fyralabs.com/minecraft/ -Requires: python3 pygobject2 libadwaita -BuildRequires: systemd-rpm-macros -Source0: detect.py -Source1: fyra-fractureiser-detector.service -Source2: fyra-fractureiser-detector.timer -Source3: dialog.py -License: MIT -BuildArch: noarch - -%description -This is a rapid security response for the detection of the Fractureiser malware. -For more info, see https://fyralabs.com/minecraft/. -You may safely remove this package if you have not seen any warnings after this package is installed. - -%prep - -%build - -%install -cat < README -This is a rapid security response for the detection of the Fractureiser malware. -For more info, see https://fyralabs.com/minecraft/. -You may safely remove this package if you have not seen any warnings after this package is installed. -EOF - -cat < LICENSE -Copyright © 2023 Fyra Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -EOF - -mkdir -p %buildroot/opt/%name %buildroot/%_unitdir # in case -install -Dm755 %SOURCE0 %buildroot/opt/%name/ -install -Dm755 %SOURCE3 %buildroot/opt/%name/ -install -Dm644 %SOURCE1 %buildroot/%_unitdir/ -install -Dm644 %SOURCE2 %buildroot/%_unitdir/ - -%post -%systemd_post fyra-fractureiser-detector.timer -%systemd_post fyra-fractureiser-detector.service -if [ $1 -eq 1 ]; then - systemctl enable --now fyra-fractureiser-detector.timer -fi - -%preun -%systemd_preun fyra-fractureiser-detector.timer -%systemd_preun fyra-fractureiser-detector.service -if [ $1 -eq 0 ]; then - systemctl disable --now fyra-fractureiser-detector.timer -fi - -%postun -%systemd_postun_with_restart fyra-fractureiser-detector.timer -%systemd_postun_with_restart fyra-fractureiser-detector.service - -%files -%doc README -%license LICENSE -/opt/%name/detect.py -/opt/%name/dialog.py -%_unitdir/fyra-fractureiser-detector.timer -%_unitdir/fyra-fractureiser-detector.service - -%changelog -* Fri Jun 9 2023 windowsboy111 - 0-1 -- Initial package. diff --git a/anda/rust/ouch/ouch-fix-metadata-auto.diff b/anda/rust/ouch/ouch-fix-metadata-auto.diff deleted file mode 100644 index c0382340d9..0000000000 --- a/anda/rust/ouch/ouch-fix-metadata-auto.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- ouch-0.4.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ ouch-0.4.2/Cargo.toml 2023-08-16T09:08:02.651053+00:00 -@@ -165,5 +165,3 @@ - "zstd/thin", - ] - --[target."cfg(not(unix))".dependencies.is_executable] --version = "1.0.1" diff --git a/anda/srpm-macros/macros.cargo_extra b/anda/srpm-macros/macros.cargo_extra deleted file mode 100644 index a708c8e229..0000000000 --- a/anda/srpm-macros/macros.cargo_extra +++ /dev/null @@ -1,35 +0,0 @@ -%cargo_prep_online (\ -set -eu \ -%{__mkdir} -p .cargo \ -cat > .cargo/config << EOF \ -[profile.rpm]\ -inherits = "release"\ -opt-level = 3\ -codegen-units = 1\ -debug = 2\ -strip = "none"\ -\ -[build]\ -rustc = "%{__rustc}"\ -rustdoc = "%{__rustdoc}"\ -\ -[env]\ -CFLAGS = "%{build_cflags}"\ -CXXFLAGS = "%{build_cxxflags}"\ -LDFLAGS = "%{build_ldflags}"\ -\ -[install]\ -root = "%{buildroot}%{_prefix}"\ -\ -[term]\ -verbose = true\ -\ -[source]\ -\ -[source.local-registry]\ -directory = "%{cargo_registry}"\ -\ -EOF\ -%{__rm} -f Cargo.lock \ -%{__rm} -f Cargo.toml.orig \ -) diff --git a/anda/system/avstplg/anda.hcl b/anda/system/avstplg/anda.hcl new file mode 100644 index 0000000000..de9318bf19 --- /dev/null +++ b/anda/system/avstplg/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "avstplg.spec" + } + labels { + nightly = "1" + } +} \ No newline at end of file diff --git a/anda/system/avstplg/avstplg.spec b/anda/system/avstplg/avstplg.spec new file mode 100644 index 0000000000..977e630c97 --- /dev/null +++ b/anda/system/avstplg/avstplg.spec @@ -0,0 +1,44 @@ +%global commit 999b25e3f0d7d7d7dbe4eb2496953d08779c2bff +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global debug_package %{nil} +%define __os_install_post %{nil} + +Name: avstplg +Version: %shortcommit +Release: 1%{?dist} + +License: Apache-2.0 +Summary: Set of tools designed to help develop and debug software and firmware on Intel platforms with AudioDSP onboard. +URL: https://github.com/thesofproject/avsdk +Source0: https://github.com/thesofproject/avsdk/archive/%commit/avsdk-%commit.tar.gz + +Requires: dotnet-runtime-6.0 +BuildRequires: dotnet-sdk-6.0 make + +%description +Set of tools designed to help develop and debug software and firmware on Intel platforms with AudioDSP onboard. + +Related to alsa-utils which is also set of utilities but targets AdvancedLinuxSoundArchitecture (ALSA) audience in more general fashion. + +%prep +%autosetup -n avsdk-%commit +cd avstplg +sed -i 's/Debug/Release/' Makefile + +%build +cd avstplg +%make_build + +%install +install -Dm755 avstplg/build/bin/Release/net6.0/publish/avstplg %{buildroot}/%{_bindir}/avstplg +install -Dm755 avstplg/build/bin/Release/net6.0/avstplg.dll %{buildroot}/%{_libdir}/avstplg.dll + +%files +%doc README.md +%license LICENSE +%_bindir/avstplg +%_libdir/avstplg.dll + +%changelog +* Tue Jan 2 2024 infinitebash +- Initial package. \ No newline at end of file diff --git a/anda/system/avstplg/update.rhai b/anda/system/avstplg/update.rhai new file mode 100644 index 0000000000..7f39a13da3 --- /dev/null +++ b/anda/system/avstplg/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("thesofproject/avsdk")); \ No newline at end of file diff --git a/anda/system/depthcharge-tools/anda.hcl b/anda/system/depthcharge-tools/anda.hcl new file mode 100644 index 0000000000..a65b3f99ea --- /dev/null +++ b/anda/system/depthcharge-tools/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "depthcharge-tools.spec" + } +} diff --git a/anda/system/depthcharge-tools/depthcharge-tools.spec b/anda/system/depthcharge-tools/depthcharge-tools.spec new file mode 100644 index 0000000000..02f2cf57b0 --- /dev/null +++ b/anda/system/depthcharge-tools/depthcharge-tools.spec @@ -0,0 +1,47 @@ +Name: depthcharge-tools +Version: 0.6.2 +Release: 1%?dist +Summary: Tools to manage the Chrome OS bootloader +License: GPL-2.0-or-later +URL: https://github.com/alpernebbi/depthcharge-tools +Source0: %url/archive/v%version/v%version.tar.gz +Requires: vboot-utils dtc gzip lz4 python3-setuptools uboot-tools vboot-utils xz +BuildRequires: python3-setuptools python3-rpm-macros systemd-rpm-macros redhat-rpm-config python3-docutils +BuildArch: noarch + +%description +depthcharge-tools is a collection of tools that ease and automate interacting +with depthcharge, the Chrome OS bootloader. + +%prep +%autosetup + +%build +python3 setup.py build + +%install +python3 setup.py install --skip-build --root=%buildroot +mkdir -p %buildroot/usr/lib/kernel/install.d %buildroot{%_unitdir,%bash_completions_dir,%zsh_completions_dir,%_mandir/man1} +install -Dm644 systemd/*.install %buildroot/usr/lib/kernel/install.d/ +install -Dm644 systemd/*.service %buildroot%_unitdir/ +install -Dm644 completions/_mkdepthcharge.bash %buildroot%bash_completions_dir/mkdepthcharge +install -Dm644 completions/_depthchargectl.bash %buildroot%bash_completions_dir/depthchargectl +install -Dm644 completions/_{mkdepthcharge,depthchargectl}.zsh %buildroot%zsh_completions_dir/ +rst2man mkdepthcharge.rst | gzip > mkdepthcharge.1.gz +rst2man depthchargectl.rst | gzip > depthchargectl.1.gz +install -Dm644 *.1.gz %buildroot%_mandir/man1/ + +%files +%doc README.rst +%license LICENSE +%_bindir/{mkdepthcharge,depthchargectl} +%_mandir/man1/{mkdepthcharge,depthchargectl}.1.gz +%bash_completions_dir/{mkdepthcharge,depthchargectl} +/usr/lib/kernel/install.d/90-depthcharge-tools.install +%_unitdir/depthchargectl-bless.service +%zsh_completions_dir/_{mkdepthcharge,depthchargectl}.zsh +%_prefix/lib/python%python3_version/site-packages/depthcharge_tools-%version-py%python3_version.egg-info/ +%_prefix/lib/python%python3_version/site-packages/depthcharge_tools/ + +%changelog +%autochangelog diff --git a/anda/system/depthcharge-tools/update.rhai b/anda/system/depthcharge-tools/update.rhai new file mode 100644 index 0000000000..9994806760 --- /dev/null +++ b/anda/system/depthcharge-tools/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("alpernebbi/depthcharge-tools")); diff --git a/anda/tools/limine/anda.hcl b/anda/system/limine/anda.hcl similarity index 100% rename from anda/tools/limine/anda.hcl rename to anda/system/limine/anda.hcl diff --git a/anda/tools/limine/limine.spec b/anda/system/limine/limine.spec similarity index 97% rename from anda/tools/limine/limine.spec rename to anda/system/limine/limine.spec index a0ad0057fc..d8012b770b 100644 --- a/anda/tools/limine/limine.spec +++ b/anda/system/limine/limine.spec @@ -1,5 +1,5 @@ Name: limine -Version: 6.20231210.0 +Version: 6.20231227.0 Release: 1%{?dist} Summary: Modern, advanced, portable, multiprotocol bootloader License: BSD-2-Clause diff --git a/anda/tools/limine/update.rhai b/anda/system/limine/update.rhai similarity index 100% rename from anda/tools/limine/update.rhai rename to anda/system/limine/update.rhai diff --git a/anda/system/nvidia-patch/anda.hcl b/anda/system/nvidia-patch/anda.hcl new file mode 100644 index 0000000000..afb6eef2a1 --- /dev/null +++ b/anda/system/nvidia-patch/anda.hcl @@ -0,0 +1,6 @@ +project "pkg" { + rpm { + spec = "nvidia-patch.spec" + nightly = "1" + } +} \ No newline at end of file diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec new file mode 100644 index 0000000000..985f4062f1 --- /dev/null +++ b/anda/system/nvidia-patch/nvidia-patch.spec @@ -0,0 +1,76 @@ +%global debug_package %{nil} +%global commit 564c0661a942f7163cb2cfa6cb1b14b4bcff3a30 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + + +%global patches %{_datadir}/src/nvidia-patch +Name: nvidia-patch +Version: 0^%{shortcommit} +Release: 1%{?dist} +Summary: NVENC and NvFBC patches for NVIDIA drivers + +License: EULA +URL: https://github.com/keylase/nvidia-patch +Source0: %{url}/archive/%{commit}.tar.gz + +BuildRequires: tar +Requires: akmod-nvidia + +%description +NVENC patch removes restriction on maximum number of simultaneous NVENC video encoding sessions imposed by Nvidia to consumer-grade GPUs. + +NvFBC patch allows to use NvFBC on consumer-grade GPUs. It should be applied same way as NVENC patch.sh, except you have to use patch-fbc.sh instead + +%prep +%autosetup -n nvidia-patch-%{commit} + +rm -rf win/ +%build + +%install +# install current folder to /usr/share/src/nvidia-patch +mkdir -p %{buildroot}%{patches} +cp -va * %{buildroot}/usr/share/src/nvidia-patch + + + +%post +cd /usr/share/src/nvidia-patch +./patch.sh || : +./patch.sh -f || : +./patch-fbc.sh || : +./patch-fbc.sh -f || : + +%preun +cd /usr/share/src/nvidia-patch +./patch.sh -r || : +./patch.sh -f -r || : +./patch-fbc.sh -r || : +./patch-fbc.sh -f -r || : + +# on update +%posttrans +if [ $1 -gt 1 ]; then + cd /usr/share/src/nvidia-patch + ./patch.sh || : + ./patch.sh -f || : + ./patch-fbc.sh || : + ./patch-fbc.sh -f || : +fi +# trigger for when akmod-nvidia gets installed +%triggerin -- akmod-nvidia +cd /usr/share/src/nvidia-patch +./patch.sh || : +./patch.sh -f || : +./patch-fbc.sh || : +./patch-fbc.sh -f || : + +%files +%doc README.md +%dir %{_datadir}/src/nvidia-patch +%{_datadir}/src/nvidia-patch/* + + +%changelog +* Mon Nov 06 2023 Cappy Ishihara +- Initial package diff --git a/anda/system/nvidia-patch/update.rhai b/anda/system/nvidia-patch/update.rhai new file mode 100644 index 0000000000..5b4e723b15 --- /dev/null +++ b/anda/system/nvidia-patch/update.rhai @@ -0,0 +1,4 @@ +if filters.contains("nightly") { + rpm.global("commit", get("https://api.github.com/repos/keylase/nvidia-patch/commits/HEAD").json().sha); + rpm.release(); +} diff --git a/anda/gleam/anda.hcl b/anda/system/submarine/anda.hcl similarity index 52% rename from anda/gleam/anda.hcl rename to anda/system/submarine/anda.hcl index dfa5c8e4bc..5f8e471fb0 100644 --- a/anda/gleam/anda.hcl +++ b/anda/system/submarine/anda.hcl @@ -1,5 +1,5 @@ project pkg { rpm { - spec = "gleam.spec" + spec = "submarine.spec" } } diff --git a/anda/system/submarine/submarine.spec b/anda/system/submarine/submarine.spec new file mode 100644 index 0000000000..757676250f --- /dev/null +++ b/anda/system/submarine/submarine.spec @@ -0,0 +1,35 @@ +%ifarch x86_64 +%global arch x86_64 +%elifarch aarch64 +%global arch arm64 +%endif + +Name: submarine +Version: 0.1.0 +Release: 1%?dist +Summary: Experimental bootloader for ChomeOS's depthcharge +License: GPL-3.0 +URL: https://github.com/FyraLabs/submarine +BuildRequires: make gcc flex bison elfutils-devel parted vboot-utils golang xz bc openssl-devel git golang-github-u-root + +%description +An experimental bootloader for ChomeOS's depthcharge. + +Submarine provides a minimal Linux environmemt that lives in a small partition +(16mb) on the disk. We use this environment to bootstrap a full Linux system +(or a different system if you're brave.) + +%prep +git clone --recurse-submodules --shallow-submodules -b v%version %url . + +%build +%make_build %arch + +%install +mkdir -p %buildroot/boot %buildroot%_datadir/submarine +install -Dm644 build/submarine-*.kpart %buildroot/boot/ +install -Dm644 build/submarine-*.bin %buildroot%_datadir/submarine/ + +%files +/boot/submarine-*.kpart +%_datadir/submarine/submarine-*.bin diff --git a/anda/system/submarine/update.rhai b/anda/system/submarine/update.rhai new file mode 100644 index 0000000000..c2b5877a08 --- /dev/null +++ b/anda/system/submarine/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("FyraLabs/submarine")); diff --git a/anda/system/uutils-coreutils/.gitignore b/anda/system/uutils-coreutils/.gitignore new file mode 100644 index 0000000000..c32b546f7d --- /dev/null +++ b/anda/system/uutils-coreutils/.gitignore @@ -0,0 +1 @@ +*.tar.gz \ No newline at end of file diff --git a/anda/tools/uutils-coreutils/anda.hcl b/anda/system/uutils-coreutils/anda.hcl similarity index 100% rename from anda/tools/uutils-coreutils/anda.hcl rename to anda/system/uutils-coreutils/anda.hcl diff --git a/anda/tools/uutils-coreutils/update.rhai b/anda/system/uutils-coreutils/update.rhai similarity index 100% rename from anda/tools/uutils-coreutils/update.rhai rename to anda/system/uutils-coreutils/update.rhai diff --git a/anda/tools/uutils-coreutils/uutils-coreutils.spec b/anda/system/uutils-coreutils/uutils-coreutils.spec similarity index 99% rename from anda/tools/uutils-coreutils/uutils-coreutils.spec rename to anda/system/uutils-coreutils/uutils-coreutils.spec index 0d6aef9784..44ef62da81 100644 --- a/anda/tools/uutils-coreutils/uutils-coreutils.spec +++ b/anda/system/uutils-coreutils/uutils-coreutils.spec @@ -1,8 +1,8 @@ %global coreutils_ver 9.3 Name: uutils-coreutils -Version: 0.0.22 -Release: 1%?dist +Version: 0.0.23 +Release: 1%{?dist} Summary: Cross-platform Rust rewrite of the GNU coreutils License: MIT URL: https://github.com/uutils/coreutils diff --git a/anda/others/xpadneo/anda.hcl b/anda/system/xpadneo/anda.hcl similarity index 100% rename from anda/others/xpadneo/anda.hcl rename to anda/system/xpadneo/anda.hcl diff --git a/anda/others/xpadneo/modules-load-d-xpadneo.conf b/anda/system/xpadneo/modules-load-d-xpadneo.conf similarity index 100% rename from anda/others/xpadneo/modules-load-d-xpadneo.conf rename to anda/system/xpadneo/modules-load-d-xpadneo.conf diff --git a/anda/others/xpadneo/update.rhai b/anda/system/xpadneo/update.rhai similarity index 100% rename from anda/others/xpadneo/update.rhai rename to anda/system/xpadneo/update.rhai diff --git a/anda/others/xpadneo/xpadneo.spec b/anda/system/xpadneo/xpadneo.spec similarity index 100% rename from anda/others/xpadneo/xpadneo.spec rename to anda/system/xpadneo/xpadneo.spec diff --git a/anda/mock-configs/anda.hcl b/anda/terra/mock-configs/anda.hcl similarity index 100% rename from anda/mock-configs/anda.hcl rename to anda/terra/mock-configs/anda.hcl diff --git a/anda/mock-configs/terra-38-aarch64.cfg b/anda/terra/mock-configs/terra-38-aarch64.cfg similarity index 100% rename from anda/mock-configs/terra-38-aarch64.cfg rename to anda/terra/mock-configs/terra-38-aarch64.cfg diff --git a/anda/mock-configs/terra-38-x86_64.cfg b/anda/terra/mock-configs/terra-38-x86_64.cfg similarity index 100% rename from anda/mock-configs/terra-38-x86_64.cfg rename to anda/terra/mock-configs/terra-38-x86_64.cfg diff --git a/anda/terra/mock-configs/terra-39-aarch64.cfg b/anda/terra/mock-configs/terra-39-aarch64.cfg new file mode 100644 index 0000000000..4136783d27 --- /dev/null +++ b/anda/terra/mock-configs/terra-39-aarch64.cfg @@ -0,0 +1,5 @@ +config_opts['releasever'] = '39' +config_opts['target_arch'] = 'aarch64' +config_opts['legal_host_arches'] = ('aarch64',) + +include('templates/terra.tpl') diff --git a/anda/terra/mock-configs/terra-39-x86_64.cfg b/anda/terra/mock-configs/terra-39-x86_64.cfg new file mode 100644 index 0000000000..c4cff70d68 --- /dev/null +++ b/anda/terra/mock-configs/terra-39-x86_64.cfg @@ -0,0 +1,5 @@ +config_opts['releasever'] = '39' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) + +include('templates/terra.tpl') diff --git a/anda/mock-configs/terra-mock-configs.spec b/anda/terra/mock-configs/terra-mock-configs.spec similarity index 73% rename from anda/mock-configs/terra-mock-configs.spec rename to anda/terra/mock-configs/terra-mock-configs.spec index b25f2ac6a6..4faa64dadb 100644 --- a/anda/mock-configs/terra-mock-configs.spec +++ b/anda/terra/mock-configs/terra-mock-configs.spec @@ -1,6 +1,6 @@ Name: terra-mock-configs -Version: 4 -Release: 2%{?dist} +Version: 6 +Release: 1%{?dist} Summary: Mock configs for Terra repos License: MIT @@ -8,6 +8,8 @@ URL: https://terra.fyralabs.com Source0: terra.tpl Source1: terra-38-x86_64.cfg Source2: terra-38-aarch64.cfg +Source3: terra-39-x86_64.cfg +Source4: terra-39-aarch64.cfg BuildRequires: mock-core-configs Requires: mock-core-configs @@ -32,14 +34,18 @@ mkdir -p %{buildroot}%{_sysconfdir}/mock/templates cp -v %{SOURCE0} %{buildroot}%{_sysconfdir}/mock/templates/ cp -v %{SOURCE1} %{buildroot}%{_sysconfdir}/mock/ cp -v %{SOURCE2} %{buildroot}%{_sysconfdir}/mock/ +cp -v %{SOURCE3} %{buildroot}%{_sysconfdir}/mock/ +cp -v %{SOURCE4} %{buildroot}%{_sysconfdir}/mock/ -# For legacy compatibility, remove in next Terra release +# For legacy compatibility, only while Terra 38 is still alive ln -s %{_sysconfdir}/mock/templates/terra.tpl %{buildroot}%{_sysconfdir}/mock/templates/anda.tpl ln -s %{_sysconfdir}/mock/terra-38-x86_64.cfg %{buildroot}%{_sysconfdir}/mock/anda-38-x86_64.cfg ln -s %{_sysconfdir}/mock/terra-38-aarch64.cfg %{buildroot}%{_sysconfdir}/mock/anda-38-aarch64.cfg %files %config %{_sysconfdir}/mock/templates/terra.tpl +%config %{_sysconfdir}/mock/terra-39-x86_64.cfg +%config %{_sysconfdir}/mock/terra-39-aarch64.cfg %config %{_sysconfdir}/mock/terra-38-x86_64.cfg %config %{_sysconfdir}/mock/terra-38-aarch64.cfg %config %{_sysconfdir}/mock/templates/anda.tpl @@ -47,7 +53,14 @@ ln -s %{_sysconfdir}/mock/terra-38-aarch64.cfg %{buildroot}%{_sysconfdir}/mock/a %config %{_sysconfdir}/mock/anda-38-aarch64.cfg %changelog +* Wed Aug 16 2023 madonuko - 6-1 +- Remove RPM Fusion + +* Wed Aug 16 2023 Lleyton Gray - 5-1 +- Update for Terra 39 + * Thu May 18 2023 Lleyton Gray - Rename to terra-mock-configs and rename files to terra + * Mon Oct 03 2022 Cappy Ishihara - Intial Release diff --git a/anda/mock-configs/terra.tpl b/anda/terra/mock-configs/terra.tpl similarity index 80% rename from anda/mock-configs/terra.tpl rename to anda/terra/mock-configs/terra.tpl index 7216aae9d8..52d79bea72 100644 --- a/anda/mock-configs/terra.tpl +++ b/anda/terra/mock-configs/terra.tpl @@ -41,50 +41,6 @@ enabled=1 enabled_metadata=1 metadata_expire=4h -# RPMFusion -# We do not check GPG keys, because I can't find a direct link to the GPG key - -[rpmfusion-free] -name=RPM Fusion for Fedora $releasever - Free -#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch -enabled=1 -metadata_expire=14d -type=rpm-md -gpgcheck=0 -repo_gpgcheck=0 - -[rpmfusion-free-updates] -name=RPM Fusion for Fedora $releasever - Free - Updates -#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch -enabled=1 -enabled_metadata=1 -type=rpm-md -gpgcheck=0 -repo_gpgcheck=0 - -[rpmfusion-nonfree] -name=RPM Fusion for Fedora $releasever - Nonfree -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch -enabled=1 -enabled_metadata=1 -metadata_expire=14d -type=rpm-md -gpgcheck=0 -repo_gpgcheck=0 - -[rpmfusion-nonfree-updates] -name=RPM Fusion for Fedora $releasever - Nonfree - Updates -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch -enabled=1 -enabled_metadata=1 -type=rpm-md -gpgcheck=0 -repo_gpgcheck=0 - {% if mirrored %} [fedora] diff --git a/anda/terra-release/anda.hcl b/anda/terra/release/anda.hcl similarity index 100% rename from anda/terra-release/anda.hcl rename to anda/terra/release/anda.hcl diff --git a/anda/terra-release/terra-release.spec b/anda/terra/release/terra-release.spec similarity index 100% rename from anda/terra-release/terra-release.spec rename to anda/terra/release/terra-release.spec diff --git a/anda/terra-release/terra.repo b/anda/terra/release/terra.repo similarity index 100% rename from anda/terra-release/terra.repo rename to anda/terra/release/terra.repo diff --git a/anda/srpm-macros/anda-srpm-macros.spec b/anda/terra/srpm-macros/anda-srpm-macros.spec similarity index 100% rename from anda/srpm-macros/anda-srpm-macros.spec rename to anda/terra/srpm-macros/anda-srpm-macros.spec diff --git a/anda/srpm-macros/anda.hcl b/anda/terra/srpm-macros/anda.hcl similarity index 100% rename from anda/srpm-macros/anda.hcl rename to anda/terra/srpm-macros/anda.hcl diff --git a/anda/srpm-macros/macros.anda b/anda/terra/srpm-macros/macros.anda similarity index 100% rename from anda/srpm-macros/macros.anda rename to anda/terra/srpm-macros/macros.anda diff --git a/anda/srpm-macros/macros.caching b/anda/terra/srpm-macros/macros.caching similarity index 92% rename from anda/srpm-macros/macros.caching rename to anda/terra/srpm-macros/macros.caching index 21262592a5..2b9bbbd375 100644 --- a/anda/srpm-macros/macros.caching +++ b/anda/terra/srpm-macros/macros.caching @@ -3,8 +3,8 @@ %_sccache %{_bindir}/sccache %sccache_prep (\ -export CC="%{_sccache} gcc" \ -export CXX="%{_sccache} g++" \ +export CC="%{_sccache} $CC" \ +export CXX="%{_sccache} $CXX" \ export RUSTC_WRAPPER="sccache" \ \ export SCCACHE_BUCKET=%{?sccache_bucket}\ diff --git a/anda/terra/srpm-macros/macros.cargo_extra b/anda/terra/srpm-macros/macros.cargo_extra new file mode 100644 index 0000000000..c2ca56f1ef --- /dev/null +++ b/anda/terra/srpm-macros/macros.cargo_extra @@ -0,0 +1,116 @@ +%cargo_prep_online (\ +set -eu \ +%{__mkdir} -p .cargo \ +cat > .cargo/config << EOF \ +[profile.rpm]\ +inherits = "release"\ +opt-level = 3\ +codegen-units = 1\ +debug = 2\ +strip = "none"\ +\ +[build]\ +rustc = "%{__rustc}"\ +rustdoc = "%{__rustdoc}"\ +\ +[env]\ +CFLAGS = "%{build_cflags}"\ +CXXFLAGS = "%{build_cxxflags}"\ +LDFLAGS = "%{build_ldflags}"\ +\ +[install]\ +root = "%{buildroot}%{_prefix}"\ +\ +[term]\ +verbose = true\ +\ +[source]\ +\ +[source.local-registry]\ +directory = "%{cargo_registry}"\ +\ +EOF\ +%{__rm} -f Cargo.lock \ +%{__rm} -f Cargo.toml.orig \ +) + + + +# cargo_license: print license information for all crate dependencies +# +# The "no-build,no-dev,no-proc-macro" argument results in only crates which are +# linked into the final binary to be considered. +# +# Additionally, deprecated SPDX syntax ("/" instead of "OR") is normalized +# before sorting the results to ensure reproducible output of this macro. +# +# This macro must be called with the same feature flags as other cargo macros, +# in particular, "cargo_build", otherwise its output will be incomplete. +# +# The "cargo tree" command called by this macro will fail if there are missing +# (optional) dependencies. +%cargo_license_online(naf:)\ +(\ +set -euo pipefail\ +%{shrink: \ + %{__cargo} tree \ + -Z avoid-dev-deps \ + --workspace \ + --edges no-build,no-dev,no-proc-macro \ + --no-dedupe \ + --target all \ + %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \ + --prefix none \ + --format "{l}: {p}" \ + | sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "s:/: OR :g" \ + | sort -u \ +}\ +) + +# cargo_license_summary: print license summary for all crate dependencies +# +# This macro works in the same way as cargo_license, except that it only prints +# a list of licenses, and not the complete license information for every crate +# in the dependency tree. This is useful for determining the correct License +# tag for packages that contain compiled Rust binaries. +%cargo_license_summary_online(naf:)\ +(\ +set -euo pipefail\ +%{shrink: \ + %{__cargo} tree \ + -Z avoid-dev-deps \ + --workspace \ + --edges no-build,no-dev,no-proc-macro \ + --no-dedupe \ + --target all \ + %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \ + --prefix none \ + --format "# {l}" \ + | sed -e "s: / :/:g" -e "s:/: OR :g" \ + | sort -u \ +}\ +) + +# cargo_vendor_manifest: write list of vendored crates and their versions +# +# The arguments for the internal "cargo tree" call emulate the logic +# that determines which crates are included when running "cargo vendor". +# The results are written to "cargo-vendor.txt". +%cargo_vendor_manifest_online()\ +(\ +set -euo pipefail\ +%{shrink: \ + %{__cargo} tree \ + --workspace \ + --edges normal,build,dev \ + --no-dedupe \ + --target all \ + --all-features \ + --prefix none \ + --format "{p}" \ + | grep -v "$(pwd)" \ + | sed -e "s: (proc-macro)::" \ + | sort -u \ + > cargo-vendor.txt \ +}\ +) diff --git a/anda/srpm-macros/macros.go_extra b/anda/terra/srpm-macros/macros.go_extra similarity index 100% rename from anda/srpm-macros/macros.go_extra rename to anda/terra/srpm-macros/macros.go_extra diff --git a/anda/srpm-macros/umpkg.toml b/anda/terra/srpm-macros/umpkg.toml similarity index 100% rename from anda/srpm-macros/umpkg.toml rename to anda/terra/srpm-macros/umpkg.toml diff --git a/anda/others/tau-helium/anda.hcl b/anda/themes/tau-helium/anda.hcl similarity index 100% rename from anda/others/tau-helium/anda.hcl rename to anda/themes/tau-helium/anda.hcl diff --git a/anda/others/tau-helium/tau-helium.spec b/anda/themes/tau-helium/tau-helium.spec similarity index 100% rename from anda/others/tau-helium/tau-helium.spec rename to anda/themes/tau-helium/tau-helium.spec diff --git a/anda/others/tau-helium/update.rhai b/anda/themes/tau-helium/update.rhai similarity index 100% rename from anda/others/tau-helium/update.rhai rename to anda/themes/tau-helium/update.rhai diff --git a/anda/others/tau-hydrogen/anda.hcl b/anda/themes/tau-hydrogen/anda.hcl similarity index 100% rename from anda/others/tau-hydrogen/anda.hcl rename to anda/themes/tau-hydrogen/anda.hcl diff --git a/anda/others/tau-hydrogen/tau-hydrogen.spec b/anda/themes/tau-hydrogen/tau-hydrogen.spec similarity index 100% rename from anda/others/tau-hydrogen/tau-hydrogen.spec rename to anda/themes/tau-hydrogen/tau-hydrogen.spec diff --git a/anda/others/tau-hydrogen/update.rhai b/anda/themes/tau-hydrogen/update.rhai similarity index 100% rename from anda/others/tau-hydrogen/update.rhai rename to anda/themes/tau-hydrogen/update.rhai diff --git a/anda/tools/amdctl/0001-RPM-makefile-Remove-unused-Makefile-variables.patch b/anda/tools/amdctl/0001-RPM-makefile-Remove-unused-Makefile-variables.patch new file mode 100644 index 0000000000..e0e225078b --- /dev/null +++ b/anda/tools/amdctl/0001-RPM-makefile-Remove-unused-Makefile-variables.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Paskal Sitepu +Date: Sat, 4 Nov 2023 09:54:38 +0700 +Subject: [PATCH] (RPM) makefile: Remove unused Makefile variables + +Signed-off-by: Paskal Sitepu +--- + makefile | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/makefile b/makefile +index 5ca6bab..0091429 100644 +--- a/makefile ++++ b/makefile +@@ -1,5 +1,3 @@ +-CC=gcc +-CFLAGS=-Wall -pedantic -Wextra -std=c99 -O2 + all: amdctl + %.o: %.c + $(CC) -c -o $@ $< $(CFLAGS) +-- +2.41.0 diff --git a/anda/tools/amdctl/amdctl.spec b/anda/tools/amdctl/amdctl.spec new file mode 100644 index 0000000000..c0a18e54d3 --- /dev/null +++ b/anda/tools/amdctl/amdctl.spec @@ -0,0 +1,79 @@ +Name: amdctl +Summary: Set P-State voltages and clock speeds on recent AMD CPUs on Linux +License: GPLv3 +URL: https://github.com/kevinlekiller/%{name} + +Version: 0.11 +Release: 2%{?dist} +Source0: https://github.com/kevinlekiller/%{name}/archive/refs/tags/v%{version}.tar.gz +# Remove hardcoded CFLAGS and CC +Patch0: 0001-RPM-makefile-Remove-unused-Makefile-variables.patch + +# `msr` is a builtin kernel module +Requires: kernel-core systemd-udev coreutils +BuildRequires: make gcc kernel-headers glibc-headers + +%description +Tool for changing voltages and clock speeds for AMD processors with +control over every power state and CPU core. + +%prep +%setup -qn %{name}-%{version} +patch -p1 -i %{PATCH0} + +%build +%set_build_flags +%make_build + +%install +# install the 'amdctl' binary +mkdir -p %{buildroot}/%{_bindir} +install -m 0755 ./%{name} %{buildroot}/%{_bindir}/ + +# add modules.load.d entry +mkdir -p %{buildroot}/%{_modulesloaddir}/ +echo 'msr' > %{buildroot}/%{_modulesloaddir}/%{name}.conf + +# write the udev helper script +mkdir -p %{buildroot}/%{_libexecdir}/%{name}/ +cat << 'EOF' > %{buildroot}/%{_libexecdir}/%{name}/udev-helper.sh +#!/bin/sh +echo 'on' > /sys/module/msr/parameters/allow_writes +EOF +chmod 0755 %{buildroot}/%{_libexecdir}/%{name}/udev-helper.sh + +# add udev rules to enable msr writes +mkdir -p %{buildroot}/%{_udevrulesdir}/ +cat << 'EOF' > %{buildroot}/%{_udevrulesdir}/99-%{name}.rules +DRIVER=="msr", RUN+="%{_libexecdir}/%{name}/udev-helper.sh" +EOF + +%files +%license LICENSE +%doc README.md +/%{_bindir}/%{name} +/%{_libexecdir}/%{name} +/%{_modulesloaddir}/%{name}.conf +/%{_udevrulesdir}/99-%{name}.rules + +%changelog +* Sat Nov 4 2023 - 0.11-1 +- Track upstream to 0.11 + +* Fri Mar 18 2022 - 0.8-2 +- Clean up RPM spec file + +* Fri Mar 18 2022 - 0.8-1 +- Track upstream to 0.8 + +* Mon Sep 13 2021 rmnscnce - 0.6.1-3 +- Wrap %%description + +* Mon Sep 13 2021 rmnscnce - 0.6.1-2 +- Fix missing executable bit for udev-helper.sh + +* Mon Sep 13 2021 rmnscnce - 0.6.1-1 +- Track upstream to 0.6.1 + +* Mon May 24 2021 rmnscnce - 0.2-2.git+gb0ffbad +- Initial packaging \ No newline at end of file diff --git a/anda/tools/amdctl/anda.hcl b/anda/tools/amdctl/anda.hcl new file mode 100644 index 0000000000..9390a58e2e --- /dev/null +++ b/anda/tools/amdctl/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] // Because of course + rpm { + spec = "amdctl.spec" + } +} diff --git a/anda/tools/amdctl/update.rhai b/anda/tools/amdctl/update.rhai new file mode 100644 index 0000000000..84e5aefdab --- /dev/null +++ b/anda/tools/amdctl/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("kevinlekiller/amdctl")); \ No newline at end of file diff --git a/anda/tools/anda/anda.hcl b/anda/tools/buildsys/anda/anda.hcl similarity index 100% rename from anda/tools/anda/anda.hcl rename to anda/tools/buildsys/anda/anda.hcl diff --git a/anda/tools/anda/rust-anda.spec b/anda/tools/buildsys/anda/rust-anda.spec similarity index 100% rename from anda/tools/anda/rust-anda.spec rename to anda/tools/buildsys/anda/rust-anda.spec diff --git a/anda/tools/anda/update.rhai b/anda/tools/buildsys/anda/update.rhai similarity index 100% rename from anda/tools/anda/update.rhai rename to anda/tools/buildsys/anda/update.rhai diff --git a/anda/tools/gradle/anda.hcl b/anda/tools/buildsys/gradle/anda.hcl similarity index 100% rename from anda/tools/gradle/anda.hcl rename to anda/tools/buildsys/gradle/anda.hcl diff --git a/anda/tools/gradle/gradle.spec b/anda/tools/buildsys/gradle/gradle.spec similarity index 100% rename from anda/tools/gradle/gradle.spec rename to anda/tools/buildsys/gradle/gradle.spec diff --git a/anda/tools/gradle/update.rhai b/anda/tools/buildsys/gradle/update.rhai similarity index 100% rename from anda/tools/gradle/update.rhai rename to anda/tools/buildsys/gradle/update.rhai diff --git a/anda/tools/katsu/anda.hcl b/anda/tools/buildsys/katsu/anda.hcl similarity index 100% rename from anda/tools/katsu/anda.hcl rename to anda/tools/buildsys/katsu/anda.hcl diff --git a/anda/tools/katsu/katsu.spec b/anda/tools/buildsys/katsu/katsu.spec similarity index 95% rename from anda/tools/katsu/katsu.spec rename to anda/tools/buildsys/katsu/katsu.spec index 8449b4ff4c..9187321272 100644 --- a/anda/tools/katsu/katsu.spec +++ b/anda/tools/buildsys/katsu/katsu.spec @@ -6,7 +6,7 @@ Release: 1%{?dist} Summary: The vicious image builder License: MIT URL: https://github.com/FyraLabs/katsu -Source0: %url/archive/refs/tags/%version.tar.gz +Source0: %url/archive/refs/tags/v%version.tar.gz Requires: xorriso dracut limine grub2 systemd-devel squashfs-tools Requires: dracut-live dracut-config-generic dracut-config-rescue grub2-tools-extra dracut-squash BuildRequires: cargo rust-packaging pkgconfig(libudev) clang-devel diff --git a/anda/tools/katsu/update.rhai b/anda/tools/buildsys/katsu/update.rhai similarity index 100% rename from anda/tools/katsu/update.rhai rename to anda/tools/buildsys/katsu/update.rhai diff --git a/anda/tools/muon/anda.hcl b/anda/tools/buildsys/muon/anda.hcl similarity index 100% rename from anda/tools/muon/anda.hcl rename to anda/tools/buildsys/muon/anda.hcl diff --git a/anda/tools/muon/muon.spec b/anda/tools/buildsys/muon/muon.spec similarity index 100% rename from anda/tools/muon/muon.spec rename to anda/tools/buildsys/muon/muon.spec diff --git a/anda/tools/ops2deb/anda.hcl b/anda/tools/buildsys/ops2deb/anda.hcl similarity index 100% rename from anda/tools/ops2deb/anda.hcl rename to anda/tools/buildsys/ops2deb/anda.hcl diff --git a/anda/tools/ops2deb/ops2deb.spec b/anda/tools/buildsys/ops2deb/ops2deb.spec similarity index 96% rename from anda/tools/ops2deb/ops2deb.spec rename to anda/tools/buildsys/ops2deb/ops2deb.spec index 218399f7b0..6e89648ae4 100644 --- a/anda/tools/ops2deb/ops2deb.spec +++ b/anda/tools/buildsys/ops2deb/ops2deb.spec @@ -2,8 +2,8 @@ %define _python_dist_allow_version_zero # upstream issue? Name: python3-ops2deb -Version: 2.4.1 -Release: 1%?dist +Version: 2.5.0 +Release: 1%{?dist} Summary: Generate Debian packages for common devops tools License: MIT URL: https://github.com/upciti/ops2deb diff --git a/anda/tools/ops2deb/update.rhai b/anda/tools/buildsys/ops2deb/update.rhai similarity index 100% rename from anda/tools/ops2deb/update.rhai rename to anda/tools/buildsys/ops2deb/update.rhai diff --git a/anda/tools/subatomic/anda.hcl b/anda/tools/buildsys/subatomic/anda.hcl similarity index 100% rename from anda/tools/subatomic/anda.hcl rename to anda/tools/buildsys/subatomic/anda.hcl diff --git a/anda/tools/subatomic/subatomic.spec b/anda/tools/buildsys/subatomic/subatomic.spec similarity index 100% rename from anda/tools/subatomic/subatomic.spec rename to anda/tools/buildsys/subatomic/subatomic.spec diff --git a/anda/tools/subatomic/update.rhai b/anda/tools/buildsys/subatomic/update.rhai similarity index 100% rename from anda/tools/subatomic/update.rhai rename to anda/tools/buildsys/subatomic/update.rhai diff --git a/anda/tools/chromium-ectool/anda.hcl b/anda/tools/chromium-ectool/anda.hcl new file mode 100644 index 0000000000..52c95d7d50 --- /dev/null +++ b/anda/tools/chromium-ectool/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "chromium-ectool.spec" + } +} \ No newline at end of file diff --git a/anda/tools/chromium-ectool/chromium-ectool.spec b/anda/tools/chromium-ectool/chromium-ectool.spec new file mode 100644 index 0000000000..d9388298e0 --- /dev/null +++ b/anda/tools/chromium-ectool/chromium-ectool.spec @@ -0,0 +1,35 @@ +%global commit 55680f70d2a1e61c193fc78ff1d51c7437803683 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +Name: chromium-ectool +Summary: Query and send commands to ChromiumOS EC from userspace. +License: BSD-3-Clause +URL: https://chromium.googlesource.com/chromiumos/platform/ec/ + +Version: %shortcommit +Release: 14526.B%{?dist} +Source0: https://github.com/coreboot/chrome-ec/archive/refs/heads/release-R100-14526.B-main.tar.gz +Provides: ectool + +BuildRequires: make gcc libftdi-devel libusb1-devel hostname + +%description +A tool to query and send commands to ChromiumOS EC from userspace. + +%prep +%autosetup -n chrome-ec-release-R100-14526.B-main + +%build +BOARD=host %make_build utils-host + +%install +install -Dm755 build/host/util/ectool %{buildroot}%{_bindir}/ectool + +%files +%license LICENSE +%doc README.md +%{_bindir}/ectool + +%changelog +* Tue Jan 2 2024 infinitebash +- Initial package. \ No newline at end of file diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 746295a4b2..b1536548c5 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 28.0.0 +Version: 28.1.0 Release: 1%{?dist} Summary: Build cross platform desktop apps with web technologies License: MIT diff --git a/anda/tools/ffmpeg/0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch b/anda/tools/ffmpeg/0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch deleted file mode 100644 index f47e82732c..0000000000 --- a/anda/tools/ffmpeg/0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch +++ /dev/null @@ -1,76 +0,0 @@ -From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Sun, 16 Jul 2023 18:18:02 +0300 -Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift - instructions within inline assembly - -Fixes assembling with binutil as >= 2.41 - -Signed-off-by: James Almer ---- - libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++--- - 1 file changed, 23 insertions(+), 3 deletions(-) - -diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h -index 6298f5ed19..ca7e2dffc1 100644 ---- a/libavcodec/x86/mathops.h -+++ b/libavcodec/x86/mathops.h -@@ -35,12 +35,20 @@ - static av_always_inline av_const int MULL(int a, int b, unsigned shift) - { - int rt, dummy; -+ if (__builtin_constant_p(shift)) - __asm__ ( - "imull %3 \n\t" - "shrdl %4, %%edx, %%eax \n\t" - :"=a"(rt), "=d"(dummy) -- :"a"(a), "rm"(b), "ci"((uint8_t)shift) -+ :"a"(a), "rm"(b), "i"(shift & 0x1F) - ); -+ else -+ __asm__ ( -+ "imull %3 \n\t" -+ "shrdl %4, %%edx, %%eax \n\t" -+ :"=a"(rt), "=d"(dummy) -+ :"a"(a), "rm"(b), "c"((uint8_t)shift) -+ ); - return rt; - } - -@@ -113,19 +121,31 @@ __asm__ volatile(\ - // avoid +32 for shift optimization (gcc should do that ...) - #define NEG_SSR32 NEG_SSR32 - static inline int32_t NEG_SSR32( int32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("sarl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("sarl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - - #define NEG_USR32 NEG_USR32 - static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("shrl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("shrl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - --- -2.41.0 - diff --git a/anda/tools/ffmpeg/0001-avfilter-vf_libplacebo-remove-deprecated-field.patch b/anda/tools/ffmpeg/0001-avfilter-vf_libplacebo-remove-deprecated-field.patch deleted file mode 100644 index 0819af4591..0000000000 --- a/anda/tools/ffmpeg/0001-avfilter-vf_libplacebo-remove-deprecated-field.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 1231003c3c6d4839a9e838d06f8e16ee7690958f Mon Sep 17 00:00:00 2001 -From: Niklas Haas -Date: Mon, 13 Mar 2023 14:33:16 +0100 -Subject: [PATCH] avfilter/vf_libplacebo: remove deprecated field - -This has not been functional since a year ago, including in our current -minimum dependency of libplacebo (v4.192.0). It also causes build errors -against libplacebo v6, so it needs to be removed from the code. We can -keep the option around for now, but it should also be removed soon. - -Signed-off-by: Niklas Haas -Signed-off-by: James Almer ---- - doc/filters.texi | 3 --- - libavfilter/vf_libplacebo.c | 7 ++++--- - 2 files changed, 4 insertions(+), 6 deletions(-) - -diff --git a/doc/filters.texi b/doc/filters.texi -index 7a7b2ba4e79e..77b594f69cb1 100644 ---- a/doc/filters.texi -+++ b/doc/filters.texi -@@ -16242,9 +16242,6 @@ Disable linear light scaling. - @item disable_builtin - Disable built-in GPU sampling (forces LUT). - --@item force_icc_lut --Force the use of a full ICC 3DLUT for gamut mapping. -- - @item disable_fbos - Forcibly disable FBOs, resulting in loss of almost all functionality, but - offering the maximum possible speed. -diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c -index d75723289069..757dc519e9ad 100644 ---- a/libavfilter/vf_libplacebo.c -+++ b/libavfilter/vf_libplacebo.c -@@ -97,7 +97,6 @@ typedef struct LibplaceboContext { - float polar_cutoff; - int disable_linear; - int disable_builtin; -- int force_icc_lut; - int force_dither; - int disable_fbos; - -@@ -139,6 +138,7 @@ typedef struct LibplaceboContext { - float desat_exp; - int gamut_warning; - int gamut_clipping; -+ int force_icc_lut; - #endif - - /* pl_dither_params */ -@@ -463,7 +463,6 @@ static int process_frames(AVFilterContext *avctx, AVFrame *out, AVFrame *in) - .polar_cutoff = s->polar_cutoff, - .disable_linear_scaling = s->disable_linear, - .disable_builtin_scalers = s->disable_builtin, -- .force_icc_lut = s->force_icc_lut, - .force_dither = s->force_dither, - .disable_fbos = s->disable_fbos, - }; -@@ -855,7 +854,9 @@ static const AVOption libplacebo_options[] = { - { "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff), AV_OPT_TYPE_FLOAT, {.dbl = 0}, 0.0, 1.0, DYNAMIC }, - { "disable_linear", "Disable linear scaling", OFFSET(disable_linear), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, - { "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, -- { "force_icc_lut", "Force the use of a full ICC 3DLUT for color mapping", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, -+#if FF_API_LIBPLACEBO_OPTS -+ { "force_icc_lut", "Deprecated, does nothing", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, -+#endif - { "force_dither", "Force dithering", OFFSET(force_dither), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, - { "disable_fbos", "Force-disable FBOs", OFFSET(disable_fbos), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, - { NULL }, --- -2.39.2 - diff --git a/anda/tools/ffmpeg/0001-avfilter-vf_libplacebo-wrap-deprecated-opts-in-FF_AP.patch b/anda/tools/ffmpeg/0001-avfilter-vf_libplacebo-wrap-deprecated-opts-in-FF_AP.patch deleted file mode 100644 index 2d2a939b84..0000000000 --- a/anda/tools/ffmpeg/0001-avfilter-vf_libplacebo-wrap-deprecated-opts-in-FF_AP.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 11eca6018c40f5ebe6af93cbc4b4dce447d8b3bc Mon Sep 17 00:00:00 2001 -From: Niklas Haas -Date: Mon, 13 Mar 2023 15:10:26 +0100 -Subject: [PATCH] avfilter/vf_libplacebo: wrap deprecated opts in FF_API define - -Signed-off-by: Niklas Haas -Signed-off-by: James Almer ---- - libavfilter/version_major.h | 2 ++ - libavfilter/vf_libplacebo.c | 8 ++++++++ - 2 files changed, 10 insertions(+) - -diff --git a/libavfilter/version_major.h b/libavfilter/version_major.h -index 899dfdb27dba..1decc4012ee0 100644 ---- a/libavfilter/version_major.h -+++ b/libavfilter/version_major.h -@@ -35,4 +35,6 @@ - * the public API and may change, break or disappear at any time. - */ - -+#define FF_API_LIBPLACEBO_OPTS (LIBAVFILTER_VERSION_MAJOR < 10) -+ - #endif /* AVFILTER_VERSION_MAJOR_H */ -diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c -index 7cd495de2619..d75723289069 100644 ---- a/libavfilter/vf_libplacebo.c -+++ b/libavfilter/vf_libplacebo.c -@@ -132,11 +132,14 @@ typedef struct LibplaceboContext { - int inverse_tonemapping; - float crosstalk; - int tonemapping_lut_size; -+ -+#if FF_API_LIBPLACEBO_OPTS - /* for backwards compatibility */ - float desat_str; - float desat_exp; - int gamut_warning; - int gamut_clipping; -+#endif - - /* pl_dither_params */ - int dithering; -@@ -380,6 +383,7 @@ static int process_frames(AVFilterContext *avctx, AVFrame *out, AVFrame *in) - pl_rect2df_aspect_set(&target.crop, aspect, s->pad_crop_ratio); - } - -+#if FF_API_LIBPLACEBO_OPTS - /* backwards compatibility with older API */ - if (!tonemapping_mode && (s->desat_str >= 0.0f || s->desat_exp >= 0.0f)) { - float str = s->desat_str < 0.0f ? 0.9f : s->desat_str; -@@ -397,6 +401,7 @@ static int process_frames(AVFilterContext *avctx, AVFrame *out, AVFrame *in) - gamut_mode = PL_GAMUT_WARN; - if (s->gamut_clipping) - gamut_mode = PL_GAMUT_DESATURATE; -+#endif - - /* Update render params */ - params = (struct pl_render_params) { -@@ -818,11 +823,14 @@ static const AVOption libplacebo_options[] = { - { "inverse_tonemapping", "Inverse tone mapping (range expansion)", OFFSET(inverse_tonemapping), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC }, - { "tonemapping_crosstalk", "Crosstalk factor for tone-mapping", OFFSET(crosstalk), AV_OPT_TYPE_FLOAT, {.dbl = 0.04}, 0.0, 0.30, DYNAMIC }, - { "tonemapping_lut_size", "Tone-mapping LUT size", OFFSET(tonemapping_lut_size), AV_OPT_TYPE_INT, {.i64 = 256}, 2, 1024, DYNAMIC }, -+ -+#if FF_API_LIBPLACEBO_OPTS - /* deprecated options for backwards compatibility, defaulting to -1 to not override the new defaults */ - { "desaturation_strength", "Desaturation strength", OFFSET(desat_str), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 1.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, - { "desaturation_exponent", "Desaturation exponent", OFFSET(desat_exp), AV_OPT_TYPE_FLOAT, {.dbl = -1.0}, -1.0, 10.0, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, - { "gamut_warning", "Highlight out-of-gamut colors", OFFSET(gamut_warning), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, - { "gamut_clipping", "Enable colorimetric gamut clipping", OFFSET(gamut_clipping), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, -+#endif - - { "dithering", "Dither method to use", OFFSET(dithering), AV_OPT_TYPE_INT, {.i64 = PL_DITHER_BLUE_NOISE}, -1, PL_DITHER_METHOD_COUNT - 1, DYNAMIC, "dither" }, - { "none", "Disable dithering", 0, AV_OPT_TYPE_CONST, {.i64 = -1}, 0, 0, STATIC, "dither" }, --- -2.39.2 - diff --git a/anda/tools/ffmpeg/0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch b/anda/tools/ffmpeg/0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch deleted file mode 100644 index 85b43a4433..0000000000 --- a/anda/tools/ffmpeg/0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a0a0a804998da8d1a397479c9bafeb000e6be088 Mon Sep 17 00:00:00 2001 -From: Jun Zhao -Date: Sat, 25 Feb 2023 21:54:00 +0800 -Subject: [PATCH] fftools/ffmpeg_filter: initialize the 'o' to silence the - warning - -silence the warning: variable 'o' is used uninitialized whenever -'&&' condition is false - -Signed-off-by: Jun Zhao ---- - fftools/ffmpeg_filter.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c -index 1f5bbf6c4d..3504a3cc0a 100644 ---- a/fftools/ffmpeg_filter.c -+++ b/fftools/ffmpeg_filter.c -@@ -362,7 +362,7 @@ fail: - - static int filter_opt_apply(AVFilterContext *f, const char *key, const char *val) - { -- const AVOption *o; -+ const AVOption *o = NULL; - int ret; - - ret = av_opt_set(f, key, val, AV_OPT_SEARCH_CHILDREN); --- -2.41.0 - diff --git a/anda/tools/ffmpeg/ffmpeg.spec b/anda/tools/ffmpeg/ffmpeg.spec deleted file mode 100644 index a015da2d90..0000000000 --- a/anda/tools/ffmpeg/ffmpeg.spec +++ /dev/null @@ -1,540 +0,0 @@ -# ref: https://github.com/rpmfusion/ffmpeg/blob/master/ffmpeg.spec -# TODO: add make test to %%check section - -#global branch oldabi- -#global date 20230221 -#global commit 691d01989936d4b0681aa226aea8a19f06c04cea -#global rel %(c=%{commit}; echo ${c:0:7}) - -%if 0%{?fedora} >= 37 || 0%{?rhel} >= 9 -%bcond_without libavcodec_freeworld -%else -%bcond_with libavcodec_freeworld -%endif - -%undefine _package_note_file - -%ifarch %{ix86} -# Fails due to asm issue -%global _lto_cflags %{nil} -%endif - -# Cuda and others are only available on some arches -%global cuda_arches x86_64 - -# Disable because of gcc issue -%global _without_lensfun 1 -%ifnarch i686 -%global _with_bs2b 1 -%global _with_chromaprint 1 -%global _with_ilbc 1 -%global _with_openh264 1 -%if 0%{?fedora} -%global _with_placebo 1 -%endif -%global _with_rav1e 1 -%global _with_rubberband 1 -%global _with_smb 1 -%global _with_snappy 1 -%global _with_svtav1 1 -%global _with_tesseract 1 -%global _with_twolame 1 -%global _with_wavpack 1 -%global _with_webp 1 -%global _with_zmq 1 -%else -%global _without_vulkan 1 -%endif -%ifarch x86_64 -%global _with_vpl 1 -%global _with_vapoursynth 1 -%global _with_vmaf 1 -%endif - -# flavor nonfree -%if 0%{?_with_cuda:1} -%global debug_package %{nil} -%global flavor -cuda -%global progs_suffix -cuda -#global build_suffix -lgpl -%ifarch %{cuda_arches} -%global _with_cuvid 1 -%global _with_libnpp 1 -%endif -%global _with_fdk_aac 1 -%global _without_cdio 1 -%global _without_frei0r 1 -%global _without_gpl 1 -%global _without_vidstab 1 -%global _without_x264 1 -%global _without_x265 1 -%global _without_xvid 1 -%undefine _with_smb -%endif - -# Disable nvenc when not relevant -#ifnarch %{cuda_arches} aarch64 -%global _without_nvenc 1 -#endif - -# extras flags -%if 0%{!?_cuda_version:1} -%global _cuda_version 11.2 -%endif -%global _cuda_version_rpm %(echo %{_cuda_version} | sed -e 's/\\./-/') -%global _cuda_bindir %{_cuda_prefix}/bin -%if 0%{?_with_cuda:1} -%global cuda_cflags $(pkg-config --cflags cuda-%{_cuda_version}) -%global cuda_ldflags $(pkg-config --libs cuda-%{_cuda_version}) -%endif - -%if 0%{?_with_libnpp:1} -%global libnpp_cflags $(pkg-config --cflags nppi-%{_cuda_version} nppc-%{_cuda_version}) -%global libnpp_ldlags $(pkg-config --libs-only-L nppi-%{_cuda_version} nppc-%{_cuda_version}) -%endif - -%if 0%{?_with_rpi:1} -%global _with_omx 1 -%global _with_omx_rpi 1 -%global _with_mmal 1 -ExclusiveArch: armv7hnl -%endif - -%if 0%{?_without_gpl} -%global lesser L -%endif - -%if 0%{!?_without_amr} || 0%{?_with_gmp} || 0%{?_with_smb} || 0%{?_with_vmaf} -%global ffmpeg_license %{?lesser}GPLv3+ -%else -%global ffmpeg_license %{?lesser}GPLv2+ -%endif - -Summary: Digital VCR and streaming server -Name: ffmpeg%{?flavor} -Version: 6.0 -Release: 18%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist} -License: %{ffmpeg_license} -URL: https://ffmpeg.org/ -%if 0%{?date} -Source0: ffmpeg-%{?branch}%{date}.tar.bz2 -%else -Source0: https://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz -Source1: https://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz.asc -Source2: https://ffmpeg.org/ffmpeg-devel.asc -%endif -Patch0: 0001-avfilter-vf_libplacebo-wrap-deprecated-opts-in-FF_AP.patch -Patch1: 0001-avfilter-vf_libplacebo-remove-deprecated-field.patch -Patch2: 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch -# Backport fix for segfault when passing non-existent filter option -# See: https://bugzilla.rpmfusion.org/show_bug.cgi?id=6773 -Patch3: 0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch -Conflicts: %{name}-free -Provides: %{name}-bin = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel} -%{?_with_cuda:%{?!_with_cuda_nvcc:BuildRequires: clang}} -%{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})} -BuildRequires: alsa-lib-devel -BuildRequires: AMF-devel -BuildRequires: bzip2-devel -%{?_with_faac:BuildRequires: faac-devel} -%{?_with_fdk_aac:BuildRequires: fdk-aac-devel} -%{?_with_flite:BuildRequires: flite-devel} -BuildRequires: fontconfig-devel -BuildRequires: freetype-devel -BuildRequires: fribidi-devel -%{!?_without_frei0r:BuildRequires: frei0r-devel} -%{?_with_gme:BuildRequires: game-music-emu-devel} -BuildRequires: gnupg2 -BuildRequires: gnutls-devel -BuildRequires: gsm-devel -%{?_with_ilbc:BuildRequires: ilbc-devel} -BuildRequires: lame-devel >= 3.98.3 -%{!?_without_jack:BuildRequires: jack-audio-connection-kit-devel} -%{!?_without_jxl:BuildRequires: libjxl-devel} -%{!?_without_ladspa:BuildRequires: ladspa-devel} -%{!?_without_aom:BuildRequires: libaom-devel} -%{!?_without_dav1d:BuildRequires: libdav1d-devel} -%{!?_without_ass:BuildRequires: libass-devel} -%{!?_without_bluray:BuildRequires: libbluray-devel} -%{?_with_bs2b:BuildRequires: libbs2b-devel} -%{?_with_caca:BuildRequires: libcaca-devel} -%{!?_without_cdio:BuildRequires: libcdio-paranoia-devel} -%{?_with_chromaprint:BuildRequires: libchromaprint-devel} -%{?_with_crystalhd:BuildRequires: libcrystalhd-devel} -%{!?_without_lensfun:BuildRequires: lensfun-devel} -%if 0%{?_with_ieee1394} -BuildRequires: libavc1394-devel -BuildRequires: libdc1394-devel -BuildRequires: libiec61883-devel -%endif -BuildRequires: libdrm-devel -BuildRequires: libgcrypt-devel -BuildRequires: libGL-devel -BuildRequires: libmodplug-devel -BuildRequires: libmysofa-devel -%{?_with_openh264:BuildRequires: openh264-devel} -BuildRequires: libopenmpt-devel -%{?_with_placebo:BuildRequires: libplacebo-devel >= 4.192.0} -BuildRequires: librsvg2-devel -# Disable rtmp because of rfbz: 6441 & 2399 -%{?_with_rtmp:BuildRequires: librtmp-devel} -%{?_with_smb:BuildRequires: libsmbclient-devel} -BuildRequires: libssh-devel -BuildRequires: libtheora-devel -BuildRequires: libv4l-devel -%{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0} -BuildRequires: libvdpau-devel -BuildRequires: libvorbis-devel -%{?_with_vapoursynth:BuildRequires: vapoursynth-devel} -%{?!_without_vpx:BuildRequires: libvpx-devel >= 1.4.0} -%{?_with_mfx:BuildRequires: pkgconfig(libmfx) >= 1.23-1} -%ifarch %{ix86} x86_64 -BuildRequires: nasm -%endif -%{?_with_webp:BuildRequires: libwebp-devel} -%{?_with_netcdf:BuildRequires: netcdf-devel} -%{?_with_rpi:BuildRequires: raspberrypi-vc-devel} -%{!?_without_nvenc:BuildRequires: nv-codec-headers} -%{!?_without_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel} -%{?_with_omx:BuildRequires: libomxil-bellagio-devel} -BuildRequires: libxcb-devel -BuildRequires: libxml2-devel -%{!?_without_lv2:BuildRequires: lilv-devel lv2-devel} -%{!?_without_openal:BuildRequires: openal-soft-devel} -%if 0%{!?_without_opencl:1} -BuildRequires: opencl-headers ocl-icd-devel -%{?fedora:Recommends: opencl-icd} -%endif -%{?_with_opencv:BuildRequires: opencv-devel} -BuildRequires: openjpeg2-devel -%{!?_without_opus:BuildRequires: opus-devel >= 1.1.3} -%{!?_without_pulse:BuildRequires: pulseaudio-libs-devel} -BuildRequires: perl(Pod::Man) -%{?_with_rav1e:BuildRequires: pkgconfig(rav1e)} -%{?_with_rubberband:BuildRequires: rubberband-devel} -%{!?_without_tools:BuildRequires: SDL2-devel} -%{?_with_snappy:BuildRequires: snappy-devel} -BuildRequires: soxr-devel -BuildRequires: speex-devel -BuildRequires: pkgconfig(srt) -%{?_with_svtav1:BuildRequires: svt-av1-devel >= 0.9.0} -%{?_with_tesseract:BuildRequires: tesseract-devel} -#BuildRequires: texi2html -BuildRequires: texinfo -%{?_with_twolame:BuildRequires: twolame-devel} -%{?_with_vmaf:BuildRequires: libvmaf-devel >= 1.5.2} -%{?_with_vpl:BuildRequires: pkgconfig(vpl) >= 2.6} -%{?_with_wavpack:BuildRequires: wavpack-devel} -%{!?_without_vidstab:BuildRequires: vid.stab-devel} -%{!?_without_vulkan:BuildRequires: vulkan-loader-devel pkgconfig(shaderc)} -%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31} -%{!?_without_x265:BuildRequires: x265-devel} -%{!?_without_xvid:BuildRequires: xvidcore-devel} -%{!?_without_zimg:BuildRequires: zimg-devel >= 2.7.0} -BuildRequires: zlib-devel -%{?_with_zmq:BuildRequires: zeromq-devel} -%{!?_without_zvbi:BuildRequires: zvbi-devel} - -%description -FFmpeg is a complete and free Internet live audio and video -broadcasting solution for Linux/Unix. It also includes a digital -VCR. It can encode in real time in many formats including MPEG1 audio -and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. - -%package libs -Summary: Libraries for %{name} -Conflicts: libavcodec-free -Conflicts: libavfilter-free -Conflicts: libavformat-free -Conflicts: libavutil-free -Conflicts: libpostproc-free -Conflicts: libswresample-free -Conflicts: libswscale-free -%{?_with_vmaf:Recommends: vmaf-models} - -%description libs -FFmpeg is a complete and free Internet live audio and video -broadcasting solution for Linux/Unix. It also includes a digital -VCR. It can encode in real time in many formats including MPEG1 audio -and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. -This package contains the libraries for %{name} - -%package -n libavdevice%{?flavor} -Summary: Special devices muxing/demuxing library -Conflicts: libavdevice-free -Requires: %{name}-libs%{_isa} = %{version}-%{release} - -%description -n libavdevice%{?flavor} -Libavdevice is a complementary library to libavf "libavformat". It provides -various "special" platform-specific muxers and demuxers, e.g. for grabbing -devices, audio capture and playback etc. - -%package devel -Summary: Development package for %{name} -Conflicts: %{name}-free-devel -Requires: %{name}-libs%{_isa} = %{version}-%{release} -Requires: libavdevice%{?flavor}%{_isa} = %{version}-%{release} -Requires: pkgconfig - -%description devel -FFmpeg is a complete and free Internet live audio and video -broadcasting solution for Linux/Unix. It also includes a digital -VCR. It can encode in real time in many formats including MPEG1 audio -and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. -This package contains development files for %{name} - -%if %{with libavcodec_freeworld} -%package -n libavcodec-freeworld -Summary: Freeworld libavcodec to complement the distro counterparts -# Supplements doesn't work well yet - we can rely on comps for now -#Supplements: libavcodec-free >= %%{version} - -%description -n libavcodec-freeworld -Freeworld libavcodec to complement the distro counterparts -%endif - - -# Don't use the %%configure macro as this is not an autotool script -%global ff_configure \ -./configure \\\ - --prefix=%{_prefix} \\\ - --bindir=%{_bindir} \\\ - --datadir=%{_datadir}/%{name} \\\ - --docdir=%{_docdir}/%{name} \\\ - --incdir=%{_includedir}/%{name} \\\ - --libdir=%{_libdir} \\\ - --mandir=%{_mandir} \\\ - --arch=%{_target_cpu} \\\ - --optflags="%{optflags}" \\\ - --extra-ldflags="%{?__global_ldflags} %{?cuda_ldflags} %{?libnpp_ldlags}" \\\ - --extra-cflags="%{?cuda_cflags} %{?libnpp_cflags} -I%{_includedir}/rav1e" \\\ - %{?flavor:--disable-manpages} \\\ - %{?progs_suffix:--progs-suffix=%{progs_suffix}} \\\ - %{?build_suffix:--build-suffix=%{build_suffix}} \\\ - %{!?_without_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\ - --enable-bzlib \\\ - %{?_with_chromaprint:--enable-chromaprint} \\\ - %{!?_with_crystalhd:--disable-crystalhd} \\\ - --enable-fontconfig \\\ - %{!?_without_frei0r:--enable-frei0r} \\\ - --enable-gcrypt \\\ - %{?_with_gmp:--enable-gmp --enable-version3} \\\ - --enable-gnutls \\\ - %{!?_without_ladspa:--enable-ladspa} \\\ - %{!?_without_aom:--enable-libaom} \\\ - %{!?_without_dav1d:--enable-libdav1d} \\\ - %{!?_without_ass:--enable-libass} \\\ - %{!?_without_bluray:--enable-libbluray} \\\ - %{?_with_bs2b:--enable-libbs2b} \\\ - %{?_with_caca:--enable-libcaca} \\\ - %{?_with_cuda_nvcc:--enable-cuda-nvcc --enable-nonfree} \\\ - %{?_with_cuvid:--enable-cuvid --enable-nonfree} \\\ - %{!?_without_cdio:--enable-libcdio} \\\ - %{?_with_ieee1394:--enable-libdc1394 --enable-libiec61883} \\\ - --enable-libdrm \\\ - %{?_with_faac:--enable-libfaac --enable-nonfree} \\\ - %{?_with_fdk_aac:--enable-libfdk-aac --enable-nonfree} \\\ - %{?_with_flite:--enable-libflite} \\\ - %{!?_without_jack:--enable-libjack} \\\ - %{!?_without_jxl:--enable-libjxl} \\\ - --enable-libfreetype \\\ - %{!?_without_fribidi:--enable-libfribidi} \\\ - %{?_with_gme:--enable-libgme} \\\ - --enable-libgsm \\\ - %{?_with_ilbc:--enable-libilbc} \\\ - %{!?_without_lensfun:--enable-liblensfun} \\\ - %{?_with_libnpp:--enable-libnpp --enable-nonfree} \\\ - --enable-libmp3lame \\\ - --enable-libmysofa \\\ - %{?_with_netcdf:--enable-netcdf} \\\ - %{?_with_mmal:--enable-mmal} \\\ - %{!?_without_nvenc:--enable-nvenc} \\\ - %{?_with_omx:--enable-omx} \\\ - %{?_with_omx_rpi:--enable-omx-rpi} \\\ - %{!?_without_openal:--enable-openal} \\\ - %{!?_without_opencl:--enable-opencl} \\\ - %{?_with_opencv:--enable-libopencv} \\\ - %{!?_without_opengl:--enable-opengl} \\\ - %{?_with_openh264:--enable-libopenh264} \\\ - --enable-libopenjpeg \\\ - --enable-libopenmpt \\\ - %{!?_without_opus:--enable-libopus} \\\ - %{!?_without_pulse:--enable-libpulse} \\\ - %{?_with_placebo:--enable-libplacebo} \\\ - --enable-librsvg \\\ - %{?_with_rav1e:--enable-librav1e} \\\ - %{?_with_rtmp:--enable-librtmp} \\\ - %{?_with_rubberband:--enable-librubberband} \\\ - %{?_with_smb:--enable-libsmbclient --enable-version3} \\\ - %{?_with_snappy:--enable-libsnappy} \\\ - --enable-libsoxr \\\ - --enable-libspeex \\\ - --enable-libsrt \\\ - --enable-libssh \\\ - %{?_with_svtav1:--enable-libsvtav1} \\\ - %{?_with_tesseract:--enable-libtesseract} \\\ - --enable-libtheora \\\ - %{?_with_twolame:--enable-libtwolame} \\\ - --enable-libvorbis \\\ - --enable-libv4l2 \\\ - %{!?_without_vidstab:--enable-libvidstab} \\\ - %{?_with_vmaf:--enable-libvmaf --enable-version3} \\\ - %{?_with_vapoursynth:--enable-vapoursynth} \\\ - %{!?_without_vpx:--enable-libvpx} \\\ - %{!?_without_vulkan:--enable-vulkan --enable-libshaderc} \\\ - %{?_with_webp:--enable-libwebp} \\\ - %{!?_without_x264:--enable-libx264} \\\ - %{!?_without_x265:--enable-libx265} \\\ - %{!?_without_xvid:--enable-libxvid} \\\ - --enable-libxml2 \\\ - %{!?_without_zimg:--enable-libzimg} \\\ - %{?_with_zmq:--enable-libzmq} \\\ - %{!?_without_zvbi:--enable-libzvbi} \\\ - %{!?_without_lv2:--enable-lv2} \\\ - --enable-avfilter \\\ - --enable-libmodplug \\\ - --enable-postproc \\\ - --enable-pthreads \\\ - --disable-static \\\ - --enable-shared \\\ - %{!?_without_gpl:--enable-gpl} \\\ - --disable-debug \\\ - --disable-stripping - - -%prep -%if 0%{?date} -%autosetup -p1 -n ffmpeg-%{?branch}%{date} -echo "git-snapshot-%{?branch}%{date}-rpmfusion" > VERSION -%else -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup -p1 -n ffmpeg-%{version} -%endif -# fix -O3 -g in host_cflags -sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure -mkdir -p _doc/examples -cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/ - -%build -%{?_with_cuda:export PATH=${PATH}:%{_cuda_bindir}} -%{ff_configure}\ - --shlibdir=%{_libdir} \ -%if 0%{?_without_tools:1} - --disable-doc \ - --disable-ffmpeg --disable-ffplay --disable-ffprobe \ -%endif -%ifnarch %{ix86} - --enable-lto \ -%endif -%ifarch %{ix86} - --cpu=%{_target_cpu} \ -%endif - %{?_with_mfx:--enable-libmfx} \ - %{?_with_vpl:--enable-libvpl} \ -%ifarch %{ix86} x86_64 %{power64} - --enable-runtime-cpudetect \ -%endif -%ifarch %{power64} -%ifarch ppc64 - --cpu=g5 \ -%endif -%ifarch ppc64p7 - --cpu=power7 \ -%endif -%ifarch ppc64le - --cpu=power8 \ -%endif - --enable-pic \ -%endif -%ifarch %{arm} - --disable-runtime-cpudetect --arch=arm \ -%ifarch armv6hl - --cpu=armv6 \ -%endif -%ifarch armv7hl armv7hnl - --cpu=armv7-a \ - --enable-vfpv3 \ - --enable-thumb \ -%endif -%ifarch armv7hl - --disable-neon \ -%endif -%ifarch armv7hnl - --enable-neon \ -%endif -%endif - || cat ffbuild/config.log - -%make_build V=1 -make documentation V=1 -make alltools V=1 - -%install -%make_install V=1 -%if 0%{!?flavor:1} -rm -r %{buildroot}%{_datadir}/%{name}/examples -%endif -%if 0%{!?progs_suffix:1} -install -pm755 tools/qt-faststart %{buildroot}%{_bindir} -%endif - -%if %{with libavcodec_freeworld} -# Install the libavcodec freeworld counterpart -mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/ -mkdir -p %{buildroot}%{_libdir}/%{name} -echo -e "%{_libdir}/%{name}\n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf -cp -pa %{buildroot}%{_libdir}/libavcodec.so.* \ - %{buildroot}%{_libdir}/%{name} -# Strip to prevent debuginfo duplication -strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.* -%endif - -%ldconfig_scriptlets libs -%ldconfig_scriptlets -n libavdevice%{?flavor} - -%if 0%{!?_without_tools:1} -%files -%{_bindir}/ffmpeg%{?progs_suffix} -%{_bindir}/ffplay%{?progs_suffix} -%{_bindir}/ffprobe%{?progs_suffix} -%{!?progs_suffix:%{_bindir}/qt-faststart} -%{!?flavor: -%{_mandir}/man1/ffmpeg*.1* -%{_mandir}/man1/ffplay*.1* -%{_mandir}/man1/ffprobe*.1* -} -%{_datadir}/%{name} -%endif - -%files libs -%doc CREDITS README.md -%license COPYING.* -%{_libdir}/lib*.so.* -%exclude %{_libdir}/libavdevice%{?build_suffix}.so.* -%{!?flavor:%{_mandir}/man3/lib*.3.* -%exclude %{_mandir}/man3/libavdevice.3* -} - -%files -n libavdevice%{?flavor} -%{_libdir}/libavdevice%{?build_suffix}.so.* -%{!?flavor:%{_mandir}/man3/libavdevice.3*} - -%files devel -%doc MAINTAINERS doc/APIchanges doc/*.txt -%doc _doc/examples -%doc %{_docdir}/%{name}/*.{css,html} -%{_includedir}/%{name} -%{_libdir}/pkgconfig/lib*.pc -%{_libdir}/lib*.so - -%if %{with libavcodec_freeworld} -%files -n libavcodec-freeworld -%{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf -%{_libdir}/%{name}/libavcodec.so.* -%endif - - -%changelog -%autochangelog diff --git a/anda/tools/graalvm/graalvm.spec b/anda/tools/graalvm/graalvm.spec index 521cb1afab..c9f46a6bf5 100644 --- a/anda/tools/graalvm/graalvm.spec +++ b/anda/tools/graalvm/graalvm.spec @@ -10,8 +10,8 @@ execution of applications written in Java and other JVM languages along with support for JavaScript, Ruby, Python, and a number of other popular languages.} Name: graalvm -Version: 22.3.2 -Release: 2%{?dist} +Version: 22.3.3 +Release: 1%{?dist} URL: https://www.graalvm.org/ Summary: %{gsummary} License: GPL-2.0 diff --git a/anda/tools/umstellar/.gitignore b/anda/tools/umstellar/.gitignore new file mode 100644 index 0000000000..c32b546f7d --- /dev/null +++ b/anda/tools/umstellar/.gitignore @@ -0,0 +1 @@ +*.tar.gz \ No newline at end of file diff --git a/anda/tools/umstellar/anda.hcl b/anda/tools/umstellar/anda.hcl new file mode 100644 index 0000000000..aa51dee858 --- /dev/null +++ b/anda/tools/umstellar/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "umstellar.spec" + } +} \ No newline at end of file diff --git a/anda/tools/umstellar/umstellar.spec b/anda/tools/umstellar/umstellar.spec new file mode 100644 index 0000000000..3deca4b2f5 --- /dev/null +++ b/anda/tools/umstellar/umstellar.spec @@ -0,0 +1,63 @@ +# Created by pyp2rpm-3.3.10 +%global pypi_name umstellar +%global pypi_version 0.0.3 + +Name: python-%{pypi_name} +Version: 0.0.3 +Provides: python3-%{pypi_name} = %{version}-%{release} +Provides: %{pypi_name} = %{version}-%{release} +Release: 1%{?dist} +Summary: Ultramarine Quickstart Tool + +License: None +URL: https://github.com/Ultramarine-Linux/stellar +Source0: %{url}/archive/v%{version}.tar.gz +BuildArch: noarch + +BuildRequires: python3-devel +BuildRequires: python3dist(setuptools) + +%description + Stellar (Stellar)Stellar is a quick-and-dirty GUI post-install menu for +Ultramarine Linux. It's written in Python and uses libadwaita for the UI.We +hacked this together in a few days, just in time for Ultramarine Linux 39 which +happened to get delayed due to some major GNOME 45 porting issues. It's meant +to only be used for Ultramarine Linux 39's Anaconda post-install menu. +Why?So,... + +%package -n python3-%{pypi_name} +Summary: %{summary} +%{?python_provide:%python_provide python3-%{pypi_name}} + +Requires: python3dist(requests) +Requires: python3dist(setuptools) +Requires: python3dist(setuptools) = 67.7.2 +Requires: anaconda-core +%description -n python3-%{pypi_name} + +Stellar is a quick-and-dirty GUI post-install menu for +Ultramarine Linux + + +%prep +%autosetup -n stellar-%{pypi_version} + +%build +%py3_build + +%install +%py3_install + +# install kickstart file +install -D -m 644 example.ks %{buildroot}%{_datadir}/anaconda/post-scripts/stellar.ks + +%files -n python3-%{pypi_name} +%license LICENSE +%doc README.md +%{python3_sitelib}/umstellar +%{python3_sitelib}/%{pypi_name}-%{pypi_version}-py%{python3_version}.egg-info +%{_datadir}/anaconda/post-scripts/stellar.ks + +%changelog +* Fri Nov 10 2023 Cappy Ishihara - 0.0.1-1 +- Initial package. \ No newline at end of file diff --git a/anda/tools/umstellar/update.rhai b/anda/tools/umstellar/update.rhai new file mode 100644 index 0000000000..c929de9bef --- /dev/null +++ b/anda/tools/umstellar/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("Ultramarine-Linux/stellar"));