diff --git a/.gitignore b/.gitignore index 44f05e1..e688706 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/clevis-6.tar.bz2 +/clevis-7.tar.bz2 diff --git a/clevis.spec b/clevis.spec index 978a8f3..83f3f0f 100644 --- a/clevis.spec +++ b/clevis.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: clevis -Version: 6 -Release: 3%{?dist} +Version: 7 +Release: 1%{?dist} Summary: Automated decryption framework License: GPLv3+ @@ -10,7 +10,8 @@ URL: https://github.com/latchset/%{name} Source0: https://github.com/latchset/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2 BuildRequires: libjose-devel >= 8 -BuildRequires: libluksmeta-devel +BuildRequires: libluksmeta-devel >= 8 +BuildRequires: audit-libs-devel BuildRequires: libudisks2-devel BuildRequires: openssl-devel @@ -41,18 +42,38 @@ volumes during early boot. Summary: LUKSv1 integration for clevis Requires: %{name}%{?_isa} = %{version}-%{release} Requires: cryptsetup -Requires: luksmeta +Requires: luksmeta >= 8 %description luks LUKSv1 integration for clevis. This package allows you to bind a LUKSv1 volume to a clevis unlocking policy. For automated unlocking, an unlocker will also be required. See, for example, clevis-dracut and clevis-udisks2. +%package systemd +Summary: systemd integration for clevis +Requires: %{name}-luks%{?_isa} = %{version}-%{release} +%if 0%{?fedora} > 27 +Requires: systemd%{?_isa} >= 235-3 +%else +%if 0%{?fedora} == 27 +Requires: systemd%{?_isa} >= 234-9 +%else +%if 0%{?fedora} == 26 +Requires: systemd%{?_isa} >= 233-7 +%else +Requires: systemd%{?_isa} >= 236 +%endif +%endif +%endif +Requires: nc + +%description systemd +Automatically unlocks LUKSv1 _netdev block devices from /etc/crypttab. + %package dracut Summary: Dracut integration for clevis -Requires: %{name}-luks%{?_isa} = %{version}-%{release} +Requires: %{name}-systemd%{?_isa} = %{version}-%{release} Requires: dracut-network -Requires: nc %description dracut Automatically unlocks LUKSv1 block devices in early boot. @@ -104,8 +125,17 @@ exit 0 %{_mandir}/man1/%{name}.1* %files luks +%{_mandir}/man1/%{name}-luks-unlockers.1* +%{_mandir}/man1/%{name}-luks-unlock.1* +%{_mandir}/man1/%{name}-luks-bind.1* +%{_bindir}/%{name}-luks-unlock +%{_bindir}/%{name}-luks-bind %{_bindir}/%{name}-bind-luks -%{_mandir}/man1/%{name}-bind-luks.1* + +%files systemd +%{_libexecdir}/%{name}-luks-askpass +%{_unitdir}/%{name}-luks-askpass.path +%{_unitdir}/%{name}-luks-askpass.service %files dracut %{_prefix}/lib/dracut/modules.d/60%{name} @@ -115,6 +145,9 @@ exit 0 %attr(4755, root, root) %{_libexecdir}/%{name}-luks-udisks2 %changelog +* Fri Oct 27 2017 Nathaniel McCallum - 7-1 +- Update to v7 + * Wed Aug 02 2017 Fedora Release Engineering - 6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 849d599..e6b0eef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clevis-6.tar.bz2) = 5a465aa23f0559fc2a1c22b54992ba799e8528fcb62a0b3d9d1874a0ba4b2ee9307619837089bb811beb20fe337d5c1d3f7dfa66fa500a2209cae96027a0864b +SHA512 (clevis-7.tar.bz2) = 8ffbb01893be91e31139bd4890cac27b9dad57e307a70aa45f87c58ecc1fc24f82e22da82eaa0362fdf015001d860dfd265921daf7d991d97a26de0ba4010096