Fri Dec 12 07:44:08 2014 UTC ()
Use SSLBASE for openssl engines.


(obache)
diff -r1.39 -r1.40 pkgsrc/net/bind98/Makefile
diff -r1.2 -r1.3 pkgsrc/net/bind98/files/named9.sh
cvs diff -r1.39 -r1.40 pkgsrc/net/bind98/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/bind98/Attic/Makefile 2014/06/14 10:14:06 1.39
+++ pkgsrc/net/bind98/Attic/Makefile 2014/12/12 07:44:08 1.40
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.39 2014/06/14 10:14:06 wiedi Exp $ 1# $NetBSD: Makefile,v 1.40 2014/12/12 07:44:08 obache Exp $
2 2
3DISTNAME= bind-${BIND_VERSION} 3DISTNAME= bind-${BIND_VERSION}
4PKGNAME= ${DISTNAME:S/-P/pl/} 4PKGNAME= ${DISTNAME:S/-P/pl/}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \ 7MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
8 http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/ 8 http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.isc.org/software/bind/ 11HOMEPAGE= http://www.isc.org/software/bind/
12COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.8 12COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.8
13 13
14CONFLICTS+= host-[0-9]* 14CONFLICTS+= host-[0-9]*
@@ -46,27 +46,28 @@ CONFIGURE_ARGS+= --disable-kqueue @@ -46,27 +46,28 @@ CONFIGURE_ARGS+= --disable-kqueue
46PKG_GROUPS_VARS+= BIND_GROUP 46PKG_GROUPS_VARS+= BIND_GROUP
47PKG_USERS_VARS+= BIND_USER 47PKG_USERS_VARS+= BIND_USER
48 48
49PKG_GROUPS= ${BIND_GROUP} 49PKG_GROUPS= ${BIND_GROUP}
50PKG_USERS= ${BIND_USER}:${BIND_GROUP} 50PKG_USERS= ${BIND_USER}:${BIND_GROUP}
51 51
52PKG_GECOS.${BIND_USER}= Named pseudo-user 52PKG_GECOS.${BIND_USER}= Named pseudo-user
53PKG_HOME.${BIND_USER}= ${BIND_DIR} 53PKG_HOME.${BIND_USER}= ${BIND_DIR}
54 54
55PTHREAD_OPTS+= native 55PTHREAD_OPTS+= native
56PTHREAD_AUTO_VARS= yes 56PTHREAD_AUTO_VARS= yes
57 57
58FILES_SUBST+= BIND_GROUP=${BIND_GROUP:Q} \ 58FILES_SUBST+= BIND_GROUP=${BIND_GROUP:Q} \
59 BIND_USER=${BIND_USER:Q} PAX=${PAX:Q} 59 BIND_USER=${BIND_USER:Q} PAX=${PAX:Q} \
 60 SSLBASE=${SSLBASE:Q}
60MESSAGE_SUBST+= BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER} 61MESSAGE_SUBST+= BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER}
61DOCDIR= ${DESTDIR}${PREFIX}/share/doc/bind9 62DOCDIR= ${DESTDIR}${PREFIX}/share/doc/bind9
62MISCDOC= dnssec ipv6 migration migration-4to9 options \ 63MISCDOC= dnssec ipv6 migration migration-4to9 options \
63 rfc-compliance roadmap sdb 64 rfc-compliance roadmap sdb
64 65
65# include/isc/ipv6.h is installed on non-ipv6 platforms 66# include/isc/ipv6.h is installed on non-ipv6 platforms
66PLIST_VARS+= inet6 67PLIST_VARS+= inet6
67.if !empty(MISSING_FEATURES:Minet6) 68.if !empty(MISSING_FEATURES:Minet6)
68PLIST.inet6= yes 69PLIST.inet6= yes
69.endif 70.endif
70 71
71RCD_SCRIPTS= lwresd named9 72RCD_SCRIPTS= lwresd named9
72SMF_METHODS= named 73SMF_METHODS= named
cvs diff -r1.2 -r1.3 pkgsrc/net/bind98/files/Attic/named9.sh (expand / switch to unified diff)

