CVS commit: src/usr.sbin/dhcp
Module Name:src Committed By: christos Date: Thu Jun 20 18:41:27 UTC 2013 Removed Files: src/usr.sbin/dhcp: Makefile Makefile.inc src/usr.sbin/dhcp/client: Makefile src/usr.sbin/dhcp/clientscript: Makefile dhclient-script src/usr.sbin/dhcp/common: Makefile src/usr.sbin/dhcp/dhcpctl: Makefile src/usr.sbin/dhcp/dst: Makefile src/usr.sbin/dhcp/minires: Makefile src/usr.sbin/dhcp/omapip: Makefile src/usr.sbin/dhcp/omshell: Makefile src/usr.sbin/dhcp/relay: Makefile src/usr.sbin/dhcp/server: Makefile src/usr.sbin/dhcp/share: Makefile src/usr.sbin/dhcp/share/dhcpd: Makefile pxe.defs Log Message: bye build glue To generate a diff of this commit: cvs rdiff -u -r1.13 -r0 src/usr.sbin/dhcp/Makefile cvs rdiff -u -r1.27 -r0 src/usr.sbin/dhcp/Makefile.inc cvs rdiff -u -r1.15 -r0 src/usr.sbin/dhcp/client/Makefile cvs rdiff -u -r1.4 -r0 src/usr.sbin/dhcp/clientscript/Makefile cvs rdiff -u -r1.13 -r0 src/usr.sbin/dhcp/clientscript/dhclient-script cvs rdiff -u -r1.27 -r0 src/usr.sbin/dhcp/common/Makefile cvs rdiff -u -r1.6 -r0 src/usr.sbin/dhcp/dhcpctl/Makefile cvs rdiff -u -r1.8 -r0 src/usr.sbin/dhcp/dst/Makefile cvs rdiff -u -r1.9 -r0 src/usr.sbin/dhcp/minires/Makefile cvs rdiff -u -r1.9 -r0 src/usr.sbin/dhcp/omapip/Makefile cvs rdiff -u -r1.4 -r0 src/usr.sbin/dhcp/omshell/Makefile cvs rdiff -u -r1.3 -r0 src/usr.sbin/dhcp/relay/Makefile cvs rdiff -u -r1.18 -r0 src/usr.sbin/dhcp/server/Makefile cvs rdiff -u -r1.1 -r0 src/usr.sbin/dhcp/share/Makefile cvs rdiff -u -r1.2 -r0 src/usr.sbin/dhcp/share/dhcpd/Makefile \ src/usr.sbin/dhcp/share/dhcpd/pxe.defs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/dhcp/server
Module Name:src Committed By: plunky Date: Tue Sep 13 14:00:08 UTC 2011 Modified Files: src/usr.sbin/dhcp/server: Makefile Log Message: this HAVE_PCC is not (any longer) required To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/dhcp/server/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/dhcp/server/Makefile diff -u src/usr.sbin/dhcp/server/Makefile:1.17 src/usr.sbin/dhcp/server/Makefile:1.18 --- src/usr.sbin/dhcp/server/Makefile:1.17 Tue Aug 16 16:37:07 2011 +++ src/usr.sbin/dhcp/server/Makefile Tue Sep 13 14:00:08 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2011/08/16 16:37:07 christos Exp $ +# $NetBSD: Makefile,v 1.18 2011/09/13 14:00:08 plunky Exp $ .include bsd.own.mk @@ -15,8 +15,4 @@ FILES= dhcpd.conf .endif -.if defined(HAVE_PCC) -COPTS += -Wno-unreachable-code -.endif - .include bsd.prog.mk
CVS commit: src/usr.sbin/dhcp
Module Name:src
Committed By: christos
Date: Tue Aug 16 16:37:07 UTC 2011
Modified Files:
src/usr.sbin/dhcp/common: Makefile
src/usr.sbin/dhcp/omshell: Makefile
src/usr.sbin/dhcp/server: Makefile
Log Message:
remove gcc-4.5 hacks
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/dhcp/common/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/dhcp/omshell/Makefile
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/dhcp/server/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/dhcp/common/Makefile
diff -u src/usr.sbin/dhcp/common/Makefile:1.26 src/usr.sbin/dhcp/common/Makefile:1.27
--- src/usr.sbin/dhcp/common/Makefile:1.26 Wed Jun 29 02:34:31 2011
+++ src/usr.sbin/dhcp/common/Makefile Tue Aug 16 12:37:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2011/06/29 06:34:31 mrg Exp $
+# $NetBSD: Makefile,v 1.27 2011/08/16 16:37:07 christos Exp $
LIBISPRIVATE= yes
@@ -12,7 +12,3 @@
DHCPSRCDIR= common
.include bsd.lib.mk
-
-.if defined(HAVE_GCC) ${HAVE_GCC} = 45
-CPPFLAGS.dns.c+= -Wno-enum-compare
-.endif
Index: src/usr.sbin/dhcp/omshell/Makefile
diff -u src/usr.sbin/dhcp/omshell/Makefile:1.3 src/usr.sbin/dhcp/omshell/Makefile:1.4
--- src/usr.sbin/dhcp/omshell/Makefile:1.3 Tue Jun 21 22:49:45 2011
+++ src/usr.sbin/dhcp/omshell/Makefile Tue Aug 16 12:37:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/06/22 02:49:45 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/16 16:37:07 christos Exp $
.include bsd.own.mk
@@ -14,8 +14,3 @@
DPADD+= ${CTLOBJDIR}/libdhcpctl.a
.include bsd.prog.mk
-
-# XXX
-.if ${HAVE_GCC} == 45
-COPTS.omshell.c+= -Wno-error
-.endif
Index: src/usr.sbin/dhcp/server/Makefile
diff -u src/usr.sbin/dhcp/server/Makefile:1.16 src/usr.sbin/dhcp/server/Makefile:1.17
--- src/usr.sbin/dhcp/server/Makefile:1.16 Wed Jun 29 02:34:31 2011
+++ src/usr.sbin/dhcp/server/Makefile Tue Aug 16 12:37:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2011/06/29 06:34:31 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2011/08/16 16:37:07 christos Exp $
.include bsd.own.mk
@@ -20,7 +20,3 @@
.endif
.include bsd.prog.mk
-
-.if defined(HAVE_GCC) ${HAVE_GCC} = 45
-CPPFLAGS.ddns.c+= -Wno-enum-compare
-.endif
CVS commit: src/usr.sbin/dhcp/common
Module Name:src Committed By: mrg Date: Wed Jun 29 06:32:32 UTC 2011 Modified Files: src/usr.sbin/dhcp/common: Makefile Log Message: -Wno-enum-compare is only valid for GCC 4.5. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/dhcp/common/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/dhcp/common/Makefile diff -u src/usr.sbin/dhcp/common/Makefile:1.24 src/usr.sbin/dhcp/common/Makefile:1.25 --- src/usr.sbin/dhcp/common/Makefile:1.24 Wed Jun 29 02:40:11 2011 +++ src/usr.sbin/dhcp/common/Makefile Wed Jun 29 06:32:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2011/06/29 02:40:11 mrg Exp $ +# $NetBSD: Makefile,v 1.25 2011/06/29 06:32:32 mrg Exp $ LIBISPRIVATE= yes @@ -13,4 +13,6 @@ .include bsd.lib.mk +.if defined(HAVE_GCC) HAVE_GCC = 45 CPPFLAGS.dns.c+= -Wno-enum-compare +.endif
CVS commit: src/usr.sbin/dhcp
Module Name:src
Committed By: mrg
Date: Wed Jun 29 06:34:31 UTC 2011
Modified Files:
src/usr.sbin/dhcp/common: Makefile
src/usr.sbin/dhcp/server: Makefile
Log Message:
fix previous / -Wno-enum-compare is only valid for GCC 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/dhcp/common/Makefile
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/dhcp/server/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/dhcp/common/Makefile
diff -u src/usr.sbin/dhcp/common/Makefile:1.25 src/usr.sbin/dhcp/common/Makefile:1.26
--- src/usr.sbin/dhcp/common/Makefile:1.25 Wed Jun 29 06:32:32 2011
+++ src/usr.sbin/dhcp/common/Makefile Wed Jun 29 06:34:31 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2011/06/29 06:32:32 mrg Exp $
+# $NetBSD: Makefile,v 1.26 2011/06/29 06:34:31 mrg Exp $
LIBISPRIVATE= yes
@@ -13,6 +13,6 @@
.include bsd.lib.mk
-.if defined(HAVE_GCC) HAVE_GCC = 45
+.if defined(HAVE_GCC) ${HAVE_GCC} = 45
CPPFLAGS.dns.c+= -Wno-enum-compare
.endif
Index: src/usr.sbin/dhcp/server/Makefile
diff -u src/usr.sbin/dhcp/server/Makefile:1.15 src/usr.sbin/dhcp/server/Makefile:1.16
--- src/usr.sbin/dhcp/server/Makefile:1.15 Wed Jun 29 02:40:11 2011
+++ src/usr.sbin/dhcp/server/Makefile Wed Jun 29 06:34:31 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/06/29 02:40:11 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2011/06/29 06:34:31 mrg Exp $
.include bsd.own.mk
@@ -21,4 +21,6 @@
.include bsd.prog.mk
+.if defined(HAVE_GCC) ${HAVE_GCC} = 45
CPPFLAGS.ddns.c+= -Wno-enum-compare
+.endif
CVS commit: src/usr.sbin/dhcp
Module Name:src Committed By: mrg Date: Wed Jun 29 02:40:11 UTC 2011 Modified Files: src/usr.sbin/dhcp/common: Makefile src/usr.sbin/dhcp/server: Makefile Log Message: apply some -Wno-enum-compare To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/dhcp/common/Makefile cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/dhcp/server/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/dhcp/common/Makefile diff -u src/usr.sbin/dhcp/common/Makefile:1.23 src/usr.sbin/dhcp/common/Makefile:1.24 --- src/usr.sbin/dhcp/common/Makefile:1.23 Sat May 3 14:48:32 2008 +++ src/usr.sbin/dhcp/common/Makefile Wed Jun 29 02:40:11 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2008/05/03 14:48:32 lukem Exp $ +# $NetBSD: Makefile,v 1.24 2011/06/29 02:40:11 mrg Exp $ LIBISPRIVATE= yes @@ -12,3 +12,5 @@ DHCPSRCDIR= common .include bsd.lib.mk + +CPPFLAGS.dns.c+= -Wno-enum-compare Index: src/usr.sbin/dhcp/server/Makefile diff -u src/usr.sbin/dhcp/server/Makefile:1.14 src/usr.sbin/dhcp/server/Makefile:1.15 --- src/usr.sbin/dhcp/server/Makefile:1.14 Fri Aug 29 00:02:25 2008 +++ src/usr.sbin/dhcp/server/Makefile Wed Jun 29 02:40:11 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2008/08/29 00:02:25 gmcgarry Exp $ +# $NetBSD: Makefile,v 1.15 2011/06/29 02:40:11 mrg Exp $ .include bsd.own.mk @@ -20,3 +20,5 @@ .endif .include bsd.prog.mk + +CPPFLAGS.ddns.c+= -Wno-enum-compare
CVS commit: src/usr.sbin/dhcp/clientscript
Module Name:src
Committed By: roy
Date: Sat Nov 21 07:54:00 UTC 2009
Modified Files:
src/usr.sbin/dhcp/clientscript: dhclient-script
Log Message:
Use resolvconf(8) to manage /etc/resolv.conf
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/dhcp/clientscript/dhclient-script
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/dhcp/clientscript/dhclient-script
diff -u src/usr.sbin/dhcp/clientscript/dhclient-script:1.12 src/usr.sbin/dhcp/clientscript/dhclient-script:1.13
--- src/usr.sbin/dhcp/clientscript/dhclient-script:1.12 Sun Oct 8 17:09:32 2006
+++ src/usr.sbin/dhcp/clientscript/dhclient-script Sat Nov 21 07:53:59 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: dhclient-script,v 1.12 2006/10/08 17:09:32 riz Exp $
+# $NetBSD: dhclient-script,v 1.13 2009/11/21 07:53:59 roy Exp $
ENTERHOOKS=/etc/dhclient-enter-hooks
EXITHOOKS=/etc/dhclient-exit-hooks
@@ -8,34 +8,39 @@
SIGNATURE=# Created by dhclient from
INTSIG=$SIGNATURE $interface
+echo_resolv_conf() {
+ echo $INTSIG
+ echo search $new_domain_name
+ for nameserver in $new_domain_name_servers; do
+ echo nameserver $nameserver
+ done
+}
+
make_resolv_conf() {
if [ ! -z $new_domain_name_servers ]; then
- if [ -f $RESOLV ]
- then
- while read line; do
-case $line in
-$SIGNATURE*)
- ;;
-*)
- mv $RESOLV $RESOLV.save;;
-esac
-break
- done $RESOLV
- fi
- echo $INTSIG $RESOLV
- if [ ! -z $new_domain_name ]
- then
- echo search $new_domain_name $RESOLV
+ if [ -x /sbin/resolvconf ]; then
+ echo_resolv_conf | /sbin/resolvconf -a $interface
+ else
+ if [ -f $RESOLV ]; then
+while read line; do
+ case $line in
+ $SIGNATURE*)
+ ;;
+ *)
+ mv $RESOLV $RESOLV.save;;
+ esac
+ break
+done $RESOLV
+ fi
+ echo_resolv_conf $RESOLV
fi
- for nameserver in $new_domain_name_servers; do
- echo nameserver $nameserver
- done $RESOLV
fi
}
restore_resolv_conf() {
- if [ -f $RESOLV.save -a -f $RESOLV ]
- then
+ if [ -x /sbin/resolvconf ]; then
+ /sbin/resolvconf -d $interface
+ elif [ -f $RESOLV.save -a -f $RESOLV ]; then
while read line; do
case $line in
$INTSIG*)
