Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 118371 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/net-dns/djbdns/djbdns-1.05-r16.ebuild (-26 / +33 lines)
Lines 1-4 Link Here
1
# Copyright 1999-2005 Gentoo Foundation
1
# Copyright 1999-2006 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r16.ebuild,v 1.1 2005/09/09 09:51:46 flameeyes Exp $
3
# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r16.ebuild,v 1.1 2005/09/09 09:51:46 flameeyes Exp $
4
4
Lines 16-22 Link Here
16
	fwdzone? ( ${URL1}/djbdns-1.04-fwdzone.patch )
16
	fwdzone? ( ${URL1}/djbdns-1.04-fwdzone.patch )
17
	roundrobin? ( http://www.legend.co.uk/djb/dns/round-robin.patch )
17
	roundrobin? ( http://www.legend.co.uk/djb/dns/round-robin.patch )
18
	multipleip? ( http://danp.net/djbdns/dnscache-multiple-ip.patch
18
	multipleip? ( http://danp.net/djbdns/dnscache-multiple-ip.patch
19
	              http://www.ohse.de/uwe/patches/djbdns-1.05-multiip.diff )
19
		http://www.ohse.de/uwe/patches/djbdns-1.05-multiip.diff )
20
	aliaschain? ( ${URL2}/tinydns-alias-chain-truncation.patch )
20
	aliaschain? ( ${URL2}/tinydns-alias-chain-truncation.patch )
21
	semanticfix? ( ${URL2}/tinydns-data-semantic-error.patch )
21
	semanticfix? ( ${URL2}/tinydns-data-semantic-error.patch )
22
	cnamefix? ( ${URL2}/dnscache-cname-handling.patch )
22
	cnamefix? ( ${URL2}/dnscache-cname-handling.patch )
Lines 35-49 Link Here
35
	unpack ${A}
35
	unpack ${A}
36
	cd ${S}
36
	cd ${S}
37
37
38
	useq ipv6 && useq cnamefix && \
38
	use ipv6 && use cnamefix && \
39
	eerror "ipv6 cannot currently be used with the cnamefix patch" && \
39
	eerror "ipv6 cannot currently be used with the cnamefix patch" && \
40
	exit -1
40
	exit -1
41
41
42
	useq ipv6 && useq multipleip && \
42
	use ipv6 && use multipleip && \
43
	eerror "ipv6 cannot currently be used with the multipleip patch" && \
43
	eerror "ipv6 cannot currently be used with the multipleip patch" && \
44
	exit -1
44
	exit -1
45
45
46
	useq ipv6 && ( useq fwdzone || useq roundrobin ) && \
46
	use ipv6 && ( use fwdzone || use roundrobin ) && \
47
	eerror "ipv6 cannot currently be used with the fwdzone or " && \
47
	eerror "ipv6 cannot currently be used with the fwdzone or " && \
48
	eerror "roundrobin patch." && \
48
	eerror "roundrobin patch." && \
49
	eerror && \
49
	eerror && \
Lines 53-88 Link Here
53
	eerror "both at the same time, since the latter 2 patches are " && \
53
	eerror "both at the same time, since the latter 2 patches are " && \
54
	eerror "mutually exclusive according to bug #31238." && exit -1
54
	eerror "mutually exclusive according to bug #31238." && exit -1
55
55
56
	useq fwdzone && useq roundrobin && \
56
	use fwdzone && use roundrobin && \
57
	eerror "fwdzone and roundrobin do not work together according " && \
57
	eerror "fwdzone and roundrobin do not work together according " && \
58
	eerror "to bug #31238" && exit -1
58
	eerror "to bug #31238" && exit -1
59
59
60
	useq cnamefix && \
60
	use cnamefix && \
61
		sed s:'\r'::g < ${DISTDIR}/dnscache-cname-handling.patch \
61
		sed s:'\r'::g < ${DISTDIR}/dnscache-cname-handling.patch \
62
		> ${WORKDIR}/dnscache-cname-handling.patch && \
62
		> ${WORKDIR}/dnscache-cname-handling.patch && \
63
		epatch ${WORKDIR}/dnscache-cname-handling.patch
63
		epatch ${WORKDIR}/dnscache-cname-handling.patch
64
	useq aliaschain && \
64
	use aliaschain && \
65
		epatch ${DISTDIR}/tinydns-alias-chain-truncation.patch
65
		epatch ${DISTDIR}/tinydns-alias-chain-truncation.patch
66
	useq semanticfix && \
66
	use semanticfix && \
67
		epatch ${DISTDIR}/tinydns-data-semantic-error.patch
67
		epatch ${DISTDIR}/tinydns-data-semantic-error.patch
68
68
69
	useq fwdzone && epatch ${DISTDIR}/djbdns-1.04-fwdzone.patch
69
	use fwdzone && epatch ${DISTDIR}/djbdns-1.04-fwdzone.patch
70
	useq roundrobin && epatch ${DISTDIR}/round-robin.patch
70
	use roundrobin && epatch ${DISTDIR}/round-robin.patch
71
	useq multipleip && \
71
	use multipleip && \
72
		epatch ${DISTDIR}/dnscache-multiple-ip.patch && \
72
		epatch ${DISTDIR}/dnscache-multiple-ip.patch && \
73
		epatch ${DISTDIR}/djbdns-1.05-multiip.diff
73
		epatch ${DISTDIR}/djbdns-1.05-multiip.diff
74
74
75
	epatch ${FILESDIR}/headtail.patch
75
	epatch ${FILESDIR}/headtail.patch
76
	epatch ${FILESDIR}/dnsroots.patch
76
	epatch ${FILESDIR}/dnsroots.patch
77
77
78
	useq ipv6 && {
78
	# NB: All versions >=test21 of the ipv6 patch include the errno patch
79
		einfo "At present dnstrace does NOT support IPv6. It will " \
79
	use ipv6 && {
80
		      "be compiled without IPv6 support."
80
		einfo "At present dnstrace does NOT support IPv6. It will" \
81
			"be compiled without IPv6 support."
82
83
		# preserve an unpatched copy of ${S} for dnstrace
81
		cp -pR ${S} ${S}-noipv6
84
		cp -pR ${S} ${S}-noipv6
82
		# Careful -- >=test21 of the ipv6 patch includes the errno patch
83
		epatch ${WORKDIR}/${P}-${IPV6_PATCH}.diff
84
		cd ${S}-noipv6
85
		cd ${S}-noipv6
85
		epatch ${FILESDIR}/${PV}-errno.patch
86
		epatch ${FILESDIR}/${PV}-errno.patch
87
88
		# now patch ${S} with the ${IPV6_PATCH}
89
		cd ${S}
90
		epatch ${WORKDIR}/${P}-${IPV6_PATCH}.diff
86
	} || {
91
	} || {
87
		epatch ${FILESDIR}/${PV}-errno.patch
92
		epatch ${FILESDIR}/${PV}-errno.patch
88
	}
93
	}
Lines 90-96 Link Here
90
95
91
src_compile() {
96
src_compile() {
92
	LDFLAGS=
97
	LDFLAGS=
93
	useq static && LDFLAGS="-static"
98
	use static && LDFLAGS="-static"
94
	echo "gcc ${CFLAGS}" > conf-cc
99
	echo "gcc ${CFLAGS}" > conf-cc
95
	echo "gcc ${LDFLAGS}" > conf-ld
100
	echo "gcc ${LDFLAGS}" > conf-ld
96
	echo "/usr" > conf-home
101
	echo "/usr" > conf-home
Lines 99-110 Link Here
99
	# If djbdns is compiled with ipv6 support it breaks dnstrace
104
	# If djbdns is compiled with ipv6 support it breaks dnstrace
100
	# therefore we must compile dnstrace separately without ipv6
105
	# therefore we must compile dnstrace separately without ipv6
101
	# support.
106
	# support.
102
	if useq ipv6;
107
	if use ipv6
103
	then
108
	then
104
		einfo "Compiling dnstrace without ipv6 support"
109
		einfo "Compiling dnstrace without ipv6 support"
105
		cd ${S}-noipv6
110
		cd ${S}-noipv6
106
		LDFLAGS=
111
		LDFLAGS=
107
		useq static && LDFLAGS="-static"
112
		use static && LDFLAGS="-static"
108
		echo "gcc ${CFLAGS}" > conf-cc
113
		echo "gcc ${CFLAGS}" > conf-cc
109
		echo "gcc ${LDFLAGS}" > conf-ld
114
		echo "gcc ${LDFLAGS}" > conf-ld
110
		echo "/usr" > conf-home
115
		echo "/usr" > conf-home
Lines 117-131 Link Here
117
	doins dnsroots.global
122
	doins dnsroots.global
118
	into /usr
123
	into /usr
119
	dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
124
	dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
120
	      *-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
125
		*-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
121
	      dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
126
		dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
122
127
123
	useq ipv6 && dobin dnsip6 dnsip6q ${S}-noipv6/dnstrace
128
	use ipv6 && dobin dnsip6 dnsip6q ${S}-noipv6/dnstrace
124
129
125
	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
130
	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
126
131
127
	dobin ${FILESDIR}/dnscache-setup
132
	dobin ${FILESDIR}/dnscache-setup
128
	useq fwdzone && cd ${D}${DESTTREE}/bin && \
133
	use fwdzone && cd ${D}${DESTTREE}/bin && \
129
		epatch ${FILESDIR}/fwdzone-fix.patch
134
		epatch ${FILESDIR}/fwdzone-fix.patch
130
	dobin ${FILESDIR}/tinydns-setup
135
	dobin ${FILESDIR}/tinydns-setup
131
	dobin ${FILESDIR}/djbdns-setup
136
	dobin ${FILESDIR}/djbdns-setup
Lines 137-142 Link Here
137
	enewuser dnslog -1 -1 /nonexistent nofiles
142
	enewuser dnslog -1 -1 /nonexistent nofiles
138
	enewuser tinydns -1 -1 /nonexistent nofiles
143
	enewuser tinydns -1 -1 /nonexistent nofiles
139
144
140
	einfo "Use (dnscache-setup + tinydns-setup) or djbdns-setup" \
145
	einfo
141
	      "to configure djbdns."
146
	einfo "Use (/usr/bin/dnscache-setup + /usr/bin/tinydns-setup)"
147
	einfo "or /usr/bin/djbdns-setup to configure djbdns."
148
	einfo
142
}
149
}

Return to bug 118371