CVS commit: src/sbin/cgdconfig
Module Name:src
Committed By: prlw1
Date: Thu Jun 3 15:40:27 UTC 2021
Modified Files:
src/sbin/cgdconfig: params.c
Log Message:
Make adiantum a first class citizen
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sbin/cgdconfig/params.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/cgdconfig/params.c
diff -u src/sbin/cgdconfig/params.c:1.30 src/sbin/cgdconfig/params.c:1.31
--- src/sbin/cgdconfig/params.c:1.30 Sun Dec 30 12:05:48 2018
+++ src/sbin/cgdconfig/params.c Thu Jun 3 15:40:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: params.c,v 1.30 2018/12/30 12:05:48 mlelstv Exp $ */
+/* $NetBSD: params.c,v 1.31 2021/06/03 15:40:27 prlw1 Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: params.c,v 1.30 2018/12/30 12:05:48 mlelstv Exp $");
+__RCSID("$NetBSD: params.c,v 1.31 2021/06/03 15:40:27 prlw1 Exp $");
#endif
#include
@@ -69,6 +69,7 @@ static struct crypto_defaults {
char alg[32];
int keylen;
} crypto_defaults[] = {
+ { "adiantum", 256 },
{ "aes-cbc", 128 },
{ "aes-xts", 256 },
{ "3des-cbc", 192 },
CVS commit: src/sys/dev/pci
Module Name:src Committed By: prlw1 Date: Wed Apr 22 15:39:59 UTC 2020 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add an eclectic mix of GeForce GTX 680, RTS522A PCI-E Card Reader, intel wifi 9560 + whitespace To generate a diff of this commit: cvs rdiff -u -r1.1409 -r1.1410 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1409 src/sys/dev/pci/pcidevs:1.1410 --- src/sys/dev/pci/pcidevs:1.1409 Wed Apr 22 06:35:58 2020 +++ src/sys/dev/pci/pcidevs Wed Apr 22 15:39:59 2020 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1409 2020/04/22 06:35:58 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1410 2020/04/22 15:39:59 prlw1 Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1109,7 +1109,7 @@ product AMD PCSCSI_PCI 0x2020 PCscsi-PC product AMD GEODELX_PCHB 0x2080 Geode LX Host-PCI Bridge product AMD GEODELX_VGA 0x2081 Geode LX VGA Controller product AMD GEODELX_AES 0x2082 Geode LX AES Security Block -product AMD CS5536_PCISB 0x208f CS5536 GeodeLink PCI South Bridge +product AMD CS5536_PCISB 0x208f CS5536 GeodeLink PCI South Bridge product AMD CS5536_PCIB 0x2090 CS5536 PCI-ISA Bridge product AMD CS5536_FLASH 0x2091 CS5536 Flash product AMD CS5536_AUDIO 0x2093 CS5536 Audio @@ -5475,6 +5475,7 @@ product INTEL 100SERIES_LP_I2C_5 0x9d65 product INTEL 100SERIES_LP_UART_2 0x9d66 100 Series UART 2 product INTEL 100SERIES_LP_HDA 0x9d70 100 Series HD Audio product INTEL 2HS_U_HDA 0x9d71 200 Series HD Audio +product INTEL WIFI_LINK_9560_1 0x9df0 Dual Band Wireless AC 9560 product INTEL 3HS_Y_P_LPC 0x9d83 300 Series Premiun-Y LPC product INTEL 3HS_U_P_LPC 0x9d84 300 Series Premium-U LPC product INTEL 3HS_U_M_LPC 0x9d84 300 Series Mainstream/Base U LPC @@ -6804,6 +6805,7 @@ product NVIDIA NVS_4200M2 0x1057 GeForce product NVIDIA GEFORCE_610M 0x1058 GeForce 610M product NVIDIA GEFORCE_610M2 0x1059 GeForce 610M product NVIDIA GT610M 0x105A GeForce GT 610M +product NVIDIA GF_GTX680 0x1180 GeForce GTX 680 product NVIDIA GF116 0x1244 GeForce GTX 550 Ti product NVIDIA GF_GTX960 0x1401 GeForce GTX 960 product NVIDIA GF_GTX950 0x1402 GeForce GTX 950 @@ -7211,6 +7213,7 @@ product REALTEK RTS5208 0x5208 RTS5208 product REALTEK RTS5209 0x5209 RTS5209 PCI-E Card Reader product REALTEK RTS5227 0x5227 RTS5227 PCI-E Card Reader product REALTEK RTS5229 0x5229 RTS5229 PCI-E Card Reader +product REALTEK RTS522A 0x522A RTS522A PCI-E Card Reader product REALTEK RTS5249 0x5249 RTS5249 PCI-E Card Reader product REALTEK RTS525A 0x525A RTS525A PCI-E Card Reader product REALTEK RTL8402 0x5286 RTL8402 PCI-E Card Reader
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: prlw1 Date: Mon Mar 23 22:29:23 UTC 2020 Modified Files: src/sys/arch/evbarm/conf: RPI_INSTALL Log Message: The image size increased. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/RPI_INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/RPI_INSTALL diff -u src/sys/arch/evbarm/conf/RPI_INSTALL:1.12 src/sys/arch/evbarm/conf/RPI_INSTALL:1.13 --- src/sys/arch/evbarm/conf/RPI_INSTALL:1.12 Fri Jan 24 06:34:19 2020 +++ src/sys/arch/evbarm/conf/RPI_INSTALL Mon Mar 23 22:29:23 2020 @@ -1,4 +1,4 @@ -# $NetBSD: RPI_INSTALL,v 1.12 2020/01/24 06:34:19 mlelstv Exp $ +# $NetBSD: RPI_INSTALL,v 1.13 2020/03/23 22:29:23 prlw1 Exp $ # # RPI_INSTALL -- RPI kernel with installation-sized # ramdisk @@ -8,7 +8,7 @@ include "arch/evbarm/conf/RPI" include "arch/evbarm/conf/INSTALL" no options MEMORY_DISK_ROOT_SIZE -options MEMORY_DISK_ROOT_SIZE=66000 +options MEMORY_DISK_ROOT_SIZE=86000 makeoptions RAMDISKNAME=sshramdisk no makeoptions DEBUG
CVS commit: src/external/bsd/nsd
Module Name:src
Committed By: prlw1
Date: Thu Feb 14 14:40:08 UTC 2019
Modified Files:
src/external/bsd/nsd: Makefile.inc
Log Message:
libpthread isn't used
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nsd/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nsd/Makefile.inc
diff -u src/external/bsd/nsd/Makefile.inc:1.5 src/external/bsd/nsd/Makefile.inc:1.6
--- src/external/bsd/nsd/Makefile.inc:1.5 Fri Oct 12 09:43:59 2018
+++ src/external/bsd/nsd/Makefile.inc Thu Feb 14 14:40:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2018/10/12 09:43:59 hannken Exp $
+# $NetBSD: Makefile.inc,v 1.6 2019/02/14 14:40:07 prlw1 Exp $
.include
@@ -23,7 +23,6 @@ DPLIBS+= ssl ${NETBSDSRCDIR}/crypto/exte
DPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto
DPLIBS+= crypt ${NETBSDSRCDIR}/lib/libcrypt
DPLIBS+= util ${NETBSDSRCDIR}/lib/libutil
-DPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
__subst: .USE
${TOOL_SED} \
CVS commit: src/doc
Module Name:src Committed By: prlw1 Date: Tue Feb 12 16:13:23 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new nsd To generate a diff of this commit: cvs rdiff -u -r1.1597 -r1.1598 src/doc/3RDPARTY cvs rdiff -u -r1.2500 -r1.2501 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1597 src/doc/3RDPARTY:1.1598 --- src/doc/3RDPARTY:1.1597 Thu Feb 7 21:40:40 2019 +++ src/doc/3RDPARTY Tue Feb 12 16:13:23 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1597 2019/02/07 21:40:40 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1598 2019/02/12 16:13:23 prlw1 Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -154,7 +154,7 @@ Use cleantags to import run configure and update config files in include Package: nsd -Version: 4.1.24 +Version: 4.1.26 Current Vers: 4.1.26 Maintainer: Christos Zoulas Archive Site: https://www.nlnetlabs.nl/svn/nsd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2500 src/doc/CHANGES:1.2501 --- src/doc/CHANGES:1.2500 Fri Feb 8 09:39:14 2019 +++ src/doc/CHANGES Tue Feb 12 16:13:23 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2500 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2501 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -327,3 +327,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: ure(4): Add driver for Realtek RTL8152/RTL8153 from OpenBSD. [rin 20190206] dhcpcd: Import dhcpcd-7.1.1 [roy 20190207] + nsd: Import 4.1.26 [prlw1 20190212]
CVS import: src/external/bsd/nsd/dist
Module Name:src Committed By: prlw1 Date: Tue Feb 12 15:49:03 UTC 2019 Update of /cvsroot/src/external/bsd/nsd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5840 Log Message: Import nsd-4.1.26 29 November 2018: Wouter - Tag for 4.1.26rc1. 27 November 2018: Wouter - Fix parsezone failure in 4194 fix. 26 November 2018: Wouter - Fix to not set GLOB_NOSORT so the nsd.conf include: files are sorted and in a predictable order. - Added nsd-control changezone. nsd-control changezone name pattern allows the change of a zone pattern option without downtime for the zone, in one operation. - Fix #3433: document that reconfig does not change per-zone stats. 20 November 2018: Wouter - Fix #4205: enable-recvmmsg in mixed IPv4/IPv6 environment fails. This sets the msg_hdr.msg_namelen correctly after receipt. 19 November 2018: Wouter - Support SO_REUSEPORT_LB in FreeBSD 12 with the reuseport: yes option in nsd.conf. - Fix #4202: nsd-control delzone incorrect exit code on error. - Tab style fix to use tab for 8 spaces, from Xiaobo Liu. 25 October 2018: Wouter - Adjust dnstap socket path for chroot. 22 October 2018: Wouter - Fix #4194: Zone file parser derailed by non-FQDN names in RHS of DNSSEC RRs. - Fix some more, neater code and checks for domain length limit. - check that the dnstap socket file can be opened and exists, print error if not. 4 October 2018: Wouter - dnstap work, the dnstap.proto is a copy of the file from Unbound, also dnstap.m4 configure include file. - dnstap collector: free eventbase and memclean nicer. - dnstap collector: send data and read it in collector. - dnstap/dnstap.c and .h from Unbound's contribution from Farsight Security, added to then adapt it for dnstap logging in NSD. - dnstap.c with auth query and auth response, and called from the collector. - dnstap work, config nsd.conf parse. - dnstap example config. 25 September 2018: Wouter - NSD 4.1.25 released, trunk has 4.1.26 in development. 18 September 2018: Wouter - tag for NSD 4.1.25rc1. 17 September 2018: Wouter - Fix #4156: Fix systemd service manager state change notification 14 September 2018: Wouter - Remove unused if clause during server service startup. 13 September 2018: Wouter - Fix typo in clang analysis test. - Annotate exit functions with noreturn. - nsd-control prints neater errors for file failures. 12 September 2018: Wouter - clang analysis test. 11 September 2018: Wouter - Fix to combine the same error function into one, from Xiaobo Liu. - Fix initialisation in remote.c. - please clang analyzer and fix parse of IPSECKEY with bad gateway. - Fix unit test code for clang analyzer. - Fix nsd-checkconf fail on bad zone name. 10 September 2018: Wouter - Fix coding style in nsd.c 7 September 2018: Wouter - append_trailing_slash has one implementation and is not repeated differently. 4 September 2018: Wouter - Fix codingstyle in nsd-checkconf.c in patch from Sharp Liu. 15 August 2018: Wouter - Fix use_systemd typo/leftover in remote.c. Status: Vendor Tag: NLNETLABS Release Tags: nsd-4-1-26 U src/external/bsd/nsd/dist/nsec3.h U src/external/bsd/nsd/dist/udbzone.c U src/external/bsd/nsd/dist/rbtree.h U src/external/bsd/nsd/dist/udbradtree.c U src/external/bsd/nsd/dist/lookup3.h U src/external/bsd/nsd/dist/configyyrename.h C src/external/bsd/nsd/dist/configparser.h U src/external/bsd/nsd/dist/tsig.h U src/external/bsd/nsd/dist/edns.h U src/external/bsd/nsd/dist/iterated_hash.c U src/external/bsd/nsd/dist/nsd.conf.5.in U src/external/bsd/nsd/dist/namedb.c U src/external/bsd/nsd/dist/answer.h U src/external/bsd/nsd/dist/difffile.h U src/external/bsd/nsd/dist/nsd-checkzone.c C src/external/bsd/nsd/dist/zparser.h U src/external/bsd/nsd/dist/dbaccess.c U src/external/bsd/nsd/dist/dbcreate.c U src/external/bsd/nsd/dist/region-allocator.c U src/external/bsd/nsd/dist/dns.c C src/external/bsd/nsd/dist/zparser.c U src/external/bsd/nsd/dist/xfrd.c U src/external/bsd/nsd/dist/zonec.c U src/external/bsd/nsd/dist/axfr.c U src/external/bsd/nsd/dist/nsec3.c U src/external/bsd/nsd/dist/query.h U src/external/bsd/nsd/dist/nsd.h U src/external/bsd/nsd/dist/lookup3.c U src/external/bsd/nsd/dist/config.h.in U src/external/bsd/nsd/dist/edns.c C src/external/bsd/nsd/dist/server.c C src/external/bsd/nsd/dist/util.h U src/external/bsd/nsd/dist/xfrd-disk.h U src/external/bsd/nsd/dist/configparser.y U src/external/bsd/nsd/dist/rbtree.c U src/external/bsd/nsd/dist/rrl.c U src/external/bsd/nsd/dist/xfrd-tcp.h U src/external/bsd/nsd/dist/zlexer.lex U src/external/bsd/nsd/dist/zonec.h U src/external/b
CVS commit: src/sys/dev/pci
Module Name:src Committed By: prlw1 Date: Tue Nov 20 15:16:43 UTC 2018 Modified Files: src/sys/dev/pci: ahcisata_pci.c Log Message: Trivial build fix To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pci/ahcisata_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/ahcisata_pci.c diff -u src/sys/dev/pci/ahcisata_pci.c:1.44 src/sys/dev/pci/ahcisata_pci.c:1.45 --- src/sys/dev/pci/ahcisata_pci.c:1.44 Tue Nov 20 12:23:01 2018 +++ src/sys/dev/pci/ahcisata_pci.c Tue Nov 20 15:16:43 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisata_pci.c,v 1.44 2018/11/20 12:23:01 skrll Exp $ */ +/* $NetBSD: ahcisata_pci.c,v 1.45 2018/11/20 15:16:43 prlw1 Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.44 2018/11/20 12:23:01 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.45 2018/11/20 15:16:43 prlw1 Exp $"); #ifdef _KERNEL_OPT #include "opt_ahcisata_pci.h" @@ -326,7 +326,7 @@ alloc_retry: /* The next try is for MSI: Disable MSIX */ counts[PCI_INTR_TYPE_INTX] = 1; #ifndef AHCISATA_DISABLE_MSI - counts[PCI_INTR_TYPE_MSI] = 1;, + counts[PCI_INTR_TYPE_MSI] = 1; #endif counts[PCI_INTR_TYPE_MSIX] = 0; goto alloc_retry;
CVS commit: src/sbin/cgdconfig
Module Name:src Committed By: prlw1 Date: Sat Sep 1 11:46:52 UTC 2018 Modified Files: src/sbin/cgdconfig: cgdconfig.8 Log Message: typo To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sbin/cgdconfig/cgdconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/cgdconfig/cgdconfig.8 diff -u src/sbin/cgdconfig/cgdconfig.8:1.40 src/sbin/cgdconfig/cgdconfig.8:1.41 --- src/sbin/cgdconfig/cgdconfig.8:1.40 Wed May 9 20:23:35 2018 +++ src/sbin/cgdconfig/cgdconfig.8 Sat Sep 1 11:46:52 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: cgdconfig.8,v 1.40 2018/05/09 20:23:35 kre Exp $ +.\" $NetBSD: cgdconfig.8,v 1.41 2018/09/01 11:46:52 prlw1 Exp $ .\" .\" Copyright (c) 2002, The NetBSD Foundation, Inc. .\" All rights reserved. @@ -90,7 +90,7 @@ The options are as follows: .It Fl C Configure all the devices listed in the cgd configuration file. .It Fl e -Echo the passphase. +Echo the passphrase. .It Fl f Ar configfile Specify the configuration file explicitly, rather than using the default configuration file
CVS commit: src/sys/dev/usb
Module Name:src Committed By: prlw1 Date: Thu Aug 9 21:23:23 UTC 2018 Modified Files: src/sys/dev/usb: ohci.c Log Message: whitespace To generate a diff of this commit: cvs rdiff -u -r1.283 -r1.284 src/sys/dev/usb/ohci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/ohci.c diff -u src/sys/dev/usb/ohci.c:1.283 src/sys/dev/usb/ohci.c:1.284 --- src/sys/dev/usb/ohci.c:1.283 Thu Aug 9 21:16:43 2018 +++ src/sys/dev/usb/ohci.c Thu Aug 9 21:23:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ohci.c,v 1.283 2018/08/09 21:16:43 prlw1 Exp $ */ +/* $NetBSD: ohci.c,v 1.284 2018/08/09 21:23:23 prlw1 Exp $ */ /* * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.283 2018/08/09 21:16:43 prlw1 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.284 2018/08/09 21:23:23 prlw1 Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -1389,7 +1389,7 @@ ohci_softintr(void *v) int len, cc; int i, j, actlen, iframes, uedir; ohci_physaddr_t done; - bool polling __diagused= sc->sc_bus.ub_usepolling; + bool polling __diagused = sc->sc_bus.ub_usepolling; KASSERT(polling || mutex_owned(&sc->sc_lock));
CVS commit: src/sys/dev/usb
Module Name:src Committed By: prlw1 Date: Thu Aug 9 21:16:43 UTC 2018 Modified Files: src/sys/dev/usb: ohci.c uhci.c Log Message: Sprinkle __diagused To generate a diff of this commit: cvs rdiff -u -r1.282 -r1.283 src/sys/dev/usb/ohci.c cvs rdiff -u -r1.281 -r1.282 src/sys/dev/usb/uhci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/ohci.c diff -u src/sys/dev/usb/ohci.c:1.282 src/sys/dev/usb/ohci.c:1.283 --- src/sys/dev/usb/ohci.c:1.282 Thu Aug 9 06:26:47 2018 +++ src/sys/dev/usb/ohci.c Thu Aug 9 21:16:43 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ohci.c,v 1.282 2018/08/09 06:26:47 mrg Exp $ */ +/* $NetBSD: ohci.c,v 1.283 2018/08/09 21:16:43 prlw1 Exp $ */ /* * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.282 2018/08/09 06:26:47 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.283 2018/08/09 21:16:43 prlw1 Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -1389,7 +1389,7 @@ ohci_softintr(void *v) int len, cc; int i, j, actlen, iframes, uedir; ohci_physaddr_t done; - bool polling = sc->sc_bus.ub_usepolling; + bool polling __diagused= sc->sc_bus.ub_usepolling; KASSERT(polling || mutex_owned(&sc->sc_lock)); Index: src/sys/dev/usb/uhci.c diff -u src/sys/dev/usb/uhci.c:1.281 src/sys/dev/usb/uhci.c:1.282 --- src/sys/dev/usb/uhci.c:1.281 Thu Aug 9 06:26:47 2018 +++ src/sys/dev/usb/uhci.c Thu Aug 9 21:16:43 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: uhci.c,v 1.281 2018/08/09 06:26:47 mrg Exp $ */ +/* $NetBSD: uhci.c,v 1.282 2018/08/09 21:16:43 prlw1 Exp $ */ /* * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.281 2018/08/09 06:26:47 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.282 2018/08/09 21:16:43 prlw1 Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -1555,7 +1555,7 @@ uhci_idone(struct uhci_xfer *ux, ux_comp struct uhci_pipe *upipe = UHCI_PIPE2UPIPE(xfer->ux_pipe); uhci_soft_td_t *std; uint32_t status = 0, nstatus; - bool polling = sc->sc_bus.ub_usepolling; + bool polling __diagused = sc->sc_bus.ub_usepolling; int actlen; KASSERT(polling || mutex_owned(&sc->sc_lock));
CVS commit: src/sys/dev/pci
Module Name:src Committed By: prlw1 Date: Fri Jul 6 14:58:22 UTC 2018 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.1334 -r1.1335 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1333 -r1.1334 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/sys/dev/pci
Module Name:src Committed By: prlw1 Date: Fri Jul 6 14:46:27 UTC 2018 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Western Digital (Sandisk) WD Black NVMe SSD as per suggestion from thorpej@ To generate a diff of this commit: cvs rdiff -u -r1.1343 -r1.1344 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1343 src/sys/dev/pci/pcidevs:1.1344 --- src/sys/dev/pci/pcidevs:1.1343 Wed Jun 20 09:10:33 2018 +++ src/sys/dev/pci/pcidevs Fri Jul 6 14:46:27 2018 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1343 2018/06/20 09:10:33 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1344 2018/07/06 14:46:27 prlw1 Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -596,6 +596,7 @@ vendor GEOCAST 0x15a1 Geocast Network S vendor BLUESTEEL 0x15ab Bluesteel Networks vendor VMWARE 0x15ad VMware vendor MELLANOX 0x15b3 Mellanox Technologies +vendor SANDISK 0x15b7 Western Digital (SanDisk) vendor AGILENT 0x15bc Agilent Technologies vendor SUPERMICRO 0x15d9 Super Micro Computer Inc vendor NDC 0x15e8 National Datacomm @@ -6737,6 +6738,9 @@ product SANDBURST QE1000 0x0180 QE1000 product SANDBURST FE1000 0x0200 FE1000 /*product SANDBURST SE1600 0x0100 SE1600*/ +/* Western Digital (SanDisk) products */ +product SANDISK WDBLACK_NVME 0x5002 WD Black NVMe SSD + /* SEGA Enterprises products */ product SEGA BROADBAND 0x1234 Broadband Adapter
CVS commit: src/sys/netinet6
Module Name:src
Committed By: prlw1
Date: Tue May 29 09:10:39 UTC 2018
Modified Files:
src/sys/netinet6: in6.c
Log Message:
Mark in6m as used for non-DIAGNOSTIC builds.
To generate a diff of this commit:
cvs rdiff -u -r1.267 -r1.268 src/sys/netinet6/in6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.267 src/sys/netinet6/in6.c:1.268
--- src/sys/netinet6/in6.c:1.267 Tue May 29 04:37:16 2018
+++ src/sys/netinet6/in6.c Tue May 29 09:10:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.267 2018/05/29 04:37:16 ozaki-r Exp $ */
+/* $NetBSD: in6.c,v 1.268 2018/05/29 09:10:39 prlw1 Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.267 2018/05/29 04:37:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.268 2018/05/29 09:10:39 prlw1 Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1405,7 +1405,7 @@ in6_purgeaddr(struct ifaddr *ifa)
again:
mutex_enter(&in6_ifaddr_lock);
while ((imm = LIST_FIRST(&ia->ia6_memberships)) != NULL) {
- struct in6_multi *in6m = imm->i6mm_maddr;
+ struct in6_multi *in6m __diagused = imm->i6mm_maddr;
KASSERT(in6m == NULL || in6m->in6m_ifp == ifp);
LIST_REMOVE(imm, i6mm_chain);
mutex_exit(&in6_ifaddr_lock);
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: prlw1
Date: Wed Feb 7 15:55:58 UTC 2018
Modified Files:
src/sys/dev/usb: xhci.c
Log Message:
xhci.c: avoid unused variable in non-DIAGNOSTIC build
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/usb/xhci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.85 src/sys/dev/usb/xhci.c:1.86
--- src/sys/dev/usb/xhci.c:1.85 Thu Feb 1 09:55:37 2018
+++ src/sys/dev/usb/xhci.c Wed Feb 7 15:55:58 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.85 2018/02/01 09:55:37 msaitoh Exp $ */
+/* $NetBSD: xhci.c,v 1.86 2018/02/07 15:55:58 prlw1 Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.85 2018/02/01 09:55:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.86 2018/02/07 15:55:58 prlw1 Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -3658,7 +3658,7 @@ xhci_root_intr_start(struct usbd_xfer *x
static void
xhci_root_intr_abort(struct usbd_xfer *xfer)
{
- struct xhci_softc * const sc = XHCI_XFER2SC(xfer);
+ struct xhci_softc * const sc __diagused = XHCI_XFER2SC(xfer);
XHCIHIST_FUNC(); XHCIHIST_CALLED();
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: prlw1
Date: Thu Jan 25 15:01:05 UTC 2018
Modified Files:
src/sys/arch/x86/pci: amdzentemp.c
Log Message:
Unused variable build fix. (now void *aux is unused)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/pci/amdzentemp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/amdzentemp.c
diff -u src/sys/arch/x86/pci/amdzentemp.c:1.1 src/sys/arch/x86/pci/amdzentemp.c:1.2
--- src/sys/arch/x86/pci/amdzentemp.c:1.1 Thu Jan 25 01:22:21 2018
+++ src/sys/arch/x86/pci/amdzentemp.c Thu Jan 25 15:01:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amdzentemp.c,v 1.1 2018/01/25 01:22:21 christos Exp $ */
+/* $NetBSD: amdzentemp.c,v 1.2 2018/01/25 15:01:05 prlw1 Exp $ */
/* $OpenBSD: kate.c,v 1.2 2008/03/27 04:52:03 cnst Exp $ */
/*
@@ -50,7 +50,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: amdzentemp.c,v 1.1 2018/01/25 01:22:21 christos Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdzentemp.c,v 1.2 2018/01/25 15:01:05 prlw1 Exp $ ");
#include
#include
@@ -98,8 +98,6 @@ CFATTACH_DECL_NEW(amdzentemp, sizeof(str
static int
amdzentemp_match(device_t parent, cfdata_t match, void *aux)
{
- struct pci_attach_args *pa = aux;
-
KASSERT(PCI_VENDOR(pa->pa_id) == PCI_VENDOR_AMD);
cfdata_t parent_cfdata = device_cfdata(parent);
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src
Committed By: prlw1
Date: Thu May 26 09:09:47 UTC 2016
Modified Files:
src/external/bsd/dhcpcd/dist: dhcp.c dhcp.h
Log Message:
Handle truncated DHCP messages, provided only the BOOTP vendor area
is truncated. [3fd740f3ed]
OK from roy@
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/dhcpcd/dist/dhcp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/dhcp.c:1.41 src/external/bsd/dhcpcd/dist/dhcp.c:1.42
--- src/external/bsd/dhcpcd/dist/dhcp.c:1.41 Mon May 9 20:28:08 2016
+++ src/external/bsd/dhcpcd/dist/dhcp.c Thu May 26 09:09:47 2016
@@ -1,5 +1,5 @@
#include
- __RCSID("$NetBSD: dhcp.c,v 1.41 2016/05/09 20:28:08 martin Exp $");
+ __RCSID("$NetBSD: dhcp.c,v 1.42 2016/05/26 09:09:47 prlw1 Exp $");
/*
* dhcpcd - DHCP client daemon
@@ -1087,9 +1087,12 @@ make_message(struct bootp **bootpm, cons
*p++ = DHO_END;
len = (size_t)(p - (uint8_t *)bootp);
- /* Pad out to the BOOTP minimum message length.
- * Some DHCP servers incorrectly require this. */
- while (len < BOOTP_MESSAGE_LENTH_MIN) {
+ /* Pad out to the BOOTP message length.
+ * Even if we send a DHCP packet with a variable length vendor area,
+ * some servers / relay agents don't like packets smaller than
+ * a BOOTP message which is fine because that's stipulated
+ * in RFC1542 section 2.1. */
+ while (len < sizeof(*bootp)) {
*p++ = DHO_PAD;
len++;
}
@@ -3139,14 +3142,26 @@ dhcp_handlepacket(void *arg)
"%s: server %s is not destination",
ifp->name, inet_ntoa(from));
}
-
+ /*
+ * DHCP has a variable option area rather than a fixed
+ * vendor area.
+ * Because DHCP uses the BOOTP protocol it should
+ * still send BOOTP sized packets to be RFC compliant.
+ * However some servers send a truncated vendor area.
+ * dhcpcd can work fine without the vendor area being sent.
+ */
bytes = get_udp_data(&bootp, buf);
- if (bytes < sizeof(struct bootp)) {
+ if (bytes < offsetof(struct bootp, vend)) {
logger(ifp->ctx, LOG_ERR,
"%s: truncated packet (%zu) from %s",
ifp->name, bytes, inet_ntoa(from));
continue;
}
+ /* But to make our IS_DHCP macro easy, ensure the vendor
+ * area has at least 4 octets. */
+ while (bytes < offsetof(struct bootp, vend) + 4)
+ bootp[bytes++] = '\0';
+
dhcp_handledhcp(ifp, (struct bootp *)bootp, bytes, &from);
if (state->raw_fd == -1)
break;
Index: src/external/bsd/dhcpcd/dist/dhcp.h
diff -u src/external/bsd/dhcpcd/dist/dhcp.h:1.15 src/external/bsd/dhcpcd/dist/dhcp.h:1.16
--- src/external/bsd/dhcpcd/dist/dhcp.h:1.15 Mon May 9 10:15:59 2016
+++ src/external/bsd/dhcpcd/dist/dhcp.h Thu May 26 09:09:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: dhcp.h,v 1.15 2016/05/09 10:15:59 roy Exp $ */
+/* $NetBSD: dhcp.h,v 1.16 2016/05/26 09:09:47 prlw1 Exp $ */
/*
* dhcpcd - DHCP client daemon
@@ -133,9 +133,6 @@ enum FQDN {
FQDN_BOTH = 0x31
};
-/* Some crappy DHCP servers require the BOOTP minimum length */
-#define BOOTP_MESSAGE_LENTH_MIN 300
-
/* Don't import common.h as that defines __unused which causes problems
* on some Linux systems which define it as part of a structure */
#if __GNUC__ > 2 || defined(__INTEL_COMPILER)
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src Committed By: prlw1 Date: Tue Oct 6 10:21:08 UTC 2015 Modified Files: src/sys/external/bsd/ipf/netinet: ip_nat.c ip_nat6.c Log Message: Update comments to match previous change (avoid panic in SIOCGNATL) To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/ipf/netinet/ip_nat.c cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/ipf/netinet/ip_nat6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/ipf/netinet/ip_nat.c diff -u src/sys/external/bsd/ipf/netinet/ip_nat.c:1.14 src/sys/external/bsd/ipf/netinet/ip_nat.c:1.15 --- src/sys/external/bsd/ipf/netinet/ip_nat.c:1.14 Fri Aug 7 17:31:12 2015 +++ src/sys/external/bsd/ipf/netinet/ip_nat.c Tue Oct 6 10:21:08 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_nat.c,v 1.14 2015/08/07 17:31:12 prlw1 Exp $ */ +/* $NetBSD: ip_nat.c,v 1.15 2015/10/06 10:21:08 prlw1 Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -113,7 +113,7 @@ extern struct ifnet vpnif; #if !defined(lint) #if defined(__NetBSD__) #include -__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.14 2015/08/07 17:31:12 prlw1 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.15 2015/10/06 10:21:08 prlw1 Exp $"); #else static const char sccsid[] = "@(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed"; static const char rcsid[] = "@(#)Id: ip_nat.c,v 1.1.1.2 2012/07/22 13:45:27 darrenr Exp"; @@ -4558,8 +4558,9 @@ find_out_wild_ports: /* Function:ipf_nat_lookupredir */ /* Returns: nat_t* - NULL == no match, */ /* else pointer to matching NAT entry */ -/* Parameters: np(I) - pointer to description of packet to find NAT table */ -/* entry for. */ +/* Parameters: softc(I) - pointer to soft context main structure */ +/* np(I)- pointer to description of packet to find NAT */ +/* table entry for. */ /* */ /* Lookup the NAT tables to search for a matching redirect */ /* The contents of natlookup_t should imitate those found in a packet that */ Index: src/sys/external/bsd/ipf/netinet/ip_nat6.c diff -u src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.8 src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.9 --- src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.8 Fri Aug 7 17:31:12 2015 +++ src/sys/external/bsd/ipf/netinet/ip_nat6.c Tue Oct 6 10:21:08 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_nat6.c,v 1.8 2015/08/07 17:31:12 prlw1 Exp $ */ +/* $NetBSD: ip_nat6.c,v 1.9 2015/10/06 10:21:08 prlw1 Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -2398,8 +2398,9 @@ find_out_wild_ports: /* Function:ipf_nat6_lookupredir*/ /* Returns: nat6_t* - NULL == no match, */ /* else pointer to matching NAT entry */ -/* Parameters: np(I) - pointer to description of packet to find NAT table */ -/* entry for. */ +/* Parameters: softc(I) - pointer to soft context main structure */ +/* np(I)- pointer to description of packet to find NAT */ +/* table entry for. */ /* */ /* Lookup the NAT tables to search for a matching redirect */ /* The contents of natlookup_t should imitate those found in a packet that */
CVS commit: src/external/bsd/ipf/dist/man
Module Name:src Committed By: prlw1 Date: Tue Aug 11 16:06:53 UTC 2015 Modified Files: src/external/bsd/ipf/dist/man: ipnat.5 Log Message: fix typos To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/dist/man/ipnat.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ipf/dist/man/ipnat.5 diff -u src/external/bsd/ipf/dist/man/ipnat.5:1.3 src/external/bsd/ipf/dist/man/ipnat.5:1.4 --- src/external/bsd/ipf/dist/man/ipnat.5:1.3 Sun Jul 22 14:27:51 2012 +++ src/external/bsd/ipf/dist/man/ipnat.5 Tue Aug 11 16:06:52 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: ipnat.5,v 1.3 2012/07/22 14:27:51 darrenr Exp $ +.\" $NetBSD: ipnat.5,v 1.4 2015/08/11 16:06:52 prlw1 Exp $ .\" .TH IPNAT 5 .SH NAME @@ -149,8 +149,8 @@ map le0 10.0.0.0/8 -> 192.168.55.2/32 gr For TCP connections exiting a connection such as PPPoE where the MTU is slightly smaller than normal ethernet, it can be useful to reduce the Maximum Segment Size (MSS) offered by the internal machines to match, -reducing the liklihood that the either end will attempt to send packets -that are too big and result in fragmentation. This is acheived using the +reducing the likelihood that either end will attempt to send packets +that are too big and result in fragmentation. This is achieved using the .B mssclamp option with TCP .B map @@ -356,7 +356,7 @@ rdr le0 from 1.1.0.0/16 to any -> 192.16 rdr le0 ! from 1.1.0.0/16 to any -> 192.168.1.4 .fi .PP -If there is a consective set of addresses you wish to spread the packets +If there is a consecutive set of addresses you wish to spread the packets over, then this can be done in one of two ways, the word "range" optional to preserve: .nf @@ -402,7 +402,7 @@ feature can only be combined with .B round-robin and the use of comma. .PP -For TCP and UDP packets, it is possible to both match on the destiantion +For TCP and UDP packets, it is possible to both match on the destination port number and to modify it. For example, to change the destination port from 80 to 3128, we would use a rule like this: .nf
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src
Committed By: prlw1
Date: Fri Aug 7 17:31:12 UTC 2015
Modified Files:
src/sys/external/bsd/ipf/netinet: ip_nat.c ip_nat.h ip_nat6.c
Log Message:
Avoid panic in SIOCGNATL dereferencing a NULL softc.
Solution suggestion from Martin Husemann.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/ipf/netinet/ip_nat.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/ipf/netinet/ip_nat.h
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/ipf/netinet/ip_nat6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/ipf/netinet/ip_nat.c
diff -u src/sys/external/bsd/ipf/netinet/ip_nat.c:1.13 src/sys/external/bsd/ipf/netinet/ip_nat.c:1.14
--- src/sys/external/bsd/ipf/netinet/ip_nat.c:1.13 Sat Jul 12 14:54:32 2014
+++ src/sys/external/bsd/ipf/netinet/ip_nat.c Fri Aug 7 17:31:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_nat.c,v 1.13 2014/07/12 14:54:32 darrenr Exp $ */
+/* $NetBSD: ip_nat.c,v 1.14 2015/08/07 17:31:12 prlw1 Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -113,7 +113,7 @@ extern struct ifnet vpnif;
#if !defined(lint)
#if defined(__NetBSD__)
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.13 2014/07/12 14:54:32 darrenr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_nat.c,v 1.14 2015/08/07 17:31:12 prlw1 Exp $");
#else
static const char sccsid[] = "@(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_nat.c,v 1.1.1.2 2012/07/22 13:45:27 darrenr Exp";
@@ -1227,11 +1227,11 @@ ipf_nat_ioctl(ipf_main_softc_t *softc, v
switch (nl.nl_v)
{
case 4 :
-ptr = ipf_nat_lookupredir(&nl);
+ptr = ipf_nat_lookupredir(softc, &nl);
break;
#ifdef USE_INET6
case 6 :
-ptr = ipf_nat6_lookupredir(&nl);
+ptr = ipf_nat6_lookupredir(softc, &nl);
break;
#endif
default:
@@ -4574,12 +4574,13 @@ find_out_wild_ports:
/* nl_out* = destination information (translated) */
/* */
nat_t *
-ipf_nat_lookupredir(natlookup_t *np)
+ipf_nat_lookupredir(ipf_main_softc_t *softc, natlookup_t *np)
{
fr_info_t fi;
nat_t *nat;
bzero((char *)&fi, sizeof(fi));
+ fi.fin_main_soft = softc;
if (np->nl_flags & IPN_IN) {
fi.fin_data[0] = ntohs(np->nl_realport);
fi.fin_data[1] = ntohs(np->nl_outport);
Index: src/sys/external/bsd/ipf/netinet/ip_nat.h
diff -u src/sys/external/bsd/ipf/netinet/ip_nat.h:1.6 src/sys/external/bsd/ipf/netinet/ip_nat.h:1.7
--- src/sys/external/bsd/ipf/netinet/ip_nat.h:1.6 Wed Jan 9 13:23:20 2013
+++ src/sys/external/bsd/ipf/netinet/ip_nat.h Fri Aug 7 17:31:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_nat.h,v 1.6 2013/01/09 13:23:20 christos Exp $ */
+/* $NetBSD: ip_nat.h,v 1.7 2015/08/07 17:31:12 prlw1 Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -721,7 +721,7 @@ extern int ipf_nat_ioctl(ipf_main_softc_
int, int, void *);
extern void ipf_nat_log(ipf_main_softc_t *, ipf_nat_softc_t *,
struct nat *, u_int);
-extern nat_t *ipf_nat_lookupredir(natlookup_t *);
+extern nat_t *ipf_nat_lookupredir(ipf_main_softc_t *, natlookup_t *);
extern nat_t *ipf_nat_maplookup(void *, u_int, struct in_addr,
struct in_addr);
extern nat_t *ipf_nat_add(fr_info_t *, ipnat_t *, nat_t **,
@@ -780,7 +780,7 @@ extern nat_t *ipf_nat6_inlookup(fr_info_
extern u_32_t ipf_nat6_ip6subtract(i6addr_t *, i6addr_t *);
extern frentry_t *ipf_nat6_ipfin(fr_info_t *, u_32_t *);
extern frentry_t *ipf_nat6_ipfout(fr_info_t *, u_32_t *);
-extern nat_t *ipf_nat6_lookupredir(natlookup_t *);
+extern nat_t *ipf_nat6_lookupredir(ipf_main_softc_t *, natlookup_t *);
extern int ipf_nat6_newmap(fr_info_t *, nat_t *, natinfo_t *);
extern int ipf_nat6_newrdr(fr_info_t *, nat_t *, natinfo_t *);
extern nat_t *ipf_nat6_outlookup(fr_info_t *, u_int, u_int,
Index: src/sys/external/bsd/ipf/netinet/ip_nat6.c
diff -u src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.7 src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.8
--- src/sys/external/bsd/ipf/netinet/ip_nat6.c:1.7 Tue Apr 1 15:19:29 2014
+++ src/sys/external/bsd/ipf/netinet/ip_nat6.c Fri Aug 7 17:31:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_nat6.c,v 1.7 2014/04/01 15:19:29 christos Exp $ */
+/* $NetBSD: ip_nat6.c,v 1.8 2015/08/07 17:31:12 prlw1 Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -2414,12 +2414,13 @@ find_out_wild_ports:
/* nl_out* = destination information (translated) */
/* */
nat_t *
-ipf_nat6_lookupredir(natlookup_t *np)
+ipf_nat6_lookupredir(ipf_main_softc_t *softc, natlookup_t *np)
{
fr_info_t fi;
nat_t *nat;
bzero((char *)&fi, sizeof(fi));
+ fi.fin_main_soft = softc;
if (np->nl_flags & IPN_IN) {
fi.fin_data[0] = ntohs(np->nl_realport);
fi.fin_data[1] = ntohs(np->nl_outport);
CVS commit: src/sys/dev
Module Name:src
Committed By: prlw1
Date: Tue Jul 28 13:12:47 UTC 2015
Modified Files:
src/sys/dev: vnd.c
Log Message:
Print vndattach error
To generate a diff of this commit:
cvs rdiff -u -r1.245 -r1.246 src/sys/dev/vnd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.245 src/sys/dev/vnd.c:1.246
--- src/sys/dev/vnd.c:1.245 Mon May 25 21:02:37 2015
+++ src/sys/dev/vnd.c Tue Jul 28 13:12:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.245 2015/05/25 21:02:37 prlw1 Exp $ */
+/* $NetBSD: vnd.c,v 1.246 2015/07/28 13:12:47 prlw1 Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.245 2015/05/25 21:02:37 prlw1 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.246 2015/07/28 13:12:47 prlw1 Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -245,8 +245,8 @@ vndattach(int num)
error = config_cfattach_attach(vnd_cd.cd_name, &vnd_ca);
if (error)
- aprint_error("%s: unable to register cfattach\n",
- vnd_cd.cd_name);
+ aprint_error("%s: unable to register cfattach, error = %d\n",
+ vnd_cd.cd_name, error);
}
static int
CVS commit: src/sys/dev/pckbport
Module Name:src
Committed By: prlw1
Date: Thu Jul 16 15:01:04 UTC 2015
Modified Files:
src/sys/dev/pckbport: pckbd.c
Log Message:
Disambiguate debug message.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pckbport/pckbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pckbport/pckbd.c
diff -u src/sys/dev/pckbport/pckbd.c:1.31 src/sys/dev/pckbport/pckbd.c:1.32
--- src/sys/dev/pckbport/pckbd.c:1.31 Sun Sep 15 09:24:05 2013
+++ src/sys/dev/pckbport/pckbd.c Thu Jul 16 15:01:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbd.c,v 1.31 2013/09/15 09:24:05 martin Exp $ */
+/* $NetBSD: pckbd.c,v 1.32 2015/07/16 15:01:04 prlw1 Exp $ */
/*-
* Copyright (c) 1998, 2009 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.31 2013/09/15 09:24:05 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.32 2015/07/16 15:01:04 prlw1 Exp $");
#include
#include
@@ -288,10 +288,9 @@ pckbd_resume(device_t dv, const pmf_qual
res = pckbport_poll_cmd(sc->id->t_kbctag,
sc->id->t_kbcslot, cmd, 1, 1, resp, 1);
if (res)
- aprint_debug("pckbdprobe: reset error %d\n", res);
+ aprint_debug("%s: reset error %d\n", __func__, res);
if (resp[0] != KBR_RSTDONE)
- printf("pckbdprobe: reset response 0x%x\n",
- resp[0]);
+ printf("%s: reset response 0x%x\n", __func__, resp[0]);
pckbport_flush(sc->id->t_kbctag, sc->id->t_kbcslot);
CVS commit: src
Module Name:src Committed By: prlw1 Date: Mon May 25 21:02:37 UTC 2015 Modified Files: src/share/man/man9: csf.9 src/sys/dev: vnd.c src/sys/kern: kern_mutex.c Log Message: typo To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/share/man/man9/csf.9 cvs rdiff -u -r1.244 -r1.245 src/sys/dev/vnd.c cvs rdiff -u -r1.61 -r1.62 src/sys/kern/kern_mutex.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/csf.9 diff -u src/share/man/man9/csf.9:1.8 src/share/man/man9/csf.9:1.9 --- src/share/man/man9/csf.9:1.8 Mon Oct 27 12:02:17 2014 +++ src/share/man/man9/csf.9 Mon May 25 21:02:37 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: csf.9,v 1.8 2014/10/27 12:02:17 christos Exp $ +.\" $NetBSD: csf.9,v 1.9 2015/05/25 21:02:37 prlw1 Exp $ .\" .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -92,7 +92,7 @@ Currently, the schedulers available are .Xr sched_4bsd 9 , the traditional 4.4BSD thread scheduler, and .Xr sched_m2 9 -which implements a SVR4/Solaris like apporach. +which implements a SVR4/Solaris like approach. .Pp The interface is divided into two parts: A set of functions each scheduler needs to implement and common functions used by all Index: src/sys/dev/vnd.c diff -u src/sys/dev/vnd.c:1.244 src/sys/dev/vnd.c:1.245 --- src/sys/dev/vnd.c:1.244 Mon May 25 20:57:18 2015 +++ src/sys/dev/vnd.c Mon May 25 21:02:37 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: vnd.c,v 1.244 2015/05/25 20:57:18 prlw1 Exp $ */ +/* $NetBSD: vnd.c,v 1.245 2015/05/25 21:02:37 prlw1 Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc. @@ -91,7 +91,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.244 2015/05/25 20:57:18 prlw1 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.245 2015/05/25 21:02:37 prlw1 Exp $"); #if defined(_KERNEL_OPT) #include "opt_vnd.h" @@ -743,7 +743,7 @@ vnode_has_op(const struct vnode *vp, int } /* - * Handes the read/write request given in 'bp' using the vnode's VOP_READ + * Handles the read/write request given in 'bp' using the vnode's VOP_READ * and VOP_WRITE operations. * * 'obp' is a pointer to the original request fed to the vnd device. Index: src/sys/kern/kern_mutex.c diff -u src/sys/kern/kern_mutex.c:1.61 src/sys/kern/kern_mutex.c:1.62 --- src/sys/kern/kern_mutex.c:1.61 Fri Nov 28 08:27:27 2014 +++ src/sys/kern/kern_mutex.c Mon May 25 21:02:37 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_mutex.c,v 1.61 2014/11/28 08:27:27 uebayasi Exp $ */ +/* $NetBSD: kern_mutex.c,v 1.62 2015/05/25 21:02:37 prlw1 Exp $ */ /*- * Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ #define __MUTEX_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.61 2014/11/28 08:27:27 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.62 2015/05/25 21:02:37 prlw1 Exp $"); #include #include @@ -432,7 +432,7 @@ mutex_oncpu(uintptr_t owner) * * Support routine for mutex_enter() that must handle all cases. In * the LOCKDEBUG case, mutex_enter() is always aliased here, even if - * fast-path stubs are available. If an mutex_spin_enter() stub is + * fast-path stubs are available. If a mutex_spin_enter() stub is * not available, then it is also aliased directly here. */ void
CVS commit: src/sys/dev
Module Name:src
Committed By: prlw1
Date: Mon May 25 20:57:18 UTC 2015
Modified Files:
src/sys/dev: vnd.c vndvar.h
Log Message:
whitespace police
To generate a diff of this commit:
cvs rdiff -u -r1.243 -r1.244 src/sys/dev/vnd.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/vndvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.243 src/sys/dev/vnd.c:1.244
--- src/sys/dev/vnd.c:1.243 Sun Apr 26 15:15:20 2015
+++ src/sys/dev/vnd.c Mon May 25 20:57:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.243 2015/04/26 15:15:20 mlelstv Exp $ */
+/* $NetBSD: vnd.c,v 1.244 2015/05/25 20:57:18 prlw1 Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.243 2015/04/26 15:15:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.244 2015/05/25 20:57:18 prlw1 Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -658,7 +658,7 @@ vndthread(void *arg)
/* handle a compressed read */
if ((obp->b_flags & B_READ) != 0 && (vnd->sc_flags & VNF_COMP)) {
off_t bn;
-
+
/* Convert to a byte offset within the file. */
bn = obp->b_rawblkno *
vnd->sc_dkdev.dk_label->d_secsize;
@@ -667,7 +667,7 @@ vndthread(void *arg)
goto done;
}
#endif /* VND_COMPRESSION */
-
+
/*
* Allocate a header for this transfer and link it to the
* buffer
@@ -896,7 +896,7 @@ handle_with_strategy(struct vnd_softc *v
* fsync won't wait for this write which
* has no chance to complete before all nested bufs
* have been queued. But it has to be done
- * before the last VOP_STRATEGY()
+ * before the last VOP_STRATEGY()
* or the call to nestiobuf_done().
*/
w_vp = bp->b_vp;
@@ -905,9 +905,9 @@ handle_with_strategy(struct vnd_softc *v
mutex_exit(w_vp->v_interlock);
}
KASSERT(skipped != 0 || nbp != NULL);
- if (skipped)
+ if (skipped)
nestiobuf_done(bp, skipped, error);
- else
+ else
VOP_STRATEGY(vp, nbp);
}
@@ -1181,11 +1181,11 @@ vndioctl(dev_t dev, u_long cmd, void *da
int i;
u_int32_t comp_size;
u_int32_t comp_maxsize;
-
+
/* allocate space for compresed file header */
ch = malloc(sizeof(struct vnd_comp_header),
M_TEMP, M_WAITOK);
-
+
/* read compressed file header */
error = vn_rdwr(UIO_READ, nd.ni_vp, (void *)ch,
sizeof(struct vnd_comp_header), 0, UIO_SYSSPACE,
@@ -1195,7 +1195,7 @@ vndioctl(dev_t dev, u_long cmd, void *da
VOP_UNLOCK(nd.ni_vp);
goto close_and_exit;
}
-
+
/* save some header info */
vnd->sc_comp_blksz = ntohl(ch->block_size);
/* note last offset is the file byte size */
@@ -1214,17 +1214,17 @@ vndioctl(dev_t dev, u_long cmd, void *da
error = EINVAL;
goto close_and_exit;
}
-
+
/* set decompressed file size */
vattr.va_size =
((u_quad_t)vnd->sc_comp_numoffs - 1) *
(u_quad_t)vnd->sc_comp_blksz;
-
+
/* allocate space for all the compressed offsets */
vnd->sc_comp_offsets =
malloc(sizeof(u_int64_t) * vnd->sc_comp_numoffs,
M_DEVBUF, M_WAITOK);
-
+
/* read in the offsets */
error = vn_rdwr(UIO_READ, nd.ni_vp,
(void *)vnd->sc_comp_offsets,
@@ -1250,16 +1250,16 @@ vndioctl(dev_t dev, u_long cmd, void *da
}
vnd->sc_comp_offsets[vnd->sc_comp_numoffs - 1] =
be64toh(vnd->sc_comp_offsets[vnd->sc_comp_numoffs - 1]);
-
+
/* create compressed data buffer */
vnd->sc_comp_buff = malloc(comp_maxsize,
M_DEVBUF, M_WAITOK);
-
+
/* create decompressed buffer */
vnd->sc_comp_decombuf = malloc(vnd->sc_comp_blksz,
M_DEVBUF, M_WAITOK);
vnd->sc_comp_buffblk = -1;
-
+
/* Initialize decompress stream */
memset(&vnd->sc_comp_stream, 0, sizeof(z_stream));
vnd->sc_comp_stream.zalloc = vnd_alloc;
@@ -1273,7 +1273,7 @@ vndioctl(dev_t dev, u_long cmd, void *da
error = EINVAL;
goto close_and_exit;
}
-
+
vnd->sc_flags |= VNF_COMP | VNF_READONLY;
#else /* !VND_COMPRESSION */
VOP_UNLOCK(nd.ni_vp);
@@ -1281,7 +1281,7 @@ vndioctl(dev_t dev, u_long cmd, void *da
goto close_and_exit;
#endif /* VND_COMPRESSION */
}
-
+
VOP_UNLOCK(nd.ni_vp);
vnd->sc_vp = nd.ni_vp;
vnd->sc_size = btodb(vattr.va_size); /* note truncation */
@@ -2041,7 +2041,7 @@ static int
vnd_modcmd(modcmd_t cmd, void *arg)
{
int bmajor = -1, cmajor = -1, error = 0;
-
+
switch (cmd) {
case MODULE_CMD_INIT:
error = config_cfdriver_attach(&vnd_cd);
@@ -2055,7 +2055,7 @@ vnd_modcmd(modcmd_t cmd, void *arg)
vnd_cd.cd_name);
break;
}
-
+
error = devsw_attach("vnd", &vnd_bdevsw, &bmajor,
&vnd_cdevsw, &cmajor);
if (error) {
@@ -2063,7 +2063,7 @@ vnd_modcmd(modcmd_t cmd, void *arg)
config_cfdriver_detach(&vnd_cd);
break;
}
-
+
break;
case MODULE_CMD_FINI:
Index: src/sys/dev/v
CVS commit: src
Module Name:src Committed By: prlw1 Date: Tue Apr 28 09:48:31 UTC 2015 Modified Files: src/crypto/external/bsd/heimdal/dist/kadmin: kadmin.8 src/external/bsd/am-utils/dist: README src/external/bsd/pkg_install/dist/info: pkg_info.1 src/external/bsd/pkg_install/dist/lib: pkg_install.conf.5.in src/external/gpl3/gcc/dist/gcc/doc: invoke.texi src/sbin/dump: dump.8 src/sbin/mount_nfs: mount_nfs.8 src/share/man/man4: crypto.4 src/share/man/man8: pam.8 src/share/man/man9: firmload.9 wdc.9 src/sys/rump/librump/rumpvfs: rump_etfs.3 Log Message: Fix typos To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8 cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/am-utils/dist/README cvs rdiff -u -r1.1.1.6 -r1.2 \ src/external/bsd/pkg_install/dist/info/pkg_info.1 cvs rdiff -u -r1.1.1.13 -r1.2 \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/dist/gcc/doc/invoke.texi cvs rdiff -u -r1.65 -r1.66 src/sbin/dump/dump.8 cvs rdiff -u -r1.43 -r1.44 src/sbin/mount_nfs/mount_nfs.8 cvs rdiff -u -r1.24 -r1.25 src/share/man/man4/crypto.4 cvs rdiff -u -r1.4 -r1.5 src/share/man/man8/pam.8 cvs rdiff -u -r1.8 -r1.9 src/share/man/man9/firmload.9 cvs rdiff -u -r1.18 -r1.19 src/share/man/man9/wdc.9 cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpvfs/rump_etfs.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8 diff -u src/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8:1.3 src/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8:1.4 --- src/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8:1.3 Thu Apr 24 13:45:33 2014 +++ src/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8 Tue Apr 28 09:48:30 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: kadmin.8,v 1.3 2014/04/24 13:45:33 pettai Exp $ +.\" $NetBSD: kadmin.8,v 1.4 2015/04/28 09:48:30 prlw1 Exp $ .\" .\" Copyright (c) 2000 - 2007 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -115,7 +115,7 @@ Commands include: .Ar principal... .Bd -ragged -offset indent Adds a new principal to the database. The options not passed on the -command line will be promped for. +command line will be prompted for. .Ed .Pp .Nm add_enctype @@ -123,7 +123,7 @@ command line will be promped for. .Ar principal enctypes... .Pp .Bd -ragged -offset indent -Adds a new encryption type to the principal, only random key are +Adds a new encryption type to the principal, only random keys are supported. .Ed .Pp Index: src/external/bsd/am-utils/dist/README diff -u src/external/bsd/am-utils/dist/README:1.1.1.2 src/external/bsd/am-utils/dist/README:1.2 --- src/external/bsd/am-utils/dist/README:1.1.1.2 Sat Jan 17 16:34:14 2015 +++ src/external/bsd/am-utils/dist/README Tue Apr 28 09:48:30 2015 @@ -38,9 +38,8 @@ and then run make -This would configure amd in the directory you've run the configure script -in, and the built it there. Run "make install" to install all the necessary -files. +This would configure amd in the directory you've run the configure script, +and build it there. Run "make install" to install all the necessary files. Note that this is good for building only one version of amd on one architecture! Don't try this for multiple architectures. If you must, then @@ -91,7 +90,7 @@ buildall script to rerun configure and t Modifying M4 macros may not be very intuitive to anyone that has not done so before. Let me know if you are having any problems with them. I fully -expect, at least initially, to have to be the sole developers of the M4 +expect, at least initially, to have to be the sole developer of the M4 macros and let others concentrate on C sources. [E] Report all bugs via Bugzilla or the am-utils list (see Index: src/external/bsd/pkg_install/dist/info/pkg_info.1 diff -u src/external/bsd/pkg_install/dist/info/pkg_info.1:1.1.1.6 src/external/bsd/pkg_install/dist/info/pkg_info.1:1.2 --- src/external/bsd/pkg_install/dist/info/pkg_info.1:1.1.1.6 Sat Apr 20 15:26:53 2013 +++ src/external/bsd/pkg_install/dist/info/pkg_info.1 Tue Apr 28 09:48:30 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_info.1,v 1.1.1.6 2013/04/20 15:26:53 wiz Exp $ +.\" $NetBSD: pkg_info.1,v 1.2 2015/04/28 09:48:30 prlw1 Exp $ .\" .\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. @@ -47,7 +47,7 @@ command. .Pp The .Ar pkg-name -may be the name of an installed package (with our without version), a +may be the name of an installed package (with or without version), a pattern matching several installed packages (see the .Sx PACKAGE WILDCARDS section for a description of possible patterns), Index: src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in diff -u src/external/bsd/pkg_
CVS commit: src/etc/rc.d
Module Name:src
Committed By: prlw1
Date: Mon Apr 20 18:01:46 UTC 2015
Modified Files:
src/etc/rc.d: swap1
Log Message:
Apply modified version of patch from Wolfgang Stukenbrock in PR bin/41766
This forcibly unmounts tmpfs file systems, so that swapctl doesn't run
out of swap itself, eventually trying to kill pid 1.
No objections since:
http://mail-index.netbsd.org/current-users/2015/03/16/msg026908.html
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/etc/rc.d/swap1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/swap1
diff -u src/etc/rc.d/swap1:1.11 src/etc/rc.d/swap1:1.12
--- src/etc/rc.d/swap1:1.11 Thu Sep 24 16:45:48 2009
+++ src/etc/rc.d/swap1 Mon Apr 20 18:01:46 2015
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: swap1,v 1.11 2009/09/24 16:45:48 apb Exp $
+# $NetBSD: swap1,v 1.12 2015/04/20 18:01:46 prlw1 Exp $
#
# PROVIDE: localswap
@@ -31,6 +31,8 @@ swap1_start()
swap1_stop()
{
if checkyesno swapoff || [ -n "$rc_force" ]; then
+ echo "Forcibly unmounting tmpfs filesystems"
+ umount -aft tmpfs
echo "Removing block-type swap devices"
swapctl -U -t blk || [ $? = 2 ]
fi
CVS commit: src/sys/opencrypto
Module Name:src
Committed By: prlw1
Date: Thu Mar 26 17:40:16 UTC 2015
Modified Files:
src/sys/opencrypto: cryptodev.c deflate.c
Log Message:
Trivial printf format changes and typo fix
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.21 -r1.22 src/sys/opencrypto/deflate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.82 src/sys/opencrypto/cryptodev.c:1.83
--- src/sys/opencrypto/cryptodev.c:1.82 Thu Nov 27 20:30:05 2014
+++ src/sys/opencrypto/cryptodev.c Thu Mar 26 17:40:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.82 2014/11/27 20:30:05 christos Exp $ */
+/* $NetBSD: cryptodev.c,v 1.83 2015/03/26 17:40:16 prlw1 Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.82 2014/11/27 20:30:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.83 2015/03/26 17:40:16 prlw1 Exp $");
#include
#include
@@ -1709,7 +1709,7 @@ cryptodev_session(struct fcrypt *fcr, st
error = crypto_newsession(&sid, crihead, crypto_devallowsoft);
if (!error) {
- DPRINTF(("cyrptodev_session: got session %d\n", (uint32_t)sid));
+ DPRINTF(("cryptodev_session: got session %d\n", (uint32_t)sid));
cse = csecreate(fcr, sid, crie.cri_key, crie.cri_klen,
cria.cri_key, cria.cri_klen, (txform ? sop->cipher : 0), sop->mac,
(tcomp ? sop->comp_alg : 0), txform, thash, tcomp);
Index: src/sys/opencrypto/deflate.c
diff -u src/sys/opencrypto/deflate.c:1.21 src/sys/opencrypto/deflate.c:1.22
--- src/sys/opencrypto/deflate.c:1.21 Sun Jul 3 01:01:06 2011
+++ src/sys/opencrypto/deflate.c Thu Mar 26 17:40:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: deflate.c,v 1.21 2011/07/03 01:01:06 mrg Exp $ */
+/* $NetBSD: deflate.c,v 1.22 2015/03/26 17:40:16 prlw1 Exp $ */
/* $FreeBSD: src/sys/opencrypto/deflate.c,v 1.1.2.1 2002/11/21 23:34:23 sam Exp $ */
/* $OpenBSD: deflate.c,v 1.3 2001/08/20 02:45:22 hugh Exp $ */
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: deflate.c,v 1.21 2011/07/03 01:01:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: deflate.c,v 1.22 2015/03/26 17:40:16 prlw1 Exp $");
#include
#include
@@ -88,7 +88,7 @@ deflate_global(u_int8_t *data, u_int32_t
int error, i, j;
struct deflate_buf buf[ZBUF];
- DPRINTF(("deflate_global: size %d\n", size));
+ DPRINTF(("deflate_global: size %u\n", size));
memset(&zbuf, 0, sizeof(z_stream));
zbuf.next_in = data; /* data that is going to be processed */
@@ -236,7 +236,7 @@ gzip_global(u_int8_t *data, u_int32_t si
u_int32_t crc;
u_int32_t isize = 0, icrc = 0;
- DPRINTF(("gzip_global: decomp %d, size %d\n", decomp, size));
+ DPRINTF(("gzip_global: decomp %d, size %u\n", decomp, size));
memset(&zbuf, 0, sizeof(z_stream));
zbuf.zalloc = ocf_zalloc;
@@ -245,13 +245,13 @@ gzip_global(u_int8_t *data, u_int32_t si
if (!decomp) {
/* compress */
- DPRINTF(("gzip_global: compress malloc %d + %d + %d = %d\n",
+ DPRINTF(("gzip_global: compress malloc %u + %zu + %u = %zu\n",
size, sizeof(gzip_header), GZIP_TAIL_SIZE,
size + sizeof(gzip_header) + GZIP_TAIL_SIZE));
buf[0].size = size;
crc = crc32(0, data, size);
- DPRINTF(("gzip_compress: size %d, crc 0x%x\n", size, crc));
+ DPRINTF(("gzip_compress: size %u, crc 0x%x\n", size, crc));
zbuf.avail_in = size; /* Total length of data to be processed */
zbuf.next_in = data; /* data that is going to be processed */
} else {
@@ -259,7 +259,7 @@ gzip_global(u_int8_t *data, u_int32_t si
/* check the gzip header */
if (size <= sizeof(gzip_header) + GZIP_TAIL_SIZE) {
/* Not enough data for the header & tail */
- DPRINTF(("gzip_global: not enough data (%d)\n",
+ DPRINTF(("gzip_global: not enough data (%u)\n",
size));
return 0;
}
@@ -284,7 +284,7 @@ gzip_global(u_int8_t *data, u_int32_t si
memcpy(&icrc, &data[size-2*sizeof(uint32_t)], sizeof(uint32_t));
LE32TOH(icrc);
- DPRINTF(("gzip_global: isize = %d (%02x %02x %02x %02x)\n",
+ DPRINTF(("gzip_global: isize = %u (%02x %02x %02x %02x)\n",
isize,
data[size-4],
data[size-3],
@@ -306,7 +306,7 @@ gzip_global(u_int8_t *data, u_int32_t si
return 0;
zbuf.next_out = buf[0].out;
zbuf.avail_out = buf[0].size;
- DPRINTF(("zbuf avail_in %d, avail_out %d\n",
+ DPRINTF(("zbuf avail_in %u, avail_out %u\n",
zbuf.avail_in, zbuf.avail_out));
i = 1;
@@ -319,11 +319,11 @@ gzip_global(u_int8_t *data, u_int32_t si
goto bad2;
}
for (;;) {
- DPRINTF(("pre: %s in:%d out:%d\n", decomp ? "deflate()" : "inflate()",
+ DPRINTF(("pre: %s in:%u out:%u\n", decomp ? "deflate()" : "inflate()",
zbuf.avail_in, zbuf.avail_out));
err
CVS commit: src/tests/crypto/opencrypto
Module Name:src
Committed By: prlw1
Date: Mon Mar 16 16:42:27 UTC 2015
Modified Files:
src/tests/crypto/opencrypto: t_opencrypto.sh
Log Message:
correct test name
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/crypto/opencrypto/t_opencrypto.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/opencrypto/t_opencrypto.sh
diff -u src/tests/crypto/opencrypto/t_opencrypto.sh:1.4 src/tests/crypto/opencrypto/t_opencrypto.sh:1.5
--- src/tests/crypto/opencrypto/t_opencrypto.sh:1.4 Sat Jan 18 15:15:16 2014
+++ src/tests/crypto/opencrypto/t_opencrypto.sh Mon Mar 16 16:42:27 2015
@@ -1,4 +1,4 @@
-# $NetBSD: t_opencrypto.sh,v 1.4 2014/01/18 15:15:16 pgoyette Exp $
+# $NetBSD: t_opencrypto.sh,v 1.5 2015/03/16 16:42:27 prlw1 Exp $
#
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -98,7 +98,7 @@ camellia_cleanup() {
atf_test_case cbcdes cleanup
cbcdes_head() {
- common_head "Test ARC4 crypto"
+ common_head "Test DES_CBC crypto"
}
cbcdes_body() {
CVS commit: src/sys/arch/usermode
Module Name:src
Committed By: prlw1
Date: Fri Feb 6 10:25:13 UTC 2015
Modified Files:
src/sys/arch/usermode/include: thunk.h
src/sys/arch/usermode/usermode: thunk.c
Log Message:
Take procfs_machdep.c rev 1.4 one step further and adjust signature of
thunk_getcpuinfo().
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/usermode/include/thunk.h
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/usermode/usermode/thunk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/usermode/include/thunk.h
diff -u src/sys/arch/usermode/include/thunk.h:1.61 src/sys/arch/usermode/include/thunk.h:1.62
--- src/sys/arch/usermode/include/thunk.h:1.61 Sat Mar 3 21:15:16 2012
+++ src/sys/arch/usermode/include/thunk.h Fri Feb 6 10:25:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: thunk.h,v 1.61 2012/03/03 21:15:16 reinoud Exp $ */
+/* $NetBSD: thunk.h,v 1.62 2015/02/06 10:25:13 prlw1 Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill
@@ -156,7 +156,7 @@ int thunk_idle(void);
char * thunk_getenv(const char *);
vaddr_t thunk_get_vm_min_address(void);
-int thunk_getcpuinfo(char *, int *);
+int thunk_getcpuinfo(char *, size_t *);
int thunk_getmachine(char *, size_t, char *, size_t);
Index: src/sys/arch/usermode/usermode/thunk.c
diff -u src/sys/arch/usermode/usermode/thunk.c:1.84 src/sys/arch/usermode/usermode/thunk.c:1.85
--- src/sys/arch/usermode/usermode/thunk.c:1.84 Sun Nov 10 19:51:00 2013
+++ src/sys/arch/usermode/usermode/thunk.c Fri Feb 6 10:25:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: thunk.c,v 1.84 2013/11/10 19:51:00 jmcneill Exp $ */
+/* $NetBSD: thunk.c,v 1.85 2015/02/06 10:25:13 prlw1 Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill
@@ -28,7 +28,7 @@
#include
#ifdef __NetBSD__
-__RCSID("$NetBSD: thunk.c,v 1.84 2013/11/10 19:51:00 jmcneill Exp $");
+__RCSID("$NetBSD: thunk.c,v 1.85 2015/02/06 10:25:13 prlw1 Exp $");
#endif
#include
@@ -754,7 +754,7 @@ thunk_idle(void)
}
int
-thunk_getcpuinfo(char *cp, int *len)
+thunk_getcpuinfo(char *cp, size_t *len)
{
ssize_t rlen;
int fd;
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/sna
Module Name:xsrc
Committed By: prlw1
Date: Wed Jan 28 09:59:35 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna: kgem.c sna_display.c
Log Message:
Remove differences with upstream xf86-video-intel which are no longer
necessary. (Use do_ioctl and mmap rather than drmIoct and drmMap.)
http://mail-index.netbsd.org/tech-x11/2015/01/25/msg001486.html
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.4 xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.5
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.4 Fri Jan 16 21:32:11 2015
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c Wed Jan 28 09:59:35 2015
@@ -440,12 +440,7 @@ static void *__kgem_bo_map__gtt(struct k
VG_CLEAR(gtt);
retry_gtt:
gtt.handle = bo->handle;
-#ifdef __NetBSD__
- if (drmIoctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP_GTT, >t)) {
- err = errno;
-#else
if ((err = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP_GTT, >t))) {
-#endif
assert(err != EINVAL);
(void)__kgem_throttle_retire(kgem, 0);
@@ -461,15 +456,10 @@ retry_gtt:
}
retry_mmap:
-#ifdef __NetBSD__
- err = -drmMap(kgem->fd, gtt.offset, bytes(bo), &ptr);
- if (err) {
-#else
ptr = mmap(0, bytes(bo), PROT_READ | PROT_WRITE, MAP_SHARED,
kgem->fd, gtt.offset);
if (ptr == MAP_FAILED) {
err = errno;
-#endif
assert(err != EINVAL);
if (__kgem_throttle_retire(kgem, 0))
Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.3 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.4
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.3 Fri Jan 16 21:32:11 2015
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c Wed Jan 28 09:59:35 2015
@@ -439,22 +439,14 @@ static void *gem_mmap(int fd, int handle
{
struct drm_i915_gem_mmap_gtt mmap_arg;
void *ptr;
-#ifdef __NetBSD__
- int err;
-#endif
VG_CLEAR(mmap_arg);
mmap_arg.handle = handle;
if (drmIoctl(fd, DRM_IOCTL_I915_GEM_MMAP_GTT, &mmap_arg))
return NULL;
-#ifdef __NetBSD__
- err = -drmMap(fd, mmap_arg.offset, size, &ptr);
- if (err)
-#else
ptr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, mmap_arg.offset);
if (ptr == MAP_FAILED)
-#endif
return NULL;
return ptr;
CVS commit: xsrc/external/mit/xf86-video-geode/dist/src
Module Name:xsrc Committed By: prlw1 Date: Wed Jan 28 00:48:06 UTC 2015 Modified Files: xsrc/external/mit/xf86-video-geode/dist/src: geode_dcon.c Log Message: Fix i386 build - reported and tested by Hisashi T Fujinaka To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xf86-video-geode/dist/src/geode_dcon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-geode/dist/src/geode_dcon.c diff -u xsrc/external/mit/xf86-video-geode/dist/src/geode_dcon.c:1.1.1.3 xsrc/external/mit/xf86-video-geode/dist/src/geode_dcon.c:1.2 --- xsrc/external/mit/xf86-video-geode/dist/src/geode_dcon.c:1.1.1.3 Thu Mar 20 06:54:20 2014 +++ xsrc/external/mit/xf86-video-geode/dist/src/geode_dcon.c Wed Jan 28 00:48:06 2015 @@ -29,6 +29,7 @@ /* Includes that are used by all drivers */ #include +#include #include #include
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: prlw1 Date: Sun Jan 25 21:45:45 UTC 2015 Modified Files: xsrc/external/mit/xf86-video-nv/dist/src: nv_include.h xsrc/external/mit/xf86-video-savage/dist/src: savage_driver.h xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86.h xf86Config.c xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc: xf86DDC.h xsrc/external/mit/xorg-server/dist/hw/xfree86/fbdevhw: fbdevhw.c xsrc/external/mit/xorg-server/dist/hw/xfree86/modes: xf86DisplayIDModes.c xf86Modes.h xf86RandR12.c xsrc/external/mit/xorg-server/dist/hw/xfree86/utils/cvt: cvt.c xsrc/external/mit/xorg-server/dist/hw/xfree86/vbe: vbe.c xsrc/external/mit/xorg-server/dist/include: dix.h dixfont.h xsrc/external/mit/xorg-server/dist/randr: randrstr.h rrtransform.h xsrc/external/mit/xorg-server/dist/render: glyphstr.h Log Message: Remove some redundant function redeclarations, as noted in http://mail-index.netbsd.org/tech-x11/2015/01/09/msg001452.html The changes come from upstream in commits: * xserver: ecf62755 Define prototypes for hw/xfree86/modes/xf86Modes.c only in xf86Modes.h. - didn't add xf86SaveModeContents which isn't defined in our version 0bc41d5f Remove redundant redeclarations of functions in the same header file 5595e7ce randr: Remove redundant declaration. 471e5373 Remove duplicate declaration of xf86ValidateModesFlags in xf86Modes.h 9ef53e22 include: GetClientResolutions is declared in font.h 8b6a7500 Fix gcc warnings about redundant declarations of fallback functions - just took ffs() #ifdef defense, so most not applied * xf86-video-nv: 49ee1c26 Include xf86Modes.h to use functions from hw/xfree86/modes/xf86Modes.c. * xf86-video-savage: 2e9217bb Include xf86Modes.h to use functions from hw/xfree86/modes/xf86Modes.c. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h cvs rdiff -u -r1.1.1.4 -r1.2 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h cvs rdiff -u -r1.10 -r1.11 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/ddc/xf86DDC.h cvs rdiff -u -r1.1.1.6 -r1.2 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/fbdevhw/fbdevhw.c cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86DisplayIDModes.c cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Modes.h cvs rdiff -u -r1.1.1.7 -r1.2 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86RandR12.c cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/utils/cvt/cvt.c cvs rdiff -u -r1.1.1.6 -r1.2 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/vbe/vbe.c cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/include/dix.h cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xorg-server/dist/include/dixfont.h cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/randr/randrstr.h cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xorg-server/dist/randr/rrtransform.h cvs rdiff -u -r1.1.1.4 -r1.2 \ xsrc/external/mit/xorg-server/dist/render/glyphstr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h:1.1.1.3 xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h:1.2 --- xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h:1.1.1.3 Sun Jun 2 08:24:14 2013 +++ xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h Sun Jan 25 21:45:44 2015 @@ -30,6 +30,7 @@ #include "micmap.h" #include "xf86DDC.h" +#include "xf86Modes.h" #include "vbe.h" Index: xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h diff -u xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h:1.3 xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h:1.4 --- xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h:1.3 Wed Mar 19 23:56:47 2014 +++ xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h Sun Jan 25 21:45:44 2015 @@ -54,6 +54,7 @@ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" #endif +#include "xf86Modes.h" #include "xf86Pci.h" #include "xf86_OSproc.h" #include "xf86Cursor.h" Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h:1.1.1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h:1.2 --- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h:1.1.1.4 Tue Aug 2 06:56:54 2011 +++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86.h Sun Jan 25 21:45:44 2015 @@ -164,9 +164,6
CVS commit: src/usr.bin/pkill
Module Name:src
Committed By: prlw1
Date: Fri Jan 9 12:45:32 UTC 2015
Modified Files:
src/usr.bin/pkill: pkill.c
Log Message:
Simplify code so that gcc 4.8 can understand it.
http://mail-index.netbsd.org/tech-userlevel/2015/01/06/msg008882.html
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/pkill/pkill.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/pkill/pkill.c
diff -u src/usr.bin/pkill/pkill.c:1.29 src/usr.bin/pkill/pkill.c:1.30
--- src/usr.bin/pkill/pkill.c:1.29 Wed Jan 2 10:36:07 2013
+++ src/usr.bin/pkill/pkill.c Fri Jan 9 12:45:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pkill.c,v 1.29 2013/01/02 10:36:07 dsl Exp $ */
+/* $NetBSD: pkill.c,v 1.30 2015/01/09 12:45:32 prlw1 Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: pkill.c,v 1.29 2013/01/02 10:36:07 dsl Exp $");
+__RCSID("$NetBSD: pkill.c,v 1.30 2015/01/09 12:45:32 prlw1 Exp $");
#endif /* !lint */
#include
@@ -128,8 +128,8 @@ main(int argc, char **argv)
action = grepact;
pgrep = 1;
} else if (strcmp(getprogname(), "prenice") == 0) {
+ action = reniceact;
prenice = 1;
-
} else {
action = killact;
p = argv[1];
@@ -171,7 +171,6 @@ main(int argc, char **argv)
if (argc < 2)
usage();
- action = reniceact;
p = argv[1];
i = (int)strtol(p, &q, 10);
CVS commit: src/sys/dev/raidframe
Module Name:src
Committed By: prlw1
Date: Sat Jan 3 11:48:04 UTC 2015
Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c
Log Message:
Also print b_error in the IO Error message
To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 src/sys/dev/raidframe/rf_netbsdkintf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.321 src/sys/dev/raidframe/rf_netbsdkintf.c:1.322
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.321 Fri Jan 2 19:42:07 2015
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Sat Jan 3 11:48:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.321 2015/01/02 19:42:07 christos Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.322 2015/01/03 11:48:04 prlw1 Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***/
#include
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.321 2015/01/02 19:42:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.322 2015/01/03 11:48:04 prlw1 Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2279,8 +2279,9 @@ KernelWakeupFunc(struct buf *bp)
rf_ds_used_spare)) &&
(queue->raidPtr->numFailures <
queue->raidPtr->Layout.map->faultsTolerated)) {
- printf("raid%d: IO Error. Marking %s as failed.\n",
+ printf("raid%d: IO Error (%d). Marking %s as failed.\n",
queue->raidPtr->raidid,
+ bp->b_error,
queue->raidPtr->Disks[queue->col].devname);
queue->raidPtr->Disks[queue->col].status =
rf_ds_failed;
CVS commit: src
Module Name:src
Committed By: prlw1
Date: Sat Dec 20 13:15:48 UTC 2014
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
src/external/bsd/dhcpcd/dist: dhcpcd.c
src/external/bsd/ipf/dist/lib: printhost.c printhostmask.c
printipfexpr.c save_v1trap.c save_v2trap.c
src/external/bsd/ipf/dist/tools: lexer.c
src/external/bsd/ntp/dist/ntpd: ntp_io.c
src/external/bsd/ppp/usr.sbin/pppd: sys-bsd.c
src/external/bsd/tcpdump/bin: Makefile
src/sbin/route: route.c
src/usr.sbin/lpr/common_source: Makefile common.c
Log Message:
MKINET6=no build fixes
http://mail-index.netbsd.org/tech-net/2014/12/13/msg004898.html
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/dhcpcd/dist/dhcpcd.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/dist/lib/printhost.c \
src/external/bsd/ipf/dist/lib/printhostmask.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/ipf/dist/lib/printipfexpr.c \
src/external/bsd/ipf/dist/lib/save_v1trap.c \
src/external/bsd/ipf/dist/lib/save_v2trap.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/ipf/dist/tools/lexer.c
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/dist/ntpd/ntp_io.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.148 -r1.149 src/sbin/route/route.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/lpr/common_source/Makefile
cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/lpr/common_source/common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.6 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.7
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.6 Mon Mar 31 23:26:30 2014
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Sat Dec 20 13:15:48 2014
@@ -718,7 +718,7 @@ mDNSlocal int SetupSocket(struct sockadd
err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_RECVPKTINFO, &kOn, sizeof(kOn));
if (err < 0) { err = errno; perror("setsockopt - IPV6_RECVPKTINFO"); }
}
-#elif defined(IPV6_PKTINFO)
+ #elif defined(IPV6_PKTINFO)
if (err == 0)
{
err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_PKTINFO, &kOn, sizeof(kOn));
Index: src/external/bsd/dhcpcd/dist/dhcpcd.c
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.c:1.20 src/external/bsd/dhcpcd/dist/dhcpcd.c:1.21
--- src/external/bsd/dhcpcd/dist/dhcpcd.c:1.20 Fri Dec 19 10:54:08 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd.c Sat Dec 20 13:15:48 2014
@@ -1,5 +1,5 @@
#include
- __RCSID("$NetBSD: dhcpcd.c,v 1.20 2014/12/19 10:54:08 roy Exp $");
+ __RCSID("$NetBSD: dhcpcd.c,v 1.21 2014/12/20 13:15:48 prlw1 Exp $");
/*
* dhcpcd - DHCP client daemon
@@ -745,8 +745,9 @@ dhcpcd_startinterface(void *arg)
!(ifo->options & (DHCPCD_INFORM | DHCPCD_PFXDLGONLY)))
ipv6nd_startrs(ifp);
- if (ifo->options & DHCPCD_DHCP6)
+ if (ifo->options & DHCPCD_DHCP6) {
dhcp6_find_delegates(ifp);
+ }
if (!(ifo->options & DHCPCD_IPV6RS) ||
ifo->options & DHCPCD_IA_FORCED)
Index: src/external/bsd/ipf/dist/lib/printhost.c
diff -u src/external/bsd/ipf/dist/lib/printhost.c:1.2 src/external/bsd/ipf/dist/lib/printhost.c:1.3
--- src/external/bsd/ipf/dist/lib/printhost.c:1.2 Sun Jul 22 14:27:36 2012
+++ src/external/bsd/ipf/dist/lib/printhost.c Sat Dec 20 13:15:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: printhost.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: printhost.c,v 1.3 2014/12/20 13:15:48 prlw1 Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -25,9 +25,9 @@ printhost(family, addr)
if ((family == -1) || !*addr)
PRINTF("any");
else {
+#ifdef USE_INET6
void *ptr = addr;
-#ifdef USE_INET6
PRINTF("%s", inet_ntop(family, ptr, ipbuf, sizeof(ipbuf)));
#else
ipa.s_addr = *addr;
Index: src/external/bsd/ipf/dist/lib/printhostmask.c
diff -u src/external/bsd/ipf/dist/lib/printhostmask.c:1.2 src/external/bsd/ipf/dist/lib/printhostmask.c:1.3
--- src/external/bsd/ipf/dist/lib/printhostmask.c:1.2 Sun Jul 22 14:27:36 2012
+++ src/external/bsd/ipf/dist/lib/printhostmask.c Sat Dec 20 13:15:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: printhostmask.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: printhostmask.c,v 1.3 2014/12/20 13:15:48 prlw1 Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -25,9 +25,9 @@ printhostmask(family, addr, mask)
if ((family == -1) || ((!addr || !*addr) && (!mask || !*mask)))
PRINTF("any");
else {
+#ifdef USE_INET6
void *ptr = addr;
-#ifdef USE_INET6
PRINTF("%s", inet_ntop(family, ptr, ipbuf, sizeof(ipbuf)));
#else
ipa.s_addr = *addr;
Index: src/external/bsd
CVS commit: src/sys/external/bsd/drm2/drm
Module Name:src Committed By: prlw1 Date: Mon Nov 24 17:29:03 UTC 2014 Modified Files: src/sys/external/bsd/drm2/drm: drm_sysctl.c Log Message: Trivial build fix for no options SYSCTL_INCLUDE_DESCR case, to avoid -Werror. OK christos@ and riastradh@ To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/drm/drm_sysctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/drm/drm_sysctl.c diff -u src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.3 src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.4 --- src/sys/external/bsd/drm2/drm/drm_sysctl.c:1.3 Wed Nov 12 04:53:13 2014 +++ src/sys/external/bsd/drm2/drm/drm_sysctl.c Mon Nov 24 17:29:02 2014 @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: drm_sysctl.c,v 1.3 2014/11/12 04:53:13 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_sysctl.c,v 1.4 2014/11/24 17:29:02 prlw1 Exp $"); #include #include @@ -40,6 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_sysctl.c #include +#ifdef SYSCTL_INCLUDE_DESCR static const char * drm_sysctl_get_description(const struct linux_module_param_info *p, const struct drm_sysctl_def *def) @@ -53,6 +54,7 @@ drm_sysctl_get_description(const struct } return NULL; } +#endif #ifdef notyet static uint64_t
CVS commit: src
Module Name:src Committed By: prlw1 Date: Wed Nov 5 14:30:00 UTC 2014 Modified Files: src/distrib/sets/lists/xcomp: mi src/external/mit/xorg/server/xorg-server/include: Makefile Log Message: Install fbpict.h (e.g., new xf86-video-intel assumes it exists if RENDER is defined) To generate a diff of this commit: cvs rdiff -u -r1.152 -r1.153 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/server/xorg-server/include/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.152 src/distrib/sets/lists/xcomp/mi:1.153 --- src/distrib/sets/lists/xcomp/mi:1.152 Thu May 15 16:32:28 2014 +++ src/distrib/sets/lists/xcomp/mi Wed Nov 5 14:30:00 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.152 2014/05/15 16:32:28 apb Exp $ +# $NetBSD: mi,v 1.153 2014/11/05 14:30:00 prlw1 Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -5911,6 +5911,7 @@ ./usr/X11R7/include/xorg/fbdevhw.h -unknown- xorg ./usr/X11R7/include/xorg/fboverlay.h -unknown- xorg ./usr/X11R7/include/xorg/fbpseudocolor.h -unknown- obsolete +./usr/X11R7/include/xorg/fbpict.h -unknown- xorg ./usr/X11R7/include/xorg/fbrop.h -unknown- xorg ./usr/X11R7/include/xorg/fi1236.h -unknown- xorg ./usr/X11R7/include/xorg/fourcc.h -unknown- xorg Index: src/external/mit/xorg/server/xorg-server/include/Makefile diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.11 src/external/mit/xorg/server/xorg-server/include/Makefile:1.12 --- src/external/mit/xorg/server/xorg-server/include/Makefile:1.11 Wed Apr 2 01:22:11 2014 +++ src/external/mit/xorg/server/xorg-server/include/Makefile Wed Nov 5 14:30:00 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/04/02 01:22:11 riastradh Exp $ +# $NetBSD: Makefile,v 1.12 2014/11/05 14:30:00 prlw1 Exp $ .include @@ -30,7 +30,7 @@ INCS= BT.h IBM.h TI.h XIstubs.h Xprintf. dixgrabs.h dixstruct.h dri.h dristruct.h edid.h exa.h exevents.h \ eventconvert.h events.h eventstr.h list.h \ extension.h extinit.h extnsionst.h fb.h fbdevhw.h fboverlay.h \ - fbrop.h fi1236.h fourcc.h gc.h gcstruct.h geext.h globals.h \ + fbpict.h fbrop.h fi1236.h fourcc.h gc.h gcstruct.h geext.h globals.h \ glyphstr.h i2c_def.h input.h inputstr.h inpututils.h \ mi.h mibstore.h micmap.h micoord.h mifillarc.h mifpoly.h \ migc.h miline.h mipict.h mipointer.h mipointrst.h misc.h miscstruct.h \
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src
Committed By: prlw1
Date: Sun Jul 20 17:56:44 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/include/linux: ctype.h
Log Message:
The lua 5.1 to 5.3 update added isprint to libkern.h
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/include/linux/ctype.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/ctype.h
diff -u src/sys/external/bsd/drm2/include/linux/ctype.h:1.1 src/sys/external/bsd/drm2/include/linux/ctype.h:1.2
--- src/sys/external/bsd/drm2/include/linux/ctype.h:1.1 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/include/linux/ctype.h Sun Jul 20 17:56:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ctype.h,v 1.1 2014/07/16 20:56:25 riastradh Exp $ */
+/* $NetBSD: ctype.h,v 1.2 2014/07/20 17:56:44 prlw1 Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,10 +34,4 @@
#include
-static inline int
-isprint(int c)
-{
- return ((' ' <= c) && (c < 127));
-}
-
#endif /* _LINUX_CTYPE_H_ */
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: prlw1 Date: Fri Jul 18 16:01:08 UTC 2014 Modified Files: src/sys/arch/i386/conf: DRMKMS Log Message: drmkmsbus has gone away To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/conf/DRMKMS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/DRMKMS diff -u src/sys/arch/i386/conf/DRMKMS:1.1 src/sys/arch/i386/conf/DRMKMS:1.2 --- src/sys/arch/i386/conf/DRMKMS:1.1 Thu Apr 3 19:18:51 2014 +++ src/sys/arch/i386/conf/DRMKMS Fri Jul 18 16:01:07 2014 @@ -1,6 +1,5 @@ include "arch/i386/conf/NO_DRM" -drmkms* at drmkmsbus? i915drmkms* at pci? dev ? function ? no options DIAGNOSTIC
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: prlw1 Date: Thu Jul 17 12:04:05 UTC 2014 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi shl.mi src/distrib/sets/lists/debug: mi shl.mi Log Message: Update lists after adding support for vnd to rump (report from hannken@) To generate a diff of this commit: cvs rdiff -u -r1.706 -r1.707 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1897 -r1.1898 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.265 -r1.266 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.706 src/distrib/sets/lists/base/shl.mi:1.707 --- src/distrib/sets/lists/base/shl.mi:1.706 Tue Jul 8 05:55:33 2014 +++ src/distrib/sets/lists/base/shl.mi Thu Jul 17 12:04:05 2014 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.706 2014/07/08 05:55:33 spz Exp $ +# $NetBSD: shl.mi,v 1.707 2014/07/17 12:04:05 prlw1 Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -548,6 +548,9 @@ ./usr/lib/librumpdev_usb.so base-rump-shlib rump ./usr/lib/librumpdev_usb.so.0 base-rump-shlib rump ./usr/lib/librumpdev_usb.so.0.0 base-rump-shlib rump +./usr/lib/librumpdev_vnd.so base-rump-shlib rump +./usr/lib/librumpdev_vnd.so.0 base-rump-shlib rump +./usr/lib/librumpdev_vnd.so.0.0 base-rump-shlib rump ./usr/lib/librumpdev_wscons.so base-rump-shlib rump ./usr/lib/librumpdev_wscons.so.0 base-rump-shlib rump ./usr/lib/librumpdev_wscons.so.0.0 base-rump-shlib rump Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1897 src/distrib/sets/lists/comp/mi:1.1898 --- src/distrib/sets/lists/comp/mi:1.1897 Tue Jul 8 05:55:34 2014 +++ src/distrib/sets/lists/comp/mi Thu Jul 17 12:04:05 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1897 2014/07/08 05:55:34 spz Exp $ +# $NetBSD: mi,v 1.1898 2014/07/17 12:04:05 prlw1 Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3781,6 +3781,8 @@ ./usr/lib/librumpdev_umass_p.a comp-c-proflib profile,rump ./usr/lib/librumpdev_usb.a comp-c-lib rump ./usr/lib/librumpdev_usb_p.a comp-c-proflib profile,rump +./usr/lib/librumpdev_vnd.a comp-c-lib rump +./usr/lib/librumpdev_vnd_p.a comp-c-proflib profile,rump ./usr/lib/librumpdev_wscons.a comp-c-lib rump ./usr/lib/librumpdev_wscons_p.a comp-c-proflib profile,rump ./usr/lib/librumpfs_cd9660.a comp-c-lib rump Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.265 src/distrib/sets/lists/comp/shl.mi:1.266 --- src/distrib/sets/lists/comp/shl.mi:1.265 Tue Jul 8 05:55:34 2014 +++ src/distrib/sets/lists/comp/shl.mi Thu Jul 17 12:04:05 2014 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.265 2014/07/08 05:55:34 spz Exp $ +# $NetBSD: shl.mi,v 1.266 2014/07/17 12:04:05 prlw1 Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -173,6 +173,7 @@ ./usr/lib/librumpdev_ulpt_pic.a comp-c-piclib rump,picinstall ./usr/lib/librumpdev_umass_pic.a comp-c-piclib rump,picinstall ./usr/lib/librumpdev_usb_pic.a comp-c-piclib rump,picinstall +./usr/lib/librumpdev_vnd_pic.a comp-c-piclib rump,picinstall ./usr/lib/librumpdev_wscons_pic.a comp-c-piclib rump,picinstall ./usr/lib/librumpfs_cd9660_pic.a comp-c-piclib rump,picinstall ./usr/lib/librumpfs_efs_pic.a comp-c-piclib rump,picinstall Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.71 src/distrib/sets/lists/debug/mi:1.72 --- src/distrib/sets/lists/debug/mi:1.71 Wed Jul 9 13:50:48 2014 +++ src/distrib/sets/lists/debug/mi Thu Jul 17 12:04:05 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.71 2014/07/09 13:50:48 alnsn Exp $ +# $NetBSD: mi,v 1.72 2014/07/17 12:04:05 prlw1 Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -161,6 +161,7 @@ ./usr/lib/librumpdev_ulpt_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpdev_umass_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpdev_usb_g.a comp-c-debuglib debuglib,rump +./usr/lib/librumpdev_vnd_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpdev_wscons_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpfs_cd9660_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpfs_efs_g.a comp-c-debuglib debuglib,rump Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.66 src/distrib/sets/lists/debug/shl.mi:1.67 --- src/distrib/sets/lists/debug/shl.mi:1.66 Tue Jul 8 11:13:24 2014 +++ src/distrib/sets/lists/debug/shl.mi Thu Jul 17 12:04:05 2014 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.66 2014/07/08 11
CVS commit: src/sys/rump/dev
Module Name:src
Committed By: prlw1
Date: Thu Jul 17 08:16:12 UTC 2014
Modified Files:
src/sys/rump/dev: Makefile.rumpdevcomp
Added Files:
src/sys/rump/dev/lib/libvnd: Makefile shlib_version vnd_component.c
Log Message:
Add vnd support to rump
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/dev/Makefile.rumpdevcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libvnd/Makefile \
src/sys/rump/dev/lib/libvnd/shlib_version \
src/sys/rump/dev/lib/libvnd/vnd_component.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/Makefile.rumpdevcomp
diff -u src/sys/rump/dev/Makefile.rumpdevcomp:1.11 src/sys/rump/dev/Makefile.rumpdevcomp:1.12
--- src/sys/rump/dev/Makefile.rumpdevcomp:1.11 Thu Apr 24 21:46:44 2014
+++ src/sys/rump/dev/Makefile.rumpdevcomp Thu Jul 17 08:16:12 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.rumpdevcomp,v 1.11 2014/04/24 21:46:44 pooka Exp $
+# $NetBSD: Makefile.rumpdevcomp,v 1.12 2014/07/17 08:16:12 prlw1 Exp $
#
RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb pad pud \
- putter raidframe rnd scsipi sysmon wscons \
+ putter raidframe rnd scsipi sysmon vnd wscons \
opencrypto
RUMPUSBDEVS= ubt ucom ugenhc ulpt umass usb
Added files:
Index: src/sys/rump/dev/lib/libvnd/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libvnd/Makefile:1.1
--- /dev/null Thu Jul 17 08:16:12 2014
+++ src/sys/rump/dev/lib/libvnd/Makefile Thu Jul 17 08:16:12 2014
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2014/07/17 08:16:12 prlw1 Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../dev
+
+LIB= rumpdev_vnd
+
+SRCS= vnd.c
+
+SRCS+= vnd_component.c
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
+
+.include
+.include
Index: src/sys/rump/dev/lib/libvnd/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libvnd/shlib_version:1.1
--- /dev/null Thu Jul 17 08:16:12 2014
+++ src/sys/rump/dev/lib/libvnd/shlib_version Thu Jul 17 08:16:12 2014
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2014/07/17 08:16:12 prlw1 Exp $
+#
+major=0
+minor=0
Index: src/sys/rump/dev/lib/libvnd/vnd_component.c
diff -u /dev/null src/sys/rump/dev/lib/libvnd/vnd_component.c:1.1
--- /dev/null Thu Jul 17 08:16:12 2014
+++ src/sys/rump/dev/lib/libvnd/vnd_component.c Thu Jul 17 08:16:12 2014
@@ -0,0 +1,59 @@
+/* $NetBSD: vnd_component.c,v 1.1 2014/07/17 08:16:12 prlw1 Exp $ */
+
+/*
+ * Copyright (c) 2009 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: vnd_component.c,v 1.1 2014/07/17 08:16:12 prlw1 Exp $");
+
+#include
+#include
+#include
+#include
+
+#include "rump_private.h"
+#include "rump_vfs_private.h"
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern const struct bdevsw vnd_bdevsw;
+ extern const struct cdevsw vnd_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ /* go, mydevfs */
+ bmaj = cmaj = -1;
+
+ if ((error = devsw_attach("/dev/vnd0", &vnd_bdevsw, &bmaj,
+ &vnd_cdevsw, &cmaj)) != 0)
+ panic("cannot attach vnd: %d", error);
+
+ if ((error = rump_vfs_makedevnodes(S_IFBLK, "/dev/vnd0", 'a',
+ bmaj, 0, 7)) != 0)
+ panic("cannot create cooked vnd dev nodes: %d", error);
+ if ((error = rump_vfs_makedevnodes(S_IFCHR, "/dev/rvnd0", 'a',
+ cmaj, 0, 7)) != 0)
+ panic("cannot create raw vnd dev nodes: %d", error);
+}
CVS commit: src/sys/dev
Module Name:src
Committed By: prlw1
Date: Sat Mar 22 16:08:51 UTC 2014
Modified Files:
src/sys/dev: vnd.c
Log Message:
DIOCGDISKINFO support for vnd
Reviewed by apb@ and christos@
To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 src/sys/dev/vnd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.228 src/sys/dev/vnd.c:1.229
--- src/sys/dev/vnd.c:1.228 Sun Mar 16 05:20:26 2014
+++ src/sys/dev/vnd.c Sat Mar 22 16:08:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.228 2014/03/16 05:20:26 dholland Exp $ */
+/* $NetBSD: vnd.c,v 1.229 2014/03/22 16:08:51 prlw1 Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.228 2014/03/16 05:20:26 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.229 2014/03/22 16:08:51 prlw1 Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -1059,6 +1059,10 @@ vndioctl(dev_t dev, u_long cmd, void *da
return ENXIO;
vio = (struct vnd_ioctl *)data;
+ error = disk_ioctl(&vnd->sc_dkdev, cmd, data, flag, l);
+ if (error != EPASSTHROUGH)
+ return (error);
+
/* Must be open for writes for these commands... */
switch (cmd) {
case VNDIOCSET:
@@ -2022,6 +2026,12 @@ vnd_set_geometry(struct vnd_softc *vnd)
dg->dg_ntracks = vnd->sc_geom.vng_ntracks;
dg->dg_ncylinders = vnd->sc_geom.vng_ncylinders;
+#ifdef DEBUG
+ if (vnddebug & VDB_LABEL) {
+ printf("dg->dg_secperunit: %" PRId64 "\n", dg->dg_secperunit);
+ printf("dg->dg_ncylinders: %u\n", dg->dg_ncylinders);
+ }
+#endif
disk_set_info(vnd->sc_dev, &vnd->sc_dkdev, NULL);
}
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: prlw1
Date: Mon Sep 9 15:04:12 UTC 2013
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Add pkgpath.conf to /etc/defaults check.
To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/usr.sbin/postinstall/postinstall
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/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.157 src/usr.sbin/postinstall/postinstall:1.158
--- src/usr.sbin/postinstall/postinstall:1.157 Sun Jul 14 15:44:00 2013
+++ src/usr.sbin/postinstall/postinstall Mon Sep 9 15:04:12 2013
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.157 2013/07/14 15:44:00 htodd Exp $
+# $NetBSD: postinstall,v 1.158 2013/09/09 15:04:12 prlw1 Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -762,7 +762,7 @@ do_defaults()
compare_dir "$op" "${SRC_DIR}/etc/defaults" "${DEST_DIR}/etc/defaults" \
444 \
- daily.conf monthly.conf security.conf \
+ daily.conf monthly.conf pkgpath.conf security.conf \
weekly.conf ${extra_scripts}
failed=$(( ${failed} + $? ))
CVS commit: src/etc
Module Name:src
Committed By: prlw1
Date: Sun Sep 8 08:19:40 UTC 2013
Modified Files:
src/etc: daily security
Log Message:
Add defaults for pkg_info and pkg_admin variables in case pkgpath.conf
is not installed.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/etc/daily
cvs rdiff -u -r1.112 -r1.113 src/etc/security
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/daily
diff -u src/etc/daily:1.89 src/etc/daily:1.90
--- src/etc/daily:1.89 Wed May 1 05:36:25 2013
+++ src/etc/daily Sun Sep 8 08:19:40 2013
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: daily,v 1.89 2013/05/01 05:36:25 agc Exp $
+# $NetBSD: daily,v 1.90 2013/09/08 08:19:40 prlw1 Exp $
# @(#)daily 8.2 (Berkeley) 1/25/94
#
@@ -18,6 +18,9 @@ host="$(hostname)"
date="$(date)"
rcvar_manpage='daily.conf(5)'
+pkg_admin=${pkg_admin:-/usr/sbin/pkg_admin}
+pkg_info=${pkg_info:-/usr/sbin/pkg_info}
+
echo "To: ${MAILTO:-root}"
echo "Subject: $host daily output for $date"
echo ""
Index: src/etc/security
diff -u src/etc/security:1.112 src/etc/security:1.113
--- src/etc/security:1.112 Wed May 1 05:36:25 2013
+++ src/etc/security Sun Sep 8 08:19:40 2013
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: security,v 1.112 2013/05/01 05:36:25 agc Exp $
+# $NetBSD: security,v 1.113 2013/09/08 08:19:40 prlw1 Exp $
# from: @(#)security 8.1 (Berkeley) 6/9/93
#
@@ -30,6 +30,7 @@ fi
backup_dir=${backup_dir:-/var/backups}
max_loginlen=${max_loginlen:-8}
max_grouplen=${max_grouplen:-8}
+pkg_admin=${pkg_admin:-/usr/sbin/pkg_admin}
pkg_info=${pkg_info:-/usr/sbin/pkg_info}
# Other configurable variables
CVS commit: src/usr.bin/newsyslog
Module Name:src
Committed By: prlw1
Date: Thu Sep 5 11:34:40 UTC 2013
Modified Files:
src/usr.bin/newsyslog: newsyslog.c
Log Message:
Fix
/var/log/httpd/access.log 644 52 * $W0D23 ZBP /var/run/httpd.pid 30
newsyslog: config line 16: bad signal type
(strtol: **endptr is '\0' on success rather than *endptr)
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/newsyslog/newsyslog.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/newsyslog/newsyslog.c
diff -u src/usr.bin/newsyslog/newsyslog.c:1.60 src/usr.bin/newsyslog/newsyslog.c:1.61
--- src/usr.bin/newsyslog/newsyslog.c:1.60 Sun Jun 17 03:52:32 2012
+++ src/usr.bin/newsyslog/newsyslog.c Thu Sep 5 11:34:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: newsyslog.c,v 1.60 2012/06/17 03:52:32 christos Exp $ */
+/* $NetBSD: newsyslog.c,v 1.61 2013/09/05 11:34:40 prlw1 Exp $ */
/*
* Copyright (c) 1999, 2000 Andrew Doran
@@ -55,7 +55,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: newsyslog.c,v 1.60 2012/06/17 03:52:32 christos Exp $");
+__RCSID("$NetBSD: newsyslog.c,v 1.61 2013/09/05 11:34:40 prlw1 Exp $");
#endif /* not lint */
#include
@@ -824,7 +824,7 @@ getsig(const char *sig)
if (isnumber(sig)) {
n = (int)strtol(sig, &p, 0);
- if (p != '\0' || n < 0 || n >= NSIG)
+ if (*p != '\0' || n < 0 || n >= NSIG)
return -1;
return n;
}
CVS commit: src
Module Name:src
Committed By: prlw1
Date: Sun Jul 28 11:46:24 UTC 2013
Modified Files:
src/doc: CHANGES
src/external/intel-fw-public: Makefile Makefile.inc
src/sys/dev/pci: if_iwn.c if_iwnreg.h if_iwnvar.h
Added Files:
src/external/intel-fw-public/iwl6030: Makefile
src/external/intel-fw-public/iwl6030/dist:
LICENSE.iwlwifi-6000g2b-ucode README.iwlwifi-6000g2b-ucode
iwlwifi-6000g2b-6.ucode
Log Message:
Add support for Centrino Wireless-N 1030 and Centrino Advanced-N 6230
http://mail-index.netbsd.org/tech-net/2013/01/04/msg003802.html
To generate a diff of this commit:
cvs rdiff -u -r1.1836 -r1.1837 src/doc/CHANGES
cvs rdiff -u -r1.6 -r1.7 src/external/intel-fw-public/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/intel-fw-public/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/intel-fw-public/iwl6030/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/intel-fw-public/iwl6030/dist/LICENSE.iwlwifi-6000g2b-ucode \
src/external/intel-fw-public/iwl6030/dist/README.iwlwifi-6000g2b-ucode \
src/external/intel-fw-public/iwl6030/dist/iwlwifi-6000g2b-6.ucode
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/pci/if_iwn.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/if_iwnreg.h
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/if_iwnvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1836 src/doc/CHANGES:1.1837
--- src/doc/CHANGES:1.1836 Sat Jul 27 19:25:23 2013
+++ src/doc/CHANGES Sun Jul 28 11:46:24 2013
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1836 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1837 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -262,3 +262,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
addressing modes). [matt 20130719]
bind: update to 9.9.3-P2 to fix CVE-2013-4854 remote query can cause
named to terminate
+ iwn(4): Add support for Centrino Wireless-N 1030 and Centrino
+ Advanced-N 6230 [prlw1 20130728]
Index: src/external/intel-fw-public/Makefile
diff -u src/external/intel-fw-public/Makefile:1.6 src/external/intel-fw-public/Makefile:1.7
--- src/external/intel-fw-public/Makefile:1.6 Fri May 20 01:59:14 2011
+++ src/external/intel-fw-public/Makefile Sun Jul 28 11:46:24 2013
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2011/05/20 01:59:14 msaitoh Exp $
+# $NetBSD: Makefile,v 1.7 2013/07/28 11:46:24 prlw1 Exp $
SUBDIR+= ipw3945 iwl1000 iwl4965 iwl5000 iwl5150 iwl6000 iwl6005 \
- iwl6050
+ iwl6030 iwl6050
.include
Index: src/external/intel-fw-public/Makefile.inc
diff -u src/external/intel-fw-public/Makefile.inc:1.1 src/external/intel-fw-public/Makefile.inc:1.2
--- src/external/intel-fw-public/Makefile.inc:1.1 Thu Oct 30 00:27:32 2008
+++ src/external/intel-fw-public/Makefile.inc Sun Jul 28 11:46:24 2013
@@ -1,4 +1,4 @@
-# $NetBSD
+# $NetBSD: Makefile.inc,v 1.2 2013/07/28 11:46:24 prlw1 Exp $
FILESOWN= ${FIRMWAREOWN}
FILESGRP= ${FIRMWAREGRP}
Index: src/sys/dev/pci/if_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.66 src/sys/dev/pci/if_iwn.c:1.67
--- src/sys/dev/pci/if_iwn.c:1.66 Sat Jun 15 13:05:35 2013
+++ src/sys/dev/pci/if_iwn.c Sun Jul 28 11:46:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwn.c,v 1.66 2013/06/15 13:05:35 christos Exp $ */
+/* $NetBSD: if_iwn.c,v 1.67 2013/07/28 11:46:24 prlw1 Exp $ */
/* $OpenBSD: if_iwn.c,v 1.119 2013/05/29 23:16:52 yuo Exp $ */
/*-
@@ -22,7 +22,7 @@
* adapters.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.66 2013/06/15 13:05:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.67 2013/07/28 11:46:24 prlw1 Exp $");
#define IWN_USE_RBUF /* Use local storage for RX */
#undef IWN_HWCRYPTO /* XXX does not even compile yet */
@@ -35,6 +35,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1
#include
#include
#include
+#ifdef notyetMODULE
+#include
+#endif
#include
#include
#include
@@ -227,6 +230,11 @@ static void iwn_tune_sensitivity(struct
static int iwn_send_sensitivity(struct iwn_softc *);
static int iwn_set_pslevel(struct iwn_softc *, int, int, int);
static int iwn5000_runtime_calib(struct iwn_softc *);
+
+static int iwn_config_bt_coex_bluetooth(struct iwn_softc *);
+static int iwn_config_bt_coex_prio_table(struct iwn_softc *);
+static int iwn_config_bt_coex_adv1(struct iwn_softc *);
+
static int iwn_config(struct iwn_softc *);
static int iwn_scan(struct iwn_softc *, uint16_t);
static int iwn_auth(struct iwn_softc *);
@@ -618,6 +626,7 @@ iwn4965_attach(struct iwn_softc *sc, pci
ops->read_eeprom = iwn4965_read_eeprom;
ops->post_alive = iwn4965_post_alive;
ops->nic_config = iwn4965_nic_config;
+ ops->config_bt_coex = iwn_config_bt_coex_bluetooth;
ops->update_sched = iwn4965_update_sched;
ops->get_temperature = iwn4965_get_temperature;
ops->get_rssi = iwn4965_get_rssi;
@@ -657,6 +666,7 @@ iwn5000_attach(struct iwn_soft
CVS commit: src/external/mit/xorg/bin/xrdb
Module Name:src Committed By: prlw1 Date: Fri Jul 19 08:29:27 UTC 2013 Modified Files: src/external/mit/xorg/bin/xrdb: Makefile Log Message: Replace mrg's clean cpp+cpp_arg interface with xrdb version 420347005c to minimise upstream differences. OK wiz@ To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xrdb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xrdb/Makefile diff -u src/external/mit/xorg/bin/xrdb/Makefile:1.3 src/external/mit/xorg/bin/xrdb/Makefile:1.4 --- src/external/mit/xorg/bin/xrdb/Makefile:1.3 Mon Feb 21 04:40:55 2011 +++ src/external/mit/xorg/bin/xrdb/Makefile Fri Jul 19 08:29:27 2013 @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2011/02/21 04:40:55 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2013/07/19 08:29:27 prlw1 Exp $ .include PROG= xrdb -CPPFLAGS+=-DCPP="\"/usr/bin/cpp\"" -DHAS_MKSTEMP # XXX -CPPFLAGS+=-DCPP_ARGS="\"-traditional\"" +CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAS_MKSTEMP # XXX CPPFLAGS+=-DHAVE_ASPRINTF LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
CVS commit: xsrc/external/mit/xrdb/dist
Module Name:xsrc
Committed By: prlw1
Date: Fri Jul 19 08:29:24 UTC 2013
Modified Files:
xsrc/external/mit/xrdb/dist: xrdb.c
Log Message:
Replace mrg's clean cpp+cpp_arg interface with xrdb version 420347005c
to minimise upstream differences.
OK wiz@
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xrdb/dist/xrdb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xrdb/dist/xrdb.c
diff -u xsrc/external/mit/xrdb/dist/xrdb.c:1.5 xsrc/external/mit/xrdb/dist/xrdb.c:1.6
--- xsrc/external/mit/xrdb/dist/xrdb.c:1.5 Wed Apr 6 02:07:24 2011
+++ xsrc/external/mit/xrdb/dist/xrdb.c Fri Jul 19 08:29:24 2013
@@ -120,17 +120,13 @@ static char *filename = NULL;
#ifdef PATHETICCPP
static Bool need_real_defines = False;
static char tmpname2[32];
+#endif
#ifdef WIN32
static char tmpname3[32];
#endif
-#endif
static int oper = OPLOAD;
static char *editFile = NULL;
static const char *cpp_program = NULL;
-#ifndef CPP_ARGS
-#define CPP_ARGS NULL
-#endif
-static const char *cpp_args = CPP_ARGS;
static const char* const cpp_locations[] = { CPP };
static char *backup_suffix = BACKUP_SUFFIX;
static Bool dont_execute = False;
@@ -424,7 +420,7 @@ AddDef(String *buff, char *title, char *
#ifdef PATHETICCPP
if (need_real_defines) {
addstring(buff, "\n#define ");
- addstring(buff, title);
+ addtokstring(buff, title);
if (value && (value[0] != '\0')) {
addstring(buff, " ");
addstring(buff, value);
@@ -747,7 +743,7 @@ Syntax (void)
" -Dname[=value], -Uname, -Idirectorypassed to preprocessor\n"
"\n"
"A - or no input filename represents stdin.\n",
- ProgramName, CPP, BACKUP_SUFFIX);
+ ProgramName, cpp_program ? cpp_program : "", BACKUP_SUFFIX);
exit (1);
}
@@ -859,11 +855,19 @@ main(int argc, char *argv[])
int j;
for (j = 0; j < number_of_elements; j++) {
- if (access(cpp_locations[j], X_OK) == 0) {
+ char *end, *dup;
+ /* cut off arguments */
+ dup = strdup(cpp_locations[j]);
+ end = strchr(dup,' ');
+ if (end)
+ *end = '\0';
+ if (access(dup, X_OK) == 0) {
cpp_program = cpp_locations[j];
+ free(dup);
break;
}
- }
+ free(dup);
+ }
}
/* needs to be replaced with XrmParseCommand */
@@ -890,10 +894,6 @@ main(int argc, char *argv[])
if (++i >= argc) Syntax ();
cpp_program = argv[i];
continue;
- } else if (isabbreviation ("-cppargs", arg, 2)) {
- if (++i >= argc) Syntax ();
- cpp_args = argv[i];
- continue;
} else if (!strcmp ("-n", arg)) {
dont_execute = True;
continue;
@@ -1238,10 +1238,7 @@ Process(int scrno, Bool doScreen, Bool e
fprintf(input, "\n#include \"%s\"\n", filename);
fclose(input);
(void) mktemp(tmpname3);
- if (asprintf(&cmd, "%s%s%s -P%s %s > %s", cpp_program,
- cpp_args ? " " : "",
- cpp_args ? cpp_args : "",
- includes.val,
+ if (asprintf(&cmd, "%s -P%s %s > %s", cpp_program, includes.val,
tmpname2, tmpname3) == -1)
fatal("%s: Out of memory\n", ProgramName);
if (system(cmd) < 0)
@@ -1256,10 +1253,7 @@ Process(int scrno, Bool doScreen, Bool e
fprintf(stdin, "\n#include \"%s\"\n", filename);
fflush(stdin);
fseek(stdin, 0, 0);
- if (asprintf(&cmd, "%s%s%s -P%s", cpp_program,
- cpp_args ? " " : "",
- cpp_args ? cpp_args : "",
- includes.val) == -1)
+ if (asprintf(&cmd, "%s -P%s", cpp_program, includes.val) == -1)
fatal("%s: Out of memory\n", ProgramName);
if (!(input = popen(cmd, "r")))
fatal("%s: cannot run '%s'\n", ProgramName, cmd);
@@ -1274,9 +1268,7 @@ Process(int scrno, Bool doScreen, Bool e
if (cpp_program) {
#ifdef WIN32
(void) mktemp(tmpname3);
- if (asprintf(&cmd, "%s%s%s -P%s %s %s > %s", cpp_program,
- cpp_args ? " " : "",
- cpp_args ? cpp_args : "",
+ if (asprintf(&cmd, "%s -P%s %s %s > %s", cpp_program,
includes.val, defines.val,
filename ? filename : "", tmpname3) == -1)
fatal("%s: Out of memory\n", ProgramName);
@@ -1286,9 +1278,7 @@ Process(int scrno, Bool doScreen, Bool e
if (!(input = fopen(tmpname3, "r")))
fatal("%s: can't open file '%s'\n", ProgramName, tmpname3);
#else
- if (asprintf(&cmd, "%s%s%s -P%s %s %s", cpp_program,
- cpp_args ? " " : "",
- cpp_args ? cpp_args : "",
+ if (asprintf(&cmd, "%s -P%s %s %s", cpp_program,
includes.val, defines.val,
filename ? filename : "") == -1)
fatal("%s: Out of memory\n", ProgramName);
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: prlw1
Date: Tue May 21 12:07:03 UTC 2013
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
add _gpio to gid check
To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/usr.sbin/postinstall/postinstall
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/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.148 src/usr.sbin/postinstall/postinstall:1.149
--- src/usr.sbin/postinstall/postinstall:1.148 Thu May 16 07:37:05 2013
+++ src/usr.sbin/postinstall/postinstall Tue May 21 12:07:03 2013
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.148 2013/05/16 07:37:05 yamt Exp $
+# $NetBSD: postinstall,v 1.149 2013/05/21 12:07:03 prlw1 Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -855,7 +855,7 @@ do_gid()
check_ids "$1" groups "${DEST_DIR}/etc/group" \
named ntpd sshd authpf _pflogd _rwhod _proxy _timedc \
- _sdpd _httpd _mdnsd _tests _tcpdump _tss
+ _sdpd _httpd _mdnsd _tests _tcpdump _tss _gpio
}
#
CVS commit: src
Module Name:src Committed By: prlw1 Date: Sun Jan 13 18:47:58 UTC 2013 Modified Files: src/etc/defaults: rc.conf src/etc/rc.d: ppp src/share/man/man5: rc.conf.5 Log Message: Add ppp=YES variable. Currently pppd(8) starts automatically if ppp_peers is not empty. Adding a ppp variable allows the default peer to be set, and ppp set to NO so that dialing can happen with /etc/rc.d/ppp onestart. Default set to YES so that old behaviour is preserved. http://mail-index.netbsd.org/tech-userlevel/2012/08/21/msg006656.html To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/etc/defaults/rc.conf cvs rdiff -u -r1.10 -r1.11 src/etc/rc.d/ppp cvs rdiff -u -r1.154 -r1.155 src/share/man/man5/rc.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/defaults/rc.conf diff -u src/etc/defaults/rc.conf:1.121 src/etc/defaults/rc.conf:1.122 --- src/etc/defaults/rc.conf:1.121 Fri Jan 11 04:32:41 2013 +++ src/etc/defaults/rc.conf Sun Jan 13 18:47:57 2013 @@ -1,4 +1,4 @@ -# $NetBSD: rc.conf,v 1.121 2013/01/11 04:32:41 riastradh Exp $ +# $NetBSD: rc.conf,v 1.122 2013/01/13 18:47:57 prlw1 Exp $ # # /etc/defaults/rc.conf -- # default configuration of /etc/rc.conf @@ -179,7 +179,7 @@ dhcpcd_flags="-q"# For ifconfig_XXX= dhclient=NO # behave as a DHCP client dhclient_flags="" # blank: config all interfaces ntpdate=NO ntpdate_flags="-b -s" # May need '-u' thru firewall -ppp_peers="" # /etc/ppp/peers to call +ppp=YES ppp_peers="" # /etc/ppp/peers to call ip6mode=host # host, autohost or router ip6uniquelocal=NO# IPv6 unique-local forwarding rtsol=NO rtsol_flags="-a" # for ip6mode=autohost only Index: src/etc/rc.d/ppp diff -u src/etc/rc.d/ppp:1.10 src/etc/rc.d/ppp:1.11 --- src/etc/rc.d/ppp:1.10 Thu Dec 13 21:51:52 2012 +++ src/etc/rc.d/ppp Sun Jan 13 18:47:58 2013 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: ppp,v 1.10 2012/12/13 21:51:52 wiz Exp $ +# $NetBSD: ppp,v 1.11 2013/01/13 18:47:58 prlw1 Exp $ # # PROVIDE: ppp @@ -14,6 +14,7 @@ $_rc_subr_loaded . /etc/rc.subr name="ppp" +rcvar=$name start_cmd="ppp_start" stop_cmd="ppp_stop" sig_stop="-INT" Index: src/share/man/man5/rc.conf.5 diff -u src/share/man/man5/rc.conf.5:1.154 src/share/man/man5/rc.conf.5:1.155 --- src/share/man/man5/rc.conf.5:1.154 Tue Oct 2 09:18:59 2012 +++ src/share/man/man5/rc.conf.5 Sun Jan 13 18:47:58 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: rc.conf.5,v 1.154 2012/10/02 09:18:59 roy Exp $ +.\" $NetBSD: rc.conf.5,v 1.155 2013/01/13 18:47:58 prlw1 Exp $ .\" .\" Copyright (c) 1996 Matthew R. Green .\" All rights reserved. @@ -887,9 +887,17 @@ Boolean value. Run .Xr pflogd 8 for dumping packet filter logging information to a file. +.It Sy ppp +A boolean. Toggles starting +.Xr pppd 8 +on startup. See +.Sy ppp_peers +below. .It Sy ppp_peers A string. If +.Sy ppp +is true and .Sy ppp_peers is not empty, then .Pa /etc/rc.d/ppp
CVS commit: src/sys/dev
Module Name:src
Committed By: prlw1
Date: Mon Jan 7 15:07:41 UTC 2013
Modified Files:
src/sys/dev: video.c
src/sys/dev/usb: ehci.c usb_mem.c usb_mem.h
Log Message:
Allow USB memory allocation by multiple segments in scatter/gather lists
rather than in a single contiguous block which causes problems with
large USB video frames.
Based on a patch by Jeremy Morse in the thread
http://mail-index.netbsd.org/current-users/2011/01/26/msg015532.html
Tested by developing http://code.opencv.org/issues/2360
OK jmcneill@
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/video.c
cvs rdiff -u -r1.196 -r1.197 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/usb/usb_mem.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/usb_mem.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/video.c
diff -u src/sys/dev/video.c:1.28 src/sys/dev/video.c:1.29
--- src/sys/dev/video.c:1.28 Thu Feb 2 17:21:18 2012
+++ src/sys/dev/video.c Mon Jan 7 15:07:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: video.c,v 1.28 2012/02/02 17:21:18 drochner Exp $ */
+/* $NetBSD: video.c,v 1.29 2013/01/07 15:07:40 prlw1 Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: video.c,v 1.28 2012/02/02 17:21:18 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: video.c,v 1.29 2013/01/07 15:07:40 prlw1 Exp $");
#include "video.h"
#if NVIDEO > 0
@@ -1604,7 +1604,8 @@ videoopen(dev_t dev, int flags, int ifmt
sc = device_private(device_lookup(&video_cd, VIDEOUNIT(dev)));
if (sc == NULL) {
- DPRINTF(("videoopen: failed to get softc\n"));
+ DPRINTF(("videoopen: failed to get softc for unit %d\n",
+ VIDEOUNIT(dev)));
return ENXIO;
}
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.196 src/sys/dev/usb/ehci.c:1.197
--- src/sys/dev/usb/ehci.c:1.196 Sat Jan 5 23:34:16 2013
+++ src/sys/dev/usb/ehci.c Mon Jan 7 15:07:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.196 2013/01/05 23:34:16 christos Exp $ */
+/* $NetBSD: ehci.c,v 1.197 2013/01/07 15:07:40 prlw1 Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.196 2013/01/05 23:34:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.197 2013/01/07 15:07:40 prlw1 Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -1336,12 +1336,18 @@ ehci_allocm(struct usbd_bus *bus, usb_dm
struct ehci_softc *sc = bus->hci_private;
usbd_status err;
- err = usb_allocmem(&sc->sc_bus, size, 0, dma);
+ err = usb_allocmem_flags(&sc->sc_bus, size, 0, dma, USBMALLOC_MULTISEG);
+#ifdef EHCI_DEBUG
+ if (err)
+ printf("ehci_allocm: usb_allocmem_flags()= %s (%d)\n",
+ usbd_errstr(err), err);
+#endif
if (err == USBD_NOMEM)
err = usb_reserve_allocm(&sc->sc_dma_reserve, dma, size);
#ifdef EHCI_DEBUG
if (err)
- printf("ehci_allocm: usb_allocmem()=%d\n", err);
+ printf("ehci_allocm: usb_reserve_allocm()= %s (%d)\n",
+ usbd_errstr(err), err);
#endif
return (err);
}
@@ -2727,18 +2733,20 @@ ehci_alloc_sqtd_chain(struct ehci_pipe *
ehci_soft_qtd_t **sp, ehci_soft_qtd_t **ep)
{
ehci_soft_qtd_t *next, *cur;
- ehci_physaddr_t dataphys, dataphyspage, dataphyslastpage, nextphys;
+ ehci_physaddr_t nextphys;
u_int32_t qtdstatus;
int len, curlen, mps;
int i, tog;
+ int pages, pageoffs;
+ bus_size_t curoffs;
+ vaddr_t va, va_offs;
usb_dma_t *dma = &xfer->dmabuf;
u_int16_t flags = xfer->flags;
+ paddr_t a;
DPRINTFN(alen<4*4096,("ehci_alloc_sqtd_chain: start len=%d\n", alen));
len = alen;
- dataphys = DMAADDR(dma, 0);
- dataphyslastpage = EHCI_PAGE(dataphys + len - 1);
qtdstatus = EHCI_QTD_ACTIVE |
EHCI_QTD_SET_PID(rd ? EHCI_QTD_PID_IN : EHCI_QTD_PID_OUT) |
EHCI_QTD_SET_CERR(3)
@@ -2756,28 +2764,18 @@ ehci_alloc_sqtd_chain(struct ehci_pipe *
usb_syncmem(dma, 0, alen,
rd ? BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE);
+ curoffs = 0;
for (;;) {
- dataphyspage = EHCI_PAGE(dataphys);
/* The EHCI hardware can handle at most 5 pages. */
- if (dataphyslastpage - dataphyspage <
- EHCI_QTD_NBUFFERS * EHCI_PAGE_SIZE) {
+ va_offs = (vaddr_t)KERNADDR(dma, curoffs);
+ va_offs = EHCI_PAGE_OFFSET(va_offs);
+ if (len-curoffs < EHCI_QTD_NBUFFERS*EHCI_PAGE_SIZE - va_offs) {
/* we can handle it in this QTD */
- curlen = len;
+ curlen = len - curoffs;
} else {
/* must use multiple TDs, fill as much as possible. */
- curlen = EHCI_QTD_NBUFFERS * EHCI_PAGE_SIZE -
- EHCI_PAGE_OFFSET(dataphys);
-#ifdef DIAGNOSTIC
- if (curlen > len) {
-printf("ehci_alloc_sqtd_chain: curlen=0x%x "
- "len=0x%x offs=0x%x\n", curlen, len,
- EHCI_PAGE_OFFSET(dataphys));
-printf("lastpage=0x%x page=0x%x phys=0x%x\n",
- dataphyslastpage, dataphyspage,
- dataphys);
-curlen = len;
- }
-#endif
+ cu
CVS commit: src/etc/rc.d
Module Name:src
Committed By: prlw1
Date: Tue Dec 4 16:38:40 UTC 2012
Modified Files:
src/etc/rc.d: ntpd ppp
Log Message:
Make sure that ntpd creates a pid file for the rc machinery to work.
http://mail-index.netbsd.org/current-users/2012/11/19/msg021518.html
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/etc/rc.d/ntpd
cvs rdiff -u -r1.8 -r1.9 src/etc/rc.d/ppp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/ntpd
diff -u src/etc/rc.d/ntpd:1.13 src/etc/rc.d/ntpd:1.14
--- src/etc/rc.d/ntpd:1.13 Fri Aug 13 18:08:03 2004
+++ src/etc/rc.d/ntpd Tue Dec 4 16:38:40 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ntpd,v 1.13 2004/08/13 18:08:03 mycroft Exp $
+# $NetBSD: ntpd,v 1.14 2012/12/04 16:38:40 prlw1 Exp $
#
# PROVIDE: ntpd
@@ -19,6 +19,7 @@ required_files="/etc/ntp.conf"
ntpd_precmd()
{
+ rc_flags="-p ${pidfile} $rc_flags"
if [ -z "$ntpd_chrootdir" ]; then
return 0;
fi
Index: src/etc/rc.d/ppp
diff -u src/etc/rc.d/ppp:1.8 src/etc/rc.d/ppp:1.9
--- src/etc/rc.d/ppp:1.8 Mon Oct 11 15:00:51 2004
+++ src/etc/rc.d/ppp Tue Dec 4 16:38:40 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ppp,v 1.8 2004/10/11 15:00:51 christos Exp $
+# $NetBSD: ppp,v 1.9 2012/12/04 16:38:40 prlw1 Exp $
#
# PROVIDE: ppp
@@ -14,6 +14,7 @@
$_rc_subr_loaded . /etc/rc.subr
name="ppp"
+rcvar=$name
start_cmd="ppp_start"
stop_cmd="ppp_stop"
sig_stop="-INT"
@@ -40,6 +41,8 @@ ppp_start()
fi
done
echo "."
+ else
+ warn "\${ppp_peers} is not set - pppd was not started."
fi
}
CVS commit: src/sys/dev/pci
Module Name:src Committed By: prlw1 Date: Fri Oct 19 16:57:47 UTC 2012 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Intel Centrino Wireless-N 2230 To generate a diff of this commit: cvs rdiff -u -r1.1139 -r1.1140 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1139 src/sys/dev/pci/pcidevs:1.1140 --- src/sys/dev/pci/pcidevs:1.1139 Sat Sep 29 10:26:14 2012 +++ src/sys/dev/pci/pcidevs Fri Oct 19 16:57:47 2012 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1139 2012/09/29 10:26:14 gsutre Exp $ +$NetBSD: pcidevs,v 1.1140 2012/10/19 16:57:47 prlw1 Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2517,6 +2517,8 @@ product INTEL 82426EX 0x0486 82426EX PC product INTEL PCMC 0x04a3 82434LX/NX PCI, Cache and Memory Controller (PCMC) product INTEL GDT_RAID1 0x0600 GDT RAID product INTEL GDT_RAID2 0x061f GDT RAID +product INTEL WIFI_LINK_2230_1 0x0887 Centrino Wireless-N 2230 +product INTEL WIFI_LINK_2230_2 0x0888 Centrino Wireless-N 2230 product INTEL 80960RM 0x0962 i960 RM PCI-PCI product INTEL 80960RN 0x0964 i960 RN PCI-PCI product INTEL 82542 0x1000 i82542 Gigabit Ethernet
