Module Name: src
Committed By: riz
Date: Sat May 19 15:23:44 UTC 2012
Modified Files:
src/distrib/sets/lists/base [netbsd-6]: mi
src/distrib/sets/lists/comp [netbsd-6]: mi
src/distrib/sets/lists/man [netbsd-6]: mi
src/external/bsd/bind [netbsd-6]: Makefile.inc
src/external/bsd/bind/bin [netbsd-6]: Makefile Makefile.inc
Added Files:
src/external/bsd/bind/bin/confgen [netbsd-6]: Makefile Makefile.inc
src/external/bsd/bind/bin/confgen/ddns-confgen [netbsd-6]: Makefile
src/external/bsd/bind/bin/confgen/rndc-confgen [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by christos in ticket #264):
distrib/sets/lists/comp/mi: revision 1.1757
external/bsd/bind/bin/Makefile: revision 1.4
external/bsd/bind/Makefile.inc: revision 1.13
external/bsd/bind/bin/Makefile.inc: revision 1.2
distrib/sets/lists/base/mi: revision 1.991
external/bsd/bind/bin/confgen/Makefile.inc: revision 1.1
external/bsd/bind/bin/confgen/Makefile: revision 1.1
external/bsd/bind/bin/confgen/ddns-confgen/Makefile: revision 1.1
distrib/sets/lists/man/mi: revision 1.1389
external/bsd/bind/bin/confgen/rndc-confgen/Makefile: revision 1.1
add confgen programs
add {rndc,ddns}-confgen
To generate a diff of this commit:
cvs rdiff -u -r1.984.2.2 -r1.984.2.3 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1738.2.2 -r1.1738.2.3 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1379.2.3 -r1.1379.2.4 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.12 -r1.12.4.1 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.3 -r1.3.4.1 src/external/bsd/bind/bin/Makefile
cvs rdiff -u -r1.1 -r1.1.10.1 src/external/bsd/bind/bin/Makefile.inc
cvs rdiff -u -r0 -r1.1.2.2 src/external/bsd/bind/bin/confgen/Makefile \
src/external/bsd/bind/bin/confgen/Makefile.inc
cvs rdiff -u -r0 -r1.1.2.2 \
src/external/bsd/bind/bin/confgen/ddns-confgen/Makefile
cvs rdiff -u -r0 -r1.1.2.2 \
src/external/bsd/bind/bin/confgen/rndc-confgen/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.984.2.2 src/distrib/sets/lists/base/mi:1.984.2.3
--- src/distrib/sets/lists/base/mi:1.984.2.2 Fri Mar 2 18:27:49 2012
+++ src/distrib/sets/lists/base/mi Sat May 19 15:23:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.984.2.2 2012/03/02 18:27:49 riz Exp $
+# $NetBSD: mi,v 1.984.2.3 2012/05/19 15:23:41 riz Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1185,6 +1185,7 @@
./usr/sbin/cron base-cron-bin
./usr/sbin/daicctl base-isdn-bin
./usr/sbin/dbsym base-sysutil-bin binutils
+./usr/sbin/ddns-confgen base-bind-bin
./usr/sbin/dev_mkdb base-sysutil-bin
./usr/sbin/dhcpd base-dhcpd-bin
./usr/sbin/dhcrelay base-dhcpd-bin
@@ -1406,7 +1407,7 @@
./usr/sbin/rip6query base-netutil-bin inet6
./usr/sbin/rmt base-sysutil-bin
./usr/sbin/rndc base-bind-bin
-./usr/sbin/rndc-confgen base-obsolete obsolete
+./usr/sbin/rndc-confgen base-bind-bin
./usr/sbin/route6d base-router-bin use_inet6
./usr/sbin/rpc.bootparamd base-bootserver-bin
./usr/sbin/rpc.lockd base-nfsserver-bin
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1738.2.2 src/distrib/sets/lists/comp/mi:1.1738.2.3
--- src/distrib/sets/lists/comp/mi:1.1738.2.2 Wed May 9 18:22:32 2012
+++ src/distrib/sets/lists/comp/mi Sat May 19 15:23:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1738.2.2 2012/05/09 18:22:32 riz Exp $
+# $NetBSD: mi,v 1.1738.2.3 2012/05/19 15:23:39 riz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4077,6 +4077,7 @@
./usr/libdata/debug/usr/sbin/cron.debug comp-cron-debug debug
./usr/libdata/debug/usr/sbin/daicctl.debug comp-isdn-debug debug
./usr/libdata/debug/usr/sbin/dbsym.debug comp-sysutil-debug binutils,debug
+./usr/libdata/debug/usr/sbin/ddns-confgen.debug comp-bind-bin debug
./usr/libdata/debug/usr/sbin/dev_mkdb.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/dhcpd.debug comp-dhcpd-debug debug
./usr/libdata/debug/usr/sbin/dhcrelay.debug comp-dhcpd-debug debug
@@ -4246,7 +4247,7 @@
./usr/libdata/debug/usr/sbin/revnetgroup.debug comp-nis-debug yp,debug
./usr/libdata/debug/usr/sbin/rip6query.debug comp-netutil-debug inet6,debug
./usr/libdata/debug/usr/sbin/rmt.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/rndc-confgen.debug comp-obsolete obsolete
+./usr/libdata/debug/usr/sbin/rndc-confgen.debug comp-bind-bin debug
./usr/libdata/debug/usr/sbin/rndc.debug comp-bind-bin debug
./usr/libdata/debug/usr/sbin/route6d.debug comp-router-debug use_inet6,debug
./usr/libdata/debug/usr/sbin/rpc.bootparamd.debug comp-bootserver-debug debug
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1379.2.3 src/distrib/sets/lists/man/mi:1.1379.2.4
--- src/distrib/sets/lists/man/mi:1.1379.2.3 Mon Apr 23 16:31:36 2012
+++ src/distrib/sets/lists/man/mi Sat May 19 15:23:43 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1379.2.3 2012/04/23 16:31:36 riz Exp $
+# $NetBSD: mi,v 1.1379.2.4 2012/05/19 15:23:43 riz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2236,6 +2236,7 @@
./usr/share/man/cat8/crash.0 man-sysutil-catman .cat
./usr/share/man/cat8/cron.0 man-cron-catman .cat
./usr/share/man/cat8/dbsym.0 man-sysutil-catman binutils,.cat
+./usr/share/man/cat8/ddns-confgen.0 man-bind-catman .cat
./usr/share/man/cat8/defer.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/dev_mkdb.0 man-sysutil-catman .cat
./usr/share/man/cat8/devpubd.0 man-sysutil-catman .cat
@@ -2738,7 +2739,7 @@
./usr/share/man/cat8/rlogind.0 man-netutil-catman .cat
./usr/share/man/cat8/rmail.0 man-obsolete obsolete
./usr/share/man/cat8/rmt.0 man-sysutil-catman .cat
-./usr/share/man/cat8/rndc-confgen.0 man-obsolete obsolete
+./usr/share/man/cat8/rndc-confgen.0 man-bind-catman .cat
./usr/share/man/cat8/rndc.0 man-bind-catman .cat
./usr/share/man/cat8/rndctl.0 man-sysutil-catman .cat
./usr/share/man/cat8/route.0 man-netutil-catman .cat
@@ -4964,6 +4965,7 @@
./usr/share/man/html8/crash.html man-sysutil-htmlman html
./usr/share/man/html8/cron.html man-cron-htmlman html
./usr/share/man/html8/dbsym.html man-sysutil-htmlman binutils,html
+./usr/share/man/html8/ddns-confgen.html man-bind-htmlman html
./usr/share/man/html8/defer.html man-postfix-htmlman postfix,html
./usr/share/man/html8/dev_mkdb.html man-sysutil-htmlman html
./usr/share/man/html8/devpubd.html man-sysutil-htmlman html
@@ -5354,7 +5356,7 @@
./usr/share/man/html8/rip6query.html man-netutil-htmlman inet6,html
./usr/share/man/html8/rlogind.html man-netutil-htmlman html
./usr/share/man/html8/rmt.html man-sysutil-htmlman html
-./usr/share/man/html8/rndc-confgen.html man-obsolete obsolete
+./usr/share/man/html8/rndc-confgen.html man-bind-htmlman html
./usr/share/man/html8/rndc.html man-bind-htmlman html
./usr/share/man/html8/rndctl.html man-sysutil-htmlman html
./usr/share/man/html8/route.html man-netutil-htmlman html
@@ -7748,6 +7750,7 @@
./usr/share/man/man8/crash.8 man-crash-man .man
./usr/share/man/man8/cron.8 man-cron-man .man
./usr/share/man/man8/dbsym.8 man-sysutil-man binutils,.man
+./usr/share/man/man8/ddns-confgen.8 man-bind-man .man
./usr/share/man/man8/defer.8 man-postfix-man postfix,.man
./usr/share/man/man8/dev_mkdb.8 man-sysutil-man .man
./usr/share/man/man8/devpubd.8 man-sysutil-man .man
@@ -8251,7 +8254,7 @@
./usr/share/man/man8/rlogind.8 man-netutil-man .man
./usr/share/man/man8/rmail.8 man-obsolete obsolete
./usr/share/man/man8/rmt.8 man-sysutil-man .man
-./usr/share/man/man8/rndc-confgen.8 man-obsolete obsolete
+./usr/share/man/man8/rndc-confgen.8 man-bind-man .man
./usr/share/man/man8/rndc.8 man-bind-man .man
./usr/share/man/man8/rndctl.8 man-sysutil-man .man
./usr/share/man/man8/route.8 man-netutil-man .man
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.12 src/external/bsd/bind/Makefile.inc:1.12.4.1
--- src/external/bsd/bind/Makefile.inc:1.12 Mon Jun 20 07:43:57 2011
+++ src/external/bsd/bind/Makefile.inc Sat May 19 15:23:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2011/06/20 07:43:57 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.12.4.1 2012/05/19 15:23:41 riz Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -108,7 +108,7 @@ CPPFLAGS+=-DISC_PLATFORM_USETHREADS -I${
CPPFLAGS+=-I${IDIST}/lib/isc/nothreads/include
.endif
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
+.if exists(${.PARSEDIR}/../Makefile.inc)
+.include "${.PARSEDIR}/../Makefile.inc"
.endif
.endif
Index: src/external/bsd/bind/bin/Makefile
diff -u src/external/bsd/bind/bin/Makefile:1.3 src/external/bsd/bind/bin/Makefile:1.3.4.1
--- src/external/bsd/bind/bin/Makefile:1.3 Sun Sep 11 18:55:24 2011
+++ src/external/bsd/bind/bin/Makefile Sat May 19 15:23:41 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2011/09/11 18:55:24 christos Exp $
+# $NetBSD: Makefile,v 1.3.4.1 2012/05/19 15:23:41 riz Exp $
-SUBDIR= html dig host named nslookup nsupdate rndc dnssec check tools
+SUBDIR= html dig host named nslookup nsupdate rndc dnssec check tools confgen
.include "Makefile.inc"
Index: src/external/bsd/bind/bin/Makefile.inc
diff -u src/external/bsd/bind/bin/Makefile.inc:1.1 src/external/bsd/bind/bin/Makefile.inc:1.1.10.1
--- src/external/bsd/bind/bin/Makefile.inc:1.1 Sun Apr 12 03:46:04 2009
+++ src/external/bsd/bind/bin/Makefile.inc Sat May 19 15:23:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/04/12 03:46:04 christos Exp $
+# $NetBSD: Makefile.inc,v 1.1.10.1 2012/05/19 15:23:41 riz Exp $
-.include "../Makefile.inc"
+.include "${.PARSEDIR}/../Makefile.inc"
WARNS?= 2
Added files:
Index: src/external/bsd/bind/bin/confgen/Makefile
diff -u /dev/null src/external/bsd/bind/bin/confgen/Makefile:1.1.2.2
--- /dev/null Sat May 19 15:23:45 2012
+++ src/external/bsd/bind/bin/confgen/Makefile Sat May 19 15:23:43 2012
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1.2.2 2012/05/19 15:23:43 riz Exp $
+
+SUBDIR= rndc-confgen ddns-confgen
+
+.include <bsd.subdir.mk>
Index: src/external/bsd/bind/bin/confgen/Makefile.inc
diff -u /dev/null src/external/bsd/bind/bin/confgen/Makefile.inc:1.1.2.2
--- /dev/null Sat May 19 15:23:45 2012
+++ src/external/bsd/bind/bin/confgen/Makefile.inc Sat May 19 15:23:42 2012
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile.inc,v 1.1.2.2 2012/05/19 15:23:42 riz Exp $
+
+PROG= ${.CURDIR:T}
+SRCS= ${PROG}.c keygen.c util.c os.c
+MAN= ${PROG}.8
+BINDIR= /usr/sbin
+
+.include "${.PARSEDIR}/../Makefile.inc"
+
+DIST=${IDIST}/bin/confgen
+
+CPPFLAGS+= -I${DIST}/include \
+ -DRNDC_CONFFILE=\"${SYSCONFDIR}/rndc.conf\" \
+ -DRNDC_KEYFILE=\"${SYSCONFDIR}/rndc.key\" \
+
+
+.PATH: ${DIST} ${DIST}/unix
Index: src/external/bsd/bind/bin/confgen/ddns-confgen/Makefile
diff -u /dev/null src/external/bsd/bind/bin/confgen/ddns-confgen/Makefile:1.1.2.2
--- /dev/null Sat May 19 15:23:45 2012
+++ src/external/bsd/bind/bin/confgen/ddns-confgen/Makefile Sat May 19 15:23:43 2012
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1.2.2 2012/05/19 15:23:43 riz Exp $
+
+.include "${.PARSEDIR}/../Makefile.inc"
+
+.include <bsd.prog.mk>
Index: src/external/bsd/bind/bin/confgen/rndc-confgen/Makefile
diff -u /dev/null src/external/bsd/bind/bin/confgen/rndc-confgen/Makefile:1.1.2.2
--- /dev/null Sat May 19 15:23:45 2012
+++ src/external/bsd/bind/bin/confgen/rndc-confgen/Makefile Sat May 19 15:23:44 2012
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1.2.2 2012/05/19 15:23:44 riz Exp $
+
+.include "${.PARSEDIR}/../Makefile.inc"
+
+.include <bsd.prog.mk>
