* [gentoo-commits] gentoo-x86 commit in net-dns/bind/files: named.init-r10
@ 2011-02-27 22:27 Christian Ruppert (idl0r)
0 siblings, 0 replies; 4+ messages in thread
From: Christian Ruppert (idl0r) @ 2011-02-27 22:27 UTC (permalink / raw
To: gentoo-commits
idl0r 11/02/27 22:27:48
Modified: named.init-r10
Log:
Remove 9.7.2_p3-r1. Copy /etc/localtime in the init script instead of emerge --config. Add openssl libgost support as of 9.8.0.
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
Revision Changes Path
1.2 net-dns/bind/files/named.init-r10
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r10?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r10?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r10?r1=1.1&r2=1.2
Index: named.init-r10
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r10,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- named.init-r10 25 Feb 2011 12:42:11 -0000 1.1
+++ named.init-r10 27 Feb 2011 22:27:48 -0000 1.2
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r10,v 1.1 2011/02/25 12:42:11 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r10,v 1.2 2011/02/27 22:27:48 idl0r Exp $
opts="start stop reload restart checkconfig checkzones"
@@ -13,6 +13,8 @@
NAMED_CONF=${CHROOT}/etc/bind/named.conf
+OPENSSL_LIBGOST=0
+
_mount() {
local from
local to
@@ -63,10 +65,16 @@
[ ! -d "${CHROOT}/var/run" ] || [ ! -d "${CHROOT}/var/log" ] && return 1
[ ! -d "${CHROOT}/etc/bind" ] || [ ! -d "${CHROOT}/var/bind" ] && return 1
[ ! -d "${CHROOT}/var/log/named" ] && return 1
- [ ! -e "${CHROOT}/etc/localtime" ] && return 1
[ ! -c "${CHROOT}/dev/null" ] || [ ! -c "${CHROOT}/dev/zero" ] && return 1
[ ! -c "${CHROOT}/dev/random" ] && [ ! -c "${CHROOT}/dev/urandom" ] && return 1
[ "${CHROOT_GEOIP:-0}" -eq 1 ] && [ ! -d "${CHROOT}/usr/share/GeoIP" ] && return 1
+ if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then
+ if [ -d "/usr/lib64" ]; then
+ [ ! -d "${CHROOT}/usr/lib64/engines" ] && return 1
+ elif [ -d "/usr/lib" ]; then
+ [ ! -d "${CHROOT}/usr/lib/engines" ] && return 1
+ fi
+ fi
fi
return 0
@@ -100,12 +108,28 @@
ebegin "Starting ${CHROOT:+chrooted }named"
- if [ -n "${CHROOT}" -a "${CHROOT_NOCHECK:-0}" -eq 0 ]; then
- check_chroot || {
- eend 1
- eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
- return 1
- }
+ if [ -n "${CHROOT}" ]; then
+ if [ ${CHROOT_NOCHECK:-0} -eq 0 ]; then
+ check_chroot || {
+ eend 1
+ eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
+ return 1
+ }
+ fi
+
+ if [ ${OPENSSL_LIBGOST:-0} -eq 1 ]; then
+ if [ ! -e /usr/lib/engines/libgost.so ]; then
+ eend 1
+ eerror "Couldn't find /usr/lib/engines/libgost.so but bind has been built with openssl and libgost support"
+ return 1
+ fi
+ cp -Lp /usr/lib/engines/libgost.so "${CHROOT}/usr/lib/engines/libgost.so" || {
+ eend 1
+ eerror "Couldn't copy /usr/lib/engines/libgost.so into '${CHROOT}/usr/lib/engines/'"
+ return 1
+ }
+ fi
+ cp -Lp /etc/localtime "${CHROOT}/etc/localtime"
if [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then
einfo "Mounting chroot dirs"
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-dns/bind/files: named.init-r10
@ 2011-03-03 20:18 Christian Ruppert (idl0r)
0 siblings, 0 replies; 4+ messages in thread
From: Christian Ruppert (idl0r) @ 2011-03-03 20:18 UTC (permalink / raw
To: gentoo-commits
idl0r 11/03/03 20:18:11
Modified: named.init-r10
Log:
Check chroot on restart.
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Revision Changes Path
1.3 net-dns/bind/files/named.init-r10
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r10?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r10?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r10?r1=1.2&r2=1.3
Index: named.init-r10
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r10,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- named.init-r10 27 Feb 2011 22:27:48 -0000 1.2
+++ named.init-r10 3 Mar 2011 20:18:11 -0000 1.3
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r10,v 1.2 2011/02/27 22:27:48 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r10,v 1.3 2011/03/03 20:18:11 idl0r Exp $
opts="start stop reload restart checkconfig checkzones"
@@ -174,6 +174,14 @@
# Workaround for now, until openrc's restart has been fixed.
# openrc doesn't care about a restart() function in init scripts.
if [ "${RC_CMD}" = "restart" ]; then
+ if [ -n "${CHROOT}" -a ${CHROOT_NOCHECK:-0} -eq 0 ]; then
+ check_chroot || {
+ eend 1
+ eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
+ return 1
+ }
+ fi
+
checkconfig || { eend 1; return 1; }
fi
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-dns/bind/files: named.init-r10
@ 2011-03-10 17:06 Christian Ruppert (idl0r)
0 siblings, 0 replies; 4+ messages in thread
From: Christian Ruppert (idl0r) @ 2011-03-10 17:06 UTC (permalink / raw
To: gentoo-commits
idl0r 11/03/10 17:06:01
Modified: named.init-r10
Log:
Improve OpenSSL/libgost stuff, bug 357569, thanks to Duncan <1i5t5.duncan@cox.net>.
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Revision Changes Path
1.4 net-dns/bind/files/named.init-r10
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r10?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r10?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r10?r1=1.3&r2=1.4
Index: named.init-r10
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r10,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- named.init-r10 3 Mar 2011 20:18:11 -0000 1.3
+++ named.init-r10 10 Mar 2011 17:06:01 -0000 1.4
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r10,v 1.3 2011/03/03 20:18:11 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r10,v 1.4 2011/03/10 17:06:01 idl0r Exp $
opts="start stop reload restart checkconfig checkzones"
@@ -13,7 +13,7 @@
NAMED_CONF=${CHROOT}/etc/bind/named.conf
-OPENSSL_LIBGOST=0
+OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}
_mount() {
local from
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-dns/bind/files: named.init-r10
@ 2011-12-24 22:45 Christian Ruppert (idl0r)
0 siblings, 0 replies; 4+ messages in thread
From: Christian Ruppert (idl0r) @ 2011-12-24 22:45 UTC (permalink / raw
To: gentoo-commits
idl0r 11/12/24 22:45:39
Removed: named.init-r10
Log:
Cleanup.
(Portage version: 2.1.10.41/cvs/Linux i686)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-12-24 22:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-24 22:45 [gentoo-commits] gentoo-x86 commit in net-dns/bind/files: named.init-r10 Christian Ruppert (idl0r)
-- strict thread matches above, loose matches on Subject: below --
2011-03-10 17:06 Christian Ruppert (idl0r)
2011-03-03 20:18 Christian Ruppert (idl0r)
2011-02-27 22:27 Christian Ruppert (idl0r)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox