Module name: xenocara
Changes by: matthieu@cvs.openbsd.org 2014/08/11 10:18:10

Modified files:
. : MODULES 3RDPARTY

Log message:
update

Module name: src
Changes by: miod@cvs.openbsd.org 2014/08/11 10:54:20

Modified files:
sys/arch/octeon/conf: GENERIC

Log message:
Add option USER_PCICONF for pcidump(8) to be able to do its magic.

Module name: src
Changes by: miod@cvs.openbsd.org 2014/08/11 12:08:17

Modified files:
sys/arch/octeon/dev: cn30xxasx.c cn30xxfau.c cn30xxfpa.c
cn30xxgmx.c cn30xxpow.c cn30xxsmi.c
if_cnmac.c

Log message:
De-static so that my ddb backtrace get closer to reality.

Module name: src
Changes by: miod@cvs.openbsd.org 2014/08/11 12:29:56

Modified files:
sys/arch/octeon/dev: cn30xxasx.c cn30xxasxreg.h cn30xxasxvar.h
cn30xxbootbusreg.h cn30xxciureg.h
cn30xxfpa.c cn30xxfpareg.h cn30xxgmx.c
cn30xxgmxreg.h cn30xxgmxvar.h cn30xxipd.c
cn30xxipdreg.h cn30xxipdvar.h cn30xxpip.c
cn30xxpipreg.h cn30xxpipvar.h cn30xxpko.c
cn30xxpkovar.h cn30xxpow.c cn30xxpowreg.h
cn30xxpowvar.h if_cnmac.c if_cnmacvar.h
octhcireg.h
sys/arch/octeon/include: octeonvar.h

Log message:
Remove evcnt and %b format strings relying upon SEIL extensions. This gives
OCTEON_ETH_DEBUG kernels a chance to build. No functional change for regular
kernels.

Module name: src
Changes by: miod@cvs.openbsd.org 2014/08/11 12:33:36

Modified files:
sys/conf : newvers.sh

Log message:
-current dammit

Module name: src
Changes by: tobias@cvs.openbsd.org 2014/08/11 12:39:41

Modified files:
usr.sbin/dhcpd : dhcp.c

Log message:
validate len field for proper length, not just "not zero."

ok krw@

Module name: src
Changes by: tobias@cvs.openbsd.org 2014/08/11 12:41:13

Modified files:
sbin/dhclient : dhclient.c

Log message:
When parsing 32 bit values, verify that we received 4 bytes.

ok krw@

Module name: src
Changes by: miod@cvs.openbsd.org 2014/08/11 12:52:54

Modified files:
sys/arch/octeon/dev: cn30xxgmx.c cn30xxgmxvar.h

Log message:
Get rid of the `quirks' member, which is never initialized (but by zero at
softc creation) anyway. Sorry, we are not trying to support SEIL-specific
hardware at this point.

Module name: src
Changes by: miod@cvs.openbsd.org 2014/08/11 12:56:49

Modified files:
sys/arch/octeon/dev: cn30xxpow.c if_cnmac.c
sys/arch/octeon/octeon: machdep.c

Log message:
Do not use CKSEG0 to quickly map physical addresses, but XKPHYS, for we are
not limited to 512MB physmem.

Module name: src
Changes by: miod@cvs.openbsd.org 2014/08/11 13:00:50

Modified files:
sys/arch/octeon/dev: cn30xxgmx.c if_cnmac.c octcf.c
octeon_pcibus.c octrtc.c

Log message:
Do not extern octeon_boot_info, <machine/octeonvar.h> declares it for you.

Module name: src
Changes by: miod@cvs.openbsd.org 2014/08/11 13:16:56

Modified files:
sys/kern : vfs_biomem.c

Log message:
Do not pmap_update(pmap_kernel()) within the `create mappings' loop, but only
once after it is over.

