starlingx/integ
Code Issues Proposed changes

Merge "rebase dnsmasq patch to CentOS 7.6 version" into f/centos76

Browse Source
This commit is contained in:
Zuul 2019-01-02 03:34:03 +00:00 committed by Gerrit Code Review
commit d26fe93b36
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/dnsmasq/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -16,8 +16,8 @@ index 4d30b0a..689158e 100644
Name: dnsmasq Name: dnsmasq
Version: 2.76 Version: 2.76
-Release: 5%{?extraversion}%{?dist} -Release: 7%{?extraversion}%{?dist}
+Release: 5.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 7.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: A lightweight DHCP/caching DNS server Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons Group: System Environment/Daemons

14
base/dnsmasq/centos/meta_patches/spec-include-TiS-patch.patch
View File

@ -12,9 +12,9 @@ diff --git a/SPECS/dnsmasq.spec b/SPECS/dnsmasq.spec
index b312ef3..4d30b0a 100644 index b312ef3..4d30b0a 100644
--- a/SPECS/dnsmasq.spec --- a/SPECS/dnsmasq.spec
+++ b/SPECS/dnsmasq.spec +++ b/SPECS/dnsmasq.spec
@@ -55,6 +55,10 @@ Patch17: dnsmasq-2.76-gita3303e196.patch @@ -57,6 +57,10 @@ Patch19: dnsmasq-2.76-misc-cleanups.patch
Patch18: dnsmasq-2.76-underflow.patch Patch20: dnsmasq-2.76-CVE-2017-14491-2.patch
Patch19: dnsmasq-2.76-misc-cleanups.patch Patch21: dnsmasq-2.76-inotify.patch
+# WRS patches +# WRS patches
+Patch30: dnsmasq-update-ipv6-leases-from-config.patch +Patch30: dnsmasq-update-ipv6-leases-from-config.patch
@ -23,9 +23,9 @@ index b312ef3..4d30b0a 100644
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel BuildRequires: dbus-devel
@@ -109,6 +113,10 @@ query/remove a DHCP server's leases. @@ -113,6 +117,10 @@ query/remove a DHCP server's leases.
%patch18 -p1 -b .underflow %patch20 -p1 -b .CVE-2017-14491-2
%patch19 -p1 -b .misc %patch21 -p1 -b .inotify
+# WRS patches +# WRS patches
+%patch30 -p1 +%patch30 -p1
@ -34,7 +34,7 @@ index b312ef3..4d30b0a 100644
# use /var/lib/dnsmasq instead of /var/lib/misc # 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 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" sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
@@ -164,25 +172,11 @@ rm -rf %{buildroot}%{_initrddir} @@ -168,25 +176,11 @@ rm -rf %{buildroot}%{_initrddir}
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT

2
base/dnsmasq/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/dnsmasq-2.76-5.el7.src.rpm mirror:Source/dnsmasq-2.76-7.el7.src.rpm