Merge tag 'upstream/878.70.2' into tizen

Change-Id: I6f20b26499f5bc0a578098edaefff0946c8bf8f5

diff --cc Clients/dns-sd.c
index f36211e,78c8f29..78c8f29
mode 100755,100644..100755
--- 1/Clients/dns-sd.c
--- 2/Clients/dns-sd.c
+++ b/Clients/dns-sd.c

diff --cc Makefile
index 2b528d0,978c895..978c895
mode 100755,100644..100755
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile

diff --cc mDNSCore/DNSCommon.c
index 3ea9a30,597c4cc..597c4cc
mode 100755,100644..100755
--- 1/mDNSCore/DNSCommon.c
--- 2/mDNSCore/DNSCommon.c
+++ b/mDNSCore/DNSCommon.c

diff --cc mDNSCore/DNSCommon.h
index 2da1970,e1ef261..e1ef261
mode 100755,100644..100755
--- 1/mDNSCore/DNSCommon.h
--- 2/mDNSCore/DNSCommon.h
+++ b/mDNSCore/DNSCommon.h

diff --cc mDNSCore/anonymous.c
index d2b80e7,5c138d2..5c138d2
mode 100755,100644..100755
--- 1/mDNSCore/anonymous.c
--- 2/mDNSCore/anonymous.c
+++ b/mDNSCore/anonymous.c

diff --cc mDNSCore/dnsproxy.c
index 2afb59d,a94c005..a94c005
mode 100755,100644..100755
--- 1/mDNSCore/dnsproxy.c
--- 2/mDNSCore/dnsproxy.c
+++ b/mDNSCore/dnsproxy.c

diff --cc mDNSCore/dnsproxy.h
index a2abdfb,6889e73..6889e73
mode 100755,100644..100755
--- 1/mDNSCore/dnsproxy.h
--- 2/mDNSCore/dnsproxy.h
+++ b/mDNSCore/dnsproxy.h

diff --cc mDNSCore/dnssec.c
index 514a488,9525655..9525655
mode 100755,100644..100755
--- 1/mDNSCore/dnssec.c
--- 2/mDNSCore/dnssec.c
+++ b/mDNSCore/dnssec.c

diff --cc mDNSCore/nsec.c
index 09d2735,31cf1e9..31cf1e9
mode 100755,100644..100755
--- 1/mDNSCore/nsec.c
--- 2/mDNSCore/nsec.c
+++ b/mDNSCore/nsec.c

diff --cc mDNSCore/nsec3.c
index 4e9e8c8,43cd37a..43cd37a
mode 100755,100644..100755
--- 1/mDNSCore/nsec3.c
--- 2/mDNSCore/nsec3.c
+++ b/mDNSCore/nsec3.c

diff --cc mDNSPosix/ExampleClientApp.c
index f23248b,be34091..be34091
mode 100755,100644..100755
--- 1/mDNSPosix/ExampleClientApp.c
--- 2/mDNSPosix/ExampleClientApp.c
+++ b/mDNSPosix/ExampleClientApp.c

diff --cc mDNSPosix/NetMonitor.c
index a3823c5,418aadd..418aadd
mode 100755,100644..100755
--- 1/mDNSPosix/NetMonitor.c
--- 2/mDNSPosix/NetMonitor.c
+++ b/mDNSPosix/NetMonitor.c

diff --cc mDNSPosix/PosixDaemon.c
index 88b3292,295e842..295e842
mode 100755,100644..100755
--- 1/mDNSPosix/PosixDaemon.c
--- 2/mDNSPosix/PosixDaemon.c
+++ b/mDNSPosix/PosixDaemon.c

diff --cc mDNSPosix/ProxyResponder.c
index 3982161,bd0fe58..bd0fe58
mode 100755,100644..100755
--- 1/mDNSPosix/ProxyResponder.c
--- 2/mDNSPosix/ProxyResponder.c
+++ b/mDNSPosix/ProxyResponder.c

diff --cc mDNSPosix/mDNSPosix.c
Simple merge

diff --cc mDNSShared/CommonServices.h
index 7fceac0,fecfb0f..fecfb0f
mode 100755,100644..100755
--- 1/mDNSShared/CommonServices.h
--- 2/mDNSShared/CommonServices.h
+++ b/mDNSShared/CommonServices.h

diff --cc mDNSShared/dns_sd.h
index 660b370,0e5c35e..0e5c35e
mode 100755,100644..100755
--- 1/mDNSShared/dns_sd.h
--- 2/mDNSShared/dns_sd.h
+++ b/mDNSShared/dns_sd.h

diff --cc mDNSShared/dnsextd.c
index b55d3f4,bc89ef8..bc89ef8
mode 100755,100644..100755
--- 1/mDNSShared/dnsextd.c
--- 2/mDNSShared/dnsextd.c
+++ b/mDNSShared/dnsextd.c

diff --cc mDNSShared/dnsextd.conf
index 0379580,d8cac24..d8cac24
mode 100755,100644..100755
--- 1/mDNSShared/dnsextd.conf
--- 2/mDNSShared/dnsextd.conf
+++ b/mDNSShared/dnsextd.conf

diff --cc mDNSShared/dnssd_clientstub.c
index 127832f,27e90ee..01decc7
mode 100755,100644..100755
--- 1/mDNSShared/dnssd_clientstub.c
--- 2/mDNSShared/dnssd_clientstub.c
+++ b/mDNSShared/dnssd_clientstub.c

