Module Name: src
Committed By: christos
Date: Sat Mar 3 16:09:56 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/Clients: dns-sd.c
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_clientlib.c
Log Message:
Fix Reproducible builds by obeying MDNS_VERSIONSTR_NODTS in all cases.
Reported by wiz@
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c
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/dist/Clients/dns-sd.c
diff -u src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c:1.6 src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c:1.7
--- src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c:1.6 Sun Jan 14 15:04:55 2018
+++ src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c Sat Mar 3 11:09:56 2018
@@ -2288,7 +2288,12 @@ Fail:
// NOT static -- otherwise the compiler may optimize it out
// The "@(#) " pattern is a special prefix the "what" command looks for
-const char VersionString_SCCS[] = "@(#) dns-sd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
+const char VersionString_SCCS[] = "@(#) dns-sd "
+ STRINGIFY(mDNSResponderVersion)
+#ifndef MDNS_VERSIONSTR_NODTS
+ " (" __DATE__ " " __TIME__ ")"
+#endif
+;
#if _BUILDING_XCODE_PROJECT_
// If the process crashes, then this string will be magically included in the automatically-generated crash log
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.10 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.11
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.10 Sun Jan 14 15:04:56 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Sat Mar 3 11:09:56 2018
@@ -249,9 +249,15 @@ asm (".desc ___crashreporter_info__, 0x1
// For convenience when using the "strings" command, this is the last thing in the file
#if mDNSResponderVersion > 1
-mDNSexport const char mDNSResponderVersionString_SCCS[] = "@(#) mDNSResponder-" STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
-#elif MDNS_VERSIONSTR_NODTS
-mDNSexport const char mDNSResponderVersionString_SCCS[] = "@(#) mDNSResponder (Engineering Build)";
+mDNSexport const char mDNSResponderVersionString_SCCS[] = "@(#) mDNSResponder-" STRINGIFY(mDNSResponderVersion)
+#ifndef MDNS_VERSIONSTR_NODTS
+ " (" __DATE__ " " __TIME__ ")"
+#endif
+;
#else
-mDNSexport const char mDNSResponderVersionString_SCCS[] = "@(#) mDNSResponder (Engineering Build) (" __DATE__ " " __TIME__ ")";
+mDNSexport const char mDNSResponderVersionString_SCCS[] = "@(#) mDNSResponder (Engineering Build)"
+#ifndef MDNS_VERSIONSTR_NODTS
+ " (" __DATE__ " " __TIME__ ")"
+#endif
+;
#endif
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c:1.5 src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c:1.6
--- src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c:1.5 Sun Jan 14 15:04:56 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c Sat Mar 3 11:09:56 2018
@@ -363,4 +363,10 @@ DNSServiceErrorType DNSSD_API TXTRecordG
// NOT static -- otherwise the compiler may optimize it out
// The "@(#) " pattern is a special prefix the "what" command looks for
-const char VersionString_SCCS_libdnssd[] = "@(#) libdns_sd " STRINGIFY(mDNSResponderVersion) " (" __DATE__ " " __TIME__ ")";
+const char VersionString_SCCS_libdnssd[] = "@(#) libdns_sd "
+ STRINGIFY(mDNSResponderVersion)
+#ifndef MDNS_VERSIONSTR_NODTS
+ " (" __DATE__ " " __TIME__ ")"
+#endif
+;
+
