1 |
idl0r 11/09/01 19:34:46 |
2 |
|
3 |
Modified: metadata.xml ChangeLog bind-9.8.1.ebuild |
4 |
Log: |
5 |
EAPI bump. Add more useflags. Make use of REQUIRED_USE for dlz/db flags. Remove useless blocks. Remove useless resolvconf dependency/flag. |
6 |
|
7 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.13 net-dns/bind/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/metadata.xml?rev=1.13&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/metadata.xml?rev=1.13&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/metadata.xml?r1=1.12&r2=1.13 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/metadata.xml,v |
19 |
retrieving revision 1.12 |
20 |
retrieving revision 1.13 |
21 |
diff -u -r1.12 -r1.13 |
22 |
--- metadata.xml 25 Feb 2011 12:42:11 -0000 1.12 |
23 |
+++ metadata.xml 1 Sep 2011 19:34:46 -0000 1.13 |
24 |
@@ -9,8 +9,11 @@ |
25 |
<longdescription>ISC's bind dns server, used the world 'round.</longdescription> |
26 |
<use> |
27 |
<flag name="dlz">Enables dynamic loaded zones, 3rd party extension</flag> |
28 |
+ <flag name="gost">Enables gost OpenSSL engine support</flag> |
29 |
<flag name="gssapi">Enable gssapi support</flag> |
30 |
<flag name="resolvconf">Enable support for <pkg>net-dns/openresolv</pkg></flag> |
31 |
+ <flag name="rpz">Enable response policy rewriting (rpz)</flag> |
32 |
+ <flag name="pkcs11">Enable PKCS#11 key support/tools for DNSSEC</flag> |
33 |
<flag name="sdb-ldap">Enables ldap-sdb backend</flag> |
34 |
<flag name="urandom">Use /dev/urandom instead of /dev/random</flag> |
35 |
</use> |
36 |
|
37 |
|
38 |
|
39 |
1.350 net-dns/bind/ChangeLog |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/ChangeLog?rev=1.350&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/ChangeLog?rev=1.350&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/ChangeLog?r1=1.349&r2=1.350 |
44 |
|
45 |
Index: ChangeLog |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v |
48 |
retrieving revision 1.349 |
49 |
retrieving revision 1.350 |
50 |
diff -u -r1.349 -r1.350 |
51 |
--- ChangeLog 1 Sep 2011 15:20:13 -0000 1.349 |
52 |
+++ ChangeLog 1 Sep 2011 19:34:46 -0000 1.350 |
53 |
@@ -1,6 +1,11 @@ |
54 |
# ChangeLog for net-dns/bind |
55 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.349 2011/09/01 15:20:13 idl0r Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.350 2011/09/01 19:34:46 idl0r Exp $ |
58 |
+ |
59 |
+ 01 Sep 2011; Christian Ruppert <idl0r@g.o> bind-9.8.1.ebuild, |
60 |
+ metadata.xml: |
61 |
+ EAPI bump. Add more useflags. Make use of REQUIRED_USE for dlz/db flags. |
62 |
+ Remove useless blocks. Remove useless resolvconf dependency/flag. |
63 |
|
64 |
*bind-9.8.1 (01 Sep 2011) |
65 |
|
66 |
|
67 |
|
68 |
|
69 |
1.2 net-dns/bind/bind-9.8.1.ebuild |
70 |
|
71 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/bind-9.8.1.ebuild?rev=1.2&view=markup |
72 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/bind-9.8.1.ebuild?rev=1.2&content-type=text/plain |
73 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/bind-9.8.1.ebuild?r1=1.1&r2=1.2 |
74 |
|
75 |
Index: bind-9.8.1.ebuild |
76 |
=================================================================== |
77 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.1.ebuild,v |
78 |
retrieving revision 1.1 |
79 |
retrieving revision 1.2 |
80 |
diff -u -r1.1 -r1.2 |
81 |
--- bind-9.8.1.ebuild 1 Sep 2011 15:20:13 -0000 1.1 |
82 |
+++ bind-9.8.1.ebuild 1 Sep 2011 19:34:46 -0000 1.2 |
83 |
@@ -1,8 +1,17 @@ |
84 |
# Copyright 1999-2011 Gentoo Foundation |
85 |
# Distributed under the terms of the GNU General Public License v2 |
86 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.1.ebuild,v 1.1 2011/09/01 15:20:13 idl0r Exp $ |
87 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.1.ebuild,v 1.2 2011/09/01 19:34:46 idl0r Exp $ |
88 |
|
89 |
-EAPI="3" |
90 |
+# Re dlz/mysql and threads, needs to be verified.. |
91 |
+# MySQL uses thread local storage in its C api. Thus MySQL |
92 |
+# requires that each thread of an application execute a MySQL |
93 |
+# thread initialization to setup the thread local storage. |
94 |
+# This is impossible to do safely while staying within the DLZ |
95 |
+# driver API. This is a limitation caused by MySQL, and not the DLZ API. |
96 |
+# Because of this BIND MUST only run with a single thread when |
97 |
+# using the MySQL driver. |
98 |
+ |
99 |
+EAPI="4" |
100 |
|
101 |
inherit eutils autotools toolchain-funcs flag-o-matic multilib |
102 |
|
103 |
@@ -32,8 +41,16 @@ |
104 |
LICENSE="as-is" |
105 |
SLOT="0" |
106 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
107 |
-IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads |
108 |
- resolvconf urandom xml geoip gssapi sdb-ldap" |
109 |
+IUSE="berkdb caps dlz doc geoip gost gssapi idn ipv6 ldap mysql odbc pkcs11 postgres rpz sdb-ldap |
110 |
+selinux ssl threads urandom xml" |
111 |
+ |
112 |
+REQUIRED_USE="postgres? ( dlz ) |
113 |
+ berkdb? ( dlz ) |
114 |
+ mysql? ( dlz !threads ) |
115 |
+ odbc? ( dlz ) |
116 |
+ ldap? ( dlz ) |
117 |
+ sdb-ldap? ( dlz ) |
118 |
+ gost? ( ssl )" |
119 |
|
120 |
DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g ) |
121 |
mysql? ( >=virtual/mysql-4.0 ) |
122 |
@@ -41,15 +58,15 @@ |
123 |
ldap? ( net-nds/openldap ) |
124 |
idn? ( net-dns/idnkit ) |
125 |
postgres? ( dev-db/postgresql-base ) |
126 |
- threads? ( >=sys-libs/libcap-2.1.0 ) |
127 |
+ caps? ( >=sys-libs/libcap-2.1.0 ) |
128 |
xml? ( dev-libs/libxml2 ) |
129 |
geoip? ( >=dev-libs/geoip-1.4.6 ) |
130 |
gssapi? ( virtual/krb5 ) |
131 |
- sdb-ldap? ( net-nds/openldap )" |
132 |
+ sdb-ldap? ( net-nds/openldap ) |
133 |
+ gost? ( >=dev-libs/openssl-1.0.0 )" |
134 |
|
135 |
RDEPEND="${DEPEND} |
136 |
selinux? ( sec-policy/selinux-bind ) |
137 |
- resolvconf? ( net-dns/openresolv ) |
138 |
sys-process/psmisc" |
139 |
|
140 |
S="${WORKDIR}/${MY_P}" |
141 |
@@ -88,21 +105,21 @@ |
142 |
if use odbc; then |
143 |
epatch "${FILESDIR}/${PN}-9.7.3-odbc-dlz-detect.patch" |
144 |
fi |
145 |
+ |
146 |
+ # sdb-ldap patch as per bug #160567 |
147 |
+ # Upstream URL: http://bind9-ldap.bayour.com/ |
148 |
+ # New patch take from bug 302735 |
149 |
+ if use sdb-ldap; then |
150 |
+ epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch |
151 |
+ cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/ |
152 |
+ cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/ |
153 |
+ cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/ |
154 |
+ fi |
155 |
fi |
156 |
|
157 |
# should be installed by bind-tools |
158 |
sed -i -r -e "s:(nsupdate|dig) ::g" bin/Makefile.in || die |
159 |
|
160 |
- # sdb-ldap patch as per bug #160567 |
161 |
- # Upstream URL: http://bind9-ldap.bayour.com/ |
162 |
- # New patch take from bug 302735 |
163 |
- if use sdb-ldap; then |
164 |
- epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch |
165 |
- cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named |
166 |
- cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools |
167 |
- cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools |
168 |
- fi |
169 |
- |
170 |
if use geoip; then |
171 |
cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die |
172 |
sed -i -e 's:RELEASETYPE=-P:RELEASETYPE=:' \ |
173 |
@@ -112,46 +129,12 @@ |
174 |
|
175 |
# bug #220361 |
176 |
rm {aclocal,libtool}.m4 |
177 |
- WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf |
178 |
- |
179 |
- # remove useless c++ checks |
180 |
- epunt_cxx |
181 |
+ eautoreconf |
182 |
} |
183 |
|
184 |
src_configure() { |
185 |
local myconf="" |
186 |
|
187 |
- use dlz && { |
188 |
- myconf="${myconf} --with-dlz-filesystem --with-dlz-stub" |
189 |
- use postgres && myconf="${myconf} --with-dlz-postgres" |
190 |
- use mysql && myconf="${myconf} --with-dlz-mysql" |
191 |
- use berkdb && myconf="${myconf} --with-dlz-bdb" |
192 |
- use ldap && myconf="${myconf} --with-dlz-ldap" |
193 |
- use odbc && myconf="${myconf} --with-dlz-odbc" |
194 |
- } |
195 |
- |
196 |
- if use threads; then |
197 |
- if use dlz && use mysql; then |
198 |
- ewarn |
199 |
- ewarn "MySQL uses thread local storage in its C api. Thus MySQL" |
200 |
- ewarn "requires that each thread of an application execute a MySQL" |
201 |
- ewarn "\"thread initialization\" to setup the thread local storage." |
202 |
- ewarn "This is impossible to do safely while staying within the DLZ" |
203 |
- ewarn "driver API. This is a limitation caused by MySQL, and not" |
204 |
- ewarn "the DLZ API." |
205 |
- ewarn "Because of this BIND MUST only run with a single thread when" |
206 |
- ewarn "using the MySQL driver." |
207 |
- ewarn |
208 |
- myconf="${myconf} --disable-linux-caps --disable-threads" |
209 |
- ewarn "Threading support disabled" |
210 |
- else |
211 |
- myconf="${myconf} --enable-linux-caps --enable-threads" |
212 |
- einfo "Threading support enabled" |
213 |
- fi |
214 |
- else |
215 |
- myconf="${myconf} --disable-linux-caps --disable-threads" |
216 |
- fi |
217 |
- |
218 |
if use urandom; then |
219 |
myconf="${myconf} --with-randomdev=/dev/urandom" |
220 |
else |
221 |
@@ -168,11 +151,25 @@ |
222 |
--sysconfdir=/etc/bind \ |
223 |
--localstatedir=/var \ |
224 |
--with-libtool \ |
225 |
+ $(use_enable threads) \ |
226 |
+ $(use_with dlz dlopen) \ |
227 |
+ $(use_with dlz dlz-filesystem) \ |
228 |
+ $(use_with dlz dlz-stub) \ |
229 |
+ $(use_with postgres dlz-postgres) \ |
230 |
+ $(use_with mysql dlz-mysql) \ |
231 |
+ $(use_with berkdb dlz-bdb) \ |
232 |
+ $(use_with ldap dlz-ldap) \ |
233 |
+ $(use_with odbc dlz-odbc) \ |
234 |
$(use_with ssl openssl) \ |
235 |
$(use_with idn) \ |
236 |
$(use_enable ipv6) \ |
237 |
$(use_with xml libxml2) \ |
238 |
$(use_with gssapi) \ |
239 |
+ $(use_enable rpz rpz-nsip) \ |
240 |
+ $(use_enable rpz rpz-nsdname) \ |
241 |
+ $(use_with pkcs11) \ |
242 |
+ $(use_enable caps linux-caps) \ |
243 |
+ $(use_with gost) \ |
244 |
${myconf} |
245 |
|
246 |
# bug #151839 |
247 |
@@ -229,7 +226,7 @@ |
248 |
newinitd "${FILESDIR}"/named.init-r11 named || die |
249 |
newconfd "${FILESDIR}"/named.confd-r6 named || die |
250 |
|
251 |
- if use ssl && [ -e /usr/lib/engines/libgost.so ]; then |
252 |
+ if use gost; then |
253 |
sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die |
254 |
else |
255 |
sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die |
256 |
@@ -341,7 +338,7 @@ |
257 |
mkdir -m 0750 -p ${CHROOT}/etc/bind |
258 |
mkdir -m 0770 -p ${CHROOT}/var/{bind,{run,log}/named} |
259 |
# As of bind 9.8.0 |
260 |
- if has_version net-dns/bind[ssl] -a -e /usr/lib/engines/libgost.so; then |
261 |
+ if has_version net-dns/bind[gost]; then |
262 |
if [ "$(get_libdir)" = "lib64" ]; then |
263 |
mkdir -m 0755 -p ${CHROOT}/usr/lib64/engines |
264 |
ln -s lib64 ${CHROOT}/usr/lib |