1 |
idl0r 10/06/03 16:57:18 |
2 |
|
3 |
Modified: bind-9.7.0_p2-r1.ebuild ChangeLog |
4 |
bind-9.6.2_p2.ebuild |
5 |
Log: |
6 |
Improve pkg_config, bug 321457, thanks to Duncan <1i5t5.duncan@×××.net>. Remove some old einfo's |
7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 net-dns/bind/bind-9.7.0_p2-r1.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/bind-9.7.0_p2-r1.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/bind-9.7.0_p2-r1.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/bind-9.7.0_p2-r1.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: bind-9.7.0_p2-r1.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.0_p2-r1.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- bind-9.7.0_p2-r1.ebuild 23 May 2010 20:44:50 -0000 1.1 |
23 |
+++ bind-9.7.0_p2-r1.ebuild 3 Jun 2010 16:57:17 -0000 1.2 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2010 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.0_p2-r1.ebuild,v 1.1 2010/05/23 20:44:50 idl0r Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.0_p2-r1.ebuild,v 1.2 2010/06/03 16:57:17 idl0r Exp $ |
29 |
|
30 |
EAPI="3" |
31 |
|
32 |
@@ -268,30 +268,21 @@ |
33 |
einfo "Before running the above command you might want to change the chroot" |
34 |
einfo "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used." |
35 |
einfo |
36 |
- einfo "Recently verisign added a wildcard A record to the .COM and .NET TLD" |
37 |
- einfo "zones making all .com and .net domains appear to be registered" |
38 |
- einfo "This causes many problems such as breaking important anti-spam checks" |
39 |
- einfo "which verify source domains exist. ISC released a patch for BIND which" |
40 |
- einfo "adds 'delegation-only' zones to allow admins to return the .com and .net" |
41 |
- einfo "domain resolution to their normal function." |
42 |
- einfo |
43 |
- einfo "There is no need to create a com or net data file. Just the" |
44 |
- einfo "entries to the named.conf file is enough." |
45 |
- einfo |
46 |
- einfo " zone "com" IN { type delegation-only; };" |
47 |
- einfo " zone "net" IN { type delegation-only; };" |
48 |
|
49 |
- CHROOT=$(sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null) |
50 |
+ CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) |
51 |
if [[ -n ${CHROOT} && -d ${CHROOT} ]]; then |
52 |
ewarn "NOTE: as of 'bind-9.6.1' the chroot part of the init-script got some major changes." |
53 |
fi |
54 |
} |
55 |
|
56 |
pkg_config() { |
57 |
- CHROOT=$(sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null) |
58 |
+ CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) |
59 |
|
60 |
- if [ -z "${CHROOT}" ]; then |
61 |
- CHROOT="/chroot/dns" |
62 |
+ if [[ -z "${CHROOT}" ]]; then |
63 |
+ eerror "This config script is designed to automate setting up" |
64 |
+ eerror "a chrooted bind/named. To do so, please first uncomment" |
65 |
+ eerror "and set the CHROOT variable in '/etc/conf.d/named'." |
66 |
+ die "Unset CHROOT" |
67 |
fi |
68 |
if [[ -d "${CHROOT}" ]]; then |
69 |
ewarn "NOTE: As of 'bind-9.6.1' the chroot part of the init-script got some major changes." |
70 |
@@ -327,9 +318,4 @@ |
71 |
|
72 |
elog "You may need to add the following line to your syslog-ng.conf:" |
73 |
elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };" |
74 |
- |
75 |
- grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$? |
76 |
- if [ $RETVAL = 0 ]; then |
77 |
- sed -i 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named 2>/dev/null |
78 |
- fi |
79 |
} |
80 |
|
81 |
|
82 |
|
83 |
1.276 net-dns/bind/ChangeLog |
84 |
|
85 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/ChangeLog?rev=1.276&view=markup |
86 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/ChangeLog?rev=1.276&content-type=text/plain |
87 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/ChangeLog?r1=1.275&r2=1.276 |
88 |
|
89 |
Index: ChangeLog |
90 |
=================================================================== |
91 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v |
92 |
retrieving revision 1.275 |
93 |
retrieving revision 1.276 |
94 |
diff -u -r1.275 -r1.276 |
95 |
--- ChangeLog 23 May 2010 20:44:50 -0000 1.275 |
96 |
+++ ChangeLog 3 Jun 2010 16:57:17 -0000 1.276 |
97 |
@@ -1,6 +1,11 @@ |
98 |
# ChangeLog for net-dns/bind |
99 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
100 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.275 2010/05/23 20:44:50 idl0r Exp $ |
101 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.276 2010/06/03 16:57:17 idl0r Exp $ |
102 |
+ |
103 |
+ 03 Jun 2010; Christian Ruppert <idl0r@g.o> bind-9.6.2_p2.ebuild, |
104 |
+ bind-9.7.0_p2-r1.ebuild: |
105 |
+ Improve pkg_config, bug 321457, thanks to Duncan <1i5t5.duncan@×××.net>. |
106 |
+ Remove some old einfo's |
107 |
|
108 |
*bind-9.7.0_p2-r1 (23 May 2010) |
109 |
*bind-9.6.2_p2 (23 May 2010) |
110 |
|
111 |
|
112 |
|
113 |
1.2 net-dns/bind/bind-9.6.2_p2.ebuild |
114 |
|
115 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/bind-9.6.2_p2.ebuild?rev=1.2&view=markup |
116 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/bind-9.6.2_p2.ebuild?rev=1.2&content-type=text/plain |
117 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/bind-9.6.2_p2.ebuild?r1=1.1&r2=1.2 |
118 |
|
119 |
Index: bind-9.6.2_p2.ebuild |
120 |
=================================================================== |
121 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.2_p2.ebuild,v |
122 |
retrieving revision 1.1 |
123 |
retrieving revision 1.2 |
124 |
diff -u -r1.1 -r1.2 |
125 |
--- bind-9.6.2_p2.ebuild 23 May 2010 20:44:50 -0000 1.1 |
126 |
+++ bind-9.6.2_p2.ebuild 3 Jun 2010 16:57:18 -0000 1.2 |
127 |
@@ -1,6 +1,6 @@ |
128 |
# Copyright 1999-2010 Gentoo Foundation |
129 |
# Distributed under the terms of the GNU General Public License v2 |
130 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.2_p2.ebuild,v 1.1 2010/05/23 20:44:50 idl0r Exp $ |
131 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.2_p2.ebuild,v 1.2 2010/06/03 16:57:18 idl0r Exp $ |
132 |
|
133 |
EAPI="3" |
134 |
|
135 |
@@ -268,30 +268,21 @@ |
136 |
einfo "Before running the above command you might want to change the chroot" |
137 |
einfo "dir in /etc/conf.d/named. Otherwise /chroot/dns will be used." |
138 |
einfo |
139 |
- einfo "Recently verisign added a wildcard A record to the .COM and .NET TLD" |
140 |
- einfo "zones making all .com and .net domains appear to be registered" |
141 |
- einfo "This causes many problems such as breaking important anti-spam checks" |
142 |
- einfo "which verify source domains exist. ISC released a patch for BIND which" |
143 |
- einfo "adds 'delegation-only' zones to allow admins to return the .com and .net" |
144 |
- einfo "domain resolution to their normal function." |
145 |
- einfo |
146 |
- einfo "There is no need to create a com or net data file. Just the" |
147 |
- einfo "entries to the named.conf file is enough." |
148 |
- einfo |
149 |
- einfo " zone "com" IN { type delegation-only; };" |
150 |
- einfo " zone "net" IN { type delegation-only; };" |
151 |
|
152 |
- CHROOT=$(sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null) |
153 |
+ CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) |
154 |
if [[ -n ${CHROOT} && -d ${CHROOT} ]]; then |
155 |
ewarn "NOTE: as of 'bind-9.6.1' the chroot part of the init-script got some major changes." |
156 |
fi |
157 |
} |
158 |
|
159 |
pkg_config() { |
160 |
- CHROOT=$(sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/named 2>/dev/null) |
161 |
+ CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) |
162 |
|
163 |
- if [ -z "${CHROOT}" ]; then |
164 |
- CHROOT="/chroot/dns" |
165 |
+ if [[ -z "${CHROOT}" ]]; then |
166 |
+ eerror "This config script is designed to automate setting up" |
167 |
+ eerror "a chrooted bind/named. To do so, please first uncomment" |
168 |
+ eerror "and set the CHROOT variable in '/etc/conf.d/named'." |
169 |
+ die "Unset CHROOT" |
170 |
fi |
171 |
if [[ -d "${CHROOT}" ]]; then |
172 |
ewarn "NOTE: As of 'bind-9.6.1' the chroot part of the init-script got some major changes." |
173 |
@@ -327,9 +318,4 @@ |
174 |
|
175 |
elog "You may need to add the following line to your syslog-ng.conf:" |
176 |
elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };" |
177 |
- |
178 |
- grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$? |
179 |
- if [ $RETVAL = 0 ]; then |
180 |
- sed -i 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named 2>/dev/null |
181 |
- fi |
182 |
} |