Attachment #42210 for bug #65865

View | Details | Raw Unified | Return to bug 65865
Collapse All | Expand All




PATCH_DIST_STRIP=	-p1
.endif

.if !defined(WITH_JUMBO)
.if defined(WITH_DNSCACHE_DUMPCACHE)
.if defined(WITH_IPV6)
BROKEN=		The IPv6 and dnscache-dumpcache patches are currently in conflict.

PATCH_DIST_STRIP=	-p1
CFLAGS+=	-DDUMPCACHE
.endif
.endif

.if defined(WITH_JUMBO)
.if defined(WITH_IPV6)
BROKEN=		The IPv6 and jumbo patches are currently in conflict.
.endif
.if defined(WITH_IGNOREIP)
BROKEN=		The ignoreip and jumbo patches are currently in conflict.
.endif
PATCH_SITES+=	http://www.ro.kde.org/djbdns/mywork/jumbo/:jumbo
PATCHFILES+=	jumbo-p13.patch.gz
PATCH_DIST_STRIP=	-p1
.if defined(WITH_DNSCACHE_DUMPCACHE)
CFLAGS+=	-DDUMPCACHE
.endif
.endif

.if defined(WITH_IGNOREIP)
PATCH_SITES+=	http://tinydns.org/:ignoreip

	@${ECHO} "                            http://smarden.org/pape/djb/manpages/"
	@${ECHO} "- WITH_IGNOREIP           - build with Russel Nelson's ignoreip2 patch"
	@${ECHO} "                            http://tinydns.org/djbdns-1.05-ignoreip2.patch"
	@${ECHO} "- WITH_JUMBO              - build with Jumbo Patch collection"
	@${ECHO} "                          - www.ro.kde.org/djbdns/mywork/jumbo/jumbo-p13.patch.gz"
	@${ECHO} "- WITH_PERSISTENT_MMAP    - build with Lennert Buytenhek's persistent mmap"
	@${ECHO} "                            patch for tinydns"
	@${ECHO} "                            http://marc.theaimsgroup.com/?l=djbdns&m=108229203212517&w=2"

Lines 4-6 Link Here

(-)djbdns.new/distinfo (+1 lines)
4	MD5 (patch-dnscache-dumpcache-v4.txt) = 61441dec12dd627a7fea7c3059cc2542	4	MD5 (patch-dnscache-dumpcache-v4.txt) = 61441dec12dd627a7fea7c3059cc2542
5	MD5 (djbdns-1.05-ignoreip2.patch) = c032250b209d055847a763c8d9c7e865	5	MD5 (djbdns-1.05-ignoreip2.patch) = c032250b209d055847a763c8d9c7e865
6	MD5 (tinydns-persistmmap-20040418.patch) = c721977364502180f9563b85cecf133b	6	MD5 (tinydns-persistmmap-20040418.patch) = c721977364502180f9563b85cecf133b
		7	MD5 (jumbo-p13.patch.gz) = c96a7cf19968f26ff1422cd197b1a72d

Return to bug 65865

Lines 37-42 Link Here

(-)djbdns.new/Makefile (+19 lines)
37	PATCH_DIST_STRIP= -p1	37	PATCH_DIST_STRIP= -p1
38	.endif	38	.endif
39		39
		40	.if !defined(WITH_JUMBO)
40	.if defined(WITH_DNSCACHE_DUMPCACHE)	41	.if defined(WITH_DNSCACHE_DUMPCACHE)
41	.if defined(WITH_IPV6)	42	.if defined(WITH_IPV6)
42	BROKEN= The IPv6 and dnscache-dumpcache patches are currently in conflict.	43	BROKEN= The IPv6 and dnscache-dumpcache patches are currently in conflict.
Lines 46-51 Link Here
46	PATCH_DIST_STRIP= -p1	47	PATCH_DIST_STRIP= -p1
47	CFLAGS+= -DDUMPCACHE	48	CFLAGS+= -DDUMPCACHE
48	.endif	49	.endif
		50	.endif
		51
		52	.if defined(WITH_JUMBO)
		53	.if defined(WITH_IPV6)
		54	BROKEN= The IPv6 and jumbo patches are currently in conflict.
		55	.endif
		56	.if defined(WITH_IGNOREIP)
		57	BROKEN= The ignoreip and jumbo patches are currently in conflict.
		58	.endif
		59	PATCH_SITES+= http://www.ro.kde.org/djbdns/mywork/jumbo/:jumbo
		60	PATCHFILES+= jumbo-p13.patch.gz
		61	PATCH_DIST_STRIP= -p1
		62	.if defined(WITH_DNSCACHE_DUMPCACHE)
		63	CFLAGS+= -DDUMPCACHE
		64	.endif
		65	.endif
49		66
50	.if defined(WITH_IGNOREIP)	67	.if defined(WITH_IGNOREIP)
51	PATCH_SITES+= http://tinydns.org/:ignoreip	68	PATCH_SITES+= http://tinydns.org/:ignoreip
Lines 90-95 Link Here
90	@${ECHO} " http://smarden.org/pape/djb/manpages/"	107	@${ECHO} " http://smarden.org/pape/djb/manpages/"
91	@${ECHO} "- WITH_IGNOREIP - build with Russel Nelson's ignoreip2 patch"	108	@${ECHO} "- WITH_IGNOREIP - build with Russel Nelson's ignoreip2 patch"
92	@${ECHO} " http://tinydns.org/djbdns-1.05-ignoreip2.patch"	109	@${ECHO} " http://tinydns.org/djbdns-1.05-ignoreip2.patch"
		110	@${ECHO} "- WITH_JUMBO - build with Jumbo Patch collection"
		111	@${ECHO} " - www.ro.kde.org/djbdns/mywork/jumbo/jumbo-p13.patch.gz"
93	@${ECHO} "- WITH_PERSISTENT_MMAP - build with Lennert Buytenhek's persistent mmap"	112	@${ECHO} "- WITH_PERSISTENT_MMAP - build with Lennert Buytenhek's persistent mmap"
94	@${ECHO} " patch for tinydns"	113	@${ECHO} " patch for tinydns"
95	@${ECHO} " http://marc.theaimsgroup.com/?l=djbdns&m=108229203212517&w=2"	114	@${ECHO} " http://marc.theaimsgroup.com/?l=djbdns&m=108229203212517&w=2"