992c3dfdf7
Use dnsmasq-config package to add init script to system folder Remove dnsmasq-spec-add-init-script.patch. Merge spec change part in dnsmasq-spec-add-init-script.patch and src patch adding in patch-tftp-to-close-sockets-immediately.patch to spec-include-TiS-patch.patch. Deployment test and script check pass. Story: 2003768 Task: 27583 Change-Id: I4d5b78fed03961056585b8c09dc483fac3b55728 Signed-off-by: zhipengl <zhipengs.liu@intel.com>
68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
From ecbe3b4e138cb5076b8cbbedf86fea3044449132 Mon Sep 17 00:00:00 2001
|
|
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
|
|
|
|
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
|
|
---
|
|
SPECS/dnsmasq.spec | 26 ++++++++++----------------
|
|
1 file changed, 10 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/SPECS/dnsmasq.spec b/SPECS/dnsmasq.spec
|
|
index b312ef3..4d30b0a 100644
|
|
--- a/SPECS/dnsmasq.spec
|
|
+++ b/SPECS/dnsmasq.spec
|
|
@@ -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
|
|
+Patch31: close-tftp-sockets-immediately.patch
|
|
+
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
|
BuildRequires: dbus-devel
|
|
@@ -109,6 +113,10 @@ query/remove a DHCP server's leases.
|
|
%patch18 -p1 -b .underflow
|
|
%patch19 -p1 -b .misc
|
|
|
|
+# WRS patches
|
|
+%patch30 -p1
|
|
+%patch31 -p1
|
|
+
|
|
# 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"
|
|
@@ -164,25 +172,11 @@ rm -rf %{buildroot}%{_initrddir}
|
|
%clean
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
-%post
|
|
-%systemd_post dnsmasq.service
|
|
-
|
|
-%preun
|
|
-%systemd_preun dnsmasq.service
|
|
-
|
|
-%postun
|
|
-%systemd_postun_with_restart dnsmasq.service
|
|
-
|
|
-%triggerun -- dnsmasq < 2.52-3
|
|
-%{_bindir}/systemd-sysv-convert --save dnsmasq >/dev/null 2>&1 ||:
|
|
-/sbin/chkconfig --del dnsmasq >/dev/null 2>&1 || :
|
|
-/bin/systemctl try-restart dnsmasq.service >/dev/null 2>&1 || :
|
|
-
|
|
%files
|
|
%defattr(-,root,root,-)
|
|
%doc CHANGELOG COPYING COPYING-v3 FAQ doc.html setup.html dbus/DBus-interface
|
|
-%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
|
|
-%dir /etc/dnsmasq.d
|
|
+%config(noreplace) %attr(640,root,root) %{_sysconfdir}/dnsmasq.conf
|
|
+%dir %attr(750,root,root) %{_sysconfdir}/dnsmasq.d
|
|
%dir %{_var}/lib/dnsmasq
|
|
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
|
|
%{_unitdir}/%{name}.service
|
|
--
|
|
1.8.3.1
|
|
|