Merge tag 'upstream/2.88' into tizen

Change-Id: I0bd9310f2be4823799acb0901eb09625b3cdf166

diff --cc packaging/dnsmasq.spec
index 21616ae,0000000..0167c9c
mode 100644,000000..100644
--- 1/packaging/dnsmasq.spec
--- /dev/null
+++ b/packaging/dnsmasq.spec
@@@ -1,42 -1,0 +1,42 @@@
- Version:    2.86
 +Name:       dnsmasq
 +Summary:    dnsmasq, DNS forwarder.
++Version:    2.88
 +Release:    1
 +Group:      System/Network
 +License:    GPL-2.0+
 +Source0:    %{name}-%{version}.tar.gz
 +Source1001:     packaging/dnsmasq.manifest
 +BuildRequires: cmake
 +BuildRequires: pkgconfig(dbus-1)
 +BuildRequires: pkgconfig(libtzplatform-config)
 +
 +%description
 +Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP server.
 +It is designed to provide DNS and, optionally, DHCP, to a small network.
 +It can serve the names of local machines that are not in the global DNS.
 +The DHCP server integrates with the DNS server and allows machines with
 +DHCP-allocated addresses to appear in DNS with names configured either
 +in each host or in a central configuration file. Dnsmasq supports static
 +and dynamic DHCP leases and BOOTP for network booting of diskless machines.
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
 +%build
 +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 +make %{?jobs:-j%jobs}
 +
 +%post
 +mkdir -p %{TZ_SYS_VAR}/lib/misc
 +
 +%install
 +%make_install
 +mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
 +cp dbus/dnsmasq.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
 +
 +%files
 +%manifest %{name}.manifest
 +%{_bindir}/dnsmasq
 +%license COPYING
 +%attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*

diff --cc src/config.h
Simple merge

diff --cc src/lease.c
Simple merge

diff --cc src/rfc1035.c
Simple merge