CVS commit: src/sys/uvm/pmap
Module Name:src Committed By: nonaka Date: Thu Dec 25 08:11:09 UTC 2014 Modified Files: src/sys/uvm/pmap: pmap.c Log Message: fix build failure when UVMHIST is defined. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/uvm/pmap/pmap.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/pmap/pmap.c diff -u src/sys/uvm/pmap/pmap.c:1.7 src/sys/uvm/pmap/pmap.c:1.8 --- src/sys/uvm/pmap/pmap.c:1.7 Wed Dec 24 04:03:02 2014 +++ src/sys/uvm/pmap/pmap.c Thu Dec 25 08:11:09 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.7 2014/12/24 04:03:02 nonaka Exp $ */ +/* $NetBSD: pmap.c,v 1.8 2014/12/25 08:11:09 nonaka Exp $ */ /*- * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.7 2014/12/24 04:03:02 nonaka Exp $); +__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.8 2014/12/25 08:11:09 nonaka Exp $); /* * Manages physical address maps. @@ -219,6 +219,8 @@ struct pmap_limits pmap_limits; #ifdef UVMHIST static struct kern_history_ent pmapexechistbuf[1]; static struct kern_history_ent pmaphistbuf[1]; +UVMHIST_DEFINE(pmapexechist); +UVMHIST_DEFINE(pmaphist); #endif /*
CVS commit: src/sys/net
Module Name:src
Committed By: ozaki-r
Date: Thu Dec 25 09:10:01 UTC 2014
Modified Files:
src/sys/net: if_bridge.c
Log Message:
Use LIST_FOREACH_SAFE in bridge_rt* functions
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/net/if_bridge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.93 src/sys/net/if_bridge.c:1.94
--- src/sys/net/if_bridge.c:1.93 Wed Dec 24 08:55:09 2014
+++ src/sys/net/if_bridge.c Thu Dec 25 09:10:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.93 2014/12/24 08:55:09 ozaki-r Exp $ */
+/* $NetBSD: if_bridge.c,v 1.94 2014/12/25 09:10:01 ozaki-r Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_bridge.c,v 1.93 2014/12/24 08:55:09 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_bridge.c,v 1.94 2014/12/25 09:10:01 ozaki-r Exp $);
#ifdef _KERNEL_OPT
#include opt_bridge_ipf.h
@@ -2043,8 +2043,7 @@ bridge_rttrim(struct bridge_softc *sc)
if (sc-sc_brtcnt = sc-sc_brtmax)
goto out;
- for (brt = LIST_FIRST(sc-sc_rtlist); brt != NULL; brt = nbrt) {
- nbrt = LIST_NEXT(brt, brt_list);
+ LIST_FOREACH_SAFE(brt, sc-sc_rtlist, brt_list, nbrt) {
if ((brt-brt_flags IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
bridge_rtnode_destroy(sc, brt);
if (sc-sc_brtcnt = sc-sc_brtmax)
@@ -2091,8 +2090,7 @@ bridge_rtage(struct bridge_softc *sc)
KASSERT(mutex_owned(sc-sc_rtlist_lock));
- for (brt = LIST_FIRST(sc-sc_rtlist); brt != NULL; brt = nbrt) {
- nbrt = LIST_NEXT(brt, brt_list);
+ LIST_FOREACH_SAFE(brt, sc-sc_rtlist, brt_list, nbrt) {
if ((brt-brt_flags IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
if (time_uptime = brt-brt_expire)
bridge_rtnode_destroy(sc, brt);
@@ -2112,8 +2110,7 @@ bridge_rtflush(struct bridge_softc *sc,
mutex_enter(sc-sc_rtlist_lock);
- for (brt = LIST_FIRST(sc-sc_rtlist); brt != NULL; brt = nbrt) {
- nbrt = LIST_NEXT(brt, brt_list);
+ LIST_FOREACH_SAFE(brt, sc-sc_rtlist, brt_list, nbrt) {
if (full || (brt-brt_flags IFBAF_TYPEMASK) == IFBAF_DYNAMIC)
bridge_rtnode_destroy(sc, brt);
}
@@ -2159,8 +2156,7 @@ bridge_rtdelete(struct bridge_softc *sc,
mutex_enter(sc-sc_rtlist_lock);
- for (brt = LIST_FIRST(sc-sc_rtlist); brt != NULL; brt = nbrt) {
- nbrt = LIST_NEXT(brt, brt_list);
+ LIST_FOREACH_SAFE(brt, sc-sc_rtlist, brt_list, nbrt) {
if (brt-brt_ifp == ifp)
bridge_rtnode_destroy(sc, brt);
}
CVS commit: src/lib/libedit
Module Name:src Committed By: wiz Date: Thu Dec 25 13:39:05 UTC 2014 Modified Files: src/lib/libedit: editline.3 editrc.5 Log Message: From Ingo Schwarze, based on changes from Kaspars Bankovskis: * Document error handling of el_init(), el_set(), el_source(), and history_init(). * Fix a typo an improve punctuation below H_SETUNIQUE. * The ellipsis already implies optional, no need for []. * Sort options in editrc(5). * Prevent e.g. rom being misconstrued as the end of a sentence. * Drop a useless duplicate .Ar macro. * Put telltc in its proper place in the alphabetical order. * A few typos in vi editor command names. * Some missing vi editor command names. * Some missing author macros. To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/lib/libedit/editline.3 cvs rdiff -u -r1.27 -r1.28 src/lib/libedit/editrc.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libedit/editline.3 diff -u src/lib/libedit/editline.3:1.82 src/lib/libedit/editline.3:1.83 --- src/lib/libedit/editline.3:1.82 Sun May 11 09:01:42 2014 +++ src/lib/libedit/editline.3 Thu Dec 25 13:39:05 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: editline.3,v 1.82 2014/05/11 09:01:42 wiz Exp $ +.\ $NetBSD: editline.3,v 1.83 2014/12/25 13:39:05 wiz Exp $ .\ .\ Copyright (c) 1997-2014 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -190,7 +190,9 @@ The following functions are available: .Bl -tag -width 4n .It Fn el_init Initialise the line editor, and return a data structure -to be used by all other line editing functions. +to be used by all other line editing functions, or +.Dv NULL +on failure. .Fa prog is the name of the invoking program, used when reading the .Xr editrc 5 @@ -290,6 +292,7 @@ parameters. .Fa op determines which parameter to set, and each operation has its own parameter list. +Returns 0 on success, \-1 on failure. .Pp The following values for .Fa op @@ -605,6 +608,8 @@ Refer to .Xr editrc 5 for details on the format of .Fa file . +.Fn el_source +returns 0 on success and \-1 on error. .It Fn el_resize Must be called if the terminal size changes. If @@ -665,7 +670,9 @@ The following functions are available: .Bl -tag -width 4n .It Fn history_init Initialise the history list, and return a data structure -to be used by all other history list functions. +to be used by all other history list functions, or +.Dv NULL +on failure. .It Fn history_end Clean up and finish with .Fa h , @@ -734,12 +741,12 @@ as a new element to the history, and, if removing the oldest entry to keep the list to the created size. If .Dv H_SETUNIQUE -was has been called with a non-zero arguments, the element +has been called with a non-zero argument, the element will not be entered into the history if its contents match the ones of the current history element. If the element is entered .Fn history -returns 1, if it is ignored as a duplicate returns 0. +returns 1; if it is ignored as a duplicate returns 0. Finally .Fn history returns \-1 if an error occurred. Index: src/lib/libedit/editrc.5 diff -u src/lib/libedit/editrc.5:1.27 src/lib/libedit/editrc.5:1.28 --- src/lib/libedit/editrc.5:1.27 Thu Jan 10 16:03:42 2013 +++ src/lib/libedit/editrc.5 Thu Dec 25 13:39:05 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: editrc.5,v 1.27 2013/01/10 16:03:42 wiz Exp $ +.\ $NetBSD: editrc.5,v 1.28 2014/12/25 13:39:05 wiz Exp $ .\ .\ Copyright (c) 1997-2000 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -42,7 +42,8 @@ file defines various settings to be used library. .Pp The format of each line is: -.Dl [prog:]command [arg [...]] +.Pp +.Dl [prog:]command [arg ...] .Pp .Ar command is one of the @@ -103,16 +104,12 @@ to .Ar key . Options include: .Bl -tag -width 4n -.It Fl e -Bind all keys to the standard GNU Emacs-like bindings. -.It Fl v -Bind all keys to the standard -.Xr vi 1 Ns -like -bindings. .It Fl a List or change key bindings in the .Xr vi 1 mode alternate (command mode) key map. +.It Fl e +Bind all keys to the standard GNU Emacs-like bindings. .It Fl k .Ar key is interpreted as a symbolic arrow key name, which may be one of @@ -134,6 +131,10 @@ Bound keys in .Ar command are themselves reinterpreted, and this continues for ten levels of interpretation. +.It Fl v +Bind all keys to the standard +.Xr vi 1 Ns -like +bindings. .El .Pp .Ar command @@ -149,7 +150,7 @@ can contain control characters of the fo .Sq No ^ Ar character .Sm on .Po -e.g. +e.g.\ .Sq ^A .Pc , and the following backslashed escape sequences: @@ -186,7 +187,7 @@ and .Sq ^ . .It Ic echotc Oo Fl sv Oc Ar arg Ar ... Exercise terminal capabilities given in -.Ar arg Ar ... . +.Ar arg ... . If .Ar arg is @@ -230,9 +231,6 @@ is non zero, only keep unique history en If .Dv n is zero, then keep all entries (the default). -.It Ic telltc -List the values of all the terminal capabilities (see -.Xr termcap 5 )
CVS commit: src/lib/libedit
Module Name:src Committed By: wiz Date: Thu Dec 25 13:39:41 UTC 2014 Modified Files: src/lib/libedit: editline.3 editrc.5 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/lib/libedit/editline.3 cvs rdiff -u -r1.28 -r1.29 src/lib/libedit/editrc.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libedit/editline.3 diff -u src/lib/libedit/editline.3:1.83 src/lib/libedit/editline.3:1.84 --- src/lib/libedit/editline.3:1.83 Thu Dec 25 13:39:05 2014 +++ src/lib/libedit/editline.3 Thu Dec 25 13:39:41 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: editline.3,v 1.83 2014/12/25 13:39:05 wiz Exp $ +.\ $NetBSD: editline.3,v 1.84 2014/12/25 13:39:41 wiz Exp $ .\ .\ Copyright (c) 1997-2014 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -26,7 +26,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 10, 2014 +.Dd December 25, 2014 .Dt EDITLINE 3 .Os .Sh NAME Index: src/lib/libedit/editrc.5 diff -u src/lib/libedit/editrc.5:1.28 src/lib/libedit/editrc.5:1.29 --- src/lib/libedit/editrc.5:1.28 Thu Dec 25 13:39:05 2014 +++ src/lib/libedit/editrc.5 Thu Dec 25 13:39:41 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: editrc.5,v 1.28 2014/12/25 13:39:05 wiz Exp $ +.\ $NetBSD: editrc.5,v 1.29 2014/12/25 13:39:41 wiz Exp $ .\ .\ Copyright (c) 1997-2000 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -26,7 +26,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd January 10, 2013 +.Dd December 25, 2014 .Dt EDITRC 5 .Os .Sh NAME
CVS commit: src/sys/arch/sparc64/include
Module Name:src
Committed By: nakayama
Date: Thu Dec 25 14:02:03 UTC 2014
Modified Files:
src/sys/arch/sparc64/include: psl.h
Log Message:
Put memory to asm inline for reading privilege registers on sun4v
to avoid issuing rdpr %ver before checking cputyp as a result of
code moving by compiler optimization.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/sparc64/include/psl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/include/psl.h
diff -u src/sys/arch/sparc64/include/psl.h:1.55 src/sys/arch/sparc64/include/psl.h:1.56
--- src/sys/arch/sparc64/include/psl.h:1.55 Fri Dec 5 11:34:00 2014
+++ src/sys/arch/sparc64/include/psl.h Thu Dec 25 14:02:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.55 2014/12/05 11:34:00 nakayama Exp $ */
+/* $NetBSD: psl.h,v 1.56 2014/12/25 14:02:03 nakayama Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -284,6 +284,21 @@
#if defined(_KERNEL) !defined(_LOCORE)
+#if defined(_KERNEL_OPT)
+#include opt_sparc_arch.h
+#endif
+
+/*
+ * Put memory to asm inline on sun4v to avoid issuing rdpr %ver
+ * before checking cputyp as a result of code moving by compiler
+ * optimization.
+ */
+#ifdef SUN4V
+#define constasm_clobbers memory
+#else
+#define constasm_clobbers
+#endif
+
/*
* Inlines for manipulating privileged and ancillary state registers
*/
@@ -291,7 +306,7 @@
static __inline __constfunc type get##name(void) \
{ \
type _val; \
- __asm(#rd % #reg ,%0 : =r (_val)); \
+ __asm(#rd % #reg ,%0 : =r (_val) : : constasm_clobbers); \
return _val; \
}
#define SPARC64_RD_DEF(rd, name, reg, type)\
@@ -318,7 +333,7 @@ static __inline __constfunc uint64_t get
{ \
uint32_t _hi, _lo; \
__asm(#rd % #reg ,%0; srl %0,0,%1; srlx %0,32,%0 \
- : =r (_hi), =r (_lo));\
+ : =r (_hi), =r (_lo) : : constasm_clobbers); \
return ((uint64_t)_hi 32) | _lo;\
}
#define SPARC64_RD64_DEF(rd, name, reg) \
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Thu Dec 25 17:24:25 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: binutils-2.25 out. To generate a diff of this commit: cvs rdiff -u -r1.1186 -r1.1187 src/doc/3RDPARTY 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.1186 src/doc/3RDPARTY:1.1187 --- src/doc/3RDPARTY:1.1186 Fri Dec 19 20:50:35 2014 +++ src/doc/3RDPARTY Thu Dec 25 17:24:25 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1186 2014/12/19 20:50:35 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1187 2014/12/25 17:24:25 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -157,7 +157,7 @@ Todo[5]: Reconcile the doc directory. Package: binutils Version: 2.23.2 -Current Vers: 2.24 +Current Vers: 2.25 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/binutils/ Home Page: http://www.gnu.org/software/binutils/
CVS commit: src/libexec/httpd
Module Name:src Committed By: mrg Date: Thu Dec 25 18:53:06 UTC 2014 Modified Files: src/libexec/httpd: bozohttpd.8 bozohttpd.c Log Message: call this 20141225. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/libexec/httpd/bozohttpd.8 cvs rdiff -u -r1.59 -r1.60 src/libexec/httpd/bozohttpd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/bozohttpd.8 diff -u src/libexec/httpd/bozohttpd.8:1.46 src/libexec/httpd/bozohttpd.8:1.47 --- src/libexec/httpd/bozohttpd.8:1.46 Sun Feb 9 12:32:32 2014 +++ src/libexec/httpd/bozohttpd.8 Thu Dec 25 18:53:06 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: bozohttpd.8,v 1.46 2014/02/09 12:32:32 mrg Exp $ +.\ $NetBSD: bozohttpd.8,v 1.47 2014/12/25 18:53:06 mrg Exp $ .\ .\ $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $ .\ @@ -26,7 +26,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd February 9, 2014 +.Dd December 25, 2025 .Dt HTTPD 8 .Os .Sh NAME @@ -513,7 +513,7 @@ The focus has always been simplicity and and regular code audits. This manual documents .Nm -version 20140201. +version 20141225. .Sh AUTHORS .An -nosplit .Nm Index: src/libexec/httpd/bozohttpd.c diff -u src/libexec/httpd/bozohttpd.c:1.59 src/libexec/httpd/bozohttpd.c:1.60 --- src/libexec/httpd/bozohttpd.c:1.59 Fri Nov 21 08:58:28 2014 +++ src/libexec/httpd/bozohttpd.c Thu Dec 25 18:53:06 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: bozohttpd.c,v 1.59 2014/11/21 08:58:28 shm Exp $ */ +/* $NetBSD: bozohttpd.c,v 1.60 2014/12/25 18:53:06 mrg Exp $ */ /* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */ @@ -109,7 +109,7 @@ #define INDEX_HTML index.html #endif #ifndef SERVER_SOFTWARE -#define SERVER_SOFTWARE bozohttpd/20141009 +#define SERVER_SOFTWARE bozohttpd/20141225 #endif #ifndef DIRECT_ACCESS_FILE #define DIRECT_ACCESS_FILE .bzdirect
CVS commit: src/libexec/httpd
Module Name:src Committed By: wiz Date: Thu Dec 25 18:56:28 UTC 2014 Modified Files: src/libexec/httpd: bozohttpd.8 Log Message: Bring this man page back to this decade. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/libexec/httpd/bozohttpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/bozohttpd.8 diff -u src/libexec/httpd/bozohttpd.8:1.47 src/libexec/httpd/bozohttpd.8:1.48 --- src/libexec/httpd/bozohttpd.8:1.47 Thu Dec 25 18:53:06 2014 +++ src/libexec/httpd/bozohttpd.8 Thu Dec 25 18:56:28 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: bozohttpd.8,v 1.47 2014/12/25 18:53:06 mrg Exp $ +.\ $NetBSD: bozohttpd.8,v 1.48 2014/12/25 18:56:28 wiz Exp $ .\ .\ $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $ .\ @@ -26,7 +26,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd December 25, 2025 +.Dd December 25, 2014 .Dt HTTPD 8 .Os .Sh NAME
CVS commit: src/etc/rc.d
Module Name:src
Committed By: spz
Date: Thu Dec 25 23:00:18 UTC 2014
Modified Files:
src/etc/rc.d: ntpd
Log Message:
new ntpd wants to be able to translate ntp into a port number after chroot,
so give it its own small copy of /etc/services in the chroot
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/etc/rc.d/ntpd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/ntpd
diff -u src/etc/rc.d/ntpd:1.14 src/etc/rc.d/ntpd:1.15
--- src/etc/rc.d/ntpd:1.14 Tue Dec 4 16:38:40 2012
+++ src/etc/rc.d/ntpd Thu Dec 25 23:00:18 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ntpd,v 1.14 2012/12/04 16:38:40 prlw1 Exp $
+# $NetBSD: ntpd,v 1.15 2014/12/25 23:00:18 spz Exp $
#
# PROVIDE: ntpd
@@ -50,6 +50,21 @@ ntpd_precmd()
fi
ln -fs ${ntpd_chrootdir}/var/db/ntp.drift /var/db/ntp.drift
+ if [ ! -d ${ntpd_chrootdir}/etc ]; then
+ mkdir ${ntpd_chrootdir}/etc
+ fi
+ if [ ! -f ${ntpd_chrootdir}/etc/services ]; then
+ getent services ntp/udp ntp/tcp \
+ ${ntpd_chrootdir}/etc/services
+ fi
+ if [ ! -d ${ntpd_chrootdir}/var/db ]; then
+ mkdir -p ${ntpd_chrootdir}/var/db
+ fi
+ if [ ! -f ${ntpd_chrootdir}/var/db/services.cdb ]; then
+ services_mkdb -o ${ntpd_chrootdir}/var/db/services.cdb \
+ ${ntpd_chrootdir}/etc/services
+ fi
+
# Change run_rc_commands()'s internal copy of $ntpd_flags
#
rc_flags=-u ntpd:ntpd -i ${ntpd_chrootdir} $rc_flags
CVS commit: [netbsd-5] src
Module Name:src
Committed By: he
Date: Thu Dec 25 23:19:10 UTC 2014
Modified Files:
src/dist/bind/bin/named [netbsd-5]: config.c query.c server.c
src/dist/bind/lib/dns [netbsd-5]: adb.c resolver.c
src/dist/bind/lib/dns/include/dns [netbsd-5]: adb.h resolver.h
src/dist/bind/lib/export/isc [netbsd-5]: Makefile.in
src/dist/bind/lib/isc [netbsd-5]: Makefile.in
src/dist/bind/lib/isc/include/isc [netbsd-5]: Makefile.in types.h
src/dist/bind/lib/isccfg [netbsd-5]: namedconf.c
src/lib/libisc [netbsd-5]: Makefile
src/usr.sbin/bind [netbsd-5]: Makefile.inc
Added Files:
src/dist/bind/lib/isc [netbsd-5]: counter.c
src/dist/bind/lib/isc/include/isc [netbsd-5]: counter.h
Log Message:
Apply fix for BIND, backported from the patch for 9.8.8 from ISC.
This is a fix for CVE-2014-8500, where a maliciously constructed
setup can cause BIND to issue an unlimited sequence of queries to
follow a delegation.
[spz, ticket #1937]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8.4.4 -r1.1.1.8.4.5 src/dist/bind/bin/named/config.c
cvs rdiff -u -r1.8.4.8 -r1.8.4.9 src/dist/bind/bin/named/query.c
cvs rdiff -u -r1.1.1.9.4.4 -r1.1.1.9.4.5 src/dist/bind/bin/named/server.c
cvs rdiff -u -r1.6.4.4 -r1.6.4.5 src/dist/bind/lib/dns/adb.c
cvs rdiff -u -r1.8.4.6 -r1.8.4.7 src/dist/bind/lib/dns/resolver.c
cvs rdiff -u -r1.1.1.5.4.3 -r1.1.1.5.4.4 \
src/dist/bind/lib/dns/include/dns/adb.h
cvs rdiff -u -r1.1.1.5.4.4 -r1.1.1.5.4.5 \
src/dist/bind/lib/dns/include/dns/resolver.h
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/dist/bind/lib/export/isc/Makefile.in
cvs rdiff -u -r1.1.1.6.4.4 -r1.1.1.6.4.5 src/dist/bind/lib/isc/Makefile.in
cvs rdiff -u -r0 -r1.1.2.1 src/dist/bind/lib/isc/counter.c
cvs rdiff -u -r1.1.1.5.4.4 -r1.1.1.5.4.5 \
src/dist/bind/lib/isc/include/isc/Makefile.in \
src/dist/bind/lib/isc/include/isc/types.h
cvs rdiff -u -r0 -r1.1.2.1 src/dist/bind/lib/isc/include/isc/counter.h
cvs rdiff -u -r1.1.1.7.4.4 -r1.1.1.7.4.5 src/dist/bind/lib/isccfg/namedconf.c
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/lib/libisc/Makefile
cvs rdiff -u -r1.32.4.1 -r1.32.4.2 src/usr.sbin/bind/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/bind/bin/named/config.c
diff -u src/dist/bind/bin/named/config.c:1.1.1.8.4.4 src/dist/bind/bin/named/config.c:1.1.1.8.4.5
--- src/dist/bind/bin/named/config.c:1.1.1.8.4.4 Wed Jul 25 11:57:23 2012
+++ src/dist/bind/bin/named/config.c Thu Dec 25 23:19:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: config.c,v 1.1.1.8.4.4 2012/07/25 11:57:23 jdc Exp $ */
+/* $NetBSD: config.c,v 1.1.1.8.4.5 2014/12/25 23:19:09 he Exp $ */
/*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. (ISC)
@@ -75,6 +75,8 @@ options {\n\
listen-on {any;};\n\
listen-on-v6 {none;};\n\
match-mapped-addresses no;\n\
+ max-recursion-depth 7;\n\
+ max-recursion-queries 50;\n\
memstatistics-file \named.memstats\;\n\
multiple-cnames no;\n\
# named-xfer obsolete;\n\
Index: src/dist/bind/bin/named/query.c
diff -u src/dist/bind/bin/named/query.c:1.8.4.8 src/dist/bind/bin/named/query.c:1.8.4.9
--- src/dist/bind/bin/named/query.c:1.8.4.8 Wed Jan 15 10:11:20 2014
+++ src/dist/bind/bin/named/query.c Thu Dec 25 23:19:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.8.4.8 2014/01/15 10:11:20 bouyer Exp $ */
+/* $NetBSD: query.c,v 1.8.4.9 2014/12/25 23:19:09 he Exp $ */
/*
* Copyright (C) 2004-2012 Internet Systems Consortium, Inc. (ISC)
@@ -3338,11 +3338,11 @@ query_recurse(ns_client_t *client, dns_r
peeraddr = client-peeraddr;
else
peeraddr = NULL;
- result = dns_resolver_createfetch2(client-view-resolver,
+ result = dns_resolver_createfetch3(client-view-resolver,
client-query.qname,
qtype, qdomain, nameservers,
NULL, peeraddr, client-message-id,
- client-query.fetchoptions,
+ client-query.fetchoptions, 0, NULL,
client-task,
query_resume, client,
rdataset, sigrdataset,
Index: src/dist/bind/bin/named/server.c
diff -u src/dist/bind/bin/named/server.c:1.1.1.9.4.4 src/dist/bind/bin/named/server.c:1.1.1.9.4.5
--- src/dist/bind/bin/named/server.c:1.1.1.9.4.4 Wed Jul 25 11:57:25 2012
+++ src/dist/bind/bin/named/server.c Thu Dec 25 23:19:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.1.1.9.4.4 2012/07/25 11:57:25 jdc Exp $ */
+/* $NetBSD: server.c,v 1.1.1.9.4.5 2014/12/25 23:19:10 he Exp $ */
/*
* Copyright (C) 2004-2012 Internet Systems Consortium, Inc. (ISC)
@@ -1837,6 +1837,16 @@ configure_view(dns_view_t *view, cfg_obj
udpsize = 4096;
dns_resolver_setudpsize(view-resolver, (isc_uint16_t)udpsize);
+ obj = NULL;
+ result = ns_config_get(maps, max-recursion-depth, obj);
+ INSIST(result == ISC_R_SUCCESS);
+ dns_resolver_setmaxdepth(view-resolver, cfg_obj_asuint32(obj));
+
+ obj = NULL;
+ result = ns_config_get(maps, max-recursion-queries, obj);
+
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: he Date: Thu Dec 25 23:20:19 UTC 2014 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Ticket 1937. To generate a diff of this commit: cvs rdiff -u -r1.1.2.88 -r1.1.2.89 src/doc/CHANGES-5.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.3 diff -u src/doc/CHANGES-5.3:1.1.2.88 src/doc/CHANGES-5.3:1.1.2.89 --- src/doc/CHANGES-5.3:1.1.2.88 Mon Dec 22 12:57:54 2014 +++ src/doc/CHANGES-5.3 Thu Dec 25 23:20:19 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.88 2014/12/22 12:57:54 msaitoh Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.89 2014/12/25 23:20:19 he Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -1278,3 +1278,26 @@ sys/dev/ic/rtl8169.c1.142 Force software recalculation of UDP checksum if bad checksum is reported by the hardware. [uwe, ticket #1936] + +dist/bind/lib/isc/counter.c new, via patch +dist/bind/lib/isc/include/isc/counter.h new, via patch +dist/bind/bin/named/config.c patch +dist/bind/bin/named/query.c patch +dist/bind/bin/named/server.c patch +dist/bind/lib/dns/adb.cpatch +dist/bind/lib/dns/resolver.c patch +dist/bind/lib/dns/include/dns/adb.h patch +dist/bind/lib/dns/include/dns/resolver.h patch +dist/bind/lib/export/isc/Makefile.in patch +dist/bind/lib/isc/Makefile.in patch +dist/bind/lib/isc/include/isc/Makefile.in patch +dist/bind/lib/isc/include/isc/types.h patch +dist/bind/lib/isccfg/namedconf.c patch +lib/libisc/Makefilepatch +usr.sbin/bind/Makefile.inc patch + + Apply fix for BIND, backported from the patch for 9.8.8 from ISC. + This is a fix for CVE-2014-8500, where a maliciously constructed + setup can cause BIND to issue an unlimited sequence of queries to + follow a delegation. + [spz, ticket #1937]
CVS commit: [netbsd-5-2] src
Module Name:src
Committed By: he
Date: Thu Dec 25 23:30:59 UTC 2014
Modified Files:
src/dist/bind/bin/named [netbsd-5-2]: config.c query.c server.c
src/dist/bind/lib/dns [netbsd-5-2]: adb.c resolver.c
src/dist/bind/lib/dns/include/dns [netbsd-5-2]: adb.h resolver.h
src/dist/bind/lib/export/isc [netbsd-5-2]: Makefile.in
src/dist/bind/lib/isc [netbsd-5-2]: Makefile.in
src/dist/bind/lib/isc/include/isc [netbsd-5-2]: Makefile.in types.h
src/dist/bind/lib/isccfg [netbsd-5-2]: namedconf.c
src/lib/libisc [netbsd-5-2]: Makefile
src/usr.sbin/bind [netbsd-5-2]: Makefile.inc
Added Files:
src/dist/bind/lib/isc [netbsd-5-2]: counter.c
src/dist/bind/lib/isc/include/isc [netbsd-5-2]: counter.h
Log Message:
Apply fix for BIND, backported from the patch for 9.8.8 from ISC.
This is a fix for CVE-2014-8500, where a maliciously constructed
setup can cause BIND to issue an unlimited sequence of queries to
follow a delegation.
[spz, ticket #1937]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8.4.4 -r1.1.1.8.4.4.2.1 src/dist/bind/bin/named/config.c
cvs rdiff -u -r1.8.4.7.2.1 -r1.8.4.7.2.2 src/dist/bind/bin/named/query.c
cvs rdiff -u -r1.1.1.9.4.4 -r1.1.1.9.4.4.2.1 src/dist/bind/bin/named/server.c
cvs rdiff -u -r1.6.4.4 -r1.6.4.4.2.1 src/dist/bind/lib/dns/adb.c
cvs rdiff -u -r1.8.4.6 -r1.8.4.6.2.1 src/dist/bind/lib/dns/resolver.c
cvs rdiff -u -r1.1.1.5.4.3 -r1.1.1.5.4.3.2.1 \
src/dist/bind/lib/dns/include/dns/adb.h
cvs rdiff -u -r1.1.1.5.4.4 -r1.1.1.5.4.4.2.1 \
src/dist/bind/lib/dns/include/dns/resolver.h
cvs rdiff -u -r1.1.2.3 -r1.1.2.3.2.1 src/dist/bind/lib/export/isc/Makefile.in
cvs rdiff -u -r1.1.1.6.4.4 -r1.1.1.6.4.4.2.1 \
src/dist/bind/lib/isc/Makefile.in
cvs rdiff -u -r0 -r1.1.4.2 src/dist/bind/lib/isc/counter.c
cvs rdiff -u -r1.1.1.5.4.4 -r1.1.1.5.4.4.2.1 \
src/dist/bind/lib/isc/include/isc/Makefile.in \
src/dist/bind/lib/isc/include/isc/types.h
cvs rdiff -u -r0 -r1.1.4.2 src/dist/bind/lib/isc/include/isc/counter.h
cvs rdiff -u -r1.1.1.7.4.4 -r1.1.1.7.4.4.2.1 \
src/dist/bind/lib/isccfg/namedconf.c
cvs rdiff -u -r1.2.4.2 -r1.2.4.2.2.1 src/lib/libisc/Makefile
cvs rdiff -u -r1.32.4.1 -r1.32.4.1.2.1 src/usr.sbin/bind/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/bind/bin/named/config.c
diff -u src/dist/bind/bin/named/config.c:1.1.1.8.4.4 src/dist/bind/bin/named/config.c:1.1.1.8.4.4.2.1
--- src/dist/bind/bin/named/config.c:1.1.1.8.4.4 Wed Jul 25 11:57:23 2012
+++ src/dist/bind/bin/named/config.c Thu Dec 25 23:30:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: config.c,v 1.1.1.8.4.4 2012/07/25 11:57:23 jdc Exp $ */
+/* $NetBSD: config.c,v 1.1.1.8.4.4.2.1 2014/12/25 23:30:58 he Exp $ */
/*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. (ISC)
@@ -75,6 +75,8 @@ options {\n\
listen-on {any;};\n\
listen-on-v6 {none;};\n\
match-mapped-addresses no;\n\
+ max-recursion-depth 7;\n\
+ max-recursion-queries 50;\n\
memstatistics-file \named.memstats\;\n\
multiple-cnames no;\n\
# named-xfer obsolete;\n\
Index: src/dist/bind/bin/named/query.c
diff -u src/dist/bind/bin/named/query.c:1.8.4.7.2.1 src/dist/bind/bin/named/query.c:1.8.4.7.2.2
--- src/dist/bind/bin/named/query.c:1.8.4.7.2.1 Wed Jan 15 10:11:43 2014
+++ src/dist/bind/bin/named/query.c Thu Dec 25 23:30:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.8.4.7.2.1 2014/01/15 10:11:43 bouyer Exp $ */
+/* $NetBSD: query.c,v 1.8.4.7.2.2 2014/12/25 23:30:58 he Exp $ */
/*
* Copyright (C) 2004-2012 Internet Systems Consortium, Inc. (ISC)
@@ -3338,11 +3338,11 @@ query_recurse(ns_client_t *client, dns_r
peeraddr = client-peeraddr;
else
peeraddr = NULL;
- result = dns_resolver_createfetch2(client-view-resolver,
+ result = dns_resolver_createfetch3(client-view-resolver,
client-query.qname,
qtype, qdomain, nameservers,
NULL, peeraddr, client-message-id,
- client-query.fetchoptions,
+ client-query.fetchoptions, 0, NULL,
client-task,
query_resume, client,
rdataset, sigrdataset,
Index: src/dist/bind/bin/named/server.c
diff -u src/dist/bind/bin/named/server.c:1.1.1.9.4.4 src/dist/bind/bin/named/server.c:1.1.1.9.4.4.2.1
--- src/dist/bind/bin/named/server.c:1.1.1.9.4.4 Wed Jul 25 11:57:25 2012
+++ src/dist/bind/bin/named/server.c Thu Dec 25 23:30:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.1.1.9.4.4 2012/07/25 11:57:25 jdc Exp $ */
+/* $NetBSD: server.c,v 1.1.1.9.4.4.2.1 2014/12/25 23:30:58 he Exp $ */
/*
* Copyright (C) 2004-2012 Internet Systems Consortium, Inc. (ISC)
@@ -1837,6 +1837,16 @@ configure_view(dns_view_t *view, cfg_obj
udpsize = 4096;
dns_resolver_setudpsize(view-resolver, (isc_uint16_t)udpsize);
+ obj = NULL;
+ result = ns_config_get(maps, max-recursion-depth, obj);
+ INSIST(result == ISC_R_SUCCESS);
+
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: he Date: Thu Dec 25 23:31:43 UTC 2014 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.4 Log Message: Ticket 1937. To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/doc/CHANGES-5.2.4 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.4 diff -u src/doc/CHANGES-5.2.4:1.1.2.9 src/doc/CHANGES-5.2.4:1.1.2.10 --- src/doc/CHANGES-5.2.4:1.1.2.9 Mon Dec 22 12:58:13 2014 +++ src/doc/CHANGES-5.2.4 Thu Dec 25 23:31:43 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.4,v 1.1.2.9 2014/12/22 12:58:13 msaitoh Exp $ +# $NetBSD: CHANGES-5.2.4,v 1.1.2.10 2014/12/25 23:31:43 he Exp $ A complete list of changes from the NetBSD 5.2.3 release to the NetBSD 5.2.4 release: @@ -128,3 +128,25 @@ xsrc/xfree/xc/programs/Xserver/render/re CVE-2013-6424 [mrg, ticket #1935] +dist/bind/lib/isc/counter.c new, via patch +dist/bind/lib/isc/include/isc/counter.h new, via patch +dist/bind/bin/named/config.cpatch +dist/bind/bin/named/query.c patch +dist/bind/bin/named/server.cpatch +dist/bind/lib/dns/adb.c patch +dist/bind/lib/dns/resolver.cpatch +dist/bind/lib/dns/include/dns/adb.h patch +dist/bind/lib/dns/include/dns/resolver.hpatch +dist/bind/lib/export/isc/Makefile.inpatch +dist/bind/lib/isc/Makefile.in patch +dist/bind/lib/isc/include/isc/Makefile.in patch +dist/bind/lib/isc/include/isc/types.h patch +dist/bind/lib/isccfg/namedconf.cpatch +lib/libisc/Makefile patch +usr.sbin/bind/Makefile.inc patch + + Apply fix for BIND, backported from the patch for 9.8.8 from ISC. + This is a fix for CVE-2014-8500, where a maliciously constructed + setup can cause BIND to issue an unlimited sequence of queries to + follow a delegation. + [spz, ticket #1937]
CVS commit: [netbsd-5-1] src
Module Name:src
Committed By: he
Date: Thu Dec 25 23:43:29 UTC 2014
Modified Files:
src/dist/bind/bin/named [netbsd-5-1]: config.c query.c server.c
src/dist/bind/lib/dns [netbsd-5-1]: adb.c resolver.c
src/dist/bind/lib/dns/include/dns [netbsd-5-1]: adb.h resolver.h
src/dist/bind/lib/export/isc [netbsd-5-1]: Makefile.in
src/dist/bind/lib/isc [netbsd-5-1]: Makefile.in
src/dist/bind/lib/isc/include/isc [netbsd-5-1]: Makefile.in types.h
src/dist/bind/lib/isccfg [netbsd-5-1]: namedconf.c
src/lib/libisc [netbsd-5-1]: Makefile
Added Files:
src/dist/bind/lib/isc [netbsd-5-1]: counter.c
src/dist/bind/lib/isc/include/isc [netbsd-5-1]: counter.h
Log Message:
Apply fix for BIND, backported from the patch for 9.8.8 from ISC.
This is a fix for CVE-2014-8500, where a maliciously constructed
setup can cause BIND to issue an unlimited sequence of queries to
follow a delegation.
[spz, ticket #1937]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8.4.1.2.3 -r1.1.1.8.4.1.2.4 \
src/dist/bind/bin/named/config.c
cvs rdiff -u -r1.8.4.2.2.6 -r1.8.4.2.2.7 src/dist/bind/bin/named/query.c
cvs rdiff -u -r1.1.1.9.4.1.2.3 -r1.1.1.9.4.1.2.4 \
src/dist/bind/bin/named/server.c
cvs rdiff -u -r1.6.4.1.2.3 -r1.6.4.1.2.4 src/dist/bind/lib/dns/adb.c
cvs rdiff -u -r1.8.4.2.2.4 -r1.8.4.2.2.5 src/dist/bind/lib/dns/resolver.c
cvs rdiff -u -r1.1.1.5.12.3 -r1.1.1.5.12.4 \
src/dist/bind/lib/dns/include/dns/adb.h
cvs rdiff -u -r1.1.1.5.4.1.2.3 -r1.1.1.5.4.1.2.4 \
src/dist/bind/lib/dns/include/dns/resolver.h
cvs rdiff -u -r1.1.4.4 -r1.1.4.5 src/dist/bind/lib/export/isc/Makefile.in
cvs rdiff -u -r1.1.1.6.4.1.2.3 -r1.1.1.6.4.1.2.4 \
src/dist/bind/lib/isc/Makefile.in
cvs rdiff -u -r0 -r1.1.6.2 src/dist/bind/lib/isc/counter.c
cvs rdiff -u -r1.1.1.5.4.1.2.3 -r1.1.1.5.4.1.2.4 \
src/dist/bind/lib/isc/include/isc/Makefile.in \
src/dist/bind/lib/isc/include/isc/types.h
cvs rdiff -u -r0 -r1.1.6.2 src/dist/bind/lib/isc/include/isc/counter.h
cvs rdiff -u -r1.1.1.7.4.1.2.3 -r1.1.1.7.4.1.2.4 \
src/dist/bind/lib/isccfg/namedconf.c
cvs rdiff -u -r1.2.4.1.2.1 -r1.2.4.1.2.2 src/lib/libisc/Makefile
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/bin/named/config.c
diff -u src/dist/bind/bin/named/config.c:1.1.1.8.4.1.2.3 src/dist/bind/bin/named/config.c:1.1.1.8.4.1.2.4
--- src/dist/bind/bin/named/config.c:1.1.1.8.4.1.2.3 Wed Jul 25 12:09:57 2012
+++ src/dist/bind/bin/named/config.c Thu Dec 25 23:43:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: config.c,v 1.1.1.8.4.1.2.3 2012/07/25 12:09:57 jdc Exp $ */
+/* $NetBSD: config.c,v 1.1.1.8.4.1.2.4 2014/12/25 23:43:29 he Exp $ */
/*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. (ISC)
@@ -75,6 +75,8 @@ options {\n\
listen-on {any;};\n\
listen-on-v6 {none;};\n\
match-mapped-addresses no;\n\
+ max-recursion-depth 7;\n\
+ max-recursion-queries 50;\n\
memstatistics-file \named.memstats\;\n\
multiple-cnames no;\n\
# named-xfer obsolete;\n\
Index: src/dist/bind/bin/named/query.c
diff -u src/dist/bind/bin/named/query.c:1.8.4.2.2.6 src/dist/bind/bin/named/query.c:1.8.4.2.2.7
--- src/dist/bind/bin/named/query.c:1.8.4.2.2.6 Wed Jan 15 10:11:37 2014
+++ src/dist/bind/bin/named/query.c Thu Dec 25 23:43:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.8.4.2.2.6 2014/01/15 10:11:37 bouyer Exp $ */
+/* $NetBSD: query.c,v 1.8.4.2.2.7 2014/12/25 23:43:29 he Exp $ */
/*
* Copyright (C) 2004-2012 Internet Systems Consortium, Inc. (ISC)
@@ -3338,11 +3338,11 @@ query_recurse(ns_client_t *client, dns_r
peeraddr = client-peeraddr;
else
peeraddr = NULL;
- result = dns_resolver_createfetch2(client-view-resolver,
+ result = dns_resolver_createfetch3(client-view-resolver,
client-query.qname,
qtype, qdomain, nameservers,
NULL, peeraddr, client-message-id,
- client-query.fetchoptions,
+ client-query.fetchoptions, 0, NULL,
client-task,
query_resume, client,
rdataset, sigrdataset,
Index: src/dist/bind/bin/named/server.c
diff -u src/dist/bind/bin/named/server.c:1.1.1.9.4.1.2.3 src/dist/bind/bin/named/server.c:1.1.1.9.4.1.2.4
--- src/dist/bind/bin/named/server.c:1.1.1.9.4.1.2.3 Wed Jul 25 12:10:02 2012
+++ src/dist/bind/bin/named/server.c Thu Dec 25 23:43:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.1.1.9.4.1.2.3 2012/07/25 12:10:02 jdc Exp $ */
+/* $NetBSD: server.c,v 1.1.1.9.4.1.2.4 2014/12/25 23:43:29 he Exp $ */
/*
* Copyright (C) 2004-2012 Internet Systems Consortium, Inc. (ISC)
@@ -1837,6 +1837,16 @@ configure_view(dns_view_t *view, cfg_obj
udpsize = 4096;
dns_resolver_setudpsize(view-resolver, (isc_uint16_t)udpsize);
+ obj = NULL;
+ result = ns_config_get(maps, max-recursion-depth, obj);
+ INSIST(result == ISC_R_SUCCESS);
+ dns_resolver_setmaxdepth(view-resolver, cfg_obj_asuint32(obj));
+
+ obj
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: he Date: Thu Dec 25 23:46:18 UTC 2014 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.6 Log Message: Ticket 1937. To generate a diff of this commit: cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/doc/CHANGES-5.1.6 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.6 diff -u src/doc/CHANGES-5.1.6:1.1.2.9 src/doc/CHANGES-5.1.6:1.1.2.10 --- src/doc/CHANGES-5.1.6:1.1.2.9 Mon Dec 22 12:58:36 2014 +++ src/doc/CHANGES-5.1.6 Thu Dec 25 23:46:18 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.6,v 1.1.2.9 2014/12/22 12:58:36 msaitoh Exp $ +# $NetBSD: CHANGES-5.1.6,v 1.1.2.10 2014/12/25 23:46:18 he Exp $ A complete list of changes from the NetBSD 5.1.5 release to the NetBSD 5.1.6 release: @@ -127,3 +127,26 @@ xsrc/xfree/xc/programs/Xserver/render/re the check properly. CVE-2013-6424 [mrg, ticket #1935] + +dist/bind/lib/isc/counter.c new, via patch +dist/bind/lib/isc/include/isc/counter.h new, via patch +dist/bind/bin/named/config.c patch +dist/bind/bin/named/query.c patch +dist/bind/bin/named/server.c patch +dist/bind/lib/dns/adb.cpatch +dist/bind/lib/dns/resolver.c patch +dist/bind/lib/dns/include/dns/adb.h patch +dist/bind/lib/dns/include/dns/resolver.h patch +dist/bind/lib/export/isc/Makefile.in patch +dist/bind/lib/isc/Makefile.in patch +dist/bind/lib/isc/include/isc/Makefile.in patch +dist/bind/lib/isc/include/isc/types.h patch +dist/bind/lib/isccfg/namedconf.c patch +lib/libisc/Makefilepatch +usr.sbin/bind/Makefile.inc patch + + Apply fix for BIND, backported from the patch for 9.8.8 from ISC. + This is a fix for CVE-2014-8500, where a maliciously constructed + setup can cause BIND to issue an unlimited sequence of queries to + follow a delegation. + [spz, ticket #1937]
CVS commit: [netbsd-5-0] src
Module Name:src
Committed By: he
Date: Thu Dec 25 23:52:00 UTC 2014
Modified Files:
src/dist/bind/bin/named [netbsd-5-0]: config.c query.c server.c
src/dist/bind/lib/dns [netbsd-5-0]: adb.c resolver.c
src/dist/bind/lib/dns/include/dns [netbsd-5-0]: adb.h resolver.h
src/dist/bind/lib/export/isc [netbsd-5-0]: Makefile.in
src/dist/bind/lib/isc [netbsd-5-0]: Makefile.in
src/dist/bind/lib/isc/include/isc [netbsd-5-0]: Makefile.in types.h
src/dist/bind/lib/isccfg [netbsd-5-0]: namedconf.c
src/lib/libisc [netbsd-5-0]: Makefile
src/usr.sbin/bind [netbsd-5-0]: Makefile.inc
Added Files:
src/dist/bind/lib/isc [netbsd-5-0]: counter.c
src/dist/bind/lib/isc/include/isc [netbsd-5-0]: counter.h
Log Message:
Apply fix for BIND, backported from the patch for 9.8.8 from ISC.
This is a fix for CVE-2014-8500, where a maliciously constructed
setup can cause BIND to issue an unlimited sequence of queries to
follow a delegation.
[spz, ticket #1937]
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8.8.4 -r1.1.1.8.8.5 src/dist/bind/bin/named/config.c
cvs rdiff -u -r1.8.8.7 -r1.8.8.8 src/dist/bind/bin/named/query.c
cvs rdiff -u -r1.1.1.9.8.4 -r1.1.1.9.8.5 src/dist/bind/bin/named/server.c
cvs rdiff -u -r1.6.8.4 -r1.6.8.5 src/dist/bind/lib/dns/adb.c
cvs rdiff -u -r1.8.8.6 -r1.8.8.7 src/dist/bind/lib/dns/resolver.c
cvs rdiff -u -r1.1.1.5.8.3 -r1.1.1.5.8.4 \
src/dist/bind/lib/dns/include/dns/adb.h
cvs rdiff -u -r1.1.1.5.8.4 -r1.1.1.5.8.5 \
src/dist/bind/lib/dns/include/dns/resolver.h
cvs rdiff -u -r1.1.6.4 -r1.1.6.5 src/dist/bind/lib/export/isc/Makefile.in
cvs rdiff -u -r1.1.1.6.8.4 -r1.1.1.6.8.5 src/dist/bind/lib/isc/Makefile.in
cvs rdiff -u -r0 -r1.1.8.2 src/dist/bind/lib/isc/counter.c
cvs rdiff -u -r1.1.1.5.8.4 -r1.1.1.5.8.5 \
src/dist/bind/lib/isc/include/isc/Makefile.in \
src/dist/bind/lib/isc/include/isc/types.h
cvs rdiff -u -r0 -r1.1.8.2 src/dist/bind/lib/isc/include/isc/counter.h
cvs rdiff -u -r1.1.1.7.8.4 -r1.1.1.7.8.5 src/dist/bind/lib/isccfg/namedconf.c
cvs rdiff -u -r1.2.8.2 -r1.2.8.3 src/lib/libisc/Makefile
cvs rdiff -u -r1.32.8.1 -r1.32.8.2 src/usr.sbin/bind/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/bind/bin/named/config.c
diff -u src/dist/bind/bin/named/config.c:1.1.1.8.8.4 src/dist/bind/bin/named/config.c:1.1.1.8.8.5
--- src/dist/bind/bin/named/config.c:1.1.1.8.8.4 Wed Jul 25 12:02:49 2012
+++ src/dist/bind/bin/named/config.c Thu Dec 25 23:51:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: config.c,v 1.1.1.8.8.4 2012/07/25 12:02:49 jdc Exp $ */
+/* $NetBSD: config.c,v 1.1.1.8.8.5 2014/12/25 23:51:59 he Exp $ */
/*
* Copyright (C) 2004-2010 Internet Systems Consortium, Inc. (ISC)
@@ -75,6 +75,8 @@ options {\n\
listen-on {any;};\n\
listen-on-v6 {none;};\n\
match-mapped-addresses no;\n\
+ max-recursion-depth 7;\n\
+ max-recursion-queries 50;\n\
memstatistics-file \named.memstats\;\n\
multiple-cnames no;\n\
# named-xfer obsolete;\n\
Index: src/dist/bind/bin/named/query.c
diff -u src/dist/bind/bin/named/query.c:1.8.8.7 src/dist/bind/bin/named/query.c:1.8.8.8
--- src/dist/bind/bin/named/query.c:1.8.8.7 Wed Oct 17 20:50:14 2012
+++ src/dist/bind/bin/named/query.c Thu Dec 25 23:51:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.8.8.7 2012/10/17 20:50:14 bouyer Exp $ */
+/* $NetBSD: query.c,v 1.8.8.8 2014/12/25 23:51:59 he Exp $ */
/*
* Copyright (C) 2004-2012 Internet Systems Consortium, Inc. (ISC)
@@ -3338,11 +3338,11 @@ query_recurse(ns_client_t *client, dns_r
peeraddr = client-peeraddr;
else
peeraddr = NULL;
- result = dns_resolver_createfetch2(client-view-resolver,
+ result = dns_resolver_createfetch3(client-view-resolver,
client-query.qname,
qtype, qdomain, nameservers,
NULL, peeraddr, client-message-id,
- client-query.fetchoptions,
+ client-query.fetchoptions, 0, NULL,
client-task,
query_resume, client,
rdataset, sigrdataset,
Index: src/dist/bind/bin/named/server.c
diff -u src/dist/bind/bin/named/server.c:1.1.1.9.8.4 src/dist/bind/bin/named/server.c:1.1.1.9.8.5
--- src/dist/bind/bin/named/server.c:1.1.1.9.8.4 Wed Jul 25 12:02:52 2012
+++ src/dist/bind/bin/named/server.c Thu Dec 25 23:51:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.1.1.9.8.4 2012/07/25 12:02:52 jdc Exp $ */
+/* $NetBSD: server.c,v 1.1.1.9.8.5 2014/12/25 23:51:59 he Exp $ */
/*
* Copyright (C) 2004-2012 Internet Systems Consortium, Inc. (ISC)
@@ -1837,6 +1837,16 @@ configure_view(dns_view_t *view, cfg_obj
udpsize = 4096;
dns_resolver_setudpsize(view-resolver, (isc_uint16_t)udpsize);
+ obj = NULL;
+ result = ns_config_get(maps, max-recursion-depth, obj);
+ INSIST(result == ISC_R_SUCCESS);
+ dns_resolver_setmaxdepth(view-resolver, cfg_obj_asuint32(obj));
+
+ obj = NULL;
+ result = ns_config_get(maps,
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: he Date: Thu Dec 25 23:54:07 UTC 2014 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1937. To generate a diff of this commit: cvs rdiff -u -r1.1.2.93 -r1.1.2.94 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.93 src/doc/CHANGES-5.0.3:1.1.2.94 --- src/doc/CHANGES-5.0.3:1.1.2.93 Mon Jan 21 20:22:18 2013 +++ src/doc/CHANGES-5.0.3 Thu Dec 25 23:54:07 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.93 2013/01/21 20:22:18 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.94 2014/12/25 23:54:07 he Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5252,3 +5252,25 @@ sys/external/bsd/ipf/netinet/ip_fil_netb Fix off-by-one read error. [msaitoh, ticket #1840] +dist/bind/lib/isc/counter.c new, via patch +dist/bind/lib/isc/include/isc/counter.h new, via patch +dist/bind/bin/named/config.c patch +dist/bind/bin/named/query.c patch +dist/bind/bin/named/server.c patch +dist/bind/lib/dns/adb.cpatch +dist/bind/lib/dns/resolver.c patch +dist/bind/lib/dns/include/dns/adb.h patch +dist/bind/lib/dns/include/dns/resolver.h patch +dist/bind/lib/export/isc/Makefile.in patch +dist/bind/lib/isc/Makefile.in patch +dist/bind/lib/isc/include/isc/Makefile.in patch +dist/bind/lib/isc/include/isc/types.h patch +dist/bind/lib/isccfg/namedconf.c patch +lib/libisc/Makefilepatch +usr.sbin/bind/Makefile.inc patch + + Apply fix for BIND, backported from the patch for 9.8.8 from ISC. + This is a fix for CVE-2014-8500, where a maliciously constructed + setup can cause BIND to issue an unlimited sequence of queries to + follow a delegation. + [spz, ticket #1937]
CVS commit: [netbsd-5-1] src/usr.sbin/bind
Module Name:src
Committed By: he
Date: Thu Dec 25 23:57:50 UTC 2014
Modified Files:
src/usr.sbin/bind [netbsd-5-1]: Makefile.inc
Log Message:
Apply fix for BIND, backported from the patch for 9.8.8 from ISC.
This is a fix for CVE-2014-8500, where a maliciously constructed
setup can cause BIND to issue an unlimited sequence of queries to
follow a delegation.
[spz, ticket #1937]
To generate a diff of this commit:
cvs rdiff -u -r1.32.12.1 -r1.32.12.2 src/usr.sbin/bind/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/bind/Makefile.inc
diff -u src/usr.sbin/bind/Makefile.inc:1.32.12.1 src/usr.sbin/bind/Makefile.inc:1.32.12.2
--- src/usr.sbin/bind/Makefile.inc:1.32.12.1 Sun Jan 9 20:43:30 2011
+++ src/usr.sbin/bind/Makefile.inc Thu Dec 25 23:57:50 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.32.12.1 2011/01/09 20:43:30 riz Exp $
+# $NetBSD: Makefile.inc,v 1.32.12.2 2014/12/25 23:57:50 he Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -23,7 +23,10 @@ BIND_HTMLDIR= /usr/share/doc/html/bind9
.include ${IDIST}/version
-VERSION=${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}
+# Packager suffix, for local patches past end of support from ISC
+PSUFFIX=nb5
+
+VERSION=${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}${PSUFFIX}
SYSCONFDIR=/etc
LOCALSTATEDIR=/var
CVS commit: src/share/man/man4
Module Name:src Committed By: christos Date: Fri Dec 26 01:19:43 UTC 2014 Modified Files: src/share/man/man4: options.4 Log Message: PR/49215: Kamil Rytarowski: Sync NVNODE with reality. To generate a diff of this commit: cvs rdiff -u -r1.442 -r1.443 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/options.4 diff -u src/share/man/man4/options.4:1.442 src/share/man/man4/options.4:1.443 --- src/share/man/man4/options.4:1.442 Sun Aug 24 03:59:22 2014 +++ src/share/man/man4/options.4 Thu Dec 25 20:19:43 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: options.4,v 1.442 2014/08/24 07:59:22 jnemeth Exp $ +.\ $NetBSD: options.4,v 1.443 2014/12/26 01:19:43 christos Exp $ .\ .\ Copyright (c) 1996 .\ Perry E. Metzger. All rights reserved. @@ -30,7 +30,7 @@ .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ .\ -.Dd August 23, 2014 +.Dd December 25, 2014 .Dt OPTIONS 4 .Os .Sh NAME @@ -977,8 +977,8 @@ routines, (a.k.a. the .Fn namei cache, though called by many other names in the kernel source). By default, this cache has -.Dv NPROC -(set as 20 + 16 * MAXUSERS) * (80 + NPROC / 8) entries. +.Dv (NPROC + NTEXT + 100) +entires (NPROC set as 20 + 16 * MAXUSERS and NTEXT as 80 + NPROC / 8). A reasonable way to derive a value of .Dv NVNODE , should you notice a large number of namei cache misses with a tool such as
CVS commit: src/usr.bin/who
Module Name:src Committed By: christos Date: Fri Dec 26 01:43:58 UTC 2014 Modified Files: src/usr.bin/who: who.1 Log Message: Correct provenance of who(1) (from Marcin F. Michalski) To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/usr.bin/who/who.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/who/who.1 diff -u src/usr.bin/who/who.1:1.22 src/usr.bin/who/who.1:1.23 --- src/usr.bin/who/who.1:1.22 Wed Jan 17 19:15:05 2007 +++ src/usr.bin/who/who.1 Thu Dec 25 20:43:58 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: who.1,v 1.22 2007/01/18 00:15:05 wiz Exp $ +.\ $NetBSD: who.1,v 1.23 2014/12/26 01:43:58 christos Exp $ .\ .\ Copyright (c) 1986, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)who.1 8.2 (Berkeley) 12/30/93 .\ -.Dd January 17, 2007 +.Dd December 25, 2014 .Dt WHO 1 .Os .Sh NAME @@ -196,4 +196,5 @@ utility is expected to conform to A .Nm utility appeared in -.At v6 . +.At v1 : +.Lk http://cm.bell-labs.com/cm/cs/who/dmr/pdfs/man14.pdf
CVS commit: src/usr.bin/finger
Module Name:src Committed By: christos Date: Fri Dec 26 03:49:00 UTC 2014 Modified Files: src/usr.bin/finger: finger.1 Log Message: Correct the provenance of finger.1 and show the link that it was part of 2BSD (from Marcin F. Michalski) To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.bin/finger/finger.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/finger/finger.1 diff -u src/usr.bin/finger/finger.1:1.16 src/usr.bin/finger/finger.1:1.17 --- src/usr.bin/finger/finger.1:1.16 Sun Jun 10 13:45:59 2012 +++ src/usr.bin/finger/finger.1 Thu Dec 25 22:49:00 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: finger.1,v 1.16 2012/06/10 17:45:59 dholland Exp $ +.\ $NetBSD: finger.1,v 1.17 2014/12/26 03:49:00 christos Exp $ .\ .\ Copyright (c) 1989, 1990, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ from: @(#)finger.1 8.3 (Berkeley) 5/5/94 .\ -.Dd June 10, 2012 +.Dd December 25, 2014 .Dt FINGER 1 .Os .Sh NAME @@ -210,4 +210,5 @@ last login data base The .Nm command appeared in -.Bx 3.0 . +.Bx 3.0 : +.Lk ftp://ftp.tuhs.org.ua/PDP-11/Distributions/ucb/2bsd.tar.gz
CVS commit: src/sys
Module Name:src
Committed By: msaitoh
Date: Fri Dec 26 05:09:04 UTC 2014
Modified Files:
src/sys/arch/x86/pci: ichlpcib.c
src/sys/dev/ic: i82801lpcreg.h
src/sys/dev/pci: pci_map.c pcivar.h
Log Message:
Fix a bug that ichlpcib(4) maps I/O area incorrectly and then fails to attach
gpio. It might also fix ACPI related problem described in PR#48960:
- The LPCIB_PCI_PMBASE and LPCIB_PCI_GPIO register are alike PCI BAR but not
completely compatible with it. It's ok because the registers' addresses are
out of BAR0-BAR5(0x10-0x24) and are located in the device-dependent header.
The PMBASE and GPIO registers define the base address and the type but not
describe the size. The size is fixed to 128bytes. So use
pci_mapreg_submap().
- Make pci_mapreg_submap() extern again.
- Fix the calculation of the map size in pci_mapreg_submap().
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/x86/pci/ichlpcib.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/i82801lpcreg.h
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/pci_map.c
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/pci/pcivar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.44 src/sys/arch/x86/pci/ichlpcib.c:1.45
--- src/sys/arch/x86/pci/ichlpcib.c:1.44 Mon Dec 15 13:29:42 2014
+++ src/sys/arch/x86/pci/ichlpcib.c Fri Dec 26 05:09:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ichlpcib.c,v 1.44 2014/12/15 13:29:42 msaitoh Exp $ */
+/* $NetBSD: ichlpcib.c,v 1.45 2014/12/26 05:09:03 msaitoh Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ichlpcib.c,v 1.44 2014/12/15 13:29:42 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: ichlpcib.c,v 1.45 2014/12/26 05:09:03 msaitoh Exp $);
#include sys/types.h
#include sys/param.h
@@ -321,9 +321,14 @@ lpcibattach(device_t parent, device_t se
* Part of our I/O registers are used as ACPI PM regs.
* Since our ACPI subsystem accesses the I/O space directly so far,
* we do not have to bother bus_space I/O map confliction.
+ *
+ * The PMBASE register is alike PCI BAR but not completely compatible
+ * with it. The PMBASE define the base address and the type but
+ * not describe the size.
*/
- if (pci_mapreg_map(pa, LPCIB_PCI_PMBASE, PCI_MAPREG_TYPE_IO, 0,
- sc-sc_iot, sc-sc_ioh, NULL, sc-sc_iosize)) {
+ if (pci_mapreg_submap(pa, LPCIB_PCI_PMBASE, PCI_MAPREG_TYPE_IO, 0,
+ LPCIB_PCI_PM_SIZE, 0, sc-sc_iot, sc-sc_ioh, NULL,
+ sc-sc_iosize)) {
aprint_error_dev(self, can't map power management i/o space\n);
return;
}
@@ -1057,6 +1062,7 @@ lpcib_gpio_configure(device_t self)
pcireg_t gpio_cntl;
uint32_t use, io, bit;
int pin, shift, base_reg, cntl_reg, reg;
+ int rv;
/* this implies ICH = 6, and thus different mapreg */
if (sc-sc_has_rcba) {
@@ -1073,11 +1079,16 @@ lpcib_gpio_configure(device_t self)
/* Is GPIO enabled? */
if ((gpio_cntl LPCIB_PCI_GPIO_CNTL_EN) == 0)
return;
-
- if (pci_mapreg_map(sc-sc_pa, base_reg, PCI_MAPREG_TYPE_IO, 0,
- sc-sc_gpio_iot, sc-sc_gpio_ioh,
- NULL, sc-sc_gpio_ios)) {
- aprint_error_dev(self, can't map general purpose i/o space\n);
+ /*
+ * The GPIO_BASE register is alike PCI BAR but not completely
+ * compatible with it. The PMBASE define the base address and the type
+ * but not describe the size.
+ */
+ rv = pci_mapreg_submap(sc-sc_pa, base_reg, PCI_MAPREG_TYPE_IO, 0,
+ LPCIB_PCI_GPIO_SIZE, 0, sc-sc_gpio_iot, sc-sc_gpio_ioh,
+ NULL, sc-sc_gpio_ios);
+ if (rv != 0) {
+ aprint_error_dev(self, can't map general purpose i/o space(rv = %d)\n, rv);
return;
}
Index: src/sys/dev/ic/i82801lpcreg.h
diff -u src/sys/dev/ic/i82801lpcreg.h:1.11 src/sys/dev/ic/i82801lpcreg.h:1.12
--- src/sys/dev/ic/i82801lpcreg.h:1.11 Fri Jul 23 02:23:58 2010
+++ src/sys/dev/ic/i82801lpcreg.h Fri Dec 26 05:09:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: i82801lpcreg.h,v 1.11 2010/07/23 02:23:58 jakllsch Exp $ */
+/* $NetBSD: i82801lpcreg.h,v 1.12 2014/12/26 05:09:03 msaitoh Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -40,6 +40,7 @@
* PCI configuration registers
*/
#define LPCIB_PCI_PMBASE 0x40
+#define LPCIB_PCI_PM_SIZE 0x0080
#define LPCIB_PCI_ACPI_CNTL 0x44
# define LPCIB_PCI_ACPI_CNTL_EN (1 4)
/* GPIO config registers ICH6+ */
@@ -51,6 +52,7 @@
#define LPCIB_PCI_TCO_CNTL 0x54
/* GPIO config registers ICH0-ICH5 */
#define LPCIB_PCI_GPIO_BASE 0x58
+#define LPCIB_PCI_GPIO_SIZE 0x0080
#define LPCIB_PCI_GPIO_CNTL 0x5c
#define LPCIB_PCI_GPIO_CNTL_EN (1 4)
#define LPCIB_PCI_PIRQA_ROUT 0x60
Index: src/sys/dev/pci/pci_map.c
diff -u src/sys/dev/pci/pci_map.c:1.31 src/sys/dev/pci/pci_map.c:1.32
--- src/sys/dev/pci/pci_map.c:1.31 Thu Oct 16 12:31:23 2014
+++ src/sys/dev/pci/pci_map.c Fri Dec 26 05:09:03 2014
@@ -1,4
CVS commit: [netbsd-6] src/lib
Module Name:src
Committed By: msaitoh
Date: Fri Dec 26 05:30:29 UTC 2014
Modified Files:
src/lib [netbsd-6]: Makefile
Log Message:
Pullup additional patches in ticket #1217:
lib/Makefile1.204 via patch
libbind now depends on heimdal, so push it after the third barrier.
To generate a diff of this commit:
cvs rdiff -u -r1.181.2.2 -r1.181.2.3 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.181.2.2 src/lib/Makefile:1.181.2.3
--- src/lib/Makefile:1.181.2.2 Sun Nov 18 22:38:32 2012
+++ src/lib/Makefile Fri Dec 26 05:30:29 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.181.2.2 2012/11/18 22:38:32 riz Exp $
+# $NetBSD: Makefile,v 1.181.2.3 2014/12/26 05:30:29 msaitoh Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include bsd.own.mk
@@ -159,7 +159,6 @@ SUBDIR+= ../crypto/external/bsd/openssh/
SUBDIR+= ../crypto/external/bsd/netpgp/lib # depends on libcrypto, ...
.endif
-SUBDIR+= ../external/bsd/bind/lib # depends on libcrypto
SUBDIR+= ../external/bsd/fetch/lib # depends on libssl
.if (${MKLDAP} != no)
@@ -169,6 +168,8 @@ SUBDIR+= ../external/bsd/openldap/lib #
# 3rd library dependency barrier
SUBDIR+= .WAIT
+SUBDIR+= ../external/bsd/bind/lib # depends on heimdal, libcrypto
+
SUBDIR+= librumpdev # depends on librump
SUBDIR+= librumpnet # depends on librump
SUBDIR+= librumpvfs # depends on librump
CVS commit: [netbsd-6-1] src/lib
Module Name:src
Committed By: msaitoh
Date: Fri Dec 26 05:32:50 UTC 2014
Modified Files:
src/lib [netbsd-6-1]: Makefile
Log Message:
Pullup additional patch for ticket #1217:
lib/Makefile1.204 via patch
libbind now depends on heimdal, so push it after the third barrier.
To generate a diff of this commit:
cvs rdiff -u -r1.181.2.2 -r1.181.2.2.2.1 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.181.2.2 src/lib/Makefile:1.181.2.2.2.1
--- src/lib/Makefile:1.181.2.2 Sun Nov 18 22:38:32 2012
+++ src/lib/Makefile Fri Dec 26 05:32:50 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.181.2.2 2012/11/18 22:38:32 riz Exp $
+# $NetBSD: Makefile,v 1.181.2.2.2.1 2014/12/26 05:32:50 msaitoh Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include bsd.own.mk
@@ -159,7 +159,6 @@ SUBDIR+= ../crypto/external/bsd/openssh/
SUBDIR+= ../crypto/external/bsd/netpgp/lib # depends on libcrypto, ...
.endif
-SUBDIR+= ../external/bsd/bind/lib # depends on libcrypto
SUBDIR+= ../external/bsd/fetch/lib # depends on libssl
.if (${MKLDAP} != no)
@@ -169,6 +168,8 @@ SUBDIR+= ../external/bsd/openldap/lib #
# 3rd library dependency barrier
SUBDIR+= .WAIT
+SUBDIR+= ../external/bsd/bind/lib # depends on heimdal, libcrypto
+
SUBDIR+= librumpdev # depends on librump
SUBDIR+= librumpnet # depends on librump
SUBDIR+= librumpvfs # depends on librump
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Fri Dec 26 05:36:16 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: Ticket 1217. To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-6.1.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.6 diff -u src/doc/CHANGES-6.1.6:1.1.2.20 src/doc/CHANGES-6.1.6:1.1.2.21 --- src/doc/CHANGES-6.1.6:1.1.2.20 Thu Dec 25 02:55:48 2014 +++ src/doc/CHANGES-6.1.6 Fri Dec 26 05:36:15 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.20 2014/12/25 02:55:48 snj Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.21 2014/12/26 05:36:15 msaitoh Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -1955,3 +1955,1597 @@ external/bsd/ntp/scripts/mkver patch Update ntp to 4.2.8. [christos, ticket #1221] +distrib/sets/lists/base/ad.mips64ebpatch +distrib/sets/lists/base/ad.mips64elpatch +distrib/sets/lists/base/md.amd64patch +distrib/sets/lists/base/md.sparc64patch +distrib/sets/lists/base/shl.mi patch +distrib/sets/lists/comp/ad.mips64ebpatch +distrib/sets/lists/comp/ad.mips64elpatch +distrib/sets/lists/comp/md.amd64patch +distrib/sets/lists/comp/md.sparc64patch +distrib/sets/lists/comp/mi patch +distrib/sets/lists/comp/shl.mi patch +external/bsd/bind/Makefile.inc patch +external/bsd/bind/dist/CHANGES patch +external/bsd/bind/dist/COPYRIGHTpatch +external/bsd/bind/dist/FAQ patch +external/bsd/bind/dist/FAQ.xml patch +external/bsd/bind/dist/HISTORY patch +external/bsd/bind/dist/Makefile.inpatch +external/bsd/bind/dist/README patch +external/bsd/bind/dist/REDIRECT-NOTESdelete +external/bsd/bind/dist/acconfig.hpatch +external/bsd/bind/dist/aclocal.m4patch +external/bsd/bind/dist/config.guesspatch +external/bsd/bind/dist/config.h.inpatch +external/bsd/bind/dist/config.h.win32patch +external/bsd/bind/dist/config.subpatch +external/bsd/bind/dist/configurepatch +external/bsd/bind/dist/configure.inpatch +external/bsd/bind/dist/isc-config.sh.1patch +external/bsd/bind/dist/isc-config.sh.docbook patch +external/bsd/bind/dist/isc-config.sh.html patch +external/bsd/bind/dist/isc-config.sh.inpatch +external/bsd/bind/dist/ltmain.shpatch +external/bsd/bind/dist/srcid patch +external/bsd/bind/dist/version patch +external/bsd/bind/dist/bin/Makefile.inpatch +external/bsd/bind/dist/bin/check/Makefile.in patch +external/bsd/bind/dist/bin/check/check-tool.c patch +external/bsd/bind/dist/bin/check/named-checkconf.8 patch +external/bsd/bind/dist/bin/check/named-checkconf.c patch +external/bsd/bind/dist/bin/check/named-checkconf.docbook patch +external/bsd/bind/dist/bin/check/named-checkconf.html patch +external/bsd/bind/dist/bin/check/named-checkzone.8 patch +external/bsd/bind/dist/bin/check/named-checkzone.c patch +external/bsd/bind/dist/bin/check/named-checkzone.docbook patch +external/bsd/bind/dist/bin/check/named-checkzone.html patch +external/bsd/bind/dist/bin/check/win32/checktool.dsp delete +external/bsd/bind/dist/bin/check/win32/namedcheckconf.dsp delete +external/bsd/bind/dist/bin/check/win32/namedcheckconf.dsw delete +external/bsd/bind/dist/bin/check/win32/namedcheckconf.mak delete +external/bsd/bind/dist/bin/check/win32/namedcheckzone.dsp delete +external/bsd/bind/dist/bin/check/win32/namedcheckzone.dsw delete +external/bsd/bind/dist/bin/check/win32/namedcheckzone.mak delete +external/bsd/bind/dist/bin/confgen/ddns-confgen.8 patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.c patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.docbook patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.html patch +external/bsd/bind/dist/bin/confgen/keygen.c patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.8 patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.c patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.docbook patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.html patch +external/bsd/bind/dist/bin/confgen/win32/confgentool.dsp delete +external/bsd/bind/dist/bin/confgen/win32/ddnsconfgen.dsp delete +external/bsd/bind/dist/bin/confgen/win32/ddnsconfgen.mak delete +external/bsd/bind/dist/bin/confgen/win32/rndcconfgen.dsp delete +external/bsd/bind/dist/bin/confgen/win32/rndcconfgen.mak delete +external/bsd/bind/dist/bin/dig/Makefile.in patch +external/bsd/bind/dist/bin/dig/dig.1patch +external/bsd/bind/dist/bin/dig/dig.cpatch +external/bsd/bind/dist/bin/dig/dig.docbook patch +external/bsd/bind/dist/bin/dig/dig.htmlpatch +external/bsd/bind/dist/bin/dig/dighost.c patch +external/bsd/bind/dist/bin/dig/host.1patch +external/bsd/bind/dist/bin/dig/host.cpatch +external/bsd/bind/dist/bin/dig/host.docbook patch +external/bsd/bind/dist/bin/dig/host.html patch
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Fri Dec 26 05:36:00 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 1217. To generate a diff of this commit: cvs rdiff -u -r1.1.2.176 -r1.1.2.177 src/doc/CHANGES-6.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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.176 src/doc/CHANGES-6.2:1.1.2.177 --- src/doc/CHANGES-6.2:1.1.2.176 Thu Dec 25 05:15:10 2014 +++ src/doc/CHANGES-6.2 Fri Dec 26 05:35:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.176 2014/12/25 05:15:10 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.177 2014/12/26 05:35:59 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -7260,3 +7260,1598 @@ external/bsd/ntp/scripts/mkver patch Update ntp to 4.2.8. [christos, ticket #1221] + +distrib/sets/lists/base/ad.mips64ebpatch +distrib/sets/lists/base/ad.mips64elpatch +distrib/sets/lists/base/md.amd64patch +distrib/sets/lists/base/md.sparc64patch +distrib/sets/lists/base/shl.mi patch +distrib/sets/lists/comp/ad.mips64ebpatch +distrib/sets/lists/comp/ad.mips64elpatch +distrib/sets/lists/comp/md.amd64patch +distrib/sets/lists/comp/md.sparc64patch +distrib/sets/lists/comp/mi patch +distrib/sets/lists/comp/shl.mi patch +external/bsd/bind/Makefile.inc patch +external/bsd/bind/dist/CHANGES patch +external/bsd/bind/dist/COPYRIGHTpatch +external/bsd/bind/dist/FAQ patch +external/bsd/bind/dist/FAQ.xml patch +external/bsd/bind/dist/HISTORY patch +external/bsd/bind/dist/Makefile.inpatch +external/bsd/bind/dist/README patch +external/bsd/bind/dist/REDIRECT-NOTESdelete +external/bsd/bind/dist/acconfig.hpatch +external/bsd/bind/dist/aclocal.m4patch +external/bsd/bind/dist/config.guesspatch +external/bsd/bind/dist/config.h.inpatch +external/bsd/bind/dist/config.h.win32patch +external/bsd/bind/dist/config.subpatch +external/bsd/bind/dist/configurepatch +external/bsd/bind/dist/configure.inpatch +external/bsd/bind/dist/isc-config.sh.1patch +external/bsd/bind/dist/isc-config.sh.docbook patch +external/bsd/bind/dist/isc-config.sh.html patch +external/bsd/bind/dist/isc-config.sh.inpatch +external/bsd/bind/dist/ltmain.shpatch +external/bsd/bind/dist/srcid patch +external/bsd/bind/dist/version patch +external/bsd/bind/dist/bin/Makefile.inpatch +external/bsd/bind/dist/bin/check/Makefile.in patch +external/bsd/bind/dist/bin/check/check-tool.c patch +external/bsd/bind/dist/bin/check/named-checkconf.8 patch +external/bsd/bind/dist/bin/check/named-checkconf.c patch +external/bsd/bind/dist/bin/check/named-checkconf.docbook patch +external/bsd/bind/dist/bin/check/named-checkconf.html patch +external/bsd/bind/dist/bin/check/named-checkzone.8 patch +external/bsd/bind/dist/bin/check/named-checkzone.c patch +external/bsd/bind/dist/bin/check/named-checkzone.docbook patch +external/bsd/bind/dist/bin/check/named-checkzone.html patch +external/bsd/bind/dist/bin/check/win32/checktool.dsp delete +external/bsd/bind/dist/bin/check/win32/namedcheckconf.dsp delete +external/bsd/bind/dist/bin/check/win32/namedcheckconf.dsw delete +external/bsd/bind/dist/bin/check/win32/namedcheckconf.mak delete +external/bsd/bind/dist/bin/check/win32/namedcheckzone.dsp delete +external/bsd/bind/dist/bin/check/win32/namedcheckzone.dsw delete +external/bsd/bind/dist/bin/check/win32/namedcheckzone.mak delete +external/bsd/bind/dist/bin/confgen/ddns-confgen.8 patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.c patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.docbook patch +external/bsd/bind/dist/bin/confgen/ddns-confgen.html patch +external/bsd/bind/dist/bin/confgen/keygen.c patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.8 patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.c patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.docbook patch +external/bsd/bind/dist/bin/confgen/rndc-confgen.html patch +external/bsd/bind/dist/bin/confgen/win32/confgentool.dsp delete +external/bsd/bind/dist/bin/confgen/win32/ddnsconfgen.dsp delete +external/bsd/bind/dist/bin/confgen/win32/ddnsconfgen.mak delete +external/bsd/bind/dist/bin/confgen/win32/rndcconfgen.dsp delete +external/bsd/bind/dist/bin/confgen/win32/rndcconfgen.mak delete +external/bsd/bind/dist/bin/dig/Makefile.in patch +external/bsd/bind/dist/bin/dig/dig.1patch +external/bsd/bind/dist/bin/dig/dig.cpatch +external/bsd/bind/dist/bin/dig/dig.docbook patch +external/bsd/bind/dist/bin/dig/dig.htmlpatch +external/bsd/bind/dist/bin/dig/dighost.c patch +external/bsd/bind/dist/bin/dig/host.1patch +external/bsd/bind/dist/bin/dig/host.cpatch +external/bsd/bind/dist/bin/dig/host.docbook patch +external/bsd/bind/dist/bin/dig/host.html patch
CVS commit: [netbsd-6] src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: msaitoh
Date: Fri Dec 26 07:29:34 UTC 2014
Modified Files:
src/external/mit/xorg/server/xorg-server [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1222):
external/mit/xorg/server/xorg-server/Makefile patch
Fix conversion of SDK_REQUIRED_MODULES which was reported by John D. Baker
in PR#49500.
To generate a diff of this commit:
cvs rdiff -u -r1.19.8.1 -r1.19.8.2 \
src/external/mit/xorg/server/xorg-server/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Makefile:1.19.8.1 src/external/mit/xorg/server/xorg-server/Makefile:1.19.8.2
--- src/external/mit/xorg/server/xorg-server/Makefile:1.19.8.1 Thu Dec 25 05:05:02 2014
+++ src/external/mit/xorg/server/xorg-server/Makefile Fri Dec 26 07:29:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19.8.1 2014/12/25 05:05:02 msaitoh Exp $
+# $NetBSD: Makefile,v 1.19.8.2 2014/12/26 07:29:34 msaitoh Exp $
.include bsd.own.mk
@@ -35,6 +35,7 @@ PKGCONFIG= xorg-server
# Use -fvisibility=hidden for symbol_visibility?
PKGCONFIG_SED_FLAGS= \
-e s,@sysconfigdir@,${X11ETCDIR},; \
+ s,@SDK_REQUIRED_MODULES@,xproto = 7.0.17 randrproto = 1.2.99.3 renderproto = 0.11 xextproto = 7.1.99 inputproto = 1.9.99.902 kbproto = 1.0.3 fontsproto,; \
s,@symbol_visibility@,,
.include bsd.x11.mk
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Fri Dec 26 07:31:42 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 1222. To generate a diff of this commit: cvs rdiff -u -r1.1.2.177 -r1.1.2.178 src/doc/CHANGES-6.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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.177 src/doc/CHANGES-6.2:1.1.2.178 --- src/doc/CHANGES-6.2:1.1.2.177 Fri Dec 26 05:35:59 2014 +++ src/doc/CHANGES-6.2 Fri Dec 26 07:31:42 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.177 2014/12/26 05:35:59 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.178 2014/12/26 07:31:42 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -8855,3 +8855,9 @@ lib/Makefile 1.204 via patch Update bind to 9.9.6-P1. CVE-2014-8500. [spz, ticket 1217] + +external/mit/xorg/server/xorg-server/Makefile patch + + Fix conversion of SDK_REQUIRED_MODULES which was reported by John + D. Baker in PR#49500. + [mrg, ticket 1222]
