src - OpenBSD base system

diff options


context:
space:
mode:

author	Kenneth R Westerback <krw@cvs.openbsd.org>	2012-10-30 18:39:45 +0000
committer	Kenneth R Westerback <krw@cvs.openbsd.org>	2012-10-30 18:39:45 +0000
commit	1721d77e423e622f2a9d018651a15c36a5f3a17e (patch)
tree	f6597ed300615a71bdb45bd274857071508779db /distrib
parent	1a882f5e4d6022913f24a2a3ba0c2f51fcde1e38 (diff)

Nuke dhclient-script and dhclient.conf 'script' directive. Do all

interface and route configuration via ioctl's and routing sockets. This will break configurations using local enhancements of dhclient-script, which will now require alternate arrangements. Committing early to allow time to identify and develop required alternatives. Several proddings by deraadt@.

Diffstat (limited to 'distrib')

-rw-r--r--

distrib/alpha/bsd.rd/list.local

-rw-r--r--

distrib/amd64/ramdisk_cd/list.local

-rw-r--r--

distrib/armish/ramdisk/list

-rw-r--r--

distrib/beagle/ramdisk/list

-rw-r--r--

distrib/hp300/ramdisk/list

-rw-r--r--

distrib/hppa/list

-rw-r--r--

distrib/i386/common/list

-rw-r--r--

distrib/landisk/ramdisk/list

-rw-r--r--

distrib/loongson/ramdisk/list

-rw-r--r--

distrib/luna88k/ramdisk/list

-rw-r--r--

distrib/macppc/ramdisk/list

-rw-r--r--

distrib/mvme68k/ramdisk/list

-rw-r--r--

distrib/mvme88k/ramdisk/list

-rw-r--r--

distrib/palm/ramdisk/list

-rw-r--r--

distrib/ramdisk/list

-rw-r--r--

distrib/sgi/ramdisk/list

-rw-r--r--

distrib/socppc/ramdisk/list

-rw-r--r--

distrib/sparc64/bsd.rd/list

-rw-r--r--

distrib/special/dhclient/Makefile

-rw-r--r--

distrib/zaurus/ramdisk/list

20 files changed, 38 insertions, 96 deletions

diff --git a/distrib/alpha/bsd.rd/list.local b/distrib/alpha/bsd.rd/list.local
index 4b4082bad2e..8ac70a75532 100644
--- a/distrib/alpha/bsd.rd/list.local
+++ b/distrib/alpha/bsd.rd/list.local

@@ -12,8 +12,5 @@ LINK instbin sbin/bioctl

COPY ${DESTDIR}/etc/firmware/kue etc/firmware/kue

COPY ${DESTDIR}/etc/firmware/3c990 etc/firmware/3c990

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

-SPECIAL chmod 755 sbin/dhclient-script

HASH var/hash

diff --git a/distrib/amd64/ramdisk_cd/list.local b/distrib/amd64/ramdisk_cd/list.local
index 6d27bea458f..ea8d11aa142 100644
--- a/distrib/amd64/ramdisk_cd/list.local
+++ b/distrib/amd64/ramdisk_cd/list.local

@@ -1,4 +1,4 @@

-# $OpenBSD: list.local,v 1.21 2012/10/15 17:21:04 deraadt Exp $

+# $OpenBSD: list.local,v 1.22 2012/10/30 18:39:43 krw Exp $

# add local links; use bin/sh since instbin has already been unlinked

LINK instbin bin/sha256

@@ -32,9 +32,5 @@ COPY ${DESTDIR}/etc/firmware/run-rt3071 etc/firmware/run-rt3071

COPY ${DESTDIR}/etc/firmware/zd1211 etc/firmware/zd1211

COPY ${DESTDIR}/etc/firmware/zd1211b etc/firmware/zd1211b

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

-SPECIAL chmod 755 sbin/dhclient-script

HASH var/hash

diff --git a/distrib/armish/ramdisk/list b/distrib/armish/ramdisk/list
index 3049e446428..b927557bc9c 100644
--- a/distrib/armish/ramdisk/list
+++ b/distrib/armish/ramdisk/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.14 2010/10/18 04:07:50 deraadt Exp $

+# $OpenBSD: list,v 1.15 2012/10/30 18:39:43 krw Exp $

SRCDIRS distrib/special

SRCDIRS bin sbin usr.bin usr.sbin

@@ -75,16 +75,13 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf

SYMLINK /tmp/hosts etc/hosts

TERMCAP vt100,vt220,dumb usr/share/misc/termcap

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation tools

SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/install.md install.md

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

HASH var/hash

