Module name: src
Changes by: miod@cvs.openbsd.org 2014/08/10 22:45:19

Modified files:
lib/libssl/src/ssl: ssl2.h

Log message:
Remove now-unused SSL2_STATE as well as ssl2-specific state machine values.
ok guenther@ jsing@

Module name: src
Changes by: miod@cvs.openbsd.org 2014/08/10 22:46:42

Modified files:
lib/libssl/src/ssl: s3_srvr.c

Log message:
Unchecked memory allocation and potential leak upon error in
ssl3_get_cert_verify().
ok guenther@ jsing@

Module name: src
Changes by: ajacoutot@cvs.openbsd.org 2014/08/11 00:30:39

Modified files:
usr.sbin/sysmerge: sysmerge.8

Log message:
Move a sentence to the corresponding option description.

from jmc@

Module name: ports
Changes by: brad@cvs.openbsd.org 2014/08/11 00:55:51

Modified files:
x11/wxSVG : Makefile distinfo
x11/wxSVG/pkg : PLIST

Log message:
Update to wxSVG 1.4.2.

ok ajacoutot@

Module name: src
Changes by: jmc@cvs.openbsd.org 2014/08/11 02:21:55

Modified files:
usr.sbin/ldapd : ldapd.8

Log message:
add a caveat about databases;
From: Matthew Weigel

ok gilles

Module name: src
Changes by: ajacoutot@cvs.openbsd.org 2014/08/11 03:03:27

Modified files:
usr.sbin/sysmerge: sysmerge.8 sysmerge.sh

Log message:
Steal stripcom() from /etc/rc to parse sysmerge.ignore.

Module name: www
Changes by: gilles@cvs.openbsd.org 2014/08/11 03:25:55

Modified files:
opensmtpd : index.html

Log message:
replace outdated mirror

Module name: src
Changes by: mpi@cvs.openbsd.org 2014/08/11 03:47:56

Modified files:
usr.sbin/arp : arp.c
usr.sbin/ndp : ndp.c

Log message:
Do not try to delete RTF_LOCAL entries. Such routes are automatically
created /deleted by the kernel when an IP address is added/removed
on/from an interface and should not be manipulated by userland tools.

ok henning@, jca@

Module name: src
Changes by: gilles@cvs.openbsd.org 2014/08/11 03:50:51

Modified files:
usr.sbin/smtpd : table_api.c

Log message:
missing memset in table_api.c (currently only used by pluggable tables)

diff from Martijn van Duren

Module name: www
Changes by: dlg@cvs.openbsd.org 2014/08/11 04:00:45

Modified files:
. : 56.html

Log message:
mpath was enabled this release.

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

Modified files:
lib/libssl/src/ssl: ssl_lib.c

Log message:
Check the return value of sk_SSL_CIPHER_new_null(), since it allocates
memory and can return NULL.

ok miod@

Module name: src
Changes by: mpi@cvs.openbsd.org 2014/08/11 05:50:41

Modified files:
sys/netinet : if_ether.c

Log message:
Convert ARP llinfo allocation to pool(9).

ok henning@, dlg@

Module name: ports
Changes by: sthen@cvs.openbsd.org 2014/08/11 05:18:37

Modified files:
sysutils/ykpers: Makefile distinfo
sysutils/ykpers/pkg: PLIST

Log message:
update to ykpers 1.15.2

Module name: ports
Changes by: sthen@cvs.openbsd.org 2014/08/11 05:34:42

Modified files:
infrastructure/mk: bsd.port.mk

Log message:
When copying pkg/README{,-*} from the port directory, pass -m to SUBST_CMD
to ensure that a sane file mode are set.

Also use SUBST_CMD -m for rc.d scripts (it wasn't available at the time the
current code using a separate chmod was written).

Discussed with espie, slight tweaks to previous diff to take _FAKESUDO into
account.

Module name: ports
Changes by: benoit@cvs.openbsd.org 2014/08/11 05:37:08

Modified files:
net/p5-Net-Whois-RIPE: Makefile distinfo

Log message:
Update p5-Net-Whois-RIPE to 2.005004.

Module name: src
Changes by: mpi@cvs.openbsd.org 2014/08/11 05:59:05

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

Log message:
Put back the checks about RTF_LOCAL routes now that userland tools are
aware of them.

Original commit message was:

Reserve the highest route priority for kernel-managed routes and prevent
userland from playing with the local and broadcast flags.

ok claudio@

Module name: src
Changes by: dlg@cvs.openbsd.org 2014/08/11 06:37:36

Modified files:
sys/kern : subr_pool.c

Log message:
bring back r1.131:

take the pools mutex when copying stats out of it in the sysctl
path so we are guaranteed a consistent snapshot.

Module name: src
Changes by: mpi@cvs.openbsd.org 2014/08/11 06:45:45

