[src/trunk]: src/external/apache2/mDNSResponder/dist Fix Reproducible builds ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aff2ad106a9f
branches:  trunk
changeset: 830273:aff2ad106a9f
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Mar 03 16:09:56 2018 +0000

description:
Fix Reproducible builds by obeying MDNS_VERSIONSTR_NODTS in all cases.
Reported by wiz@

diffstat:

 external/apache2/mDNSResponder/dist/Clients/dns-sd.c             |   7 ++++-
 external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c      |  14 +++++++--
 external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c |   8 +++++-
 3 files changed, 23 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r f8e641a1c17a -r aff2ad106a9f external/apache2/mDNSResponder/dist/Clients/dns-sd.c
--- a/external/apache2/mDNSResponder/dist/Clients/dns-sd.c      Sat Mar 03 16:03:38 2018 +0000
+++ b/external/apache2/mDNSResponder/dist/Clients/dns-sd.c      Sat Mar 03 16:09:56 2018 +0000
@@ -2288,7 +2288,12 @@
 
 // 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
diff -r f8e641a1c17a -r aff2ad106a9f external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
--- a/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c       Sat Mar 03 16:03:38 2018 +0000
+++ b/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c       Sat Mar 03 16:09:56 2018 +0000
@@ -249,9 +249,15 @@
 
 // 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
diff -r f8e641a1c17a -r aff2ad106a9f external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c
--- a/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c  Sat Mar 03 16:03:38 2018 +0000
+++ b/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c  Sat Mar 03 16:09:56 2018 +0000
@@ -363,4 +363,10 @@
 
 // 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 
+;
+