diff --git a/.gitignore b/.gitignore index 7677436..c302e45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ssh-key-dir-0.1.1.crate /ssh-key-dir-0.1.2.crate +/ssh-key-dir-0.1.2-vendor.tar.gz diff --git a/rust-ssh-key-dir.spec b/rust-ssh-key-dir.spec index d933d22..b09c508 100644 --- a/rust-ssh-key-dir.spec +++ b/rust-ssh-key-dir.spec @@ -6,17 +6,23 @@ Name: rust-%{crate} Version: 0.1.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: sshd AuthorizedKeysCommand to read ~/.ssh/authorized_keys.d # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: https://crates.io/crates/ssh-key-dir -Source: %{crates_source} +Source0: %{crates_source} +# not used on Fedora +Source1: https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz ExclusiveArch: %{rust_arches} +%if 0%{?rhel} && !0%{?eln} +BuildRequires: rust-toolset +%else BuildRequires: rust-packaging +%endif %global _description %{expand: sshd AuthorizedKeysCommand to read key files from ~/.ssh/authorized_keys.d.} @@ -24,7 +30,7 @@ sshd AuthorizedKeysCommand to read key files from ~/.ssh/authorized_keys.d.} %description %{_description} %package -n %{crate} -Summary: %{summary} +Summary: %{summary} # ASL 2.0 # MIT # MIT or ASL 2.0 @@ -40,8 +46,8 @@ Requires(postun): systemd %files -n %{crate} %{_libexecdir}/ssh-key-dir %config(noreplace) %{_sysconfdir}/ssh/sshd_config.d/40-ssh-key-dir.conf -%doc README.md %license LICENSE +%doc README.md %post -n %{crate} /usr/bin/systemctl try-reload-or-restart sshd.service @@ -53,18 +59,36 @@ fi %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 -%cargo_prep +%if 0%{?rhel} && !0%{?eln} +tar xvf %{SOURCE1} +mkdir -p .cargo +cat >.cargo/config << EOF +[source.crates-io] +replace-with = "vendored-sources" +[source.vendored-sources] +directory = "vendor" +EOF +%else +%cargo_prep +%endif + +%if !0%{?rhel} || 0%{?eln} %generate_buildrequires %cargo_generate_buildrequires +%endif %build %cargo_build %install +%if 0%{?rhel} && !0%{?eln} +%make_install INSTALL="install -p -c" +%else %cargo_install mv %{buildroot}%{_bindir} %{buildroot}%{_libexecdir} install -Dpm0644 -t %{buildroot}%{_sysconfdir}/ssh/sshd_config.d conf/40-ssh-key-dir.conf +%endif %if %{with check} %check @@ -72,6 +96,9 @@ install -Dpm0644 -t %{buildroot}%{_sysconfdir}/ssh/sshd_config.d conf/40-ssh-key %endif %changelog +* Fri Jan 14 2022 Sohan Kunkerkar - 0.1.2-9 +- Vendor rust dependencies on el9 + * Fri Jul 23 2021 Fedora Release Engineering - 0.1.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 25a4a8a..bfd386c 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (ssh-key-dir-0.1.2.crate) = 5413c8d95724574f4816a37b20af84b2378b35b36fa9e5dd8fe1a094c730176b75d19b7687f7666cee6c9d7f498cbf4d76ef7d65e123b8c62fa8f8548a5f13b3 +SHA512 (ssh-key-dir-0.1.2-vendor.tar.gz) = 00df5b92d09157c8660af43b7cf86eb6b4fd277591f29ab3005438b47e007e6eab5c5d12cb46a98cb5893107ed420a6418e826e9c8b6b76e47c9258278c76864