CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sat Sep 15 06:10:14 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: BCM5301X Log Message: Add some PCI devices To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/BCM5301X 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/BCM5301X diff -u src/sys/arch/evbarm/conf/BCM5301X:1.4 src/sys/arch/evbarm/conf/BCM5301X:1.5 --- src/sys/arch/evbarm/conf/BCM5301X:1.4 Tue Sep 11 19:43:09 2012 +++ src/sys/arch/evbarm/conf/BCM5301X Sat Sep 15 06:10:13 2012 @@ -1,5 +1,5 @@ # -# $NetBSD: BCM5301X,v 1.4 2012/09/11 19:43:09 msaitoh Exp $ +# $NetBSD: BCM5301X,v 1.5 2012/09/15 06:10:13 matt Exp $ # # BCM5301X -- Broadcom BCM5301X Eval Board Kernel # @@ -18,7 +18,8 @@ options RTC_OFFSET=0 # hardware clock i # CPU options #makeoptions DEFCOPTS=-O0 -#options UVMHIST,UVMHIST_PRINT,A9WDT_PERIOD_DEFAULT=30 +options UVMHIST +#options UVMHIST_PRINT,A9WDT_PERIOD_DEFAULT=30 options BCM53XX_CONSOLE_EARLY #options MULTIPROCESSOR options CPU_CORTEXA9 @@ -130,6 +131,7 @@ options KTRACE # system call tracing, #options KMEMSTATS # kernel memory statistics options PCIVERBOSE # Verbose PCI autoconfiguration messages #options PCI_CONFIG_DUMP # Verbose PCI autoconfiguration messages +options PCI_NETBSD_CONFIGURE # perform PCI configuration options RNDVERBOSE # Verbose rnd messages #options SCSIVERBOSE # Verbose SCSI errors #options MIIVERBOSE # Verbose MII autoconfiguration messages @@ -149,7 +151,7 @@ options DEBUG options DDB # in-kernel debugger options DDB_ONPANIC=1 options DDB_HISTORY_SIZE=100 # Enable history editing in DDB -options DDB_COMMANDONENTER=t; show event +options DDB_COMMANDONENTER=show event options DB_MAX_LINE=INT_MAX #options KGDB makeoptions DEBUG=-g # compile full symbol table @@ -201,6 +203,11 @@ pci* at bcmpax? ppb* at pci? dev ? function ? pci* at ppb? +ahcisata* at pci? dev ? function ? +atabus* at ahcisata? channel ? +wd* at atabus? drive ? +wm* at pci? dev ? function ? + bcmmdio0 at bcmccb0 bcmeth* at bcmccb? port ?
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Sep 15 06:13:43 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: GUMSTIX Log Message: Add malo@pcmcia. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/arch/evbarm/conf/GUMSTIX 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/GUMSTIX diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.68 src/sys/arch/evbarm/conf/GUMSTIX:1.69 --- src/sys/arch/evbarm/conf/GUMSTIX:1.68 Sun Sep 9 04:27:12 2012 +++ src/sys/arch/evbarm/conf/GUMSTIX Sat Sep 15 06:13:43 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GUMSTIX,v 1.68 2012/09/09 04:27:12 msaitoh Exp $ +# $NetBSD: GUMSTIX,v 1.69 2012/09/15 06:13:43 kiyohara Exp $ # # GUMSTIX -- Gumstix. Inc. gumstix platforms kernel # @@ -253,7 +253,7 @@ pxapcic0 at pxaip? addr 0x2000 # cf pcmcia* at pxapcic? # Marvell 88W8385 -#malo* at pcmcia? function ? # wifistix, netwifimicrosd, netpro-vx +malo* at pcmcia? function ? # wifistix, netwifimicrosd, netpro-vx # PCMCIA serial interfaces
CVS commit: src/sys/uvm
Module Name:src Committed By: matt Date: Sat Sep 15 06:25:47 UTC 2012 Modified Files: src/sys/uvm: uvm_aobj.c Log Message: #include sys/atomic.h To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 src/sys/uvm/uvm_aobj.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/uvm/uvm_aobj.c diff -u src/sys/uvm/uvm_aobj.c:1.118 src/sys/uvm/uvm_aobj.c:1.119 --- src/sys/uvm/uvm_aobj.c:1.118 Fri Sep 14 22:20:50 2012 +++ src/sys/uvm/uvm_aobj.c Sat Sep 15 06:25:47 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_aobj.c,v 1.118 2012/09/14 22:20:50 rmind Exp $ */ +/* $NetBSD: uvm_aobj.c,v 1.119 2012/09/15 06:25:47 matt Exp $ */ /* * Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and @@ -38,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uvm_aobj.c,v 1.118 2012/09/14 22:20:50 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: uvm_aobj.c,v 1.119 2012/09/15 06:25:47 matt Exp $); #include opt_uvmhist.h @@ -47,6 +47,7 @@ __KERNEL_RCSID(0, $NetBSD: uvm_aobj.c,v #include sys/kernel.h #include sys/kmem.h #include sys/pool.h +#include sys/atomic.h #include uvm/uvm.h
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:03:53 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-0]: africa antarctica asia australasia backward etcetera europe factory iso3166.tab leapseconds northamerica pacificnew solar87 solar88 solar89 southamerica systemv yearistype.sh zone.tab Log Message: Apply patch, requested by apb in ticket #1456 doc/3RDPARTYpatch share/zoneinfo/africa patch share/zoneinfo/antarctica patch share/zoneinfo/asia patch share/zoneinfo/australasia patch share/zoneinfo/backward patch share/zoneinfo/etcetera patch share/zoneinfo/europe patch share/zoneinfo/factory patch share/zoneinfo/iso3166.tab patch share/zoneinfo/leapseconds patch share/zoneinfo/northamerica patch share/zoneinfo/pacificnew patch share/zoneinfo/solar87 patch share/zoneinfo/solar88 patch share/zoneinfo/solar89 patch share/zoneinfo/southamerica patch share/zoneinfo/systemv patch share/zoneinfo/yearistype.shpatch share/zoneinfo/zone.tab patch Update to tzdata2012e Major changes from tzdata2011b to tzdata2011c: africa Summer time changes for Morocco (to start late April 2012) asia Changes for 2012 for Gaza the West Bank (Hebron) and Syria northamerica Haiti following US/Canada rules for 2012 (and we're assuming, for now anyway, for the future). Major changes from tzdata2011c to tzdata2011d: Morocco does not observe DST from Jul 20 03:00 to Aug 20 02:00 [2012]. Infrastructure changes to accommodate how the tz code and data are released on IANA. Major changes from tzdata2011d to tzdata2011e: * australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. (Thanks to Steffen Thorsen.) * Use a single version number for both code and data. To generate a diff of this commit: cvs rdiff -u -r1.486.2.9.2.7 -r1.486.2.9.2.8 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.21.2.3.2.2 -r1.1.1.21.2.3.2.3 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.16.2.1.2.2 -r1.1.1.16.2.1.2.3 \ src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.40.2.1.2.3 -r1.1.1.40.2.1.2.4 src/share/zoneinfo/asia cvs rdiff -u -r1.11.2.4.2.3 -r1.11.2.4.2.4 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.17.2.1.4.2 -r1.1.1.17.2.1.4.3 \ src/share/zoneinfo/backward cvs rdiff -u -r1.1.1.6.12.1 -r1.1.1.6.12.2 src/share/zoneinfo/etcetera cvs rdiff -u -r1.1.1.34.2.2.2.3 -r1.1.1.34.2.2.2.4 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.3.12.1 -r1.1.1.3.12.2 src/share/zoneinfo/factory \ src/share/zoneinfo/pacificnew src/share/zoneinfo/solar87 \ src/share/zoneinfo/solar88 src/share/zoneinfo/solar89 cvs rdiff -u -r1.1.1.15.2.1.4.2 -r1.1.1.15.2.1.4.3 \ src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.12.2.1.2.3 -r1.1.1.12.2.1.2.4 \ src/share/zoneinfo/leapseconds cvs rdiff -u -r1.1.1.37.2.3.2.4 -r1.1.1.37.2.3.2.5 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.35.2.2.2.3 -r1.1.1.35.2.2.2.4 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.4.12.1 -r1.1.1.4.12.2 src/share/zoneinfo/systemv cvs rdiff -u -r1.6 -r1.6.12.1 src/share/zoneinfo/yearistype.sh cvs rdiff -u -r1.1.1.26.2.3.2.4 -r1.1.1.26.2.3.2.5 \ src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.486.2.9.2.7 src/doc/3RDPARTY:1.486.2.9.2.8 --- src/doc/3RDPARTY:1.486.2.9.2.7 Fri Mar 2 17:48:46 2012 +++ src/doc/3RDPARTY Sat Sep 15 09:03:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.9.2.7 2012/03/02 17:48:46 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.9.2.8 2012/09/15 09:03:52 bouyer Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,16 +845,18 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2012b / tzdata2012b -Current Vers: tzcode2011i / tzdata2012b +Version: tzcode2004a / tzdata2012e +Current Vers: tzcode2012e / tzdata2012e Maintainer: Arthur David Olson a...@elsie.nci.nih.gov Maintainer: Robert Elz k...@munnari.oz.au -Archive Site: ftp://elsie.nci.nih.gov/pub/ +Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site:
CVS commit: [netbsd-4] src
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:04:09 UTC 2012 Modified Files: src/doc [netbsd-4]: 3RDPARTY src/share/zoneinfo [netbsd-4]: africa antarctica asia australasia backward etcetera europe factory iso3166.tab leapseconds northamerica pacificnew solar87 solar88 solar89 southamerica systemv yearistype.sh zone.tab Log Message: Apply patch, requested by apb in ticket #1456 doc/3RDPARTYpatch share/zoneinfo/africa patch share/zoneinfo/antarctica patch share/zoneinfo/asia patch share/zoneinfo/australasia patch share/zoneinfo/backward patch share/zoneinfo/etcetera patch share/zoneinfo/europe patch share/zoneinfo/factory patch share/zoneinfo/iso3166.tab patch share/zoneinfo/leapseconds patch share/zoneinfo/northamerica patch share/zoneinfo/pacificnew patch share/zoneinfo/solar87 patch share/zoneinfo/solar88 patch share/zoneinfo/solar89 patch share/zoneinfo/southamerica patch share/zoneinfo/systemv patch share/zoneinfo/yearistype.shpatch share/zoneinfo/zone.tab patch Update to tzdata2012e Major changes from tzdata2011b to tzdata2011c: africa Summer time changes for Morocco (to start late April 2012) asia Changes for 2012 for Gaza the West Bank (Hebron) and Syria northamerica Haiti following US/Canada rules for 2012 (and we're assuming, for now anyway, for the future). Major changes from tzdata2011c to tzdata2011d: Morocco does not observe DST from Jul 20 03:00 to Aug 20 02:00 [2012]. Infrastructure changes to accommodate how the tz code and data are released on IANA. Major changes from tzdata2011d to tzdata2011e: * australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. (Thanks to Steffen Thorsen.) * Use a single version number for both code and data. To generate a diff of this commit: cvs rdiff -u -r1.486.2.16 -r1.486.2.17 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.21.2.5 -r1.1.1.21.2.6 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.16.2.3 -r1.1.1.16.2.4 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.40.2.4 -r1.1.1.40.2.5 src/share/zoneinfo/asia cvs rdiff -u -r1.11.2.7 -r1.11.2.8 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.17.2.3 -r1.1.1.17.2.4 src/share/zoneinfo/backward cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 src/share/zoneinfo/etcetera cvs rdiff -u -r1.1.1.34.2.5 -r1.1.1.34.2.6 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.3.2.1 -r1.1.1.3.2.2 src/share/zoneinfo/factory \ src/share/zoneinfo/pacificnew src/share/zoneinfo/solar87 \ src/share/zoneinfo/solar88 src/share/zoneinfo/solar89 cvs rdiff -u -r1.1.1.15.2.3 -r1.1.1.15.2.4 src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.12.2.4 -r1.1.1.12.2.5 src/share/zoneinfo/leapseconds cvs rdiff -u -r1.1.1.37.2.7 -r1.1.1.37.2.8 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.35.2.5 -r1.1.1.35.2.6 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.4.2.1 -r1.1.1.4.2.2 src/share/zoneinfo/systemv cvs rdiff -u -r1.6 -r1.6.2.1 src/share/zoneinfo/yearistype.sh cvs rdiff -u -r1.1.1.26.2.7 -r1.1.1.26.2.8 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.486.2.16 src/doc/3RDPARTY:1.486.2.17 --- src/doc/3RDPARTY:1.486.2.16 Fri Mar 2 17:47:27 2012 +++ src/doc/3RDPARTY Sat Sep 15 09:04:07 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.16 2012/03/02 17:47:27 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.17 2012/09/15 09:04:07 bouyer Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,16 +845,18 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2012b / tzdata2012b -Current Vers: tzcode2011i / tzdata2012b +Version: tzcode2004a / tzdata2012e +Current Vers: tzcode2012e / tzdata2012e Maintainer: Arthur David Olson a...@elsie.nci.nih.gov Maintainer: Robert Elz k...@munnari.oz.au -Archive Site: ftp://elsie.nci.nih.gov/pub/ +Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ +Old Archive Site: ftp://elsie.nci.nih.gov/pub/ Home Page: http://www.iana.org/time-zones Mailing List: t...@iana.org Responsible: kleink, christos,
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:05:53 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket 1456 To generate a diff of this commit: cvs rdiff -u -r1.1.2.105 -r1.1.2.106 src/doc/CHANGES-4.0.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-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.105 src/doc/CHANGES-4.0.2:1.1.2.106 --- src/doc/CHANGES-4.0.2:1.1.2.105 Wed Aug 22 20:02:18 2012 +++ src/doc/CHANGES-4.0.2 Sat Sep 15 09:05:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.105 2012/08/22 20:02:18 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.106 2012/09/15 09:05:52 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1418,3 +1418,54 @@ sys/arch/amd64/amd64/trap.c patch Fix potential stack frame corruption [spz, ticket #1454] +Apply patch, requested by apb in ticket #1456 + doc/3RDPARTY patch + share/zoneinfo/africapatch + share/zoneinfo/antarctica patch + share/zoneinfo/asiapatch + share/zoneinfo/australasia patch + share/zoneinfo/backwardpatch + share/zoneinfo/etceterapatch + share/zoneinfo/europepatch + share/zoneinfo/factorypatch + share/zoneinfo/iso3166.tab patch + share/zoneinfo/leapseconds patch + share/zoneinfo/northamerica patch + share/zoneinfo/pacificnew patch + share/zoneinfo/solar87patch + share/zoneinfo/solar88patch + share/zoneinfo/solar89patch + share/zoneinfo/southamerica patch + share/zoneinfo/systemvpatch + share/zoneinfo/yearistype.sh patch + share/zoneinfo/zone.tabpatch + +Update to tzdata2012e +Major changes from tzdata2011b to tzdata2011c: + + africa + Summer time changes for Morocco (to start late April 2012) + + asia + Changes for 2012 for Gaza the West Bank (Hebron) and Syria + + northamerica + Haiti following US/Canada rules for 2012 (and we're assuming, + for now anyway, for the future). + +Major changes from tzdata2011c to tzdata2011d: + + Morocco does not observe DST from Jul 20 03:00 to + Aug 20 02:00 [2012]. + + Infrastructure changes to accommodate how the tz + code and data are released on IANA. + +Major changes from tzdata2011d to tzdata2011e: + +* australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. + (Thanks to Steffen Thorsen.) + +* Use a single version number for both code and data. + +
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:06:07 UTC 2012 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: ticket 1456 To generate a diff of this commit: cvs rdiff -u -r1.1.2.246 -r1.1.2.247 src/doc/CHANGES-4.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-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.246 src/doc/CHANGES-4.1:1.1.2.247 --- src/doc/CHANGES-4.1:1.1.2.246 Wed Aug 22 20:02:25 2012 +++ src/doc/CHANGES-4.1 Sat Sep 15 09:06:06 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.246 2012/08/22 20:02:25 bouyer Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.247 2012/09/15 09:06:06 bouyer Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4701,3 +4701,54 @@ sys/arch/amd64/amd64/trap.c patch Fix potential stack frame corruption [spz, ticket #1454] +Apply patch, requested by apb in ticket #1456 + doc/3RDPARTY patch + share/zoneinfo/africapatch + share/zoneinfo/antarctica patch + share/zoneinfo/asiapatch + share/zoneinfo/australasia patch + share/zoneinfo/backwardpatch + share/zoneinfo/etceterapatch + share/zoneinfo/europepatch + share/zoneinfo/factorypatch + share/zoneinfo/iso3166.tab patch + share/zoneinfo/leapseconds patch + share/zoneinfo/northamerica patch + share/zoneinfo/pacificnew patch + share/zoneinfo/solar87patch + share/zoneinfo/solar88patch + share/zoneinfo/solar89patch + share/zoneinfo/southamerica patch + share/zoneinfo/systemvpatch + share/zoneinfo/yearistype.sh patch + share/zoneinfo/zone.tabpatch + +Update to tzdata2012e +Major changes from tzdata2011b to tzdata2011c: + + africa + Summer time changes for Morocco (to start late April 2012) + + asia + Changes for 2012 for Gaza the West Bank (Hebron) and Syria + + northamerica + Haiti following US/Canada rules for 2012 (and we're assuming, + for now anyway, for the future). + +Major changes from tzdata2011c to tzdata2011d: + + Morocco does not observe DST from Jul 20 03:00 to + Aug 20 02:00 [2012]. + + Infrastructure changes to accommodate how the tz + code and data are released on IANA. + +Major changes from tzdata2011d to tzdata2011e: + +* australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. + (Thanks to Steffen Thorsen.) + +* Use a single version number for both code and data. + +
CVS commit: [netbsd-4-0] src/dist/bind
Module Name:src
Committed By: bouyer
Date: Sat Sep 15 09:09:24 UTC 2012
Modified Files:
src/dist/bind [netbsd-4-0]: CHANGES version
src/dist/bind/lib/dns [netbsd-4-0]: master.c rdata.c rdataslab.c
src/dist/bind/lib/dns/include/dns [netbsd-4-0]: rdata.h
Log Message:
Apply patch, requested by spz in ticket #1457
dist/bind/CHANGES patch
dist/bind/version patch
dist/bind/lib/dns/master.c patch
dist/bind/lib/dns/rdata.c patch
dist/bind/lib/dns/rdataslab.c patch
dist/bind/lib/dns/include/dns/rdata.h patch
apply fix for CVE-2012-4244 (Named could die on specially crafted
record) from upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4.4.2.2.8 -r1.1.1.4.4.2.2.9 src/dist/bind/CHANGES
cvs rdiff -u -r1.1.1.4.4.3.2.7 -r1.1.1.4.4.3.2.8 src/dist/bind/version
cvs rdiff -u -r1.1.1.4.4.1.2.3 -r1.1.1.4.4.1.2.4 \
src/dist/bind/lib/dns/master.c
cvs rdiff -u -r1.1.1.3.4.1.2.2 -r1.1.1.3.4.1.2.3 \
src/dist/bind/lib/dns/rdata.c
cvs rdiff -u -r1.1.1.3.4.1.2.3 -r1.1.1.3.4.1.2.4 \
src/dist/bind/lib/dns/rdataslab.c
cvs rdiff -u -r1.1.1.3.4.1.2.1 -r1.1.1.3.4.1.2.2 \
src/dist/bind/lib/dns/include/dns/rdata.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/bind/CHANGES
diff -u src/dist/bind/CHANGES:1.1.1.4.4.2.2.8 src/dist/bind/CHANGES:1.1.1.4.4.2.2.9
--- src/dist/bind/CHANGES:1.1.1.4.4.2.2.8 Tue Jul 24 20:41:15 2012
+++ src/dist/bind/CHANGES Sat Sep 15 09:09:22 2012
@@ -1,3 +1,8 @@
+--- 9.4-ESV-R4-P2nb2: added patches from 9.7.6-P3 ---
+
+3364. [security] Named could die on specially crafted record.
+ [RT #30416]
+
--- 9.4-ESV-R4-P2nb1: added patches from 9.6-ESV-R7-P2 ---
3346. [security] Bad-cache data could be used before it was
Index: src/dist/bind/version
diff -u src/dist/bind/version:1.1.1.4.4.3.2.7 src/dist/bind/version:1.1.1.4.4.3.2.8
--- src/dist/bind/version:1.1.1.4.4.3.2.7 Tue Jul 24 20:41:15 2012
+++ src/dist/bind/version Sat Sep 15 09:09:22 2012
@@ -1,4 +1,4 @@
-# $Id: version,v 1.1.1.4.4.3.2.7 2012/07/24 20:41:15 riz Exp $
+# $Id: version,v 1.1.1.4.4.3.2.8 2012/09/15 09:09:22 bouyer Exp $
#
# This file must follow /bin/sh rules. It is imported directly via
# configure.
@@ -7,4 +7,4 @@ MAJORVER=9
MINORVER=4
PATCHVER=
RELEASETYPE=-ESV
-RELEASEVER=-R4-P2nb1
+RELEASEVER=-R4-P2nb2
Index: src/dist/bind/lib/dns/master.c
diff -u src/dist/bind/lib/dns/master.c:1.1.1.4.4.1.2.3 src/dist/bind/lib/dns/master.c:1.1.1.4.4.1.2.4
--- src/dist/bind/lib/dns/master.c:1.1.1.4.4.1.2.3 Sun Nov 20 13:02:16 2011
+++ src/dist/bind/lib/dns/master.c Sat Sep 15 09:09:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: master.c,v 1.1.1.4.4.1.2.3 2011/11/20 13:02:16 bouyer Exp $ */
+/* $NetBSD: master.c,v 1.1.1.4.4.1.2.4 2012/09/15 09:09:23 bouyer Exp $ */
/*
* Copyright (C) 2004-2009 Internet Systems Consortium, Inc. (ISC)
@@ -77,7 +77,7 @@
/*%
* max message size - header - root - type - class - ttl - rdlen
*/
-#define MINTSIZ (65535 - 12 - 1 - 2 - 2 - 4 - 2)
+#define MINTSIZ DNS_RDATA_MAXLENGTH
/*%
* Size for tokens in the presentation format,
* The largest tokens are the base64 blocks in KEY and CERT records,
Index: src/dist/bind/lib/dns/rdata.c
diff -u src/dist/bind/lib/dns/rdata.c:1.1.1.3.4.1.2.2 src/dist/bind/lib/dns/rdata.c:1.1.1.3.4.1.2.3
--- src/dist/bind/lib/dns/rdata.c:1.1.1.3.4.1.2.2 Tue Jun 5 20:01:32 2012
+++ src/dist/bind/lib/dns/rdata.c Sat Sep 15 09:09:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rdata.c,v 1.1.1.3.4.1.2.2 2012/06/05 20:01:32 bouyer Exp $ */
+/* $NetBSD: rdata.c,v 1.1.1.3.4.1.2.3 2012/09/15 09:09:23 bouyer Exp $ */
/*
* Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. (ISC)
@@ -407,6 +407,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
isc_buffer_t st;
isc_boolean_t use_default = ISC_FALSE;
isc_uint32_t activelength;
+ size_t length;
REQUIRE(dctx != NULL);
if (rdata != NULL) {
@@ -437,6 +438,14 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
}
/*
+ * Reject any rdata that expands out to more than DNS_RDATA_MAXLENGTH
+ * as we cannot transmit it.
+ */
+ length = isc_buffer_usedlength(target) - isc_buffer_usedlength(st);
+ if (result == ISC_R_SUCCESS length DNS_RDATA_MAXLENGTH)
+ result = DNS_R_FORMERR;
+
+ /*
* We should have consumed all of our buffer.
*/
if (result == ISC_R_SUCCESS !buffer_empty(source))
@@ -444,8 +453,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
if (rdata != NULL result == ISC_R_SUCCESS) {
region.base = isc_buffer_used(st);
- region.length = isc_buffer_usedlength(target) -
-isc_buffer_usedlength(st);
+ region.length = length;
dns_rdata_fromregion(rdata, rdclass, type, region);
}
@@ -580,6 +588,7 @@
CVS commit: [netbsd-4] src/dist/bind
Module Name:src
Committed By: bouyer
Date: Sat Sep 15 09:09:33 UTC 2012
Modified Files:
src/dist/bind [netbsd-4]: CHANGES version
src/dist/bind/lib/dns [netbsd-4]: master.c rdata.c rdataslab.c
src/dist/bind/lib/dns/include/dns [netbsd-4]: rdata.h
Log Message:
Apply patch, requested by spz in ticket #1457
dist/bind/CHANGES patch
dist/bind/version patch
dist/bind/lib/dns/master.c patch
dist/bind/lib/dns/rdata.c patch
dist/bind/lib/dns/rdataslab.c patch
dist/bind/lib/dns/include/dns/rdata.h patch
apply fix for CVE-2012-4244 (Named could die on specially crafted
record) from upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4.4.10 -r1.1.1.4.4.11 src/dist/bind/CHANGES \
src/dist/bind/version
cvs rdiff -u -r1.1.1.4.4.4 -r1.1.1.4.4.5 src/dist/bind/lib/dns/master.c
cvs rdiff -u -r1.1.1.3.4.3 -r1.1.1.3.4.4 src/dist/bind/lib/dns/rdata.c
cvs rdiff -u -r1.1.1.3.4.4 -r1.1.1.3.4.5 src/dist/bind/lib/dns/rdataslab.c
cvs rdiff -u -r1.1.1.3.4.2 -r1.1.1.3.4.3 \
src/dist/bind/lib/dns/include/dns/rdata.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/bind/CHANGES
diff -u src/dist/bind/CHANGES:1.1.1.4.4.10 src/dist/bind/CHANGES:1.1.1.4.4.11
--- src/dist/bind/CHANGES:1.1.1.4.4.10 Tue Jul 24 20:38:38 2012
+++ src/dist/bind/CHANGES Sat Sep 15 09:09:31 2012
@@ -1,3 +1,8 @@
+--- 9.4-ESV-R4-P2nb2: added patches from 9.7.6-P3 ---
+
+3364. [security] Named could die on specially crafted record.
+ [RT #30416]
+
--- 9.4-ESV-R4-P2nb1: added patches from 9.6-ESV-R7-P2 ---
3346. [security] Bad-cache data could be used before it was
Index: src/dist/bind/version
diff -u src/dist/bind/version:1.1.1.4.4.10 src/dist/bind/version:1.1.1.4.4.11
--- src/dist/bind/version:1.1.1.4.4.10 Tue Jul 24 20:38:38 2012
+++ src/dist/bind/version Sat Sep 15 09:09:31 2012
@@ -1,4 +1,4 @@
-# $Id: version,v 1.1.1.4.4.10 2012/07/24 20:38:38 riz Exp $
+# $Id: version,v 1.1.1.4.4.11 2012/09/15 09:09:31 bouyer Exp $
#
# This file must follow /bin/sh rules. It is imported directly via
# configure.
@@ -7,4 +7,4 @@ MAJORVER=9
MINORVER=4
PATCHVER=
RELEASETYPE=-ESV
-RELEASEVER=-R4-P2nb1
+RELEASEVER=-R4-P2nb2
Index: src/dist/bind/lib/dns/master.c
diff -u src/dist/bind/lib/dns/master.c:1.1.1.4.4.4 src/dist/bind/lib/dns/master.c:1.1.1.4.4.5
--- src/dist/bind/lib/dns/master.c:1.1.1.4.4.4 Sun Nov 20 13:02:27 2011
+++ src/dist/bind/lib/dns/master.c Sat Sep 15 09:09:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: master.c,v 1.1.1.4.4.4 2011/11/20 13:02:27 bouyer Exp $ */
+/* $NetBSD: master.c,v 1.1.1.4.4.5 2012/09/15 09:09:32 bouyer Exp $ */
/*
* Copyright (C) 2004-2009 Internet Systems Consortium, Inc. (ISC)
@@ -77,7 +77,7 @@
/*%
* max message size - header - root - type - class - ttl - rdlen
*/
-#define MINTSIZ (65535 - 12 - 1 - 2 - 2 - 4 - 2)
+#define MINTSIZ DNS_RDATA_MAXLENGTH
/*%
* Size for tokens in the presentation format,
* The largest tokens are the base64 blocks in KEY and CERT records,
Index: src/dist/bind/lib/dns/rdata.c
diff -u src/dist/bind/lib/dns/rdata.c:1.1.1.3.4.3 src/dist/bind/lib/dns/rdata.c:1.1.1.3.4.4
--- src/dist/bind/lib/dns/rdata.c:1.1.1.3.4.3 Tue Jun 5 20:01:02 2012
+++ src/dist/bind/lib/dns/rdata.c Sat Sep 15 09:09:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rdata.c,v 1.1.1.3.4.3 2012/06/05 20:01:02 bouyer Exp $ */
+/* $NetBSD: rdata.c,v 1.1.1.3.4.4 2012/09/15 09:09:32 bouyer Exp $ */
/*
* Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. (ISC)
@@ -407,6 +407,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
isc_buffer_t st;
isc_boolean_t use_default = ISC_FALSE;
isc_uint32_t activelength;
+ size_t length;
REQUIRE(dctx != NULL);
if (rdata != NULL) {
@@ -437,6 +438,14 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
}
/*
+ * Reject any rdata that expands out to more than DNS_RDATA_MAXLENGTH
+ * as we cannot transmit it.
+ */
+ length = isc_buffer_usedlength(target) - isc_buffer_usedlength(st);
+ if (result == ISC_R_SUCCESS length DNS_RDATA_MAXLENGTH)
+ result = DNS_R_FORMERR;
+
+ /*
* We should have consumed all of our buffer.
*/
if (result == ISC_R_SUCCESS !buffer_empty(source))
@@ -444,8 +453,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, d
if (rdata != NULL result == ISC_R_SUCCESS) {
region.base = isc_buffer_used(st);
- region.length = isc_buffer_usedlength(target) -
-isc_buffer_usedlength(st);
+ region.length = length;
dns_rdata_fromregion(rdata, rdclass, type, region);
}
@@ -580,6 +588,7 @@ dns_rdata_fromtext(dns_rdata_t *rdata, d
unsigned long line;
void (*callback)(dns_rdatacallbacks_t *, const char *, ...);
isc_result_t tresult;
+ size_t length;
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:09:58 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: ticket 1457 To generate a diff of this commit: cvs rdiff -u -r1.1.2.106 -r1.1.2.107 src/doc/CHANGES-4.0.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-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.106 src/doc/CHANGES-4.0.2:1.1.2.107 --- src/doc/CHANGES-4.0.2:1.1.2.106 Sat Sep 15 09:05:52 2012 +++ src/doc/CHANGES-4.0.2 Sat Sep 15 09:09:58 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.106 2012/09/15 09:05:52 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.107 2012/09/15 09:09:58 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1469,3 +1469,14 @@ Major changes from tzdata2011d to tzdata * Use a single version number for both code and data. +dist/bind/CHANGES patch +dist/bind/version patch +dist/bind/lib/dns/master.cpatch +dist/bind/lib/dns/rdata.cpatch +dist/bind/lib/dns/rdataslab.cpatch +dist/bind/lib/dns/include/dns/rdata.h patch + + apply fix for CVE-2012-4244 (Named could die on specially crafted + record) from upstream. + [spz, ticket #1457] +
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:10:11 UTC 2012 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: ticket 1457 To generate a diff of this commit: cvs rdiff -u -r1.1.2.247 -r1.1.2.248 src/doc/CHANGES-4.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-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.247 src/doc/CHANGES-4.1:1.1.2.248 --- src/doc/CHANGES-4.1:1.1.2.247 Sat Sep 15 09:06:06 2012 +++ src/doc/CHANGES-4.1 Sat Sep 15 09:10:11 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.247 2012/09/15 09:06:06 bouyer Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.248 2012/09/15 09:10:11 bouyer Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4752,3 +4752,14 @@ Major changes from tzdata2011d to tzdata * Use a single version number for both code and data. +dist/bind/CHANGES patch +dist/bind/version patch +dist/bind/lib/dns/master.cpatch +dist/bind/lib/dns/rdata.cpatch +dist/bind/lib/dns/rdataslab.cpatch +dist/bind/lib/dns/include/dns/rdata.h patch + + apply fix for CVE-2012-4244 (Named could die on specially crafted + record) from upstream. + [spz, ticket #1457] +
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:23:03 UTC 2012 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Fix formatting of entry 1456 To generate a diff of this commit: cvs rdiff -u -r1.1.2.248 -r1.1.2.249 src/doc/CHANGES-4.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-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.248 src/doc/CHANGES-4.1:1.1.2.249 --- src/doc/CHANGES-4.1:1.1.2.248 Sat Sep 15 09:10:11 2012 +++ src/doc/CHANGES-4.1 Sat Sep 15 09:23:03 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.248 2012/09/15 09:10:11 bouyer Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.249 2012/09/15 09:23:03 bouyer Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4701,56 +4701,47 @@ sys/arch/amd64/amd64/trap.c patch Fix potential stack frame corruption [spz, ticket #1454] -Apply patch, requested by apb in ticket #1456 - doc/3RDPARTY patch - share/zoneinfo/africapatch - share/zoneinfo/antarctica patch - share/zoneinfo/asiapatch - share/zoneinfo/australasia patch - share/zoneinfo/backwardpatch - share/zoneinfo/etceterapatch - share/zoneinfo/europepatch - share/zoneinfo/factorypatch - share/zoneinfo/iso3166.tab patch - share/zoneinfo/leapseconds patch - share/zoneinfo/northamerica patch - share/zoneinfo/pacificnew patch - share/zoneinfo/solar87patch - share/zoneinfo/solar88patch - share/zoneinfo/solar89patch - share/zoneinfo/southamerica patch - share/zoneinfo/systemvpatch - share/zoneinfo/yearistype.sh patch - share/zoneinfo/zone.tabpatch - -Update to tzdata2012e -Major changes from tzdata2011b to tzdata2011c: - - africa - Summer time changes for Morocco (to start late April 2012) - - asia - Changes for 2012 for Gaza the West Bank (Hebron) and Syria - - northamerica - Haiti following US/Canada rules for 2012 (and we're assuming, - for now anyway, for the future). - -Major changes from tzdata2011c to tzdata2011d: - - Morocco does not observe DST from Jul 20 03:00 to - Aug 20 02:00 [2012]. - - Infrastructure changes to accommodate how the tz - code and data are released on IANA. - -Major changes from tzdata2011d to tzdata2011e: - -* australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. - (Thanks to Steffen Thorsen.) +doc/3RDPARTY patch +share/zoneinfo/africapatch +share/zoneinfo/antarctica patch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/backwardpatch +share/zoneinfo/etceterapatch +share/zoneinfo/europepatch +share/zoneinfo/factorypatch +share/zoneinfo/iso3166.tab patch +share/zoneinfo/leapseconds patch +share/zoneinfo/northamerica patch +share/zoneinfo/pacificnew patch +share/zoneinfo/solar87patch +share/zoneinfo/solar88patch +share/zoneinfo/solar89patch +share/zoneinfo/southamerica patch +share/zoneinfo/systemvpatch +share/zoneinfo/yearistype.sh patch +share/zoneinfo/zone.tabpatch -* Use a single version number for both code and data. + Update to tzdata2012e + Major changes from tzdata2011b to tzdata2011c: + africa + Summer time changes for Morocco (to start late April 2012) + asia + Changes for 2012 for Gaza the West Bank (Hebron) and Syria + northamerica + Haiti following US/Canada rules for 2012 (and we're assuming, + for now anyway, for the future). + + Major changes from tzdata2011c to tzdata2011d: + Morocco does not observe DST from Jul 20 03:00 to + Aug 20 02:00 [2012]. + + Major changes from tzdata2011d to tzdata2011e: + * australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. + (Thanks to Steffen Thorsen.) + * Use a single version number for both code and data. + [apb, ticket #1456] dist/bind/CHANGES patch dist/bind/version patch
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:24:51 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Fix entry for ticket 1456 To generate a diff of this commit: cvs rdiff -u -r1.1.2.107 -r1.1.2.108 src/doc/CHANGES-4.0.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-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.107 src/doc/CHANGES-4.0.2:1.1.2.108 --- src/doc/CHANGES-4.0.2:1.1.2.107 Sat Sep 15 09:09:58 2012 +++ src/doc/CHANGES-4.0.2 Sat Sep 15 09:24:50 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.107 2012/09/15 09:09:58 bouyer Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.108 2012/09/15 09:24:50 bouyer Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1418,55 +1418,46 @@ sys/arch/amd64/amd64/trap.c patch Fix potential stack frame corruption [spz, ticket #1454] -Apply patch, requested by apb in ticket #1456 - doc/3RDPARTY patch - share/zoneinfo/africapatch - share/zoneinfo/antarctica patch - share/zoneinfo/asiapatch - share/zoneinfo/australasia patch - share/zoneinfo/backwardpatch - share/zoneinfo/etceterapatch - share/zoneinfo/europepatch - share/zoneinfo/factorypatch - share/zoneinfo/iso3166.tab patch - share/zoneinfo/leapseconds patch - share/zoneinfo/northamerica patch - share/zoneinfo/pacificnew patch - share/zoneinfo/solar87patch - share/zoneinfo/solar88patch - share/zoneinfo/solar89patch - share/zoneinfo/southamerica patch - share/zoneinfo/systemvpatch - share/zoneinfo/yearistype.sh patch - share/zoneinfo/zone.tabpatch - -Update to tzdata2012e -Major changes from tzdata2011b to tzdata2011c: - - africa - Summer time changes for Morocco (to start late April 2012) - - asia - Changes for 2012 for Gaza the West Bank (Hebron) and Syria - - northamerica - Haiti following US/Canada rules for 2012 (and we're assuming, - for now anyway, for the future). - -Major changes from tzdata2011c to tzdata2011d: - - Morocco does not observe DST from Jul 20 03:00 to - Aug 20 02:00 [2012]. - - Infrastructure changes to accommodate how the tz - code and data are released on IANA. - -Major changes from tzdata2011d to tzdata2011e: +doc/3RDPARTY patch +share/zoneinfo/africapatch +share/zoneinfo/antarctica patch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/backwardpatch +share/zoneinfo/etceterapatch +share/zoneinfo/europepatch +share/zoneinfo/factorypatch +share/zoneinfo/iso3166.tab patch +share/zoneinfo/leapseconds patch +share/zoneinfo/northamerica patch +share/zoneinfo/pacificnew patch +share/zoneinfo/solar87patch +share/zoneinfo/solar88patch +share/zoneinfo/solar89patch +share/zoneinfo/southamerica patch +share/zoneinfo/systemvpatch +share/zoneinfo/yearistype.sh patch +share/zoneinfo/zone.tabpatch -* australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. - (Thanks to Steffen Thorsen.) + Update to tzdata2012e + Major changes from tzdata2011b to tzdata2011c: + africa + Summer time changes for Morocco (to start late April 2012) + asia + Changes for 2012 for Gaza the West Bank (Hebron) and Syria + northamerica + Haiti following US/Canada rules for 2012 (and we're assuming, + for now anyway, for the future). + + Major changes from tzdata2011c to tzdata2011d: + Morocco does not observe DST from Jul 20 03:00 to + Aug 20 02:00 [2012]. + Major changes from tzdata2011d to tzdata2011e: + * australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. + (Thanks to Steffen Thorsen.) + * Use a single version number for both code and data. -* Use a single version number for both code and data. + [apb, ticket #1456] dist/bind/CHANGES patch
CVS commit: [netbsd-5-0] src
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:26:30 UTC 2012 Modified Files: src/doc [netbsd-5-0]: 3RDPARTY src/share/zoneinfo [netbsd-5-0]: africa antarctica asia australasia backward etcetera europe factory iso3166.tab leapseconds northamerica pacificnew solar87 solar88 solar89 southamerica systemv yearistype.sh zone.tab Log Message: Apply patch, requested by apb in ticket #1783 doc/3RDPARTYpatch share/zoneinfo/africa patch share/zoneinfo/antarctica patch share/zoneinfo/asia patch share/zoneinfo/australasia patch share/zoneinfo/backward patch share/zoneinfo/etcetera patch share/zoneinfo/europe patch share/zoneinfo/factory patch share/zoneinfo/iso3166.tab patch share/zoneinfo/leapseconds patch share/zoneinfo/northamerica patch share/zoneinfo/pacificnew patch share/zoneinfo/solar87 patch share/zoneinfo/solar88 patch share/zoneinfo/solar89 patch share/zoneinfo/southamerica patch share/zoneinfo/systemv patch share/zoneinfo/yearistype.shpatch share/zoneinfo/zone.tab patch Update to tzdata2012e Major changes from tzdata2011b to tzdata2011c: africa Summer time changes for Morocco (to start late April 2012) asia Changes for 2012 for Gaza the West Bank (Hebron) and Syria northamerica Haiti following US/Canada rules for 2012 (and we're assuming, for now anyway, for the future). Major changes from tzdata2011c to tzdata2011d: Morocco does not observe DST from Jul 20 03:00 to Aug 20 02:00 [2012]. Infrastructure changes to accommodate how the tz code and data are released on IANA. Major changes from tzdata2011d to tzdata2011e: * australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. (Thanks to Steffen Thorsen.) * Use a single version number for both code and data. To generate a diff of this commit: cvs rdiff -u -r1.647.2.6.2.6 -r1.647.2.6.2.7 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.27.6.1 -r1.1.1.27.6.2 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.17.16.2 -r1.1.1.17.16.3 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.44.6.2 -r1.1.1.44.6.3 src/share/zoneinfo/asia cvs rdiff -u -r1.17.6.2 -r1.17.6.3 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.19.6.1 -r1.1.1.19.6.2 src/share/zoneinfo/backward cvs rdiff -u -r1.1.1.6.28.1 -r1.1.1.6.28.2 src/share/zoneinfo/etcetera cvs rdiff -u -r1.1.1.38.6.2 -r1.1.1.38.6.3 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.3.28.1 -r1.1.1.3.28.2 src/share/zoneinfo/factory \ src/share/zoneinfo/pacificnew src/share/zoneinfo/solar87 \ src/share/zoneinfo/solar88 src/share/zoneinfo/solar89 cvs rdiff -u -r1.1.1.17.6.1 -r1.1.1.17.6.2 src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.15.6.2 -r1.1.1.15.6.3 src/share/zoneinfo/leapseconds cvs rdiff -u -r1.1.1.42.6.3 -r1.1.1.42.6.4 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.42.6.2 -r1.1.1.42.6.3 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.4.28.1 -r1.1.1.4.28.2 src/share/zoneinfo/systemv cvs rdiff -u -r1.6 -r1.6.28.1 src/share/zoneinfo/yearistype.sh cvs rdiff -u -r1.1.1.33.6.3 -r1.1.1.33.6.4 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.647.2.6.2.6 src/doc/3RDPARTY:1.647.2.6.2.7 --- src/doc/3RDPARTY:1.647.2.6.2.6 Fri Mar 2 17:43:43 2012 +++ src/doc/3RDPARTY Sat Sep 15 09:26:27 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.6.2.6 2012/03/02 17:43:43 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.6.2.7 2012/09/15 09:26:27 bouyer Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,16 +924,18 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2012b / tzdata2012b -Current Vers: tzcode2011i / tzdata2012b +Version: tzcode2004a / tzdata2012e +Current Vers: tzcode2012e / tzdata2012e Maintainer: Arthur David Olson a...@elsie.nci.nih.gov Maintainer: Robert Elz k...@munnari.oz.au -Archive Site: ftp://elsie.nci.nih.gov/pub/ +Archive Site:
CVS commit: [netbsd-5] src
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:26:44 UTC 2012 Modified Files: src/doc [netbsd-5]: 3RDPARTY src/share/zoneinfo [netbsd-5]: africa antarctica asia australasia backward etcetera europe factory iso3166.tab leapseconds northamerica pacificnew solar87 solar88 solar89 southamerica systemv yearistype.sh zone.tab Log Message: Apply patch, requested by apb in ticket #1783 doc/3RDPARTYpatch share/zoneinfo/africa patch share/zoneinfo/antarctica patch share/zoneinfo/asia patch share/zoneinfo/australasia patch share/zoneinfo/backward patch share/zoneinfo/etcetera patch share/zoneinfo/europe patch share/zoneinfo/factory patch share/zoneinfo/iso3166.tab patch share/zoneinfo/leapseconds patch share/zoneinfo/northamerica patch share/zoneinfo/pacificnew patch share/zoneinfo/solar87 patch share/zoneinfo/solar88 patch share/zoneinfo/solar89 patch share/zoneinfo/southamerica patch share/zoneinfo/systemv patch share/zoneinfo/yearistype.shpatch share/zoneinfo/zone.tab patch Update to tzdata2012e Major changes from tzdata2011b to tzdata2011c: africa Summer time changes for Morocco (to start late April 2012) asia Changes for 2012 for Gaza the West Bank (Hebron) and Syria northamerica Haiti following US/Canada rules for 2012 (and we're assuming, for now anyway, for the future). Major changes from tzdata2011c to tzdata2011d: Morocco does not observe DST from Jul 20 03:00 to Aug 20 02:00 [2012]. Infrastructure changes to accommodate how the tz code and data are released on IANA. Major changes from tzdata2011d to tzdata2011e: * australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. (Thanks to Steffen Thorsen.) * Use a single version number for both code and data. To generate a diff of this commit: cvs rdiff -u -r1.647.2.17 -r1.647.2.18 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.27.2.1 -r1.1.1.27.2.2 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.17.12.2 -r1.1.1.17.12.3 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.44.2.2 -r1.1.1.44.2.3 src/share/zoneinfo/asia cvs rdiff -u -r1.17.2.2 -r1.17.2.3 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.19.2.1 -r1.1.1.19.2.2 src/share/zoneinfo/backward cvs rdiff -u -r1.1.1.6.24.1 -r1.1.1.6.24.2 src/share/zoneinfo/etcetera cvs rdiff -u -r1.1.1.38.2.2 -r1.1.1.38.2.3 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.3.24.1 -r1.1.1.3.24.2 src/share/zoneinfo/factory \ src/share/zoneinfo/pacificnew src/share/zoneinfo/solar87 \ src/share/zoneinfo/solar88 src/share/zoneinfo/solar89 cvs rdiff -u -r1.1.1.17.2.1 -r1.1.1.17.2.2 src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.15.2.2 -r1.1.1.15.2.3 src/share/zoneinfo/leapseconds cvs rdiff -u -r1.1.1.42.2.3 -r1.1.1.42.2.4 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.42.2.2 -r1.1.1.42.2.3 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.4.24.1 -r1.1.1.4.24.2 src/share/zoneinfo/systemv cvs rdiff -u -r1.6 -r1.6.24.1 src/share/zoneinfo/yearistype.sh cvs rdiff -u -r1.1.1.33.2.3 -r1.1.1.33.2.4 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.647.2.17 src/doc/3RDPARTY:1.647.2.18 --- src/doc/3RDPARTY:1.647.2.17 Fri Mar 2 17:42:47 2012 +++ src/doc/3RDPARTY Sat Sep 15 09:26:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.17 2012/03/02 17:42:47 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.18 2012/09/15 09:26:41 bouyer Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,16 +924,18 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2012b / tzdata2012b -Current Vers: tzcode2011i / tzdata2012b +Version: tzcode2004a / tzdata2012e +Current Vers: tzcode2012e / tzdata2012e Maintainer: Arthur David Olson a...@elsie.nci.nih.gov Maintainer: Robert Elz k...@munnari.oz.au -Archive Site: ftp://elsie.nci.nih.gov/pub/ +Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site:
CVS commit: [netbsd-5-1] src
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:26:54 UTC 2012 Modified Files: src/doc [netbsd-5-1]: 3RDPARTY src/share/zoneinfo [netbsd-5-1]: africa antarctica asia australasia backward etcetera europe factory iso3166.tab leapseconds northamerica pacificnew solar87 solar88 solar89 southamerica systemv yearistype.sh zone.tab Log Message: Apply patch, requested by apb in ticket #1783 doc/3RDPARTYpatch share/zoneinfo/africa patch share/zoneinfo/antarctica patch share/zoneinfo/asia patch share/zoneinfo/australasia patch share/zoneinfo/backward patch share/zoneinfo/etcetera patch share/zoneinfo/europe patch share/zoneinfo/factory patch share/zoneinfo/iso3166.tab patch share/zoneinfo/leapseconds patch share/zoneinfo/northamerica patch share/zoneinfo/pacificnew patch share/zoneinfo/solar87 patch share/zoneinfo/solar88 patch share/zoneinfo/solar89 patch share/zoneinfo/southamerica patch share/zoneinfo/systemv patch share/zoneinfo/yearistype.shpatch share/zoneinfo/zone.tab patch Update to tzdata2012e Major changes from tzdata2011b to tzdata2011c: africa Summer time changes for Morocco (to start late April 2012) asia Changes for 2012 for Gaza the West Bank (Hebron) and Syria northamerica Haiti following US/Canada rules for 2012 (and we're assuming, for now anyway, for the future). Major changes from tzdata2011c to tzdata2011d: Morocco does not observe DST from Jul 20 03:00 to Aug 20 02:00 [2012]. Infrastructure changes to accommodate how the tz code and data are released on IANA. Major changes from tzdata2011d to tzdata2011e: * australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. (Thanks to Steffen Thorsen.) * Use a single version number for both code and data. To generate a diff of this commit: cvs rdiff -u -r1.647.2.12.2.3 -r1.647.2.12.2.4 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.27.10.1 -r1.1.1.27.10.2 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.17.20.2 -r1.1.1.17.20.3 src/share/zoneinfo/antarctica cvs rdiff -u -r1.1.1.44.10.2 -r1.1.1.44.10.3 src/share/zoneinfo/asia cvs rdiff -u -r1.17.10.2 -r1.17.10.3 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.19.10.1 -r1.1.1.19.10.2 src/share/zoneinfo/backward cvs rdiff -u -r1.1.1.6.32.1 -r1.1.1.6.32.2 src/share/zoneinfo/etcetera cvs rdiff -u -r1.1.1.38.10.2 -r1.1.1.38.10.3 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.3.32.1 -r1.1.1.3.32.2 src/share/zoneinfo/factory \ src/share/zoneinfo/pacificnew src/share/zoneinfo/solar87 \ src/share/zoneinfo/solar88 src/share/zoneinfo/solar89 cvs rdiff -u -r1.1.1.17.10.1 -r1.1.1.17.10.2 src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.15.10.2 -r1.1.1.15.10.3 src/share/zoneinfo/leapseconds cvs rdiff -u -r1.1.1.42.10.3 -r1.1.1.42.10.4 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.42.10.2 -r1.1.1.42.10.3 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.4.32.1 -r1.1.1.4.32.2 src/share/zoneinfo/systemv cvs rdiff -u -r1.6 -r1.6.32.1 src/share/zoneinfo/yearistype.sh cvs rdiff -u -r1.1.1.33.10.3 -r1.1.1.33.10.4 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.647.2.12.2.3 src/doc/3RDPARTY:1.647.2.12.2.4 --- src/doc/3RDPARTY:1.647.2.12.2.3 Fri Mar 2 17:44:36 2012 +++ src/doc/3RDPARTY Sat Sep 15 09:26:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.12.2.3 2012/03/02 17:44:36 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.12.2.4 2012/09/15 09:26:52 bouyer Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,16 +924,18 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2012b / tzdata2012b -Current Vers: tzcode2011i / tzdata2012b +Version: tzcode2004a / tzdata2012e +Current Vers: tzcode2012e / tzdata2012e Maintainer: Arthur David Olson a...@elsie.nci.nih.gov Maintainer: Robert Elz k...@munnari.oz.au -Archive Site: ftp://elsie.nci.nih.gov/pub/ +Archive Site:
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:27:18 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: ticket 1783 To generate a diff of this commit: cvs rdiff -u -r1.1.2.181 -r1.1.2.182 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.181 src/doc/CHANGES-5.2:1.1.2.182 --- src/doc/CHANGES-5.2:1.1.2.181 Thu Sep 13 23:59:18 2012 +++ src/doc/CHANGES-5.2 Sat Sep 15 09:27:17 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.181 2012/09/13 23:59:18 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.182 2012/09/15 09:27:17 bouyer Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -8543,3 +8543,45 @@ dist/bind/lib/dns/include/dns/rdata.h p Apply fix for CVE-2012-4244 from upstream. [1796, ticket #spz] +doc/3RDPARTY patch +share/zoneinfo/africa patch +share/zoneinfo/antarcticapatch +share/zoneinfo/asia patch +share/zoneinfo/australasiapatch +share/zoneinfo/backward patch +share/zoneinfo/etcetera patch +share/zoneinfo/europe patch +share/zoneinfo/factory patch +share/zoneinfo/iso3166.tabpatch +share/zoneinfo/leapsecondspatch +share/zoneinfo/northamericapatch +share/zoneinfo/pacificnewpatch +share/zoneinfo/solar87 patch +share/zoneinfo/solar88 patch +share/zoneinfo/solar89 patch +share/zoneinfo/southamericapatch +share/zoneinfo/systemv patch +share/zoneinfo/yearistype.shpatch +share/zoneinfo/zone.tab patch + + Update to tzdata2012e + Major changes from tzdata2011b to tzdata2011c: + africa + Summer time changes for Morocco (to start late April 2012) + asia + Changes for 2012 for Gaza the West Bank (Hebron) and Syria + + northamerica + Haiti following US/Canada rules for 2012 (and we're assuming, + for now anyway, for the future). + + Major changes from tzdata2011c to tzdata2011d: + Morocco does not observe DST from Jul 20 03:00 to + Aug 20 02:00 [2012]. + + Major changes from tzdata2011d to tzdata2011e: + * australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. + (Thanks to Steffen Thorsen.) + * Use a single version number for both code and data. + [apb, ticket #1783] +
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:27:32 UTC 2012 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: ticket 1783 To generate a diff of this commit: cvs rdiff -u -r1.1.2.22 -r1.1.2.23 src/doc/CHANGES-5.1.3 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.1.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.22 src/doc/CHANGES-5.1.3:1.1.2.23 --- src/doc/CHANGES-5.1.3:1.1.2.22 Fri Sep 14 00:00:19 2012 +++ src/doc/CHANGES-5.1.3 Sat Sep 15 09:27:32 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.22 2012/09/14 00:00:19 riz Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.23 2012/09/15 09:27:32 bouyer Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -2154,3 +2154,45 @@ dist/bind/lib/dns/include/dns/rdata.h p Apply fix for CVE-2012-4244 from upstream. [1796, ticket #spz] +doc/3RDPARTY patch +share/zoneinfo/africa patch +share/zoneinfo/antarcticapatch +share/zoneinfo/asia patch +share/zoneinfo/australasiapatch +share/zoneinfo/backward patch +share/zoneinfo/etcetera patch +share/zoneinfo/europe patch +share/zoneinfo/factory patch +share/zoneinfo/iso3166.tabpatch +share/zoneinfo/leapsecondspatch +share/zoneinfo/northamericapatch +share/zoneinfo/pacificnewpatch +share/zoneinfo/solar87 patch +share/zoneinfo/solar88 patch +share/zoneinfo/solar89 patch +share/zoneinfo/southamericapatch +share/zoneinfo/systemv patch +share/zoneinfo/yearistype.shpatch +share/zoneinfo/zone.tab patch + + Update to tzdata2012e + Major changes from tzdata2011b to tzdata2011c: + africa + Summer time changes for Morocco (to start late April 2012) + asia + Changes for 2012 for Gaza the West Bank (Hebron) and Syria + + northamerica + Haiti following US/Canada rules for 2012 (and we're assuming, + for now anyway, for the future). + + Major changes from tzdata2011c to tzdata2011d: + Morocco does not observe DST from Jul 20 03:00 to + Aug 20 02:00 [2012]. + + Major changes from tzdata2011d to tzdata2011e: + * australasia (Pacific/Fakaofo): Tokelau is UTC+13, not UTC+14. + (Thanks to Steffen Thorsen.) + * Use a single version number for both code and data. + [apb, ticket #1783] +
CVS commit: [netbsd-5] src/sys/dev/ic
Module Name:src
Committed By: bouyer
Date: Sat Sep 15 09:32:36 UTC 2012
Modified Files:
src/sys/dev/ic [netbsd-5]: gem.c gemreg.h gemvar.h
Log Message:
Pull up following revision(s) (requested by jdc in ticket #1789):
sys/dev/ic/gem.c: revision 1.99 via patch
sys/dev/ic/gemvar.h: revision 1.24 via patch
sys/dev/ic/gemreg.h: revision 1.15 via patch
Apply lockup fixes from Havard Eidnes/OpenBSD in PR port-sparc64/46260:
- add an additional watchdog for RX overflow
- re-initialise the chip on device timeout
Also alter the interrupt blanking rate to 8 packets, as per OpenSolaris.
To generate a diff of this commit:
cvs rdiff -u -r1.78.4.2 -r1.78.4.3 src/sys/dev/ic/gem.c
cvs rdiff -u -r1.14 -r1.14.4.1 src/sys/dev/ic/gemreg.h
cvs rdiff -u -r1.18 -r1.18.20.1 src/sys/dev/ic/gemvar.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/ic/gem.c
diff -u src/sys/dev/ic/gem.c:1.78.4.2 src/sys/dev/ic/gem.c:1.78.4.3
--- src/sys/dev/ic/gem.c:1.78.4.2 Sat Jun 18 16:40:31 2011
+++ src/sys/dev/ic/gem.c Sat Sep 15 09:32:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: gem.c,v 1.78.4.2 2011/06/18 16:40:31 bouyer Exp $ */
+/* $NetBSD: gem.c,v 1.78.4.3 2012/09/15 09:32:36 bouyer Exp $ */
/*
*
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gem.c,v 1.78.4.2 2011/06/18 16:40:31 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: gem.c,v 1.78.4.3 2012/09/15 09:32:36 bouyer Exp $);
#include opt_inet.h
#include bpfilter.h
@@ -93,6 +93,8 @@ static void gem_stop(struct ifnet *, int
int gem_ioctl(struct ifnet *, u_long, void *);
void gem_tick(void *);
void gem_watchdog(struct ifnet *);
+void gem_rx_watchdog(void *);
+void gem_pcs_start(struct gem_softc *sc);
void gem_shutdown(void *);
void gem_pcs_start(struct gem_softc *sc);
void gem_pcs_stop(struct gem_softc *sc, int);
@@ -504,6 +506,8 @@ gem_attach(sc, enaddr)
#endif
callout_init(sc-sc_tick_ch, 0);
+ callout_init(sc-sc_rx_watchdog, 0);
+ callout_setfunc(sc-sc_rx_watchdog, gem_rx_watchdog, sc);
return;
/*
@@ -691,6 +695,8 @@ gem_reset_rx(struct gem_softc *sc)
/* Wait till it finishes */
if (!gem_bitwait(sc, h, GEM_RX_CONFIG, 1, 0))
aprint_error_dev(sc-sc_dev, cannot disable read dma\n);
+ /* Wait 5ms extra. */
+ delay(5000);
/* Finally, reset the ERX */
bus_space_write_4(t, h2, GEM_RESET, GEM_RESET_RX);
@@ -775,7 +781,7 @@ gem_rx_common(struct gem_softc *sc)
(3 * sc-sc_rxfifosize / 256) |
((sc-sc_rxfifosize / 256) 12));
bus_space_write_4(t, h, GEM_RX_BLANKING,
- (6 GEM_RX_BLANKING_TIME_SHIFT) | 6);
+ (6 GEM_RX_BLANKING_TIME_SHIFT) | 8);
}
/*
@@ -1762,6 +1768,8 @@ gem_rint(sc)
if (gem_add_rxbuf(sc, i) != 0) {
GEM_COUNTER_INCR(sc, sc_ev_rxnobuf);
ifp-if_ierrors++;
+ aprint_error_dev(sc-sc_dev,
+ receive error: RX no buffer space\n);
GEM_INIT_RXDESC(sc, i);
bus_dmamap_sync(sc-sc_dmatag, rxs-rxs_dmamap, 0,
rxs-rxs_dmamap-dm_mapsize, BUS_DMASYNC_PREREAD);
@@ -2143,12 +2151,20 @@ gem_intr(v)
/*
* At least with GEM_SUN_GEM and some GEM_SUN_ERI
* revisions GEM_MAC_RX_OVERFLOW happen often due to a
- * silicon bug so handle them silently. Moreover, it's
- * likely that the receiver has hung so we reset it.
+ * silicon bug so handle them silently. So if we detect
+ * an RX FIFO overflow, we fire off a timer, and check
+ * whether we're still making progress by looking at the
+ * RX FIFO write and read pointers.
*/
if (rxstat GEM_MAC_RX_OVERFLOW) {
ifp-if_ierrors++;
- gem_reset_rxdma(sc);
+ aprint_error_dev(sc-sc_dev,
+ receive error: RX overflow sc-rxptr %d, complete %d\n, sc-sc_rxptr, bus_space_read_4(t, h, GEM_RX_COMPLETION));
+ sc-sc_rx_fifo_wr_ptr =
+bus_space_read_4(t, h, GEM_RX_FIFO_WR_PTR);
+ sc-sc_rx_fifo_rd_ptr =
+bus_space_read_4(t, h, GEM_RX_FIFO_RD_PTR);
+ callout_schedule(sc-sc_rx_watchdog, 400);
} else if (rxstat ~(GEM_MAC_RX_DONE | GEM_MAC_RX_FRAME_CNT))
printf(%s: MAC rx fault, status 0x%02x\n,
device_xname(sc-sc_dev), rxstat);
@@ -2177,6 +2193,61 @@ gem_intr(v)
return (r);
}
+void
+gem_rx_watchdog(void *arg)
+{
+ struct gem_softc *sc = arg;
+ struct ifnet *ifp = sc-sc_ethercom.ec_if;
+ bus_space_tag_t t = sc-sc_bustag;
+ bus_space_handle_t h = sc-sc_h1;
+ u_int32_t rx_fifo_wr_ptr;
+ u_int32_t rx_fifo_rd_ptr;
+ u_int32_t state;
+
+ if ((ifp-if_flags IFF_RUNNING) == 0) {
+ aprint_error_dev(sc-sc_dev, receiver not running\n);
+ return;
+ }
+
+ rx_fifo_wr_ptr = bus_space_read_4(t, h, GEM_RX_FIFO_WR_PTR);
+ rx_fifo_rd_ptr = bus_space_read_4(t, h, GEM_RX_FIFO_RD_PTR);
+ state = bus_space_read_4(t, h, GEM_MAC_MAC_STATE);
+ if ((state GEM_MAC_STATE_OVERFLOW) == GEM_MAC_STATE_OVERFLOW
+ ((rx_fifo_wr_ptr == rx_fifo_rd_ptr) ||
+ ((sc-sc_rx_fifo_wr_ptr == rx_fifo_wr_ptr)
+ (sc-sc_rx_fifo_rd_ptr == rx_fifo_rd_ptr
+ {
+ /*
+
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 15 09:33:05 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: ticket 1789 To generate a diff of this commit: cvs rdiff -u -r1.1.2.182 -r1.1.2.183 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.182 src/doc/CHANGES-5.2:1.1.2.183 --- src/doc/CHANGES-5.2:1.1.2.182 Sat Sep 15 09:27:17 2012 +++ src/doc/CHANGES-5.2 Sat Sep 15 09:33:05 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.182 2012/09/15 09:27:17 bouyer Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.183 2012/09/15 09:33:05 bouyer Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -8585,3 +8585,13 @@ share/zoneinfo/zone.tab patch * Use a single version number for both code and data. [apb, ticket #1783] +sys/dev/ic/gem.c1.99 via patch +sys/dev/ic/gemreg.h1.15 via patch +sys/dev/ic/gemvar.h1.24 via patch + + Apply lockup fixes from Havard Eidnes/OpenBSD in PR port-sparc64/46260: + - add an additional watchdog for RX overflow + - re-initialise the chip on device timeout + Also alter the interrupt blanking rate to 8 packets, as per OpenSolaris. + [jdc, ticket #1789] +
CVS commit: src/tests/lib/libc/net
Module Name:src Committed By: plunky Date: Sat Sep 15 16:22:58 UTC 2012 Modified Files: src/tests/lib/libc/net: Makefile Log Message: correct spelling of file to clean To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libc/net/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/net/Makefile diff -u src/tests/lib/libc/net/Makefile:1.6 src/tests/lib/libc/net/Makefile:1.7 --- src/tests/lib/libc/net/Makefile:1.6 Tue Nov 1 22:36:53 2011 +++ src/tests/lib/libc/net/Makefile Sat Sep 15 16:22:58 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2011/11/01 22:36:53 pgoyette Exp $ +# $NetBSD: Makefile,v 1.7 2012/09/15 16:22:58 plunky Exp $ .include bsd.own.mk @@ -28,6 +28,6 @@ PROGS+= h_servent LDADD.h_nsd_recurse+= -lpthread -CLEANFILES+= aton_ether_subr_.c +CLEANFILES+= aton_ether_subr.c .include bsd.test.mk
CVS commit: src/external/bsd/ipf/dist
Module Name:src Committed By: plunky Date: Sat Sep 15 16:56:06 UTC 2012 Modified Files: src/external/bsd/ipf/dist: opts.h Log Message: the result of the construct #define FOO defined(BAR) #if FOO [conditional code] #endif is undefined, according to C99 6.10.1 note 4. So, change code like that to use the following paradigm #if defined(BAR) #define FOO 1 #else #define FOO 0 #endif #if FOO [conditional code] #endif To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/dist/opts.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ipf/dist/opts.h diff -u src/external/bsd/ipf/dist/opts.h:1.2 src/external/bsd/ipf/dist/opts.h:1.3 --- src/external/bsd/ipf/dist/opts.h:1.2 Sun Jul 22 14:27:35 2012 +++ src/external/bsd/ipf/dist/opts.h Sat Sep 15 16:56:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: opts.h,v 1.2 2012/07/22 14:27:35 darrenr Exp $ */ +/* $NetBSD: opts.h,v 1.3 2012/09/15 16:56:05 plunky Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -12,7 +12,11 @@ #define __OPTS_H__ #ifndef SOLARIS -#define SOLARIS (defined(sun) (defined(__svr4__) || defined(__SVR4))) +# if (defined(sun) (defined(__svr4__) || defined(__SVR4))) +# define SOLARIS 1 +# else +# define SOLARIS 0 +# endif #endif #define OPT_REMOVE 0x01 #define OPT_DEBUG 0x02
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src Committed By: plunky Date: Sat Sep 15 16:56:45 UTC 2012 Modified Files: src/sys/external/bsd/ipf/netinet: ip_compat.h ip_fil.h ip_log.c ip_nat.h ip_proxy.h Log Message: the result of the construct #define FOO defined(BAR) #if FOO [conditional code] #endif is undefined, according to C99 6.10.1 note 4. So, change code like that to use the following paradigm #if defined(BAR) #define FOO 1 #else #define FOO 0 #endif #if FOO [conditional code] #endif To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/ipf/netinet/ip_compat.h \ src/sys/external/bsd/ipf/netinet/ip_fil.h \ src/sys/external/bsd/ipf/netinet/ip_log.c \ src/sys/external/bsd/ipf/netinet/ip_nat.h \ src/sys/external/bsd/ipf/netinet/ip_proxy.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/ipf/netinet/ip_compat.h diff -u src/sys/external/bsd/ipf/netinet/ip_compat.h:1.3 src/sys/external/bsd/ipf/netinet/ip_compat.h:1.4 --- src/sys/external/bsd/ipf/netinet/ip_compat.h:1.3 Sun Jul 22 14:27:51 2012 +++ src/sys/external/bsd/ipf/netinet/ip_compat.h Sat Sep 15 16:56:45 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_compat.h,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */ +/* $NetBSD: ip_compat.h,v 1.4 2012/09/15 16:56:45 plunky Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -27,7 +27,11 @@ #endif #ifndef SOLARIS -#define SOLARIS (defined(sun) (defined(__svr4__) || defined(__SVR4))) +# if (defined(sun) (defined(__svr4__) || defined(__SVR4))) +# define SOLARIS 1 +# else +# define SOLARIS 0 +# endif #endif #if (defined(SOLARIS2) (SOLARIS2 = 8)) # ifndef USE_INET6 @@ -128,30 +132,55 @@ struct file; # endif #endif -#define NETBSD_GE_REV(x) (defined(__NetBSD_Version__) \ - (__NetBSD_Version__ = (x))) -#define NETBSD_GT_REV(x) (defined(__NetBSD_Version__) \ - (__NetBSD_Version__ (x))) -#define NETBSD_LT_REV(x) (defined(__NetBSD_Version__) \ - (__NetBSD_Version__ (x))) -#define FREEBSD_GE_REV(x) (defined(__FreeBSD_version) \ - (__FreeBSD_version = (x))) -#define FREEBSD_GT_REV(x) (defined(__FreeBSD_version) \ - (__FreeBSD_version (x))) -#define FREEBSD_LT_REV(x) (defined(__FreeBSD_version) \ - (__FreeBSD_version (x))) -#define BSDOS_GE_REV(x) (defined(_BSDI_VERSION) \ - (_BSDI_VERSION = (x))) -#define BSDOS_GT_REV(x) (defined(_BSDI_VERSION) \ - (_BSDI_VERSION (x))) -#define BSDOS_LT_REV(x) (defined(_BSDI_VERSION) \ - (_BSDI_VERSION (x))) -#define OPENBSD_GE_REV(x) (defined(OpenBSD) (OpenBSD = (x))) -#define OPENBSD_GT_REV(x) (defined(OpenBSD) (OpenBSD (x))) -#define OPENBSD_LT_REV(x) (defined(OpenBSD) (OpenBSD (x))) -#define BSD_GE_YEAR(x) (defined(BSD) (BSD = (x))) -#define BSD_GT_YEAR(x) (defined(BSD) (BSD (x))) -#define BSD_LT_YEAR(x) (defined(BSD) (BSD (x))) +#if defined(__NetBSD_Version__) +# define NETBSD_GE_REV(x) (__NetBSD_Version__ = (x)) +# define NETBSD_GT_REV(x) (__NetBSD_Version__ (x)) +# define NETBSD_LT_REV(x) (__NetBSD_Version__ (x)) +#else +# define NETBSD_GE_REV(x) 0 +# define NETBSD_GT_REV(x) 0 +# define NETBSD_LT_REV(x) 0 +#endif + +#if defined(__FreeBSD_version) +# define FREEBSD_GE_REV(x) (__FreeBSD_version = (x)) +# define FREEBSD_GT_REV(x) (__FreeBSD_version (x)) +# define FREEBSD_LT_REV(x) (__FreeBSD_version (x)) +#else +# define FREEBSD_GE_REV(x) 0 +# define FREEBSD_GT_REV(x) 0 +# define FREEBSD_LT_REV(x) 0 +#endif + +#if defined(_BSDI_VERSION) +# define BSDOS_GE_REV(x) (_BSDI_VERSION = (x)) +# define BSDOS_GT_REV(x) (_BSDI_VERSION (x)) +# define BSDOS_LT_REV(x) (_BSDI_VERSION (x)) +#else +# define BSDOS_GE_REV(x) 0 +# define BSDOS_GT_REV(x) 0 +# define BSDOS_LT_REV(x) 0 +#endif + +#if defined(OpenBSD) +# define OPENBSD_GE_REV(x) (OpenBSD = (x)) +# define OPENBSD_GT_REV(x) (OpenBSD (x)) +# define OPENBSD_LT_REV(x) (OpenBSD (x)) +#else +# define OPENBSD_GE_REV(x) 0 +# define OPENBSD_GT_REV(x) 0 +# define OPENBSD_LT_REV(x) 0 +#endif + +#if defined(BSD) +# define BSD_GE_YEAR(x) (BSD = (x)) +# define BSD_GT_YEAR(x) (BSD (x)) +# define BSD_LT_YEAR(x) (BSD (x)) +#else +# define BSD_GE_YEAR(x) 0 +# define BSD_GT_YEAR(x) 0 +# define BSD_LT_YEAR(x) 0 +#endif /* --- */ Index: src/sys/external/bsd/ipf/netinet/ip_fil.h diff -u src/sys/external/bsd/ipf/netinet/ip_fil.h:1.3 src/sys/external/bsd/ipf/netinet/ip_fil.h:1.4 --- src/sys/external/bsd/ipf/netinet/ip_fil.h:1.3 Sun Jul 22 14:27:51 2012 +++ src/sys/external/bsd/ipf/netinet/ip_fil.h Sat Sep 15 16:56:45 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_fil.h,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */ +/* $NetBSD: ip_fil.h,v 1.4 2012/09/15 16:56:45 plunky Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -30,7 +30,11 @@ #endif #ifndef SOLARIS -# define SOLARIS (defined(sun) (defined(__svr4__) || defined(__SVR4))) +#
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Sat Sep 15 17:15:01 UTC 2012
Modified Files:
src/sys/rump/librump/rumpkern: scheduler.c
Log Message:
In the interlock case (where the scheduler lock is used as the condvar
lock), we need to take the CPU interlock before releasing the CPU.
Otherwise other threads can be scheduled before we get the interlock,
leading to e.g. missed condvar wakeups. This affected only locks_up.c
locking (nomen est omen?).
Also, remove various __predicts since they don't have a positive
performance impact in any setup.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/rump/librump/rumpkern/scheduler.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/scheduler.c
diff -u src/sys/rump/librump/rumpkern/scheduler.c:1.28 src/sys/rump/librump/rumpkern/scheduler.c:1.29
--- src/sys/rump/librump/rumpkern/scheduler.c:1.28 Fri Jun 22 12:45:43 2012
+++ src/sys/rump/librump/rumpkern/scheduler.c Sat Sep 15 17:15:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: scheduler.c,v 1.28 2012/06/22 12:45:43 rmind Exp $ */
+/* $NetBSD: scheduler.c,v 1.29 2012/09/15 17:15:01 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scheduler.c,v 1.28 2012/06/22 12:45:43 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: scheduler.c,v 1.29 2012/09/15 17:15:01 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -300,7 +300,7 @@ rump_schedule_cpu_interlock(struct lwp *
KASSERT(l-l_target_cpu != NULL);
rcpu = rcpu_storage[l-l_target_cpu-rump_cpus[0]];
if (atomic_cas_ptr(rcpu-rcpu_prevlwp, l, RCPULWP_BUSY) == l) {
- if (__predict_true(interlock == rcpu-rcpu_mtx))
+ if (interlock == rcpu-rcpu_mtx)
rumpuser_mutex_exit(rcpu-rcpu_mtx);
SCHED_FASTPATH(rcpu);
/* jones, you're the man */
@@ -317,7 +317,7 @@ rump_schedule_cpu_interlock(struct lwp *
domigrate = true;
/* Take lock. This acts as a load barrier too. */
- if (__predict_true(interlock != rcpu-rcpu_mtx))
+ if (interlock != rcpu-rcpu_mtx)
rumpuser_mutex_enter_nowrap(rcpu-rcpu_mtx);
for (;;) {
@@ -442,17 +442,23 @@ rump_unschedule_cpu1(struct lwp *l, void
* is relevant only in the non-fastpath scheduling case, but
* we don't know here if that's going to happen, so need to
* expect the worst.
+ *
+ * If the scheduler interlock was requested by the caller, we
+ * need to obtain it before we release the CPU. Otherwise, we risk a
+ * race condition where another thread is scheduled onto the
+ * rump kernel CPU before our current thread can
+ * grab the interlock.
*/
- membar_exit();
+ if (interlock == rcpu-rcpu_mtx)
+ rumpuser_mutex_enter_nowrap(rcpu-rcpu_mtx);
+ else
+ membar_exit();
/* Release the CPU. */
old = atomic_swap_ptr(rcpu-rcpu_prevlwp, l);
/* No waiters? No problems. We're outta here. */
if (old == RCPULWP_BUSY) {
- /* Was the scheduler interlock requested? */
- if (__predict_false(interlock == rcpu-rcpu_mtx))
- rumpuser_mutex_enter_nowrap(rcpu-rcpu_mtx);
return;
}
@@ -464,11 +470,11 @@ rump_unschedule_cpu1(struct lwp *l, void
* Snailpath: take lock and signal anyone waiting for this CPU.
*/
- rumpuser_mutex_enter_nowrap(rcpu-rcpu_mtx);
+ if (interlock != rcpu-rcpu_mtx)
+ rumpuser_mutex_enter_nowrap(rcpu-rcpu_mtx);
if (rcpu-rcpu_wanted)
rumpuser_cv_broadcast(rcpu-rcpu_cv);
-
- if (__predict_true(interlock != rcpu-rcpu_mtx))
+ if (interlock != rcpu-rcpu_mtx)
rumpuser_mutex_exit(rcpu-rcpu_mtx);
}
CVS commit: src
Module Name:src
Committed By: plunky
Date: Sat Sep 15 17:33:28 UTC 2012
Modified Files:
src/distrib/sets/lists/misc: mi
src/external/bsd/ipf/rules: Makefile
Log Message:
install example rules from the 5.1.2 distribution in external/bsd/ipf/dist
rather than the old one.. mediaone does not seem to exist though, so
mark it obsolete
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ipf/rules/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/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.176 src/distrib/sets/lists/misc/mi:1.177
--- src/distrib/sets/lists/misc/mi:1.176 Tue Feb 14 17:29:51 2012
+++ src/distrib/sets/lists/misc/mi Sat Sep 15 17:33:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.176 2012/02/14 17:29:51 njoly Exp $
+# $NetBSD: mi,v 1.177 2012/09/15 17:33:28 plunky Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -731,7 +731,7 @@
./usr/share/examples/ipf/firewall misc-ipf-examples ipfilter,share
./usr/share/examples/ipf/ftp-proxy misc-ipf-examples ipfilter,share
./usr/share/examples/ipf/ftppxy misc-ipf-examples ipfilter,share
-./usr/share/examples/ipf/mediaone misc-ipf-examples ipfilter,share
+./usr/share/examples/ipf/mediaone misc-obsolete obsolete
./usr/share/examples/ipf/mkfilters misc-ipf-examples ipfilter,share
./usr/share/examples/ipf/nat-setup misc-ipf-examples ipfilter,share
./usr/share/examples/ipf/nat.eg misc-ipf-examples ipfilter,share
Index: src/external/bsd/ipf/rules/Makefile
diff -u src/external/bsd/ipf/rules/Makefile:1.1 src/external/bsd/ipf/rules/Makefile:1.2
--- src/external/bsd/ipf/rules/Makefile:1.1 Fri Mar 23 21:29:46 2012
+++ src/external/bsd/ipf/rules/Makefile Sat Sep 15 17:33:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/03/23 21:29:46 christos Exp $
+# $NetBSD: Makefile,v 1.2 2012/09/15 17:33:27 plunky Exp $
.include bsd.own.mk
@@ -9,9 +9,9 @@ FILESDIR= /usr/share/examples/ipf
FILES= BASIC.NAT BASIC_1.FW BASIC_2.FW example.1 example.2 example.3 \
example.4 example.5 example.6 example.7 example.8 example.9 \
example.10 example.11 example.12 example.13 example.sr \
- firewall ftp-proxy ftppxy mediaone nat-setup \
+ firewall ftp-proxy ftppxy nat-setup \
nat.eg server tcpstate mkfilters
.endif
-.PATH: ${NETBSDSRCDIR}/dist/ipf/rules
+.PATH: ${NETBSDSRCDIR}/external/bsd/ipf/dist/rules
.include bsd.prog.mk
CVS commit: src
Module Name:src
Committed By: plunky
Date: Sat Sep 15 17:42:01 UTC 2012
Modified Files:
src/distrib/sets/lists/comp: mi
src/sys/netinet: Makefile
Log Message:
install header files from IPF 5.1.2 (sys/external/bsd/ipf) instead of
older IPF (sys/dist/ipf).
This adds ipf_rb.h
To generate a diff of this commit:
cvs rdiff -u -r1.1779 -r1.1780 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.24 -r1.25 src/sys/netinet/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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1779 src/distrib/sets/lists/comp/mi:1.1780
--- src/distrib/sets/lists/comp/mi:1.1779 Thu Sep 13 21:05:20 2012
+++ src/distrib/sets/lists/comp/mi Sat Sep 15 17:41:59 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1779 2012/09/13 21:05:20 martin Exp $
+# $NetBSD: mi,v 1.1780 2012/09/15 17:41:59 plunky Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -1930,7 +1930,7 @@
./usr/include/netinet/ip_state.h comp-ipf-include ipfilter
./usr/include/netinet/ip_sync.h comp-ipf-include ipfilter
./usr/include/netinet/ip_var.h comp-c-include
-./usr/include/netinet/ipf_rb.h comp-obsolete obsolete
+./usr/include/netinet/ipf_rb.h comp-ipf-include ipfilter
./usr/include/netinet/ipl.h comp-ipf-include ipfilter
./usr/include/netinet/pim.h comp-c-include
./usr/include/netinet/pim_var.h comp-c-include
Index: src/sys/netinet/Makefile
diff -u src/sys/netinet/Makefile:1.24 src/sys/netinet/Makefile:1.25
--- src/sys/netinet/Makefile:1.24 Mon Jun 25 15:28:38 2012
+++ src/sys/netinet/Makefile Sat Sep 15 17:41:59 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2012/06/25 15:28:38 christos Exp $
+# $NetBSD: Makefile,v 1.25 2012/09/15 17:41:59 plunky Exp $
INCSDIR= /usr/include/netinet
@@ -20,9 +20,9 @@ INCS+= ip_compat.h # always needed by kd
.if (${MKIPFILTER} != no)
INCS+= ip_auth.h ip_fil.h ip_frag.h ip_htable.h ip_nat.h \
ip_lookup.h ip_pool.h ip_proxy.h ip_scan.h ip_state.h ip_sync.h \
- ipl.h
+ ipf_rb.h ipl.h
.endif
.include bsd.kinc.mk
-.PATH: ${NETBSDSRCDIR}/sys/dist/ipf/netinet
+.PATH: ${NETBSDSRCDIR}/sys/external/bsd/ipf/netinet
CVS commit: src/dist/pf/usr.sbin/ftp-proxy
Module Name:src
Committed By: plunky
Date: Sat Sep 15 17:42:43 UTC 2012
Modified Files:
src/dist/pf/usr.sbin/ftp-proxy: ipf.c
Log Message:
reinstate Update ftp-proxy for changes to ipnat_t from Darren Reed
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/dist/pf/usr.sbin/ftp-proxy/ipf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/pf/usr.sbin/ftp-proxy/ipf.c
diff -u src/dist/pf/usr.sbin/ftp-proxy/ipf.c:1.5 src/dist/pf/usr.sbin/ftp-proxy/ipf.c:1.6
--- src/dist/pf/usr.sbin/ftp-proxy/ipf.c:1.5 Wed Feb 15 17:55:14 2012
+++ src/dist/pf/usr.sbin/ftp-proxy/ipf.c Sat Sep 15 17:42:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ipf.c,v 1.5 2012/02/15 17:55:14 riz Exp $ */
+/* $NetBSD: ipf.c,v 1.6 2012/09/15 17:42:43 plunky Exp $ */
/*
* Copyright (c) 2004, 2008 The NetBSD Foundation, Inc.
@@ -151,7 +151,7 @@ ftp_proxy_entry_find(u_int32_t id)
}
static int
-ftp_proxy_entry_add_nat(struct ftp_proxy_entry *fpe, ipnat_t ipn)
+ftp_proxy_entry_add_nat(struct ftp_proxy_entry *fpe, ipnat_t *ipn)
{
struct ftp_proxy_nat *fpn;
@@ -159,22 +159,22 @@ ftp_proxy_entry_add_nat(struct ftp_proxy
if (fpn == NULL)
return (-1);
- memcpy(fpn-ipn, ipn, sizeof(fpn-ipn));
+ memcpy(fpn-ipn, ipn, sizeof(fpn-ipn));
LIST_INSERT_HEAD(fpe-nat_entries, fpn, link);
return (0);
}
static int
-ipfilter_add_nat(ipnat_t ipn)
+ipfilter_add_nat(ipnat_t *ipn)
{
ipfobj_t obj;
memset(obj, 0, sizeof(obj));
obj.ipfo_rev = IPFILTER_VERSION;
- obj.ipfo_size = sizeof(ipn);
+ obj.ipfo_size = ipn-in_size;
obj.ipfo_type = IPFOBJ_IPNAT;
- obj.ipfo_ptr = ipn;
+ obj.ipfo_ptr = ipn;
return ioctl(natfd, SIOCADNAT, obj);
}
@@ -224,7 +224,7 @@ ipf_add_rdr(u_int32_t id, struct sockadd
u_int16_t d_port, struct sockaddr *rdr, u_int16_t rdr_port)
{
struct ftp_proxy_entry *fpe = ftp_proxy_entry_find(id);
- ipnat_t ipn;
+ ipnat_t *ipn;
if (fpe == NULL) {
errno = ENOENT;
@@ -237,98 +237,48 @@ ipf_add_rdr(u_int32_t id, struct sockadd
return (-1);
}
- memset(ipn, 0, sizeof(ipn));
- ipn.in_redir = NAT_REDIRECT;
- ipn.in_v = 4;
- ipn.in_outip = satosin(dst)-sin_addr.s_addr;
- ipn.in_outmsk = 0x;
- strlcpy(ipn.in_ifnames[0], netif, sizeof(ipn.in_ifnames[0]));
- strlcpy(ipn.in_ifnames[1], netif, sizeof(ipn.in_ifnames[1]));
- ipn.in_pmin = htons(d_port);
- ipn.in_pmax = htons(d_port);
- ipn.in_inip = satosin(rdr)-sin_addr.s_addr;
- ipn.in_inmsk = 0x;
- ipn.in_pnext = htons(rdr_port);
- ipn.in_flags = IPN_FIXEDDPORT | IPN_TCP;
- strlcpy(ipn.in_tag.ipt_tag, fpe-proxy_tag, sizeof(ipn.in_tag.ipt_tag));
-
- if (ipfilter_add_nat(ipn) == -1)
+ ipn = calloc(1, sizeof(*ipn) + 2 * IF_NAMESIZE + 2);
+ if (ipn == NULL) {
+ errno = ENOMEM;
return (-1);
+ }
+ ipn-in_redir = NAT_REDIRECT;
+ ipn-in_v[0] = 4;
+ ipn-in_v[1] = 4;
+ ipn-in_odstaddr = satosin(dst)-sin_addr.s_addr;
+ ipn-in_odstmsk = 0x;
+ ipn-in_odport = htons(d_port);
+ ipn-in_dtop = htons(d_port);
+ ipn-in_ndstaddr = satosin(rdr)-sin_addr.s_addr;
+ ipn-in_ndstmsk = 0x;
+ ipn-in_dpnext = htons(rdr_port);
+ ipn-in_flags = IPN_FIXEDDPORT | IPN_TCP;
+ strlcpy(ipn-in_tag.ipt_tag, fpe-proxy_tag,
+ sizeof(ipn-in_tag.ipt_tag));
+
+ ipn-in_ifnames[0] = 0;
+ (void) strlcpy(ipn-in_names, netif, IF_NAMESIZE);
+ ipn-in_namelen = strlen(ipn-in_names) + 1;
+ ipn-in_ifnames[1] = ipn-in_namelen;
+ (void) strlcpy(ipn-in_names + ipn-in_namelen, netif, IF_NAMESIZE);
+ ipn-in_namelen += strlen(ipn-in_names + ipn-in_ifnames[1]) + 1;
+ ipn-in_size = sizeof(*ipn) + ipn-in_namelen;
- if (ftp_proxy_entry_add_nat(fpe, ipn) == -1)
+ if (ipfilter_add_nat(ipn) == -1) {
+ free(ipn);
return (-1);
+ }
- fpe-status = 1;
-
- return (0);
-}
-
-#if 0
-int
-ipf_add_rdr(u_int32_t id, struct sockaddr *src, struct sockaddr *dst,
-u_int16_t d_port, struct sockaddr *rdr, u_int16_t rdr_port)
-{
- u_32_t sum1, sum2, sumd;
- int onoff, error;
- nat_save_t ns;
- ipfobj_t obj;
- nat_t *nat;
-
- if (!src || !dst || !d_port || !rdr || !rdr_port ||
- (src-sa_family != rdr-sa_family)) {
- errno = EINVAL;
+ if (ftp_proxy_entry_add_nat(fpe, ipn) == -1) {
+ free(ipn);
return (-1);
}
- memset(ns, 0, sizeof(ns));
-
- nat = ns.ipn_nat;
- nat-nat_p = IPPROTO_TCP;
- nat-nat_dir = NAT_OUTBOUND;
- nat-nat_redir = NAT_REDIRECT;
- strlcpy(nat-nat_ifnames[0], netif, sizeof(nat-nat_ifnames[0]));
- strlcpy(nat-nat_ifnames[1], netif, sizeof(nat-nat_ifnames[1]));
-
- nat-nat_inip = satosin(rdr)-sin_addr;
- nat-nat_outip = satosin(dst)-sin_addr;
- nat-nat_oip = satosin(src)-sin_addr;
-
- sum1 = LONG_SUM(ntohl(nat-nat_inip.s_addr)) + rdr_port;
- sum2 = LONG_SUM(ntohl(nat-nat_outip.s_addr)) + d_port;
- CALC_SUMD(sum1, sum2, sumd);
- nat-nat_sumd[0] = (sumd 0x) + (sumd 16);
- nat-nat_sumd[1] = nat-nat_sumd[0];
-
- sum1 = LONG_SUM(ntohl(nat-nat_inip.s_addr));
- sum2 = LONG_SUM(ntohl(nat-nat_outip.s_addr));
- CALC_SUMD(sum1, sum2, sumd);
-
CVS commit: src/libexec/identd
Module Name:src
Committed By: plunky
Date: Sat Sep 15 17:45:35 UTC 2012
Modified Files:
src/libexec/identd: Makefile
Log Message:
does not need -I${NETBSDSRCDIR}/sys/dist/ipf here, the files are
installed in /usr/include/netinet
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/libexec/identd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/identd/Makefile
diff -u src/libexec/identd/Makefile:1.12 src/libexec/identd/Makefile:1.13
--- src/libexec/identd/Makefile:1.12 Mon Mar 16 02:24:56 2009
+++ src/libexec/identd/Makefile Sat Sep 15 17:45:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/03/16 02:24:56 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2012/09/15 17:45:35 plunky Exp $
.include bsd.own.mk
@@ -9,7 +9,7 @@ MAN= identd.8
# Build with IP Filter support?
.if (${MKIPFILTER} != no)
SRCS+= ipf.c
-CPPFLAGS+=-I${NETBSDSRCDIR}/sys/dist/ipf -DWITH_IPF
+CPPFLAGS+=-DWITH_IPF
.endif
# Build with pf support?
CVS commit: src/usr.sbin/pf/ftp-proxy
Module Name:src
Committed By: plunky
Date: Sat Sep 15 17:46:25 UTC 2012
Modified Files:
src/usr.sbin/pf/ftp-proxy: Makefile
Log Message:
does not need -I${NETBSDSRCDIR}/sys/dist/ipf here, the include files
are installed in /usr/include/netinet
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/pf/ftp-proxy/Makefile
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/pf/ftp-proxy/Makefile
diff -u src/usr.sbin/pf/ftp-proxy/Makefile:1.6 src/usr.sbin/pf/ftp-proxy/Makefile:1.7
--- src/usr.sbin/pf/ftp-proxy/Makefile:1.6 Fri Feb 4 00:19:52 2011
+++ src/usr.sbin/pf/ftp-proxy/Makefile Sat Sep 15 17:46:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/02/04 00:19:52 rmind Exp $
+# $NetBSD: Makefile,v 1.7 2012/09/15 17:46:25 plunky Exp $
# $OpenBSD: Makefile,v 1.3 2006/11/26 11:31:13 deraadt Exp $
PROG= ftp-proxy
@@ -23,7 +23,7 @@ LDADD+= -lnpf -lprop
# IP Filter support
.if (${MKIPFILTER} != no)
SRCS+= ipf.c
-CPPFLAGS+=-I${NETBSDSRCDIR}/sys/dist/ipf -DWITH_IPF
+CPPFLAGS+=-DWITH_IPF
.endif
BINDIR= /usr/sbin
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: jdf
Date: Sat Sep 15 17:56:28 UTC 2012
Modified Files:
src/distrib/utils/sysinst: msg.mi.es
Log Message:
Add Spanish translations for sysinst's new configuration menu, plus adding a few
that were left previously.
Translation provided by jmmv.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/distrib/utils/sysinst/msg.mi.es
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.46 src/distrib/utils/sysinst/msg.mi.es:1.47
--- src/distrib/utils/sysinst/msg.mi.es:1.46 Fri Jul 6 21:10:56 2012
+++ src/distrib/utils/sysinst/msg.mi.es Sat Sep 15 17:56:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.46 2012/07/06 21:10:56 jdf Exp $ */
+/* $NetBSD: msg.mi.es,v 1.47 2012/09/15 17:56:28 jdf Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -125,7 +125,7 @@ sus discos.)
}
message mount_failed
-{Mounting %s failed. Continue?
+{No se ha podido montar %s. ¿Desea continuar?
}
message nodisk
@@ -703,8 +703,9 @@ message makedev
}
message badfs
-{Parece que /dev/%s%c no es un sistema de archivos BSD o el fsck no ha sido
-correcto. ¿Continuar? (Error número %d.)
+{Parece ser que /dev/%s%c no es un sistema de archivos BSD o bien el
+fsck ha fallado. ¿Desea montarlo de todos modos? (Código de error:
+%d.)
}
message rootmissing
@@ -920,8 +921,7 @@ message Upgrade_NetBSD_on_a_hard_disk {A
message Re_install_sets_or_install_additional_sets {Reinstalar conjuntos o instalar conjuntos adicionales}
message Reboot_the_computer {Reiniciar la computadora}
message Utility_menu {Menú de utilidades}
-/* XXX */
-message Config_menu {Menú de configuracion}
+message Config_menu {Menu de configuración}
message exit_utility_menu {Exit}
message NetBSD_VERSION_Utilities {Utilidades de NetBSD-@@VERSION@@}
message Run_bin_sh {Ejecutar /bin/sh}
@@ -1013,63 +1013,74 @@ actualizar /etc/mailer.conf usted mismo
de correo electrónico se envíen correctamente.}
message license
-{To use the network interface %s, you must agree to the license in
-file %s.
-To view this file now, you can type ^Z, look at the contents of
-the file and then type fg to resume.}
+{Para usar la interfaz de red %s, debe de aceptar la licencia en el archivo %s.
+Para ver este archivo ahora, pulse ^Z, mire el contendido del archivo, y luego
+teclee fg para continuar la instalación.}
message binpkg
-{To configure the binary package system, please choose the network location
-to fetch packages from. Once your system comes up, you can use 'pkgin'
-to install additional packages, or remove packages.}
-
+{Para configurar el sistema de paquetes binários, por favor escoja el
+sitio de red desde el cual descargar los paquetes. Una vez el sistema
+arranque, puede usar 'pkgin' para instalar paquetes adicionales, o
+eliminar paquetes ya instalados.}
+
message pkgpath
-{The following are the protocol, host, directory, user, and password that
-will be used. If user is ftp, then the password is not needed.
+{Las siguientes entradas representan el protocolo, la máquina, el
+directorio, el usuario y la contraseña que se usarán. Si el usuario
+es ftp, entonces la contraseña es opcional.
}
-message rcconf_backup_failed {Making backup of rc.conf failed. Continue?}
-message rcconf_backup_succeeded {rc.conf backup saved to %s.}
-message rcconf_restore_failed {Restoring backup rc.conf failed.}
-message rcconf_delete_failed {Deleting old %s entry failed.}
-message Pkg_dir {Package directory}
+message rcconf_backup_failed
+{Error al intentar hacer una cópia de seguridad de rc.conf. ¿Desea continuar?}
+message rcconf_backup_succeeded
+{La cópia de seguridad de rc.conf se ha guardado en %s.}
+message rcconf_restore_failed
+{La recuperación de rc.conf desde su cópia de seguridad ha fallado.}
+message rcconf_delete_failed {La eliminación del viejo %s ha fallado.}
+message Pkg_dir {Directorio del paquete}
message configure_prior {configure a prior installation of}
-message configure {configure}
-message change {change}
-message password_set {password set}
-message YES {YES}
+message configure {Configurar}
+message change {Cambiar}
+message password_set {Contraseña configurada}
+message YES {SI}
message NO {NO}
-message DONE {DONE}
-message abandoned {Abandoned}
-message empty {***EMPTY***}
-message timezone {Timezone}
-message change_rootpw {Change root password}
-message enable_binpkg {Enable installation of binary packages}
-message enable_sshd {Enable sshd}
-message enable_ntpd {Enable ntpd}
-message run_ntpdate {Run ntpdate at boot}
-message enable_mdnsd {Enable mdnsd}
-message configmenu {Configure the additional items as needed.}
-message doneconfig {Finished configuring}
-message Install_pkgin {Install pkgin and update package summary}
+message DONE {HECHO}
+message abandoned {Abandonado}
+message
CVS commit: src
Module Name:src Committed By: dholland Date: Sat Sep 15 18:03:42 UTC 2012 Modified Files: src: UPDATING Log Message: Fix typo, noticed by stu314 on freenode. To generate a diff of this commit: cvs rdiff -u -r1.238 -r1.239 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.238 src/UPDATING:1.239 --- src/UPDATING:1.238 Wed Aug 22 04:16:47 2012 +++ src/UPDATING Sat Sep 15 18:03:42 2012 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.238 2012/08/22 04:16:47 dholland Exp $ +$NetBSD: UPDATING,v 1.239 2012/09/15 18:03:42 dholland Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -37,7 +37,7 @@ Recent changes: 20120216: Default for MKCATPAGES changed to NO. Update builds will fail unless DESTDIR is cleaned manually. If you built between 20120207 - and 20120216, daily and weekly could have created an unreable + and 20120216, daily and weekly could have created an unreadable /var/db/man.db index for apropos. Running makemandb -f or the next run of weekly will fix it.
CVS commit: src/external/bsd/wpa/dist/src
Module Name:src
Committed By: plunky
Date: Sat Sep 15 18:37:28 UTC 2012
Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_test.c
src/external/bsd/wpa/dist/src/utils: eloop.c trace.h
Log Message:
WPA_TRACE_REF() provides optional content, potentially leaving an extra
semicolon within the struct declarator list. This is not permitted
according to C99 6.7.2.1 Structure and union specifiers, so instead
have the macro provide the semicolon as required.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/wpa/dist/src/drivers/driver_test.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/wpa/dist/src/utils/eloop.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/wpa/dist/src/utils/trace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/wpa/dist/src/drivers/driver_test.c
diff -u src/external/bsd/wpa/dist/src/drivers/driver_test.c:1.1.1.1 src/external/bsd/wpa/dist/src/drivers/driver_test.c:1.2
--- src/external/bsd/wpa/dist/src/drivers/driver_test.c:1.1.1.1 Wed Aug 4 10:21:50 2010
+++ src/external/bsd/wpa/dist/src/drivers/driver_test.c Sat Sep 15 18:37:27 2012
@@ -70,7 +70,7 @@ struct wpa_driver_test_global {
struct wpa_driver_test_data {
struct wpa_driver_test_global *global;
void *ctx;
- WPA_TRACE_REF(ctx);
+ WPA_TRACE_REF(ctx)
u8 own_addr[ETH_ALEN];
int test_socket;
#ifdef DRIVER_TEST_UNIX
Index: src/external/bsd/wpa/dist/src/utils/eloop.c
diff -u src/external/bsd/wpa/dist/src/utils/eloop.c:1.1.1.2 src/external/bsd/wpa/dist/src/utils/eloop.c:1.2
--- src/external/bsd/wpa/dist/src/utils/eloop.c:1.1.1.2 Sat Sep 10 20:54:05 2011
+++ src/external/bsd/wpa/dist/src/utils/eloop.c Sat Sep 15 18:37:28 2012
@@ -25,8 +25,8 @@ struct eloop_sock {
void *eloop_data;
void *user_data;
eloop_sock_handler handler;
- WPA_TRACE_REF(eloop);
- WPA_TRACE_REF(user);
+ WPA_TRACE_REF(eloop)
+ WPA_TRACE_REF(user)
WPA_TRACE_INFO
};
@@ -36,8 +36,8 @@ struct eloop_timeout {
void *eloop_data;
void *user_data;
eloop_timeout_handler handler;
- WPA_TRACE_REF(eloop);
- WPA_TRACE_REF(user);
+ WPA_TRACE_REF(eloop)
+ WPA_TRACE_REF(user)
WPA_TRACE_INFO
};
Index: src/external/bsd/wpa/dist/src/utils/trace.h
diff -u src/external/bsd/wpa/dist/src/utils/trace.h:1.1.1.1 src/external/bsd/wpa/dist/src/utils/trace.h:1.2
--- src/external/bsd/wpa/dist/src/utils/trace.h:1.1.1.1 Wed Aug 4 10:18:41 2010
+++ src/external/bsd/wpa/dist/src/utils/trace.h Sat Sep 15 18:37:28 2012
@@ -29,7 +29,7 @@ struct wpa_trace_ref {
const void *addr;
WPA_TRACE_INFO
};
-#define WPA_TRACE_REF(name) struct wpa_trace_ref wpa_trace_ref_##name
+#define WPA_TRACE_REF(name) struct wpa_trace_ref wpa_trace_ref_##name;
#define wpa_trace_dump(title, ptr) \
wpa_trace_dump_func((title), (ptr)-btrace, (ptr)-btrace_num)
CVS commit: src/lib/libc/gen
Module Name:src Committed By: spz Date: Sat Sep 15 19:31:12 UTC 2012 Modified Files: src/lib/libc/gen: fts.c Log Message: remove dubious cast To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/lib/libc/gen/fts.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/libc/gen/fts.c diff -u src/lib/libc/gen/fts.c:1.44 src/lib/libc/gen/fts.c:1.45 --- src/lib/libc/gen/fts.c:1.44 Wed Mar 14 00:25:19 2012 +++ src/lib/libc/gen/fts.c Sat Sep 15 19:31:12 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fts.c,v 1.44 2012/03/14 00:25:19 christos Exp $ */ +/* $NetBSD: fts.c,v 1.45 2012/09/15 19:31:12 spz Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = @(#)fts.c 8.6 (Berkeley) 8/14/94; #else -__RCSID($NetBSD: fts.c,v 1.44 2012/03/14 00:25:19 christos Exp $); +__RCSID($NetBSD: fts.c,v 1.45 2012/09/15 19:31:12 spz Exp $); #endif #endif /* LIBC_SCCS and not lint */ @@ -133,7 +133,7 @@ fts_open(char * const *argv, int options } /* Allocate/initialize the stream */ - if ((sp = malloc((unsigned int)sizeof(FTS))) == NULL) + if ((sp = malloc(sizeof(FTS))) == NULL) return (NULL); memset(sp, 0, sizeof(FTS)); sp-fts_compar = compar;
CVS commit: src/share/misc
Module Name:src Committed By: dholland Date: Sun Sep 16 00:02:41 UTC 2012 Modified Files: src/share/misc: acronyms Log Message: SAR (search and rescue) To generate a diff of this commit: cvs rdiff -u -r1.212 -r1.213 src/share/misc/acronyms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms diff -u src/share/misc/acronyms:1.212 src/share/misc/acronyms:1.213 --- src/share/misc/acronyms:1.212 Fri Aug 24 06:04:02 2012 +++ src/share/misc/acronyms Sun Sep 16 00:02:41 2012 @@ -1,4 +1,4 @@ -$NetBSD: acronyms,v 1.212 2012/08/24 06:04:02 dholland Exp $ +$NetBSD: acronyms,v 1.213 2012/09/16 00:02:41 dholland Exp $ 10Q thank you 10X thanks 1337 elite (leet) @@ -409,6 +409,7 @@ RTFD read the fine/fucking documentation RTFM read the fine/fucking manual RTFMP read the fine/fucking man page RTFS read the fine/fucking source +SAR search and rescue SAR some assembly required SCNR sorry, could not resist SEP someone else's problem
