From 3e34444944ea5831d4fefed4a3161f677d7841b6 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 09 2021 18:21:02 +0000
Subject: import dnsmasq-2.79-19.el8


---

diff --git a/SOURCES/dnsmasq-2.80-man-nameing.patch b/SOURCES/dnsmasq-2.80-man-nameing.patch
new file mode 100644
index 0000000..3318a4a
--- /dev/null
+++ b/SOURCES/dnsmasq-2.80-man-nameing.patch
@@ -0,0 +1,25 @@
+From 03212e533b1e07aba30d2f4112009dc3af867ea5 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Tue, 4 Sep 2018 17:52:28 +0100
+Subject: [PATCH] Manpage typo.
+
+---
+ man/dnsmasq.8 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
+index ebfadba..a62860e 100644
+--- a/man/dnsmasq.8
++++ b/man/dnsmasq.8
+@@ -27,7 +27,7 @@ TFTP server to allow net/PXE boot of DHCP hosts and also supports BOOTP. The PXE
+ .PP
+ The dnsmasq DHCPv6 server provides the same set of features as the
+ DHCPv4 server, and in addition, it includes router advertisements and
+-a neat feature which allows nameing for clients which use DHCPv4 and
++a neat feature which allows naming for clients which use DHCPv4 and
+ stateless autoconfiguration only for IPv6 configuration. There is support for doing address allocation (both DHCPv6 and RA) from subnets which are dynamically delegated via DHCPv6 prefix delegation.
+ .PP
+ Dnsmasq is coded with small embedded systems in mind. It aims for the smallest possible memory footprint compatible with the supported functions,  and allows unneeded functions to be omitted from the compiled binary.  
+-- 
+2.31.1
+
diff --git a/SPECS/dnsmasq.spec b/SPECS/dnsmasq.spec
index 9d1a962..3f116de 100644
--- a/SPECS/dnsmasq.spec
+++ b/SPECS/dnsmasq.spec
@@ -13,7 +13,7 @@
 
 Name:           dnsmasq
 Version:        2.79
-Release:        18%{?extraversion:.%{extraversion}}%{?dist}
+Release:        19%{?extraversion:.%{extraversion}}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 License:        GPLv2 or GPLv3
@@ -65,6 +65,8 @@ Patch28:        dnsmasq-2.81-netlink-table.patch
 Patch29:        dnsmasq-2.84-bind-dynamic-netlink.patch
 # http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=74d4fcd756a85bc1823232ea74334f7ccfb9d5d2
 Patch30:        dnsmasq-2.85-CVE-2021-3448.patch
+# http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=03212e533b1e07aba30d2f4112009dc3af867ea5
+Patch31:        dnsmasq-2.80-man-nameing.patch
 
 # This is workaround to nettle bug #1549190
 # https://bugzilla.redhat.com/show_bug.cgi?id=1549190
@@ -128,6 +130,7 @@ server's leases.
 %patch28 -p1 -b .rh1887649-table
 %patch29 -p1 -b .rh1887649
 %patch30 -p1 -b .CVE-2021-3448
+%patch31 -p1 -b .rh1947039
 
 # use /var/lib/dnsmasq instead of /var/lib/misc
 for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
@@ -227,6 +230,9 @@ install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/dnsmasq.conf
 %{_mandir}/man1/dhcp_*
 
 %changelog
+* Tue Jun 29 2021 Petr Menšík <pemensik@redhat.com> - 2.79-19
+- Correct typo in man page (#1947039)
+
 * Thu Mar 18 2021 Petr Menšík <pemensik@redhat.com> - 2.79-18
 - Properly randomize outgoing ports also with bound interface (CVE-2021-3448)