diff --git a/distrib/beagle/ramdisk/list b/distrib/beagle/ramdisk/list
index 1b5bce22c41..8944639c061 100644
--- a/distrib/beagle/ramdisk/list
+++ b/distrib/beagle/ramdisk/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.1 2011/03/14 16:40:23 drahn Exp $

+# $OpenBSD: list,v 1.2 2012/10/30 18:39:43 krw Exp $

SRCDIRS distrib/special

SRCDIRS bin sbin usr.bin usr.sbin

@@ -75,16 +75,13 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf

SYMLINK /tmp/hosts etc/hosts

TERMCAP vt100,vt220,dumb usr/share/misc/termcap

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation tools

SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/install.md install.md

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

HASH var/hash

diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list
index d7e5c14547b..5fa264b91c3 100644
--- a/distrib/hp300/ramdisk/list
+++ b/distrib/hp300/ramdisk/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.57 2012/10/16 16:15:58 deraadt Exp $

+# $OpenBSD: list,v 1.58 2012/10/30 18:39:44 krw Exp $

SRCDIRS distrib/special

SRCDIRS bin sbin usr.bin usr.sbin

@@ -77,15 +77,12 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf

SYMLINK /tmp/hosts etc/hosts

TERMCAP vt100,vt220,dumb,hp2392,hpansi,hpsub,hpex,hp700-wy,hp70092 usr/share/misc/termcap

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation tools

SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/install.md install.md

SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

HASH var/hash

diff --git a/distrib/hppa/list b/distrib/hppa/list
index 4cb5a8e288b..ac992711bf0 100644
--- a/distrib/hppa/list
+++ b/distrib/hppa/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.18 2012/10/16 16:59:02 deraadt Exp $

+# $OpenBSD: list,v 1.19 2012/10/30 18:39:44 krw Exp $

SRCDIRS distrib/special

SRCDIRS bin sbin usr.bin usr.sbin

@@ -58,9 +58,6 @@ SPECIAL pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd

COPY ${CURDIR}/../../miniroot/protocols etc/protocols

COPY ${CURDIR}/../../miniroot/services etc/services

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# for disklabel(8) -B

COPY ${DESTDIR}/usr/mdec/sdboot usr/mdec/sdboot

@@ -69,7 +66,7 @@ SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

# the hashes of the various install components

HASH var/hash

diff --git a/distrib/i386/common/list b/distrib/i386/common/list
index 911dfc3a184..635246cfa27 100644
--- a/distrib/i386/common/list
+++ b/distrib/i386/common/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.27 2012/10/15 17:21:03 deraadt Exp $

+# $OpenBSD: list,v 1.28 2012/10/30 18:39:44 krw Exp $

SRCDIRS distrib/special

SRCDIRS bin sbin usr.bin usr.sbin

@@ -71,13 +71,10 @@ SYMLINK /tmp/fstab.shadow etc/fstab

SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf

SYMLINK /tmp/hosts etc/hosts

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation tools

SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/../common/install.md install.md

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list
index 960a90ed874..e98bebf2470 100644
--- a/distrib/landisk/ramdisk/list
+++ b/distrib/landisk/ramdisk/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.22 2012/10/17 02:36:16 deraadt Exp $

+# $OpenBSD: list,v 1.23 2012/10/30 18:39:44 krw Exp $

SRCDIRS distrib/special

SRCDIRS bin sbin usr.bin usr.sbin

@@ -104,16 +104,13 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf

SYMLINK /tmp/hosts etc/hosts

TERMCAP vt100,vt220,dumb usr/share/misc/termcap

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation tools

SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/install.md install.md

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

HASH var/hash

diff --git a/distrib/loongson/ramdisk/list b/distrib/loongson/ramdisk/list
index 4f1dc9a546e..c962adcd6f2 100644
--- a/distrib/loongson/ramdisk/list
+++ b/distrib/loongson/ramdisk/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.8 2012/10/15 16:15:34 deraadt Exp $

+# $OpenBSD: list,v 1.9 2012/10/30 18:39:44 krw Exp $

SRCDIRS distrib/special

SRCDIRS bin sbin usr.bin usr.sbin

@@ -101,16 +101,13 @@ COPY ${DESTDIR}/etc/firmware/ral-rt2561 etc/firmware/ral-rt2561

COPY ${DESTDIR}/etc/firmware/ral-rt2561s etc/firmware/ral-rt2561s

COPY ${DESTDIR}/etc/firmware/ral-rt2661 etc/firmware/ral-rt2661

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation tools

SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/install.md install.md

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

HASH var/hash

diff --git a/distrib/luna88k/ramdisk/list b/distrib/luna88k/ramdisk/list
index b01e9dc0754..8f58da19929 100644
--- a/distrib/luna88k/ramdisk/list
+++ b/distrib/luna88k/ramdisk/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.16 2010/10/18 04:07:50 deraadt Exp $

