1 |
idl0r 11/02/25 12:43:11 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: bind-9.8.0_rc1.ebuild |
5 |
Log: |
6 |
Version bump to 9.8.0_rc1. |
7 |
|
8 |
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.319 net-dns/bind/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/ChangeLog?rev=1.319&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/ChangeLog?rev=1.319&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/ChangeLog?r1=1.318&r2=1.319 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v |
20 |
retrieving revision 1.318 |
21 |
retrieving revision 1.319 |
22 |
diff -u -r1.318 -r1.319 |
23 |
--- ChangeLog 25 Feb 2011 12:42:11 -0000 1.318 |
24 |
+++ ChangeLog 25 Feb 2011 12:43:11 -0000 1.319 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for net-dns/bind |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.318 2011/02/25 12:42:11 idl0r Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.319 2011/02/25 12:43:11 idl0r Exp $ |
30 |
+ |
31 |
+*bind-9.8.0_rc1 (25 Feb 2011) |
32 |
+ |
33 |
+ 25 Feb 2011; Christian Ruppert <idl0r@g.o> +bind-9.8.0_rc1.ebuild: |
34 |
+ Version bump to 9.8.0_rc1. |
35 |
|
36 |
*bind-9.7.3-r1 (25 Feb 2011) |
37 |
*bind-9.6.3-r1 (25 Feb 2011) |
38 |
|
39 |
|
40 |
|
41 |
1.1 net-dns/bind/bind-9.8.0_rc1.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/bind-9.8.0_rc1.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/bind-9.8.0_rc1.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: bind-9.8.0_rc1.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2011 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.0_rc1.ebuild,v 1.1 2011/02/25 12:43:11 idl0r Exp $ |
51 |
|
52 |
EAPI="3" |
53 |
|
54 |
inherit eutils autotools toolchain-funcs flag-o-matic |
55 |
|
56 |
MY_PV="${PV/_p/-P}" |
57 |
MY_PV="${MY_PV/_rc/rc}" |
58 |
MY_P="${PN}-${MY_PV}" |
59 |
|
60 |
SDB_LDAP_VER="1.1.0-fc14" |
61 |
|
62 |
GEOIP_PV=1.3 |
63 |
#GEOIP_PV_AGAINST="${MY_PV}" |
64 |
GEOIP_PV_AGAINST="9.7.2-P2" |
65 |
GEOIP_P="bind-geoip-${GEOIP_PV}" |
66 |
GEOIP_PATCH_A="${GEOIP_P}-${GEOIP_PV_AGAINST}.patch" |
67 |
GEOIP_DOC_A="${GEOIP_P}-readme.txt" |
68 |
GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/" |
69 |
|
70 |
DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server" |
71 |
HOMEPAGE="http://www.isc.org/software/bind" |
72 |
SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz |
73 |
doc? ( mirror://gentoo/dyndns-samples.tbz2 ) |
74 |
geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_DOC_A} |
75 |
${GEOIP_SRC_URI_BASE}/files/${GEOIP_PATCH_A} ) |
76 |
sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 )" |
77 |
|
78 |
LICENSE="as-is" |
79 |
SLOT="0" |
80 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
81 |
IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads |
82 |
resolvconf urandom xml geoip gssapi sdb-ldap" |
83 |
|
84 |
DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g ) |
85 |
mysql? ( >=virtual/mysql-4.0 ) |
86 |
odbc? ( >=dev-db/unixODBC-2.2.6 ) |
87 |
ldap? ( net-nds/openldap ) |
88 |
idn? ( net-dns/idnkit ) |
89 |
postgres? ( dev-db/postgresql-base ) |
90 |
threads? ( >=sys-libs/libcap-2.1.0 ) |
91 |
xml? ( dev-libs/libxml2 ) |
92 |
geoip? ( >=dev-libs/geoip-1.4.6 ) |
93 |
gssapi? ( virtual/krb5 ) |
94 |
sdb-ldap? ( net-nds/openldap )" |
95 |
|
96 |
RDEPEND="${DEPEND} |
97 |
selinux? ( sec-policy/selinux-bind ) |
98 |
resolvconf? ( net-dns/openresolv ) |
99 |
sys-process/psmisc" |
100 |
|
101 |
S="${WORKDIR}/${MY_P}" |
102 |
|
103 |
pkg_setup() { |
104 |
use threads && { |
105 |
ewarn |
106 |
ewarn "If you're in vserver enviroment, you're probably want to" |
107 |
ewarn "disable threads support because of linux capabilities dependency" |
108 |
ewarn |
109 |
} |
110 |
|
111 |
ebegin "Creating named group and user" |
112 |
enewgroup named 40 |
113 |
enewuser named 40 -1 /etc/bind named |
114 |
eend ${?} |
115 |
} |
116 |
|
117 |
src_prepare() { |
118 |
# Adjusting PATHs in manpages |
119 |
for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do |
120 |
sed -i \ |
121 |
-e 's:/etc/named.conf:/etc/bind/named.conf:g' \ |
122 |
-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \ |
123 |
-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \ |
124 |
"${i}" || die "sed failed, ${i} doesn't exist" |
125 |
done |
126 |
|
127 |
if use dlz; then |
128 |
# bind fails to reconnect to MySQL5 databases, bug #180720, patch by Nicolas Brousse |
129 |
# (http://www.shell-tips.com/2007/09/04/bind-950-patch-dlz-mysql-5-for-auto-reconnect/) |
130 |
if use mysql && has_version ">=dev-db/mysql-5"; then |
131 |
epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch |
132 |
fi |
133 |
|
134 |
if use odbc; then |
135 |
epatch "${FILESDIR}/${P}-odbc-dlz-detect.patch" |
136 |
fi |
137 |
fi |
138 |
|
139 |
# should be installed by bind-tools |
140 |
sed -i -r -e "s:(nsupdate|dig) ::g" bin/Makefile.in || die |
141 |
|
142 |
# sdb-ldap patch as per bug #160567 |
143 |
# Upstream URL: http://bind9-ldap.bayour.com/ |
144 |
# New patch take from bug 302735 |
145 |
if use sdb-ldap; then |
146 |
epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch |
147 |
cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named |
148 |
cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools |
149 |
cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools |
150 |
fi |
151 |
|
152 |
if use geoip; then |
153 |
cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die |
154 |
sed -i -e 's/MINORVER=7/MINORVER=8/' \ |
155 |
-e 's/PATCHVER=2/PATCHVER=0/' \ |
156 |
-e 's/RELEASETYPE=-P/RELEASETYPE=rc/' \ |
157 |
-e 's/-RELEASEVER=2/-RELEASEVER=1/' \ |
158 |
-e 's/+RELEASEVER=2-geoip-1.3/+RELEASEVER=1-geoip-1.3/' \ |
159 |
${GEOIP_PATCH_A} || die |
160 |
epatch ${GEOIP_PATCH_A} |
161 |
fi |
162 |
|
163 |
# bug #220361 |
164 |
rm {aclocal,libtool}.m4 |
165 |
WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf |
166 |
|
167 |
# remove useless c++ checks |
168 |
epunt_cxx |
169 |
} |
170 |
|
171 |
src_configure() { |
172 |
local myconf="" |
173 |
|
174 |
use dlz && { |
175 |
myconf="${myconf} --with-dlz-filesystem --with-dlz-stub" |
176 |
use postgres && myconf="${myconf} --with-dlz-postgres" |
177 |
use mysql && myconf="${myconf} --with-dlz-mysql" |
178 |
use berkdb && myconf="${myconf} --with-dlz-bdb" |
179 |
use ldap && myconf="${myconf} --with-dlz-ldap" |
180 |
use odbc && myconf="${myconf} --with-dlz-odbc" |
181 |
} |
182 |
|
183 |
if use threads; then |
184 |
if use dlz && use mysql; then |
185 |
ewarn |
186 |
ewarn "MySQL uses thread local storage in its C api. Thus MySQL" |
187 |
ewarn "requires that each thread of an application execute a MySQL" |
188 |
ewarn "\"thread initialization\" to setup the thread local storage." |
189 |
ewarn "This is impossible to do safely while staying within the DLZ" |
190 |
ewarn "driver API. This is a limitation caused by MySQL, and not" |
191 |
ewarn "the DLZ API." |
192 |
ewarn "Because of this BIND MUST only run with a single thread when" |
193 |
ewarn "using the MySQL driver." |
194 |
ewarn |
195 |
myconf="${myconf} --disable-linux-caps --disable-threads" |
196 |
ewarn "Threading support disabled" |
197 |
else |
198 |
myconf="${myconf} --enable-linux-caps --enable-threads" |
199 |
einfo "Threading support enabled" |
200 |
fi |
201 |
else |
202 |
myconf="${myconf} --disable-linux-caps --disable-threads" |
203 |
fi |
204 |
|
205 |
if use urandom; then |
206 |
myconf="${myconf} --with-randomdev=/dev/urandom" |
207 |
else |
208 |
myconf="${myconf} --with-randomdev=/dev/random" |
209 |
fi |
210 |
|
211 |
use geoip && myconf="${myconf} --with-geoip" |
212 |
|
213 |
# bug #158664 |
214 |
gcc-specs-ssp && replace-flags -O[23s] -O |
215 |
|
216 |
export BUILD_CC=$(tc-getBUILD_CC) |
217 |
econf \ |
218 |
--sysconfdir=/etc/bind \ |
219 |
--localstatedir=/var \ |
220 |
--with-libtool \ |
221 |
$(use_with ssl openssl) \ |
222 |
$(use_with idn) \ |
223 |
$(use_enable ipv6) \ |
224 |
$(use_with xml libxml2) \ |
225 |
$(use_with gssapi) \ |
226 |
${myconf} |
227 |
|
228 |
# bug #151839 |
229 |
echo '#undef SO_BSDCOMPAT' >> config.h |
230 |
} |
231 |
|
232 |
src_install() { |
233 |
emake DESTDIR="${D}" install || die |
234 |
|
235 |
dodoc CHANGES FAQ README |
236 |
|
237 |
if use idn; then |
238 |
dodoc contrib/idn/README.idnkit || die |
239 |
fi |
240 |
|
241 |
if use doc; then |
242 |
dodoc doc/arm/Bv9ARM.pdf || die |
243 |
|
244 |
docinto misc |
245 |
dodoc doc/misc/* || die |
246 |
|
247 |
# might a 'html' useflag make sense? |
248 |
docinto html |
249 |
dohtml -r doc/arm/* || die |
250 |
|
251 |
docinto draft |
252 |
dodoc doc/draft/* || die |
253 |
|
254 |
docinto rfc |
255 |
dodoc doc/rfc/* || die |
256 |
|
257 |
docinto contrib |
258 |
dodoc contrib/named-bootconf/named-bootconf.sh \ |
259 |
contrib/nanny/nanny.pl || die |
260 |
|
261 |
# some handy-dandy dynamic dns examples |
262 |
cd "${D}"/usr/share/doc/${PF} |
263 |
tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die |
264 |
fi |
265 |
|
266 |
use geoip && dodoc "${DISTDIR}"/${GEOIP_P}-readme.txt |
267 |
|
268 |
insinto /etc/bind |
269 |
newins "${FILESDIR}"/named.conf-r5 named.conf || die |
270 |
|
271 |
# ftp://ftp.rs.internic.net/domain/named.cache: |
272 |
insinto /var/bind |
273 |
doins "${FILESDIR}"/named.cache || die |
274 |
|
275 |
insinto /var/bind/pri |
276 |
newins "${FILESDIR}"/127.zone-r1 127.zone || die |
277 |
newins "${FILESDIR}"/localhost.zone-r3 localhost.zone || die |
278 |
|
279 |
newinitd "${FILESDIR}"/named.init-r10 named || die |
280 |
newconfd "${FILESDIR}"/named.confd-r6 named || die |
281 |
|
282 |
newenvd "${FILESDIR}"/10bind.env 10bind || die |
283 |
|
284 |
# Let's get rid of those tools and their manpages since they're provided by bind-tools |
285 |
rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1* |
286 |
rm -f "${D}"/usr/share/man/man8/{dnssec-keygen,nsupdate}.8* |
287 |
rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate} |
288 |
rm -f "${D}"/usr/sbin/{dig,host,nslookup,dnssec-keygen,nsupdate} |
289 |
|
290 |
dosym /var/bind/named.cache /var/bind/root.cache || die |
291 |
dosym /var/bind/pri /etc/bind/pri || die |
292 |
dosym /var/bind/sec /etc/bind/sec || die |
293 |
dosym /var/bind/dyn /etc/bind/dyn || die |
294 |
keepdir /var/bind/{pri,sec,dyn} |
295 |
|
296 |
dodir /var/{run,log}/named || die |
297 |
|
298 |
fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn} |
299 |
fowners root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf} |
300 |
fperms 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf} |
301 |
fperms 0750 /etc/bind /var/bind/pri |
302 |
fperms 0770 /var/{run,log}/named /var/bind/{,sec,dyn} |
303 |
} |
304 |
|
305 |
pkg_postinst() { |
306 |
if [ ! -f '/etc/bind/rndc.key' ]; then |
307 |
if use urandom; then |
308 |
einfo "Using /dev/urandom for generating rndc.key" |
309 |
/usr/sbin/rndc-confgen -r /dev/urandom -a |
310 |
echo |
311 |
else |
312 |
einfo "Using /dev/random for generating rndc.key" |
313 |
/usr/sbin/rndc-confgen -a |
314 |
echo |
315 |
fi |
316 |
chown root:named /etc/bind/rndc.key |
317 |
chmod 0640 /etc/bind/rndc.key |
318 |
fi |
319 |
|
320 |
einfo |
321 |
einfo "You can edit /etc/conf.d/named to customize named settings" |
322 |
einfo |
323 |
use mysql || use postgres || use ldap && { |
324 |
elog "If your named depends on MySQL/PostgreSQL or LDAP," |
325 |
elog "uncomment the specified rc_named_* lines in your" |
326 |
elog "/etc/conf.d/named config to ensure they'll start before bind" |
327 |
einfo |
328 |
} |
329 |
einfo "If you'd like to run bind in a chroot AND this is a new" |
330 |
einfo "install OR your bind doesn't already run in a chroot:" |
331 |
einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named." |
332 |
einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`" |
333 |
einfo |
334 |
|
335 |
CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) |
336 |
if [[ -n ${CHROOT} ]]; then |
337 |
elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" |
338 |
elog "To enable the old behaviour (without using mount) uncomment the" |
339 |
elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config." |
340 |
elog "If you decide to use the new/default method, ensure to make backup" |
341 |
elog "first and merge your existing configs/zones to /etc/bind and" |
342 |
elog "/var/bind because bind will now mount the needed directories into" |
343 |
elog "the chroot dir." |
344 |
fi |
345 |
|
346 |
ewarn |
347 |
ewarn "NOTE: /var/bind/named.ca has been renamed to /var/bind/named.cache" |
348 |
ewarn "you may need to fix your named.conf!" |
349 |
ewarn |
350 |
ewarn "NOTE: If you upgrade from <net-dns/bind-9.4.3_p5-r1, you may encounter permission problems" |
351 |
ewarn "To fix the permissions do:" |
352 |
ewarn "chown root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn}" |
353 |
ewarn "chown root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}" |
354 |
ewarn "chmod 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}" |
355 |
ewarn "chmod 0750 /etc/bind /var/bind/pri" |
356 |
ewarn "chmod 0770 /var/{run,log}/named /var/bind/{,sec,dyn}" |
357 |
ewarn |
358 |
} |
359 |
|
360 |
pkg_config() { |
361 |
CHROOT=$(source /etc/conf.d/named; echo ${CHROOT}) |
362 |
CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT}) |
363 |
CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP}) |
364 |
|
365 |
if [[ -z "${CHROOT}" ]]; then |
366 |
eerror "This config script is designed to automate setting up" |
367 |
eerror "a chrooted bind/named. To do so, please first uncomment" |
368 |
eerror "and set the CHROOT variable in '/etc/conf.d/named'." |
369 |
die "Unset CHROOT" |
370 |
fi |
371 |
if [[ -d "${CHROOT}" ]]; then |
372 |
ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" |
373 |
ewarn "To enable the old behaviour (without using mount) uncomment the" |
374 |
ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config." |
375 |
ewarn |
376 |
ewarn "${CHROOT} already exists... some things might become overridden" |
377 |
ewarn "press CTRL+C if you don't want to continue" |
378 |
sleep 10 |
379 |
fi |
380 |
|
381 |
echo; einfo "Setting up the chroot directory..." |
382 |
|
383 |
mkdir -m 0750 -p ${CHROOT} |
384 |
mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/{run,log}} |
385 |
mkdir -m 0750 -p ${CHROOT}/etc/bind |
386 |
mkdir -m 0770 -p ${CHROOT}/var/{bind,{run,log}/named} |
387 |
chown root:named ${CHROOT} ${CHROOT}/var/{bind,{run,log}/named} ${CHROOT}/etc/bind |
388 |
|
389 |
cp /etc/localtime ${CHROOT}/etc/localtime |
390 |
|
391 |
mknod ${CHROOT}/dev/null c 1 3 |
392 |
chmod 0666 ${CHROOT}/dev/null |
393 |
|
394 |
mknod ${CHROOT}/dev/zero c 1 5 |
395 |
chmod 0666 ${CHROOT}/dev/zero |
396 |
|
397 |
if use urandom; then |
398 |
mknod ${CHROOT}/dev/urandom c 1 9 |
399 |
chmod 0666 ${CHROOT}/dev/urandom |
400 |
else |
401 |
mknod ${CHROOT}/dev/random c 1 8 |
402 |
chmod 0666 ${CHROOT}/dev/random |
403 |
fi |
404 |
|
405 |
if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then |
406 |
cp -a /etc/bind ${CHROOT}/etc/ |
407 |
cp -a /var/bind ${CHROOT}/var/ |
408 |
fi |
409 |
|
410 |
if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then |
411 |
mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP |
412 |
fi |
413 |
|
414 |
elog "You may need to add the following line to your syslog-ng.conf:" |
415 |
elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };" |
416 |
} |