[packages/mDNSResponder] - new URLs, updated to 576.30.4 - removed obsolete alpha patch - added posix patch (add mDNSPosix ve
qboosh
qboosh at pld-linux.org
Sun Nov 29 21:18:05 CET 2015
commit 55ad4941d2c8cea42de08567390357300dd6e8ce
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Nov 29 21:18:41 2015 +0100
- new URLs, updated to 576.30.4
- removed obsolete alpha patch
- added posix patch (add mDNSPosix version of unconditionally called function which exists only in mDNSMacOSX)
- added bison patch (fix build with bison 3)
mDNSResponder-alpha.patch | 11 -----------
mDNSResponder-bison.patch | 36 ++++++++++++++++++++++++++++++++++++
mDNSResponder-posix.patch | 25 +++++++++++++++++++++++++
mDNSResponder-soname.patch | 32 ++++++++++++++++----------------
mDNSResponder.spec | 27 +++++++++++++++++----------
5 files changed, 94 insertions(+), 37 deletions(-)
---
diff --git a/mDNSResponder.spec b/mDNSResponder.spec
index 60ca5a6..f194285 100644
--- a/mDNSResponder.spec
+++ b/mDNSResponder.spec
@@ -1,18 +1,20 @@
Summary: Rendezvous - DNS Service Discovery
Summary(pl.UTF-8): Rendezvous - wykrywanie usług w oparciu o DNS
Name: mDNSResponder
-Version: 108
-Release: 6
-License: APSL
+Version: 576.30.4
+Release: 1
+License: Apache v2.0
Group: Networking/Daemons
-Source0: http://darwinsource.opendarwin.org/tarballs/apsl/%{name}-%{version}.tar.gz
-# Source0-md5: 645eda2dd5d465b8dabedc3b87e1b31a
+Source0: https://opensource.apple.com/tarballs/mDNSResponder/%{name}-%{version}.tar.gz
+# Source0-md5: 940057ac8b513b00e8e9ca12ef796762
Source1: mDNSResponder.init
Patch0: %{name}-cflags.patch
Patch1: %{name}-soname.patch
-Patch2: %{name}-alpha.patch
+Patch2: %{name}-posix.patch
Patch3: %{name}-spell.patch
-URL: http://developer.apple.com/darwin/projects/rendezvous/
+Patch4: %{name}-bison.patch
+URL: https://developer.apple.com/bonjour/
+BuildRequires: bison
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-libs = %{version}-%{release}
Requires: rc-scripts
@@ -92,6 +94,7 @@ Moduł NSS korzystający z mDNSRespondera.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%{__make} -C mDNSPosix \
@@ -154,17 +157,21 @@ fi
%files libs
%defattr(644,root,root,755)
-%doc APPLE_LICENSE README.txt
+%doc LICENSE PrivateDNS.txt README.txt
%attr(755,root,root) %{_libdir}/libdns_sd.so.1.0.0
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libdns_sd.so
-%{_includedir}/*.h
+%{_includedir}/dns_sd.h
%files tools
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mDNS*
+%attr(755,root,root) %{_bindir}/mDNSClientPosix
+%attr(755,root,root) %{_bindir}/mDNSIdentify
+%attr(755,root,root) %{_bindir}/mDNSNetMonitor
+%attr(755,root,root) %{_bindir}/mDNSProxyResponderPosix
+%attr(755,root,root) %{_bindir}/mDNSResponderPosix
%files -n nss_mdns
%defattr(644,root,root,755)
diff --git a/mDNSResponder-alpha.patch b/mDNSResponder-alpha.patch
deleted file mode 100644
index 129c824..0000000
--- a/mDNSResponder-alpha.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mDNSResponder-98/mDNSCore/mDNSEmbeddedAPI.h.orig 2005-01-27 23:57:55.000000000 +0100
-+++ mDNSResponder-98/mDNSCore/mDNSEmbeddedAPI.h 2005-04-23 19:20:56.000000000 +0200
-@@ -1069,7 +1069,7 @@
- // Macro Name __LP64__ Value 1
- // A quick Google search for "defined(__LP64__)" OR "#ifdef __LP64__" gives 2590 hits and
- // a search for "#if __LP64__" gives only 12, so I think we'll go with the majority and use defined()
--#if defined(_LP64) || defined(__LP64__)
-+#if defined(__alpha__) || defined(_LP64) || defined(__LP64__)
- typedef signed int mDNSs32;
- typedef unsigned int mDNSu32;
- #elif defined(_ILP64) || defined(__ILP64__)
diff --git a/mDNSResponder-bison.patch b/mDNSResponder-bison.patch
new file mode 100644
index 0000000..db6ffda
--- /dev/null
+++ b/mDNSResponder-bison.patch
@@ -0,0 +1,36 @@
+--- mDNSResponder-576.30.4/mDNSShared/dnsextd_parser.y.orig 2015-11-29 20:59:53.090821801 +0100
++++ mDNSResponder-576.30.4/mDNSShared/dnsextd_parser.y 2015-11-29 21:00:09.160821148 +0100
+@@ -15,6 +15,7 @@
+ * limitations under the License.
+ */
+
++%parse-param { void *context };
+ %{
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -23,7 +24,7 @@
+ #include "DebugServices.h"
+ #include "dnsextd.h"
+
+-void yyerror( const char* error );
++void yyerror( void *context, const char* error );
+ int yylex(void);
+
+
+@@ -81,7 +82,6 @@
+ static ZoneSpec g_zoneSpec;
+ static const char * g_filename;
+
+-#define YYPARSE_PARAM context
+
+ void
+ SetupOptions
+@@ -378,7 +378,7 @@
+
+ extern int yylineno;
+
+-void yyerror( const char *str )
++void yyerror( void *context, const char *str )
+ {
+ fprintf( stderr,"%s:%d: error: %s\n", g_filename, yylineno, str );
+ }
diff --git a/mDNSResponder-posix.patch b/mDNSResponder-posix.patch
new file mode 100644
index 0000000..cc4b34f
--- /dev/null
+++ b/mDNSResponder-posix.patch
@@ -0,0 +1,25 @@
+--- mDNSResponder-576.30.4/mDNSPosix/mDNSPosix.c.orig 2015-03-13 01:15:32.000000000 +0100
++++ mDNSResponder-576.30.4/mDNSPosix/mDNSPosix.c 2015-11-29 19:03:35.764448066 +0100
+@@ -132,6 +132,22 @@
+ }
+ }
+
++mDNSexport void mDNSPlatformSetuDNSSocktOpt(UDPSocket *src, const mDNSAddr *dst, DNSQuestion *q)
++{
++#if 0 // no POSIX compliant options currently
++ if (src)
++ {
++ int s;
++
++ if (dst->type == mDNSAddrType_IPv4)
++ s = src->ss.sktv4;
++ else
++ s = src->ss.sktv6;
++
++ }
++#endif
++}
++
+ #if COMPILER_LIKES_PRAGMA_MARK
+ #pragma mark ***** Send and Receive
+ #endif
diff --git a/mDNSResponder-soname.patch b/mDNSResponder-soname.patch
index 000e1f5..57edee7 100644
--- a/mDNSResponder-soname.patch
+++ b/mDNSResponder-soname.patch
@@ -1,37 +1,37 @@
---- mDNSResponder-98/mDNSPosix/Makefile.orig 2005-03-26 18:34:02.017295000 +0100
-+++ mDNSResponder-98/mDNSPosix/Makefile 2005-03-26 18:49:31.538987072 +0100
-@@ -254,6 +254,9 @@
+--- mDNSResponder-576.30.4/mDNSPosix/Makefile.orig 2015-11-29 17:00:33.618091078 +0100
++++ mDNSResponder-576.30.4/mDNSPosix/Makefile 2015-11-29 17:10:11.764733480 +0100
+@@ -106,6 +106,8 @@
+ LD = $(CC) -shared
+ FLEXFLAGS_OS = -l
JAVACFLAGS_OS += -I$(JDK)/include/linux
- OPTIONALTARG = nss_mdns
- OPTINSTALL = InstalledNSS
-+LD = $(CC) -shared
+LIBSONAME = -Wl,-soname=libdns_sd.$(LDSUFFIX).$(LIBVERS)
+NSSSONAME = -Wl,-soname=$(NSSLINKNAME)
- else
- ifeq ($(os),netbsd)
-@@ -404,16 +407,16 @@
+ # uClibc does not support Name Service Switch
+ ifneq ($(os),linux-uclibc)
+@@ -257,8 +259,8 @@
CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o
$(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS)
-- @$(LD) $(LIBFLAGS) -o $@ $+
+- @$(LD) $(LINKOPTS) -o $@ $+
- @$(STRIP) $@
-+ $(LD) $(LIBSONAME) $(LIBFLAGS) -o $@ $+
++ $(LD) $(LIBSONAME) $(LINKOPTS) -o $@ $+
+ $(STRIP) $@
- # nss_mdns target builds the Name Service Switch module
- nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE)
+ Clients: setup libdns_sd ../Clients/build/dns-sd
+ @echo "Clients done"
+@@ -271,8 +273,8 @@
@echo "Name Service Switch module done"
$(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o
-- @$(LD) $(LIBFLAGS) -o $@ $+
+- @$(LD) $(LINKOPTS) -o $@ $+
- @$(STRIP) $@
-+ $(LD) $(NSSSONAME) $(LIBFLAGS) -o $@ $+
++ $(LD) $(NSSSONAME) $(LINKOPTS) -o $@ $+
+ $(STRIP) $@
#############################################################################
-@@ -465,11 +468,9 @@
+@@ -347,11 +349,9 @@
$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE)
$(LN) $< $@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mDNSResponder.git/commitdiff/55ad4941d2c8cea42de08567390357300dd6e8ce
More information about the pld-cvs-commit
mailing list