Module Name: src
Committed By: tsarna
Date: Thu Oct 1 00:22:03 UTC 2009
Modified Files:
src/external/apache2/mDNSResponder: Makefile.inc
src/external/apache2/mDNSResponder/dist/mDNSShared: uds_daemon.c
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
Log Message:
Two minor tweaks:
- Build with MDNS_VERSIONSTR_NODTS a'la OpenSolaris, to exclude
__DATE__/__TIME__, for repeatable builds.
- log under "mdnsd" instead of "mDNSResponder" to reduce confusion.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/apache2/mDNSResponder/Makefile.inc
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
cvs rdiff -u -r1.1 -r1.2 \
src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/Makefile.inc
diff -u src/external/apache2/mDNSResponder/Makefile.inc:1.1 src/external/apache2/mDNSResponder/Makefile.inc:1.2
--- src/external/apache2/mDNSResponder/Makefile.inc:1.1 Tue Sep 29 23:56:27 2009
+++ src/external/apache2/mDNSResponder/Makefile.inc Thu Oct 1 00:22:03 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/09/29 23:56:27 tsarna Exp $
+# $NetBSD: Makefile.inc,v 1.2 2009/10/01 00:22:03 tsarna Exp $
.include <bsd.own.mk>
@@ -12,4 +12,5 @@
.endif
CPPFLAGS+= -DPID_FILE=\"/var/run/mdnsd/mdnsd.pid\" \
- -DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd/mdnsd\"
+ -DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd/mdnsd\" \
+ -DMDNS_VERSIONSTR_NODTS
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.1.1.1 src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.2
--- src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.1.1.1 Tue Sep 29 22:14:17 2009
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Thu Oct 1 00:22:03 2009
@@ -1083,7 +1083,10 @@
// globals
mDNSexport mDNS mDNSStorage;
-mDNSexport const char ProgramName[] = "mDNSResponder";
+#ifndef PROGRAM_NAME
+#define PROGRAM_NAME "mDNSResponder"
+#endif
+mDNSexport const char ProgramName[] = PROGRAM_NAME;
static dnssd_sock_t listenfd = dnssd_InvalidSocket;
static request_state *all_requests = NULL;
Index: src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
diff -u src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.1 src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.2
--- src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.1 Tue Sep 29 23:56:34 2009
+++ src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile Thu Oct 1 00:22:03 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/09/29 23:56:34 tsarna Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/01 00:22:03 tsarna Exp $
PROG= mdnsd
@@ -6,7 +6,7 @@
.PATH: ${DIST}/mDNSPosix ${DIST}/mDNSCore ${DIST}/mDNSShared
-CPPFLAGS+=-I${DIST}/mDNSCore -I${DIST}/mDNSShared
+CPPFLAGS+=-I${DIST}/mDNSCore -I${DIST}/mDNSShared -DPROGRAM_NAME=\"mdnsd\"
SRCS= PosixDaemon.c mDNSPosix.c mDNSUNP.c mDNS.c DNSDigest.c uDNS.c \
DNSCommon.c uds_daemon.c mDNSDebug.c dnssd_ipc.c GenLinkedList.c \
PlatformCommon.c
