rpms/dnsmasq
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/dnsmasq.git#85b95520cf06f64468258b01a2594476d1c0cd2f
This commit is contained in:
DistroBaker 2021-01-19 22:39:57 +00:00
parent fa9ecc575b
commit 498c522839
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -34,3 +34,5 @@ dnsmasq-2.52.tar.lzma
/dnsmasq-2.81.tar.xz.asc /dnsmasq-2.81.tar.xz.asc
/dnsmasq-2.82.tar.xz /dnsmasq-2.82.tar.xz
/dnsmasq-2.82.tar.xz.asc /dnsmasq-2.82.tar.xz.asc
/dnsmasq-2.83.tar.xz
/dnsmasq-2.83.tar.xz.asc

13
dnsmasq.spec
View File

@ -19,8 +19,8 @@
%bcond_with sourcegit %bcond_with sourcegit
Name: dnsmasq Name: dnsmasq
Version: 2.82 Version: 2.83
Release: 4%{?extraversion:.%{extraversion}}%{?dist} Release: 1%{?extraversion:.%{extraversion}}%{?dist}
Summary: A lightweight DHCP/caching DNS server Summary: A lightweight DHCP/caching DNS server
License: GPLv2 or GPLv3 License: GPLv2 or GPLv3
@ -57,10 +57,12 @@ Buildrequires: gcc
BuildRequires: gnupg2 BuildRequires: gnupg2
BuildRequires: systemd BuildRequires: systemd
BuildRequires: systemd-rpm-macros
%{?systemd_requires} %{?systemd_requires}
%if %{with sourcegit} %if %{with sourcegit}
BuildRequires: git-core BuildRequires: git-core
%endif %endif
BuildRequires: make
%description %description
Dnsmasq is lightweight, easy to configure DNS forwarder and DHCP server. Dnsmasq is lightweight, easy to configure DNS forwarder and DHCP server.
@ -81,7 +83,7 @@ server's leases.
%prep %prep
%if 0%{?gpgverify:1} %if 0%{?fedora}
%gpgverify -k 4 -s 3 -d 0 %gpgverify -k 4 -s 3 -d 0
%endif %endif
%if %{with sourcegit} %if %{with sourcegit}
@ -151,7 +153,7 @@ install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
%pre %pre
#precreate users so that rpm can install files owned by that user #precreate users so that rpm can install files owned by that user
%sysusers_create_package %{name} %{SOURCE2} %sysusers_create_compat %{SOURCE2}
%post %post
%systemd_post dnsmasq.service %systemd_post dnsmasq.service
@ -184,6 +186,9 @@ install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
%{_mandir}/man1/dhcp_* %{_mandir}/man1/dhcp_*
%changelog %changelog
* Tue Jan 19 2021 Petr Menšík <pemensik@redhat.com> - 2.83-1
- Update to 2.83, fix CVE-2020-25681-7
* Fri Oct 09 2020 Petr Menšík <pemensik@redhat.com> - 2.82-4 * Fri Oct 09 2020 Petr Menšík <pemensik@redhat.com> - 2.82-4
- Remove uninitialized condition from downstream patch - Remove uninitialized condition from downstream patch

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (dnsmasq-2.82.tar.xz) = faf36efdaa3abe84994e46aea018b0a324218d42814baac056ca635f6d03f1301e7b4d958f92b272a8e3a7ac358f3a4e2606129a217587b471aedb3ce23e903b SHA512 (dnsmasq-2.83.tar.xz) = 1eaade775dc19658afe825407c10456ab954b82034644bb19af2594d737ceae17ff2cee7f1f917e8e8b2dadbfbcb83dd8b842c0693fcac71487a5fade1eb4b05
SHA512 (dnsmasq-2.82.tar.xz.asc) = e52a9b6589b37a97313654f78f86cf9f9c501dc8f38b3775b8b6ebfe6e4f4a54d3aa73ac9cf0472eac3a32ec930a8b4fc5a6a809b396e7ade16988d3c034b5bd SHA512 (dnsmasq-2.83.tar.xz.asc) = fee9a51ae2a16618e57721a17b1e7cc7a3c849ab76c404eee45a0e38d05ad7975531f7dcb7b3e703626e3e20600027409b8a11e6c43bd7a3978012b1d5c39300