CentOS 7.5 upgrade for dnsmasq package.
Story: 2003389 Task: 24494 Change-Id: Ib2bf11d1d797f81c988c4bee598657f32e65f6d5 Signed-off-by: chenyan <yan.chen@intel.com>
This commit is contained in:
parent
ef011db731
commit
edfed46f4f
@ -8,18 +8,18 @@ Subject: [PATCH] update package patching
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/SPECS/dnsmasq.spec b/SPECS/dnsmasq.spec
|
||||
index b3f178f..a583cf2 100644
|
||||
index 5cf440a..dd74293 100644
|
||||
--- a/SPECS/dnsmasq.spec
|
||||
+++ b/SPECS/dnsmasq.spec
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
Name: dnsmasq
|
||||
Version: 2.76
|
||||
-Release: 2%{?extraversion}%{?dist}.2
|
||||
+Release: 2.el7_4.2%{?_tis_dist}.%{tis_patch_ver}
|
||||
-Release: 5%{?extraversion}%{?dist}
|
||||
+Release: 5.el7%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: A lightweight DHCP/caching DNS server
|
||||
|
||||
Group: System Environment/Daemons
|
||||
--
|
||||
1.8.3.1
|
||||
2.7.4
|
||||
|
||||
|
@ -3,14 +3,12 @@ From: Scott Little <scott.little@windriver.com>
|
||||
Date: Mon, 2 Oct 2017 17:27:13 -0400
|
||||
Subject: [PATCH 2/5] WRS: dnsmasq-spec-add-init-script.patch
|
||||
|
||||
Conflicts:
|
||||
SPECS/dnsmasq.spec
|
||||
---
|
||||
SPECS/dnsmasq.spec | 26 ++++++++++++++++----------
|
||||
1 file changed, 16 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/SPECS/dnsmasq.spec b/SPECS/dnsmasq.spec
|
||||
index 63ff820..f8aace1 100644
|
||||
index 7f370d1..0641503 100644
|
||||
--- a/SPECS/dnsmasq.spec
|
||||
+++ b/SPECS/dnsmasq.spec
|
||||
@@ -21,6 +21,7 @@ License: GPLv2 or GPLv3
|
||||
@ -21,7 +19,7 @@ index 63ff820..f8aace1 100644
|
||||
# upstream git: git://thekelleys.org.uk/dnsmasq.git
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1367772
|
||||
@@ -140,22 +141,26 @@ mkdir -p %{buildroot}%{_unitdir}
|
||||
@@ -168,22 +169,26 @@ mkdir -p %{buildroot}%{_unitdir}
|
||||
install -m644 %{SOURCE1} %{buildroot}%{_unitdir}
|
||||
rm -rf %{buildroot}%{_initrddir}
|
||||
|
||||
@ -58,7 +56,7 @@ index 63ff820..f8aace1 100644
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
@@ -167,6 +172,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
@@ -195,6 +200,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_unitdir}/%{name}.service
|
||||
%{_sbindir}/dnsmasq
|
||||
%{_mandir}/man8/dnsmasq*
|
||||
@ -67,5 +65,5 @@ index 63ff820..f8aace1 100644
|
||||
%files utils
|
||||
%{_bindir}/dhcp_*
|
||||
--
|
||||
1.9.1
|
||||
2.7.4
|
||||
|
||||
|
@ -3,25 +3,23 @@ From: Scott Little <scott.little@windriver.com>
|
||||
Date: Mon, 2 Oct 2017 17:27:13 -0400
|
||||
Subject: [PATCH 3/5] WRS: patch-tftp-to-close-sockets-immediately.patch
|
||||
|
||||
Conflicts:
|
||||
SPECS/dnsmasq.spec
|
||||
---
|
||||
SPECS/dnsmasq.spec | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/SPECS/dnsmasq.spec b/SPECS/dnsmasq.spec
|
||||
index f8aace1..a3a9e08 100644
|
||||
index 0641503..5cf440a 100644
|
||||
--- a/SPECS/dnsmasq.spec
|
||||
+++ b/SPECS/dnsmasq.spec
|
||||
@@ -42,6 +42,7 @@ Patch8: dnsmasq-2.76-coverity.patch
|
||||
@@ -58,6 +58,7 @@ Patch19: dnsmasq-2.76-misc-cleanups.patch
|
||||
|
||||
# WRS patches
|
||||
Patch30: dnsmasq-update-ipv6-leases-from-config.patch
|
||||
+Patch31: close-tftp-sockets-immediately.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
@@ -88,6 +89,7 @@ query/remove a DHCP server's leases.
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@@ -116,6 +117,7 @@ query/remove a DHCP server's leases.
|
||||
|
||||
# WRS patches
|
||||
%patch30 -p1
|
||||
@ -30,5 +28,5 @@ index f8aace1..a3a9e08 100644
|
||||
# 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
|
||||
--
|
||||
1.9.1
|
||||
2.7.4
|
||||
|
||||
|
@ -3,29 +3,28 @@ From: Scott Little <scott.little@windriver.com>
|
||||
Date: Mon, 2 Oct 2017 17:27:13 -0400
|
||||
Subject: [PATCH 1/5] WRS: spec-include-TiS-patch.patch
|
||||
|
||||
Conflicts:
|
||||
SPECS/dnsmasq.spec
|
||||
---
|
||||
SPECS/dnsmasq.spec | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
SPECS/dnsmasq.spec | 11 +++++++++--
|
||||
1 file changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/SPECS/dnsmasq.spec b/SPECS/dnsmasq.spec
|
||||
index 8a6450a..63ff820 100644
|
||||
index b312ef3..7f370d1 100644
|
||||
--- a/SPECS/dnsmasq.spec
|
||||
+++ b/SPECS/dnsmasq.spec
|
||||
@@ -39,6 +39,9 @@ Patch6: dnsmasq-2.76-label-warning.patch
|
||||
Patch7: dnsmasq-2.76-label-man.patch
|
||||
Patch8: dnsmasq-2.76-coverity.patch
|
||||
@@ -55,6 +55,10 @@ Patch17: dnsmasq-2.76-gita3303e196.patch
|
||||
Patch18: dnsmasq-2.76-underflow.patch
|
||||
Patch19: dnsmasq-2.76-misc-cleanups.patch
|
||||
|
||||
+# WRS patches
|
||||
+Patch30: dnsmasq-update-ipv6-leases-from-config.patch
|
||||
+
|
||||
+
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: dbus-devel
|
||||
@@ -82,6 +85,9 @@ query/remove a DHCP server's leases.
|
||||
%patch7 -p1
|
||||
%patch8 -p1 -b .coverity
|
||||
@@ -109,6 +113,9 @@ query/remove a DHCP server's leases.
|
||||
%patch18 -p1 -b .underflow
|
||||
%patch19 -p1 -b .misc
|
||||
|
||||
+# WRS patches
|
||||
+%patch30 -p1
|
||||
@ -33,7 +32,7 @@ index 8a6450a..63ff820 100644
|
||||
# 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
|
||||
sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
|
||||
@@ -154,8 +160,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
@@ -181,8 +188,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc CHANGELOG COPYING COPYING-v3 FAQ doc.html setup.html dbus/DBus-interface
|
||||
@ -45,5 +44,5 @@ index 8a6450a..63ff820 100644
|
||||
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
|
||||
%{_unitdir}/%{name}.service
|
||||
--
|
||||
1.9.1
|
||||
2.7.4
|
||||
|
||||
|
@ -1 +1 @@
|
||||
mirror:Source/dnsmasq-2.76-2.el7_4.2.src.rpm
|
||||
mirror:Source/dnsmasq-2.76-5.el7.src.rpm
|
||||
|
Loading…
Reference in New Issue
Block a user