> CVSROOT: /cvs
> Module name: src
> Changes by: ajacoutot@cvs.openbsd.org 2014/08/11 07:25:23
>
> Modified files:
> etc/rc.d : rc.subr
>
> Log message:
> Make it possible to pass arguments to _rc_parse_conf().
>
> ok robert@

This badly breaks /etc/rc and /etc/netstart, which both use
_rc_parse_conf without parameters. Instead of wiring the default
parameters (/etc/rc.conf and /etc/rc.conf.local) there, too, I think
it's better to let _rc_parse_conf use them as defaults when it has
been invoked without parameters. Also, there's no reason to use
' ... in "$@"' in a for loop.

ok?

Index: rc.subr
===================================================================
RCS file: /cvs/src/etc/rc.d/rc.subr,v
retrieving revision 1.78
diff -u -p -r1.78 rc.subr
--- rc.subr 11 Aug 2014 13:25:23 -0000 1.78
+++ rc.subr 11 Aug 2014 19:22:36 -0000
@@ -121,7 +121,8 @@ _rc_parse_conf() {
pf_rules ipsec_rules shlib_dirs pkg_scripts \
nfs_server

- for _rcfile in $@; do
+ [ $# -gt 0 ] || set -- /etc/rc.conf /etc.rc.conf.local
+ for _rcfile; do
[[ -f $_rcfile ]] || continue
while IFS=' ' read -r _l; do
[[ $_l == [!#=]*=* ]] || continue
@@ -263,7 +264,7 @@ _RC_RUNDIR=/var/run/rc.d
_RC_RUNFILE=${_RC_RUNDIR}/${_name}

# parse /etc/rc.conf{.local} for the daemon_flags
-_rc_do _rc_parse_conf /etc/rc.conf /etc/rc.conf.local
+_rc_do _rc_parse_conf

eval _rcflags=\${${_name}_flags}
eval _rcuser=\${${_name}_user}

> On Mon, Aug 11, 2014 at 07:25:23AM -0600, Antoine Jacoutot wrote:
> > CVSROOT: /cvs
> > Module name: src
> > Changes by: ajacoutot@cvs.openbsd.org 2014/08/11 07:25:23
> >
> > Modified files:
> > etc/rc.d : rc.subr
> >
> > Log message:
> > Make it possible to pass arguments to _rc_parse_conf().
> >
> > ok robert@
>
> This badly breaks /etc/rc and /etc/netstart, which both use
> _rc_parse_conf without parameters. Instead of wiring the default
> parameters (/etc/rc.conf and /etc/rc.conf.local) there, too, I think
> it's better to let _rc_parse_conf use them as defaults when it has
> been invoked without parameters. Also, there's no reason to use
> ' ... in "$@"' in a for loop.

Ok shit I totally forgot to commit those... but I did modify them and have them on my system actually :-(

> ok?

Yes.

> Index: rc.subr
> ===================================================================
> RCS file: /cvs/src/etc/rc.d/rc.subr,v
> retrieving revision 1.78
> diff -u -p -r1.78 rc.subr
> --- rc.subr 11 Aug 2014 13:25:23 -0000 1.78
> +++ rc.subr 11 Aug 2014 19:22:36 -0000
> @@ -121,7 +121,8 @@ _rc_parse_conf() {
> pf_rules ipsec_rules shlib_dirs pkg_scripts \
> nfs_server
>
> - for _rcfile in $@; do
> + [ $# -gt 0 ] || set -- /etc/rc.conf /etc.rc.conf.local
> + for _rcfile; do
> [[ -f $_rcfile ]] || continue
> while IFS=' ' read -r _l; do
> [[ $_l == [!#=]*=* ]] || continue
> @@ -263,7 +264,7 @@ _RC_RUNDIR=/var/run/rc.d
> _RC_RUNFILE=${_RC_RUNDIR}/${_name}
>
> # parse /etc/rc.conf{.local} for the daemon_flags
> -_rc_do _rc_parse_conf /etc/rc.conf /etc/rc.conf.local
> +_rc_do _rc_parse_conf
>
> eval _rcflags=\${${_name}_flags}
> eval _rcuser=\${${_name}_user}

--
Antoine

Module name: src
Changes by: kili@cvs.openbsd.org 2014/08/11 14:16:04

Modified files:
etc/rc.d : rc.subr

Log message:
Let _rc_parse_conf stick to parsing /etc/rc.conf and /etc/rc.conf.local
if it's invoked without parameters. It's simpler than adding adding
/etc/rc.conf and /etc/rc.conf.local parameters whereever _rc_parse_conf
is used (e.g. /etc/rc and /etc/netstart).

While here, replace a

for foo in "$@"; do something; done

by

for foo; do something; done

ok aja@

Module name: src
Changes by: ajacoutot@cvs.openbsd.org 2014/08/11 14:24:57

Modified files:
etc/rc.d : rc.subr

Log message:
Typo.

ok kili@

Module name: src
Changes by: guenther@cvs.openbsd.org 2014/08/11 14:28:47

Modified files:
bin/ksh : io.c

Log message:
Still need to separately set FD_CLOEXEC if the new fd was >= FDBASE.
Affects scripts that directly use 9 of the first 10 fds.

noted by miod@

Module name: src
Changes by: millert@cvs.openbsd.org 2014/08/11 14:30:22

Modified files:
sys/dev/pci : pcidevs

Log message:
Add some Intel Z97 chipset devices; ok deraadt@

Module name: src
Changes by: millert@cvs.openbsd.org 2014/08/11 14:30:51

Modified files:
sys/dev/pci : pcidevs.h pcidevs_data.h

Log message:
regen

Module name: src
Changes by: nicm@cvs.openbsd.org 2014/08/11 16:14:30

Modified files:
usr.bin/tmux : cmd-select-pane.c tmux.1 tmux.h window.c

Log message:
Add flags to selectp to enable and disable input to a pane, from Anish
Athalye.

Module name: src
Changes by: nicm@cvs.openbsd.org 2014/08/11 16:18:16

Modified files:
usr.bin/tmux : screen.c tmux.h window-copy.c

Log message:
Fix two copy mode problems:

1. In vi mode the selection doesn't include the last character if you
moved the cursor up or left.
2. In emacs mode the selection includes the last character if you moved
the cursor to the left.

From Balazs Kezes.

Module name: src
Changes by: nicm@cvs.openbsd.org 2014/08/11 16:39:57

Modified files:
usr.bin/tmux : window-copy.c mode-key.c

Log message:
No need to repeat other-end more than once, from Juho Pohjala. Also add
it to the commands list while here.

Module name: src
Changes by: dlg@cvs.openbsd.org 2014/08/11 18:59:27

Modified files:
sys/kern : subr_pool.c

Log message:
bring back r1.132. this is a bit different cos we're still using splvm to
protect pool_list rather than the rwlock that made i386 blow up:

provide a pool_count global so we can figure out how many pools there are
active without having to walk the global pool_list.

Module name: src
Changes by: dlg@cvs.openbsd.org 2014/08/11 19:01:11

Modified files:
sys/kern : subr_pool.c

Log message:
bring back r1.134:

inline is the new __inline

Module name: src
Changes by: dlg@cvs.openbsd.org 2014/08/11 19:05:46

Modified files:
sys/kern : subr_pool.c

Log message:
bring back r1.135:

matthew@ noticed i wasnt populating npages in the kinfo_pool sent to
userland.

Module name: src
Changes by: dlg@cvs.openbsd.org 2014/08/11 19:25:21

Modified files:
sys/kern : subr_pool.c

Log message:
i accidentally removed the check for whether the requested pool in
the sysctl path exists. return ENOENT instead of trying a NULL
deref.

Module name: src
Changes by: dlg@cvs.openbsd.org 2014/08/11 19:31:43

Modified files:
sys/kern : subr_pool.c

Log message:
sigh. when returning ENOENT in the sysctl path, unlock on the way out.

> CVSROOT: /cvs
> Module name: src
> Changes by: millert@cvs.openbsd.org 2014/08/11 14:30:22
>
> Modified files:
> sys/dev/pci : pcidevs
>
> Log message:
> Add some Intel Z97 chipset devices; ok deraadt@

You're wrongly calling some of the 9 Series devices
there LP, while a datasheet is only available for the
seperate chip at the moment, 9 series LP/Wildcat Point LP
will likely be called something like
'Mobile 5th Generation Intel Core Processor Family I/O'.

The following diff fixes that, adds some more 9 series &
9 series lp ids and adds them to various drivers.

Index: pcidevs
===================================================================
RCS file: /cvs/src/sys/dev/pci/pcidevs,v
retrieving revision 1.1736
diff -u -p -r1.1736 pcidevs
--- pcidevs 11 Aug 2014 20:30:22 -0000 1.1736
+++ pcidevs 12 Aug 2014 02:25:04 -0000
@@ -4269,16 +4269,31 @@ product INTEL C222_LPC 0x8c52 C222 LPC
product INTEL C224_LPC 0x8c54 C224 LPC
product INTEL C226_LPC 0x8c56 C226 LPC
product INTEL H81_LPC 0x8c5c H81 LPC
-product INTEL 9SERIES_LP_AHCI 0x8c82 9 Series AHCI
-product INTEL 9SERIES_LP_PCIE_1 0x8c90 9 Series PCIE
-product INTEL 9SERIES_LP_PCIE_2 0x8c9a 9 Series PCIE
-product INTEL 9SERIES_LP_HDA 0x8ca0 9 Series HD Audio
-product INTEL 9SERIES_LP_SMB 0x8ca2 9 Series SMBus
+product INTEL 9SERIES_SATA_1 0x8c80 9 Series SATA
+product INTEL 9SERIES_AHCI 0x8c82 9 Series AHCI
+product INTEL 9SERIES_RAID_1 0x8c84 9 Series RAID
+product INTEL 9SERIES_RAID_2 0x8c86 9 Series RAID
+product INTEL 9SERIES_SATA_2 0x8c88 9 Series SATA
+product INTEL 9SERIES_RAID_3 0x8c8e 9 Series RAID
+product INTEL 9SERIES_PCIE_1 0x8c90 9 Series PCIE
+product INTEL 9SERIES_PCIE_2 0x8c92 9 Series PCIE
+product INTEL 9SERIES_PCIE_3 0x8c94 9 Series PCIE
+product INTEL 9SERIES_PCIE_4 0x8c96 9 Series PCIE
+product INTEL 9SERIES_PCIE_5 0x8c98 9 Series PCIE
+product INTEL 9SERIES_PCIE_6 0x8c9a 9 Series PCIE
+product INTEL 9SERIES_PCIE_7 0x8c9c 9 Series PCIE
+product INTEL 9SERIES_PCIE_8 0x8c9e 9 Series PCIE
+product INTEL 9SERIES_HDA 0x8ca0 9 Series HD Audio
+product INTEL 9SERIES_SMB 0x8ca2 9 Series SMBus
product INTEL 9SERIES_EHCI_1 0x8ca6 9 Series EHCI
product INTEL 9SERIES_EHCI_2 0x8cad 9 Series EHCI
product INTEL 9SERIES_XHCI 0x8cb1 9 Series xHCI
product INTEL 9SERIES_MEI_1 0x8cba 9 Series MEI
+product INTEL 9SERIES_MEI_2 0x8cbb 9 Series MEI
+product INTEL 9SERIES_IDER 0x8cbc 9 Series IDER
+product INTEL 9SERIES_KT 0x8cbd 9 Series KT
product INTEL Z97_LPC 0x8cc4 Z97 LPC
+product INTEL H97_LPC 0x8cc6 H97 LPC
product INTEL I2OPCIB 0x9620 I2O RAID
product INTEL RCU21 0x9621 RCU21 I2O RAID
product INTEL RCUxx 0x9622 RCUxx I2O RAID
@@ -4303,9 +4318,29 @@ product INTEL 8SERIES_LP_EHCI 0x9c26 8 S
product INTEL 8SERIES_LP_XHCI 0x9c31 8 Series xHCI
product INTEL 8SERIES_LP_MEI_1 0x9c3a 8 Series MEI
product INTEL 8SERIES_LP_MEI_2 0x9c3b 8 Series MEI
+product INTEL 8SERIES_LP_IDER 0x9c3c 8 Series IDER
+product INTEL 8SERIES_LP_KT 0x9c3d 8 Series KT
product INTEL 8SERIES_LP_LPC_1 0x9c41 8 Series LPC
product INTEL 8SERIES_LP_LPC_2 0x9c43 8 Series LPC
product INTEL 8SERIES_LP_LPC_3 0x9c45 8 Series LPC
+product INTEL 9SERIES_LP_AHCI 0x9c83 9 Series AHCI
+product INTEL 9SERIES_LP_RAID_1 0x9c85 9 Series RAID
+product INTEL 9SERIES_LP_RAID_2 0x9c87 9 Series RAID
+product INTEL 9SERIES_LP_RAID_3 0x9c8f 9 Series RAID
+product INTEL 9SERIES_LP_PCIE_1 0x9c90 9 Series PCIE
+product INTEL 9SERIES_LP_PCIE_2 0x9c92 9 Series PCIE
+product INTEL 9SERIES_LP_PCIE_3 0x9c94 9 Series PCIE
+product INTEL 9SERIES_LP_PCIE_4 0x9c96 9 Series PCIE
+product INTEL 9SERIES_LP_PCIE_5 0x9c98 9 Series PCIE
+product INTEL 9SERIES_LP_PCIE_6 0x9c9a 9 Series PCIE
+product INTEL 9SERIES_LP_MEI_1 0x9cba 9 Series MEI
+product INTEL 9SERIES_LP_MEI_2 0x9cbb 9 Series MEI
+product INTEL 9SERIES_LP_IDER 0x9cbc 9 Series IDER
+product INTEL 9SERIES_LP_KT 0x9cbd 9 Series KT
+product INTEL 9SERIES_LP_HDA 0x9ca0 9 Series HD Audio
+product INTEL 9SERIES_LP_SMB 0x9ca2 9 Series SMBus
+product INTEL 9SERIES_LP_EHCI 0x9ca6 9 Series USB
+product INTEL 9SERIES_LP_XHCI 0x9cb1 9 Series xHCI
product INTEL PINEVIEW_DMI 0xa000 Pineview DMI
product INTEL PINEVIEW_IGC_1 0xa001 Pineview Video
product INTEL PINEVIEW_IGC_2 0xa002 Pineview Video
Index: ichiic.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/ichiic.c,v
retrieving revision 1.33
diff -u -p -r1.33 ichiic.c
--- ichiic.c 10 Mar 2014 02:31:12 -0000 1.33
+++ ichiic.c 12 Aug 2014 02:15:29 -0000
@@ -92,6 +92,8 @@ const struct pci_matchid ichiic_ids[] =
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_7SERIES_SMB },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8SERIES_SMB },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8SERIES_LP_SMB },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_9SERIES_SMB },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_9SERIES_LP_SMB },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AA_SMB },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AB_SMB },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801BA_SMB },
Index: azalia.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/azalia.c,v
retrieving revision 1.215
diff -u -p -r1.215 azalia.c
--- azalia.c 13 Jul 2014 23:10:23 -0000 1.215
+++ azalia.c 12 Aug 2014 02:16:00 -0000
@@ -463,6 +463,8 @@ azalia_configure_pci(azalia_t *az)
case PCI_PRODUCT_INTEL_7SERIES_HDA:
case PCI_PRODUCT_INTEL_8SERIES_HDA:
case PCI_PRODUCT_INTEL_8SERIES_LP_HDA:
+ case PCI_PRODUCT_INTEL_9SERIES_HDA:
+ case PCI_PRODUCT_INTEL_9SERIES_LP_HDA:
reg = azalia_pci_read(az->pc, az->tag,
INTEL_PCIE_NOSNOOP_REG);
reg &= INTEL_PCIE_NOSNOOP_MASK;
Index: pucdata.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/pucdata.c,v
retrieving revision 1.92
diff -u -p -r1.92 pucdata.c
--- pucdata.c 2 Feb 2014 19:25:41 -0000 1.92
+++ pucdata.c 12 Aug 2014 02:20:03 -0000
@@ -55,13 +55,41 @@ const struct puc_device_description puc_
{ PUC_COM_POW2(0), 0x10, 0x0000 },
},
},
- { /* Series KT */
+ { /* 7 Series KT */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_7SERIES_KT, 0x0000, 0x0000 },
{ 0xffff, 0xffff, 0x0000, 0x0000 },
{
{ PUC_COM_POW2(0), 0x10, 0x0000 },
},
},
+ { /* 8 Series KT */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8SERIES_KT, 0x0000, 0x0000 },
+ { 0xffff, 0xffff, 0x0000, 0x0000 },
+ {
+ { PUC_COM_POW2(0), 0x10, 0x0000 },
+ },
+ },
+ { /* 8 Series LP KT */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8SERIES_LP_KT, 0x0000, 0x0000 },
+ { 0xffff, 0xffff, 0x0000, 0x0000 },
+ {
+ { PUC_COM_POW2(0), 0x10, 0x0000 },
+ },
+ },
+ { /* 9 Series KT */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_9SERIES_KT, 0x0000, 0x0000 },
+ { 0xffff, 0xffff, 0x0000, 0x0000 },
+ {
+ { PUC_COM_POW2(0), 0x10, 0x0000 },
+ },
+ },
+ { /* 9 Series LP KT */
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_9SERIES_LP_KT, 0x0000, 0x0000 },
+ { 0xffff, 0xffff, 0x0000, 0x0000 },
+ {
+ { PUC_COM_POW2(0), 0x10, 0x0000 },
+ },
+ },
{ /* 82946GZ KT */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82946GZ_KT, 0x0000, 0x0000 },
{ 0xffff, 0xffff, 0x0000, 0x0000 },
@@ -141,13 +169,6 @@ const struct puc_device_description puc_
},
{ /* 3400 KT */
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_KT, 0x0000, 0x0000 },
- { 0xffff, 0xffff, 0x0000, 0x0000 },
- {
- { PUC_COM_POW2(0), 0x10, 0x0000 },
- },
- },
- { /* 8 Series KT */
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8SERIES_KT, 0x0000, 0x0000 },
{ 0xffff, 0xffff, 0x0000, 0x0000 },
{
{ PUC_COM_POW2(0), 0x10, 0x0000 },
Index: pciide.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/pciide.c,v
retrieving revision 1.347
diff -u -p -r1.347 pciide.c
--- pciide.c 13 Jul 2014 23:19:51 -0000 1.347
+++ pciide.c 12 Aug 2014 02:21:09 -0000
@@ -625,6 +625,14 @@ const struct pciide_product_desc pciide_
0,
piixsata_chip_map
},
+ { PCI_PRODUCT_INTEL_9SERIES_SATA_1, /* Intel 9 Series SATA */
+ 0,
+ piixsata_chip_map
+ },
+ { PCI_PRODUCT_INTEL_9SERIES_SATA_2, /* Intel 9 Series SATA */
+ 0,
+ piixsata_chip_map
+ },
{ PCI_PRODUCT_INTEL_ATOMC2000_SATA_1, /* Intel Atom C2000 SATA */
0,
piixsata_chip_map

Module name: src
Changes by: miod@cvs.openbsd.org 2014/08/11 22:28:07

Modified files:
sys/arch/mips64/mips64: mips64_machdep.c

Log message:
Pass 0 instead of uvm_map_hint() to uvm_map() in exec_md_map() to figure out
where to put the fpu assist page, for uvm_map_hint() may return an address
outside userland bounds due to aggressive randomization. Passing zero will
still get a random address, but correctly bounded.

Module name: src
Changes by: miod@cvs.openbsd.org 2014/08/11 22:29:05

Modified files:
sys/uvm : uvm_map.c

Log message:
Revert 1.173 now that the real cause of the octeon regression has been fixed.

Module name: src
Changes by: miod@cvs.openbsd.org 2014/08/11 22:30:21

Modified files:
sys/arch/mips64/mips64: cache_octeon.c

Log message:
Better cache information gathering. Only affects information put in dmesg.

Module name: src
Changes by: mpi@cvs.openbsd.org 2014/08/12 07:52:08

Modified files:
sys/net : route.c route.h rtsock.c

Log message:
route_cb is internal to rtsock.c

Module name: src
Changes by: mikeb@cvs.openbsd.org 2014/08/12 08:38:28

Modified files:
sys/net : pf.c pf_ioctl.c

Log message:
Apart from some minor code reshuffling the big change is that we
start with a ruleset pointer assigned to pf_main_ruleset so that
pf_purge_rule doesn't get called with a NULL.

Prompted by the discussion with Alexandr Nedvedicky <alexandr !
nedvedicky at oracle ! com>.

OK henning

Module name: src
Changes by: mikeb@cvs.openbsd.org 2014/08/12 08:42:06

Modified files:
sys/net : pf.c

Log message:
Make sure that pf_step_into_anchor always saves a pointer to the rule
that owns the anchor on the pf anchor stack. There's no reason why we
should check for depth here. As a side effect this makes sure that the
correct nested anchor gets it's counter bumped instead of the top most.

For the save/restore symmetry pf_step_out_of_anchor is made to always
restore previous value of the anchor rule. depth == 0 means what we a
at the top (main ruleset).

OK henning

Module name: src
Changes by: bcook@cvs.openbsd.org 2014/08/12 09:02:52

Modified files:
lib/libssl/src/crypto: md32_common.h

Log message:
Replace intrinsic ROTATE macros with an inline.

Without the cast/mask, the compiler is allowed to optimize this directly
to the correct CPU intrinsic for rotate.

Module name: src
Changes by: mikeb@cvs.openbsd.org 2014/08/12 09:29:33

Modified files:
sys/net : pf.c pf_ioctl.c pfvar.h

Log message:
Finally implement what's stated in the man page regarding parent
anchors for "once" rules: "In case this is the only rule in the
anchor, the anchor will be destroyed automatically after the rule
is matched." Employ an additional pointer pair to keep track of
the parent ruleset containing the anchor that we want to remove.

OK henning

Module name: src
Changes by: schwarze@cvs.openbsd.org 2014/08/12 13:19:42

Modified files:
usr.bin/mandoc : out.h

Log message:
The macro SCALE_HS_INIT() is always passed the result of strlen() or
an equivalent number as its argument, and strlen() measures the width
of a string in characters, not in basic units. No functional change
right now, but important for the upcoming scaling unit fixes.

Module name: src
Changes by: schwarze@cvs.openbsd.org 2014/08/12 13:27:57

Modified files:
usr.bin/mandoc : out.c

Log message:
In mdoc(7) and man(7), if a width is given as a bare number without
specifying a unit, the implied unit is 'n' (on the terminal, one
character position; in PostScript, half of the current font size
in points), not 'u' (roff output device basic unit). No functional
change right now, but important for the upcoming scaling unit fixes.

Module name: src
Changes by: miod@cvs.openbsd.org 2014/08/12 13:33:59

Modified files:
sys/arch/mips64/mips64: tlbhandler.S

Log message:
addu -> PTR_ADDU when doing address arithmetic in the octeon-specific code path.

Module name: src
Changes by: miod@cvs.openbsd.org 2014/08/12 13:35:28

Modified files:
sys/arch/octeon/include: vmparam.h

Log message:
Lower VM_PHYSSEG_MAX from the mips64 default to a generous 4, and change
allocation strategy to VM_PSTRAT_BIGFIRST.

Module name: src
Changes by: schwarze@cvs.openbsd.org 2014/08/12 14:36:41

Modified files:
lib/libssl/src/doc/crypto: ASN1_OBJECT_new.pod
lib/libssl/src/doc/ssl: SSL_CTX_set_max_cert_list.pod

Log message:
Merge a patch that i successfully pushed to OpenSSL,
original OpenSSL commit message follows:

Fixed as shown; to be released post-1.0.2
commit bebbb11d132cc149f7713d6693703f8bfae10072
Author: Ingo Schwarze <schwarze@usta.de>
Date: Sat Jan 18 11:46:25 2014 +0100

RT3239: Extra comma in NAME lines of two manpages

In two OpenSSL manual pages, in the NAME section, the last word of the
name list is followed by a stray trailing comma. While this may seem
minor, it is worth fixing because it may confuse some makewhatis(8)
implementations.

While here, also add the missing word "size" to the one line
description in SSL_CTX_set_max_cert_list(3).

Reviewed by: Dr Stephen Henson <shenson@drh-consultancy.co.uk>

Module name: src
Changes by: dlg@cvs.openbsd.org 2014/08/12 19:00:16

Modified files:
usr.sbin/tftpd : tftpd.c

Log message:
setsockopt sets errno on failure, so we can use err instead of errx when
handling the error.

Module name: src
Changes by: dlg@cvs.openbsd.org 2014/08/12 19:03:57

Modified files:
usr.sbin/tftpd : tftpd.c

Log message:
use errc instead of juggling errno values in tftpd_listen.

Module name: src
Changes by: deraadt@cvs.openbsd.org 2014/08/13 00:04:10

Modified files:
lib/libcrypto/crypto: arc4random_linux.h arc4random_osx.h
arc4random_solaris.h

Log message:
munmap correct object in (extremely unlikely, and effectively terminal)
case of failing to map the 2nd object.
found by Paul Maurers

Module name: src
Changes by: jsg@cvs.openbsd.org 2014/08/13 01:36:21

Modified files:
sys/dev/pci : pcidevs

Log message:
Add some more 9 series ids, correct some existing ones and add
9 series LP/Wildcat Point-LP entries.
ok millert@

Module name: src
Changes by: jsg@cvs.openbsd.org 2014/08/13 01:36:58

Modified files:
sys/dev/pci : pcidevs.h pcidevs_data.h

Log message:
regen

Module name: src
Changes by: jsg@cvs.openbsd.org 2014/08/13 01:45:37

Modified files:
sys/dev/pci : ichiic.c azalia.c pucdata.c pciide.c

Log message:
match on Intel 9 series and 9 series LP PCH, and add 8 series KT to puc
ok millert@

Module name: src
Changes by: chrisz@cvs.openbsd.org 2014/08/13 02:08:55

Modified files:
usr.sbin/httpd : httpd.c

Log message:
fix early loop termination in httpd path_info()
without this fix httpd always put at least the first
path component in SCRIPT_NAME even when it did not exist.
Now for completely non-existant paths everything goes into
PATH_INFO.

Module name: src
Changes by: nicm@cvs.openbsd.org 2014/08/13 02:42:46

Modified files:
usr.bin/sndiod : dsp.c sndiod.1

Log message:
Spelling - "alignment" not "alignement". ok ratchov

Module name: src
Changes by: blambert@cvs.openbsd.org 2014/08/13 03:46:23

Modified files:
sys/net : if_pflow.h if_pflow.c

Log message:
Bring IPFIX sequence numbers in line with the RFC; original
diff from benno@.

ok benno@, florian@

Module name: www
Changes by: brett@cvs.openbsd.org 2014/08/13 05:13:53

Modified files:
. : plus.html

Log message:
plus.html july 28 to august 3rd.