Modified files:
sys/dev/cardbus: if_fxp_cardbus.c if_re_cardbus.c
if_rl_cardbus.c if_xl_cardbus.c
sys/dev/eisa : if_ep_eisa.c
sys/dev/isa : if_ec.c if_ef_isapnp.c if_eg.c if_el.c
if_ep_isa.c if_ep_isapnp.c if_ie.c if_lc_isa.c
if_ne_isa.c if_ne_isapnp.c if_sm_isa.c if_we.c
sys/dev/pcmcia : if_cnw.c if_ep_pcmcia.c if_malo.c
if_sm_pcmcia.c if_xe.c
sys/dev/sbus : be.c if_gem_sbus.c if_hme_sbus.c if_ti_sbus.c
qe.c

Log message:
Fewer <netinet/in_systm.h>

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

Modified files:
share/man/man5 : login.conf.5

Log message:
document "tc";
From: Edward

ok millert

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@

Module name: src
Changes by: bcook@cvs.openbsd.org 2014/08/11 07:29:43

Modified files:
lib/libcrypto/crypto/arch/amd64: Makefile.inc
lib/libssl/src/crypto/engine: eng_rsax.c
lib/libssl/src/crypto/evp: e_rc4_hmac_md5.c

Log message:
Guard RSA / RC4-5 ASM when NO_ASM is not defined

Most assembly blocks remain inactive if OPENSSL_NO_ASM is not defined,
only enabling inline assembly, but the RSA / RC4-5 blocks (used only in
amd64 systems) turn on implicitly. Guard these two as well.

This simplifies enabling just inline ASM in portable, no effective
change in OpenBSD.

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

Modified files:
sys/kern : subr_pool.c

Log message:
bring back r1.132:

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: mpi@cvs.openbsd.org 2014/08/11 07:51:07

Modified files:
sys/net : if.c
sys/netinet : if_ether.c
sys/netinet6 : nd6.c

Log message:
Use the RTF_LOCAL flag instead of abusing the RTF_LLINFO flag when
adding local route entries.

This hack made sense when we didn't have the RTF_LOCAL flag, but since
some months it is set on every local route.

Module name: ports
Changes by: ajacoutot@cvs.openbsd.org 2014/08/11 08:02:08

Modified files:
devel/pango : Makefile
devel/pango/pkg: PLIST
x11/gnome/gdm : Makefile
x11/gnome/gdm/pkg: PLIST

Log message:
Drop XXX, we are past 5.6 now.

Module name: src
Changes by: deraadt@cvs.openbsd.org 2014/08/11 09:26:33

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

Log message:
make a few variables more local

Module name: ports
Changes by: ajacoutot@cvs.openbsd.org 2014/08/11 09:25:30

Modified files:
databases/evolution-data-server: Makefile distinfo

Log message:
Update to evolution-data-server-3.12.5.

Module name: ports
Changes by: ajacoutot@cvs.openbsd.org 2014/08/11 09:25:51

Modified files:
mail/evolution : Makefile distinfo

Log message:
Update to evolution-3.12.5.

Module name: ports
Changes by: ajacoutot@cvs.openbsd.org 2014/08/11 09:26:12

Modified files:
mail/evolution-ews: Makefile distinfo

Log message:
Update to evolution-ews-3.12.5.

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

Modified files:
. : MODULES 3RDPARTY

Log message:
update

Module name: ports
Changes by: pascal@cvs.openbsd.org 2014/08/11 10:49:31

Modified files:
devel/git : Makefile distinfo
devel/git/patches: patch-Makefile
devel/git/pkg : PLIST-main

Log message:
Update to 2.0.4; also install the "multimail" hooks as requested by djm@

ok benoit@ (maintainer)

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: ports
Changes by: stsp@cvs.openbsd.org 2014/08/11 11:36:18

Modified files:
devel/subversion: Makefile distinfo

Log message:
Update to Subversion 1.8.10. -stable backports of important fixes will
follow in about a week when new files can be created in the tree again.

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: ports
Changes by: sthen@cvs.openbsd.org 2014/08/11 12:34:59

Modified files:
net/icinga/core: Makefile
net/icinga/core/patches: patch-configure

Log message:
use the correct format string for time_t on i386, unbreaking logging there.
patch bodged into patch-configure for now, to be split out after full unlock.

Module name: ports
Changes by: bluhm@cvs.openbsd.org 2014/08/11 12:44:02

Modified files:
devel/p5-Data-Validate: Makefile distinfo

Log message:
update p5-Data-Validate to 0.09

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}

Module name: ports
Changes by: bluhm@cvs.openbsd.org 2014/08/11 13:19:40

Modified files:
net/p5-Net-SMTP-TLS-ButMaintained: Makefile distinfo
net/p5-Net-SMTP-TLS-ButMaintained/pkg: DESCR

Log message:
- update p5-Net-SMTP-TLS-ButMaintained to 0.24
- mention that this perl module is deprecated
OK sthen@

> 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@