Module Name: src
Committed By: christos
Date: Sat Oct 26 18:14:20 UTC 2024
Modified Files:
src/external/apache2/mDNSResponder: prepare-import.sh
src/external/apache2/mDNSResponder/dist/Clients: dns-sd.c
src/external/apache2/mDNSResponder/dist/mDNSCore: DNSCommon.c
DNSCommon.h DNSDigest.c mDNS.c mDNSDebug.h mDNSEmbeddedAPI.h uDNS.c
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
mDNSBSD.c mDNSPosix.c mDNSUNP.c mDNSUNP.h
src/external/apache2/mDNSResponder/dist/mDNSShared: CommonServices.h
PlatformCommon.c dns_sd.h dnssd_clientlib.c dnssd_clientstub.c
dnssd_ipc.h uds_daemon.c
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
Removed Files:
src/external/apache2/mDNSResponder/dist: .gitignore
src/external/apache2/mDNSResponder/dist/Clients: dnsctl.c dnssdutil.c
src/external/apache2/mDNSResponder/dist/mDNSCore: CryptoAlg.c
CryptoAlg.h anonymous.c anonymous.h dnsproxy.c dnsproxy.h dnssec.c
dnssec.h nsec.c nsec.h nsec3.c nsec3.h
src/external/apache2/mDNSResponder/dist/unittests: CNameRecordTests.c
CNameRecordTests.h DNSMessageTest.c DNSMessageTest.h
DomainNameTest.c DomainNameTest.h InterfaceTest.c InterfaceTest.h
LocalOnlyTimeoutTests.c LocalOnlyTimeoutTests.h
ResourceRecordTest.c ResourceRecordTest.h mDNSCoreReceiveTest.c
mDNSCoreReceiveTest.h main.c unittest.c
Log Message:
Merge conflicts between 878.30.4 and 2559.1.1
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/apache2/mDNSResponder/prepare-import.sh
cvs rdiff -u -r1.1.1.1 -r0 src/external/apache2/mDNSResponder/dist/.gitignore
cvs rdiff -u -r1.7 -r1.8 \
src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/apache2/mDNSResponder/dist/Clients/dnsctl.c \
src/external/apache2/mDNSResponder/dist/Clients/dnssdutil.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/apache2/mDNSResponder/dist/mDNSCore/CryptoAlg.c \
src/external/apache2/mDNSResponder/dist/mDNSCore/CryptoAlg.h \
src/external/apache2/mDNSResponder/dist/mDNSCore/anonymous.c \
src/external/apache2/mDNSResponder/dist/mDNSCore/anonymous.h \
src/external/apache2/mDNSResponder/dist/mDNSCore/dnsproxy.c \
src/external/apache2/mDNSResponder/dist/mDNSCore/dnsproxy.h \
src/external/apache2/mDNSResponder/dist/mDNSCore/dnssec.c \
src/external/apache2/mDNSResponder/dist/mDNSCore/dnssec.h \
src/external/apache2/mDNSResponder/dist/mDNSCore/nsec.c \
src/external/apache2/mDNSResponder/dist/mDNSCore/nsec.h \
src/external/apache2/mDNSResponder/dist/mDNSCore/nsec3.c \
src/external/apache2/mDNSResponder/dist/mDNSCore/nsec3.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.h \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSDebug.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/apache2/mDNSResponder/dist/mDNSCore/DNSDigest.c
cvs rdiff -u -r1.9 -r1.10 \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/apache2/mDNSResponder/dist/mDNSCore/uDNS.c
cvs rdiff -u -r1.18 -r1.19 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
cvs rdiff -u -r1.1 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSBSD.c
cvs rdiff -u -r1.20 -r1.21 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
cvs rdiff -u -r1.12 -r1.13 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h
cvs rdiff -u -r1.1.1.5 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSShared/CommonServices.h
cvs rdiff -u -r1.7 -r1.8 \
src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c \
src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c
cvs rdiff -u -r1.11 -r1.12 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c
cvs rdiff -u -r1.8 -r1.9 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/apache2/mDNSResponder/dist/unittests/CNameRecordTests.c \
src/external/apache2/mDNSResponder/dist/unittests/CNameRecordTests.h \
src/external/apache2/mDNSResponder/dist/unittests/DNSMessageTest.c \
src/external/apache2/mDNSResponder/dist/unittests/DNSMessageTest.h \
src/external/apache2/mDNSResponder/dist/unittests/DomainNameTest.c \
src/external/apache2/mDNSResponder/dist/unittests/DomainNameTest.h \
src/external/apache2/mDNSResponder/dist/unittests/InterfaceTest.c \
src/external/apache2/mDNSResponder/dist/unittests/InterfaceTest.h \
src/external/apache2/mDNSResponder/dist/unittests/LocalOnlyTimeoutTests.c \
src/external/apache2/mDNSResponder/dist/unittests/LocalOnlyTimeoutTests.h \
src/external/apache2/mDNSResponder/dist/unittests/ResourceRecordTest.c \
src/external/apache2/mDNSResponder/dist/unittests/ResourceRecordTest.h \
src/external/apache2/mDNSResponder/dist/unittests/mDNSCoreReceiveTest.c \
src/external/apache2/mDNSResponder/dist/unittests/mDNSCoreReceiveTest.h \
src/external/apache2/mDNSResponder/dist/unittests/main.c \
src/external/apache2/mDNSResponder/dist/unittests/unittest.c
cvs rdiff -u -r1.18 -r1.19 \
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.
