diff --git a/.gitignore b/.gitignore index d631ee1..aef8121 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /dhcpcd-9.4.0.tar.xz.distinfo.asc /dhcpcd-9.4.1.tar.xz /dhcpcd-9.4.1.tar.xz.distinfo.asc +/dhcpcd-10.0.1.tar.xz +/dhcpcd-10.0.1.tar.xz.asc diff --git a/dhcpcd.spec b/dhcpcd.spec index 2b71f1e..43fd21f 100644 --- a/dhcpcd.spec +++ b/dhcpcd.spec @@ -1,19 +1,18 @@ -# Requires explicit trust in builder's keyring -%bcond_without SIGCHECK +%global forgeurl0 https://github.com/NetworkConfiguration/dhcpcd Name: dhcpcd -Version: 9.4.1 -Release: 4%{?dist} +Version: 10.0.1 +Release: 0%{?dist} Summary: A minimalistic network configuration daemon with DHCPv4, rdisc and DHCPv6 support License: BSD -# Moved to github -# https://github.com/NetworkConfiguration/dhcpcd URL: http://roy.marples.name/projects/%{name}/ -Source0: http://roy.marples.name/downloads/%{name}/%{name}-%{version}.tar.xz -Source1: %{name}.service -Source2: %{name}@.service -Source3: http://roy.marples.name/downloads/%{name}/%{name}-%{version}.tar.xz.distinfo.asc -Source4: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xa785ed2755955d9e93ea59f6597f97ea9ad45549#/roy-marples.name.asc +# Moved to github +VCS: git:%{forgeurl0} +Source0: %{forgeurl0}/releases/download/v%{version}/%{name}-%{version}.tar.xz +Source1: %{forgeurl0}/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc +Source2: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xa785ed2755955d9e93ea59f6597f97ea9ad45549#/roy-marples.name.asc +Source3: %{name}.service +Source4: %{name}@.service Source5: systemd-sysusers.conf BuildRequires: gcc BuildRequires: systemd-rpm-macros @@ -21,7 +20,7 @@ BuildRequires: chrony BuildRequires: systemd-devel BuildRequires: ypbind BuildRequires: make -%if %{with SIGCHECK} +%if 0%{?fedora} || 0%{?rhel} > 8 BuildRequires: gnupg2 %endif %{?systemd_requires} @@ -31,13 +30,9 @@ that supports IPv4 and IPv6 configuration including configuration discovery through NDP, DHCPv4 and DHCPv6 protocols. %prep -%if %{with SIGCHECK} -GPGHOME="$(mktemp -d ./gpghome-XXXXXXX)" -gpg --homedir "$GPGHOME" --import %{SOURCE4} -gpg --homedir "$GPGHOME" --verify %{SOURCE3} -rm -rf "$GPGHOME" +%if 0%{?fedora} || 0%{?rhel} > 8 +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %endif -(cd %{_sourcedir} && tr -d '\r' <%{SOURCE3} | sha256sum -c) %autosetup %build @@ -52,8 +47,8 @@ make test export BINMODE=755 %make_install find %{buildroot} -name '*.la' -delete -print -install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service -install -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}@.service +install -D -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service +install -D -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}@.service install -d %{buildroot}%{_sharedstatedir}/%{_name} %pre diff --git a/sources b/sources index f4cb441..10f1bca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dhcpcd-9.4.1.tar.xz) = 530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45 -SHA512 (dhcpcd-9.4.1.tar.xz.distinfo.asc) = 4ed66bbb906a1c3eacfcf22a41a90601c7361fa356ca9a8b348bd66e09dd9a4a884db2c26e28c28611868f41c61b96ff1490f6161ad4ac5aeedbf55f6711d8a5 +SHA512 (dhcpcd-10.0.1.tar.xz) = 31b0ac780b8592d3d40437837fd759a357b0200dbdc7fd8c62287a4fedc052f324fb8006daff84455906c82d5a4cb6a04916b94a0ad9b17899532f83daf51d3d +SHA512 (dhcpcd-10.0.1.tar.xz.asc) = e6d044f4c3ca41b26c1f85f8e7e7b05da59de3f9e9bef49ff72c8fe1c67c29d19e7ac123d99026c09d2045acc6a268c3d23a582eeb685d5f121316c04b988608