diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index d58ce77c642..196edeee241 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.181 2018/09/05 07:01:50 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.182 2018/10/01 19:52:41 naddy Exp $ USE_WXNEEDED= Yes @@ -7,7 +7,7 @@ ONLY_FOR_ARCHS= aarch64 amd64 arm i386 powerpc sparc64 COMMENT= multi system emulator DISTNAME= qemu-3.0.0 -REVISION= 1 +REVISION= 2 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ EXTRACT_SUFX= .tar.xz diff --git a/emulators/qemu/pkg/README b/emulators/qemu/pkg/README index 4b2237a1c2c..6d23fb1af35 100644 --- a/emulators/qemu/pkg/README +++ b/emulators/qemu/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.13 2018/09/04 12:46:12 espie Exp $ +$OpenBSD: README,v 1.14 2018/10/01 19:52:41 naddy Exp $ +----------------------------------------------------------------------- | Running ${PKGSTEM} on OpenBSD @@ -151,7 +151,7 @@ $OpenBSD: README,v 1.13 2018/09/04 12:46:12 espie Exp $ inet 10.7.255.1 255.255.255.0 inet6 alias 2001:240:58a:45::1c - I have dhcpd configured to run on trunk101, and also run rtadvd. + I have dhcpd configured to run on trunk101, and also run rad. For QEMU, the startup looks like this: # export ETHER=trunk101 diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile index 6a9ae7f3249..2c370cbe6e3 100644 --- a/net/dhcpcd/Makefile +++ b/net/dhcpcd/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.41 2018/09/04 12:46:16 espie Exp $ +# $OpenBSD: Makefile,v 1.42 2018/10/01 19:52:41 naddy Exp $ COMMENT= DHCPv4/IPv4LL/IPv6RS/DHCPv6 quad stack client DISTNAME= dhcpcd-7.0.8 -REVISION= 0 +REVISION= 1 CATEGORIES= net EXTRACT_SUFX= .tar.xz diff --git a/net/dhcpcd/pkg/README b/net/dhcpcd/pkg/README index 7672f1a0db3..e2cc2b7bdeb 100644 --- a/net/dhcpcd/pkg/README +++ b/net/dhcpcd/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.6 2018/09/04 12:46:16 espie Exp $ +$OpenBSD: README,v 1.7 2018/10/01 19:52:41 naddy Exp $ +----------------------------------------------------------------------- | Running ${PKGSTEM} on OpenBSD @@ -36,5 +36,15 @@ interface pppoe0 ia_pd 2 em0/1 vlan3/2 vlan5/3 -- -- -- -- -- -- -In normal cases, you would use rtadvd(8) to advertise these prefixes to -clients (e.g. "rcctl enable rtadvd; rcctl set rtadvd flags em0 vlan3 vlan5"). +In normal cases, you would use rad(8) to advertise these prefixes to +clients. Put the following in /etc/rad.conf: + +-- -- -- -- -- -- +interface em0 +interface vlan3 +interface vlan5 +-- -- -- -- -- -- + +And enable rad(8): + + # rcctl enable rad diff --git a/net/wide-dhcpv6/Makefile b/net/wide-dhcpv6/Makefile index 3acb3bf843a..7e85c7b0021 100644 --- a/net/wide-dhcpv6/Makefile +++ b/net/wide-dhcpv6/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.15 2017/09/27 14:03:26 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.16 2018/10/01 19:52:41 naddy Exp $ COMMENT= client and servers for the WIDE DHCPv6 protocol DISTNAME= wide-dhcpv6-20080615 -REVISION= 8 +REVISION= 9 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wide-dhcpv6/} diff --git a/net/wide-dhcpv6/patches/patch-dhcp6s_conf_sample b/net/wide-dhcpv6/patches/patch-dhcp6s_conf_sample index 77b7e9be95e..6b168e4337b 100644 --- a/net/wide-dhcpv6/patches/patch-dhcp6s_conf_sample +++ b/net/wide-dhcpv6/patches/patch-dhcp6s_conf_sample @@ -1,4 +1,4 @@ -$OpenBSD: patch-dhcp6s_conf_sample,v 1.1.1.1 2009/01/01 19:01:14 stsp Exp $ +$OpenBSD: patch-dhcp6s_conf_sample,v 1.2 2018/10/01 19:52:41 naddy Exp $ --- dhcp6s.conf.sample.orig Thu Jul 17 22:07:54 2008 +++ dhcp6s.conf.sample Thu Jul 17 22:26:35 2008 @@ -1,5 +1,5 @@ @@ -39,7 +39,7 @@ $OpenBSD: patch-dhcp6s_conf_sample,v 1.1.1.1 2009/01/01 19:01:14 stsp Exp $ +# The following is an example configuration which provides an IPv6 address +# from an address pool (2001:db8:1:2::1000-2000) with a lease time of 3600 +# seconds to any client attached to the fxp0 interface. Note that you have -+# to send router advertisements on fxp0, i.e. run rtadvd(8) on that interface. ++# to send router advertisements on fxp0, i.e. run rad(8) on that interface. +# Otherwise a client cannot know the prefix-length and the default router. + interface fxp0 { @@ -53,7 +53,7 @@ $OpenBSD: patch-dhcp6s_conf_sample,v 1.1.1.1 2009/01/01 19:01:14 stsp Exp $ +# The following is an example configuration which provides fixed IPv6 +# addresses to two known clients. It also provides every client with a +# DNS server. Note that you have to send router advertisements on fxp0, -+# i.e. run rtadvd(8) on the interface the clients are attached to. ++# i.e. run rad(8) on the interface the clients are attached to. +# Otherwise a client cannot know the prefix-length and the default router. + +option domain-name-servers 2001:db8::35;