+# $OpenBSD: list,v 1.17 2012/10/30 18:39:44 krw Exp $

SRCDIRS distrib/special

SRCDIRS bin sbin usr.bin usr.sbin

@@ -68,9 +68,6 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf

SYMLINK /tmp/hosts etc/hosts

TERMCAP vt100,vt220,dumb usr/share/misc/termcap

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation tools

SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/install.md install.md

@@ -78,6 +75,6 @@ SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

HASH var/hash

diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list
index 24a444ed8b9..c34f53de447 100644
--- a/distrib/macppc/ramdisk/list
+++ b/distrib/macppc/ramdisk/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.44 2012/10/15 02:27:23 deraadt Exp $

+# $OpenBSD: list,v 1.45 2012/10/30 18:39:44 krw Exp $

SRCDIRS distrib/special

SRCDIRS bin sbin usr.bin usr.sbin

@@ -86,16 +86,13 @@ COPY ${DESTDIR}/etc/firmware/rum-rt2573 etc/firmware/rum-rt2573

COPY ${DESTDIR}/etc/firmware/run-rt2870 etc/firmware/run-rt2870

COPY ${DESTDIR}/etc/firmware/run-rt3071 etc/firmware/run-rt3071

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation tools

SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/install.md install.md

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

HASH var/hash

diff --git a/distrib/mvme68k/ramdisk/list b/distrib/mvme68k/ramdisk/list
index 1bb5f2b29eb..90881066496 100644
--- a/distrib/mvme68k/ramdisk/list
+++ b/distrib/mvme68k/ramdisk/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.41 2012/10/17 03:05:09 deraadt Exp $

+# $OpenBSD: list,v 1.42 2012/10/30 18:39:44 krw Exp $

SRCDIRS distrib/special

SRCDIRS bin sbin usr.bin usr.sbin

@@ -68,9 +68,6 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf

SYMLINK /tmp/hosts etc/hosts

TERMCAP vt100,vt220,dumb usr/share/misc/termcap

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation tools

SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/install.md install.md

@@ -78,6 +75,6 @@ SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

HASH var/hash

diff --git a/distrib/mvme88k/ramdisk/list b/distrib/mvme88k/ramdisk/list
index c03cb27fde2..e3b0501ec66 100644
--- a/distrib/mvme88k/ramdisk/list
+++ b/distrib/mvme88k/ramdisk/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.39 2012/10/17 03:05:11 deraadt Exp $

+# $OpenBSD: list,v 1.40 2012/10/30 18:39:44 krw Exp $

SRCDIRS distrib/special

SRCDIRS bin sbin usr.bin usr.sbin

@@ -68,9 +68,6 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf

SYMLINK /tmp/hosts etc/hosts

TERMCAP vt100,vt220,dumb usr/share/misc/termcap

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation tools

SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/install.md install.md

@@ -78,6 +75,6 @@ SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

HASH var/hash

diff --git a/distrib/palm/ramdisk/list b/distrib/palm/ramdisk/list
index 290bf8a89ed..a0eb4a855d4 100644
--- a/distrib/palm/ramdisk/list
+++ b/distrib/palm/ramdisk/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.4 2010/10/18 04:07:51 deraadt Exp $

+# $OpenBSD: list,v 1.5 2012/10/30 18:39:44 krw Exp $

SRCDIRS distrib/special

SRCDIRS bin sbin usr.bin usr.sbin

@@ -75,16 +75,13 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf

SYMLINK /tmp/hosts etc/hosts

TERMCAP vt100,vt220,dumb usr/share/misc/termcap

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation tools

SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/install.md install.md

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

HASH var/hash

diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list
index d9c4d00783a..41d7ac53e3c 100644
--- a/distrib/ramdisk/list
+++ b/distrib/ramdisk/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.39 2010/10/18 04:07:51 deraadt Exp $

+# $OpenBSD: list,v 1.40 2012/10/30 18:39:44 krw Exp $

# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $

SRCDIRS distrib/special

@@ -59,15 +59,12 @@ SPECIAL pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd

COPY ${CURDIR}/../miniroot/protocols etc/protocols

COPY ${CURDIR}/../miniroot/services etc/services

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation scripts

SCRIPT ${CURDIR}/../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../miniroot/install.sh install

SCRIPT ${CURDIR}/../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

HASH var/hash

diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list
index 44140e243ae..fe043a409aa 100644
--- a/distrib/sgi/ramdisk/list
+++ b/distrib/sgi/ramdisk/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.33 2012/10/18 16:57:31 deraadt Exp $

+# $OpenBSD: list,v 1.34 2012/10/30 18:39:44 krw Exp $

SRCDIRS distrib/special

SRCDIRS bin sbin usr.bin usr.sbin

