diff --git a/net/bind8/Makefile b/net/bind8/Makefile index a0a435b47be..e29db0d237a 100644 --- a/net/bind8/Makefile +++ b/net/bind8/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.5 1999/10/06 18:54:48 jakob Exp $ +# $OpenBSD: Makefile,v 1.6 1999/10/29 12:54:22 ho Exp $ -DISTNAME= bind-19991004-snapshot -PKGNAME= bind-8.2.2-t4b +DISTNAME= bind-19991020-snapshot +PKGNAME= bind-8.2.2 CATEGORIES= net MASTER_SITES= ftp://ftp.gsnig.net/pub/openbsd-bind/ \ ftp://ftp.sekure.net/pub/gsnig/openbsd-bind/ @@ -15,15 +15,15 @@ NO_CONFIGURE= yes NO_CDROM= "CRYPTO: Unclear status of crypto components." RESTRICTED= "Unclear status of crypto components." +SAMPLEDIR= /usr/local/share/examples/bind8 + pre-install pre-package: @${SH} ${PKGDIR}/INSTALL ${DISTNAME} PRE-INSTALL - @cp ${WRKSRC}/etc/namedb/named.* /var/named/inst-sample post-install: - @${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL - -post-package: - @rm -rf /var/named/inst-sample + mkdir -p ${SAMPLEDIR} + cp ${WRKSRC}/etc/namedb/named.* ${SAMPLEDIR} + @${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL ${SAMPLEDIR} .include diff --git a/net/bind8/files/md5 b/net/bind8/files/md5 index 5a9f8272005..84e2855beeb 100644 --- a/net/bind8/files/md5 +++ b/net/bind8/files/md5 @@ -1,3 +1,3 @@ -SHA1 (bind-19991004-snapshot.tar.gz) = ef27fef594087f38a008a758a9324f2b5d6b9811 -RMD160 (bind-19991004-snapshot.tar.gz) = c2c12a1d460366d204a88d84300462df62b0b791 -MD5 (bind-19991004-snapshot.tar.gz) = ba71e57618b3a294d5bf872ef738a3dd +SHA1 (bind-19991020-snapshot.tar.gz) = 7c367c537f61994167d4871079469991069c6cc6 +RMD160 (bind-19991020-snapshot.tar.gz) = b4612f1b5a42c261740084c7b2d94f60355af95d +MD5 (bind-19991020-snapshot.tar.gz) = 29f050408b80e7579466349c66db5ef3 diff --git a/net/bind8/pkg/INSTALL b/net/bind8/pkg/INSTALL index 561e5127df9..6789da40932 100644 --- a/net/bind8/pkg/INSTALL +++ b/net/bind8/pkg/INSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: INSTALL,v 1.1 1999/09/23 11:32:45 ho Exp $ +# $OpenBSD: INSTALL,v 1.2 1999/10/29 12:54:23 ho Exp $ # # Pre/post-installation setup of named @@ -8,12 +8,13 @@ set -e PATH=/bin:/usr/bin:/sbin:/usr/sbin PREFIX=${PKG_PREFIX:-/} NROOT=/var/named -SAMPLEDIR=${NROOT}/inst-sample -if [ $# -ne 2 ]; then - echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 - exit 1 -fi +SAMPLEDIR=${3:-/usr/local/share/examples/bind8} + +print_usage() +{ + echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL}" >&2 +} pre_fix_dir() { @@ -31,21 +32,10 @@ pre_fix_dir() fi } -post_copy_move() -{ - if [ -f ${SAMPLEDIR}/$1 ]; then - if [ -f ${NROOT}/${2} ]; then - echo "Keeping old ${NROOT}/${2} as ${NROOT}/${2}.pre-bind8" >&2 - rm -f ${NROOT}/${2}.pre-bind8 - mv -f ${NROOT}/${2} ${NROOT}/${2}.pre-bind8 - fi - - echo "Installing sample ${NROOT}/${2}" >&2 - cp ${SAMPLEDIR}/${1} ${NROOT}/${2} - chown ${3} ${NROOT}/${2} - chmod ${4} ${NROOT}/${2} - fi -} +if [ $# -ne 2 -a $# -ne 3 ]; then + print_usage + exit 1 +fi # Verify/process the command # @@ -63,23 +53,6 @@ case $2 in pre_fix_dir ${SAMPLEDIR} ;; POST-INSTALL) - if [ ! -d ${SAMPLEDIR} ]; then - # Oops. - echo "No sample configuration files found to install !" >&2 - exit 0 - fi - - echo "" >&2 - echo "Installing BIND 8 sample configuration files" >&2 - echo "" >&2 - - post_copy_move named.conf named.conf root:named 0640 - post_copy_move named.root named.root root:wheel 0644 - post_copy_move named.loopback named.loopback root:wheel 0644 - post_copy_move named.localhost named.localhost root:wheel 0644 - - rm -rf ${SAMPLEDIR} - echo "" >&2 echo "Check your /etc/rc.conf file for the 'named' options." >&2 echo "Recommended (and also OpenBSD default) values are:" >&2 @@ -87,11 +60,23 @@ case $2 in echo " named_user=named" >&2 echo " named_chroot=${NROOT}" >&2 echo "" >&2 - echo "Check/modify ${NROOT}/named.conf to suit your site." >&2 + + if [ ! -d ${SAMPLEDIR} ]; then + # Oops. + exit 0 + fi + echo "Sample configuration files have been installed to directory" >&2 + echo " ${SAMPLEDIR}" >&2 + echo "" >&2 + echo "Proper modes for the sample files are [{owner,group,mode}]" >&2 + echo " {root,named,640} for named.conf" >&2 + echo " {root,wheel,644} for the rest" >&2 + echo "" >&2 + echo "Check/modify named.conf to suit your site." >&2 echo "" >&2 ;; *) - echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 + print_usage exit 1 ;; esac diff --git a/net/bind8/pkg/PLIST b/net/bind8/pkg/PLIST index fe3b49ee559..23c05b7ec5c 100644 --- a/net/bind8/pkg/PLIST +++ b/net/bind8/pkg/PLIST @@ -39,11 +39,10 @@ usr/share/doc/html/named/options.html usr/share/doc/html/named/server.html usr/share/doc/html/named/trusted-keys.html usr/share/doc/html/named/zone.html -@unexec mkdir /var/named/inst-sample -@unexec touch /var/named/inst-sample/named.conf /var/named/inst-sample/named.root /var/named/inst-sample/named.localhost /var/named/inst-sample/named.loopback -var/named/inst-sample/named.conf -var/named/inst-sample/named.root -var/named/inst-sample/named.localhost -var/named/inst-sample/named.loopback +usr/local/share/examples/bind8/named.conf +usr/local/share/examples/bind8/named.root +usr/local/share/examples/bind8/named.localhost +usr/local/share/examples/bind8/named.loopback +@dirrm /usr/local/share/examples/bind8 @dirrm /usr/libexec/named @dirrm /usr/share/doc/html/named diff --git a/net/bind8/pkg/SECURITY b/net/bind8/pkg/SECURITY index 67e45160d51..fc918a6d3ee 100644 --- a/net/bind8/pkg/SECURITY +++ b/net/bind8/pkg/SECURITY @@ -1,9 +1,9 @@ -$OpenBSD: SECURITY,v 1.1 1999/09/26 22:40:59 ho Exp $ +$OpenBSD: SECURITY,v 1.2 1999/10/29 12:54:23 ho Exp $ Quick notes on security issues using BIND 8 ------------------------------------------- -The base version of BIND from ISC is 8.2.2-T3B, RC0, which is belived +The base version of BIND from ISC is 8.2.2, RELEASE, which is belived to be fairly secure (i.e no obvious or (to the author) known bugs). It is, however, a large and complex piece of software, so there are bound to be bugs found in the future... @@ -46,6 +46,6 @@ There are also some functionality/bugfix patches (from the indicated sources). ** support multiple CNAMEs [ISC] -September 26, 1999 +October 29, 1999 Håkan Olsson Jakob Schlyter