Browse code
Update dnsmasq to v2.76 - fix CVE-2015-8899
Change-Id: Ifeaea4a51cc61ba4a55ea37a29e6d845c25e4ee3
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1764
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>
(cherry picked from commit fa40e2b8d444b3ae55cd0175391d00b7e15e5b44)
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1775
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
Vinay Kulkarni authored on 2016/11/29 07:57:56Showing 1 changed files
| ... | ... |
@@ -1,12 +1,12 @@ |
| 1 | 1 |
Summary: DNS proxy with integrated DHCP server |
| 2 | 2 |
Name: dnsmasq |
| 3 |
-Version: 2.75 |
|
| 4 |
-Release: 2%{?dist}
|
|
| 3 |
+Version: 2.76 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: GPLv2 or GPLv3 |
| 6 | 6 |
Group: System Environment/Daemons |
| 7 | 7 |
URL: http://www.thekelleys.org.uk/dnsmasq/ |
| 8 |
-Source: %{name}-%{version}.tar.xz
|
|
| 9 |
-%define sha1 dnsmasq=e3312377f2ce75ebae1408fee41414a6fc03458f |
|
| 8 |
+Source: %{name}-%{version}.tar.xz
|
|
| 9 |
+%define sha1 dnsmasq=db42d7297dc0a05d51588baa2f298ebb42fcef99 |
|
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| 12 | 12 |
Provides: dnsmasq |
| ... | ... |
@@ -18,8 +18,7 @@ Dnsmasq a lightweight, caching DNS proxy with integrated DHCP server. |
| 18 | 18 |
%setup -q |
| 19 | 19 |
|
| 20 | 20 |
%build |
| 21 |
-make %{?_smp_mflags}
|
|
| 22 |
-make -C contrib/wrt %{?_smp_mflags}
|
|
| 21 |
+make %{?_smp_mflags}
|
|
| 23 | 22 |
|
| 24 | 23 |
%install |
| 25 | 24 |
rm -rf %{buildroot}
|
| ... | ... |
@@ -36,10 +35,7 @@ install dbus/dnsmasq.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/
|
| 36 | 36 |
install -m 644 man/dnsmasq.8 %{buildroot}%{_mandir}/man8/
|
| 37 | 37 |
install -D trust-anchors.conf %{buildroot}%{_datadir}/%{name}/trust-anchors.conf
|
| 38 | 38 |
|
| 39 |
-install -m 755 contrib/wrt/dhcp_release %{buildroot}%{_bindir}/dhcp_release
|
|
| 40 |
-install -m 644 contrib/wrt/dhcp_release.1 %{buildroot}%{_mandir}/man1/dhcp_release.1
|
|
| 41 |
-install -m 755 contrib/wrt/dhcp_lease_time %{buildroot}%{_bindir}/dhcp_lease_time
|
|
| 42 |
-install -m 644 contrib/wrt/dhcp_lease_time.1 %{buildroot}%{_mandir}/man1/dhcp_lease_time.1
|
|
| 39 |
+install -m 755 contrib/wrt/lease_update.sh %{buildroot}%{_sbindir}/lease_update.sh
|
|
| 43 | 40 |
|
| 44 | 41 |
mkdir -p %{buildroot}/usr/lib/systemd/system
|
| 45 | 42 |
cat << EOF >> %{buildroot}/usr/lib/systemd/system/dnsmasq.service
|
| ... | ... |
@@ -63,7 +59,6 @@ rm -rf %{buildroot}
|
| 63 | 63 |
%defattr(-,root,root,-) |
| 64 | 64 |
%{_libdir}/systemd/*
|
| 65 | 65 |
%exclude %{_libdir}/debug
|
| 66 |
-%{_bindir}/*
|
|
| 67 | 66 |
%{_sbindir}/*
|
| 68 | 67 |
%{_mandir}/*
|
| 69 | 68 |
%{_sysconfdir}/*
|
| ... | ... |
@@ -71,7 +66,9 @@ rm -rf %{buildroot}
|
| 71 | 71 |
%config /usr/share/dnsmasq/trust-anchors.conf |
| 72 | 72 |
|
| 73 | 73 |
%changelog |
| 74 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.75-2 |
|
| 75 |
-- GA - Bump release of all rpms |
|
| 76 |
-* Mon Apr 18 2016 Xiaolin Li <xiaolinl@vmware.com> 2.75-1 |
|
| 77 |
-- Initial version |
|
| 74 |
+* Sun Nov 27 2016 Vinay Kulkarni <kulkarniv@vmware.com> 2.76-1 |
|
| 75 |
+- Upgrade to 2.76 to address CVE-2015-8899 |
|
| 76 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.75-2 |
|
| 77 |
+- GA - Bump release of all rpms |
|
| 78 |
+* Mon Apr 18 2016 Xiaolin Li <xiaolinl@vmware.com> 2.75-1 |
|
| 79 |
+- Initial version |