--- pkgsrc/net/bind98/files/Attic/named9.sh 2012/05/20 09:10:44 1.2
+++ pkgsrc/net/bind98/files/Attic/named9.sh 2014/12/12 07:44:08 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: named9.sh,v 1.2 2012/05/20 09:10:44 marino Exp $ 3# $NetBSD: named9.sh,v 1.3 2014/12/12 07:44:08 obache Exp $
4# 4#
5 5
6# PROVIDE: named 6# PROVIDE: named
7# REQUIRE: NETWORKING mountcritremote syslogd 7# REQUIRE: NETWORKING mountcritremote syslogd
8# BEFORE: DAEMON 8# BEFORE: DAEMON
9# KEYWORD: chrootdir 9# KEYWORD: chrootdir
10 10
11. /etc/rc.subr 11. /etc/rc.subr
12 12
13name="named" 13name="named"
14rcvar="${name}9" 14rcvar="${name}9"
15command="@PREFIX@/sbin/${name}" 15command="@PREFIX@/sbin/${name}"
16pidfile="@VARBASE@/run/named/${name}.pid" 16pidfile="@VARBASE@/run/named/${name}.pid"
@@ -39,32 +39,32 @@ named_precmd() @@ -39,32 +39,32 @@ named_precmd()
39 do 39 do
40 if [ ! -c "${named_chrootdir}/dev/$i" ]; then 40 if [ ! -c "${named_chrootdir}/dev/$i" ]; then
41 @RM@ -f "${named_chrootdir}/dev/$i" 41 @RM@ -f "${named_chrootdir}/dev/$i"
42 (cd /dev && 42 (cd /dev &&
43 @PAX@ -rw -pe "$i" "${named_chrootdir}/dev") 43 @PAX@ -rw -pe "$i" "${named_chrootdir}/dev")
44 fi 44 fi
45 done 45 done
46 46
47 if [ -f /etc/localtime ]; then 47 if [ -f /etc/localtime ]; then
48 @CMP@ -s /etc/localtime "${named_chrootdir}/etc/localtime" || \ 48 @CMP@ -s /etc/localtime "${named_chrootdir}/etc/localtime" || \
49 @CP@ -p /etc/localtime "${named_chrootdir}/etc/localtime" 49 @CP@ -p /etc/localtime "${named_chrootdir}/etc/localtime"
50 fi 50 fi
51 51
52 if [ -f /usr/lib/engines/libgost.so ]; then 52 if [ -f @SSLBASE@/lib/engines/libgost.so ]; then
53 if [ ! -d ${named_chrootdir}/usr/lib/engines ]; then 53 if [ ! -d ${named_chrootdir}@SSLBASE@/lib/engines ]; then
54 @MKDIR@ ${named_chrootdir}/usr/lib/engines 54 @MKDIR@ ${named_chrootdir}@SSLBASE@/lib/engines
55 fi 55 fi
56 @CMP@ -s /usr/lib/engines/libgost.so "${named_chrootdir}/usr/lib/engines/libgost.so" || \ 56 @CMP@ -s @SSLBASE@/lib/engines/libgost.so "${named_chrootdir}@SSLBASE@/lib/engines/libgost.so" || \
57 @CP@ -p /usr/lib/engines/libgost.so "${named_chrootdir}/usr/lib/engines/libgost.so" 57 @CP@ -p /usr/lib/engines/libgost.so "${named_chrootdir}@SSLBASE@/lib/engines/libgost.so"
58 fi 58 fi
59 59
60 if [ ! -d ${named_chrootdir}@VARBASE@/run/named ]; then  60 if [ ! -d ${named_chrootdir}@VARBASE@/run/named ]; then
61 @MKDIR@ ${named_chrootdir}@VARBASE@/run/named  61 @MKDIR@ ${named_chrootdir}@VARBASE@/run/named
62 @CHOWN@ @BIND_USER@ ${named_chrootdir}@VARBASE@/run/named 62 @CHOWN@ @BIND_USER@ ${named_chrootdir}@VARBASE@/run/named
63 fi  63 fi
64 64
65 @RM@ -f ${pidfile} 65 @RM@ -f ${pidfile}
66 @LN@ -s "${named_chrootdir}${pidfile}" ${pidfile} 66 @LN@ -s "${named_chrootdir}${pidfile}" ${pidfile}
67 67
68 # Change run_rc_commands()'s internal copy of $named_flags 68 # Change run_rc_commands()'s internal copy of $named_flags
69 # 69 #
70 rc_flags="-u @BIND_USER@ -t ${named_chrootdir} $rc_flags" 70 rc_flags="-u @BIND_USER@ -t ${named_chrootdir} $rc_flags"