diff --cc mDNSShared/uds_daemon.c
index 2552c8a,946ad16..946ad16
mode 100755,100644..100755
--- 1/mDNSShared/uds_daemon.c
--- 2/mDNSShared/uds_daemon.c
+++ b/mDNSShared/uds_daemon.c

diff --cc mDNSShared/uds_daemon.h
index ef98450,dc7d9ac..dc7d9ac
mode 100755,100644..100755
--- 1/mDNSShared/uds_daemon.h
--- 2/mDNSShared/uds_daemon.h
+++ b/mDNSShared/uds_daemon.h

diff --cc packaging/mdnsresponder.spec
index 037a013,0000000..10635c6
mode 100755,000000..100755
--- 1/packaging/mdnsresponder.spec
--- /dev/null
+++ b/packaging/mdnsresponder.spec
@@@ -1,113 -1,0 +1,113 @@@
- Version:    765.50.9
 +Name:       mdnsresponder
 +Summary:    DNS Service Discovery service with dns-sd library
++Version:    878.70.2
 +Release:    1
 +Group:      System/Network
 +License:    Apache-2.0 or BSD-2.0
 +Source0:    %{name}-%{version}.tar.gz
 +Source1001:    mdnsresponder.manifest
 +Source1002:    libdns_sd.manifest
 +BuildRequires: bison
 +BuildRequires: flex
 +Requires(post):       /sbin/ldconfig
 +Requires(postun):     /sbin/ldconfig
 +
 +%description
 +The DNS Service Discovery is part of Bonjour, Apple's implementation of
 +zero-configuration networking(ZEROCONF).
 +
 +%package -n libdns_sd
 +Summary:    DNS-SD - client libraries
 +%if "%{?_lib}" == "lib64"
 +Provides: libdns_sd.so()(64bit)
 +%else
 +Provides: libdns_sd.so
 +%endif
 +Requires:   mdnsresponder = %{version}-%{release}
 +
 +%description -n libdns_sd
 +Client libraries for DNS-SD: synchronous and asynchronous
 +
 +%package devel
 +Summary:  DNS Service Discovery (Development)
 +Requires:   libdns_sd = %{version}-%{release}
 +Requires: pkgconfig
 +
 +%description devel
 +DNS-SD development files
 +
 +%prep
 +%setup -q
 +cp -a %{SOURCE1001} .
 +cp -a %{SOURCE1002} .
 +
 +%build
 +%if "%{?_lib}" == "lib64"
 +CONFIG_TIZEN_64BIT=y; export CONFIG_TIZEN_64BIT
 +%endif
 +
 +cd mDNSPosix
 +make os=tizen %{?_smp_mflags}
 +
 +%install
 +MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 +
 +rm -rf %{buildroot}
 +mkdir -p %{buildroot}%{_sbindir}/
 +mkdir -p %{buildroot}%{_bindir}/
 +mkdir -p %{buildroot}%{_libdir}/
 +mkdir -p %{buildroot}%{_libdir}/pkgconfig/
 +
 +#mkdir -p %{buildroot}%{_libdir}/systemd/system/
 +#cp mdnsd.service %{buildroot}%{_libdir}/systemd/system/mdnsd.service
 +#mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/
 +#ln -s mdnsd.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/mdnsd.service
 +
 +cp mdnsresponder-server.sh.in %{buildroot}%{_bindir}/mdnsresponder-server.sh
 +
 +mkdir -p %{buildroot}%{_includedir}/
 +%if "%{?_lib}" == "lib64"
 +CONFIG_TIZEN_64BIT=y; export CONFIG_TIZEN_64BIT
 +%endif
 +cd mDNSPosix
 +make install os=tizen DESTDIR=%{buildroot} LIBDIR=/%{?_lib}
 +ln -sf %{_libdir}/libdns_sd.so.%{version} %{buildroot}%{_libdir}/libdns_sd.so.765
 +ln -sf %{_libdir}/libdns_sd.so.%{version} %{buildroot}%{_libdir}/libdns_sd.so
 +
 +%post
 +chmod 755 %{_bindir}/mdnsresponder-server.sh
 +#systemctl daemon-reload
 +
 +#if [ $1 = 1 ]; then
 +#    systemctl enable mdnsd.service
 +#fi
 +
 +#systemctl restart mdnsd.service
 +
 +#%preun
 +#if [ $1 = 0 ]; then
 +#    # unistall
 +#    systemctl stop mdnsd.service
 +#fi
 +
 +%post -n libdns_sd -p /sbin/ldconfig
 +
 +%postun -n libdns_sd -p /sbin/ldconfig
 +
 +%files
 +%manifest mdnsresponder.manifest
 +%license LICENSE
 +%attr(755,root,root) %{_sbindir}/mdnsd
 +%attr(-,root,root) %{_bindir}/mdnsresponder-server.sh
 +#%attr(-,root,root) %{_libdir}/systemd/system/mdnsd.service
 +#%attr(-,root,root) %{_libdir}/systemd/system/multi-user.target.wants/mdnsd.service
 +
 +%files devel
 +%{_includedir}/*.h
 +%{_libdir}/pkgconfig/*.pc
 +%{_libdir}/*.so
 +
 +%files -n libdns_sd
 +%manifest libdns_sd.manifest
 +%license LICENSE
 +%{_libdir}/libdns_sd.so*