db9aaf09da
Move content from stx-gplv3 into stx-integ
Packages will be relocated to
stx-integ:
base/
anaconda
crontabs
dnsmasq
rsync
database/
python-psycopg2
filesystem/
parted
grub/
grub2
security/
python-keyring
Change-Id: I357310173e6bd1a1005e76be619a5ff5c9bcbed4
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
50 lines
1.6 KiB
Diff
50 lines
1.6 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
|
|
|
|
Conflicts:
|
|
SPECS/dnsmasq.spec
|
|
---
|
|
SPECS/dnsmasq.spec | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/SPECS/dnsmasq.spec b/SPECS/dnsmasq.spec
|
|
index 8a6450a..63ff820 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
|
|
|
|
+# 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
|
|
|
|
+# WRS patches
|
|
+%patch30 -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"
|
|
@@ -154,8 +160,8 @@ rm -rf $RPM_BUILD_ROOT
|
|
%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) /etc/dnsmasq.d
|
|
%dir %{_var}/lib/dnsmasq
|
|
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
|
|
%{_unitdir}/%{name}.service
|
|
--
|
|
1.9.1
|
|
|