@@ -82,16 +82,13 @@ COPY ${DESTDIR}/etc/firmware/bnx-rv2p etc/firmware/bnx-rv2p

COPY ${DESTDIR}/etc/firmware/bnx-xi-rv2p etc/firmware/bnx-xi-rv2p

COPY ${DESTDIR}/etc/firmware/bnx-xi90-rv2p etc/firmware/bnx-xi90-rv2p

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation tools

SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/install.md install.md

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

HASH var/hash bsd.IP22 bsd.IP27 bsd.IP28 bsd.IP30 bsd.mp.IP30 bsd.IP32

diff --git a/distrib/socppc/ramdisk/list b/distrib/socppc/ramdisk/list
index 0f38ffb6ecc..627ebd7d5fe 100644
--- a/distrib/socppc/ramdisk/list
+++ b/distrib/socppc/ramdisk/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.14 2012/10/16 23:07:20 deraadt Exp $

+# $OpenBSD: list,v 1.15 2012/10/30 18:39:44 krw Exp $

SRCDIRS distrib/special

SRCDIRS bin sbin usr.bin usr.sbin

@@ -97,16 +97,13 @@ COPY ${DESTDIR}/etc/firmware/atu-rfmd2958-int etc/firmware/atu-rfmd2958-int

COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-ext etc/firmware/atu-rfmd2958smc-ext

COPY ${DESTDIR}/etc/firmware/atu-rfmd2958smc-int etc/firmware/atu-rfmd2958smc-int

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation tools

SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/install.md install.md

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

HASH var/hash

diff --git a/distrib/sparc64/bsd.rd/list b/distrib/sparc64/bsd.rd/list
index bfa678d46e4..88dad28129b 100644
--- a/distrib/sparc64/bsd.rd/list
+++ b/distrib/sparc64/bsd.rd/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.39 2012/10/21 17:46:33 deraadt Exp $

+# $OpenBSD: list,v 1.40 2012/10/30 18:39:44 krw Exp $

# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $

SRCDIRS distrib/special

@@ -72,16 +72,13 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf

SYMLINK /tmp/hosts etc/hosts

TERMCAP vt100,vt220,dumb,sun usr/share/misc/termcap

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation scripts

SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/../common/install.md install.md

SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

COPY ${DESTDIR}/etc/firmware/bnx-b06 etc/firmware/bnx-b06

COPY ${DESTDIR}/etc/firmware/bnx-b09 etc/firmware/bnx-b09

diff --git a/distrib/special/dhclient/Makefile b/distrib/special/dhclient/Makefile
index cfa1590f79f..eee5c976f06 100644
--- a/distrib/special/dhclient/Makefile
+++ b/distrib/special/dhclient/Makefile

@@ -1,4 +1,4 @@

-# $OpenBSD: Makefile,v 1.10 2009/10/28 07:36:49 deraadt Exp $

+# $OpenBSD: Makefile,v 1.11 2012/10/30 18:39:44 krw Exp $

.include <bsd.own.mk>

@@ -7,8 +7,8 @@

CLIENT_PATH='"PATH=/usr/bin:/usr/sbin:/bin:/sbin"'

CPPFLAGS+= -I${.CURDIR}/../../../sbin/dhclient

SRCS= dhclient.c clparse.c dispatch.c bpf.c options.c \

- conflex.c errwarn.c inet.c packet.c convert.c tables.c parse.c \

- privsep.c

+ conflex.c errwarn.c inet.c kroute.c packet.c convert.c \

+ tables.c parse.c privsep.c

PROG= dhclient

.include <bsd.prog.mk>

diff --git a/distrib/zaurus/ramdisk/list b/distrib/zaurus/ramdisk/list
index db869e6f362..5571fd5cf1d 100644
--- a/distrib/zaurus/ramdisk/list
+++ b/distrib/zaurus/ramdisk/list

@@ -1,4 +1,4 @@

-# $OpenBSD: list,v 1.18 2010/10/18 04:08:32 deraadt Exp $

+# $OpenBSD: list,v 1.19 2012/10/30 18:39:44 krw Exp $

SRCDIRS distrib/special

SRCDIRS bin sbin usr.bin usr.sbin

@@ -76,16 +76,13 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf

SYMLINK /tmp/hosts etc/hosts

TERMCAP vt100,vt220,dumb usr/share/misc/termcap

-# dhcp things

-SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script

# and the installation tools

SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile

SCRIPT ${CURDIR}/install.md install.md

SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade

SCRIPT ${CURDIR}/../../miniroot/install.sh install

SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub

-SPECIAL chmod 755 install upgrade sbin/dhclient-script

+SPECIAL chmod 755 install upgrade

HASH var/hash