CVS commit: [netbsd-6] src/sys/dev/marvell
Module Name:src
Committed By: riz
Date: Sat Jan 5 23:32:28 UTC 2013
Modified Files:
src/sys/dev/marvell [netbsd-6]: if_mvgbe.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #766):
sys/dev/marvell/if_mvgbe.c: revision 1.33
Check wheter an MII PHY is really connected or not.
This change privents panic if MII PHY port is not used.
To generate a diff of this commit:
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/sys/dev/marvell/if_mvgbe.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/marvell/if_mvgbe.c
diff -u src/sys/dev/marvell/if_mvgbe.c:1.16.2.1 src/sys/dev/marvell/if_mvgbe.c:1.16.2.2
--- src/sys/dev/marvell/if_mvgbe.c:1.16.2.1 Tue Nov 20 22:26:03 2012
+++ src/sys/dev/marvell/if_mvgbe.c Sat Jan 5 23:32:27 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mvgbe.c,v 1.16.2.1 2012/11/20 22:26:03 riz Exp $ */
+/* $NetBSD: if_mvgbe.c,v 1.16.2.2 2013/01/05 23:32:27 riz Exp $ */
/*
* Copyright (c) 2007, 2008 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_mvgbe.c,v 1.16.2.1 2012/11/20 22:26:03 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_mvgbe.c,v 1.16.2.2 2013/01/05 23:32:27 riz Exp $);
#include sys/param.h
#include sys/bus.h
@@ -398,7 +398,9 @@ mvgbec_attach(device_t parent, device_t
if (child) {
port = device_private(child);
mii = LIST_FIRST(port-sc_mii.mii_phys);
-phyaddr |= MVGBE_PHYADDR_PHYAD(j, mii-mii_phy);
+if (mii != NULL)
+ phyaddr |= MVGBE_PHYADDR_PHYAD(j,
+ mii-mii_phy);
}
}
break;
CVS commit: [netbsd-6] src/sys/kern
Module Name:src
Committed By: riz
Date: Wed Jan 2 23:23:15 UTC 2013
Modified Files:
src/sys/kern [netbsd-6]: vfs_wapbl.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #758):
sys/kern/vfs_wapbl.c: revision 1.53
sys/kern/vfs_wapbl.c: revision 1.54
wapbl_biodone: Release the buffer before reclaiming the log.
wapbl_flush() may wait for the log to become empty and
all buffers should be unbusy before it returns.
Try to coalesce writes to the journal in MAXPHYS sized and aligned blocks.
Speeds up wapbl_flush() on raid5 by a factor of 3-4.
Discussed on tech-kern.
Needs pullup to NetBSD-6.
To generate a diff of this commit:
cvs rdiff -u -r1.51.2.1 -r1.51.2.2 src/sys/kern/vfs_wapbl.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/kern/vfs_wapbl.c
diff -u src/sys/kern/vfs_wapbl.c:1.51.2.1 src/sys/kern/vfs_wapbl.c:1.51.2.2
--- src/sys/kern/vfs_wapbl.c:1.51.2.1 Mon May 7 03:01:13 2012
+++ src/sys/kern/vfs_wapbl.c Wed Jan 2 23:23:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_wapbl.c,v 1.51.2.1 2012/05/07 03:01:13 riz Exp $ */
+/* $NetBSD: vfs_wapbl.c,v 1.51.2.2 2013/01/02 23:23:15 riz Exp $ */
/*-
* Copyright (c) 2003, 2008, 2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#define WAPBL_INTERNAL
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_wapbl.c,v 1.51.2.1 2012/05/07 03:01:13 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_wapbl.c,v 1.51.2.2 2013/01/02 23:23:15 riz Exp $);
#include sys/param.h
#include sys/bitops.h
@@ -184,6 +184,10 @@ struct wapbl {
SIMPLEQ_HEAD(, wapbl_entry) wl_entries; /* On disk transaction
accounting */
+
+ u_char *wl_buffer; /* l: buffer for wapbl_buffered_write() */
+ daddr_t wl_buffer_dblk; /* l: buffer disk block address */
+ size_t wl_buffer_used; /* l: buffer current use */
};
#ifdef WAPBL_DEBUG_PRINT
@@ -489,6 +493,9 @@ wapbl_start(struct wapbl ** wlp, struct
wl-wl_dealloclens = wapbl_alloc(sizeof(*wl-wl_dealloclens) *
wl-wl_dealloclim);
+ wl-wl_buffer = wapbl_alloc(MAXPHYS);
+ wl-wl_buffer_used = 0;
+
wapbl_inodetrk_init(wl, WAPBL_INODETRK_SIZE);
/* Initialize the commit header */
@@ -537,6 +544,7 @@ wapbl_start(struct wapbl ** wlp, struct
sizeof(*wl-wl_deallocblks) * wl-wl_dealloclim);
wapbl_free(wl-wl_dealloclens,
sizeof(*wl-wl_dealloclens) * wl-wl_dealloclim);
+ wapbl_free(wl-wl_buffer, MAXPHYS);
wapbl_inodetrk_free(wl);
wapbl_free(wl, sizeof(*wl));
@@ -716,6 +724,7 @@ wapbl_stop(struct wapbl *wl, int force)
sizeof(*wl-wl_deallocblks) * wl-wl_dealloclim);
wapbl_free(wl-wl_dealloclens,
sizeof(*wl-wl_dealloclens) * wl-wl_dealloclim);
+ wapbl_free(wl-wl_buffer, MAXPHYS);
wapbl_inodetrk_free(wl);
cv_destroy(wl-wl_reclaimable_cv);
@@ -791,6 +800,81 @@ wapbl_read(void *data, size_t len, struc
}
/*
+ * Flush buffered data if any.
+ */
+static int
+wapbl_buffered_flush(struct wapbl *wl)
+{
+ int error;
+
+ if (wl-wl_buffer_used == 0)
+ return 0;
+
+ error = wapbl_doio(wl-wl_buffer, wl-wl_buffer_used,
+ wl-wl_devvp, wl-wl_buffer_dblk, B_WRITE);
+ wl-wl_buffer_used = 0;
+
+ return error;
+}
+
+/*
+ * Write data to the log.
+ * Try to coalesce writes and emit MAXPHYS aligned blocks.
+ */
+static int
+wapbl_buffered_write(void *data, size_t len, struct wapbl *wl, daddr_t pbn)
+{
+ int error;
+ size_t resid;
+
+ /*
+ * If not adjacent to buffered data flush first. Disk block
+ * address is always valid for non-empty buffer.
+ */
+ if (wl-wl_buffer_used 0
+ pbn != wl-wl_buffer_dblk + btodb(wl-wl_buffer_used)) {
+ error = wapbl_buffered_flush(wl);
+ if (error)
+ return error;
+ }
+ /*
+ * If this write goes to an empty buffer we have to
+ * save the disk block address first.
+ */
+ if (wl-wl_buffer_used == 0)
+ wl-wl_buffer_dblk = pbn;
+ /*
+ * Remaining space so this buffer ends on a MAXPHYS boundary.
+ *
+ * Cannot become less or equal zero as the buffer would have been
+ * flushed on the last call then.
+ */
+ resid = MAXPHYS - dbtob(wl-wl_buffer_dblk % btodb(MAXPHYS)) -
+ wl-wl_buffer_used;
+ KASSERT(resid 0);
+ KASSERT(dbtob(btodb(resid)) == resid);
+ if (len = resid) {
+ memcpy(wl-wl_buffer + wl-wl_buffer_used, data, resid);
+ wl-wl_buffer_used += resid;
+ error = wapbl_doio(wl-wl_buffer, wl-wl_buffer_used,
+ wl-wl_devvp, wl-wl_buffer_dblk, B_WRITE);
+ data = (uint8_t *)data + resid;
+ len -= resid;
+ wl-wl_buffer_dblk = pbn + btodb(resid);
+ wl-wl_buffer_used = 0;
+ if (error)
+ return error;
+ }
+ KASSERT(len MAXPHYS);
+ if (len 0) {
+ memcpy(wl-wl_buffer + wl-wl_buffer_used, data, len);
+ wl-wl_buffer_used += len;
+ }
+
+ return 0;
+}
+
+/*
* Off is byte offset returns new offset for next write
* handles log wraparound
*/
@@ -813,7 +897,7 @@ wapbl_circ_write(struct wapbl *wl, void
#ifdef _KERNEL
pbn = btodb(pbn wl-wl_log_dev_bshift);
#endif
- error =
CVS commit: [netbsd-6] src/sys/dev/sdmmc
Module Name:src
Committed By: riz
Date: Wed Jan 2 23:34:56 UTC 2013
Modified Files:
src/sys/dev/sdmmc [netbsd-6]: sdhc.c sdhcreg.h
Log Message:
sys/dev/sdmmc/sdhc.cpatch
sys/dev/sdmmc/sdhcreg.h patch
Support SDHC version 3 clocks.
[skrll, ticket #759]
To generate a diff of this commit:
cvs rdiff -u -r1.10.2.3 -r1.10.2.4 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/sys/dev/sdmmc/sdhcreg.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.10.2.3 src/sys/dev/sdmmc/sdhc.c:1.10.2.4
--- src/sys/dev/sdmmc/sdhc.c:1.10.2.3 Thu Aug 9 06:36:48 2012
+++ src/sys/dev/sdmmc/sdhc.c Wed Jan 2 23:34:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.10.2.3 2012/08/09 06:36:48 jdc Exp $ */
+/* $NetBSD: sdhc.c,v 1.10.2.4 2013/01/02 23:34:56 riz Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.10.2.3 2012/08/09 06:36:48 jdc Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.10.2.4 2013/01/02 23:34:56 riz Exp $);
#ifdef _KERNEL_OPT
#include opt_sdmmc.h
@@ -79,6 +79,8 @@ struct sdhc_host {
struct kmutex intr_mtx;
struct kcondvar intr_cv;
+ int specver; /* spec. version */
+
uint32_t flags; /* flags for this host */
#define SHF_USE_DMA 0x0001
#define SHF_USE_4BIT_MODE 0x0002
@@ -223,26 +225,8 @@ sdhc_host_found(struct sdhc_softc *sc, b
struct sdmmcbus_attach_args saa;
struct sdhc_host *hp;
uint32_t caps;
-#ifdef SDHC_DEBUG
uint16_t sdhcver;
- sdhcver = bus_space_read_2(iot, ioh, SDHC_HOST_CTL_VERSION);
- aprint_normal_dev(sc-sc_dev, SD Host Specification/Vendor Version );
- switch (SDHC_SPEC_VERSION(sdhcver)) {
- case 0x00:
- aprint_normal(1.0/%u\n, SDHC_VENDOR_VERSION(sdhcver));
- break;
-
- case 0x01:
- aprint_normal(2.0/%u\n, SDHC_VENDOR_VERSION(sdhcver));
- break;
-
- default:
- aprint_normal(2.0/%u\n, SDHC_VENDOR_VERSION(sdhcver));
- break;
- }
-#endif
-
/* Allocate one more host structure. */
hp = malloc(sizeof(struct sdhc_host), M_DEVBUF, M_WAITOK|M_ZERO);
if (hp == NULL) {
@@ -262,6 +246,29 @@ sdhc_host_found(struct sdhc_softc *sc, b
mutex_init(hp-intr_mtx, MUTEX_DEFAULT, IPL_SDMMC);
cv_init(hp-intr_cv, sdhcintr);
+ sdhcver = HREAD2(hp, SDHC_HOST_CTL_VERSION);
+ aprint_normal_dev(sc-sc_dev, SD Host Specification );
+ hp-specver = SDHC_SPEC_VERSION(sdhcver);
+ switch (SDHC_SPEC_VERSION(sdhcver)) {
+ case SDHC_SPEC_VERS_100:
+ aprint_normal(1.0);
+ break;
+
+ case SDHC_SPEC_VERS_200:
+ aprint_normal(2.0);
+ break;
+
+ case SDHC_SPEC_VERS_300:
+ aprint_normal(3.0);
+ break;
+
+ default:
+ aprint_normal(unknown version(0x%x),
+ SDHC_SPEC_VERSION(sdhcver));
+ break;
+ }
+ aprint_normal(, rev.%u\n, SDHC_VENDOR_VERSION(sdhcver));
+
/*
* Reset the host controller and enable interrupts.
*/
@@ -289,8 +296,11 @@ sdhc_host_found(struct sdhc_softc *sc, b
/*
* Determine the base clock frequency. (2.2.24)
*/
- if (SDHC_BASE_FREQ_KHZ(caps) != 0)
+ if (hp-specver == SDHC_SPEC_VERS_300) {
+ hp-clkbase = SDHC_BASE_V3_FREQ_KHZ(caps);
+ } else {
hp-clkbase = SDHC_BASE_FREQ_KHZ(caps);
+ }
if (hp-clkbase == 0) {
if (sc-sc_clkbase == 0) {
/* The attachment driver must tell us. */
@@ -370,12 +380,16 @@ sdhc_host_found(struct sdhc_softc *sc, b
saa.saa_sct = sdhc_functions;
saa.saa_sch = hp;
saa.saa_dmat = hp-dmat;
- saa.saa_clkmin = hp-clkbase / 256;
saa.saa_clkmax = hp-clkbase;
if (ISSET(sc-sc_flags, SDHC_FLAG_HAVE_CGM))
- saa.saa_clkmin /= 2046;
+ saa.saa_clkmin = hp-clkbase / 256 / 2046;
else if (ISSET(sc-sc_flags, SDHC_FLAG_HAVE_DVS))
- saa.saa_clkmin /= 16;
+ saa.saa_clkmin = hp-clkbase / 256 / 16;
+ else if (hp-specver == SDHC_SPEC_VERS_300)
+ saa.saa_clkmin = hp-clkbase / 0x3ff;
+ else
+ saa.saa_clkmin = hp-clkbase / 256;
+
saa.saa_caps = SMC_CAPS_4BIT_MODE|SMC_CAPS_AUTO_STOP;
if (ISSET(sc-sc_flags, SDHC_FLAG_8BIT_MODE))
saa.saa_caps |= SMC_CAPS_8BIT_MODE;
@@ -725,16 +739,29 @@ sdhc_clock_divisor(struct sdhc_host *hp,
*/
roundup |= dvs 1;
}
- panic(%s: can't find divisor for freq %u, HDEVNAME(hp), freq);
+ /* No divisor found. */
+ return false;
+ }
+ if (hp-specver == SDHC_SPEC_VERS_300) {
+ div = howmany(hp-clkbase, freq);
+ if (div 0x3ff)
+ return false;
+ *divp = (((div 8) SDHC_SDCLK_XDIV_MASK)
+ SDHC_SDCLK_XDIV_SHIFT) |
+ (((div 0) SDHC_SDCLK_DIV_MASK)
+ SDHC_SDCLK_DIV_SHIFT);
+ return true;
} else {
for (div = 1; div = 256; div *= 2) {
if ((hp-clkbase / div) = freq) {
*divp = (div / 2) SDHC_SDCLK_DIV_SHIFT;
+//freq = hp-clkbase / div;
return true;
}
}
+ /* No divisor found. */
+ return false;
}
-
/* No divisor found. */
return false;
}
Index: src/sys/dev/sdmmc/sdhcreg.h
diff -u
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Wed Jan 2 23:36:12 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 758, 759 To generate a diff of this commit: cvs rdiff -u -r1.1.2.66 -r1.1.2.67 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.66 src/doc/CHANGES-6.1:1.1.2.67 --- src/doc/CHANGES-6.1:1.1.2.66 Mon Dec 17 00:32:05 2012 +++ src/doc/CHANGES-6.1 Wed Jan 2 23:36:11 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.66 2012/12/17 00:32:05 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.67 2013/01/02 23:36:11 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -7900,3 +7900,15 @@ sys/compat/netbsd32/netbsd32_fs.c 1.64 Fix inverted error check. [matt, ticket #756] +sys/kern/vfs_wapbl.c1.53-1.54 + + Coalesce writes to the journal to speed up wapbl_flush() on + raid5 by a factor of 3-4. + [hannken, ticket #758] + +sys/dev/sdmmc/sdhc.cpatch +sys/dev/sdmmc/sdhcreg.hpatch + + Support SDHC version 3 clocks. + [skrll, ticket #759] +
CVS commit: src/sys/arch/arm/omap
Module Name:src Committed By: riz Date: Sat Dec 29 04:59:21 UTC 2012 Modified Files: src/sys/arch/arm/omap: omap_wdt.c Log Message: In kernel tickle mode, tickle once immediately upon setting the mode. Works around a peculiarity where the first watchdog period (only) on the BeagleBone is only half as long as expected. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/omap/omap_wdt.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/arm/omap/omap_wdt.c diff -u src/sys/arch/arm/omap/omap_wdt.c:1.5 src/sys/arch/arm/omap/omap_wdt.c:1.6 --- src/sys/arch/arm/omap/omap_wdt.c:1.5 Wed Sep 5 00:19:59 2012 +++ src/sys/arch/arm/omap/omap_wdt.c Sat Dec 29 04:59:21 2012 @@ -193,6 +193,8 @@ omapwdt32k_setmode(struct sysmon_wdog *s sc-sc_smw.smw_period = smw-smw_period; omapwdt32k_set_timeout(sc-sc_smw.smw_period); omapwdt32k_enable(1); + if ((smw-smw_mode WDOG_MODE_MASK) == WDOG_MODE_KTICKLE) + omapwdt32k_tickle(smw); } return error; }
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: riz Date: Sat Dec 29 05:00:36 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: BEAGLEBONE Log Message: Enable the watchdog driver on BeagleBone. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/BEAGLEBONE 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/BEAGLEBONE diff -u src/sys/arch/evbarm/conf/BEAGLEBONE:1.5 src/sys/arch/evbarm/conf/BEAGLEBONE:1.6 --- src/sys/arch/evbarm/conf/BEAGLEBONE:1.5 Wed Dec 19 07:54:42 2012 +++ src/sys/arch/evbarm/conf/BEAGLEBONE Sat Dec 29 05:00:36 2012 @@ -1,5 +1,5 @@ # -# $NetBSD: BEAGLEBONE,v 1.5 2012/12/19 07:54:42 msaitoh Exp $ +# $NetBSD: BEAGLEBONE,v 1.6 2012/12/29 05:00:36 riz Exp $ # # BEAGLEBONE -- TI AM335x board Kernel # @@ -245,7 +245,7 @@ omapdmtimer2 at obio0 addr 0x48044000 si options OMAP_SYSTEM_CLOCK_FREQ=2400 # Watchdog timers -#omapwdt32k* at obio0 addr 0x44e35000 size 0x1000 # WDT1 +omapwdt32k* at obio0 addr 0x44e35000 size 0x1000 # WDT1 # onboard video #omapfb* at obio0 addr 0x4805 size 0x1
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Tue Dec 18 19:45:47 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Correct change list for ticket #1819. To generate a diff of this commit: cvs rdiff -u -r1.1.2.203 -r1.1.2.204 src/doc/CHANGES-5.2 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-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.203 src/doc/CHANGES-5.2:1.1.2.204 --- src/doc/CHANGES-5.2:1.1.2.203 Tue Nov 27 18:52:28 2012 +++ src/doc/CHANGES-5.2 Tue Dec 18 19:45:46 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.203 2012/11/27 18:52:28 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.204 2012/12/18 19:45:46 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -8799,6 +8799,7 @@ distrib/sets/lists/base/mi 1.993 Really mark wake as obsolete [msaitoh] +sys/arch/x86/include/specialreg.h 1.58 sys/arch/x86/x86/identcpu.c 1.31 via patch MSR fixes for VIA CPUs. PR#41267.
CVS commit: [netbsd-5-2] src
Module Name:src Committed By: riz Date: Tue Dec 18 21:55:15 UTC 2012 Modified Files: src/gnu/usr.bin/groff/tmac [netbsd-5-2]: mdoc.local src/sys/sys [netbsd-5-2]: param.h Added Files: src/doc [netbsd-5-2]: CHANGES-5.2.1 Log Message: Welcome to 5.2.0_PATCH. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-5.2.1 cvs rdiff -u -r1.43.4.18 -r1.43.4.18.2.1 \ src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.330.4.18 -r1.330.4.18.2.1 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18.2.1 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18 Tue Nov 27 18:52:27 2012 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Tue Dec 18 21:55:15 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mdoc.local,v 1.43.4.18 2012/11/27 18:52:27 riz Exp $ +.\ $NetBSD: mdoc.local,v 1.43.4.18.2.1 2012/12/18 21:55:15 riz Exp $ .\ .\ Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\ Default .Os value -.ds doc-operating-system NetBSD\~5.2 +.ds doc-operating-system NetBSD\~5.2.0_PATCH .\ Default footer operating system value -.ds doc-default-operating-system NetBSD\~5.2 +.ds doc-default-operating-system NetBSD\~5.2.0_PATCH .\ Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.330.4.18 src/sys/sys/param.h:1.330.4.18.2.1 --- src/sys/sys/param.h:1.330.4.18 Tue Nov 27 18:52:28 2012 +++ src/sys/sys/param.h Tue Dec 18 21:55:15 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.330.4.18 2012/11/27 18:52:28 riz Exp $ */ +/* $NetBSD: param.h,v 1.330.4.18.2.1 2012/12/18 21:55:15 riz Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 50200 /* NetBSD 5.2 */ +#define __NetBSD_Version__ 50200 /* NetBSD 5.2.0_PATCH */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__) Added files: Index: src/doc/CHANGES-5.2.1 diff -u /dev/null src/doc/CHANGES-5.2.1:1.1.2.1 --- /dev/null Tue Dec 18 21:55:16 2012 +++ src/doc/CHANGES-5.2.1 Tue Dec 18 21:55:15 2012 @@ -0,0 +1,11 @@ +# $NetBSD: CHANGES-5.2.1,v 1.1.2.1 2012/12/18 21:55:15 riz Exp $ + +A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.2.1 +release: + +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 5.2.0_PATCH. + [riz] +
CVS commit: [netbsd-5] src
Module Name:src Committed By: riz Date: Tue Dec 18 21:59:29 UTC 2012 Modified Files: src/doc [netbsd-5]: LAST_MINUTE README.files src/gnu/usr.bin/groff/tmac [netbsd-5]: mdoc.local src/sys/sys [netbsd-5]: param.h Added Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Welcome to 5.2_STABLE. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-5.3 cvs rdiff -u -r1.2.30.3 -r1.2.30.4 src/doc/LAST_MINUTE cvs rdiff -u -r1.4.10.4 -r1.4.10.5 src/doc/README.files cvs rdiff -u -r1.43.4.18 -r1.43.4.19 src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.330.4.18 -r1.330.4.19 src/sys/sys/param.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/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.30.3 src/doc/LAST_MINUTE:1.2.30.4 --- src/doc/LAST_MINUTE:1.2.30.3 Tue Nov 27 18:52:28 2012 +++ src/doc/LAST_MINUTE Tue Dec 18 21:59:28 2012 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.30.3 2012/11/27 18:52:28 riz Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.30.4 2012/12/18 21:59:28 riz Exp $ -This file contains important information on the NetBSD 5.2 release that +This file contains important information on the NetBSD 5.3 release that did not make it into the main documentation. [all] Index: src/doc/README.files diff -u src/doc/README.files:1.4.10.4 src/doc/README.files:1.4.10.5 --- src/doc/README.files:1.4.10.4 Tue Nov 27 18:52:28 2012 +++ src/doc/README.files Tue Dec 18 21:59:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: README.files,v 1.4.10.4 2012/11/27 18:52:28 riz Exp $ +# $NetBSD: README.files,v 1.4.10.5 2012/12/18 21:59:28 riz Exp $ What's in this directory: @@ -10,6 +10,8 @@ CHANGES-5.1 Changes between the 5.0 and CHANGES-5.2 Changes between the 5.1 and 5.2 releases. +CHANGES-5.2 Changes between the 5.2 and 5.3 releases. + CHANGES.prev Changes in previous NetBSD releases. LAST_MINUTE Last minute changes and notes about the release. Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.19 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18 Tue Nov 27 18:52:27 2012 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Tue Dec 18 21:59:28 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mdoc.local,v 1.43.4.18 2012/11/27 18:52:27 riz Exp $ +.\ $NetBSD: mdoc.local,v 1.43.4.19 2012/12/18 21:59:28 riz Exp $ .\ .\ Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\ Default .Os value -.ds doc-operating-system NetBSD\~5.2 +.ds doc-operating-system NetBSD\~5.2_STABLE .\ Default footer operating system value -.ds doc-default-operating-system NetBSD\~5.2 +.ds doc-default-operating-system NetBSD\~5.2_STABLE .\ Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 @@ -59,6 +59,7 @@ .ds doc-operating-system-NetBSD-5.05.0 .ds doc-operating-system-NetBSD-5.15.1 .ds doc-operating-system-NetBSD-5.25.2 +.ds doc-operating-system-NetBSD-5.35.3 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-6.1 6.1 .ds doc-operating-system-FreeBSD-6.3 6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.330.4.18 src/sys/sys/param.h:1.330.4.19 --- src/sys/sys/param.h:1.330.4.18 Tue Nov 27 18:52:28 2012 +++ src/sys/sys/param.h Tue Dec 18 21:59:28 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.330.4.18 2012/11/27 18:52:28 riz Exp $ */ +/* $NetBSD: param.h,v 1.330.4.19 2012/12/18 21:59:28 riz Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 50200 /* NetBSD 5.2 */ +#define __NetBSD_Version__ 50200 /* NetBSD 5.2_STABLE */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__) Added files: Index: src/doc/CHANGES-5.3 diff -u /dev/null src/doc/CHANGES-5.3:1.1.2.1 --- /dev/null Tue Dec 18 21:59:29 2012 +++ src/doc/CHANGES-5.3 Tue Dec 18 21:59:28 2012 @@ -0,0 +1,13 @@ +# $NetBSD: CHANGES-5.3,v 1.1.2.1 2012/12/18 21:59:28 riz Exp $ + +A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 +release: + +doc/LAST_MINUTE patched by hand +doc/README.filespatched by hand +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 5.2_STABLE. + [riz] +
CVS commit: [netbsd-6-0] src/distrib/notes/common
Module Name:src
Committed By: riz
Date: Mon Dec 17 17:52:07 UTC 2012
Modified Files:
src/distrib/notes/common [netbsd-6-0]: main
Log Message:
Update release notes for 6.0.1.
To generate a diff of this commit:
cvs rdiff -u -r1.484.2.4 -r1.484.2.4.2.1 src/distrib/notes/common/main
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.484.2.4 src/distrib/notes/common/main:1.484.2.4.2.1
--- src/distrib/notes/common/main:1.484.2.4 Fri Oct 12 22:06:59 2012
+++ src/distrib/notes/common/main Mon Dec 17 17:52:06 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: main,v 1.484.2.4 2012/10/12 22:06:59 riz Exp $
+.\ $NetBSD: main,v 1.484.2.4.2.1 2012/12/17 17:52:06 riz Exp $
.\
.\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -458,429 +458,51 @@ possible, it's likely that
wouldn't exist.
.
.if \n[FOR_RELEASE] \{\
-.Ss Changes Between The NetBSD 5.0 and 6.0 Releases
+.Ss Changes Between The NetBSD 6.0 and 6.0.1 Releases
.Pp
-The
-.Nx
-\*V release
-provides numerous significant functional enhancements, including
-support for many new devices, integration of hundreds of bug fixes,
-new and updated kernel subsystems, and many user-land enhancements.
-The result of these improvements is a stable operating system fit for
-production use that rivals most commercially available systems.
-.Pp
-It is impossible to completely summarize the massive development that
-went into the
-.Nx
-\*V release.
The complete list of changes can be found in the
-CHANGES:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.0/CHANGES
-and
-CHANGES-6.0:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.0/CHANGES-6.0
-files in the top level directory of the NetBSD 6.0 release tree.
-.Pp
-Some highlights include:
-.Ss2 General kernel
+CHANGES-6.0.1:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.0.1/CHANGES-6.0.1
+file in the top level directory of the NetBSD 6.0.1 release tree. An abbreviated list is as follows:
+.Ss2 Security Fixes
.(bullet
-.Dv time_t
-and
-.Dv dev_t
-are now 64 bits.
-.It
-Much-improved compat_linux support for running Linux binaries.
-.It
-Added a generic producer/consumer queue.
-.It
-Added a new ptree ( Patricia / RADIX tree ) implementation.
-.It
-Removed
-.Dv MALLOC()
-and
-.Dv FREE()
-macros.
-.It
-Compute
-.Dv kern.ipc.shmmaxpages
-on startup based on physical memory. Can be overridden via
-.Xr sysctl 8 .
-.It
-.Xr kmem_alloc 9 :
-Add more extensive runtime debugging facilities.
-.It
-File descriptor access performance improvements were made.
-.It
-.Xr cpu_reboot 9 :
-tear down stacks of devices and file systems in an orderly fashion during shutdown.
-.It
-Added 'show vmem' and 'show all vmems' commands to
-.Xr ddb 4 .
-.It
-Added high-priority
-.Xr xcall 9
-support.
-.It
-Added direct select()/poll() support.
-.It
-Add PCU (Per-CPU Unit) interface to unify synchronization of per CPU context, like lazy FPU management.
-.It
-Added new system calls
-.Xr pipe2 2 ,
-.Xr paccept 2 ,
-.Xr kqueue1 2 ,
-flags SOCK_CLOEXEC/SOCK_NONBLOCK to
-.Xr socket 2 ,
-.Xr socketpair 2 ,
-F_DUPFD_CLOEXEC to
-.Xr fcntl 2 ,
-and a MSG_CMSG_CLOEXEC to
-.Xr recvfrom 2
-to be able to set close-on-exec to all newly created file descriptors.
-.It
-Major improvements to
-.Xr uvm_map 9 ,
-.Xr uvm_km 9 ,
-.Xr vmem 9 ,
-and
-.Xr kmem 9
-layers.
-.It
-Removed
-.Xr ltsleep 9
-and wakeup_one(9).
-.It
-Rewrote most of the entropy-gathering and entropy-distributing code, separating the
-.Xr rnd 4
-pseudodevice from the bitstream generation code
-.Xr cprng 9
-and entropy-pool code
-.Xr rnd 9 .
+expat: Fix CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876.
.It
-.Xr kmem_alloc 9 :
-add more extensive runtime debugging facilities.
-.It
-Kernel support for
-.Xr posix_spawn 3 .
+BIND: Address CVE-2012-5688: Named could die on specific queries with dns64 enabled.
.bullet)
.
-.Ss2 Networking
+.Ss2 General kernel
.(bullet
-.Xr ip 4 :
-added IP_RECVTTL option to let
-.Xr recvmsg 2
-return the TTL of the received datagram.
-.It
-.Xr ip 4 :
-added IP_MINTTL option to discard packets with a TTL lower than the option value.
+posix_spawn(): Fix processes with attributes.
.It
-Added SOCK_SEQPACKET for local sockets.
+Resolve races between vget() and vrele() resulting in vget() returning dead vnodes.
.It
-Added
-.Dv net.inet.icmp.bmcastecho
-.Xr sysctl 7 ,
-to disable ICMP replies to the braodcast address.
+Prevent crash when unsupported fd's are used with kevent.
.It
-Make TCP window size autoscaling the default.
-.It
-Derive the mbuf cluster (NMBCLUSTERS) at boot time from the available memory. The default can be raised by changing
-.Dv kern.mbuf.nmbclusters
-.
-.It
-Added NPF, the NetBSD Packet Filter.
-.It
-.Xr udp 4 :
-implement RFC6056 port selection algorithms.
.bullet)
.
-.Ss2 File systems
+.Ss2 Networking
.(bullet
-Added CHFS, a file system for flash devices.
-.It
CVS commit: [netbsd-6-0] src
Module Name:src Committed By: riz Date: Mon Dec 17 18:49:09 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 LAST_MINUTE README.files src/sys/sys [netbsd-6-0]: param.h Log Message: Welcome to 6.0.1! To generate a diff of this commit: cvs rdiff -u -r1.1.2.37 -r1.1.2.38 src/doc/CHANGES-6.0.1 cvs rdiff -u -r1.2.40.1 -r1.2.40.1.4.1 src/doc/LAST_MINUTE cvs rdiff -u -r1.4.20.1 -r1.4.20.1.2.1 src/doc/README.files cvs rdiff -u -r1.408.2.6.2.1 -r1.408.2.6.2.2 src/sys/sys/param.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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.37 src/doc/CHANGES-6.0.1:1.1.2.38 --- src/doc/CHANGES-6.0.1:1.1.2.37 Mon Dec 17 00:33:00 2012 +++ src/doc/CHANGES-6.0.1 Mon Dec 17 18:49:08 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.37 2012/12/17 00:33:00 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.38 2012/12/17 18:49:08 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -292,3 +292,11 @@ sys/compat/netbsd32/netbsd32_fs.c 1.64 Fix inverted error check. [matt, ticket #756] +distrib/notes/common/main patched by hand +doc/LAST_MINUTE patched by hand +doc/README.filespatched by hand +sys/sys/param.h patched by hand + + Welcome to 6.0.1! + [riz] + Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.40.1 src/doc/LAST_MINUTE:1.2.40.1.4.1 --- src/doc/LAST_MINUTE:1.2.40.1 Wed Feb 15 23:46:47 2012 +++ src/doc/LAST_MINUTE Mon Dec 17 18:49:09 2012 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.40.1 2012/02/15 23:46:47 riz Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.40.1.4.1 2012/12/17 18:49:09 riz Exp $ -This file contains important information on the NetBSD 6.0 release that +This file contains important information on the NetBSD 6.0.1 release that did not make it into the main documentation. [all] Index: src/doc/README.files diff -u src/doc/README.files:1.4.20.1 src/doc/README.files:1.4.20.1.2.1 --- src/doc/README.files:1.4.20.1 Fri Sep 7 22:13:38 2012 +++ src/doc/README.files Mon Dec 17 18:49:09 2012 @@ -1,8 +1,13 @@ -# $NetBSD: README.files,v 1.4.20.1 2012/09/07 22:13:38 bouyer Exp $ +# $NetBSD: README.files,v 1.4.20.1.2.1 2012/12/17 18:49:09 riz Exp $ What's in this directory: -CHANGES Changes between the XXX.XXX-1 and XXX.XXX releases. +CHANGES-6.0.1 Changes between the 6.0 and 6.0.1 releases. + +CHANGES-6.0 Changes between the creation of the netbsd-6 branch and + the 6.0 release. + +CHANGES Changes between the 5.0 and 6.0 releases. CHANGES.prev Changes in previous NetBSD releases. Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.408.2.6.2.1 src/sys/sys/param.h:1.408.2.6.2.2 --- src/sys/sys/param.h:1.408.2.6.2.1 Wed Oct 17 22:44:46 2012 +++ src/sys/sys/param.h Mon Dec 17 18:49:08 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.408.2.6.2.1 2012/10/17 22:44:46 riz Exp $ */ +/* $NetBSD: param.h,v 1.408.2.6.2.2 2012/12/17 18:49:08 riz Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 6 /* NetBSD 6.0.0_PATCH */ +#define __NetBSD_Version__ 60001 /* NetBSD 6.0.1 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: [netbsd-6] src/sys/net/npf
Module Name:src
Committed By: riz
Date: Sun Dec 16 18:19:53 UTC 2012
Modified Files:
src/sys/net/npf [netbsd-6]: npf.h npf_inet.c npf_mbuf.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #746):
sys/net/npf/npf_inet.c: revision 1.18
sys/net/npf/npf_mbuf.c: revision 1.8
sys/net/npf/npf.h: revision 1.23
npf_rwrcksum: handle delayed checksums in the network stack; also fix
non-NPF_NAT_PORTS case and add some comments. PR/47235.
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.8 -r1.14.2.9 src/sys/net/npf/npf.h
cvs rdiff -u -r1.10.4.6 -r1.10.4.7 src/sys/net/npf/npf_inet.c
cvs rdiff -u -r1.6.14.1 -r1.6.14.2 src/sys/net/npf/npf_mbuf.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/net/npf/npf.h
diff -u src/sys/net/npf/npf.h:1.14.2.8 src/sys/net/npf/npf.h:1.14.2.9
--- src/sys/net/npf/npf.h:1.14.2.8 Sat Nov 24 04:34:42 2012
+++ src/sys/net/npf/npf.h Sun Dec 16 18:19:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.h,v 1.14.2.8 2012/11/24 04:34:42 riz Exp $ */
+/* $NetBSD: npf.h,v 1.14.2.9 2012/12/16 18:19:52 riz Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -146,6 +146,7 @@ int nbuf_advstore(nbuf_t **, void **, u
int nbuf_fetch_datum(nbuf_t *, void *, size_t, void *);
int nbuf_store_datum(nbuf_t *, void *, size_t, void *);
+void nbuf_cksum_barrier(nbuf_t *);
int nbuf_add_tag(nbuf_t *, uint32_t, uint32_t);
int nbuf_find_tag(nbuf_t *, uint32_t, void **);
Index: src/sys/net/npf/npf_inet.c
diff -u src/sys/net/npf/npf_inet.c:1.10.4.6 src/sys/net/npf/npf_inet.c:1.10.4.7
--- src/sys/net/npf/npf_inet.c:1.10.4.6 Sun Nov 18 22:38:25 2012
+++ src/sys/net/npf/npf_inet.c Sun Dec 16 18:19:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_inet.c,v 1.10.4.6 2012/11/18 22:38:25 riz Exp $ */
+/* $NetBSD: npf_inet.c,v 1.10.4.7 2012/12/16 18:19:52 riz Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_inet.c,v 1.10.4.6 2012/11/18 22:38:25 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_inet.c,v 1.10.4.7 2012/12/16 18:19:52 riz Exp $);
#include sys/param.h
#include sys/types.h
@@ -597,65 +597,80 @@ npf_rwrcksum(npf_cache_t *npc, nbuf_t *n
{
const int proto = npf_cache_ipproto(npc);
npf_addr_t *oaddr;
- in_port_t *oport;
- uint16_t *cksum;
+ uint16_t *ocksum;
+ in_port_t oport;
u_int offby;
- /* Checksum update for IPv4 header. */
+ /* XXX: NetBSD - process delayed checksums. */
+ if (di == PFIL_OUT proto != IPPROTO_ICMP) {
+ nbuf_cksum_barrier(nbuf);
+ npc-npc_info = ~(NPC_LAYER4 | NPC_TCP | NPC_UDP);
+ if (!npf_cache_all(npc, nbuf)) {
+ return false;
+ }
+ }
+
+ oaddr = (di == PFIL_OUT) ? npc-npc_srcip : npc-npc_dstip;
+
if (npf_iscached(npc, NPC_IP4)) {
struct ip *ip = npc-npc_ip.v4;
uint16_t ipsum;
- oaddr = (di == PFIL_OUT) ? npc-npc_srcip : npc-npc_dstip;
+ /* Recalculate IPv4 checksum, advance to it and rewrite. */
ipsum = npf_addr_cksum(ip-ip_sum, npc-npc_alen, oaddr, addr);
-
- /* Advance to the IPv4 checksum and rewrite it. */
offby = offsetof(struct ip, ip_sum);
if (nbuf_advstore(nbuf, n_ptr, offby, sizeof(ipsum), ipsum))
return false;
-
ip-ip_sum = ipsum;
- offby = npf_cache_hlen(npc) - offby;
} else {
/* No checksum for IPv6. */
KASSERT(npf_iscached(npc, NPC_IP6));
- oaddr = NULL;
offby = 0;
- return false; /* XXX: Not yet supported. */
}
- /* Determine whether TCP/UDP checksum update is needed. */
- if (proto == IPPROTO_ICMP || port == 0) {
+ /* Nothing else to do for ICMP. */
+ if (proto == IPPROTO_ICMP) {
return true;
}
KASSERT(npf_iscached(npc, NPC_TCP) || npf_iscached(npc, NPC_UDP));
+ offby = npf_cache_hlen(npc) - offby;
- /* Calculate TCP/UDP checksum. */
+ /*
+ * Calculate TCP/UDP checksum:
+ * - Skip if UDP and the current checksum is zero.
+ * - Fixup the IP address change.
+ * - Fixup the port change, if required (non-zero).
+ */
if (proto == IPPROTO_TCP) {
struct tcphdr *th = npc-npc_l4.tcp;
- cksum = th-th_sum;
+ ocksum = th-th_sum;
offby += offsetof(struct tcphdr, th_sum);
- oport = (di == PFIL_OUT) ? th-th_sport : th-th_dport;
+ oport = (di == PFIL_OUT) ? th-th_sport : th-th_dport;
} else {
struct udphdr *uh = npc-npc_l4.udp;
KASSERT(proto == IPPROTO_UDP);
- cksum = uh-uh_sum;
- if (*cksum == 0) {
+ ocksum = uh-uh_sum;
+ if (*ocksum == 0) {
/* No need to update. */
return true;
}
offby += offsetof(struct udphdr, uh_sum);
- oport = (di == PFIL_OUT) ? uh-uh_sport : uh-uh_dport;
+ oport = (di == PFIL_OUT) ? uh-uh_sport : uh-uh_dport;
+ }
+
+ uint16_t cksum = *ocksum;
+ cksum = npf_addr_cksum(cksum, npc-npc_alen, oaddr, addr);
+ if (port) {
+ cksum = npf_fixup16_cksum(cksum, oport, port);
}
- *cksum = npf_addr_cksum(*cksum, npc-npc_alen, oaddr, addr);
- *cksum =
CVS commit: [netbsd-6-0] src/sys/net/npf
Module Name:src
Committed By: riz
Date: Sun Dec 16 18:20:09 UTC 2012
Modified Files:
src/sys/net/npf [netbsd-6-0]: npf.h npf_inet.c npf_mbuf.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #746):
sys/net/npf/npf_inet.c: revision 1.18
sys/net/npf/npf_mbuf.c: revision 1.8
sys/net/npf/npf.h: revision 1.23
npf_rwrcksum: handle delayed checksums in the network stack; also fix
non-NPF_NAT_PORTS case and add some comments. PR/47235.
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.6 -r1.14.2.6.4.1 src/sys/net/npf/npf.h
cvs rdiff -u -r1.10.4.5 -r1.10.4.5.4.1 src/sys/net/npf/npf_inet.c
cvs rdiff -u -r1.6.14.1 -r1.6.14.1.4.1 src/sys/net/npf/npf_mbuf.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/net/npf/npf.h
diff -u src/sys/net/npf/npf.h:1.14.2.6 src/sys/net/npf/npf.h:1.14.2.6.4.1
--- src/sys/net/npf/npf.h:1.14.2.6 Wed Jul 25 20:45:23 2012
+++ src/sys/net/npf/npf.h Sun Dec 16 18:20:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.h,v 1.14.2.6 2012/07/25 20:45:23 jdc Exp $ */
+/* $NetBSD: npf.h,v 1.14.2.6.4.1 2012/12/16 18:20:09 riz Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -141,6 +141,7 @@ int nbuf_advstore(nbuf_t **, void **, u
int nbuf_fetch_datum(nbuf_t *, void *, size_t, void *);
int nbuf_store_datum(nbuf_t *, void *, size_t, void *);
+void nbuf_cksum_barrier(nbuf_t *);
int nbuf_add_tag(nbuf_t *, uint32_t, uint32_t);
int nbuf_find_tag(nbuf_t *, uint32_t, void **);
Index: src/sys/net/npf/npf_inet.c
diff -u src/sys/net/npf/npf_inet.c:1.10.4.5 src/sys/net/npf/npf_inet.c:1.10.4.5.4.1
--- src/sys/net/npf/npf_inet.c:1.10.4.5 Wed Jul 25 20:45:23 2012
+++ src/sys/net/npf/npf_inet.c Sun Dec 16 18:20:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_inet.c,v 1.10.4.5 2012/07/25 20:45:23 jdc Exp $ */
+/* $NetBSD: npf_inet.c,v 1.10.4.5.4.1 2012/12/16 18:20:09 riz Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_inet.c,v 1.10.4.5 2012/07/25 20:45:23 jdc Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_inet.c,v 1.10.4.5.4.1 2012/12/16 18:20:09 riz Exp $);
#include sys/param.h
#include sys/types.h
@@ -598,65 +598,80 @@ npf_rwrcksum(npf_cache_t *npc, nbuf_t *n
{
const int proto = npf_cache_ipproto(npc);
npf_addr_t *oaddr;
- in_port_t *oport;
- uint16_t *cksum;
+ uint16_t *ocksum;
+ in_port_t oport;
u_int offby;
- /* Checksum update for IPv4 header. */
+ /* XXX: NetBSD - process delayed checksums. */
+ if (di == PFIL_OUT proto != IPPROTO_ICMP) {
+ nbuf_cksum_barrier(nbuf);
+ npc-npc_info = ~(NPC_LAYER4 | NPC_TCP | NPC_UDP);
+ if (!npf_cache_all(npc, nbuf)) {
+ return false;
+ }
+ }
+
+ oaddr = (di == PFIL_OUT) ? npc-npc_srcip : npc-npc_dstip;
+
if (npf_iscached(npc, NPC_IP4)) {
struct ip *ip = npc-npc_ip.v4;
uint16_t ipsum;
- oaddr = (di == PFIL_OUT) ? npc-npc_srcip : npc-npc_dstip;
+ /* Recalculate IPv4 checksum, advance to it and rewrite. */
ipsum = npf_addr_cksum(ip-ip_sum, npc-npc_alen, oaddr, addr);
-
- /* Advance to the IPv4 checksum and rewrite it. */
offby = offsetof(struct ip, ip_sum);
if (nbuf_advstore(nbuf, n_ptr, offby, sizeof(ipsum), ipsum))
return false;
-
ip-ip_sum = ipsum;
- offby = npf_cache_hlen(npc) - offby;
} else {
/* No checksum for IPv6. */
KASSERT(npf_iscached(npc, NPC_IP6));
- oaddr = NULL;
offby = 0;
- return false; /* XXX: Not yet supported. */
}
- /* Determine whether TCP/UDP checksum update is needed. */
- if (proto == IPPROTO_ICMP || port == 0) {
+ /* Nothing else to do for ICMP. */
+ if (proto == IPPROTO_ICMP) {
return true;
}
KASSERT(npf_iscached(npc, NPC_TCP) || npf_iscached(npc, NPC_UDP));
+ offby = npf_cache_hlen(npc) - offby;
- /* Calculate TCP/UDP checksum. */
+ /*
+ * Calculate TCP/UDP checksum:
+ * - Skip if UDP and the current checksum is zero.
+ * - Fixup the IP address change.
+ * - Fixup the port change, if required (non-zero).
+ */
if (proto == IPPROTO_TCP) {
struct tcphdr *th = npc-npc_l4.tcp;
- cksum = th-th_sum;
+ ocksum = th-th_sum;
offby += offsetof(struct tcphdr, th_sum);
- oport = (di == PFIL_OUT) ? th-th_sport : th-th_dport;
+ oport = (di == PFIL_OUT) ? th-th_sport : th-th_dport;
} else {
struct udphdr *uh = npc-npc_l4.udp;
KASSERT(proto == IPPROTO_UDP);
- cksum = uh-uh_sum;
- if (*cksum == 0) {
+ ocksum = uh-uh_sum;
+ if (*ocksum == 0) {
/* No need to update. */
return true;
}
offby += offsetof(struct udphdr, uh_sum);
- oport = (di == PFIL_OUT) ? uh-uh_sport : uh-uh_dport;
+ oport = (di == PFIL_OUT) ? uh-uh_sport : uh-uh_dport;
+ }
+
+ uint16_t cksum = *ocksum;
+ cksum = npf_addr_cksum(cksum, npc-npc_alen, oaddr, addr);
+ if (port) {
+ cksum = npf_fixup16_cksum(cksum, oport, port);
}
- *cksum = npf_addr_cksum(*cksum, npc-npc_alen, oaddr,
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Sun Dec 16 18:20:26 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Ticket 746 To generate a diff of this commit: cvs rdiff -u -r1.1.2.32 -r1.1.2.33 src/doc/CHANGES-6.0.1 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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.32 src/doc/CHANGES-6.0.1:1.1.2.33 --- src/doc/CHANGES-6.0.1:1.1.2.32 Sat Dec 15 23:35:13 2012 +++ src/doc/CHANGES-6.0.1 Sun Dec 16 18:20:26 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.32 2012/12/15 23:35:13 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.33 2012/12/16 18:20:26 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -253,3 +253,11 @@ usr.sbin/npf/npfctl/npf.conf.5 1.25 vi Fix the example config. [rmind, ticket #744] +sys/net/npf/npf.h1.23 +sys/net/npf/npf_inet.c1.18 +sys/net/npf/npf_mbuf.c1.8 + + npf_rwrcksum: handle delayed checksums in the network stack; also fix + non-NPF_NAT_PORTS case and add some comments. PR/47235. + [rmind, ticket #746] +
CVS commit: [netbsd-6] src/sys/dev/pcmcia
Module Name:src Committed By: riz Date: Sun Dec 16 18:22:31 UTC 2012 Modified Files: src/sys/dev/pcmcia [netbsd-6]: if_ray.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #747): sys/dev/pcmcia/if_ray.c: revision 1.81 Apply OpenBSD rev. 1.40: Use the actual SSID length rather than a (wrong) sizeof. Makes gcc4 -Wbounded happy. ok kettenis To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.79.14.1 src/sys/dev/pcmcia/if_ray.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/pcmcia/if_ray.c diff -u src/sys/dev/pcmcia/if_ray.c:1.79 src/sys/dev/pcmcia/if_ray.c:1.79.14.1 --- src/sys/dev/pcmcia/if_ray.c:1.79 Mon Apr 5 07:21:47 2010 +++ src/sys/dev/pcmcia/if_ray.c Sun Dec 16 18:22:30 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ray.c,v 1.79 2010/04/05 07:21:47 joerg Exp $ */ +/* $NetBSD: if_ray.c,v 1.79.14.1 2012/12/16 18:22:30 riz Exp $ */ /* * Copyright (c) 2000 Christian E. Hopps @@ -57,7 +57,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_ray.c,v 1.79 2010/04/05 07:21:47 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: if_ray.c,v 1.79.14.1 2012/12/16 18:22:30 riz Exp $); #include opt_inet.h @@ -2701,7 +2701,7 @@ ray_start_join_net_done(struct ray_softc break; } sc-sc_cnwid.i_len = i; - memcpy(sc-sc_cnwid.i_nwid, np.p_ssid, sizeof(sc-sc_cnwid)); + memcpy(sc-sc_cnwid.i_nwid, np.p_ssid, i); sc-sc_omode = sc-sc_mode; if (np.p_net_type != sc-sc_mode) return (ray_start_join_net);
CVS commit: [netbsd-6] src/sys/fs/v7fs
Module Name:src
Committed By: riz
Date: Sun Dec 16 18:24:18 UTC 2012
Modified Files:
src/sys/fs/v7fs [netbsd-6]: v7fs_file.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #748):
sys/fs/v7fs/v7fs_file.c: revision 1.5
Fix off by one error.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/fs/v7fs/v7fs_file.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/fs/v7fs/v7fs_file.c
diff -u src/sys/fs/v7fs/v7fs_file.c:1.3 src/sys/fs/v7fs/v7fs_file.c:1.3.8.1
--- src/sys/fs/v7fs/v7fs_file.c:1.3 Sat Jul 30 03:51:53 2011
+++ src/sys/fs/v7fs/v7fs_file.c Sun Dec 16 18:24:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: v7fs_file.c,v 1.3 2011/07/30 03:51:53 uch Exp $ */
+/* $NetBSD: v7fs_file.c,v 1.3.8.1 2012/12/16 18:24:18 riz Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#endif
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: v7fs_file.c,v 1.3 2011/07/30 03:51:53 uch Exp $);
+__KERNEL_RCSID(0, $NetBSD: v7fs_file.c,v 1.3.8.1 2012/12/16 18:24:18 riz Exp $);
#if defined _KERNEL_OPT
#include opt_v7fs.h
#endif
@@ -77,7 +77,7 @@ v7fs_file_lookup_by_name(struct v7fs_sel
if ((q = strchr(name, '/'))) {
/* Zap following path. */
- len = MIN(V7FS_NAME_MAX + 1, q - name);
+ len = MIN(V7FS_NAME_MAX, q - name);
memcpy(filename, name, len);
filename[len] = '\0'; /* '/' - '\0' */
} else {
CVS commit: [netbsd-6-0] src/sys/fs/v7fs
Module Name:src
Committed By: riz
Date: Sun Dec 16 18:24:29 UTC 2012
Modified Files:
src/sys/fs/v7fs [netbsd-6-0]: v7fs_file.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #748):
sys/fs/v7fs/v7fs_file.c: revision 1.5
Fix off by one error.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.12.1 src/sys/fs/v7fs/v7fs_file.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/fs/v7fs/v7fs_file.c
diff -u src/sys/fs/v7fs/v7fs_file.c:1.3 src/sys/fs/v7fs/v7fs_file.c:1.3.12.1
--- src/sys/fs/v7fs/v7fs_file.c:1.3 Sat Jul 30 03:51:53 2011
+++ src/sys/fs/v7fs/v7fs_file.c Sun Dec 16 18:24:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: v7fs_file.c,v 1.3 2011/07/30 03:51:53 uch Exp $ */
+/* $NetBSD: v7fs_file.c,v 1.3.12.1 2012/12/16 18:24:29 riz Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#endif
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: v7fs_file.c,v 1.3 2011/07/30 03:51:53 uch Exp $);
+__KERNEL_RCSID(0, $NetBSD: v7fs_file.c,v 1.3.12.1 2012/12/16 18:24:29 riz Exp $);
#if defined _KERNEL_OPT
#include opt_v7fs.h
#endif
@@ -77,7 +77,7 @@ v7fs_file_lookup_by_name(struct v7fs_sel
if ((q = strchr(name, '/'))) {
/* Zap following path. */
- len = MIN(V7FS_NAME_MAX + 1, q - name);
+ len = MIN(V7FS_NAME_MAX, q - name);
memcpy(filename, name, len);
filename[len] = '\0'; /* '/' - '\0' */
} else {
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Sun Dec 16 18:24:41 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: ticket 748. To generate a diff of this commit: cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/doc/CHANGES-6.0.1 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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.33 src/doc/CHANGES-6.0.1:1.1.2.34 --- src/doc/CHANGES-6.0.1:1.1.2.33 Sun Dec 16 18:20:26 2012 +++ src/doc/CHANGES-6.0.1 Sun Dec 16 18:24:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.33 2012/12/16 18:20:26 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.34 2012/12/16 18:24:41 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -261,3 +261,8 @@ sys/net/npf/npf_mbuf.c1.8 non-NPF_NAT_PORTS case and add some comments. PR/47235. [rmind, ticket #746] +sys/fs/v7fs/v7fs_file.c1.5 + + Fix off by one error. + [msaitoh, ticket #748] +
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Sun Dec 16 18:25:07 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: tickets 746-748 To generate a diff of this commit: cvs rdiff -u -r1.1.2.61 -r1.1.2.62 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.61 src/doc/CHANGES-6.1:1.1.2.62 --- src/doc/CHANGES-6.1:1.1.2.61 Sat Dec 15 23:47:17 2012 +++ src/doc/CHANGES-6.1 Sun Dec 16 18:25:07 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.61 2012/12/15 23:47:17 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.62 2012/12/16 18:25:07 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -7841,3 +7841,21 @@ sys/net/npf/npf_ext_rndblock.c 1.1 loss simulation. [rmind, ticket #745] +sys/net/npf/npf.h1.23 +sys/net/npf/npf_inet.c1.18 +sys/net/npf/npf_mbuf.c1.8 + + npf_rwrcksum: handle delayed checksums in the network stack; also fix + non-NPF_NAT_PORTS case and add some comments. PR/47235. + [rmind, ticket #746] + +sys/dev/pcmcia/if_ray.c1.81 + + Use the correct size for a memcpy(). + [msaitoh, ticket #747] + +sys/fs/v7fs/v7fs_file.c1.5 + + Fix off by one error. + [msaitoh, ticket #748] +
CVS commit: [netbsd-6] src/sys/arch/i386/i386
Module Name:src Committed By: riz Date: Sun Dec 16 19:12:36 UTC 2012 Modified Files: src/sys/arch/i386/i386 [netbsd-6]: multiboot.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #749): sys/arch/i386/i386/multiboot.c: revision 1.22 Fix off by one. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.21.14.1 src/sys/arch/i386/i386/multiboot.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/i386/i386/multiboot.c diff -u src/sys/arch/i386/i386/multiboot.c:1.21 src/sys/arch/i386/i386/multiboot.c:1.21.14.1 --- src/sys/arch/i386/i386/multiboot.c:1.21 Tue Jan 11 12:24:37 2011 +++ src/sys/arch/i386/i386/multiboot.c Sun Dec 16 19:12:36 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: multiboot.c,v 1.21 2011/01/11 12:24:37 gsutre Exp $ */ +/* $NetBSD: multiboot.c,v 1.21.14.1 2012/12/16 19:12:36 riz Exp $ */ /*- * Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: multiboot.c,v 1.21 2011/01/11 12:24:37 gsutre Exp $); +__KERNEL_RCSID(0, $NetBSD: multiboot.c,v 1.21.14.1 2012/12/16 19:12:36 riz Exp $); #include opt_multiboot.h @@ -506,7 +506,7 @@ setup_bootpath(struct multiboot_info *mi *cl2 = '\0'; memcpy(bi.bootpath, cl, MIN(sizeof(bi.bootpath), len)); *cl2 = old; - bi.bootpath[MIN(sizeof(bi.bootpath), len)] = '\0'; + bi.bootpath[MIN(sizeof(bi.bootpath) - 1, len)] = '\0'; bootinfo_add((struct btinfo_common *)bi, BTINFO_BOOTPATH, sizeof(struct btinfo_bootpath));
CVS commit: [netbsd-6-0] src/sys/arch/i386/i386
Module Name:src Committed By: riz Date: Sun Dec 16 19:12:53 UTC 2012 Modified Files: src/sys/arch/i386/i386 [netbsd-6-0]: multiboot.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #749): sys/arch/i386/i386/multiboot.c: revision 1.22 Fix off by one. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.21.20.1 src/sys/arch/i386/i386/multiboot.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/i386/i386/multiboot.c diff -u src/sys/arch/i386/i386/multiboot.c:1.21 src/sys/arch/i386/i386/multiboot.c:1.21.20.1 --- src/sys/arch/i386/i386/multiboot.c:1.21 Tue Jan 11 12:24:37 2011 +++ src/sys/arch/i386/i386/multiboot.c Sun Dec 16 19:12:53 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: multiboot.c,v 1.21 2011/01/11 12:24:37 gsutre Exp $ */ +/* $NetBSD: multiboot.c,v 1.21.20.1 2012/12/16 19:12:53 riz Exp $ */ /*- * Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: multiboot.c,v 1.21 2011/01/11 12:24:37 gsutre Exp $); +__KERNEL_RCSID(0, $NetBSD: multiboot.c,v 1.21.20.1 2012/12/16 19:12:53 riz Exp $); #include opt_multiboot.h @@ -506,7 +506,7 @@ setup_bootpath(struct multiboot_info *mi *cl2 = '\0'; memcpy(bi.bootpath, cl, MIN(sizeof(bi.bootpath), len)); *cl2 = old; - bi.bootpath[MIN(sizeof(bi.bootpath), len)] = '\0'; + bi.bootpath[MIN(sizeof(bi.bootpath) - 1, len)] = '\0'; bootinfo_add((struct btinfo_common *)bi, BTINFO_BOOTPATH, sizeof(struct btinfo_bootpath));
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Sun Dec 16 19:13:04 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: ticket 749 To generate a diff of this commit: cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/doc/CHANGES-6.0.1 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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.34 src/doc/CHANGES-6.0.1:1.1.2.35 --- src/doc/CHANGES-6.0.1:1.1.2.34 Sun Dec 16 18:24:41 2012 +++ src/doc/CHANGES-6.0.1 Sun Dec 16 19:13:03 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.34 2012/12/16 18:24:41 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.35 2012/12/16 19:13:03 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -266,3 +266,8 @@ sys/fs/v7fs/v7fs_file.c1.5 Fix off by one error. [msaitoh, ticket #748] +sys/arch/i386/i386/multiboot.c 1.22 + + Fix off by one error. + [msaitoh, ticket #749] +
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Sun Dec 16 19:13:16 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Ticket 749 To generate a diff of this commit: cvs rdiff -u -r1.1.2.62 -r1.1.2.63 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.62 src/doc/CHANGES-6.1:1.1.2.63 --- src/doc/CHANGES-6.1:1.1.2.62 Sun Dec 16 18:25:07 2012 +++ src/doc/CHANGES-6.1 Sun Dec 16 19:13:15 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.62 2012/12/16 18:25:07 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.63 2012/12/16 19:13:15 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -7859,3 +7859,8 @@ sys/fs/v7fs/v7fs_file.c1.5 Fix off by one error. [msaitoh, ticket #748] +sys/arch/i386/i386/multiboot.c 1.22 + + Fix off by one error. + [msaitoh, ticket #749] +
CVS commit: [netbsd-6] src/usr.sbin/npf/npfctl
Module Name:src
Committed By: riz
Date: Sun Dec 16 19:41:38 UTC 2012
Modified Files:
src/usr.sbin/npf/npfctl [netbsd-6]: npf_build.c npf_disassemble.c
npfctl.8 npfctl.c npfctl.h
Log Message:
Pull up following revision(s) (requested by rmind in ticket #750):
usr.sbin/npf/npfctl/npfctl.c: revision 1.25
usr.sbin/npf/npfctl/npfctl.h: revision 1.24
usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.13
usr.sbin/npf/npfctl/npf_build.c: revision 1.16
usr.sbin/npf/npfctl/npfctl.8: revision 1.11
npfctl: add 'validate' command to check the config, but not load it. Update
the man page. Also add a small note about 'debug' command, PR/47298.
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.8 -r1.4.2.9 src/usr.sbin/npf/npfctl/npf_build.c
cvs rdiff -u -r1.3.2.9 -r1.3.2.10 src/usr.sbin/npf/npfctl/npf_disassemble.c
cvs rdiff -u -r1.6.6.3 -r1.6.6.4 src/usr.sbin/npf/npfctl/npfctl.8
cvs rdiff -u -r1.10.2.9 -r1.10.2.10 src/usr.sbin/npf/npfctl/npfctl.c
cvs rdiff -u -r1.11.2.10 -r1.11.2.11 src/usr.sbin/npf/npfctl/npfctl.h
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/npf/npfctl/npf_build.c
diff -u src/usr.sbin/npf/npfctl/npf_build.c:1.4.2.8 src/usr.sbin/npf/npfctl/npf_build.c:1.4.2.9
--- src/usr.sbin/npf/npfctl/npf_build.c:1.4.2.8 Tue Dec 11 04:31:52 2012
+++ src/usr.sbin/npf/npfctl/npf_build.c Sun Dec 16 19:41:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_build.c,v 1.4.2.8 2012/12/11 04:31:52 riz Exp $ */
+/* $NetBSD: npf_build.c,v 1.4.2.9 2012/12/16 19:41:37 riz Exp $ */
/*-
* Copyright (c) 2011-2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: npf_build.c,v 1.4.2.8 2012/12/11 04:31:52 riz Exp $);
+__RCSID($NetBSD: npf_build.c,v 1.4.2.9 2012/12/16 19:41:37 riz Exp $);
#include sys/types.h
#include sys/ioctl.h
@@ -85,6 +85,12 @@ npfctl_config_send(int fd, const char *o
return error;
}
+nl_config_t *
+npfctl_config_ref(void)
+{
+ return npf_conf;
+}
+
unsigned long
npfctl_debug_addif(const char *ifname)
{
Index: src/usr.sbin/npf/npfctl/npf_disassemble.c
diff -u src/usr.sbin/npf/npfctl/npf_disassemble.c:1.3.2.9 src/usr.sbin/npf/npfctl/npf_disassemble.c:1.3.2.10
--- src/usr.sbin/npf/npfctl/npf_disassemble.c:1.3.2.9 Mon Nov 26 17:39:29 2012
+++ src/usr.sbin/npf/npfctl/npf_disassemble.c Sun Dec 16 19:41:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_disassemble.c,v 1.3.2.9 2012/11/26 17:39:29 riz Exp $ */
+/* $NetBSD: npf_disassemble.c,v 1.3.2.10 2012/12/16 19:41:37 riz Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
* FIXME: config generation should be redesigned..
*/
#include sys/cdefs.h
-__RCSID($NetBSD: npf_disassemble.c,v 1.3.2.9 2012/11/26 17:39:29 riz Exp $);
+__RCSID($NetBSD: npf_disassemble.c,v 1.3.2.10 2012/12/16 19:41:37 riz Exp $);
#include stdio.h
#include stdlib.h
@@ -702,13 +702,18 @@ npfctl_config_show(int fd)
bool active, loaded;
int error = 0;
- ncf = npf_config_retrieve(fd, active, loaded);
- if (ncf == NULL) {
- return errno;
- }
- printf(Filtering:\t%s\nConfiguration:\t%s\n\n,
- active ? active : inactive,
- loaded ? loaded : empty);
+ if (fd) {
+ ncf = npf_config_retrieve(fd, active, loaded);
+ if (ncf == NULL) {
+ return errno;
+ }
+ printf(Filtering:\t%s\nConfiguration:\t%s\n\n,
+ active ? active : inactive,
+ loaded ? loaded : empty);
+ } else {
+ ncf = npfctl_config_ref();
+ loaded = true;
+ }
if (loaded) {
_npf_table_foreach(ncf, npfctl_show_table);
Index: src/usr.sbin/npf/npfctl/npfctl.8
diff -u src/usr.sbin/npf/npfctl/npfctl.8:1.6.6.3 src/usr.sbin/npf/npfctl/npfctl.8:1.6.6.4
--- src/usr.sbin/npf/npfctl/npfctl.8:1.6.6.3 Sat Nov 24 04:34:43 2012
+++ src/usr.sbin/npf/npfctl/npfctl.8 Sun Dec 16 19:41:37 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: npfctl.8,v 1.6.6.3 2012/11/24 04:34:43 riz Exp $
+.\ $NetBSD: npfctl.8,v 1.6.6.4 2012/12/16 19:41:37 riz Exp $
.\
.\ Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -27,7 +27,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd November 15, 2012
+.Dd December 10, 2012
.Dt NPFCTL 8
.Os
.Sh NAME
@@ -79,6 +79,12 @@ Show the current state and configuration
Syntax of printed configuration is for the user and may not match the
.Xr npf.conf 5
syntax.
+.It Ic validate Op Ar path
+Validate the configuration file and the processed form.
+The configuration file at
+.Pa /etc/npf.conf
+will be used unless a file is specified by
+.Ar path .
.It Ic table Ar tid Ic add Aq Ar addr/mask
In table
.Ar tid ,
@@ -117,6 +123,10 @@ Any existing sessions during the load op
Administrator may want to start packet inspection after the session loading.
.It Ic stats
Print various statistics.
+.It Ic debug
+Process the configuration file, print the n-code of each
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Sun Dec 16 19:42:29 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Ticket 750 To generate a diff of this commit: cvs rdiff -u -r1.1.2.63 -r1.1.2.64 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.63 src/doc/CHANGES-6.1:1.1.2.64 --- src/doc/CHANGES-6.1:1.1.2.63 Sun Dec 16 19:13:15 2012 +++ src/doc/CHANGES-6.1 Sun Dec 16 19:42:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.63 2012/12/16 19:13:15 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.64 2012/12/16 19:42:28 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -7864,3 +7864,13 @@ sys/arch/i386/i386/multiboot.c 1.22 Fix off by one error. [msaitoh, ticket #749] +usr.sbin/npf/npfctl/npf_build.c 1.16 +usr.sbin/npf/npfctl/npf_disassemble.c 1.13 +usr.sbin/npf/npfctl/npfctl.8 1.11 +usr.sbin/npf/npfctl/npfctl.c 1.25 +usr.sbin/npf/npfctl/npfctl.h 1.24 + + npfctl: add 'validate' command to check the config, but not load it. + PR#47298. + [rmind, ticket #750] +
CVS commit: [netbsd-6] src/sys/dev
Module Name:src
Committed By: riz
Date: Mon Dec 17 00:23:01 UTC 2012
Modified Files:
src/sys/dev [netbsd-6]: lockstat.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #752):
sys/dev/lockstat.c: revision 1.16
Fix off by one.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.40.1 src/sys/dev/lockstat.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/lockstat.c
diff -u src/sys/dev/lockstat.c:1.15 src/sys/dev/lockstat.c:1.15.40.1
--- src/sys/dev/lockstat.c:1.15 Mon Apr 28 20:23:46 2008
+++ src/sys/dev/lockstat.c Mon Dec 17 00:23:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: lockstat.c,v 1.15 2008/04/28 20:23:46 martin Exp $ */
+/* $NetBSD: lockstat.c,v 1.15.40.1 2012/12/17 00:23:01 riz Exp $ */
/*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lockstat.c,v 1.15 2008/04/28 20:23:46 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: lockstat.c,v 1.15.40.1 2012/12/17 00:23:01 riz Exp $);
#include sys/types.h
#include sys/param.h
@@ -270,7 +270,7 @@ lockstat_stop(lsdisable_t *ld)
cpuno = 0;
for (CPU_INFO_FOREACH(cii, ci)) {
- if (cpuno sizeof(ld-ld_freq) / sizeof(ld-ld_freq[0])) {
+ if (cpuno = sizeof(ld-ld_freq) / sizeof(ld-ld_freq[0])) {
log(LOG_WARNING, lockstat: too many CPUs\n);
break;
}
CVS commit: [netbsd-6-0] src/sys/dev
Module Name:src
Committed By: riz
Date: Mon Dec 17 00:23:10 UTC 2012
Modified Files:
src/sys/dev [netbsd-6-0]: lockstat.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #752):
sys/dev/lockstat.c: revision 1.16
Fix off by one.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.46.1 src/sys/dev/lockstat.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/lockstat.c
diff -u src/sys/dev/lockstat.c:1.15 src/sys/dev/lockstat.c:1.15.46.1
--- src/sys/dev/lockstat.c:1.15 Mon Apr 28 20:23:46 2008
+++ src/sys/dev/lockstat.c Mon Dec 17 00:23:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: lockstat.c,v 1.15 2008/04/28 20:23:46 martin Exp $ */
+/* $NetBSD: lockstat.c,v 1.15.46.1 2012/12/17 00:23:10 riz Exp $ */
/*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lockstat.c,v 1.15 2008/04/28 20:23:46 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: lockstat.c,v 1.15.46.1 2012/12/17 00:23:10 riz Exp $);
#include sys/types.h
#include sys/param.h
@@ -270,7 +270,7 @@ lockstat_stop(lsdisable_t *ld)
cpuno = 0;
for (CPU_INFO_FOREACH(cii, ci)) {
- if (cpuno sizeof(ld-ld_freq) / sizeof(ld-ld_freq[0])) {
+ if (cpuno = sizeof(ld-ld_freq) / sizeof(ld-ld_freq[0])) {
log(LOG_WARNING, lockstat: too many CPUs\n);
break;
}
CVS commit: [netbsd-6] src/sys/dev/raidframe
Module Name:src
Committed By: riz
Date: Mon Dec 17 00:25:27 UTC 2012
Modified Files:
src/sys/dev/raidframe [netbsd-6]: rf_driver.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #753):
sys/dev/raidframe/rf_driver.c: revision 1.131
Fix off by one read.
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.129.10.1 src/sys/dev/raidframe/rf_driver.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_driver.c
diff -u src/sys/dev/raidframe/rf_driver.c:1.129 src/sys/dev/raidframe/rf_driver.c:1.129.10.1
--- src/sys/dev/raidframe/rf_driver.c:1.129 Fri May 27 22:48:24 2011
+++ src/sys/dev/raidframe/rf_driver.c Mon Dec 17 00:25:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_driver.c,v 1.129 2011/05/27 22:48:24 yamt Exp $ */
+/* $NetBSD: rf_driver.c,v 1.129.10.1 2012/12/17 00:25:27 riz Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -66,7 +66,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rf_driver.c,v 1.129 2011/05/27 22:48:24 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: rf_driver.c,v 1.129.10.1 2012/12/17 00:25:27 riz Exp $);
#ifdef _KERNEL_OPT
#include opt_raid_diagnostic.h
@@ -881,7 +881,7 @@ rf_ConfigureDebug(RF_Config_t *cfgPtr)
int i;
rf_ResetDebugOptions();
- for (i = 0; cfgPtr-debugVars[i][0] i RF_MAXDBGV; i++) {
+ for (i = 0; i RF_MAXDBGV cfgPtr-debugVars[i][0]; i++) {
name_p = rf_find_non_white(cfgPtr-debugVars[i][0]);
white_p = rf_find_white(name_p); /* skip to start of 2nd
* word */
CVS commit: [netbsd-6-0] src/sys/dev/raidframe
Module Name:src
Committed By: riz
Date: Mon Dec 17 00:25:41 UTC 2012
Modified Files:
src/sys/dev/raidframe [netbsd-6-0]: rf_driver.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #753):
sys/dev/raidframe/rf_driver.c: revision 1.131
Fix off by one read.
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.129.16.1 src/sys/dev/raidframe/rf_driver.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_driver.c
diff -u src/sys/dev/raidframe/rf_driver.c:1.129 src/sys/dev/raidframe/rf_driver.c:1.129.16.1
--- src/sys/dev/raidframe/rf_driver.c:1.129 Fri May 27 22:48:24 2011
+++ src/sys/dev/raidframe/rf_driver.c Mon Dec 17 00:25:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_driver.c,v 1.129 2011/05/27 22:48:24 yamt Exp $ */
+/* $NetBSD: rf_driver.c,v 1.129.16.1 2012/12/17 00:25:41 riz Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -66,7 +66,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rf_driver.c,v 1.129 2011/05/27 22:48:24 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: rf_driver.c,v 1.129.16.1 2012/12/17 00:25:41 riz Exp $);
#ifdef _KERNEL_OPT
#include opt_raid_diagnostic.h
@@ -881,7 +881,7 @@ rf_ConfigureDebug(RF_Config_t *cfgPtr)
int i;
rf_ResetDebugOptions();
- for (i = 0; cfgPtr-debugVars[i][0] i RF_MAXDBGV; i++) {
+ for (i = 0; i RF_MAXDBGV cfgPtr-debugVars[i][0]; i++) {
name_p = rf_find_non_white(cfgPtr-debugVars[i][0]);
white_p = rf_find_white(name_p); /* skip to start of 2nd
* word */
CVS commit: [netbsd-6-0] src/sys/external/isc/atheros_hal/dist
Module Name:src
Committed By: riz
Date: Mon Dec 17 00:27:00 UTC 2012
Modified Files:
src/sys/external/isc/atheros_hal/dist [netbsd-6-0]: ah_eeprom_v14.c
ah_eeprom_v4k.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #754):
sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c: revision 1.6
sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c: revision 1.4
Fix off by one read error.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.16.1 \
src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c
cvs rdiff -u -r1.1 -r1.1.20.1 \
src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.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/isc/atheros_hal/dist/ah_eeprom_v14.c
diff -u src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c:1.5 src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c:1.5.16.1
--- src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c:1.5 Mon Mar 7 11:25:42 2011
+++ src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c Mon Dec 17 00:27:00 2012
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ah_eeprom_v14.c,v 1.5 2011/03/07 11:25:42 cegger Exp $
+ * $Id: ah_eeprom_v14.c,v 1.5.16.1 2012/12/17 00:27:00 riz Exp $
*/
#include opt_ah.h
@@ -255,7 +255,7 @@ v14EepromReadCTLInfo(struct ath_hal *ah,
HALASSERT(AR5416_NUM_CTLS = sizeof(ee-ee_rdEdgesPower)/NUM_EDGES);
- for (i = 0; ee-ee_base.ctlIndex[i] != 0 i AR5416_NUM_CTLS; i++) {
+ for (i = 0; i AR5416_NUM_CTLS ee-ee_base.ctlIndex[i] != 0; i++) {
for (j = 0; j NUM_EDGES; j ++) {
/* XXX Confirm this is the right thing to do when an invalid channel is stored */
if (ee-ee_base.ctlData[i].ctlEdges[CTL_CHAIN][j].bChannel == AR5416_BCHAN_UNUSED) {
Index: src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c
diff -u src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c:1.1 src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c:1.1.20.1
--- src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c:1.1 Sun Feb 20 11:21:02 2011
+++ src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c Mon Dec 17 00:27:00 2012
@@ -238,7 +238,7 @@ v4kEepromReadCTLInfo(struct ath_hal *ah,
HALASSERT(AR5416_4K_NUM_CTLS = sizeof(ee-ee_rdEdgesPower)/NUM_EDGES);
- for (i = 0; ee-ee_base.ctlIndex[i] != 0 i AR5416_4K_NUM_CTLS; i++) {
+ for (i = 0; i AR5416_4K_NUM_CTLS ee-ee_base.ctlIndex[i] != 0; i++) {
for (j = 0; j NUM_EDGES; j ++) {
/* XXX Confirm this is the right thing to do when an invalid channel is stored */
if (ee-ee_base.ctlData[i].ctlEdges[CTL_CHAIN][j].bChannel == AR5416_BCHAN_UNUSED) {
CVS commit: [netbsd-6] src/sys/external/isc/atheros_hal/dist
Module Name:src
Committed By: riz
Date: Mon Dec 17 00:27:13 UTC 2012
Modified Files:
src/sys/external/isc/atheros_hal/dist [netbsd-6]: ah_eeprom_v14.c
ah_eeprom_v4k.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #754):
sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c: revision 1.6
sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c: revision 1.4
Fix off by one read error.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.10.1 \
src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c
cvs rdiff -u -r1.1 -r1.1.16.1 \
src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.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/isc/atheros_hal/dist/ah_eeprom_v14.c
diff -u src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c:1.5 src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c:1.5.10.1
--- src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c:1.5 Mon Mar 7 11:25:42 2011
+++ src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c Mon Dec 17 00:27:13 2012
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ah_eeprom_v14.c,v 1.5 2011/03/07 11:25:42 cegger Exp $
+ * $Id: ah_eeprom_v14.c,v 1.5.10.1 2012/12/17 00:27:13 riz Exp $
*/
#include opt_ah.h
@@ -255,7 +255,7 @@ v14EepromReadCTLInfo(struct ath_hal *ah,
HALASSERT(AR5416_NUM_CTLS = sizeof(ee-ee_rdEdgesPower)/NUM_EDGES);
- for (i = 0; ee-ee_base.ctlIndex[i] != 0 i AR5416_NUM_CTLS; i++) {
+ for (i = 0; i AR5416_NUM_CTLS ee-ee_base.ctlIndex[i] != 0; i++) {
for (j = 0; j NUM_EDGES; j ++) {
/* XXX Confirm this is the right thing to do when an invalid channel is stored */
if (ee-ee_base.ctlData[i].ctlEdges[CTL_CHAIN][j].bChannel == AR5416_BCHAN_UNUSED) {
Index: src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c
diff -u src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c:1.1 src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c:1.1.16.1
--- src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c:1.1 Sun Feb 20 11:21:02 2011
+++ src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c Mon Dec 17 00:27:13 2012
@@ -238,7 +238,7 @@ v4kEepromReadCTLInfo(struct ath_hal *ah,
HALASSERT(AR5416_4K_NUM_CTLS = sizeof(ee-ee_rdEdgesPower)/NUM_EDGES);
- for (i = 0; ee-ee_base.ctlIndex[i] != 0 i AR5416_4K_NUM_CTLS; i++) {
+ for (i = 0; i AR5416_4K_NUM_CTLS ee-ee_base.ctlIndex[i] != 0; i++) {
for (j = 0; j NUM_EDGES; j ++) {
/* XXX Confirm this is the right thing to do when an invalid channel is stored */
if (ee-ee_base.ctlData[i].ctlEdges[CTL_CHAIN][j].bChannel == AR5416_BCHAN_UNUSED) {
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon Dec 17 00:28:14 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 752-754 To generate a diff of this commit: cvs rdiff -u -r1.1.2.64 -r1.1.2.65 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.64 src/doc/CHANGES-6.1:1.1.2.65 --- src/doc/CHANGES-6.1:1.1.2.64 Sun Dec 16 19:42:28 2012 +++ src/doc/CHANGES-6.1 Mon Dec 17 00:28:13 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.64 2012/12/16 19:42:28 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.65 2012/12/17 00:28:13 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -7874,3 +7874,19 @@ usr.sbin/npf/npfctl/npfctl.h 1.24 PR#47298. [rmind, ticket #750] +sys/dev/lockstat.c1.16 + + Fix off by one error. + [msaitoh, ticket #752] + +sys/dev/raidframe/rf_driver.c 1.131 + + Fix off by one read. + [msaitoh, ticket #753] + +sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c 1.6 +sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c 1.4 + + Fix off by one read error. + [msaitoh, ticket #754] +
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Mon Dec 17 00:28:40 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Tickets 752-754 To generate a diff of this commit: cvs rdiff -u -r1.1.2.35 -r1.1.2.36 src/doc/CHANGES-6.0.1 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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.35 src/doc/CHANGES-6.0.1:1.1.2.36 --- src/doc/CHANGES-6.0.1:1.1.2.35 Sun Dec 16 19:13:03 2012 +++ src/doc/CHANGES-6.0.1 Mon Dec 17 00:28:40 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.35 2012/12/16 19:13:03 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.36 2012/12/17 00:28:40 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -271,3 +271,19 @@ sys/arch/i386/i386/multiboot.c 1.22 Fix off by one error. [msaitoh, ticket #749] +sys/dev/lockstat.c1.16 + + Fix off by one error. + [msaitoh, ticket #752] + +sys/dev/raidframe/rf_driver.c 1.131 + + Fix off by one read. + [msaitoh, ticket #753] + +sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c 1.6 +sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c 1.4 + + Fix off by one read error. + [msaitoh, ticket #754] +
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src
Committed By: riz
Date: Mon Dec 17 00:30:05 UTC 2012
Modified Files:
src/sys/dev/pci [netbsd-6]: if_wm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #755):
sys/dev/pci/if_wm.c: revision 1.239
- 82578DC is not PCH2 but PCH. 82579V is not PCH but PCH2. This bug was
introduced in rev. 1.221. Reported by FUKAUMI Naoki.
- Fix comment.
To generate a diff of this commit:
cvs rdiff -u -r1.227.2.4 -r1.227.2.5 src/sys/dev/pci/if_wm.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/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.227.2.4 src/sys/dev/pci/if_wm.c:1.227.2.5
--- src/sys/dev/pci/if_wm.c:1.227.2.4 Fri Nov 23 16:35:21 2012
+++ src/sys/dev/pci/if_wm.c Mon Dec 17 00:30:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.227.2.4 2012/11/23 16:35:21 riz Exp $ */
+/* $NetBSD: if_wm.c,v 1.227.2.5 2012/12/17 00:30:05 riz Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.227.2.4 2012/11/23 16:35:21 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.227.2.5 2012/12/17 00:30:05 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -931,13 +931,13 @@ static const struct wm_product {
WM_T_PCH, WMP_F_1000T },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCH_D_DC,
PCH LAN (82578DC) Controller,
- WM_T_PCH2, WMP_F_1000T },
+ WM_T_PCH, WMP_F_1000T },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCH2_LV_LM,
PCH2 LAN (82579LM) Controller,
WM_T_PCH2, WMP_F_1000T },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCH2_LV_V,
PCH2 LAN (82579V) Controller,
- WM_T_PCH, WMP_F_1000T },
+ WM_T_PCH2, WMP_F_1000T },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82575EB_COPPER,
82575EB dual-1000baseT Ethernet,
WM_T_82575, WMP_F_1000T },
@@ -4125,7 +4125,7 @@ wm_reset(struct wm_softc *sc)
if (wm_check_reset_block(sc) == 0) {
/*
* Gate automatic PHY configuration by hardware on
- * manaed 82579
+ * non-managed 82579
*/
if ((sc-sc_type == WM_T_PCH2)
((CSR_READ(sc, WMREG_FWSM) FWSM_FW_VALID)
CVS commit: [netbsd-6] src/sys/compat/netbsd32
Module Name:src
Committed By: riz
Date: Mon Dec 17 00:31:29 UTC 2012
Modified Files:
src/sys/compat/netbsd32 [netbsd-6]: netbsd32_fs.c
Log Message:
Pull up following revision(s) (requested by matt in ticket #756):
sys/compat/netbsd32/netbsd32_fs.c: revision 1.64
Fix inverted error check.
To generate a diff of this commit:
cvs rdiff -u -r1.62.2.1 -r1.62.2.2 src/sys/compat/netbsd32/netbsd32_fs.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/compat/netbsd32/netbsd32_fs.c
diff -u src/sys/compat/netbsd32/netbsd32_fs.c:1.62.2.1 src/sys/compat/netbsd32/netbsd32_fs.c:1.62.2.2
--- src/sys/compat/netbsd32/netbsd32_fs.c:1.62.2.1 Thu Dec 13 23:47:57 2012
+++ src/sys/compat/netbsd32/netbsd32_fs.c Mon Dec 17 00:31:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_fs.c,v 1.62.2.1 2012/12/13 23:47:57 riz Exp $ */
+/* $NetBSD: netbsd32_fs.c,v 1.62.2.2 2012/12/17 00:31:29 riz Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_fs.c,v 1.62.2.1 2012/12/13 23:47:57 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_fs.c,v 1.62.2.2 2012/12/17 00:31:29 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -597,7 +597,7 @@ netbsd32___fhstat50(struct lwp *l, const
int error;
error = do_fhstat(l, SCARG_P32(uap, fhp), SCARG(uap, fh_size), sb);
- if (error != 0) {
+ if (error == 0) {
netbsd32_from_stat(sb, sb32);
error = copyout(sb32, SCARG_P32(uap, sb), sizeof(sb));
}
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon Dec 17 00:32:06 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: TIckets 755-756 To generate a diff of this commit: cvs rdiff -u -r1.1.2.65 -r1.1.2.66 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.65 src/doc/CHANGES-6.1:1.1.2.66 --- src/doc/CHANGES-6.1:1.1.2.65 Mon Dec 17 00:28:13 2012 +++ src/doc/CHANGES-6.1 Mon Dec 17 00:32:05 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.65 2012/12/17 00:28:13 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.66 2012/12/17 00:32:05 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -7890,3 +7890,13 @@ sys/external/isc/atheros_hal/dist/ah_eep Fix off by one read error. [msaitoh, ticket #754] +sys/dev/pci/if_wm.c1.239 + + Fix handling of 82578DC and 82579V chips. + [msaitoh, ticket #755] + +sys/compat/netbsd32/netbsd32_fs.c 1.64 + + Fix inverted error check. + [matt, ticket #756] +
CVS commit: [netbsd-6-0] src/sys/compat/netbsd32
Module Name:src
Committed By: riz
Date: Mon Dec 17 00:32:29 UTC 2012
Modified Files:
src/sys/compat/netbsd32 [netbsd-6-0]: netbsd32_fs.c
Log Message:
Pull up following revision(s) (requested by matt in ticket #756):
sys/compat/netbsd32/netbsd32_fs.c: revision 1.64
Fix inverted error check.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.62.6.1 src/sys/compat/netbsd32/netbsd32_fs.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/compat/netbsd32/netbsd32_fs.c
diff -u src/sys/compat/netbsd32/netbsd32_fs.c:1.62 src/sys/compat/netbsd32/netbsd32_fs.c:1.62.6.1
--- src/sys/compat/netbsd32/netbsd32_fs.c:1.62 Wed Jan 25 14:06:07 2012
+++ src/sys/compat/netbsd32/netbsd32_fs.c Mon Dec 17 00:32:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_fs.c,v 1.62 2012/01/25 14:06:07 christos Exp $ */
+/* $NetBSD: netbsd32_fs.c,v 1.62.6.1 2012/12/17 00:32:29 riz Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_fs.c,v 1.62 2012/01/25 14:06:07 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_fs.c,v 1.62.6.1 2012/12/17 00:32:29 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -595,7 +595,7 @@ netbsd32___fhstat50(struct lwp *l, const
int error;
error = do_fhstat(l, SCARG_P32(uap, fhp), SCARG(uap, fh_size), sb);
- if (error != 0) {
+ if (error == 0) {
netbsd32_from_stat(sb, sb32);
error = copyout(sb32, SCARG_P32(uap, sb), sizeof(sb));
}
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Mon Dec 17 00:33:00 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: ticket 756 To generate a diff of this commit: cvs rdiff -u -r1.1.2.36 -r1.1.2.37 src/doc/CHANGES-6.0.1 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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.36 src/doc/CHANGES-6.0.1:1.1.2.37 --- src/doc/CHANGES-6.0.1:1.1.2.36 Mon Dec 17 00:28:40 2012 +++ src/doc/CHANGES-6.0.1 Mon Dec 17 00:33:00 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.36 2012/12/17 00:28:40 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.37 2012/12/17 00:33:00 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -287,3 +287,8 @@ sys/external/isc/atheros_hal/dist/ah_eep Fix off by one read error. [msaitoh, ticket #754] +sys/compat/netbsd32/netbsd32_fs.c 1.64 + + Fix inverted error check. + [matt, ticket #756] +
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Sat Dec 15 23:31:07 UTC 2012
Modified Files:
src/share/examples/npf [netbsd-6]: host-npf.conf soho_gw-npf.conf
src/usr.sbin/npf/npfctl [netbsd-6]: npf.conf.5
Log Message:
Pull up following revision(s) (requested by rmind in ticket #744):
usr.sbin/npf/npfctl/npf.conf.5: revision 1.25
share/examples/npf/host-npf.conf: revision 1.4
share/examples/npf/soho_gw-npf.conf: revision 1.4
Fix syntax error in the example, fix one rule and G/C quot;ridquot; procedure.
- npf.conf(5): fix of the example config.
- Mention npf_ext_log in a comment.
To generate a diff of this commit:
cvs rdiff -u -r1.2.4.3 -r1.2.4.4 src/share/examples/npf/host-npf.conf \
src/share/examples/npf/soho_gw-npf.conf
cvs rdiff -u -r1.9.2.5 -r1.9.2.6 src/usr.sbin/npf/npfctl/npf.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/share/examples/npf/host-npf.conf
diff -u src/share/examples/npf/host-npf.conf:1.2.4.3 src/share/examples/npf/host-npf.conf:1.2.4.4
--- src/share/examples/npf/host-npf.conf:1.2.4.3 Tue Dec 11 04:31:53 2012
+++ src/share/examples/npf/host-npf.conf Sat Dec 15 23:31:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: host-npf.conf,v 1.2.4.3 2012/12/11 04:31:53 riz Exp $
+# $NetBSD: host-npf.conf,v 1.2.4.4 2012/12/15 23:31:07 riz Exp $
#
# this is an example of NPF rules for a host (i.e., not routing) with
# two network interfaces, wired and wifi
@@ -6,6 +6,7 @@
# it does both IPv4 and IPv6 and allows for DHCP in v4 and SLAAC in v6
# it also does IPSEC on the wifi
#
+
$wired_if = wm0
$wired_v4 = { inet4(wm0) }
$wired_v6 = { inet6(wm0) }
@@ -30,10 +31,6 @@ procedure log {
log: npflog0
}
-procedure rid {
- normalise: random-id
-}
-
group (name wired, interface $wired_if) {
# not being picky about our own address here
@@ -64,16 +61,16 @@ group (name wired, interface $wired_if
# only SYN packets need to generate state
pass stateful out final family inet6 proto tcp flags S/SA \
- from $wired_v6 apply rid
+ from $wired_v6
pass stateful out final family inet proto tcp flags S/SA \
- from $wired_v4 apply rid
+ from $wired_v4
# pass the other tcp packets without generating extra state
- pass out final family inet6 proto tcp from $wired_v6 apply rid
- pass out final family inet proto tcp from $wired_v4 apply rid
+ pass out final family inet6 proto tcp from $wired_v6
+ pass out final family inet proto tcp from $wired_v4
# all other types of traffic, generate state per packet
- pass stateful out final family inet6 from $wired_v6 apply rid
- pass stateful out final family inet from $wired_v4 apply rid
+ pass stateful out final family inet6 from $wired_v6
+ pass stateful out final family inet from $wired_v4
}
@@ -107,16 +104,16 @@ group (name wifi, interface $wifi_if)
# only SYN packets need to generate state
pass stateful out final family inet6 proto tcp flags S/SA \
- from $wifi_v6 apply rid
+ from $wifi_v6
pass stateful out final family inet proto tcp flags S/SA \
- from $wifi_v4 apply rid
+ from $wifi_v4
# pass the other tcp packets without generating extra state
-pass out final family inet6 proto tcp from $wifi_v6 apply rid
-pass out final family inet proto tcp from $wifi_v4 apply rid
+pass out final family inet6 proto tcp from $wifi_v6
+pass out final family inet proto tcp from $wifi_v4
# all other types of traffic, generate state per packet
-pass stateful out final family inet6 from $wifi_v6 apply rid
-pass stateful out final family inet from $wifi_v4 apply rid
+pass stateful out final family inet6 from $wifi_v6
+pass stateful out final family inet from $wifi_v4
}
group (default) {
Index: src/share/examples/npf/soho_gw-npf.conf
diff -u src/share/examples/npf/soho_gw-npf.conf:1.2.4.3 src/share/examples/npf/soho_gw-npf.conf:1.2.4.4
--- src/share/examples/npf/soho_gw-npf.conf:1.2.4.3 Tue Dec 11 04:31:53 2012
+++ src/share/examples/npf/soho_gw-npf.conf Sat Dec 15 23:31:07 2012
@@ -1,10 +1,11 @@
-# $NetBSD: soho_gw-npf.conf,v 1.2.4.3 2012/12/11 04:31:53 riz Exp $
+# $NetBSD: soho_gw-npf.conf,v 1.2.4.4 2012/12/15 23:31:07 riz Exp $
#
# SOHO border
#
# This is a natting border gateway/webserver/mailserver/nameserver
# IPv4 only
#
+
$ext_if = wm0
$ext_v4 = inet4(wm0)
$ext_addrs = { ifnet(wm0) }
@@ -27,18 +28,14 @@ map $ext_if dynamic 198.51.100.0/24 - $
# NAT traffic arriving on port 9022 of the external interface address
# to host 198.51.100.2 port 22
-map $ext_if dynamic 198.51.100.2 port 22 - $ext_v4 9022
+map $ext_if dynamic 198.51.100.2 port 22 - $ext_v4 port 9022
procedure log {
log: npflog0
}
-procedure rid {
- normalise: random-id
-}
-
group (name external, interface $ext_if) {
- pass stateful out final from $ext_addrs apply rid
+ pass stateful out final all
CVS commit: [netbsd-6-0] src/usr.sbin/npf/npfctl
Module Name:src
Committed By: riz
Date: Sat Dec 15 23:34:31 UTC 2012
Modified Files:
src/usr.sbin/npf/npfctl [netbsd-6-0]: npf.conf.5
Log Message:
Pull up following revision(s) (requested by rmind in ticket #744):
usr.sbin/npf/npfctl/npf.conf.5: revision 1.25
- npf.conf(5): fix of the example config.
- Mention npf_ext_log in a comment.
To generate a diff of this commit:
cvs rdiff -u -r1.9.2.4 -r1.9.2.4.2.1 src/usr.sbin/npf/npfctl/npf.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/usr.sbin/npf/npfctl/npf.conf.5
diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.9.2.4 src/usr.sbin/npf/npfctl/npf.conf.5:1.9.2.4.2.1
--- src/usr.sbin/npf/npfctl/npf.conf.5:1.9.2.4 Mon Oct 1 20:05:56 2012
+++ src/usr.sbin/npf/npfctl/npf.conf.5 Sat Dec 15 23:34:31 2012
@@ -1,4 +1,4 @@
-.\$NetBSD: npf.conf.5,v 1.9.2.4 2012/10/01 20:05:56 riz Exp $
+.\$NetBSD: npf.conf.5,v 1.9.2.4.2.1 2012/12/15 23:34:31 riz Exp $
.\
.\ Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -27,7 +27,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd September 30, 2012
+.Dd December 6, 2012
.Dt NPF.CONF 5
.Os
.Sh NAME
@@ -272,11 +272,12 @@ map $ext_if dynamic 10.1.1.0/24 - $ext_
map $ext_if dynamic 10.1.1.2 port 22 - $ext_if 9022
procedure log {
+ # Note: npf_ext_log kernel module should be loaded, if not built-in.
log: npflog0
}
group (name external, interface $ext_if) {
- pass stateful out final from $ext_if
+ pass stateful out final all
block in final from \*[Lt]1\*[Gt]
pass stateful in final family inet proto tcp to $ext_if port ssh apply log
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Sat Dec 15 23:35:13 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Ticket 744. To generate a diff of this commit: cvs rdiff -u -r1.1.2.31 -r1.1.2.32 src/doc/CHANGES-6.0.1 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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.31 src/doc/CHANGES-6.0.1:1.1.2.32 --- src/doc/CHANGES-6.0.1:1.1.2.31 Thu Dec 13 23:42:29 2012 +++ src/doc/CHANGES-6.0.1 Sat Dec 15 23:35:13 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.31 2012/12/13 23:42:29 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.32 2012/12/15 23:35:13 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -248,3 +248,8 @@ sys/arch/x86/acpi/acpi_cpu_md.c 1.72 Disable C1E on AMD K8 CPUs, to prevent freeze during boot. PR#47224. [jruoho, ticket #741] +usr.sbin/npf/npfctl/npf.conf.5 1.25 via patch + + Fix the example config. + [rmind, ticket #744] +
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Sat Dec 15 23:45:59 UTC 2012
Modified Files:
src/distrib/sets/lists/base [netbsd-6]: ad.mips64eb ad.mips64el
md.amd64 md.sparc64 shl.mi
src/distrib/sets/lists/comp [netbsd-6]: shl.mi
src/distrib/sets/lists/modules [netbsd-6]: md.evbppc mi
src/lib/npf [netbsd-6]: Makefile
src/sys/modules [netbsd-6]: Makefile
src/sys/net/npf [netbsd-6]: files.npf
Added Files:
src/lib/npf/ext_rndblock [netbsd-6]: Makefile npfext_rndblock.c
shlib_version
src/sys/modules/npf_ext_rndblock [netbsd-6]: Makefile
src/sys/net/npf [netbsd-6]: npf_ext_rndblock.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #745):
distrib/sets/lists/comp/shl.mi: revision 1.241
distrib/sets/lists/modules/mi: revision 1.49
distrib/sets/lists/base/md.sparc64: revision 1.171
lib/npf/ext_rndblock/npfext_rndblock.c: revision 1.1
distrib/sets/lists/base/ad.mips64eb: revision 1.106
distrib/sets/lists/modules/md.evbppc: revision 1.29
sys/net/npf/npf_ext_rndblock.c: revision 1.1
lib/npf/Makefile: revision 1.2
sys/modules/npf_ext_rndblock/Makefile: revision 1.1
lib/npf/ext_rndblock/Makefile: revision 1.1
distrib/sets/lists/base/ad.mips64el: revision 1.106
lib/npf/ext_rndblock/shlib_version: revision 1.1
distrib/sets/lists/base/md.amd64: revision 1.182
distrib/sets/lists/base/shl.mi: revision 1.643
sys/net/npf/files.npf: revision 1.9
sys/modules/Makefile: revision 1.117
Add NPF quot;rndblockquot; extension to randomly drop packets (using a random
function
with a percentage or modulo operation). This is a demo module, although it can
be used for packet loss simulation. Example of a procedure in npf.conf:
procedure quot;somedropquot; {
# Drop 1.9% of the traffic
rndblock: percentage 1.9
}
To generate a diff of this commit:
cvs rdiff -u -r1.82.2.7 -r1.82.2.8 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.81.2.7 -r1.81.2.8 src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.156.2.7 -r1.156.2.8 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.147.2.7 -r1.147.2.8 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.616.2.8 -r1.616.2.9 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.209.2.9 -r1.209.2.10 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.18.2.1 -r1.18.2.2 src/distrib/sets/lists/modules/md.evbppc
cvs rdiff -u -r1.39.2.1 -r1.39.2.2 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/lib/npf/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/lib/npf/ext_rndblock/Makefile \
src/lib/npf/ext_rndblock/npfext_rndblock.c \
src/lib/npf/ext_rndblock/shlib_version
cvs rdiff -u -r1.101.2.1 -r1.101.2.2 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/sys/modules/npf_ext_rndblock/Makefile
cvs rdiff -u -r1.6.2.2 -r1.6.2.3 src/sys/net/npf/files.npf
cvs rdiff -u -r0 -r1.1.2.2 src/sys/net/npf/npf_ext_rndblock.c
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/ad.mips64eb
diff -u src/distrib/sets/lists/base/ad.mips64eb:1.82.2.7 src/distrib/sets/lists/base/ad.mips64eb:1.82.2.8
--- src/distrib/sets/lists/base/ad.mips64eb:1.82.2.7 Sat Dec 15 05:40:17 2012
+++ src/distrib/sets/lists/base/ad.mips64eb Sat Dec 15 23:45:56 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.82.2.7 2012/12/15 05:40:17 riz Exp $
+# $NetBSD: ad.mips64eb,v 1.82.2.8 2012/12/15 23:45:56 riz Exp $
./libexec/ld.elf_so-64base-compat-shlib compat,pic
./libexec/ld.elf_so-o32base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -285,6 +285,9 @@
./usr/lib/64/npf/ext_normalise.so base-npf-shlib compat,pic
./usr/lib/64/npf/ext_normalise.so.0 base-npf-shlib compat,pic
./usr/lib/64/npf/ext_normalise.so.0.0 base-npf-shlib compat,pic
+./usr/lib/64/npf/ext_rndblock.so base-npf-shlib compat,pic
+./usr/lib/64/npf/ext_rndblock.so.0 base-npf-shlib compat,pic
+./usr/lib/64/npf/ext_rndblock.so.0.0 base-npf-shlib compat,pic
./usr/lib/64/securitybase-compat-shlib
./usr/lib/64/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam
./usr/lib/64/security/pam_chroot.so.3 base-compat-shlib compat,pic,pam
@@ -590,6 +593,9 @@
./usr/lib/o32/npf/ext_normalise.so base-npf-shlib compat,pic
./usr/lib/o32/npf/ext_normalise.so.0 base-npf-shlib compat,pic
./usr/lib/o32/npf/ext_normalise.so.0.0 base-npf-shlib compat,pic
+./usr/lib/o32/npf/ext_rndblock.so base-npf-shlib compat,pic
+./usr/lib/o32/npf/ext_rndblock.so.0 base-npf-shlib compat,pic
+./usr/lib/o32/npf/ext_rndblock.so.0.0 base-npf-shlib compat,pic
./usr/lib/o32/securitybase-compat-shlib
./usr/lib/o32/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam
./usr/lib/o32/security/pam_chroot.so.3
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Sat Dec 15 23:47:17 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 744, 745 To generate a diff of this commit: cvs rdiff -u -r1.1.2.60 -r1.1.2.61 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.60 src/doc/CHANGES-6.1:1.1.2.61 --- src/doc/CHANGES-6.1:1.1.2.60 Sat Dec 15 05:46:35 2012 +++ src/doc/CHANGES-6.1 Sat Dec 15 23:47:17 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.60 2012/12/15 05:46:35 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.61 2012/12/15 23:47:17 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -7812,3 +7812,32 @@ distrib/sets/lists/man/mipatch Update bind to version 9.9.2-P1, addressing CVE-2012-5688. [spz, ticket #751] +share/examples/npf/host-npf.conf 1.4 +share/examples/npf/soho_gw-npf.conf 1.4 +usr.sbin/npf/npfctl/npf.conf.5 1.25 + + Fix errors in NPF examples. + [rmind, ticket #744] + +distrib/sets/lists/base/ad.mips64eb 1.106 +distrib/sets/lists/base/ad.mips64el 1.106 +distrib/sets/lists/base/md.amd64 1.182 +distrib/sets/lists/base/md.sparc64 1.171 +distrib/sets/lists/base/shl.mi 1.643 +distrib/sets/lists/comp/shl.mi 1.241 +distrib/sets/lists/modules/md.evbppc 1.29 +distrib/sets/lists/modules/mi 1.49 via patch +lib/npf/Makefile1.2 +lib/npf/ext_rndblock/Makefile 1.1 +lib/npf/ext_rndblock/npfext_rndblock.c 1.1 +lib/npf/ext_rndblock/shlib_version 1.1 +sys/modules/Makefile1.117 via patch +sys/modules/npf_ext_rndblock/Makefile 1.1 +sys/net/npf/files.npf1.9 +sys/net/npf/npf_ext_rndblock.c 1.1 + + Add NPF rndblock extension to randomly drop packets. This + is a demo module, although it can be used for packet + loss simulation. + [rmind, ticket #745] +
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Sat Dec 15 05:41:06 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Ticket #751 To generate a diff of this commit: cvs rdiff -u -r1.1.2.58 -r1.1.2.59 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.58 src/doc/CHANGES-6.1:1.1.2.59 --- src/doc/CHANGES-6.1:1.1.2.58 Thu Dec 13 23:51:40 2012 +++ src/doc/CHANGES-6.1 Sat Dec 15 05:41:06 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.58 2012/12/13 23:51:40 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.59 2012/12/15 05:41:06 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -7176,3 +7176,637 @@ lib/npf/ext_normalise/Makefile 1.2 Also, make sure the compat directories get created. [rmind, ticket #743] +external/bsd/bind/bin/dnssec/Makefile patch +external/bsd/bind/bin/dnssec/dnssec-verify/Makefile patch +external/bsd/bind/dist/CHANGESpatch +external/bsd/bind/dist/Makefile.in patch +external/bsd/bind/dist/READMEpatch +external/bsd/bind/dist/acconfig.h patch +external/bsd/bind/dist/config.h.in patch +external/bsd/bind/dist/configure patch +external/bsd/bind/dist/configure.in patch +external/bsd/bind/dist/isc-config.sh.in patch +external/bsd/bind/dist/srcidpatch +external/bsd/bind/dist/versionpatch +external/bsd/bind/dist/bin/Makefile.in patch +external/bsd/bind/dist/bin/check/Makefile.in patch +external/bsd/bind/dist/bin/check/check-tool.c patch +external/bsd/bind/dist/bin/confgen/Makefile.in patch +external/bsd/bind/dist/bin/confgen/unix/Makefile.in patch +external/bsd/bind/dist/bin/dig/Makefile.in patch +external/bsd/bind/dist/bin/dig/nslookup.c patch +external/bsd/bind/dist/bin/dnssec/Makefile.in patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-dsfromkey.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-keyfromlabel.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-keygen.html patch +external/bsd/bind/dist/bin/dnssec/dnssec-settime.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-verify.8 patch +external/bsd/bind/dist/bin/dnssec/dnssec-verify.c patch +external/bsd/bind/dist/bin/dnssec/dnssec-verify.docbook patch +external/bsd/bind/dist/bin/dnssec/dnssec-verify.html patch +external/bsd/bind/dist/bin/dnssec/dnssectool.c patch +external/bsd/bind/dist/bin/dnssec/dnssectool.h patch +external/bsd/bind/dist/bin/named/Makefile.in patch +external/bsd/bind/dist/bin/named/bindkeys.pl patch +external/bsd/bind/dist/bin/named/builtin.c patch +external/bsd/bind/dist/bin/named/client.c patch +external/bsd/bind/dist/bin/named/config.c patch +external/bsd/bind/dist/bin/named/controlconf.c patch +external/bsd/bind/dist/bin/named/convertxsl.pl patch +external/bsd/bind/dist/bin/named/query.c patch +external/bsd/bind/dist/bin/named/server.c patch +external/bsd/bind/dist/bin/named/statschannel.c patch +external/bsd/bind/dist/bin/named/unix/Makefile.in patch +external/bsd/bind/dist/bin/named/unix/dlz_dlopen_driver.c patch +external/bsd/bind/dist/bin/nsupdate/Makefile.in patch +external/bsd/bind/dist/bin/nsupdate/nsupdate.c patch +external/bsd/bind/dist/bin/pkcs11/Makefile.in patch +external/bsd/bind/dist/bin/python/Makefile.in patch +external/bsd/bind/dist/bin/python/dnssec-checkds.8 patch +external/bsd/bind/dist/bin/python/dnssec-checkds.docbookpatch +external/bsd/bind/dist/bin/python/dnssec-checkds.html patch +external/bsd/bind/dist/bin/python/dnssec-checkds.py.in patch +external/bsd/bind/dist/bin/rndc/Makefile.in patch +external/bsd/bind/dist/bin/tests/Makefile.in patch +external/bsd/bind/dist/bin/tests/b8t.mk patch +external/bsd/bind/dist/bin/tests/b9t.mk patch +external/bsd/bind/dist/bin/tests/headerdep_test.sh.in patch +external/bsd/bind/dist/bin/tests/rbt_test.txt patch +external/bsd/bind/dist/bin/tests/resolv.conf.sample patch +external/bsd/bind/dist/bin/tests/t_api.pl patch +external/bsd/bind/dist/bin/tests/atomic/Makefile.in patch +external/bsd/bind/dist/bin/tests/db/Makefile.in patch +external/bsd/bind/dist/bin/tests/dnssec-signzone/run-test.sh patch +external/bsd/bind/dist/bin/tests/dst/Makefile.in patch +external/bsd/bind/dist/bin/tests/dst/t_dst.c patch
CVS commit: [netbsd-6] src/external/bsd/bind/dist/doc/arm
Module Name:src Committed By: riz Date: Sat Dec 15 05:44:33 UTC 2012 Modified Files: src/external/bsd/bind/dist/doc/arm [netbsd-6]: Bv9ARM.pdf isc-logo.pdf Log Message: Two files inadvertantly missed from ticket #751. To generate a diff of this commit: cvs rdiff -u -r1.1.1.9.4.1 -r1.1.1.9.4.2 \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf cvs rdiff -u -r1.1.1.2.8.1 -r1.1.1.2.8.2 \ src/external/bsd/bind/dist/doc/arm/isc-logo.pdf 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: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Sat Dec 15 05:46:35 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: adjust file list for ticket 751 To generate a diff of this commit: cvs rdiff -u -r1.1.2.59 -r1.1.2.60 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.59 src/doc/CHANGES-6.1:1.1.2.60 --- src/doc/CHANGES-6.1:1.1.2.59 Sat Dec 15 05:41:06 2012 +++ src/doc/CHANGES-6.1 Sat Dec 15 05:46:35 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.59 2012/12/15 05:41:06 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.60 2012/12/15 05:46:35 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -7583,7 +7583,9 @@ external/bsd/bind/dist/doc/arm/Bv9ARM.ch external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html patch external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html patch external/bsd/bind/dist/doc/arm/Bv9ARM.html patch +external/bsd/bind/dist/doc/arm/Bv9ARM.pdf patch external/bsd/bind/dist/doc/arm/Makefile.in patch +external/bsd/bind/dist/doc/arm/isc-logo.pdf patch external/bsd/bind/dist/doc/arm/latex-fixup.pl patch external/bsd/bind/dist/doc/arm/man.arpaname.html patch external/bsd/bind/dist/doc/arm/man.ddns-confgen.html patch
CVS commit: [netbsd-6] xsrc/external/mit/xf86-video-nv/dist/src
Module Name:xsrc
Committed By: riz
Date: Thu Dec 13 17:36:42 UTC 2012
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src [netbsd-6]: nv_driver.c
Log Message:
Pull up following revision(s) (requested by macallan in ticket #739):
external/mit/xf86-video-nv/dist/src/nv_driver.c: revision 1.2
don't map the VGA framebuffer if AVOID_VGAHW is defined
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.2.1 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.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-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.1.1.5 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.1.1.5.2.1
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.1.1.5 Mon Aug 9 16:17:55 2010
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c Thu Dec 13 17:36:42 2012
@@ -1219,7 +1219,9 @@ NVCloseScreen(int scrnIndex, ScreenPtr p
}
NVUnmapMem(pScrn);
+#ifndef AVOID_VGAHW
vgaHWUnmapMem(pScrn);
+#endif
if (pNv-AccelInfoRec)
XAADestroyInfoRec(pNv-AccelInfoRec);
if (pNv-CursorInfoRec)
@@ -1259,6 +1261,7 @@ NVFreeScreen(int scrnIndex, int flags)
* This only gets called when a screen is being deleted. It does not
* get called routinely at the end of a server generation.
*/
+
if (xf86LoaderCheckSymbol(vgaHWFreeHWRec))
vgaHWFreeHWRec(xf86Screens[scrnIndex]);
NVFreeRec(xf86Screens[scrnIndex]);
@@ -2410,11 +2413,13 @@ NVScreenInit(int scrnIndex, ScreenPtr pS
}
/* Map the VGA memory when the primary video */
+#ifndef AVOID_VGAHW
if (pNv-Primary !pNv-FBDev) {
hwp-MapSize = 0x1;
if (!vgaHWMapMem(pScrn))
return FALSE;
}
+#endif
if (pNv-FBDev) {
fbdevHWSave(pScrn);
CVS commit: [netbsd-6] src/external/mit/xorg/server/drivers/xf86-video-nv
Module Name:src
Committed By: riz
Date: Thu Dec 13 17:38:07 UTC 2012
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nv [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by macallan in ticket #739):
external/mit/xorg/server/drivers/xf86-video-nv/Makefile: revision 1.5
set AVOID_VGAHW on macppc, now this driver works out of the box
should probably be set on all machines where we never use VGA text mode
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.24.1 \
src/external/mit/xorg/server/drivers/xf86-video-nv/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/server/drivers/xf86-video-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.4.24.1
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.4 Sun Aug 3 14:47:26 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Thu Dec 13 17:38:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/08/03 14:47:26 rtr Exp $
+# $NetBSD: Makefile,v 1.4.24.1 2012/12/13 17:38:07 riz Exp $
DRIVER= xf86-video-nv
DRIVER_NAME= nv_drv
@@ -11,4 +11,8 @@ SRCS+= g80_dac.c g80_display.c g80_dma.
SRCS+= g80_output.c g80_sor.c g80_xaa.c
MAN= nv.4
+.if ${MACHINE} == macppc
+CPPFLAGS+= -DAVOID_VGAHW
+.endif
+
.include ../Makefile.xf86-driver
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Thu Dec 13 17:38:55 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: ticket 739. To generate a diff of this commit: cvs rdiff -u -r1.1.2.56 -r1.1.2.57 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.56 src/doc/CHANGES-6.1:1.1.2.57 --- src/doc/CHANGES-6.1:1.1.2.56 Tue Dec 11 04:45:01 2012 +++ src/doc/CHANGES-6.1 Thu Dec 13 17:38:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.56 2012/12/11 04:45:01 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.57 2012/12/13 17:38:55 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -7143,3 +7143,9 @@ sys/arch/arm/marvell/mvsocreg.h patch configure devices if their clock is disabled. [msaitoh, ticket #737] +external/mit/xorg/server/drivers/xf86-video-nv/Makefile 1.5 +xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c 1.2 + + Make xf86-video-nv work out of the box on macppc. + [macallan, ticket #739] +
CVS commit: [netbsd-6-0] src/external/bsd/bind/dist
Module Name:src Committed By: riz Date: Thu Dec 13 17:42:04 UTC 2012 Modified Files: src/external/bsd/bind/dist [netbsd-6-0]: CHANGES version src/external/bsd/bind/dist/bin/named [netbsd-6-0]: query.c Log Message: external/bsd/bind/dist/CHANGES patch external/bsd/bind/dist/version patch external/bsd/bind/dist/bin/named/query.cpatch Address CVE-2012-5688: Named could die on specific queries with dns64 enabled. [spz, ticket #740] To generate a diff of this commit: cvs rdiff -u -r1.2.2.4 -r1.2.2.4.2.1 src/external/bsd/bind/dist/CHANGES cvs rdiff -u -r1.1.1.10.4.4 -r1.1.1.10.4.4.2.1 \ src/external/bsd/bind/dist/version cvs rdiff -u -r1.7.2.2 -r1.7.2.2.2.1 \ src/external/bsd/bind/dist/bin/named/query.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/bsd/bind/dist/CHANGES diff -u src/external/bsd/bind/dist/CHANGES:1.2.2.4 src/external/bsd/bind/dist/CHANGES:1.2.2.4.2.1 --- src/external/bsd/bind/dist/CHANGES:1.2.2.4 Tue Oct 9 23:58:08 2012 +++ src/external/bsd/bind/dist/CHANGES Thu Dec 13 17:42:04 2012 @@ -1,3 +1,8 @@ + --- diff from 9.9.2 to 9.9.2-P1 -- + +3407. [security] Named could die on specific queries with dns64 enabled. + [Addressed in change #3388 for BIND 9.8.5 and 9.9.3.] + --- 9.9.1-P4 released --- 3383. [security] A certain combination of records in the RBT could Index: src/external/bsd/bind/dist/version diff -u src/external/bsd/bind/dist/version:1.1.1.10.4.4 src/external/bsd/bind/dist/version:1.1.1.10.4.4.2.1 --- src/external/bsd/bind/dist/version:1.1.1.10.4.4 Tue Oct 9 23:58:08 2012 +++ src/external/bsd/bind/dist/version Thu Dec 13 17:42:04 2012 @@ -7,4 +7,4 @@ MAJORVER=9 MINORVER=9 PATCHVER=1 RELEASETYPE=-P -RELEASEVER=4 +RELEASEVER=4nb1 Index: src/external/bsd/bind/dist/bin/named/query.c diff -u src/external/bsd/bind/dist/bin/named/query.c:1.7.2.2 src/external/bsd/bind/dist/bin/named/query.c:1.7.2.2.2.1 --- src/external/bsd/bind/dist/bin/named/query.c:1.7.2.2 Tue Oct 9 23:58:09 2012 +++ src/external/bsd/bind/dist/bin/named/query.c Thu Dec 13 17:42:04 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: query.c,v 1.7.2.2 2012/10/09 23:58:09 riz Exp $ */ +/* $NetBSD: query.c,v 1.7.2.2.2.1 2012/12/13 17:42:04 riz Exp $ */ /* * Copyright (C) 2004-2012 Internet Systems Consortium, Inc. (ISC) @@ -5178,10 +5178,12 @@ dns64_ttl(dns_db_t *db, dns_dbversion_t isc_result_t result; isc_uint32_t ttl = ISC_UINT32_MAX; + dns_rdataset_init(rdataset); + result = dns_db_getoriginnode(db, node); if (result != ISC_R_SUCCESS) goto cleanup; - dns_rdataset_init(rdataset); + result = dns_db_findrdataset(db, node, version, dns_rdatatype_soa, 0, 0, rdataset, NULL); if (result != ISC_R_SUCCESS)
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Thu Dec 13 17:42:23 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Ticket 740. To generate a diff of this commit: cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-6.0.1 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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.28 src/doc/CHANGES-6.0.1:1.1.2.29 --- src/doc/CHANGES-6.0.1:1.1.2.28 Tue Dec 11 04:27:04 2012 +++ src/doc/CHANGES-6.0.1 Thu Dec 13 17:42:23 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.28 2012/12/11 04:27:04 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.29 2012/12/13 17:42:23 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -234,3 +234,11 @@ lib/libterminfo/tparm.c1.9 Fix off by one error. [msaitoh, ticket #734] +external/bsd/bind/dist/CHANGESpatch +external/bsd/bind/dist/versionpatch +external/bsd/bind/dist/bin/named/query.c patch + + Address CVE-2012-5688: Named could die on specific queries with dns64 + enabled. + [spz, ticket #740] +
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Thu Dec 13 17:43:30 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Whitespace fix. To generate a diff of this commit: cvs rdiff -u -r1.1.2.29 -r1.1.2.30 src/doc/CHANGES-6.0.1 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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.29 src/doc/CHANGES-6.0.1:1.1.2.30 --- src/doc/CHANGES-6.0.1:1.1.2.29 Thu Dec 13 17:42:23 2012 +++ src/doc/CHANGES-6.0.1 Thu Dec 13 17:43:30 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.29 2012/12/13 17:42:23 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.30 2012/12/13 17:43:30 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -229,6 +229,7 @@ sys/arch/xen/xenbus/xenbus_xs.c 1.23 Xen Dom0 NetBSD kernel can crash by adding duplicate xenwatches. [royger, ticket #728] + lib/libterminfo/tparm.c1.9 Fix off by one error.
CVS commit: [netbsd-6] src/sys/arch/x86/acpi
Module Name:src Committed By: riz Date: Thu Dec 13 23:41:57 UTC 2012 Modified Files: src/sys/arch/x86/acpi [netbsd-6]: acpi_cpu_md.c Log Message: Pull up following revision(s) (requested by jruoho in ticket #741): sys/arch/x86/acpi/acpi_cpu_md.c: revision 1.72 Disable C1E also on K8, if present. From Imre Vadasz i...@vdsz.com in PR install/47224. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.71.2.1 src/sys/arch/x86/acpi/acpi_cpu_md.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/acpi/acpi_cpu_md.c diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.71 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.71.2.1 --- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.71 Sat Feb 11 22:09:47 2012 +++ src/sys/arch/x86/acpi/acpi_cpu_md.c Thu Dec 13 23:41:57 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_md.c,v 1.71 2012/02/11 22:09:47 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_md.c,v 1.71.2.1 2012/12/13 23:41:57 riz Exp $ */ /*- * Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.71 2012/02/11 22:09:47 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.71.2.1 2012/12/13 23:41:57 riz Exp $); #include sys/param.h #include sys/bus.h @@ -253,6 +253,12 @@ acpicpu_md_flags(void) case 0x0f: /* + * Disable C1E if present. + */ + if (rdmsr_safe(MSR_CMPHALT, msr) != EFAULT) +val |= ACPICPU_FLAG_C_C1E; + + /* * Evaluate support for the FID/VID * algorithm also used by powernow(4). */ @@ -268,6 +274,9 @@ acpicpu_md_flags(void) case 0x10: case 0x11: + /* + * Disable C1E if present. + */ if (rdmsr_safe(MSR_CMPHALT, msr) != EFAULT) val |= ACPICPU_FLAG_C_C1E;
CVS commit: [netbsd-6-0] src/sys/arch/x86/acpi
Module Name:src Committed By: riz Date: Thu Dec 13 23:42:16 UTC 2012 Modified Files: src/sys/arch/x86/acpi [netbsd-6-0]: acpi_cpu_md.c Log Message: Pull up following revision(s) (requested by jruoho in ticket #741): sys/arch/x86/acpi/acpi_cpu_md.c: revision 1.72 Disable C1E also on K8, if present. From Imre Vadasz i...@vdsz.com in PR install/47224. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.71.8.1 src/sys/arch/x86/acpi/acpi_cpu_md.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/acpi/acpi_cpu_md.c diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.71 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.71.8.1 --- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.71 Sat Feb 11 22:09:47 2012 +++ src/sys/arch/x86/acpi/acpi_cpu_md.c Thu Dec 13 23:42:16 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_md.c,v 1.71 2012/02/11 22:09:47 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_md.c,v 1.71.8.1 2012/12/13 23:42:16 riz Exp $ */ /*- * Copyright (c) 2010, 2011 Jukka Ruohonen jruoho...@iki.fi @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.71 2012/02/11 22:09:47 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.71.8.1 2012/12/13 23:42:16 riz Exp $); #include sys/param.h #include sys/bus.h @@ -253,6 +253,12 @@ acpicpu_md_flags(void) case 0x0f: /* + * Disable C1E if present. + */ + if (rdmsr_safe(MSR_CMPHALT, msr) != EFAULT) +val |= ACPICPU_FLAG_C_C1E; + + /* * Evaluate support for the FID/VID * algorithm also used by powernow(4). */ @@ -268,6 +274,9 @@ acpicpu_md_flags(void) case 0x10: case 0x11: + /* + * Disable C1E if present. + */ if (rdmsr_safe(MSR_CMPHALT, msr) != EFAULT) val |= ACPICPU_FLAG_C_C1E;
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Thu Dec 13 23:42:29 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Ticket 741. To generate a diff of this commit: cvs rdiff -u -r1.1.2.30 -r1.1.2.31 src/doc/CHANGES-6.0.1 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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.30 src/doc/CHANGES-6.0.1:1.1.2.31 --- src/doc/CHANGES-6.0.1:1.1.2.30 Thu Dec 13 17:43:30 2012 +++ src/doc/CHANGES-6.0.1 Thu Dec 13 23:42:29 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.30 2012/12/13 17:43:30 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.31 2012/12/13 23:42:29 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -243,3 +243,8 @@ external/bsd/bind/dist/bin/named/query.c enabled. [spz, ticket #740] +sys/arch/x86/acpi/acpi_cpu_md.c 1.72 + + Disable C1E on AMD K8 CPUs, to prevent freeze during boot. PR#47224. + [jruoho, ticket #741] +
CVS commit: [netbsd-6] src/sys/compat/netbsd32
Module Name:src
Committed By: riz
Date: Thu Dec 13 23:47:57 UTC 2012
Modified Files:
src/sys/compat/netbsd32 [netbsd-6]: netbsd32.h netbsd32_fs.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #742):
sys/compat/netbsd32/netbsd32.h: revision 1.94
sys/compat/netbsd32/netbsd32_fs.c: revision 1.63
allow mounting ext2fs and msdosfs
while there also enable lfs but that's untested
To generate a diff of this commit:
cvs rdiff -u -r1.92.2.1 -r1.92.2.2 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.62 -r1.62.2.1 src/sys/compat/netbsd32/netbsd32_fs.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/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.92.2.1 src/sys/compat/netbsd32/netbsd32.h:1.92.2.2
--- src/sys/compat/netbsd32/netbsd32.h:1.92.2.1 Thu Apr 12 17:05:37 2012
+++ src/sys/compat/netbsd32/netbsd32.h Thu Dec 13 23:47:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.92.2.1 2012/04/12 17:05:37 riz Exp $ */
+/* $NetBSD: netbsd32.h,v 1.92.2.2 2012/12/13 23:47:57 riz Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -938,6 +938,19 @@ struct netbsd32_nfs_args {
int32_t deadthresh; /* Retrans threshold */
netbsd32_charp hostname; /* server's name */
};
+struct netbsd32_msdosfs_args {
+ netbsd32_charp fspec; /* blocks special holding the fs to mount */
+ struct netbsd32_export_args30 _pad1; /* compat with old userland tools */
+ uid_t uid; /* uid that owns msdosfs files */
+ gid_t gid; /* gid that owns msdosfs files */
+ mode_t mask; /* mask to be applied for msdosfs perms */
+ int flags; /* see below */
+
+ /* Following items added after versioning support */
+ int version; /* version of the struct */
+ mode_t dirmask; /* v2: mask to be applied for msdosfs perms */
+ int gmtoff; /* v3: offset from UTC in seconds */
+};
struct netbsd32_posix_spawn_file_actions_entry {
enum { FAE32_OPEN, FAE32_DUP2, FAE32_CLOSE } fae_action;
Index: src/sys/compat/netbsd32/netbsd32_fs.c
diff -u src/sys/compat/netbsd32/netbsd32_fs.c:1.62 src/sys/compat/netbsd32/netbsd32_fs.c:1.62.2.1
--- src/sys/compat/netbsd32/netbsd32_fs.c:1.62 Wed Jan 25 14:06:07 2012
+++ src/sys/compat/netbsd32/netbsd32_fs.c Thu Dec 13 23:47:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_fs.c,v 1.62 2012/01/25 14:06:07 christos Exp $ */
+/* $NetBSD: netbsd32_fs.c,v 1.62.2.1 2012/12/13 23:47:57 riz Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_fs.c,v 1.62 2012/01/25 14:06:07 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_fs.c,v 1.62.2.1 2012/12/13 23:47:57 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -50,6 +50,8 @@ __KERNEL_RCSID(0, $NetBSD: netbsd32_fs.
#include sys/vfs_syscalls.h
#include fs/cd9660/cd9660_mount.h
+#include fs/msdosfs/bpb.h
+#include fs/msdosfs/msdosfsmount.h
#include ufs/ufs/ufsmount.h
#define NFS_ARGS_ONLY
@@ -774,12 +776,14 @@ netbsd32___mount50(struct lwp *l, const
struct netbsd32_mfs_args mfs_args;
struct netbsd32_iso_args iso_args;
struct netbsd32_nfs_args nfs_args;
+ struct netbsd32_msdosfs_args msdosfs_args;
} fs_args32;
union {
struct ufs_args ufs_args;
struct mfs_args mfs_args;
struct iso_args iso_args;
struct nfs_args nfs_args;
+ struct msdosfs_args msdosfs_args;
} fs_args;
const char *type = SCARG_P32(uap, type);
const char *path = SCARG_P32(uap, path);
@@ -812,7 +816,9 @@ netbsd32___mount50(struct lwp *l, const
data_seg = UIO_SYSSPACE;
data = fs_args.mfs_args;
data_len = sizeof(fs_args.mfs_args);
- } else if (strcmp(mtype, MOUNT_UFS) == 0) {
+ } else if ((strcmp(mtype, MOUNT_UFS) == 0) ||
+ (strcmp(mtype, MOUNT_EXT2FS) == 0) ||
+ (strcmp(mtype, MOUNT_LFS) == 0)) {
if (data_len sizeof(fs_args32.ufs_args))
return EINVAL;
if ((flags MNT_GETARGS) == 0) {
@@ -843,6 +849,36 @@ netbsd32___mount50(struct lwp *l, const
data_seg = UIO_SYSSPACE;
data = fs_args.iso_args;
data_len = sizeof(fs_args.iso_args);
+ } else if (strcmp(mtype, MOUNT_MSDOS) == 0) {
+ if (data_len != sizeof(fs_args32.msdosfs_args))
+ return EINVAL;
+ if ((flags MNT_GETARGS) == 0) {
+ error = copyin(data, fs_args32.msdosfs_args,
+ sizeof(fs_args32.msdosfs_args));
+ if (error)
+return error;
+ fs_args.msdosfs_args.fspec =
+ NETBSD32PTR64(fs_args32.msdosfs_args.fspec);
+ memset(fs_args.msdosfs_args._pad1, 0,
+ sizeof(fs_args.msdosfs_args._pad1));
+ fs_args.msdosfs_args.uid =
+ fs_args32.msdosfs_args.uid;
+ fs_args.msdosfs_args.gid =
+ fs_args32.msdosfs_args.gid;
+ fs_args.msdosfs_args.mask =
+ fs_args32.msdosfs_args.mask;
+ fs_args.msdosfs_args.flags =
+ fs_args32.msdosfs_args.flags;
+ fs_args.msdosfs_args.version =
+ fs_args32.msdosfs_args.version;
+
CVS commit: [netbsd-6] src
Module Name:src Committed By: riz Date: Thu Dec 13 23:50:29 UTC 2012 Modified Files: src/distrib/sets/lists/base [netbsd-6]: ad.mips64eb ad.mips64el md.amd64 md.sparc64 src/etc/mtree [netbsd-6]: NetBSD.dist.mips64eb NetBSD.dist.mips64el NetBSD.dist.sparc64 NetBSD.dist.x86_64 src/lib/npf/ext_log [netbsd-6]: Makefile src/lib/npf/ext_normalise [netbsd-6]: Makefile Log Message: Pull up following revision(s) (requested by rmind in ticket #743): distrib/sets/lists/base/md.sparc64: revision 1.170 distrib/sets/lists/base/ad.mips64eb: revision 1.105 etc/mtree/NetBSD.dist.sparc64: revision 1.4 etc/mtree/NetBSD.dist.x86_64: revision 1.4 distrib/sets/lists/base/ad.mips64el: revision 1.105 lib/npf/ext_log/Makefile: revision 1.2 etc/mtree/NetBSD.dist.mips64eb: revision 1.4 distrib/sets/lists/base/md.amd64: revision 1.181 etc/mtree/NetBSD.dist.mips64el: revision 1.5 lib/npf/ext_normalise/Makefile: revision 1.2 Make the compat libs of npf extension shared libraries go to the compat directories instead of overwriting the arch native libs. Also, make sure the compat directories get created. Tested on amd64. To generate a diff of this commit: cvs rdiff -u -r1.82.2.5 -r1.82.2.6 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.81.2.5 -r1.81.2.6 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.156.2.5 -r1.156.2.6 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.147.2.5 -r1.147.2.6 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.3 -r1.3.4.1 src/etc/mtree/NetBSD.dist.mips64eb \ src/etc/mtree/NetBSD.dist.sparc64 src/etc/mtree/NetBSD.dist.x86_64 cvs rdiff -u -r1.4 -r1.4.4.1 src/etc/mtree/NetBSD.dist.mips64el cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/lib/npf/ext_log/Makefile cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/lib/npf/ext_normalise/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/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.82.2.5 src/distrib/sets/lists/base/ad.mips64eb:1.82.2.6 --- src/distrib/sets/lists/base/ad.mips64eb:1.82.2.5 Mon Sep 17 19:00:26 2012 +++ src/distrib/sets/lists/base/ad.mips64eb Thu Dec 13 23:50:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.82.2.5 2012/09/17 19:00:26 riz Exp $ +# $NetBSD: ad.mips64eb,v 1.82.2.6 2012/12/13 23:50:28 riz Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -278,6 +278,13 @@ ./usr/lib/64/lua/5.1base-compat-shlib compat ./usr/lib/64/lua/5.1/gpio.so base-compat-shlib compat,pic ./usr/lib/64/lua/5.1/sqlite.so base-compat-shlib compat,pic +./usr/lib/64/npfbase-npf-shlib compat +./usr/lib/64/npf/ext_log.so base-npf-shlib compat,pic +./usr/lib/64/npf/ext_log.so.0 base-npf-shlib compat,pic +./usr/lib/64/npf/ext_log.so.0.0 base-npf-shlib compat,pic +./usr/lib/64/npf/ext_normalise.so base-npf-shlib compat,pic +./usr/lib/64/npf/ext_normalise.so.0 base-npf-shlib compat,pic +./usr/lib/64/npf/ext_normalise.so.0.0 base-npf-shlib compat,pic ./usr/lib/64/securitybase-compat-shlib ./usr/lib/64/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam ./usr/lib/64/security/pam_chroot.so.3 base-compat-shlib compat,pic,pam @@ -576,6 +583,13 @@ ./usr/lib/o32/lua/5.1base-compat-shlib compat ./usr/lib/o32/lua/5.1/gpio.so base-compat-shlib compat,pic ./usr/lib/o32/lua/5.1/sqlite.so base-compat-shlib compat,pic +./usr/lib/o32/npfbase-npf-shlib compat +./usr/lib/o32/npf/ext_log.so base-npf-shlib compat,pic +./usr/lib/o32/npf/ext_log.so.0 base-npf-shlib compat,pic +./usr/lib/o32/npf/ext_log.so.0.0 base-npf-shlib compat,pic +./usr/lib/o32/npf/ext_normalise.so base-npf-shlib compat,pic +./usr/lib/o32/npf/ext_normalise.so.0 base-npf-shlib compat,pic +./usr/lib/o32/npf/ext_normalise.so.0.0 base-npf-shlib compat,pic ./usr/lib/o32/securitybase-compat-shlib ./usr/lib/o32/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam ./usr/lib/o32/security/pam_chroot.so.3 base-compat-shlib compat,pic,pam Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.81.2.5 src/distrib/sets/lists/base/ad.mips64el:1.81.2.6 --- src/distrib/sets/lists/base/ad.mips64el:1.81.2.5 Mon Sep 17 19:00:26 2012 +++ src/distrib/sets/lists/base/ad.mips64el Thu Dec 13 23:50:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.81.2.5 2012/09/17 19:00:26 riz Exp $ +# $NetBSD: ad.mips64el,v 1.81.2.6 2012/12/13 23:50:28 riz Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -278,6 +278,13 @@ ./usr/lib/64/lua/5.1base-compat-shlib compat ./usr/lib/64/lua/5.1/gpio.so
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Thu Dec 13 23:51:40 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 741-743 To generate a diff of this commit: cvs rdiff -u -r1.1.2.57 -r1.1.2.58 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.57 src/doc/CHANGES-6.1:1.1.2.58 --- src/doc/CHANGES-6.1:1.1.2.57 Thu Dec 13 17:38:55 2012 +++ src/doc/CHANGES-6.1 Thu Dec 13 23:51:40 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.57 2012/12/13 17:38:55 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.58 2012/12/13 23:51:40 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -7149,3 +7149,30 @@ xsrc/external/mit/xf86-video-nv/dist/src Make xf86-video-nv work out of the box on macppc. [macallan, ticket #739] +sys/arch/x86/acpi/acpi_cpu_md.c 1.72 + + Disable C1E on AMD K8 CPUs, to prevent freeze during boot. PR#47224. + [jruoho, ticket #741] + +sys/compat/netbsd32/netbsd32.h 1.94 +sys/compat/netbsd32/netbsd32_fs.c 1.63 + + Allow mounting ext2fs and msdosfs in 32-bit compat code. + [bouyer, ticket #742] + +distrib/sets/lists/base/ad.mips64eb 1.105 +distrib/sets/lists/base/ad.mips64el 1.105 +distrib/sets/lists/base/md.amd64 1.181 +distrib/sets/lists/base/md.sparc64 1.170 +etc/mtree/NetBSD.dist.mips64eb 1.4 +etc/mtree/NetBSD.dist.mips64el 1.5 +etc/mtree/NetBSD.dist.sparc64 1.4 +etc/mtree/NetBSD.dist.x86_64 1.4 +lib/npf/ext_log/Makefile 1.2 +lib/npf/ext_normalise/Makefile 1.2 + + Make the compat libs of npf extension shared libraries go to the + compat directories instead of overwriting the arch native libs. + Also, make sure the compat directories get created. + [rmind, ticket #743] +
CVS commit: [netbsd-6-0] src
Module Name:src Committed By: riz Date: Mon Dec 10 18:26:01 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 src/sys/dev/acpi [netbsd-6-0]: acpi_pci_link.c Log Message: Back out ticket #682; it's causing some systems to fail to boot. To generate a diff of this commit: cvs rdiff -u -r1.1.2.26 -r1.1.2.27 src/doc/CHANGES-6.0.1 cvs rdiff -u -r1.18.20.1 -r1.18.20.2 src/sys/dev/acpi/acpi_pci_link.c 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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.26 src/doc/CHANGES-6.0.1:1.1.2.27 --- src/doc/CHANGES-6.0.1:1.1.2.26 Fri Nov 30 06:32:31 2012 +++ src/doc/CHANGES-6.0.1 Mon Dec 10 18:26:01 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.26 2012/11/30 06:32:31 msaitoh Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.27 2012/12/10 18:26:01 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -146,11 +146,6 @@ share/zoneinfo/southamerica patch Various fixes to documentation and commentary. [apb, ticket #677] -sys/dev/acpi/acpi_pci_link.c 1.19 - - Fix PCI interrupts on some systems. - [chs, ticket #682] - sys/dev/ic/ciss.c1.28 ciss(4): don't try to handle sensors if there aren't any. Index: src/sys/dev/acpi/acpi_pci_link.c diff -u src/sys/dev/acpi/acpi_pci_link.c:1.18.20.1 src/sys/dev/acpi/acpi_pci_link.c:1.18.20.2 --- src/sys/dev/acpi/acpi_pci_link.c:1.18.20.1 Thu Nov 22 00:34:44 2012 +++ src/sys/dev/acpi/acpi_pci_link.c Mon Dec 10 18:26:01 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_pci_link.c,v 1.18.20.1 2012/11/22 00:34:44 riz Exp $ */ +/* $NetBSD: acpi_pci_link.c,v 1.18.20.2 2012/12/10 18:26:01 riz Exp $ */ /*- * Copyright (c) 2002 Mitsuru IWASAKI iwas...@jp.freebsd.org @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_pci_link.c,v 1.18.20.1 2012/11/22 00:34:44 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_pci_link.c,v 1.18.20.2 2012/12/10 18:26:01 riz Exp $); #include sys/param.h #include sys/malloc.h @@ -533,11 +533,13 @@ acpi_pci_link_attach(struct acpi_pci_lin * run _DIS (i.e., the method doesn't exist), assume the initial * IRQ was routed by the BIOS. */ +#if 0 /* XXX causes spontaneaous resets on some systems. Disabled for now. */ if (ACPI_SUCCESS(AcpiEvaluateObject(sc-pl_handle, _DIS, NULL, NULL))) for (i = 0; i sc-pl_num_links; i++) sc-pl_links[i].l_irq = PCI_INVALID_IRQ; else +#endif for (i = 0; i sc-pl_num_links; i++) if (PCI_INTERRUPT_VALID(sc-pl_links[i].l_irq)) sc-pl_links[i].l_routed = TRUE;
CVS commit: [netbsd-6] src
Module Name:src Committed By: riz Date: Mon Dec 10 18:27:01 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 src/sys/dev/acpi [netbsd-6]: acpi_pci_link.c Log Message: Back out ticket #682; it's causing some systems to fail to boot. To generate a diff of this commit: cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-6.1 cvs rdiff -u -r1.18.14.1 -r1.18.14.2 src/sys/dev/acpi/acpi_pci_link.c 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.53 src/doc/CHANGES-6.1:1.1.2.54 --- src/doc/CHANGES-6.1:1.1.2.53 Mon Dec 3 04:54:49 2012 +++ src/doc/CHANGES-6.1 Mon Dec 10 18:27:00 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.53 2012/12/03 04:54:49 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.54 2012/12/10 18:27:00 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -789,11 +789,6 @@ sys/dev/ic/dp8390reg.h1.9 This driver is based on the MI dp8390 backend. [phx, ticket #681] -sys/dev/acpi/acpi_pci_link.c 1.19 - - Fix PCI interrupts on some systems. - [chs, ticket #682] - sys/arch/ia64/acpi/acpi_machdep.c 1.6 sys/arch/ia64/include/acpi_machdep.h 1.6 sys/arch/x86/acpi/acpi_machdep.c 1.4 Index: src/sys/dev/acpi/acpi_pci_link.c diff -u src/sys/dev/acpi/acpi_pci_link.c:1.18.14.1 src/sys/dev/acpi/acpi_pci_link.c:1.18.14.2 --- src/sys/dev/acpi/acpi_pci_link.c:1.18.14.1 Thu Nov 22 00:34:25 2012 +++ src/sys/dev/acpi/acpi_pci_link.c Mon Dec 10 18:27:01 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_pci_link.c,v 1.18.14.1 2012/11/22 00:34:25 riz Exp $ */ +/* $NetBSD: acpi_pci_link.c,v 1.18.14.2 2012/12/10 18:27:01 riz Exp $ */ /*- * Copyright (c) 2002 Mitsuru IWASAKI iwas...@jp.freebsd.org @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_pci_link.c,v 1.18.14.1 2012/11/22 00:34:25 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_pci_link.c,v 1.18.14.2 2012/12/10 18:27:01 riz Exp $); #include sys/param.h #include sys/malloc.h @@ -533,11 +533,13 @@ acpi_pci_link_attach(struct acpi_pci_lin * run _DIS (i.e., the method doesn't exist), assume the initial * IRQ was routed by the BIOS. */ +#if 0 /* XXX causes spontaneaous resets on some systems. Disabled for now. */ if (ACPI_SUCCESS(AcpiEvaluateObject(sc-pl_handle, _DIS, NULL, NULL))) for (i = 0; i sc-pl_num_links; i++) sc-pl_links[i].l_irq = PCI_INVALID_IRQ; else +#endif for (i = 0; i sc-pl_num_links; i++) if (PCI_INTERRUPT_VALID(sc-pl_links[i].l_irq)) sc-pl_links[i].l_routed = TRUE;
CVS commit: [netbsd-6] src/sys/fs/smbfs
Module Name:src
Committed By: riz
Date: Mon Dec 10 21:12:51 UTC 2012
Modified Files:
src/sys/fs/smbfs [netbsd-6]: smbfs_node.c smbfs_node.h smbfs_vnops.c
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #731):
sys/fs/smbfs/smbfs_node.h: revision 1.13
sys/fs/smbfs/smbfs_node.c: revision 1.48
sys/fs/smbfs/smbfs_node.c: revision 1.49
sys/fs/smbfs/smbfs_vnops.c: revision 1.83
sys/fs/smbfs/smbfs_vnops.c: revision 1.84
Various fixes for smbfs:
- Implement NGONE to fix caching issue described in PR kern/25070.
Mostly taken from FreeBSD r125637.
- Revert revision 1.70 of smbfs_vnops.c to fix setattr to opened
direcotry. In case of SMB_CAP_NT_SMBS, NOPEN is set after
smbfs_smb_ntcreatex() call. If NOPEN is set in front, it will
immediately return by condition at do_open label.
- In smbfs_close(), call smbfs_smb_close() and drop NOPEN bit in
the case of direcotry. Otherwise smbfs_rmdir() fails when the
directory was opened.
- Remove redundant vput() before vgone().
- Avoid unnecessary mutex_exit() in smbfs_node_alloc().
- Set NGONE bit to from-name vnode to invalidate the smbnode cache.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.47.8.1 src/sys/fs/smbfs/smbfs_node.c
cvs rdiff -u -r1.12 -r1.12.94.1 src/sys/fs/smbfs/smbfs_node.h
cvs rdiff -u -r1.78.2.1 -r1.78.2.2 src/sys/fs/smbfs/smbfs_vnops.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/fs/smbfs/smbfs_node.c
diff -u src/sys/fs/smbfs/smbfs_node.c:1.47 src/sys/fs/smbfs/smbfs_node.c:1.47.8.1
--- src/sys/fs/smbfs/smbfs_node.c:1.47 Sun Jun 12 03:35:54 2011
+++ src/sys/fs/smbfs/smbfs_node.c Mon Dec 10 21:12:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_node.c,v 1.47 2011/06/12 03:35:54 rmind Exp $ */
+/* $NetBSD: smbfs_node.c,v 1.47.8.1 2012/12/10 21:12:51 riz Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smbfs_node.c,v 1.47 2011/06/12 03:35:54 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: smbfs_node.c,v 1.47.8.1 2012/12/10 21:12:51 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -96,6 +96,7 @@ static int
smbfs_node_alloc(struct mount *mp, struct vnode *dvp,
const char *name, int nmlen, struct smbfattr *fap, struct vnode **vpp)
{
+ struct vattr vattr;
struct smbmount *smp = VFSTOSMBFS(mp);
struct smbnode_hashhead *nhpp;
struct smbnode *np, *np2, *dnp;
@@ -139,11 +140,26 @@ retry:
mutex_exit(smp-sm_hashlock);
if (vget(vp, LK_EXCLUSIVE) != 0)
goto retry;
+ /* Force cached attributes to be refreshed if stale. */
+ (void)VOP_GETATTR(vp, vattr, curlwp-l_cred);
+ /*
+ * If the file type on the server is inconsistent with
+ * what it was when we created the vnode, kill the
+ * bogus vnode now and fall through to the code below
+ * to create a new one with the right type.
+ */
+ if ((vp-v_type == VDIR (np-n_dosattr SMB_FA_DIR) == 0) ||
+ (vp-v_type == VREG (np-n_dosattr SMB_FA_DIR) != 0)) {
+ VOP_UNLOCK(vp);
+ vgone(vp);
+ goto allocnew;
+ }
*vpp = vp;
return (0);
}
mutex_exit(smp-sm_hashlock);
+allocnew:
/*
* If we don't have node attributes, then it is an explicit lookup
* for an existing vnode.
@@ -307,10 +323,9 @@ smbfs_inactive(void *v)
np-n_flag = ~NOPEN;
smbfs_attr_cacheremove(vp);
}
+ *ap-a_recycle = ((np-n_flag NGONE) != 0);
VOP_UNLOCK(vp);
- *ap-a_recycle = false; /* XXX: should set the value properly */
-
return (0);
}
/*
Index: src/sys/fs/smbfs/smbfs_node.h
diff -u src/sys/fs/smbfs/smbfs_node.h:1.12 src/sys/fs/smbfs/smbfs_node.h:1.12.94.1
--- src/sys/fs/smbfs/smbfs_node.h:1.12 Thu Nov 2 17:34:21 2006
+++ src/sys/fs/smbfs/smbfs_node.h Mon Dec 10 21:12:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_node.h,v 1.12 2006/11/02 17:34:21 jmmv Exp $ */
+/* $NetBSD: smbfs_node.h,v 1.12.94.1 2012/12/10 21:12:51 riz Exp $ */
/*
* Copyright (c) 2000-2001, Boris Popov
@@ -48,6 +48,7 @@
/*efine NNEW 0x0008*//* smb/vnode has been allocated */
#define NREFPARENT 0x0010 /* node holds parent from recycling */
#define NOPEN 0x2000 /* file is open */
+#define NGONE 0x4000 /* file has been removed/renamed */
#define SMBFS_ATTRTIMO 5 /* Attribute cache timeout in sec */
Index: src/sys/fs/smbfs/smbfs_vnops.c
diff -u src/sys/fs/smbfs/smbfs_vnops.c:1.78.2.1 src/sys/fs/smbfs/smbfs_vnops.c:1.78.2.2
--- src/sys/fs/smbfs/smbfs_vnops.c:1.78.2.1 Sun Aug 12 12:59:51 2012
+++ src/sys/fs/smbfs/smbfs_vnops.c Mon Dec 10 21:12:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_vnops.c,v 1.78.2.1 2012/08/12 12:59:51 martin Exp $ */
+/* $NetBSD: smbfs_vnops.c,v 1.78.2.2 2012/12/10 21:12:51 riz Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smbfs_vnops.c,v 1.78.2.1 2012/08/12 12:59:51 martin Exp $);
CVS commit: [netbsd-6] src/sys
Module Name:src
Committed By: riz
Date: Mon Dec 10 21:16:25 UTC 2012
Modified Files:
src/sys/fs/smbfs [netbsd-6]: smbfs_smb.c smbfs_subr.c smbfs_subr.h
smbfs_vnops.c
src/sys/netsmb [netbsd-6]: smb.h
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #732):
sys/netsmb/smb.h: revision 1.20
sys/fs/smbfs/smbfs_vnops.c: revision 1.85
sys/fs/smbfs/smbfs_subr.c: revision 1.16
sys/fs/smbfs/smbfs_smb.c: revision 1.44
sys/fs/smbfs/smbfs_subr.h: revision 1.21
Improve smbfs timestamp handling.
Don't round timestamp to 2 seconds resolution if the server
supports the CAP_INFOLEVEL_PASSTHRU capability.
To generate a diff of this commit:
cvs rdiff -u -r1.42.8.1 -r1.42.8.2 src/sys/fs/smbfs/smbfs_smb.c
cvs rdiff -u -r1.15 -r1.15.8.1 src/sys/fs/smbfs/smbfs_subr.c
cvs rdiff -u -r1.20 -r1.20.18.1 src/sys/fs/smbfs/smbfs_subr.h
cvs rdiff -u -r1.78.2.2 -r1.78.2.3 src/sys/fs/smbfs/smbfs_vnops.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/netsmb/smb.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/fs/smbfs/smbfs_smb.c
diff -u src/sys/fs/smbfs/smbfs_smb.c:1.42.8.1 src/sys/fs/smbfs/smbfs_smb.c:1.42.8.2
--- src/sys/fs/smbfs/smbfs_smb.c:1.42.8.1 Thu Nov 29 00:04:37 2012
+++ src/sys/fs/smbfs/smbfs_smb.c Mon Dec 10 21:16:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_smb.c,v 1.42.8.1 2012/11/29 00:04:37 riz Exp $ */
+/* $NetBSD: smbfs_smb.c,v 1.42.8.2 2012/12/10 21:16:25 riz Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.42.8.1 2012/11/29 00:04:37 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.42.8.2 2012/12/10 21:16:25 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -430,7 +430,6 @@ smbfs_smb_setptime2(struct smbnode *np,
/*
* NT level. Specially for win9x
*/
-#if 0
int
smbfs_smb_setpattrNT(struct smbnode *np, u_short attr, struct timespec *mtime,
struct timespec *atime, struct smb_cred *scred)
@@ -442,13 +441,22 @@ smbfs_smb_setpattrNT(struct smbnode *np,
int64_t tm;
int error, tzoff;
+ /*
+ * SMB_SET_FILE_BASIC_INFO isn't supported for
+ * SMB_TRANS2_SET_PATH_INFORMATION,
+ * so use SMB_SET_FILE_BASIC_INFORMATION instead,
+ * but it requires SMB_CAP_INFOLEVEL_PASSTHRU capability.
+ */
+ if ((SMB_CAPS(vcp) SMB_CAP_INFOLEVEL_PASSTHRU) == 0)
+ return smbfs_smb_setptime2(np, mtime, atime, attr, scred);
+
error = smb_t2_alloc(SSTOCP(ssp), SMB_TRANS2_SET_PATH_INFORMATION,
scred, t2p);
if (error)
return error;
mbp = t2p-t2_tparam;
mb_init(mbp);
- mb_put_uint16le(mbp, SMB_SET_FILE_BASIC_INFO);
+ mb_put_uint16le(mbp, SMB_SET_FILE_BASIC_INFORMATION);
mb_put_uint32le(mbp, 0); /* MBZ */
error = smbfs_fullpath(mbp, vcp, np, NULL, 0);
if (error) {
@@ -471,13 +479,13 @@ smbfs_smb_setpattrNT(struct smbnode *np,
mb_put_int64le(mbp, tm);
mb_put_int64le(mbp, tm); /* change time */
mb_put_uint32le(mbp, attr); /* attr */
- t2p-t2_maxpcount = 24;
- t2p-t2_maxdcount = 56;
+ mb_put_uint32le(mbp, 0); /* padding */
+ t2p-t2_maxpcount = 2;
+ t2p-t2_maxdcount = 0;
error = smb_t2_request(t2p);
smb_t2_done(t2p);
return error;
}
-#endif
/*
* Set file atime and mtime. Doesn't supported by core dialect.
@@ -560,9 +568,8 @@ smbfs_smb_setfattrNT(struct smbnode *np,
tm = 0;
mb_put_int64le(mbp, tm);
mb_put_int64le(mbp, tm); /* change time */
- mb_put_uint16le(mbp, attr);
- mb_put_uint32le(mbp, 0); /* padding */
- mb_put_uint16le(mbp, 0);
+ mb_put_uint32le(mbp, attr); /* attr */
+ mb_put_uint32le(mbp, 0); /* padding */
t2p-t2_maxpcount = 2;
t2p-t2_maxdcount = 0;
error = smb_t2_request(t2p);
Index: src/sys/fs/smbfs/smbfs_subr.c
diff -u src/sys/fs/smbfs/smbfs_subr.c:1.15 src/sys/fs/smbfs/smbfs_subr.c:1.15.8.1
--- src/sys/fs/smbfs/smbfs_subr.c:1.15 Thu Jun 9 02:59:22 2011
+++ src/sys/fs/smbfs/smbfs_subr.c Mon Dec 10 21:16:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_subr.c,v 1.15 2011/06/09 02:59:22 rmind Exp $ */
+/* $NetBSD: smbfs_subr.c,v 1.15.8.1 2012/12/10 21:16:25 riz Exp $ */
/*
* Copyright (c) 2000-2001, Boris Popov
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smbfs_subr.c,v 1.15 2011/06/09 02:59:22 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: smbfs_subr.c,v 1.15.8.1 2012/12/10 21:16:25 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -145,7 +145,7 @@ smb_time_local2NT(struct timespec *tsp,
u_long seconds;
smb_time_local2server(tsp, 0, seconds);
- *nsec = (((int64_t)(seconds) ~1) + DIFF1970TO1601) * (int64_t)1000;
+ *nsec = ((int64_t)seconds + DIFF1970TO1601) * (int64_t)1000;
}
void
Index: src/sys/fs/smbfs/smbfs_subr.h
diff -u src/sys/fs/smbfs/smbfs_subr.h:1.20 src/sys/fs/smbfs/smbfs_subr.h:1.20.18.1
--- src/sys/fs/smbfs/smbfs_subr.h:1.20 Tue Oct 20 20:55:01 2009
+++
CVS commit: [netbsd-6] src/external/cddl/osnet/include
Module Name:src Committed By: riz Date: Mon Dec 10 21:18:18 UTC 2012 Modified Files: src/external/cddl/osnet/include [netbsd-6]: unistd.h Log Message: Pull up following revision(s) (requested by riastradh in ticket #733): external/cddl/osnet/include/unistd.h: revision 1.5 we have _SC_PHYS_PAGES now To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.8.1 src/external/cddl/osnet/include/unistd.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/cddl/osnet/include/unistd.h diff -u src/external/cddl/osnet/include/unistd.h:1.4 src/external/cddl/osnet/include/unistd.h:1.4.8.1 --- src/external/cddl/osnet/include/unistd.h:1.4 Sun Feb 28 14:45:47 2010 +++ src/external/cddl/osnet/include/unistd.h Mon Dec 10 21:18:18 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: unistd.h,v 1.4 2010/02/28 14:45:47 haad Exp $ */ +/* $NetBSD: unistd.h,v 1.4.8.1 2012/12/10 21:18:18 riz Exp $ */ /* * Copyright (C) 2007 John Birrell j...@freebsd.org @@ -38,6 +38,4 @@ #define ftruncate64 ftruncate #define pread64 pread -#define _SC_PHYS_PAGES 500 - #endif
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon Dec 10 21:19:08 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 731-733 To generate a diff of this commit: cvs rdiff -u -r1.1.2.54 -r1.1.2.55 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.54 src/doc/CHANGES-6.1:1.1.2.55 --- src/doc/CHANGES-6.1:1.1.2.54 Mon Dec 10 18:27:00 2012 +++ src/doc/CHANGES-6.1 Mon Dec 10 21:19:08 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.54 2012/12/10 18:27:00 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.55 2012/12/10 21:19:08 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -7094,3 +7094,25 @@ sys/arch/amd64/conf/XEN3_DOM0 1.91 Add alc* at pci, re-sort slightly to reduce diffs from GENERIC. [riz, ticket #730] + +sys/fs/smbfs/smbfs_node.c 1.48-1.49 via patch +sys/fs/smbfs/smbfs_node.h 1.13 via patch +sys/fs/smbfs/smbfs_vnops.c 1.83-1.84 via patch + + Implement various fixes for smbfs. PR#25070 and others. + [nakayama, ticket #731] + +sys/fs/smbfs/smbfs_smb.c 1.44 +sys/fs/smbfs/smbfs_subr.c 1.16 +sys/fs/smbfs/smbfs_subr.h 1.21 +sys/fs/smbfs/smbfs_vnops.c 1.85 +sys/netsmb/smb.h1.20 + + Improve smbfs timestamp handling. + [nakayama, ticket #732] + +external/cddl/osnet/include/unistd.h 1.5 + + Fix MKDTRACE and MKZFS builds. + [riastradh, ticket #733] +
CVS commit: [netbsd-6] src/lib/libterminfo
Module Name:src
Committed By: riz
Date: Tue Dec 11 04:26:26 UTC 2012
Modified Files:
src/lib/libterminfo [netbsd-6]: tparm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #734):
lib/libterminfo/tparm.c: revision 1.9
Fix off by one error.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.4.1 src/lib/libterminfo/tparm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/tparm.c
diff -u src/lib/libterminfo/tparm.c:1.7 src/lib/libterminfo/tparm.c:1.7.4.1
--- src/lib/libterminfo/tparm.c:1.7 Mon Oct 3 20:13:48 2011
+++ src/lib/libterminfo/tparm.c Tue Dec 11 04:26:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tparm.c,v 1.7 2011/10/03 20:13:48 roy Exp $ */
+/* $NetBSD: tparm.c,v 1.7.4.1 2012/12/11 04:26:26 riz Exp $ */
/*
* Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: tparm.c,v 1.7 2011/10/03 20:13:48 roy Exp $);
+__RCSID($NetBSD: tparm.c,v 1.7.4.1 2012/12/11 04:26:26 riz Exp $);
#include assert.h
#include ctype.h
@@ -56,7 +56,7 @@ typedef struct {
static int
push(int num, char *string, TPSTACK *stack)
{
- if (stack-offset sizeof(stack-nums)) {
+ if (stack-offset = sizeof(stack-nums)) {
errno = E2BIG;
return -1;
}
CVS commit: [netbsd-6-0] src/lib/libterminfo
Module Name:src
Committed By: riz
Date: Tue Dec 11 04:26:49 UTC 2012
Modified Files:
src/lib/libterminfo [netbsd-6-0]: tparm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #734):
lib/libterminfo/tparm.c: revision 1.9
Fix off by one error.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.8.1 src/lib/libterminfo/tparm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/tparm.c
diff -u src/lib/libterminfo/tparm.c:1.7 src/lib/libterminfo/tparm.c:1.7.8.1
--- src/lib/libterminfo/tparm.c:1.7 Mon Oct 3 20:13:48 2011
+++ src/lib/libterminfo/tparm.c Tue Dec 11 04:26:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tparm.c,v 1.7 2011/10/03 20:13:48 roy Exp $ */
+/* $NetBSD: tparm.c,v 1.7.8.1 2012/12/11 04:26:49 riz Exp $ */
/*
* Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: tparm.c,v 1.7 2011/10/03 20:13:48 roy Exp $);
+__RCSID($NetBSD: tparm.c,v 1.7.8.1 2012/12/11 04:26:49 riz Exp $);
#include assert.h
#include ctype.h
@@ -56,7 +56,7 @@ typedef struct {
static int
push(int num, char *string, TPSTACK *stack)
{
- if (stack-offset sizeof(stack-nums)) {
+ if (stack-offset = sizeof(stack-nums)) {
errno = E2BIG;
return -1;
}
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Tue Dec 11 04:27:04 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Ticket 734. To generate a diff of this commit: cvs rdiff -u -r1.1.2.27 -r1.1.2.28 src/doc/CHANGES-6.0.1 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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.27 src/doc/CHANGES-6.0.1:1.1.2.28 --- src/doc/CHANGES-6.0.1:1.1.2.27 Mon Dec 10 18:26:01 2012 +++ src/doc/CHANGES-6.0.1 Tue Dec 11 04:27:04 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.27 2012/12/10 18:26:01 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.28 2012/12/11 04:27:04 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -229,3 +229,8 @@ sys/arch/xen/xenbus/xenbus_xs.c 1.23 Xen Dom0 NetBSD kernel can crash by adding duplicate xenwatches. [royger, ticket #728] +lib/libterminfo/tparm.c1.9 + + Fix off by one error. + [msaitoh, ticket #734] +
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Tue Dec 11 04:31:53 UTC 2012
Modified Files:
src/share/examples/npf [netbsd-6]: host-npf.conf soho_gw-npf.conf
src/sys/net/npf [netbsd-6]: npf_tableset.c
src/usr.sbin/npf/npfctl [netbsd-6]: npf.conf.5 npf_build.c npf_data.c
npf_parse.y npf_scan.l npf_var.h npfctl.h
Log Message:
Pull up following revision(s) (requested by rmind in ticket #736):
usr.sbin/npf/npfctl/npf_parse.y: revision 1.17
sys/net/npf/npf_tableset.c: revision 1.16
usr.sbin/npf/npfctl/npfctl.h: revision 1.23
usr.sbin/npf/npfctl/npf_data.c: revision 1.19
usr.sbin/npf/npfctl/npf_build.c: revision 1.15
share/examples/npf/host-npf.conf: revision 1.3
usr.sbin/npf/npfctl/npf_scan.l: revision 1.9
share/examples/npf/soho_gw-npf.conf: revision 1.3
usr.sbin/npf/npfctl/npf_var.h: revision 1.6
usr.sbin/npf/npfctl/npf.conf.5: revision 1.24
npfctl: extend syntax for extracting interface IP address(es) by the family.
adjust to current npf.conf syntax
npf_table_list: avoid triggering assert on diagnostic.
To generate a diff of this commit:
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/share/examples/npf/host-npf.conf \
src/share/examples/npf/soho_gw-npf.conf
cvs rdiff -u -r1.9.2.6 -r1.9.2.7 src/sys/net/npf/npf_tableset.c
cvs rdiff -u -r1.9.2.4 -r1.9.2.5 src/usr.sbin/npf/npfctl/npf.conf.5
cvs rdiff -u -r1.4.2.7 -r1.4.2.8 src/usr.sbin/npf/npfctl/npf_build.c
cvs rdiff -u -r1.10.2.5 -r1.10.2.6 src/usr.sbin/npf/npfctl/npf_data.c
cvs rdiff -u -r1.3.2.9 -r1.3.2.10 src/usr.sbin/npf/npfctl/npf_parse.y
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/usr.sbin/npf/npfctl/npf_scan.l
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/usr.sbin/npf/npfctl/npf_var.h
cvs rdiff -u -r1.11.2.9 -r1.11.2.10 src/usr.sbin/npf/npfctl/npfctl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/npf/host-npf.conf
diff -u src/share/examples/npf/host-npf.conf:1.2.4.2 src/share/examples/npf/host-npf.conf:1.2.4.3
--- src/share/examples/npf/host-npf.conf:1.2.4.2 Mon Oct 1 20:15:34 2012
+++ src/share/examples/npf/host-npf.conf Tue Dec 11 04:31:53 2012
@@ -1,4 +1,4 @@
-# $NetBSD: host-npf.conf,v 1.2.4.2 2012/10/01 20:15:34 riz Exp $
+# $NetBSD: host-npf.conf,v 1.2.4.3 2012/12/11 04:31:53 riz Exp $
#
# this is an example of NPF rules for a host (i.e., not routing) with
# two network interfaces, wired and wifi
@@ -7,7 +7,12 @@
# it also does IPSEC on the wifi
#
$wired_if = wm0
+$wired_v4 = { inet4(wm0) }
+$wired_v6 = { inet6(wm0) }
+
$wifi_if = iwn0
+$wifi_v4 = { inet4(iwn0) }
+$wifi_v6 = { inet6(iwn0) }
$dhcpserver = { 198.51.100.1 }
@@ -37,38 +42,38 @@ group (name wired, interface $wired_if
pass in final family inet proto icmp all
pass in final family inet proto tcp \
- from $dhcpserver port bootps to $wired_if port bootpc
+ from $dhcpserver port bootps to $wired_v4 port bootpc
pass in final family inet proto udp \
- from $dhcpserver port bootps to $wired_if port bootpc
+ from $dhcpserver port bootps to $wired_v4 port bootpc
- pass in final family inet6 proto tcp to $wired_if port ssh
+ pass in final family inet6 proto tcp to $wired_v6 port ssh
pass in final family inet proto tcp flags S/SA \
- from $backupsrv_v4 to $wired_if port $backup_port
+ from $backupsrv_v4 to $wired_v4 port $backup_port
pass in final family inet proto udp \
- from $backupsrv_v4 to $wired_if port $backup_port
+ from $backupsrv_v4 to $wired_v4 port $backup_port
pass in final family inet6 proto tcp flags S/SA \
- from $backupsrv_v6 to $wired_if port $backup_port
+ from $backupsrv_v6 to $wired_v6 port $backup_port
pass in final family inet6 proto udp \
- from $backupsrv_v6 to $wired_if port $backup_port
+ from $backupsrv_v6 to $wired_v6 port $backup_port
- pass stateful in final family inet6 proto udp to $wired_if \
+ pass stateful in final family inet6 proto udp to $wired_v6 \
port $services_udp
- pass stateful in final family inet proto udp to $wired_if \
+ pass stateful in final family inet proto udp to $wired_v6 \
port $services_udp
# only SYN packets need to generate state
pass stateful out final family inet6 proto tcp flags S/SA \
- from $wired_if apply rid
+ from $wired_v6 apply rid
pass stateful out final family inet proto tcp flags S/SA \
- from $wired_if apply rid
+ from $wired_v4 apply rid
# pass the other tcp packets without generating extra state
- pass out final family inet6 proto tcp from $wired_if apply rid
- pass out final family inet proto tcp from $wired_if apply rid
+ pass out final family inet6 proto tcp from $wired_v6 apply rid
+ pass out final family inet proto tcp from $wired_v4 apply rid
# all other types of traffic, generate state per packet
- pass stateful out final family inet6 from $wired_if apply rid
- pass stateful out final family inet from
CVS commit: [netbsd-6] src/sys/arch/arm/marvell
Module Name:src
Committed By: riz
Date: Tue Dec 11 04:44:03 UTC 2012
Modified Files:
src/sys/arch/arm/marvell [netbsd-6]: mvsoc.c mvsocreg.h
Log Message:
sys/arch/arm/marvell/mvsoc.cpatch
sys/arch/arm/marvell/mvsocreg.h patch
Add CLKGATING_BIT, enable it for some 88F6281 devices, and don't
configure devices if their clock is disabled.
[msaitoh, ticket #737]
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/arch/arm/marvell/mvsoc.c
cvs rdiff -u -r1.2 -r1.2.12.1 src/sys/arch/arm/marvell/mvsocreg.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/arch/arm/marvell/mvsoc.c
diff -u src/sys/arch/arm/marvell/mvsoc.c:1.5 src/sys/arch/arm/marvell/mvsoc.c:1.5.2.1
--- src/sys/arch/arm/marvell/mvsoc.c:1.5 Sun Feb 12 16:34:07 2012
+++ src/sys/arch/arm/marvell/mvsoc.c Tue Dec 11 04:44:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsoc.c,v 1.5 2012/02/12 16:34:07 matt Exp $ */
+/* $NetBSD: mvsoc.c,v 1.5.2.1 2012/12/11 04:44:02 riz Exp $ */
/*
* Copyright (c) 2007, 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mvsoc.c,v 1.5 2012/02/12 16:34:07 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: mvsoc.c,v 1.5.2.1 2012/12/11 04:44:02 riz Exp $);
#include opt_cputypes.h
#include opt_mvsoc.h
@@ -193,6 +193,7 @@ static const struct mvsoc_periph {
int unit;
bus_size_t offset;
int irq;
+ uint32_t clkpwr_bit;
} mvsoc_periphs[] = {
#if defined(ORION)
{ ORION_1(88F1181), mvsoctmr,0, MVSOC_TMR_BASE, IRQ_DEFAULT },
@@ -333,15 +334,23 @@ static const struct mvsoc_periph {
{ KIRKWOOD(88F6281),mvsocrtc,0, KIRKWOOD_RTC_BASE,IRQ_DEFAULT },
{ KIRKWOOD(88F6281),com, 0, MVSOC_COM0_BASE, KIRKWOOD_IRQ_UART0INT },
{ KIRKWOOD(88F6281),com, 1, MVSOC_COM1_BASE, KIRKWOOD_IRQ_UART1INT },
-{ KIRKWOOD(88F6281),ehci,0, KIRKWOOD_USB_BASE,KIRKWOOD_IRQ_USB0CNT },
+{ KIRKWOOD(88F6281),ehci,0, KIRKWOOD_USB_BASE,KIRKWOOD_IRQ_USB0CNT,
+ MVSOC_MLMB_CLKGATING_BIT(3) },
// { KIRKWOOD(88F6281),gtidmac, 0, KIRKWOOD_IDMAC_BASE,? },
{ KIRKWOOD(88F6281),gttwsi, 0, MVSOC_TWSI_BASE, KIRKWOOD_IRQ_TWSI },
-{ KIRKWOOD(88F6281),mvcesa, 0, KIRKWOOD_CESA_BASE,KIRKWOOD_IRQ_SECURITYINT},
-{ KIRKWOOD(88F6281),mvgbec, 0, KIRKWOOD_GBE0_BASE,IRQ_DEFAULT },
-{ KIRKWOOD(88F6281),mvgbec, 1, KIRKWOOD_GBE1_BASE,IRQ_DEFAULT },
-{ KIRKWOOD(88F6281),mvpex, 0, MVSOC_PEX_BASE, KIRKWOOD_IRQ_PEX0INT },
-{ KIRKWOOD(88F6281),mvsata, 0, KIRKWOOD_SATAHC_BASE,KIRKWOOD_IRQ_SATA },
-{ KIRKWOOD(88F6281),mvsdio, 0, KIRKWOOD_SDIO_BASE,KIRKWOOD_IRQ_SDIOINT },
+{ KIRKWOOD(88F6281),mvcesa, 0, KIRKWOOD_CESA_BASE,KIRKWOOD_IRQ_SECURITYINT,
+ MVSOC_MLMB_CLKGATING_BIT(17) },
+{ KIRKWOOD(88F6281),mvgbec, 0, KIRKWOOD_GBE0_BASE,IRQ_DEFAULT,
+ MVSOC_MLMB_CLKGATING_BIT(0) },
+{ KIRKWOOD(88F6281),mvgbec, 1, KIRKWOOD_GBE1_BASE,IRQ_DEFAULT,
+ MVSOC_MLMB_CLKGATING_BIT(19) },
+{ KIRKWOOD(88F6281),mvpex, 0, MVSOC_PEX_BASE, KIRKWOOD_IRQ_PEX0INT,
+ MVSOC_MLMB_CLKGATING_BIT(2) },
+{ KIRKWOOD(88F6281),mvsata, 0, KIRKWOOD_SATAHC_BASE,KIRKWOOD_IRQ_SATA,
+ MVSOC_MLMB_CLKGATING_BIT(14) |
+ MVSOC_MLMB_CLKGATING_BIT(15) },
+{ KIRKWOOD(88F6281),mvsdio, 0, KIRKWOOD_SDIO_BASE,KIRKWOOD_IRQ_SDIOINT,
+ MVSOC_MLMB_CLKGATING_BIT(4) },
#endif
#if defined(MV78XX0)
@@ -381,6 +390,7 @@ mvsoc_attach(device_t parent, device_t s
struct marvell_attach_args mva;
uint16_t model;
uint8_t rev;
+ uint32_t clkpwr, clkpwrbit;
int i;
sc-sc_dev = self;
@@ -420,6 +430,20 @@ mvsoc_attach(device_t parent, device_t s
if (mvsoc_periphs[i].model != model)
continue;
+ /* Skip clock disabled devices */
+ clkpwrbit = mvsoc_periphs[i].clkpwr_bit;
+ if (clkpwrbit != 0) {
+ clkpwr = read_mlmbreg(MVSOC_MLMB_CLKGATING);
+
+ if ((clkpwr clkpwrbit) == 0) {
+aprint_normal(%s: %s%d clock disabled\n,
+device_xname(self),
+mvsoc_periphs[i].name,
+mvsoc_periphs[i].unit);
+continue;
+ }
+ }
+
mva.mva_name = mvsoc_periphs[i].name;
mva.mva_model = model;
mva.mva_revision = rev;
Index: src/sys/arch/arm/marvell/mvsocreg.h
diff -u src/sys/arch/arm/marvell/mvsocreg.h:1.2 src/sys/arch/arm/marvell/mvsocreg.h:1.2.12.1
--- src/sys/arch/arm/marvell/mvsocreg.h:1.2 Tue Feb 1 22:54:24 2011
+++ src/sys/arch/arm/marvell/mvsocreg.h Tue Dec 11 04:44:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsocreg.h,v 1.2 2011/02/01 22:54:24 jakllsch Exp $ */
+/* $NetBSD: mvsocreg.h,v 1.2.12.1 2012/12/11 04:44:03 riz Exp $ */
/*
* Copyright (c) 2007, 2008 KIYOHARA Takashi
* All rights reserved.
@@ -110,6 +110,9 @@
#define MVSOC_MLMB_MLMBICR 0x110 /*Mb-L to Mb Bridge Intr Cause*/
#define MVSOC_MLMB_MLMBIMR 0x114 /*Mb-L to Mb Bridge Intr Mask */
+#define MVSOC_MLMB_CLKGATING 0x11c /* Clock Gating Control
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Tue Dec 11 04:45:02 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 734, 736, 737 To generate a diff of this commit: cvs rdiff -u -r1.1.2.55 -r1.1.2.56 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.55 src/doc/CHANGES-6.1:1.1.2.56 --- src/doc/CHANGES-6.1:1.1.2.55 Mon Dec 10 21:19:08 2012 +++ src/doc/CHANGES-6.1 Tue Dec 11 04:45:01 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.55 2012/12/10 21:19:08 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.56 2012/12/11 04:45:01 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -7116,3 +7116,30 @@ external/cddl/osnet/include/unistd.h 1. Fix MKDTRACE and MKZFS builds. [riastradh, ticket #733] +lib/libterminfo/tparm.c1.9 + + Fix off by one error. + [msaitoh, ticket #734] + +share/examples/npf/host-npf.conf 1.3 +share/examples/npf/soho_gw-npf.conf 1.3 +sys/net/npf/npf_tableset.c 1.16 +usr.sbin/npf/npfctl/npf.conf.5 1.24 +usr.sbin/npf/npfctl/npf_build.c 1.15 +usr.sbin/npf/npfctl/npf_data.c 1.19 +usr.sbin/npf/npfctl/npf_parse.y 1.17 +usr.sbin/npf/npfctl/npf_scan.l 1.9 +usr.sbin/npf/npfctl/npf_var.h 1.6 +usr.sbin/npf/npfctl/npfctl.h 1.23 + + Extend npfctl syntax for extracting interface IP address(es) by + family. Please check your NPF config syntax on upgrade! + [rmind, ticket #736] + +sys/arch/arm/marvell/mvsoc.c patch +sys/arch/arm/marvell/mvsocreg.h patch + + Add CLKGATING_BIT, enable it for some 88F6281 devices, and don't + configure devices if their clock is disabled. + [msaitoh, ticket #737] +
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Sun Dec 2 18:47:37 UTC 2012
Modified Files:
src/doc [netbsd-6]: CHANGES-6.1
src/lib/libpthread [netbsd-6]: pthread_int.h pthread_specific.c
pthread_tsd.c
Log Message:
Back out ticket #724 (libpthread changes) until they can be better
understood, as they broke threaded programs on (at least) i386 and amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.51 -r1.1.2.52 src/doc/CHANGES-6.1
cvs rdiff -u -r1.82.2.1 -r1.82.2.2 src/lib/libpthread/pthread_int.h
cvs rdiff -u -r1.21.22.1 -r1.21.22.2 src/lib/libpthread/pthread_specific.c
cvs rdiff -u -r1.7.24.1 -r1.7.24.2 src/lib/libpthread/pthread_tsd.c
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-6.1
diff -u src/doc/CHANGES-6.1:1.1.2.51 src/doc/CHANGES-6.1:1.1.2.52
--- src/doc/CHANGES-6.1:1.1.2.51 Sun Dec 2 02:06:18 2012
+++ src/doc/CHANGES-6.1 Sun Dec 2 18:47:37 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1,v 1.1.2.51 2012/12/02 02:06:18 riz Exp $
+# $NetBSD: CHANGES-6.1,v 1.1.2.52 2012/12/02 18:47:37 riz Exp $
A complete list of changes from the 6.0 release until the 6.1 release:
@@ -915,7 +915,7 @@ sys/dev/usb/if_urndis.c1.4
lib/libc/arch/arm/sys/__aeabi_read_tp.S 1.3
- Add $NetBSD: CHANGES-6.1,v 1.1.2.51 2012/12/02 02:06:18 riz Exp $ tag. Use ip to save r1 instead of the stack.
+ Add $NetBSD: CHANGES-6.1,v 1.1.2.52 2012/12/02 18:47:37 riz Exp $ tag. Use ip to save r1 instead of the stack.
[matt, ticket #701]
sys/net/npf/npf.c1.14
@@ -7063,15 +7063,6 @@ lib/libc/stdio/fopen.31.29
Add 'x' to the mode bits of fopen() to specify O_EXCL, like glibc.
[christos, ticket #723]
-lib/libpthread/pthread_int.h 1.88
-lib/libpthread/pthread_specific.c 1.24
-lib/libpthread/pthread_tsd.c 1.8-1.10
-
- Replace the simple implementation of pthread_key_{create,destroy}
- and pthread_{g,s}etspecific functions with one that invalidates
- values of keys in other threads when pthread_key_delete() is called.
- [christos, ticket #724]
-
sys/fs/smbfs/smbfs_smb.c 1.43
sys/netsmb/smb_smb.c1.33
Index: src/lib/libpthread/pthread_int.h
diff -u src/lib/libpthread/pthread_int.h:1.82.2.1 src/lib/libpthread/pthread_int.h:1.82.2.2
--- src/lib/libpthread/pthread_int.h:1.82.2.1 Wed Nov 28 23:58:35 2012
+++ src/lib/libpthread/pthread_int.h Sun Dec 2 18:47:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_int.h,v 1.82.2.1 2012/11/28 23:58:35 riz Exp $ */
+/* $NetBSD: pthread_int.h,v 1.82.2.2 2012/12/02 18:47:36 riz Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -145,10 +145,7 @@ struct __pthread_st {
/* Thread-specific data. Large so it sits close to the end. */
int pt_havespecific;
- struct pt_specific {
- void *pts_value;
- PTQ_ENTRY(pt_specific) pts_next;
- } pt_specific[PTHREAD_KEYS_MAX];
+ void *pt_specific[PTHREAD_KEYS_MAX];
/*
* Context for thread creation. At the end as it's cached
@@ -297,7 +294,6 @@ char *pthread__getenv(const char *) PTHR
__dead void pthread__cancelled(void) PTHREAD_HIDE;
void pthread__mutex_deferwake(pthread_t, pthread_mutex_t *) PTHREAD_HIDE;
int pthread__checkpri(int) PTHREAD_HIDE;
-int pthread__add_specific(pthread_t, pthread_key_t, const void *) PTHREAD_HIDE;
#ifndef pthread__smt_pause
#define pthread__smt_pause() /* nothing */
Index: src/lib/libpthread/pthread_specific.c
diff -u src/lib/libpthread/pthread_specific.c:1.21.22.1 src/lib/libpthread/pthread_specific.c:1.21.22.2
--- src/lib/libpthread/pthread_specific.c:1.21.22.1 Wed Nov 28 23:58:35 2012
+++ src/lib/libpthread/pthread_specific.c Sun Dec 2 18:47:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_specific.c,v 1.21.22.1 2012/11/28 23:58:35 riz Exp $ */
+/* $NetBSD: pthread_specific.c,v 1.21.22.2 2012/12/02 18:47:36 riz Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: pthread_specific.c,v 1.21.22.1 2012/11/28 23:58:35 riz Exp $);
+__RCSID($NetBSD: pthread_specific.c,v 1.21.22.2 2012/12/02 18:47:36 riz Exp $);
/* Functions and structures dealing with thread-specific data */
@@ -55,14 +55,18 @@ pthread_setspecific(pthread_key_t key, c
* and return it from functions that are const void *, without
* generating a warning.
*/
- return pthread__add_specific(self, key, value);
+ /*LINTED const cast*/
+ self-pt_specific[key] = (void *) value;
+ self-pt_havespecific = 1;
+
+ return 0;
}
void *
pthread_getspecific(pthread_key_t key)
{
- return pthread__self()-pt_specific[key].pts_value;
+ return pthread__self()-pt_specific[key];
}
unsigned int
Index: src/lib/libpthread/pthread_tsd.c
diff -u src/lib/libpthread/pthread_tsd.c:1.7.24.1 src/lib/libpthread/pthread_tsd.c:1.7.24.2
--- src/lib/libpthread/pthread_tsd.c:1.7.24.1 Wed Nov 28 23:58:35 2012
+++ src/lib/libpthread/pthread_tsd.c Sun
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon Dec 3 04:54:49 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Leave the $$ off so NetBSD tag doesn't get expanded. To generate a diff of this commit: cvs rdiff -u -r1.1.2.52 -r1.1.2.53 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.52 src/doc/CHANGES-6.1:1.1.2.53 --- src/doc/CHANGES-6.1:1.1.2.52 Sun Dec 2 18:47:37 2012 +++ src/doc/CHANGES-6.1 Mon Dec 3 04:54:49 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.52 2012/12/02 18:47:37 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.53 2012/12/03 04:54:49 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -915,7 +915,7 @@ sys/dev/usb/if_urndis.c1.4 lib/libc/arch/arm/sys/__aeabi_read_tp.S 1.3 - Add $NetBSD: CHANGES-6.1,v 1.1.2.52 2012/12/02 18:47:37 riz Exp $ tag. Use ip to save r1 instead of the stack. + Add NetBSD RCSId tag. Use ip to save r1 instead of the stack. [matt, ticket #701] sys/net/npf/npf.c1.14
CVS commit: [netbsd-6] src
Module Name:src Committed By: riz Date: Sun Dec 2 02:06:22 UTC 2012 Modified Files: src/distrib/sets/lists/comp [netbsd-6]: mi src/doc [netbsd-6]: CHANGES-6.1 Log Message: Adjust ticket #693: lzf doesn't get built in netbsd-6, so revision 1.1781 of distrib/sets/lists/comp/mi should not have been pulled up as part of it. To generate a diff of this commit: cvs rdiff -u -r1.1738.2.14 -r1.1738.2.15 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1.2.50 -r1.1.2.51 src/doc/CHANGES-6.1 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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1738.2.14 src/distrib/sets/lists/comp/mi:1.1738.2.15 --- src/distrib/sets/lists/comp/mi:1.1738.2.14 Thu Nov 29 00:09:46 2012 +++ src/distrib/sets/lists/comp/mi Sun Dec 2 02:06:19 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1738.2.14 2012/11/29 00:09:46 riz Exp $ +# $NetBSD: mi,v 1.1738.2.15 2012/12/02 02:06:19 riz Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3718,7 +3718,6 @@ ./usr/libdata/debug/usr/bin/mkfifo.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/mklocale.debug comp-locale-debug debug ./usr/libdata/debug/usr/bin/mkstr.debug comp-c-debug debug -./usr/libdata/debug/usr/bin/lzf.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/mktemp.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/mkubootimage.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/modstat.debug comp-obsolete obsolete Index: src/doc/CHANGES-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.50 src/doc/CHANGES-6.1:1.1.2.51 --- src/doc/CHANGES-6.1:1.1.2.50 Sat Dec 1 09:58:35 2012 +++ src/doc/CHANGES-6.1 Sun Dec 2 02:06:18 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.50 2012/12/01 09:58:35 msaitoh Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.51 2012/12/02 02:06:18 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -599,7 +599,6 @@ distrib/utils/sysinst/util.c 1.180 distrib/sets/lists/base/mi 1.1007,1.1009 distrib/sets/lists/base/shl.mi 1.636 -distrib/sets/lists/comp/mi 1.1781 distrib/sets/lists/comp/shl.mi 1.236 distrib/sets/lists/modules/mi 1.48 distrib/sets/lists/modules/md.evbppc 1.27-1.28 @@ -916,7 +915,7 @@ sys/dev/usb/if_urndis.c1.4 lib/libc/arch/arm/sys/__aeabi_read_tp.S 1.3 - Add $NetBSD: CHANGES-6.1,v 1.1.2.50 2012/12/01 09:58:35 msaitoh Exp $ tag. Use ip to save r1 instead of the stack. + Add $NetBSD: CHANGES-6.1,v 1.1.2.51 2012/12/02 02:06:18 riz Exp $ tag. Use ip to save r1 instead of the stack. [matt, ticket #701] sys/net/npf/npf.c1.14
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: riz Date: Fri Nov 30 18:13:30 UTC 2012 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: Add alc* at pci, re-sort slightly to reduce diffs from GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/arch/amd64/conf/XEN3_DOM0 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/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.90 src/sys/arch/amd64/conf/XEN3_DOM0:1.91 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.90 Wed Oct 17 14:48:08 2012 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Fri Nov 30 18:13:30 2012 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.90 2012/10/17 14:48:08 apb Exp $ +# $NetBSD: XEN3_DOM0,v 1.91 2012/11/30 18:13:30 riz Exp $ include arch/amd64/conf/std.xen @@ -322,8 +322,9 @@ amdpm* at pci? dev ? function ? # RNG an # PCI network interfaces age* at pci? dev ? function ? # Attansic/Atheros L1 Gigabit Ethernet -an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) +alc* at pci? dev ? function ? # Attansic/Atheros L1C/L2C Ethernet ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet +an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet
CVS commit: [netbsd-6] src
Module Name:src Committed By: riz Date: Wed Nov 28 21:35:01 UTC 2012 Modified Files: src/distrib/sets/lists/base [netbsd-6]: mi src/distrib/sets/lists/comp [netbsd-6]: mi src/distrib/sets/lists/man [netbsd-6]: mi src/usr.bin [netbsd-6]: Makefile Added Files: src/usr.bin/flock [netbsd-6]: Makefile flock.1 flock.c Log Message: Pull up following revision(s) (requested by christos in ticket #719): distrib/sets/lists/base/mi: revision 1.1011 usr.bin/flock/Makefile: revision 1.1 usr.bin/flock/flock.1: revision 1.1 distrib/sets/lists/man/mi: revision 1.1404 usr.bin/flock/flock.c: revision 1.1 distrib/sets/lists/comp/mi: revision 1.1786 usr.bin/Makefile: revision 1.211 add flock(1) Add an flock program inspired by the linux one with the same name. To generate a diff of this commit: cvs rdiff -u -r1.984.2.11 -r1.984.2.12 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1738.2.12 -r1.1738.2.13 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1379.2.7 -r1.1379.2.8 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.207 -r1.207.2.1 src/usr.bin/Makefile cvs rdiff -u -r0 -r1.1.4.2 src/usr.bin/flock/Makefile cvs rdiff -u -r0 -r1.8.4.2 src/usr.bin/flock/flock.1 cvs rdiff -u -r0 -r1.6.4.2 src/usr.bin/flock/flock.c 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/mi diff -u src/distrib/sets/lists/base/mi:1.984.2.11 src/distrib/sets/lists/base/mi:1.984.2.12 --- src/distrib/sets/lists/base/mi:1.984.2.11 Sun Nov 18 22:38:30 2012 +++ src/distrib/sets/lists/base/mi Wed Nov 28 21:34:30 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.984.2.11 2012/11/18 22:38:30 riz Exp $ +# $NetBSD: mi,v 1.984.2.12 2012/11/28 21:34:30 riz Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -455,6 +455,7 @@ ./usr/bin/fincorebase-util-bin ./usr/bin/find base-util-bin ./usr/bin/fingerbase-util-bin +./usr/bin/flock base-util-bin ./usr/bin/fmt base-util-bin ./usr/bin/fold base-util-bin ./usr/bin/from base-mail-bin Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1738.2.12 src/distrib/sets/lists/comp/mi:1.1738.2.13 --- src/distrib/sets/lists/comp/mi:1.1738.2.12 Tue Nov 20 22:33:37 2012 +++ src/distrib/sets/lists/comp/mi Wed Nov 28 21:34:43 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1738.2.12 2012/11/20 22:33:37 riz Exp $ +# $NetBSD: mi,v 1.1738.2.13 2012/11/28 21:34:43 riz Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3599,6 +3599,7 @@ ./usr/libdata/debug/usr/bin/fincore.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/find.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/finger.debug comp-util-debug debug +./usr/libdata/debug/usr/bin/flock.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/fmt.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/fold.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/fort77.debug comp-fortran-debug gcc=3,gcccmds,debug Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1379.2.7 src/distrib/sets/lists/man/mi:1.1379.2.8 --- src/distrib/sets/lists/man/mi:1.1379.2.7 Fri Jun 15 08:48:47 2012 +++ src/distrib/sets/lists/man/mi Wed Nov 28 21:34:37 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1379.2.7 2012/06/15 08:48:47 sborrill Exp $ +# $NetBSD: mi,v 1.1379.2.8 2012/11/28 21:34:37 riz Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -159,6 +159,7 @@ ./usr/share/man/cat1/fincore.0 man-util-catman .cat ./usr/share/man/cat1/find.0 man-util-catman .cat ./usr/share/man/cat1/finger.0 man-util-catman .cat +./usr/share/man/cat1/flock.0 man-util-catman .cat ./usr/share/man/cat1/fmt.0 man-util-catman .cat ./usr/share/man/cat1/fold.0 man-util-catman .cat ./usr/share/man/cat1/foreach.0 man-util-catman .cat @@ -3111,6 +3112,7 @@ ./usr/share/man/html1/fincore.html man-util-htmlman html ./usr/share/man/html1/find.html man-util-htmlman html ./usr/share/man/html1/finger.html man-util-htmlman html +./usr/share/man/html1/flock.html man-util-htmlman html ./usr/share/man/html1/fmt.html man-util-htmlman html ./usr/share/man/html1/fold.html man-util-htmlman html ./usr/share/man/html1/foreach.html man-util-htmlman html @@ -5680,6 +5682,7 @@ ./usr/share/man/man1/fincore.1 man-util-man .man ./usr/share/man/man1/find.1 man-util-man .man ./usr/share/man/man1/finger.1 man-util-man .man +./usr/share/man/man1/flock.1 man-util-man .man ./usr/share/man/man1/fmt.1 man-util-man .man ./usr/share/man/man1/fold.1 man-util-man .man ./usr/share/man/man1/foreach.1 man-util-man .man Index: src/usr.bin/Makefile diff -u src/usr.bin/Makefile:1.207 src/usr.bin/Makefile:1.207.2.1 --- src/usr.bin/Makefile:1.207 Tue Feb
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Wed Nov 28 21:38:13 UTC 2012
Modified Files:
src/lib/libc/gen [netbsd-6]: sysconf.3 sysconf.c
src/sys/sys [netbsd-6]: unistd.h
Log Message:
Pull up following revision(s) (requested by christos in ticket #720):
sys/sys/unistd.h: revision 1.54
lib/libc/gen/sysconf.3: revision 1.41
lib/libc/gen/sysconf.c: revision 1.35
add _SC_PHYS_PAGES
Add _SC_PHYS_PAGES
Add _SC_PHYS_PAGES
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.4.1 src/lib/libc/gen/sysconf.3
cvs rdiff -u -r1.33.22.1 -r1.33.22.2 src/lib/libc/gen/sysconf.c
cvs rdiff -u -r1.52.18.1 -r1.52.18.2 src/sys/sys/unistd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/sysconf.3
diff -u src/lib/libc/gen/sysconf.3:1.40 src/lib/libc/gen/sysconf.3:1.40.4.1
--- src/lib/libc/gen/sysconf.3:1.40 Tue Aug 23 17:28:34 2011
+++ src/lib/libc/gen/sysconf.3 Wed Nov 28 21:38:12 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: sysconf.3,v 1.40 2011/08/23 17:28:34 jmcneill Exp $
+.\ $NetBSD: sysconf.3,v 1.40.4.1 2012/11/28 21:38:12 riz Exp $
.\
.\ Copyright (c) 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ @(#)sysconf.3 8.3 (Berkeley) 4/19/94
.\
-.Dd August 23, 2011
+.Dd November 2, 2012
.Dt SYSCONF 3
.Os
.Sh NAME
@@ -282,6 +282,10 @@ and
The number of processors configured.
.It Li _SC_NPROCESSORS_ONLN
The number of processors online (capable of running processes).
+.It Li _SC_PHYS_PAGES
+The amount of physical memory on the system in
+.Li _SC_PAGESIZE
+bytes.
.El
.Sh RETURN VALUES
If the call to
Index: src/lib/libc/gen/sysconf.c
diff -u src/lib/libc/gen/sysconf.c:1.33.22.1 src/lib/libc/gen/sysconf.c:1.33.22.2
--- src/lib/libc/gen/sysconf.c:1.33.22.1 Thu Aug 9 06:49:23 2012
+++ src/lib/libc/gen/sysconf.c Wed Nov 28 21:38:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sysconf.c,v 1.33.22.1 2012/08/09 06:49:23 jdc Exp $ */
+/* $NetBSD: sysconf.c,v 1.33.22.2 2012/11/28 21:38:13 riz Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)sysconf.c 8.2 (Berkeley) 3/20/94;
#else
-__RCSID($NetBSD: sysconf.c,v 1.33.22.1 2012/08/09 06:49:23 jdc Exp $);
+__RCSID($NetBSD: sysconf.c,v 1.33.22.2 2012/11/28 21:38:13 riz Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -75,6 +75,7 @@ sysconf(int name)
{
struct rlimit rl;
size_t len;
+ uint64_t mem;
int mib[CTL_MAXNAME], value;
unsigned int mib_len;
struct clockinfo tmpclock;
@@ -367,6 +368,14 @@ yesno: if (sysctl(mib, mib_len, value,
mib[1] = HW_NCPUONLINE;
break;
+/* Linux/Solaris */
+ case _SC_PHYS_PAGES:
+ len = sizeof(mem);
+ mib[0] = CTL_HW;
+ mib[1] = HW_PHYSMEM64;
+ return sysctl(mib, 2, mem, len, NULL, 0) == -1 ? -1 :
+ (long)(mem / _getpagesize());
+
/* Native */
case _SC_SCHED_RT_TS:
if (sysctlgetmibinfo(kern.sched.rtts, mib[0], mib_len,
Index: src/sys/sys/unistd.h
diff -u src/sys/sys/unistd.h:1.52.18.1 src/sys/sys/unistd.h:1.52.18.2
--- src/sys/sys/unistd.h:1.52.18.1 Thu Aug 9 06:49:23 2012
+++ src/sys/sys/unistd.h Wed Nov 28 21:38:12 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: unistd.h,v 1.52.18.1 2012/08/09 06:49:23 jdc Exp $ */
+/* $NetBSD: unistd.h,v 1.52.18.2 2012/11/28 21:38:12 riz Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -306,6 +306,9 @@
/* This is implemented */
#define _SC_SPAWN 86
+/* Extensions found in Solaris and Linux. */
+#define _SC_PHYS_PAGES 121
+
#ifdef _NETBSD_SOURCE
/* Commonly provided sysconf() extensions */
#define _SC_NPROCESSORS_CONF 1001
CVS commit: [netbsd-6] src
Module Name:src Committed By: riz Date: Wed Nov 28 21:41:02 UTC 2012 Modified Files: src/include [netbsd-6]: resolv.h src/sys/netinet [netbsd-6]: ip.h Log Message: Pull up following revision(s) (requested by christos in ticket #721): include/resolv.h: revision 1.40 sys/netinet/ip.h: revision 1.33 sys/netinet/ip.h: revision 1.34 fix typo make this standalone, like every others (except OpenBSD) add netinet/in.h because it is needed for sockaddr_in. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.38.10.1 src/include/resolv.h cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/netinet/ip.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/resolv.h diff -u src/include/resolv.h:1.38 src/include/resolv.h:1.38.10.1 --- src/include/resolv.h:1.38 Sat Oct 24 17:23:34 2009 +++ src/include/resolv.h Wed Nov 28 21:41:01 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: resolv.h,v 1.38 2009/10/24 17:23:34 christos Exp $ */ +/* $NetBSD: resolv.h,v 1.38.10.1 2012/11/28 21:41:01 riz Exp $ */ /* * Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. (ISC) @@ -63,6 +63,7 @@ #include sys/cdefs.h #include sys/socket.h #include stdio.h +#include netinet/in.h #include arpa/nameser.h /*% Index: src/sys/netinet/ip.h diff -u src/sys/netinet/ip.h:1.32 src/sys/netinet/ip.h:1.32.8.1 --- src/sys/netinet/ip.h:1.32 Sun Jul 24 18:06:08 2011 +++ src/sys/netinet/ip.h Wed Nov 28 21:41:01 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ip.h,v 1.32 2011/07/24 18:06:08 christos Exp $ */ +/* $NetBSD: ip.h,v 1.32.8.1 2012/11/28 21:41:01 riz Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -34,6 +34,7 @@ #ifndef _NETINET_IP_H_ #define _NETINET_IP_H_ +#include netinet/in_systm.h /* for n_time */ /* * Definitions for internet protocol version 4. * Per RFC 791, September 1981.
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Wed Nov 28 21:41:40 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 719-721 To generate a diff of this commit: cvs rdiff -u -r1.1.2.45 -r1.1.2.46 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.45 src/doc/CHANGES-6.1:1.1.2.46 --- src/doc/CHANGES-6.1:1.1.2.45 Mon Nov 26 17:40:28 2012 +++ src/doc/CHANGES-6.1 Wed Nov 28 21:41:38 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.45 2012/11/26 17:40:28 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.46 2012/11/28 21:41:38 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -916,7 +916,7 @@ sys/dev/usb/if_urndis.c1.4 lib/libc/arch/arm/sys/__aeabi_read_tp.S 1.3 - Add $NetBSD: CHANGES-6.1,v 1.1.2.45 2012/11/26 17:40:28 riz Exp $ tag. Use ip to save r1 instead of the stack. + Add $NetBSD: CHANGES-6.1,v 1.1.2.46 2012/11/28 21:41:38 riz Exp $ tag. Use ip to save r1 instead of the stack. [matt, ticket #701] sys/net/npf/npf.c1.14 @@ -7027,3 +7027,27 @@ usr.sbin/npf/npfctl/npfctl.h 1.22 via Various NPF fixes to bring it up-to-date. [rmind, ticket #718] +distrib/sets/lists/base/mi 1.1011 +distrib/sets/lists/comp/mi 1.1786 +distrib/sets/lists/man/mi 1.1404 +usr.bin/Makefile1.211 +usr.bin/flock/Makefile1.1 +usr.bin/flock/flock.11.1-1.8 +usr.bin/flock/flock.c1.1-1.6 + + Add flock(1), inspired by the Linux program of the same name. + [christos, ticket #719] + +lib/libc/gen/sysconf.31.41 +lib/libc/gen/sysconf.c1.35 +sys/sys/unistd.h1.54 + + Add _SC_PHYS_PAGES. + [christos, ticket #720] + +include/resolv.h1.40 +sys/netinet/ip.h1.33-1.34 + + Make some include files idempotent. + [christos, ticket #721] +
CVS commit: [netbsd-6] src/lib/libpthread
Module Name:src
Committed By: riz
Date: Wed Nov 28 23:47:38 UTC 2012
Modified Files:
src/lib/libpthread [netbsd-6]: pthread.h pthread_cond.c
pthread_condattr.3
Log Message:
Pull up following revision(s) (requested by christos in ticket #722):
lib/libpthread/pthread_cond.c: revision 1.58
lib/libpthread/pthread_condattr.3: revision 1.8
lib/libpthread/pthread.h: revision 1.35
add pthread_condattr_setclock(3)
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.34.8.1 src/lib/libpthread/pthread.h
cvs rdiff -u -r1.56 -r1.56.8.1 src/lib/libpthread/pthread_cond.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/lib/libpthread/pthread_condattr.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread.h
diff -u src/lib/libpthread/pthread.h:1.34 src/lib/libpthread/pthread.h:1.34.8.1
--- src/lib/libpthread/pthread.h:1.34 Fri Aug 6 05:25:02 2010
+++ src/lib/libpthread/pthread.h Wed Nov 28 23:47:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread.h,v 1.34 2010/08/06 05:25:02 christos Exp $ */
+/* $NetBSD: pthread.h,v 1.34.8.1 2012/11/28 23:47:38 riz Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -112,6 +112,9 @@ int pthread_cond_timedwait(pthread_cond_
int pthread_cond_signal(pthread_cond_t *);
int pthread_cond_broadcast(pthread_cond_t *);
int pthread_condattr_init(pthread_condattr_t *);
+#if defined(_NETBSD_SOURCE)
+int pthread_condattr_setclock(pthread_condattr_t *, clockid_t);
+#endif
int pthread_condattr_destroy(pthread_condattr_t *);
int pthread_once(pthread_once_t *, void (*)(void));
Index: src/lib/libpthread/pthread_cond.c
diff -u src/lib/libpthread/pthread_cond.c:1.56 src/lib/libpthread/pthread_cond.c:1.56.8.1
--- src/lib/libpthread/pthread_cond.c:1.56 Tue Nov 2 20:49:47 2010
+++ src/lib/libpthread/pthread_cond.c Wed Nov 28 23:47:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_cond.c,v 1.56 2010/11/02 20:49:47 skrll Exp $ */
+/* $NetBSD: pthread_cond.c,v 1.56.8.1 2012/11/28 23:47:37 riz Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -46,11 +46,12 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: pthread_cond.c,v 1.56 2010/11/02 20:49:47 skrll Exp $);
+__RCSID($NetBSD: pthread_cond.c,v 1.56.8.1 2012/11/28 23:47:37 riz Exp $);
#include errno.h
#include sys/time.h
#include sys/types.h
+#include stdlib.h
#include pthread.h
#include pthread_int.h
@@ -60,7 +61,7 @@ int _sys___nanosleep50(const struct time
extern int pthread__started;
static int pthread_cond_wait_nothread(pthread_t, pthread_mutex_t *,
-const struct timespec *);
+pthread_cond_t *, const struct timespec *);
int _pthread_cond_has_waiters_np(pthread_cond_t *);
@@ -84,6 +85,14 @@ pthread_cond_init(pthread_cond_t *cond,
pthread_lockinit(cond-ptc_lock);
PTQ_INIT(cond-ptc_waiters);
cond-ptc_mutex = NULL;
+ if (attr attr-ptca_private) {
+ cond-ptc_private = malloc(sizeof(clockid_t));
+ if (cond-ptc_private == NULL)
+ return errno;
+ *(clockid_t *)cond-ptc_private =
+ *(clockid_t *)attr-ptca_private;
+ } else
+ cond-ptc_private = NULL;
return 0;
}
@@ -99,6 +108,7 @@ pthread_cond_destroy(pthread_cond_t *con
cond-ptc_mutex == NULL);
cond-ptc_magic = _PT_COND_DEAD;
+ free(cond-ptc_private);
return 0;
}
@@ -127,7 +137,7 @@ pthread_cond_timedwait(pthread_cond_t *c
/* Just hang out for a while if threads aren't running yet. */
if (__predict_false(pthread__started == 0)) {
- return pthread_cond_wait_nothread(self, mutex, abstime);
+ return pthread_cond_wait_nothread(self, mutex, cond, abstime);
}
if (__predict_false(self-pt_cancel)) {
pthread__cancelled();
@@ -318,11 +328,29 @@ pthread_condattr_init(pthread_condattr_t
{
attr-ptca_magic = _PT_CONDATTR_MAGIC;
+ attr-ptca_private = NULL;
return 0;
}
int
+pthread_condattr_setclock(pthread_condattr_t *attr, clockid_t clck)
+{
+ switch (clck) {
+ case CLOCK_MONOTONIC:
+ case CLOCK_REALTIME:
+ if (attr-ptca_private == NULL)
+ attr-ptca_private = malloc(sizeof(clockid_t));
+ if (attr-ptca_private == NULL)
+ return errno;
+ *(clockid_t *)attr-ptca_private = clck;
+ return 0;
+ default:
+ return EINVAL;
+ }
+}
+
+int
pthread_condattr_destroy(pthread_condattr_t *attr)
{
@@ -330,6 +358,7 @@ pthread_condattr_destroy(pthread_condatt
attr-ptca_magic == _PT_CONDATTR_MAGIC);
attr-ptca_magic = _PT_CONDATTR_DEAD;
+ free(attr-ptca_private);
return 0;
}
@@ -337,7 +366,7 @@ pthread_condattr_destroy(pthread_condatt
/* Utility routine to hang out for a while if threads haven't started yet. */
static int
pthread_cond_wait_nothread(pthread_t self, pthread_mutex_t *mutex,
-const struct timespec *abstime)
+pthread_cond_t *cond, const struct timespec *abstime)
{
struct timespec now, diff;
int retval;
@@ -346,7 +375,9 @@ pthread_cond_wait_nothread(pthread_t sel
diff.tv_sec =
CVS commit: [netbsd-6] src/lib/libc/stdio
Module Name:src
Committed By: riz
Date: Wed Nov 28 23:50:57 UTC 2012
Modified Files:
src/lib/libc/stdio [netbsd-6]: flags.c fopen.3
Log Message:
Pull up following revision(s) (requested by christos in ticket #723):
lib/libc/stdio/flags.c: revision 1.17
lib/libc/stdio/fopen.3: revision 1.29
Add 'x' to the mode bits to specify O_EXCL, like glibc.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.4.1 src/lib/libc/stdio/flags.c
cvs rdiff -u -r1.27 -r1.27.4.1 src/lib/libc/stdio/fopen.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdio/flags.c
diff -u src/lib/libc/stdio/flags.c:1.15 src/lib/libc/stdio/flags.c:1.15.4.1
--- src/lib/libc/stdio/flags.c:1.15 Sun Jun 26 16:42:41 2011
+++ src/lib/libc/stdio/flags.c Wed Nov 28 23:50:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: flags.c,v 1.15 2011/06/26 16:42:41 christos Exp $ */
+/* $NetBSD: flags.c,v 1.15.4.1 2012/11/28 23:50:57 riz Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)flags.c 8.1 (Berkeley) 6/4/93;
#else
-__RCSID($NetBSD: flags.c,v 1.15 2011/06/26 16:42:41 christos Exp $);
+__RCSID($NetBSD: flags.c,v 1.15.4.1 2012/11/28 23:50:57 riz Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -90,6 +90,7 @@ __sflags(const char *mode, int *optr)
* [rwa]\+ or [rwa]b\+ means read and write
* f means open only plain files,
* e means set close on exec.
+ * x means exclusive open.
*/
for (; *mode; mode++)
switch (*mode) {
@@ -103,6 +104,9 @@ __sflags(const char *mode, int *optr)
case 'e':
o |= O_CLOEXEC;
break;
+ case 'x':
+ o |= O_EXCL;
+ break;
case 'b':
break;
default: /* We could produce a warning here */
Index: src/lib/libc/stdio/fopen.3
diff -u src/lib/libc/stdio/fopen.3:1.27 src/lib/libc/stdio/fopen.3:1.27.4.1
--- src/lib/libc/stdio/fopen.3:1.27 Mon Jul 18 05:17:16 2011
+++ src/lib/libc/stdio/fopen.3 Wed Nov 28 23:50:57 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: fopen.3,v 1.27 2011/07/18 05:17:16 jruoho Exp $
+.\ $NetBSD: fopen.3,v 1.27.4.1 2012/11/28 23:50:57 riz Exp $
.\
.\ Copyright (c) 1990, 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -33,7 +33,7 @@
.\
.\ @(#)fopen.3 8.1 (Berkeley) 6/4/93
.\
-.Dd July 18, 2011
+.Dd November 14, 2012
.Dt FOPEN 3
.Os
.Sh NAME
@@ -118,6 +118,12 @@ will fail.
This is a non
.St -ansiC
extension.
+.It Sq x
+The letter
+.Sq x
+in the mode turns on exclusive open mode to the file (
+.Dv O_EXCL )
+which means that the file will not be created if it already exists.
.El
.Pp
Any created files will have mode
CVS commit: [netbsd-6] src/lib/libpthread
Module Name:src
Committed By: riz
Date: Wed Nov 28 23:58:36 UTC 2012
Modified Files:
src/lib/libpthread [netbsd-6]: pthread_int.h pthread_specific.c
pthread_tsd.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #724):
lib/libpthread/pthread_specific.c: revision 1.24
lib/libpthread/pthread_tsd.c: revision 1.10
lib/libpthread/pthread_tsd.c: revision 1.9
lib/libpthread/pthread_int.h: revision 1.88
Replace the simple implementation of pthread_key_{create,destroy}
and pthread_{g,s}etspecific functions, to one that invalidates
values of keys in other threads when pthread_key_delete() is called.
This fixes chromium, which expects pthread_key_delete() to do
cleanup in all threads.
Don't call the destructor in pthread_key_delete() following the standard.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.82.2.1 src/lib/libpthread/pthread_int.h
cvs rdiff -u -r1.21 -r1.21.22.1 src/lib/libpthread/pthread_specific.c
cvs rdiff -u -r1.7 -r1.7.24.1 src/lib/libpthread/pthread_tsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread_int.h
diff -u src/lib/libpthread/pthread_int.h:1.82 src/lib/libpthread/pthread_int.h:1.82.2.1
--- src/lib/libpthread/pthread_int.h:1.82 Tue Jan 17 20:34:57 2012
+++ src/lib/libpthread/pthread_int.h Wed Nov 28 23:58:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_int.h,v 1.82 2012/01/17 20:34:57 joerg Exp $ */
+/* $NetBSD: pthread_int.h,v 1.82.2.1 2012/11/28 23:58:35 riz Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -145,7 +145,10 @@ struct __pthread_st {
/* Thread-specific data. Large so it sits close to the end. */
int pt_havespecific;
- void *pt_specific[PTHREAD_KEYS_MAX];
+ struct pt_specific {
+ void *pts_value;
+ PTQ_ENTRY(pt_specific) pts_next;
+ } pt_specific[PTHREAD_KEYS_MAX];
/*
* Context for thread creation. At the end as it's cached
@@ -294,6 +297,7 @@ char *pthread__getenv(const char *) PTHR
__dead void pthread__cancelled(void) PTHREAD_HIDE;
void pthread__mutex_deferwake(pthread_t, pthread_mutex_t *) PTHREAD_HIDE;
int pthread__checkpri(int) PTHREAD_HIDE;
+int pthread__add_specific(pthread_t, pthread_key_t, const void *) PTHREAD_HIDE;
#ifndef pthread__smt_pause
#define pthread__smt_pause() /* nothing */
Index: src/lib/libpthread/pthread_specific.c
diff -u src/lib/libpthread/pthread_specific.c:1.21 src/lib/libpthread/pthread_specific.c:1.21.22.1
--- src/lib/libpthread/pthread_specific.c:1.21 Mon Jun 23 10:38:39 2008
+++ src/lib/libpthread/pthread_specific.c Wed Nov 28 23:58:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_specific.c,v 1.21 2008/06/23 10:38:39 ad Exp $ */
+/* $NetBSD: pthread_specific.c,v 1.21.22.1 2012/11/28 23:58:35 riz Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: pthread_specific.c,v 1.21 2008/06/23 10:38:39 ad Exp $);
+__RCSID($NetBSD: pthread_specific.c,v 1.21.22.1 2012/11/28 23:58:35 riz Exp $);
/* Functions and structures dealing with thread-specific data */
@@ -55,18 +55,14 @@ pthread_setspecific(pthread_key_t key, c
* and return it from functions that are const void *, without
* generating a warning.
*/
- /*LINTED const cast*/
- self-pt_specific[key] = (void *) value;
- self-pt_havespecific = 1;
-
- return 0;
+ return pthread__add_specific(self, key, value);
}
void *
pthread_getspecific(pthread_key_t key)
{
- return pthread__self()-pt_specific[key];
+ return pthread__self()-pt_specific[key].pts_value;
}
unsigned int
Index: src/lib/libpthread/pthread_tsd.c
diff -u src/lib/libpthread/pthread_tsd.c:1.7 src/lib/libpthread/pthread_tsd.c:1.7.24.1
--- src/lib/libpthread/pthread_tsd.c:1.7 Mon Apr 28 20:23:01 2008
+++ src/lib/libpthread/pthread_tsd.c Wed Nov 28 23:58:35 2012
@@ -1,11 +1,11 @@
-/* $NetBSD: pthread_tsd.c,v 1.7 2008/04/28 20:23:01 martin Exp $ */
+/* $NetBSD: pthread_tsd.c,v 1.7.24.1 2012/11/28 23:58:35 riz Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
- * by Nathan J. Williams, and by Andrew Doran.
+ * by Nathan J. Williams, by Andrew Doran, and by Christos Zoulas.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: pthread_tsd.c,v 1.7 2008/04/28 20:23:01 martin Exp $);
+__RCSID($NetBSD: pthread_tsd.c,v 1.7.24.1 2012/11/28 23:58:35 riz Exp $);
/* Functions and structures dealing with thread-specific data */
#include errno.h
@@ -38,14 +38,23 @@ __RCSID($NetBSD: pthread_tsd.c,v 1.7 20
#include pthread.h
#include pthread_int.h
+
static pthread_mutex_t
CVS commit: [netbsd-6] src/doc
Module Name:src
Committed By: riz
Date: Thu Nov 29 00:00:03 UTC 2012
Modified Files:
src/doc [netbsd-6]: CHANGES-6.1
Log Message:
Tickets 722-724
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.46 -r1.1.2.47 src/doc/CHANGES-6.1
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-6.1
diff -u src/doc/CHANGES-6.1:1.1.2.46 src/doc/CHANGES-6.1:1.1.2.47
--- src/doc/CHANGES-6.1:1.1.2.46 Wed Nov 28 21:41:38 2012
+++ src/doc/CHANGES-6.1 Thu Nov 29 00:00:02 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1,v 1.1.2.46 2012/11/28 21:41:38 riz Exp $
+# $NetBSD: CHANGES-6.1,v 1.1.2.47 2012/11/29 00:00:02 riz Exp $
A complete list of changes from the 6.0 release until the 6.1 release:
@@ -916,7 +916,7 @@ sys/dev/usb/if_urndis.c1.4
lib/libc/arch/arm/sys/__aeabi_read_tp.S 1.3
- Add $NetBSD: CHANGES-6.1,v 1.1.2.46 2012/11/28 21:41:38 riz Exp $ tag. Use ip to save r1 instead of the stack.
+ Add $NetBSD: CHANGES-6.1,v 1.1.2.47 2012/11/29 00:00:02 riz Exp $ tag. Use ip to save r1 instead of the stack.
[matt, ticket #701]
sys/net/npf/npf.c1.14
@@ -7051,3 +7051,25 @@ sys/netinet/ip.h1.33-1.34
Make some include files idempotent.
[christos, ticket #721]
+lib/libpthread/pthread.h 1.35
+lib/libpthread/pthread_cond.c 1.58
+lib/libpthread/pthread_condattr.3 1.8
+
+ Add pthread_condattr_setclock(3) function.
+ [christos, ticket #722]
+
+lib/libc/stdio/flags.c1.17
+lib/libc/stdio/fopen.31.29
+
+ Add 'x' to the mode bits of fopen() to specify O_EXCL, like glibc.
+ [christos, ticket #723]
+
+lib/libpthread/pthread_int.h 1.88
+lib/libpthread/pthread_specific.c 1.24
+lib/libpthread/pthread_tsd.c 1.8-1.10
+
+ Replace the simple implementation of pthread_key_{create,destroy}
+ and pthread_{g,s}etspecific functions with one that invalidates
+ values of keys in other threads when pthread_key_delete() is called.
+ [christos, ticket #724]
+
CVS commit: [netbsd-6-0] src/sys
Module Name:src Committed By: riz Date: Thu Nov 29 00:02:22 UTC 2012 Modified Files: src/sys/fs/smbfs [netbsd-6-0]: smbfs_smb.c src/sys/netsmb [netbsd-6-0]: smb_smb.c Log Message: Pull up following revision(s) (requested by nakayama in ticket #725): sys/fs/smbfs/smbfs_smb.c: revision 1.43 sys/netsmb/smb_smb.c: revision 1.33 - fix endian cofusion around FID, which is used as is, so no need to do byte swapping. - put right value to ByteCount of SMB_COM_NT_CREATE_ANDX request. The fix makes smbfs actually works on big-endian port. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.42.14.1 src/sys/fs/smbfs/smbfs_smb.c cvs rdiff -u -r1.32 -r1.32.24.1 src/sys/netsmb/smb_smb.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/fs/smbfs/smbfs_smb.c diff -u src/sys/fs/smbfs/smbfs_smb.c:1.42 src/sys/fs/smbfs/smbfs_smb.c:1.42.14.1 --- src/sys/fs/smbfs/smbfs_smb.c:1.42 Tue Sep 27 02:05:10 2011 +++ src/sys/fs/smbfs/smbfs_smb.c Thu Nov 29 00:02:22 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: smbfs_smb.c,v 1.42 2011/09/27 02:05:10 christos Exp $ */ +/* $NetBSD: smbfs_smb.c,v 1.42.14.1 2012/11/29 00:02:22 riz Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.42 2011/09/27 02:05:10 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.42.14.1 2012/11/29 00:02:22 riz Exp $); #include sys/param.h #include sys/systm.h @@ -689,7 +689,7 @@ smbfs_smb_create(struct smbnode *dnp, co smb_rq_getreply(rqp, mdp); md_get_uint8(mdp, wc); if (wc == 1) -md_get_uint16le(mdp, fid); +md_get_uint16(mdp, fid); else error = EBADRPC; } @@ -1422,8 +1422,6 @@ smbfs_smb_ntcreatex(struct smbnode *np, mb_put_uint8(mbp, 0); /* Security tracking mode flags */ smb_rq_wend(rqp); smb_rq_bstart(rqp); - smb_rq_bend(rqp); - mbp-mb_count = 0; error = smbfs_fullpath(mbp, SSTOVC(ssp), np, NULL, 0); if (error) @@ -1435,6 +1433,7 @@ smbfs_smb_ntcreatex(struct smbnode *np, flen = mbp-mb_count; SMBRQ_PUTLE16(nmlen, flen); + smb_rq_bend(rqp); error = smb_rq_simple(rqp); if (error) goto bad; Index: src/sys/netsmb/smb_smb.c diff -u src/sys/netsmb/smb_smb.c:1.32 src/sys/netsmb/smb_smb.c:1.32.24.1 --- src/sys/netsmb/smb_smb.c:1.32 Sun Oct 18 23:20:31 2009 +++ src/sys/netsmb/smb_smb.c Thu Nov 29 00:02:22 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: smb_smb.c,v 1.32 2009/10/18 23:20:31 tron Exp $ */ +/* $NetBSD: smb_smb.c,v 1.32.24.1 2012/11/29 00:02:22 riz Exp $ */ /* * Copyright (c) 2000-2001 Boris Popov @@ -38,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.32 2009/10/18 23:20:31 tron Exp $); +__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.32.24.1 2012/11/29 00:02:22 riz Exp $); #include sys/param.h #include sys/systm.h @@ -175,7 +175,7 @@ smb_smb_negotiate(struct smb_vc *vcp, st SMBERROR((Unexpected length of security blob (%d)\n, sblen)); break; } -error = md_get_uint16(mdp, bc); +error = md_get_uint16le(mdp, bc); if (error) break; if (sp-sv_caps SMB_CAP_EXT_SECURITY) @@ -210,7 +210,7 @@ smb_smb_negotiate(struct smb_vc *vcp, st if (swlen SMB_MAXCHALLENGELEN) break; md_get_uint16(mdp, NULL); /* mbz */ -if (md_get_uint16(mdp, bc) != 0) +if (md_get_uint16le(mdp, bc) != 0) break; if (bc swlen) break;
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Thu Nov 29 00:04:02 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Remove duplicate entries for ticket 706. To generate a diff of this commit: cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/doc/CHANGES-6.0.1 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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.23 src/doc/CHANGES-6.0.1:1.1.2.24 --- src/doc/CHANGES-6.0.1:1.1.2.23 Sun Nov 25 10:13:52 2012 +++ src/doc/CHANGES-6.0.1 Thu Nov 29 00:04:02 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.23 2012/11/25 10:13:52 jdc Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.24 2012/11/29 00:04:02 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -224,10 +224,3 @@ distrib/utils/sysinst/disks.c 1.127 install-image on a USB stick. PR#47195. [tsutsui, ticket #706] -distrib/utils/sysinst/disks.c 1.127 - Don't show a disk which is mounted as root partition in the - Available disks list during sysinst procedure to prevent - users from shooting their foot in case of installation using - install-image on a USB stick. PR#47195. - [tsutsui, ticket #706] -
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Thu Nov 29 00:04:19 UTC 2012 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 Log Message: Ticket 725. To generate a diff of this commit: cvs rdiff -u -r1.1.2.24 -r1.1.2.25 src/doc/CHANGES-6.0.1 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-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.24 src/doc/CHANGES-6.0.1:1.1.2.25 --- src/doc/CHANGES-6.0.1:1.1.2.24 Thu Nov 29 00:04:02 2012 +++ src/doc/CHANGES-6.0.1 Thu Nov 29 00:04:19 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.24 2012/11/29 00:04:02 riz Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.25 2012/11/29 00:04:19 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -224,3 +224,9 @@ distrib/utils/sysinst/disks.c 1.127 install-image on a USB stick. PR#47195. [tsutsui, ticket #706] +sys/fs/smbfs/smbfs_smb.c 1.43 +sys/netsmb/smb_smb.c1.33 + + Make smbfs actually works on big-endian ports. + [nakayama, ticket #725] +
CVS commit: [netbsd-6] src/sys
Module Name:src Committed By: riz Date: Thu Nov 29 00:04:37 UTC 2012 Modified Files: src/sys/fs/smbfs [netbsd-6]: smbfs_smb.c src/sys/netsmb [netbsd-6]: smb_smb.c Log Message: Pull up following revision(s) (requested by nakayama in ticket #725): sys/fs/smbfs/smbfs_smb.c: revision 1.43 sys/netsmb/smb_smb.c: revision 1.33 - fix endian cofusion around FID, which is used as is, so no need to do byte swapping. - put right value to ByteCount of SMB_COM_NT_CREATE_ANDX request. The fix makes smbfs actually works on big-endian port. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.42.8.1 src/sys/fs/smbfs/smbfs_smb.c cvs rdiff -u -r1.32 -r1.32.18.1 src/sys/netsmb/smb_smb.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/fs/smbfs/smbfs_smb.c diff -u src/sys/fs/smbfs/smbfs_smb.c:1.42 src/sys/fs/smbfs/smbfs_smb.c:1.42.8.1 --- src/sys/fs/smbfs/smbfs_smb.c:1.42 Tue Sep 27 02:05:10 2011 +++ src/sys/fs/smbfs/smbfs_smb.c Thu Nov 29 00:04:37 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: smbfs_smb.c,v 1.42 2011/09/27 02:05:10 christos Exp $ */ +/* $NetBSD: smbfs_smb.c,v 1.42.8.1 2012/11/29 00:04:37 riz Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.42 2011/09/27 02:05:10 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.42.8.1 2012/11/29 00:04:37 riz Exp $); #include sys/param.h #include sys/systm.h @@ -689,7 +689,7 @@ smbfs_smb_create(struct smbnode *dnp, co smb_rq_getreply(rqp, mdp); md_get_uint8(mdp, wc); if (wc == 1) -md_get_uint16le(mdp, fid); +md_get_uint16(mdp, fid); else error = EBADRPC; } @@ -1422,8 +1422,6 @@ smbfs_smb_ntcreatex(struct smbnode *np, mb_put_uint8(mbp, 0); /* Security tracking mode flags */ smb_rq_wend(rqp); smb_rq_bstart(rqp); - smb_rq_bend(rqp); - mbp-mb_count = 0; error = smbfs_fullpath(mbp, SSTOVC(ssp), np, NULL, 0); if (error) @@ -1435,6 +1433,7 @@ smbfs_smb_ntcreatex(struct smbnode *np, flen = mbp-mb_count; SMBRQ_PUTLE16(nmlen, flen); + smb_rq_bend(rqp); error = smb_rq_simple(rqp); if (error) goto bad; Index: src/sys/netsmb/smb_smb.c diff -u src/sys/netsmb/smb_smb.c:1.32 src/sys/netsmb/smb_smb.c:1.32.18.1 --- src/sys/netsmb/smb_smb.c:1.32 Sun Oct 18 23:20:31 2009 +++ src/sys/netsmb/smb_smb.c Thu Nov 29 00:04:37 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: smb_smb.c,v 1.32 2009/10/18 23:20:31 tron Exp $ */ +/* $NetBSD: smb_smb.c,v 1.32.18.1 2012/11/29 00:04:37 riz Exp $ */ /* * Copyright (c) 2000-2001 Boris Popov @@ -38,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.32 2009/10/18 23:20:31 tron Exp $); +__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.32.18.1 2012/11/29 00:04:37 riz Exp $); #include sys/param.h #include sys/systm.h @@ -175,7 +175,7 @@ smb_smb_negotiate(struct smb_vc *vcp, st SMBERROR((Unexpected length of security blob (%d)\n, sblen)); break; } -error = md_get_uint16(mdp, bc); +error = md_get_uint16le(mdp, bc); if (error) break; if (sp-sv_caps SMB_CAP_EXT_SECURITY) @@ -210,7 +210,7 @@ smb_smb_negotiate(struct smb_vc *vcp, st if (swlen SMB_MAXCHALLENGELEN) break; md_get_uint16(mdp, NULL); /* mbz */ -if (md_get_uint16(mdp, bc) != 0) +if (md_get_uint16le(mdp, bc) != 0) break; if (bc swlen) break;
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Thu Nov 29 00:09:49 UTC 2012
Modified Files:
src/distrib/sets/lists/base [netbsd-6]: mi
src/distrib/sets/lists/comp [netbsd-6]: mi
src/etc/rc.d [netbsd-6]: npf
src/usr.sbin/npf/npfctl [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by rmind in ticket #726):
etc/rc.d/npf: revision 1.3
distrib/sets/lists/base/mi: revision 1.1010
usr.sbin/npf/npfctl/Makefile: revision 1.9
distrib/sets/lists/comp/mi: revision 1.1785
put in /sbin
catch up with npfctl moving to /sbin.
untested, but i guess so was the move itself ;)
mv npfctl from /usr/sbin to /sbin so it is available before /usr is mounted.
To generate a diff of this commit:
cvs rdiff -u -r1.984.2.12 -r1.984.2.13 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1738.2.13 -r1.1738.2.14 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.2 -r1.2.6.1 src/etc/rc.d/npf
cvs rdiff -u -r1.5.2.3 -r1.5.2.4 src/usr.sbin/npf/npfctl/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/base/mi
diff -u src/distrib/sets/lists/base/mi:1.984.2.12 src/distrib/sets/lists/base/mi:1.984.2.13
--- src/distrib/sets/lists/base/mi:1.984.2.12 Wed Nov 28 21:34:30 2012
+++ src/distrib/sets/lists/base/mi Thu Nov 29 00:09:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.984.2.12 2012/11/28 21:34:30 riz Exp $
+# $NetBSD: mi,v 1.984.2.13 2012/11/29 00:09:44 riz Exp $
#
# Note: Don't delete entries from here - mark them as obsolete instead,
# unless otherwise stated below.
@@ -315,6 +315,7 @@
./sbin/nfsd base-obsolete obsolete
./sbin/nfsiod base-obsolete obsolete
./sbin/nologin base-sysutil-root
+./sbin/npfctl base-npf-bin npf
./sbin/pfctl base-pf-root pf
./sbin/pflogd base-pf-root pf
./sbin/pfs base-pf-root pf
@@ -1344,7 +1345,7 @@
./usr/sbin/netgroup_mkdb base-nis-bin
./usr/sbin/nfsd base-nfsserver-bin
./usr/sbin/nfsiodbase-obsolete obsolete
-./usr/sbin/npfctlbase-npf-bin npf
+./usr/sbin/npfctlbase-obsolete obsolete
./usr/sbin/nsec3hashbase-bind-bin
./usr/sbin/nslookupbase-obsolete obsolete
./usr/sbin/nsquerybase-obsolete obsolete
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1738.2.13 src/distrib/sets/lists/comp/mi:1.1738.2.14
--- src/distrib/sets/lists/comp/mi:1.1738.2.13 Wed Nov 28 21:34:43 2012
+++ src/distrib/sets/lists/comp/mi Thu Nov 29 00:09:46 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1738.2.13 2012/11/28 21:34:43 riz Exp $
+# $NetBSD: mi,v 1.1738.2.14 2012/11/29 00:09:46 riz Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -3472,6 +3472,7 @@
./usr/libdata/debug/sbin/newfs_sysvbfs.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/newfs_udf.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/newfs_v7fs.debug comp-sysutil-debug debug
+./usr/libdata/debug/sbin/npfctl.debug comp-npf-debug npf,debug
./usr/libdata/debug/sbin/pfctl.debug comp-pf-debug pf,debug
./usr/libdata/debug/sbin/pflogd.debug comp-pf-debug pf,debug
./usr/libdata/debug/sbin/pfs.debug comp-pf-debug pf,debug
@@ -4202,7 +4203,7 @@
./usr/libdata/debug/usr/sbin/ndp.debug comp-netutil-debug inet6,debug
./usr/libdata/debug/usr/sbin/netgroup_mkdb.debug comp-nis-debug debug
./usr/libdata/debug/usr/sbin/nfsd.debug comp-nfsserver-debug debug
-./usr/libdata/debug/usr/sbin/npfctl.debug comp-npf-debug npf,debug
+./usr/libdata/debug/usr/sbin/npfctl.debug comp-obsolete obsolete
./usr/libdata/debug/usr/sbin/nsec3hash.debug comp-bind-debug debug
./usr/libdata/debug/usr/sbin/ntp-keygen.debug comp-ntp-debug crypto,debug
./usr/libdata/debug/usr/sbin/ntpd.debug comp-ntp-debug debug
Index: src/etc/rc.d/npf
diff -u src/etc/rc.d/npf:1.2 src/etc/rc.d/npf:1.2.6.1
--- src/etc/rc.d/npf:1.2 Mon Mar 7 23:21:13 2011
+++ src/etc/rc.d/npf Thu Nov 29 00:09:44 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: npf,v 1.2 2011/03/07 23:21:13 jmcneill Exp $
+# $NetBSD: npf,v 1.2.6.1 2012/11/29 00:09:44 riz Exp $
#
# Public Domain.
#
@@ -35,22 +35,22 @@ npf_start()
{
echo Enabling NPF.
npf_cfg_check
- /usr/sbin/npfctl reload
- /usr/sbin/npfctl start
+ /sbin/npfctl reload
+ /sbin/npfctl start
}
npf_stop()
{
echo Disabling NPF.
- /usr/sbin/npfctl stop
- /usr/sbin/npfctl flush
+ /sbin/npfctl stop
+ /sbin/npfctl flush
}
npf_reload()
{
echo Reloading NPF ruleset.
npf_cfg_check
- /usr/sbin/npfctl reload
+ /sbin/npfctl reload
}
npf_status()
Index: src/usr.sbin/npf/npfctl/Makefile
diff -u src/usr.sbin/npf/npfctl/Makefile:1.5.2.3 src/usr.sbin/npf/npfctl/Makefile:1.5.2.4
--- src/usr.sbin/npf/npfctl/Makefile:1.5.2.3 Sun Nov 18 22:38:28 2012
+++ src/usr.sbin/npf/npfctl/Makefile Thu Nov 29 00:09:46 2012
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.5.2.3 2012/11/18 22:38:28 riz Exp $
+# $NetBSD: Makefile,v
CVS commit: [netbsd-6] src/sys/arch/amigappc/conf
Module Name:src
Committed By: riz
Date: Thu Nov 29 00:11:26 UTC 2012
Modified Files:
src/sys/arch/amigappc/conf [netbsd-6]: files.amigappc
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #727):
sys/arch/amigappc/conf/files.amigappc: revision 1.26
Fix fallout from recent ed driver replacement. Makes amigappc build again.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.25.2.1 src/sys/arch/amigappc/conf/files.amigappc
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/amigappc/conf/files.amigappc
diff -u src/sys/arch/amigappc/conf/files.amigappc:1.25 src/sys/arch/amigappc/conf/files.amigappc:1.25.2.1
--- src/sys/arch/amigappc/conf/files.amigappc:1.25 Wed Feb 15 12:11:43 2012
+++ src/sys/arch/amigappc/conf/files.amigappc Thu Nov 29 00:11:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.amigappc,v 1.25 2012/02/15 12:11:43 phx Exp $
+# $NetBSD: files.amigappc,v 1.25.2.1 2012/11/29 00:11:26 riz Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -229,8 +229,8 @@ file arch/amiga/dev/if_ne_zbus.c ne_zbus
# Hydra ethernet card
device ed: ifnet, ether, arp
-attach ed at zbus with ed_zbus
-file arch/amiga/dev/if_ed.c ed_zbus needs-flag
+attach ed at zbus with ed_zbus: dp8390nic
+file arch/amiga/dev/if_ed_zbus.c ed_zbus needs-flag
# C=/Ameristar A2060 / 560
attach bah at zbus with bah_zbus
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Thu Nov 29 00:12:20 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 725-727 To generate a diff of this commit: cvs rdiff -u -r1.1.2.47 -r1.1.2.48 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.47 src/doc/CHANGES-6.1:1.1.2.48 --- src/doc/CHANGES-6.1:1.1.2.47 Thu Nov 29 00:00:02 2012 +++ src/doc/CHANGES-6.1 Thu Nov 29 00:12:19 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.47 2012/11/29 00:00:02 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.48 2012/11/29 00:12:19 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -916,7 +916,7 @@ sys/dev/usb/if_urndis.c1.4 lib/libc/arch/arm/sys/__aeabi_read_tp.S 1.3 - Add $NetBSD: CHANGES-6.1,v 1.1.2.47 2012/11/29 00:00:02 riz Exp $ tag. Use ip to save r1 instead of the stack. + Add $NetBSD: CHANGES-6.1,v 1.1.2.48 2012/11/29 00:12:19 riz Exp $ tag. Use ip to save r1 instead of the stack. [matt, ticket #701] sys/net/npf/npf.c1.14 @@ -7073,3 +7073,24 @@ lib/libpthread/pthread_tsd.c 1.8-1.10 values of keys in other threads when pthread_key_delete() is called. [christos, ticket #724] +sys/fs/smbfs/smbfs_smb.c 1.43 +sys/netsmb/smb_smb.c1.33 + + Make smbfs actually works on big-endian ports. + [nakayama, ticket #725] + +distrib/sets/lists/base/mi 1.1010 via patch +distrib/sets/lists/comp/mi 1.1785 via patch +etc/rc.d/npf 1.3 +usr.sbin/npf/npfctl/Makefile 1.9 + + Move npfctl from /usr/sbin to /sbin so it is available before + /usr is mounted. + [rmind, ticket #726] + +sys/arch/amigappc/conf/files.amigappc 1.26 + + Fix fallout from recent ed driver replacement. Makes amigappc + build again. + [msaitoh, ticket #727] +
CVS commit: [netbsd-5] src/distrib/notes/common
Module Name:src
Committed By: riz
Date: Tue Nov 27 18:12:24 UTC 2012
Modified Files:
src/distrib/notes/common [netbsd-5]: main
Log Message:
Update release notes for 5.2
To generate a diff of this commit:
cvs rdiff -u -r1.425.2.15 -r1.425.2.16 src/distrib/notes/common/main
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.425.2.15 src/distrib/notes/common/main:1.425.2.16
--- src/distrib/notes/common/main:1.425.2.15 Wed Dec 1 12:28:38 2010
+++ src/distrib/notes/common/main Tue Nov 27 18:12:23 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: main,v 1.425.2.15 2010/12/01 12:28:38 sborrill Exp $
+.\ $NetBSD: main,v 1.425.2.16 2012/11/27 18:12:23 riz Exp $
.\
.\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -50,7 +50,7 @@
.as MACHINE_LIST sgimips shark sparc sparc64 sun2 sun3 vax x68k xen zaurus .
.so \*[.CURDIR]/../common/macros
.
-.Dd April 24, 2010
+.Dd November 27, 2012
.Dt INSTALL 8
.Os NetBSD
.Sh NAME
@@ -451,1121 +451,330 @@ possible, it's likely that
.Nx
wouldn't exist.
.
-.Ss Dedication
-.Pp
-.
-.Nx
-5.1 is dedicated to the memory of Martti Kuparinen, who
-was the victim of a traffic accident in June 2010.
-.Pp
-Martti's technical contributions are too many to list here in full.
-He created and maintained numerous packages in pkgsrc, updated two
-packet filter solutions distributed with
-.Nx
-and improved several
-hardware drivers. Beyond that he was always helpful and friendly. His
-example encouraged users to contribute to the project and share their
-work with the community. Some of these users later became
-.Nx
-developers themselves thanks to Martti's efforts.
-.
.if \n[FOR_RELEASE] \{\
-.Ss Changes Between the NetBSD 5.0 and 5.1 Releases
-.Pp
-The
-.Nx
-\*V
-release is the first feature update of the NetBSD 5.0 release branch.
-It represents a selected subset of fixes deemed critical for security or
-stability reasons, as well as new features and enhancements.
-.Pp
-Please note that all fixes in security/critical updates (i.e., NetBSD 5.0.1,
-5.0.2, etc.) are cumulative, so the latest update contains all such fixes
-since the corresponding minor release.
-These fixes also appear in minor releases (i.e., NetBSD 5.1, 5.2, etc.).
.Pp
The complete list of changes can be found in the
-CHANGES-5.1:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-5.1/CHANGES-5.1
-file in the top level directory of the NetBSD 5.1 release tree.
-An abbreviated list is as follows:
+CHANGES-5.2:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-5.2/CHANGES-5.2
+file in the top level directory of the NetBSD 5.2 release tree. An abbreviated list is as follows:
.Ss2 Security Advisory Fixes
.(bullet
-NetBSD-SA2009-004 (NetBSD OpenPAM
-.Xr passwd 1
-changing weakness):
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-004.txt.asc
-.It
-NetBSD-SA2009-005 (Plaintext Recovery Attack Against SSH):
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-005.txt.asc
-.It
-NetBSD-SA2009-006 (Buffer overflows in ntp):
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-006.txt.asc
+NetBSD-SA2010-012:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2010-012.txt.asc ,
+OpenSSL TLS extension parsing race condition
.It
-NetBSD-SA2009-007 (Buffer overflows in
-.Xr hack 6 ):
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-007.txt.asc
+NetBSD-SA2011-001:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2011-001.txt.asc ,
+BIND DoS due to improper handling of RRSIG records
.It
-NetBSD-SA2009-008 (OpenSSL ASN1 parsing denial of service and CMS signature
-verification weakness):
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-008.txt.asc
+NetBSD-SA2011-002:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2011-002.txt.asc ,
+OpenSSL TLS extension parsing race condition
.It
-NetBSD-SA2009-009 (OpenSSL DTLS Memory Exhaustion and DSA signature
-verification vulnerabilities):
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-009.txt.asc
+NetBSD-SA2011-003:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2011-003.txt.asc ,
+Exhausting kernel memory from user controlled value
.It
-NetBSD-SA2009-010 (ISC dhclient subnet-mask flag stack overflow):
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-010.txt.asc
+NetBSD-SA2011-004:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2011-004.txt.asc ,
+Kernel stack overflow via nested IPCOMP packet (CVE-2011-1547)
.It
-NetBSD-SA2009-011 (ISC DHCP server Denial of Service vulnerability):
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2009-011.txt.asc
+NetBSD-SA2011-005:
+.Lk
CVS commit: [netbsd-5] src/usr.bin/tput
Module Name:src Committed By: riz Date: Tue Nov 27 18:17:08 UTC 2012 Modified Files: src/usr.bin/tput [netbsd-5]: tput.c Log Message: usr.bin/tput/tput.c patch Fix tput support for setaf terminfo sequence. PR#39883. [jnemeth, ticket #1822] To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.19.4.1 src/usr.bin/tput/tput.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/tput/tput.c diff -u src/usr.bin/tput/tput.c:1.19 src/usr.bin/tput/tput.c:1.19.4.1 --- src/usr.bin/tput/tput.c:1.19 Mon Jul 21 14:19:27 2008 +++ src/usr.bin/tput/tput.c Tue Nov 27 18:17:08 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: tput.c,v 1.19 2008/07/21 14:19:27 lukem Exp $ */ +/* $NetBSD: tput.c,v 1.19.4.1 2012/11/27 18:17:08 riz Exp $ */ /*- * Copyright (c) 1980, 1988, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19 #if 0 static char sccsid[] = @(#)tput.c 8.3 (Berkeley) 4/28/95; #endif -__RCSID($NetBSD: tput.c,v 1.19 2008/07/21 14:19:27 lukem Exp $); +__RCSID($NetBSD: tput.c,v 1.19.4.1 2012/11/27 18:17:08 riz Exp $); #endif /* not lint */ #include termios.h @@ -105,7 +105,10 @@ main(int argc, char **argv) break; } cptr = buf; - if (tgetstr(p, cptr)) + if (strlen(p) 2) + errx(2, this program only supports termcap + capabilities, not terminfo); + else if (tgetstr(p, cptr)) argv = process(p, buf, argv); else if ((n = tgetnum(p)) != -1) (void)printf(%d\n, n);
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Tue Nov 27 18:17:26 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Ticket 1822 To generate a diff of this commit: cvs rdiff -u -r1.1.2.201 -r1.1.2.202 src/doc/CHANGES-5.2 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-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.201 src/doc/CHANGES-5.2:1.1.2.202 --- src/doc/CHANGES-5.2:1.1.2.201 Mon Nov 26 20:00:35 2012 +++ src/doc/CHANGES-5.2 Tue Nov 27 18:17:26 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.201 2012/11/26 20:00:35 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.202 2012/11/27 18:17:26 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -8817,3 +8817,8 @@ xsrc/external/mit/expat/dist/xmlwf/readf Address CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876. [spz, ticket #1821] +usr.bin/tput/tput.cpatch + + Fix tput support for setaf terminfo sequence. PR#39883. + [jnemeth, ticket #1822] +
CVS commit: [netbsd-5] src
Module Name:src Committed By: riz Date: Tue Nov 27 18:52:28 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 LAST_MINUTE README.files src/gnu/usr.bin/groff/tmac [netbsd-5]: mdoc.local src/sys/sys [netbsd-5]: param.h Log Message: Welcome to 5.2! To generate a diff of this commit: cvs rdiff -u -r1.1.2.202 -r1.1.2.203 src/doc/CHANGES-5.2 cvs rdiff -u -r1.2.30.2 -r1.2.30.3 src/doc/LAST_MINUTE cvs rdiff -u -r1.4.10.3 -r1.4.10.4 src/doc/README.files cvs rdiff -u -r1.43.4.17 -r1.43.4.18 src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.330.4.17 -r1.330.4.18 src/sys/sys/param.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-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.202 src/doc/CHANGES-5.2:1.1.2.203 --- src/doc/CHANGES-5.2:1.1.2.202 Tue Nov 27 18:17:26 2012 +++ src/doc/CHANGES-5.2 Tue Nov 27 18:52:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.202 2012/11/27 18:17:26 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.203 2012/11/27 18:52:28 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -8822,3 +8822,11 @@ usr.bin/tput/tput.cpatch Fix tput support for setaf terminfo sequence. PR#39883. [jnemeth, ticket #1822] +doc/LAST_MINUTE patch +doc/README.filespatch +gnu/usr.bin/groff/tmac/mdoc.local patch +sys/sys/param.h patch + + Welcome to 5.2! + [riz] + Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.30.2 src/doc/LAST_MINUTE:1.2.30.3 --- src/doc/LAST_MINUTE:1.2.30.2 Sat Nov 6 18:10:17 2010 +++ src/doc/LAST_MINUTE Tue Nov 27 18:52:28 2012 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.30.2 2010/11/06 18:10:17 snj Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.30.3 2012/11/27 18:52:28 riz Exp $ -This file contains important information on the NetBSD 5.1 release that +This file contains important information on the NetBSD 5.2 release that did not make it into the main documentation. [all] Index: src/doc/README.files diff -u src/doc/README.files:1.4.10.3 src/doc/README.files:1.4.10.4 --- src/doc/README.files:1.4.10.3 Sat Nov 6 18:10:17 2010 +++ src/doc/README.files Tue Nov 27 18:52:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: README.files,v 1.4.10.3 2010/11/06 18:10:17 snj Exp $ +# $NetBSD: README.files,v 1.4.10.4 2012/11/27 18:52:28 riz Exp $ What's in this directory: @@ -8,6 +8,8 @@ CHANGES-5.0 Changes between the initial CHANGES-5.1 Changes between the 5.0 and 5.1 releases. +CHANGES-5.2 Changes between the 5.1 and 5.2 releases. + CHANGES.prev Changes in previous NetBSD releases. LAST_MINUTE Last minute changes and notes about the release. Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.17 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.17 Tue Nov 6 20:41:32 2012 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Tue Nov 27 18:52:27 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: mdoc.local,v 1.43.4.17 2012/11/06 20:41:32 riz Exp $ +.\ $NetBSD: mdoc.local,v 1.43.4.18 2012/11/27 18:52:27 riz Exp $ .\ .\ Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\ Default .Os value -.ds doc-operating-system NetBSD\~5.2_RC1 +.ds doc-operating-system NetBSD\~5.2 .\ Default footer operating system value -.ds doc-default-operating-system NetBSD\~5.2_RC1 +.ds doc-default-operating-system NetBSD\~5.2 .\ Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.330.4.17 src/sys/sys/param.h:1.330.4.18 --- src/sys/sys/param.h:1.330.4.17 Tue Nov 6 20:41:32 2012 +++ src/sys/sys/param.h Tue Nov 27 18:52:28 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.330.4.17 2012/11/06 20:41:32 riz Exp $ */ +/* $NetBSD: param.h,v 1.330.4.18 2012/11/27 18:52:28 riz Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 50200 /* NetBSD 5.2_RC1 */ +#define __NetBSD_Version__ 50200 /* NetBSD 5.2 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: [netbsd-5] src/sys/arch/x86/include
Module Name:src Committed By: riz Date: Wed Nov 28 04:39:03 UTC 2012 Modified Files: src/sys/arch/x86/include [netbsd-5]: specialreg.h Log Message: Pull up following revision(s) (requested by christos in ticket #1819): sys/arch/x86/include/specialreg.h: revision 1.58 Add VIA Eden FCR MSR. To generate a diff of this commit: cvs rdiff -u -r1.31.4.1 -r1.31.4.2 src/sys/arch/x86/include/specialreg.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/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.31.4.1 src/sys/arch/x86/include/specialreg.h:1.31.4.2 --- src/sys/arch/x86/include/specialreg.h:1.31.4.1 Tue Jun 16 02:23:31 2009 +++ src/sys/arch/x86/include/specialreg.h Wed Nov 28 04:39:03 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.31.4.1 2009/06/16 02:23:31 snj Exp $ */ +/* $NetBSD: specialreg.h,v 1.31.4.2 2012/11/28 04:39:03 riz Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -360,6 +360,11 @@ #define MSR_VIA_ACE_ENABLE 0x1000 /* + * VIA Eden MSRs + */ +#define MSR_VIA_FCR MSR_VIA_ACE + +/* * AMD K6/K7 MSRs. */ #define MSR_K6_UWCCR 0xc085
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Mon Nov 26 17:39:29 UTC 2012
Modified Files:
src/sys/net/npf [netbsd-6]: npf_impl.h
src/usr.sbin/npf/npfctl [netbsd-6]: npf_disassemble.c npf_extmod.c
npf_ncgen.c npf_parse.y npf_scan.l npf_var.c npfctl.c npfctl.h
Log Message:
Pull up following revision(s) (requested by rmind in ticket #718):
usr.sbin/npf/npfctl/npfctl.c: revision 1.22
usr.sbin/npf/npfctl/npfctl.c: revision 1.23
usr.sbin/npf/npfctl/npf_parse.y: revision 1.15
usr.sbin/npf/npfctl/npfctl.c: revision 1.24
usr.sbin/npf/npfctl/npf_parse.y: revision 1.16
usr.sbin/npf/npfctl/npfctl.h: revision 1.22
usr.sbin/npf/npfctl/npf_ncgen.c: revision 1.14
usr.sbin/npf/npfctl/npf_ncgen.c: revision 1.15
usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.11
usr.sbin/npf/npfctl/npf_disassemble.c: revision 1.12
usr.sbin/npf/npfctl/npf_scan.l: revision 1.7
usr.sbin/npf/npfctl/npf_scan.l: revision 1.8
usr.sbin/npf/npfctl/npf_extmod.c: revision 1.2
usr.sbin/npf/npfctl/npf_extmod.c: revision 1.3
usr.sbin/npf/npfctl/npf_var.c: revision 1.6
usr.sbin/npf/npfctl/npf_var.c: revision 1.7
gcc 4.1 is not smart enough to notice quot;argquot; is only used when
initialized
correctly and produces a quot;might be used unintializedquot; warning.
npfctl: switch to efun(3) routines.
npfctl: switch to ecalloc(3).
To generate a diff of this commit:
cvs rdiff -u -r1.10.2.10 -r1.10.2.11 src/sys/net/npf/npf_impl.h
cvs rdiff -u -r1.3.2.8 -r1.3.2.9 src/usr.sbin/npf/npfctl/npf_disassemble.c \
src/usr.sbin/npf/npfctl/npf_parse.y
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/usr.sbin/npf/npfctl/npf_extmod.c
cvs rdiff -u -r1.7.2.5 -r1.7.2.6 src/usr.sbin/npf/npfctl/npf_ncgen.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/usr.sbin/npf/npfctl/npf_scan.l
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 src/usr.sbin/npf/npfctl/npf_var.c
cvs rdiff -u -r1.10.2.8 -r1.10.2.9 src/usr.sbin/npf/npfctl/npfctl.c
cvs rdiff -u -r1.11.2.8 -r1.11.2.9 src/usr.sbin/npf/npfctl/npfctl.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/net/npf/npf_impl.h
diff -u src/sys/net/npf/npf_impl.h:1.10.2.10 src/sys/net/npf/npf_impl.h:1.10.2.11
--- src/sys/net/npf/npf_impl.h:1.10.2.10 Sat Nov 24 04:34:42 2012
+++ src/sys/net/npf/npf_impl.h Mon Nov 26 17:39:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_impl.h,v 1.10.2.10 2012/11/24 04:34:42 riz Exp $ */
+/* $NetBSD: npf_impl.h,v 1.10.2.11 2012/11/26 17:39:29 riz Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -201,7 +201,7 @@ int npf_match_tcpfl(npf_cache_t *, nbuf
void npf_tableset_sysinit(void);
void npf_tableset_sysfini(void);
-const pt_tree_ops_t npf_table_ptree_ops;
+extern const pt_tree_ops_t npf_table_ptree_ops;
npf_tableset_t *npf_tableset_create(void);
void npf_tableset_destroy(npf_tableset_t *);
Index: src/usr.sbin/npf/npfctl/npf_disassemble.c
diff -u src/usr.sbin/npf/npfctl/npf_disassemble.c:1.3.2.8 src/usr.sbin/npf/npfctl/npf_disassemble.c:1.3.2.9
--- src/usr.sbin/npf/npfctl/npf_disassemble.c:1.3.2.8 Sat Nov 24 04:34:43 2012
+++ src/usr.sbin/npf/npfctl/npf_disassemble.c Mon Nov 26 17:39:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_disassemble.c,v 1.3.2.8 2012/11/24 04:34:43 riz Exp $ */
+/* $NetBSD: npf_disassemble.c,v 1.3.2.9 2012/11/26 17:39:29 riz Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
* FIXME: config generation should be redesigned..
*/
#include sys/cdefs.h
-__RCSID($NetBSD: npf_disassemble.c,v 1.3.2.8 2012/11/24 04:34:43 riz Exp $);
+__RCSID($NetBSD: npf_disassemble.c,v 1.3.2.9 2012/11/26 17:39:29 riz Exp $);
#include stdio.h
#include stdlib.h
@@ -48,8 +48,6 @@ __RCSID($NetBSD: npf_disassemble.c,v 1.
#include netinet/tcp.h
#include net/if.h
-#include util.h
-
#define NPF_OPCODES_STRINGS
#include net/npf_ncode.h
@@ -108,7 +106,7 @@ npfctl_ncode_add_target(nc_inf_t *ni, co
/* Grow array, if needed, and add a new target. */
if (ni-ni_targidx == ni-ni_targsize) {
ni-ni_targsize += 16;
- ni-ni_targs = xrealloc(ni-ni_targs,
+ ni-ni_targs = erealloc(ni-ni_targs,
ni-ni_targsize * sizeof(uint32_t));
}
assert(ni-ni_targidx ni-ni_targsize);
@@ -372,7 +370,7 @@ npfctl_ncode_operand(nc_inf_t *ni, char
nc_inf_t *
npfctl_ncode_disinf(FILE *fp)
{
- nc_inf_t *ni = zalloc(sizeof(nc_inf_t));
+ nc_inf_t *ni = ecalloc(1, sizeof(nc_inf_t));
memset(ni, 0, sizeof(nc_inf_t));
ni-ni_fp = fp;
Index: src/usr.sbin/npf/npfctl/npf_parse.y
diff -u src/usr.sbin/npf/npfctl/npf_parse.y:1.3.2.8 src/usr.sbin/npf/npfctl/npf_parse.y:1.3.2.9
--- src/usr.sbin/npf/npfctl/npf_parse.y:1.3.2.8 Sun Nov 18 22:38:28 2012
+++ src/usr.sbin/npf/npfctl/npf_parse.y Mon Nov 26 17:39:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_parse.y,v 1.3.2.8 2012/11/18 22:38:28 riz Exp $ */
+/* $NetBSD: npf_parse.y,v 1.3.2.9
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon Nov 26 17:40:28 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Ticket 718 To generate a diff of this commit: cvs rdiff -u -r1.1.2.44 -r1.1.2.45 src/doc/CHANGES-6.1 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-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.44 src/doc/CHANGES-6.1:1.1.2.45 --- src/doc/CHANGES-6.1:1.1.2.44 Sat Nov 24 21:47:28 2012 +++ src/doc/CHANGES-6.1 Mon Nov 26 17:40:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.44 2012/11/24 21:47:28 jdc Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.45 2012/11/26 17:40:28 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -916,7 +916,7 @@ sys/dev/usb/if_urndis.c1.4 lib/libc/arch/arm/sys/__aeabi_read_tp.S 1.3 - Add $NetBSD: CHANGES-6.1,v 1.1.2.44 2012/11/24 21:47:28 jdc Exp $ tag. Use ip to save r1 instead of the stack. + Add $NetBSD: CHANGES-6.1,v 1.1.2.45 2012/11/26 17:40:28 riz Exp $ tag. Use ip to save r1 instead of the stack. [matt, ticket #701] sys/net/npf/npf.c1.14 @@ -7014,3 +7014,16 @@ tests/lib/libc/sys/t_kevent.c1.2-1.5 Add a test for adding an event to an unsupported fd. [christos, ticket #716] +sys/net/npf/npf_impl.hpatch +usr.sbin/npf/npfctl/npf_disassemble.c 1.11-1.12 +usr.sbin/npf/npfctl/npf_extmod.c 1.2-1.3 +usr.sbin/npf/npfctl/npf_ncgen.c 1.14-1.15 +usr.sbin/npf/npfctl/npf_parse.y 1.15-1.16 via patch +usr.sbin/npf/npfctl/npf_scan.l 1.7-1.8 +usr.sbin/npf/npfctl/npf_var.c 1.6-1.7 +usr.sbin/npf/npfctl/npfctl.c 1.22-1.24 +usr.sbin/npf/npfctl/npfctl.h 1.22 via patch + + Various NPF fixes to bring it up-to-date. + [rmind, ticket #718] +
CVS commit: [netbsd-5] src/sys/arch/x86/x86
Module Name:src
Committed By: riz
Date: Mon Nov 26 19:44:27 UTC 2012
Modified Files:
src/sys/arch/x86/x86 [netbsd-5]: identcpu.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1819):
sys/arch/x86/x86/identcpu.c: revision 1.31
PR/41267: Andrius V: 5.0 RC4 does not detect second CPU in VIA. VIA Eden cpuid
lies about it's ability to do cmpxchg8b. Turn the feature on using the FCR MSR.
Needs pullup to both 5 and 6.
To generate a diff of this commit:
cvs rdiff -u -r1.10.4.6 -r1.10.4.7 src/sys/arch/x86/x86/identcpu.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/x86/identcpu.c
diff -u src/sys/arch/x86/x86/identcpu.c:1.10.4.6 src/sys/arch/x86/x86/identcpu.c:1.10.4.7
--- src/sys/arch/x86/x86/identcpu.c:1.10.4.6 Thu Apr 22 20:02:48 2010
+++ src/sys/arch/x86/x86/identcpu.c Mon Nov 26 19:44:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: identcpu.c,v 1.10.4.6 2010/04/22 20:02:48 snj Exp $ */
+/* $NetBSD: identcpu.c,v 1.10.4.7 2012/11/26 19:44:26 riz Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: identcpu.c,v 1.10.4.6 2010/04/22 20:02:48 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: identcpu.c,v 1.10.4.7 2012/11/26 19:44:26 riz Exp $);
#include opt_enhanced_speedstep.h
#include opt_intel_odcm.h
@@ -387,13 +387,31 @@ static void
cpu_probe_winchip(struct cpu_info *ci)
{
- if (cpu_vendor != CPUVENDOR_IDT ||
- CPUID2FAMILY(ci-ci_signature) != 5)
+ if (cpu_vendor != CPUVENDOR_IDT)
return;
- if (CPUID2MODEL(ci-ci_signature) == 4) {
- /* WinChip C6 */
- ci-ci_feature_flags = ~CPUID_TSC;
+ switch (CPUID2FAMILY(ci-ci_signature)) {
+ case 5:
+ /* WinChip C6 */
+ if (CPUID2MODEL(ci-ci_signature) == 4)
+ ci-ci_feature_flags = ~CPUID_TSC;
+ break;
+ case 6:
+ /*
+ * VIA Eden ESP
+ *
+ * Quoting from page 3-4 of: VIA Eden ESP Processor Datasheet
+ * http://www.via.com.tw/download/mainboards/6/14/Eden20v115.pdf
+ *
+ * 1. The CMPXCHG8B instruction is provided and always enabled,
+ *however, it appears disabled in the corresponding CPUID
+ *function bit 0 to avoid a bug in an early version of
+ *Windows NT. However, this default can be changed via a
+ *bit in the FCR MSR.
+ */
+ ci-ci_feature_flags |= CPUID_CX8;
+ wrmsr(MSR_VIA_FCR, rdmsr(MSR_VIA_FCR) | 0x0001);
+ break;
}
}
CVS commit: [netbsd-5] src/sys
Module Name:src Committed By: riz Date: Mon Nov 26 19:50:12 UTC 2012 Modified Files: src/sys/fs/smbfs [netbsd-5]: smbfs_smb.c src/sys/netsmb [netbsd-5]: smb_smb.c Log Message: Pull up following revision(s) (requested by nakayama in ticket #1820): sys/fs/smbfs/smbfs_smb.c: revision 1.43 sys/netsmb/smb_smb.c: revision 1.33 - fix endian cofusion around FID, which is used as is, so no need to do byte swapping. - put right value to ByteCount of SMB_COM_NT_CREATE_ANDX request. The fix makes smbfs actually works on big-endian port. To generate a diff of this commit: cvs rdiff -u -r1.37.6.1 -r1.37.6.2 src/sys/fs/smbfs/smbfs_smb.c cvs rdiff -u -r1.29.6.1 -r1.29.6.2 src/sys/netsmb/smb_smb.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/fs/smbfs/smbfs_smb.c diff -u src/sys/fs/smbfs/smbfs_smb.c:1.37.6.1 src/sys/fs/smbfs/smbfs_smb.c:1.37.6.2 --- src/sys/fs/smbfs/smbfs_smb.c:1.37.6.1 Tue Oct 27 20:46:52 2009 +++ src/sys/fs/smbfs/smbfs_smb.c Mon Nov 26 19:50:11 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: smbfs_smb.c,v 1.37.6.1 2009/10/27 20:46:52 bouyer Exp $ */ +/* $NetBSD: smbfs_smb.c,v 1.37.6.2 2012/11/26 19:50:11 riz Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.37.6.1 2009/10/27 20:46:52 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.37.6.2 2012/11/26 19:50:11 riz Exp $); #include sys/param.h #include sys/systm.h @@ -689,7 +689,7 @@ smbfs_smb_create(struct smbnode *dnp, co smb_rq_getreply(rqp, mdp); md_get_uint8(mdp, wc); if (wc == 1) -md_get_uint16le(mdp, fid); +md_get_uint16(mdp, fid); else error = EBADRPC; } @@ -1422,8 +1422,6 @@ smbfs_smb_ntcreatex(struct smbnode *np, mb_put_uint8(mbp, 0); /* Security tracking mode flags */ smb_rq_wend(rqp); smb_rq_bstart(rqp); - smb_rq_bend(rqp); - mbp-mb_count = 0; error = smbfs_fullpath(mbp, SSTOVC(ssp), np, NULL, 0); if (error) @@ -1435,6 +1433,7 @@ smbfs_smb_ntcreatex(struct smbnode *np, flen = mbp-mb_count; SMBRQ_PUTLE16(nmlen, flen); + smb_rq_bend(rqp); error = smb_rq_simple(rqp); if (error) goto bad; Index: src/sys/netsmb/smb_smb.c diff -u src/sys/netsmb/smb_smb.c:1.29.6.1 src/sys/netsmb/smb_smb.c:1.29.6.2 --- src/sys/netsmb/smb_smb.c:1.29.6.1 Tue Oct 27 20:31:15 2009 +++ src/sys/netsmb/smb_smb.c Mon Nov 26 19:50:11 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: smb_smb.c,v 1.29.6.1 2009/10/27 20:31:15 bouyer Exp $ */ +/* $NetBSD: smb_smb.c,v 1.29.6.2 2012/11/26 19:50:11 riz Exp $ */ /* * Copyright (c) 2000-2001 Boris Popov @@ -38,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.29.6.1 2009/10/27 20:31:15 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: smb_smb.c,v 1.29.6.2 2012/11/26 19:50:11 riz Exp $); #include sys/param.h #include sys/systm.h @@ -175,7 +175,7 @@ smb_smb_negotiate(struct smb_vc *vcp, st SMBERROR((Unexpected length of security blob (%d)\n, sblen)); break; } -error = md_get_uint16(mdp, bc); +error = md_get_uint16le(mdp, bc); if (error) break; if (sp-sv_caps SMB_CAP_EXT_SECURITY) @@ -210,7 +210,7 @@ smb_smb_negotiate(struct smb_vc *vcp, st if (swlen SMB_MAXCHALLENGELEN) break; md_get_uint16(mdp, NULL); /* mbz */ -if (md_get_uint16(mdp, bc) != 0) +if (md_get_uint16le(mdp, bc) != 0) break; if (bc swlen) break;
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Mon Nov 26 19:53:04 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1819, 1820. To generate a diff of this commit: cvs rdiff -u -r1.1.2.199 -r1.1.2.200 src/doc/CHANGES-5.2 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-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.199 src/doc/CHANGES-5.2:1.1.2.200 --- src/doc/CHANGES-5.2:1.1.2.199 Thu Nov 15 13:33:29 2012 +++ src/doc/CHANGES-5.2 Mon Nov 26 19:53:04 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.199 2012/11/15 13:33:29 msaitoh Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.200 2012/11/26 19:53:04 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -8798,3 +8798,15 @@ distrib/sets/lists/base/mi 1.993 Really mark wake as obsolete [msaitoh] + +sys/arch/x86/x86/identcpu.c 1.31 via patch + + MSR fixes for VIA CPUs. PR#41267. + [christos, ticket #1819] + +sys/fs/smbfs/smbfs_smb.c 1.43 +sys/netsmb/smb_smb.c1.33 + + Make smbfs actually works on big-endian ports. + [nakayama, ticket #1820] +
CVS commit: [netbsd-5-0] xsrc/external/mit/expat/dist
Module Name:xsrc
Committed By: riz
Date: Mon Nov 26 19:59:41 UTC 2012
Modified Files:
xsrc/external/mit/expat/dist/lib [netbsd-5-0]: expat.h xmlparse.c
xsrc/external/mit/expat/dist/xmlwf [netbsd-5-0]: readfilemap.c
Log Message:
xsrc/external/mit/expat/dist/lib/expat.hpatch
xsrc/external/mit/expat/dist/lib/xmlparse.c patch
xsrc/external/mit/expat/dist/xmlwf/readfilemap.cpatch
Address CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876.
[spz, ticket #1821]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 xsrc/external/mit/expat/dist/lib/expat.h
cvs rdiff -u -r1.1.1.1.4.1 -r1.1.1.1.4.2 \
xsrc/external/mit/expat/dist/lib/xmlparse.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \
xsrc/external/mit/expat/dist/xmlwf/readfilemap.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/expat/dist/lib/expat.h
diff -u xsrc/external/mit/expat/dist/lib/expat.h:1.1.1.1 xsrc/external/mit/expat/dist/lib/expat.h:1.1.1.1.4.1
--- xsrc/external/mit/expat/dist/lib/expat.h:1.1.1.1 Tue Jul 29 05:35:06 2008
+++ xsrc/external/mit/expat/dist/lib/expat.h Mon Nov 26 19:59:40 2012
@@ -883,6 +883,15 @@ XMLPARSEAPI(int)
XML_SetParamEntityParsing(XML_Parser parser,
enum XML_ParamEntityParsing parsing);
+/* Sets the hash salt to use for internal hash calculations.
+ Helps in preventing DoS attacks based on predicting hash
+ function behavior. This must be called before parsing is started.
+ Returns 1 if successful, 0 when called after parsing has started.
+*/
+XMLPARSEAPI(int)
+XML_SetHashSalt(XML_Parser parser,
+unsigned long hash_salt);
+
/* If XML_Parse or XML_ParseBuffer have returned XML_STATUS_ERROR, then
XML_GetErrorCode returns information about the error.
*/
Index: xsrc/external/mit/expat/dist/lib/xmlparse.c
diff -u xsrc/external/mit/expat/dist/lib/xmlparse.c:1.1.1.1.4.1 xsrc/external/mit/expat/dist/lib/xmlparse.c:1.1.1.1.4.2
--- xsrc/external/mit/expat/dist/lib/xmlparse.c:1.1.1.1.4.1 Wed Jan 27 20:42:42 2010
+++ xsrc/external/mit/expat/dist/lib/xmlparse.c Mon Nov 26 19:59:40 2012
@@ -5,6 +5,8 @@
#include stddef.h
#include string.h /* memset(), memcpy() */
#include assert.h
+#include limits.h /* UINT_MAX */
+#include time.h /* time() */
#define XML_BUILDING_EXPAT 1
@@ -391,12 +393,13 @@ static void dtdReset(DTD *p, const XML_M
static void
dtdDestroy(DTD *p, XML_Bool isDocEntity, const XML_Memory_Handling_Suite *ms);
static int
-dtdCopy(DTD *newDtd, const DTD *oldDtd, const XML_Memory_Handling_Suite *ms);
+dtdCopy(XML_Parser oldParser,
+DTD *newDtd, const DTD *oldDtd, const XML_Memory_Handling_Suite *ms);
static int
-copyEntityTable(HASH_TABLE *, STRING_POOL *, const HASH_TABLE *);
-
+copyEntityTable(XML_Parser oldParser,
+HASH_TABLE *, STRING_POOL *, const HASH_TABLE *);
static NAMED *
-lookup(HASH_TABLE *table, KEY name, size_t createSize);
+lookup(XML_Parser parser, HASH_TABLE *table, KEY name, size_t createSize);
static void FASTCALL
hashTableInit(HASH_TABLE *, const XML_Memory_Handling_Suite *ms);
static void FASTCALL hashTableClear(HASH_TABLE *);
@@ -429,11 +432,15 @@ static ELEMENT_TYPE *
getElementType(XML_Parser parser, const ENCODING *enc,
const char *ptr, const char *end);
+static unsigned long generate_hash_secret_salt(void);
+static XML_Bool startParsing(XML_Parser parser);
+
static XML_Parser
parserCreate(const XML_Char *encodingName,
const XML_Memory_Handling_Suite *memsuite,
const XML_Char *nameSep,
DTD *dtd);
+
static void
parserInit(XML_Parser parser, const XML_Char *encodingName);
@@ -546,6 +553,7 @@ struct XML_ParserStruct {
XML_Bool m_useForeignDTD;
enum XML_ParamEntityParsing m_paramEntityParsing;
#endif
+ unsigned long m_hash_secret_salt;
};
#define MALLOC(s) (parser-m_mem.malloc_fcn((s)))
@@ -653,6 +661,7 @@ struct XML_ParserStruct {
#define useForeignDTD (parser-m_useForeignDTD)
#define paramEntityParsing (parser-m_paramEntityParsing)
#endif /* XML_DTD */
+#define hash_secret_salt (parser-m_hash_secret_salt)
XML_Parser XMLCALL
XML_ParserCreate(const XML_Char *encodingName)
@@ -677,22 +686,35 @@ static const XML_Char implicitContext[]
ASCII_s, ASCII_p, ASCII_a, ASCII_c, ASCII_e, '\0'
};
+static unsigned long
+generate_hash_secret_salt(void)
+{
+ unsigned int seed = time(NULL) % UINT_MAX;
+ srand(seed);
+ return rand();
+}
+
+static XML_Bool /* only valid for root parser */
+startParsing(XML_Parser parser)
+{
+/* hash functions must be initialized before setContext() is called */
+if (hash_secret_salt == 0)
+ hash_secret_salt = generate_hash_secret_salt();
+if (ns) {
+ /* implicit context only set for root parser, since child
+
