CVS commit: src/external/bsd/dhcp/dist/includes/omapip
Module Name:src Committed By: uebayasi Date: Wed Dec 10 07:43:34 UTC 2014 Modified Files: src/external/bsd/dhcp/dist/includes/omapip: result.h Log Message: Don't define ISC_R_* symbols, that conflict with the newest bind. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/dhcp/dist/includes/omapip/result.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/dhcp/dist/includes/omapip/result.h diff -u src/external/bsd/dhcp/dist/includes/omapip/result.h:1.1.1.2 src/external/bsd/dhcp/dist/includes/omapip/result.h:1.2 --- src/external/bsd/dhcp/dist/includes/omapip/result.h:1.1.1.2 Sat Jul 12 11:57:57 2014 +++ src/external/bsd/dhcp/dist/includes/omapip/result.h Wed Dec 10 07:43:34 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: result.h,v 1.1.1.2 2014/07/12 11:57:57 spz Exp $ */ +/* $NetBSD: result.h,v 1.2 2014/12/10 07:43:34 uebayasi Exp $ */ /* result.h */ @@ -81,6 +81,7 @@ // Included for historical reasons, these should be removed as // soon as reasonable +#if 0 #define ISC_R_HOSTUNKNOWN DHCP_R_HOSTUNKNOWN #define ISC_R_VERSIONMISMATCH DHCP_R_VERSIONMISMATCH #define ISC_R_PROTOCOLERROR DHCP_R_PROTOCOLERROR @@ -114,6 +115,7 @@ #define ISC_R_NOT_EQUAL DHCP_R_NOT_EQUAL #define ISC_R_CONNRESET DHCP_R_CONNRESET #define ISC_R_UNKNOWNATTRIBUTE DHCP_R_UNKNOWNATTRIBUTE +#endif isc_result_t dhcp_result_register(void);
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Wed Dec 10 04:42:25 UTC 2014 Modified Files: src/distrib/sets/lists/base: ad.aarch64 ad.arm ad.mips ad.powerpc ad.riscv md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/debug: ad.aarch64 ad.arm ad.mips ad.powerpc ad.riscv md.amd64 md.sparc64 shl.mi Log Message: bump for bind update To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/base/ad.aarch64 cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/base/ad.powerpc cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/base/ad.riscv cvs rdiff -u -r1.253 -r1.254 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.241 -r1.242 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.725 -r1.726 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/debug/ad.aarch64 cvs rdiff -u -r1.51 -r1.52 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/debug/ad.riscv cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.85 -r1.86 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.aarch64 diff -u src/distrib/sets/lists/base/ad.aarch64:1.13 src/distrib/sets/lists/base/ad.aarch64:1.14 --- src/distrib/sets/lists/base/ad.aarch64:1.13 Sat Oct 25 11:02:12 2014 +++ src/distrib/sets/lists/base/ad.aarch64 Tue Dec 9 23:42:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.13 2014/10/25 15:02:12 joerg Exp $ +# $NetBSD: ad.aarch64,v 1.14 2014/12/10 04:42:24 christos Exp $ ./lib/eabi base-compat-shlib compat ./lib/eabi/npf base-npf-shlib compat ./lib/eabi/npf/ext_log.so base-npf-shlib compat,pic @@ -100,7 +100,7 @@ ./usr/lib/eabi/libbfd.so.13 base-compat-shlib compat,pic,binutils ./usr/lib/eabi/libbfd.so.13.0 base-compat-shlib compat,pic,binutils ./usr/lib/eabi/libbind9.so.8 base-compat-shlib compat,pic -./usr/lib/eabi/libbind9.so.8.0 base-compat-shlib compat,pic +./usr/lib/eabi/libbind9.so.8.1 base-compat-shlib compat,pic ./usr/lib/eabi/libbluetooth.so.4 base-compat-shlib compat,pic ./usr/lib/eabi/libbluetooth.so.4.2 base-compat-shlib compat,pic ./usr/lib/eabi/libbsdmalloc.so.0 base-compat-shlib compat,pic @@ -128,7 +128,7 @@ ./usr/lib/eabi/libdm.so.0base-compat-shlib compat,pic ./usr/lib/eabi/libdm.so.0.0 base-compat-shlib compat,pic ./usr/lib/eabi/libdns.so.8 base-compat-shlib compat,pic -./usr/lib/eabi/libdns.so.8.0 base-compat-shlib compat,pic +./usr/lib/eabi/libdns.so.8.1 base-compat-shlib compat,pic ./usr/lib/eabi/libdns_sd.so.0 base-compat-shlib compat,pic,mdns ./usr/lib/eabi/libdns_sd.so.0.0 base-compat-shlib compat,pic,mdns ./usr/lib/eabi/libdwarf.so.1 base-compat-shlib compat,pic @@ -174,11 +174,11 @@ ./usr/lib/eabi/libipsec.so.3 base-compat-shlib compat,pic ./usr/lib/eabi/libipsec.so.3.0 base-compat-shlib compat,pic ./usr/lib/eabi/libirs.so.8 base-compat-shlib compat,pic -./usr/lib/eabi/libirs.so.8.0 base-compat-shlib compat,pic +./usr/lib/eabi/libirs.so.8.1 base-compat-shlib compat,pic ./usr/lib/eabi/libisc.so.8 base-compat-shlib compat,pic -./usr/lib/eabi/libisc.so.8.0 base-compat-shlib compat,pic +./usr/lib/eabi/libisc.so.8.1 base-compat-shlib compat,pic ./usr/lib/eabi/libisccc.so.8 base-compat-shlib compat,pic -./usr/lib/eabi/libisccc.so.8.0 base-compat-shlib compat,pic +./usr/lib/eabi/libisccc.so.8.1 base-compat-shlib compat,pic ./usr/lib/eabi/libisccfg.so.8 base-compat-shlib compat,pic ./usr/lib/eabi/libisccfg.so.8.1 base-compat-shlib compat,pic ./usr/lib/eabi/libiscsi.so.2 base-compat-shlib compat,pic,iscsi @@ -208,7 +208,7 @@ ./usr/lib/eabi/liblutok.so.2 base-compat-shlib compat,pic,kyua ./usr/lib/eabi/liblutok.so.2.0 base-compat-shlib compat,pic,kyua ./usr/lib/eabi/liblwres.so.8 base-compat-shlib compat,pic -./usr/lib/eabi/liblwres.so.8.0 base-compat-shlib compat,pic +./usr/lib/eabi/liblwres.so.8.1 base-compat-shlib compat,pic ./usr/lib/eabi/liblzf.so.1 base-compat-shlib compat,pic ./usr/lib/eabi/liblzf.so.1.0 base-compat-shlib compat,pic ./usr/lib/eabi/liblzma.so.1 base-compat-shlib compat,pic @@ -416,7 +416,7 @@ ./usr/lib/eabihf/libbfd.so.13 base-compat-shlib compat,pic,binutils ./usr/lib/eabihf/libbfd.so.13.0 base-compat-shlib compat,pic,binutils ./usr/lib/eabihf/libbind9.so.8 base-compat-shlib compat,pic -./usr/lib/eabihf/libbind9.so.8.0 base-compat-shlib compat,pic +./usr/lib/eabihf/libbind9.so.8.1 base-compat-shlib compat,pic ./usr/lib/eabi
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Dec 10 04:39:56 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new bind To generate a diff of this commit: cvs rdiff -u -r1.1180 -r1.1181 src/doc/3RDPARTY cvs rdiff -u -r1.2024 -r1.2025 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1180 src/doc/3RDPARTY:1.1181 --- src/doc/3RDPARTY:1.1180 Tue Dec 9 15:25:43 2014 +++ src/doc/3RDPARTY Tue Dec 9 23:39:56 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1180 2014/12/09 20:25:43 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1181 2014/12/10 04:39:56 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -113,8 +113,8 @@ Notes: bc includes dc, both of which are in the NetBSD tree. Package: bind [named and utils] -Version: 9.10.0-P2 -Current Vers: 9.10.0-P2 +Version: 9.10.1-P1 +Current Vers: 9.10.1-P1 Maintainer: Paul Vixie Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/software/bind/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2024 src/doc/CHANGES:1.2025 --- src/doc/CHANGES:1.2024 Tue Dec 9 15:25:43 2014 +++ src/doc/CHANGES Tue Dec 9 23:39:56 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2024 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2025 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -110,3 +110,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: tcpdump(8): Import 4.6.2. [christos 20141119] dhcpcd(8): Import dhcpcd-6.6.4. [roy 20141126] dhcpcd(8): Import dhcpcd-6.6.5. [roy 20141209] + bind: Import version 9.10.1-P1. [christos 20141209]
CVS commit: src/external/bsd/bind
Module Name:src Committed By: christos Date: Wed Dec 10 04:38:04 UTC 2014 Modified Files: src/external/bsd/bind/dist: CHANGES acconfig.h config.h.in configure configure.in isc-config.sh.1 srcid version src/external/bsd/bind/dist/bin/check: check-tool.c check-tool.h named-checkconf.8 named-checkconf.c named-checkzone.8 named-checkzone.c src/external/bsd/bind/dist/bin/confgen: ddns-confgen.8 ddns-confgen.c keygen.c keygen.h rndc-confgen.8 rndc-confgen.c util.c util.h src/external/bsd/bind/dist/bin/confgen/include/confgen: os.h src/external/bsd/bind/dist/bin/confgen/unix: os.c src/external/bsd/bind/dist/bin/confgen/win32: os.c src/external/bsd/bind/dist/bin/delv: delv.c src/external/bsd/bind/dist/bin/dig: dig.1 dig.c dighost.c host.1 host.c nslookup.1 nslookup.c src/external/bsd/bind/dist/bin/dig/include/dig: dig.h src/external/bsd/bind/dist/bin/dnssec: dnssec-dsfromkey.8 dnssec-dsfromkey.c dnssec-importkey.8 dnssec-importkey.c dnssec-keyfromlabel.8 dnssec-keyfromlabel.c dnssec-keygen.8 dnssec-keygen.c dnssec-revoke.8 dnssec-revoke.c dnssec-settime.8 dnssec-settime.c dnssec-signzone.8 dnssec-signzone.c dnssec-verify.8 dnssec-verify.c dnssectool.c dnssectool.h src/external/bsd/bind/dist/bin/named: bind9.xsl.h builtin.c client.c config.c control.c controlconf.c interfacemgr.c listenlist.c log.c logconf.c lwaddr.c lwdclient.c lwderror.c lwdgabn.c lwdgnba.c lwdgrbn.c lwdnoop.c lwresd.8 lwresd.c lwsearch.c main.c named.8 named.conf.5 named.conf.html notify.c query.c server.c sortlist.c statschannel.c tkeyconf.c tsigconf.c update.c xfrout.c zoneconf.c src/external/bsd/bind/dist/bin/named/include/named: builtin.h client.h config.h control.h globals.h interfacemgr.h listenlist.h log.h logconf.h lwaddr.h lwdclient.h lwresd.h lwsearch.h main.h notify.h ns_smf_globals.h query.h server.h sortlist.h statschannel.h tkeyconf.h tsigconf.h types.h update.h xfrout.h zoneconf.h src/external/bsd/bind/dist/bin/named/unix: dlz_dlopen_driver.c os.c src/external/bsd/bind/dist/bin/named/unix/include/named: os.h src/external/bsd/bind/dist/bin/named/win32: dlz_dlopen_driver.c ntservice.c os.c src/external/bsd/bind/dist/bin/named/win32/include/named: ntservice.h os.h src/external/bsd/bind/dist/bin/nsupdate: nsupdate.1 nsupdate.c src/external/bsd/bind/dist/bin/pkcs11: pkcs11-destroy.8 pkcs11-destroy.c pkcs11-keygen.8 pkcs11-keygen.c pkcs11-list.8 pkcs11-list.c src/external/bsd/bind/dist/bin/python: dnssec-checkds.8 src/external/bsd/bind/dist/bin/rndc: rndc.8 rndc.c rndc.conf.5 util.c util.h src/external/bsd/bind/dist/bin/rndc/include/rndc: os.h src/external/bsd/bind/dist/bin/tests: adb_test.c backtrace_test.c byaddr_test.c byname_test.c cfg_test.c compress_test.c db_test.c entropy2_test.c entropy_test.c fsaccess_test.c gxba_test.c gxbn_test.c hash_test.c inter_test.c keyboard_test.c lex_test.c lfsr_test.c log_test.c lwres_test.c lwresconf_test.c makejournal.c master_test.c mempool_test.c name_test.c nsecify.c printmsg.c printmsg.h ratelimiter_test.c rbt_test.c rdata_test.c rwlock_test.c serial_test.c shutdown_test.c sig0_test.c sock_test.c sym_test.c task_test.c timer_test.c wire_test.c zone_test.c src/external/bsd/bind/dist/bin/tests/atomic: t_atomic.c src/external/bsd/bind/dist/bin/tests/db: t_db.c src/external/bsd/bind/dist/bin/tests/dst: dst_test.c gsstest.c t_dst.c src/external/bsd/bind/dist/bin/tests/hashes: t_hashes.c src/external/bsd/bind/dist/bin/tests/master: t_master.c src/external/bsd/bind/dist/bin/tests/mem: t_mem.c src/external/bsd/bind/dist/bin/tests/names: t_names.c src/external/bsd/bind/dist/bin/tests/net: driver.c driver.h netaddr_multicast.c sockaddr_multicast.c testsuite.h src/external/bsd/bind/dist/bin/tests/rbt: t_rbt.c src/external/bsd/bind/dist/bin/tests/resolver: t_resolver.c src/external/bsd/bind/dist/bin/tests/sockaddr: t_sockaddr.c src/external/bsd/bind/dist/bin/tests/system: testsock6.pl src/external/bsd/bind/dist/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d: 10.53.0.1 src/external/bsd/bind/dist/bin/tests/system/dlzexternal: driver.c src/external/bsd/bind/dist/bin/tests/system/filter-: filter-.c src/external/bsd/bind/dist/bin/tests/system/lwresd: lwtest.c src/external/bsd/bind/dist/bin/tests/system/rpz: rpz.c src/external/bsd/bind/dist/bin/tests/system/rsabigexpo
CVS commit: src/sys/netinet6
Module Name:src
Committed By: christos
Date: Wed Dec 10 01:10:38 UTC 2014
Modified Files:
src/sys/netinet6: scope6.c scope6_var.h
Log Message:
printable version of the scope.
remove stray breaks.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/netinet6/scope6.c
cvs rdiff -u -r1.2 -r1.3 src/sys/netinet6/scope6_var.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/netinet6/scope6.c
diff -u src/sys/netinet6/scope6.c:1.10 src/sys/netinet6/scope6.c:1.11
--- src/sys/netinet6/scope6.c:1.10 Sat Nov 15 19:04:06 2014
+++ src/sys/netinet6/scope6.c Tue Dec 9 20:10:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: scope6.c,v 1.10 2014/11/16 00:04:06 joerg Exp $ */
+/* $NetBSD: scope6.c,v 1.11 2014/12/10 01:10:37 christos Exp $ */
/* $KAME$ */
/*-
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.10 2014/11/16 00:04:06 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.11 2014/12/10 01:10:37 christos Exp $");
#include
#include
@@ -181,13 +181,10 @@ in6_addrscope(const struct in6_addr *add
switch (scope) {
case 0x80:
return IPV6_ADDR_SCOPE_LINKLOCAL;
- break;
case 0xc0:
return IPV6_ADDR_SCOPE_SITELOCAL;
- break;
default:
return IPV6_ADDR_SCOPE_GLOBAL; /* just in case */
- break;
}
}
@@ -202,16 +199,12 @@ in6_addrscope(const struct in6_addr *add
switch (scope) {
case IPV6_ADDR_SCOPE_INTFACELOCAL:
return IPV6_ADDR_SCOPE_INTFACELOCAL;
- break;
case IPV6_ADDR_SCOPE_LINKLOCAL:
return IPV6_ADDR_SCOPE_LINKLOCAL;
- break;
case IPV6_ADDR_SCOPE_SITELOCAL:
return IPV6_ADDR_SCOPE_SITELOCAL;
- break;
default:
return IPV6_ADDR_SCOPE_GLOBAL;
- break;
}
}
@@ -439,6 +432,22 @@ in6_setscope(struct in6_addr *in6, const
return in6_setzoneid(in6, zoneid);
}
+const char *
+in6_getscopename(const struct in6_addr *addr)
+{
+ switch (in6_addrscope(addr)) {
+ case IPV6_ADDR_SCOPE_INTFACELOCAL: return "interface";
+#if IPV6_ADDR_SCOPE_INTFACELOCAL != IPV6_ADDR_SCOPE_NODELOCAL
+ case IPV6_ADDR_SCOPE_NODELOCAL: return "node";
+#endif
+ case IPV6_ADDR_SCOPE_LINKLOCAL: return "link";
+ case IPV6_ADDR_SCOPE_SITELOCAL: return "site";
+ case IPV6_ADDR_SCOPE_ORGLOCAL: return "organization";
+ case IPV6_ADDR_SCOPE_GLOBAL: return "global";
+ default:return "unknown";
+ }
+}
+
/*
* Just clear the embedded scope identifier. Return 0 if the original address
* is intact; return non 0 if the address is modified.
Index: src/sys/netinet6/scope6_var.h
diff -u src/sys/netinet6/scope6_var.h:1.2 src/sys/netinet6/scope6_var.h:1.3
--- src/sys/netinet6/scope6_var.h:1.2 Wed Oct 24 02:37:22 2007
+++ src/sys/netinet6/scope6_var.h Tue Dec 9 20:10:37 2014
@@ -57,6 +57,7 @@ int sa6_recoverscope(struct sockaddr_in6
int in6_setzoneid(struct in6_addr *, uint32_t);
int in6_setscope(struct in6_addr *, const struct ifnet *, u_int32_t *);
int in6_clearscope(struct in6_addr *);
+const char *in6_getscopename(const struct in6_addr *);
#endif /* _KERNEL */
#endif /* _NETINET6_SCOPE6_VAR_H_ */
CVS commit: src/sys/netinet6
Module Name:src
Committed By: christos
Date: Wed Dec 10 01:10:14 UTC 2014
Modified Files:
src/sys/netinet6: ip6_forward.c
Log Message:
call vsnprintf instead of snprintf; provide more detail
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/netinet6/ip6_forward.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/ip6_forward.c
diff -u src/sys/netinet6/ip6_forward.c:1.75 src/sys/netinet6/ip6_forward.c:1.76
--- src/sys/netinet6/ip6_forward.c:1.75 Sun Dec 7 19:19:37 2014
+++ src/sys/netinet6/ip6_forward.c Tue Dec 9 20:10:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_forward.c,v 1.75 2014/12/08 00:19:37 christos Exp $ */
+/* $NetBSD: ip6_forward.c,v 1.76 2014/12/10 01:10:14 christos Exp $ */
/* $KAME: ip6_forward.c,v 1.109 2002/09/11 08:10:17 sakane Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.75 2014/12/08 00:19:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.76 2014/12/10 01:10:14 christos Exp $");
#include "opt_gateway.h"
#include "opt_ipsec.h"
@@ -74,7 +74,7 @@ struct route ip6_forward_rt;
extern pfil_head_t *inet6_pfil_hook; /* XXX */
-static void
+static void __printflike(4, 5)
ip6_cantforward(const struct ip6_hdr *ip6, const struct ifnet *srcifp,
const struct ifnet *dstifp, const char *fmt, ...)
{
@@ -98,7 +98,7 @@ ip6_cantforward(const struct ip6_hdr *ip
ip6_log_time = time_second;
va_start(ap, fmt);
- snprintf(reason, sizeof(reason), fmt, ap);
+ vsnprintf(reason, sizeof(reason), fmt, ap);
va_end(ap);
log(LOG_DEBUG, "Cannot forward from %s@%s to %s@%s nxt %d (%s)\n",
@@ -245,7 +245,8 @@ ip6_forward(struct mbuf *m, int srcrt)
in6_setscope(&src_in6, m->m_pkthdr.rcvif, &inzone) != 0 ||
inzone != outzone) {
ip6_cantforward(ip6, m->m_pkthdr.rcvif, rt->rt_ifp,
- "src inzone %d outzone %d", inzone, outzone);
+ "src[%s] inzone %d outzone %d",
+ in6_getscopename(&ip6->ip6_src), inzone, outzone);
if (mcopy)
icmp6_error(mcopy, ICMP6_DST_UNREACH,
ICMP6_DST_UNREACH_BEYONDSCOPE, 0);
@@ -280,7 +281,8 @@ ip6_forward(struct mbuf *m, int srcrt)
in6_setscope(&dst_in6, rt->rt_ifp, &outzone) != 0 ||
inzone != outzone) {
ip6_cantforward(ip6, m->m_pkthdr.rcvif, rt->rt_ifp,
- "dst inzone %d outzone %d", inzone, outzone);
+ "dst[%s] inzone %d outzone %d",
+ in6_getscopename(&ip6->ip6_dst), inzone, outzone);
if (mcopy)
icmp6_error(mcopy, ICMP6_DST_UNREACH,
ICMP6_DST_UNREACH_BEYONDSCOPE, 0);
CVS commit: src/lib/libc
Module Name:src
Committed By: pooka
Date: Wed Dec 10 00:37:30 UTC 2014
Modified Files:
src/lib/libc: Makefile Makefile.inc
src/lib/libc/sys: Makefile.inc
Log Message:
Add hooks for RUMPRUN build of libc
If "yes", does the following (default "no"):
* prevents ASM syscalls from being built (librump provides syscalls)
* does not include compat (useless when application is linked with libc)
* does not build tags (no /var/db to install them to)
* does not include tls
==> libc for rumprun can now be built against unmodified NetBSD sources
To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 src/lib/libc/Makefile
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/Makefile.inc
cvs rdiff -u -r1.225 -r1.226 src/lib/libc/sys/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/lib/libc/Makefile
diff -u src/lib/libc/Makefile:1.166 src/lib/libc/Makefile:1.167
--- src/lib/libc/Makefile:1.166 Sun Aug 10 23:39:08 2014
+++ src/lib/libc/Makefile Wed Dec 10 00:37:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.166 2014/08/10 23:39:08 matt Exp $
+# $NetBSD: Makefile,v 1.167 2014/12/10 00:37:30 pooka Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -41,6 +41,7 @@ assym.h: ${ARCHDIR}/genassym.cf
mv -f assym.h.tmp assym.h
.endif
+.if ${RUMPRUN} != "yes"
# The following controls how to build compatibility code for old NetBSD
# binaries. If BUILD_LEGACY is yes, then we build a separate library; otherwise
# we include the code in libc.
@@ -54,6 +55,7 @@ COMPATDIR=${.CURDIR}/compat
# Marker for compat code that can't be easily isolated
CPPFLAGS+= -D__BUILD_LEGACY
.endif
+.endif
.include "${.CURDIR}/../../common/lib/libc/Makefile.inc"
.include "${.CURDIR}/atomic/Makefile.inc"
@@ -90,7 +92,9 @@ CPPFLAGS+= -D__BUILD_LEGACY
.include "${.CURDIR}/termios/Makefile.inc"
.include "${.CURDIR}/thread-stub/Makefile.inc"
.include "${.CURDIR}/time/Makefile.inc"
+.if ${RUMPRUN} != "yes"
.include "${.CURDIR}/tls/Makefile.inc"
+.endif
.include "${.CURDIR}/sys/Makefile.inc"
.if ${HAVE_LIBGCC_EH} == "no"
.include "${NETBSDSRCDIR}/sys/lib/libunwind/Makefile.inc"
@@ -128,6 +132,7 @@ REGEX_SPECIALS=[][)(^$$.?*\\;]
MKREPRO_SED= -e 's;${NETBSDSRCDIR:C/${REGEX_SPECIALS}/&/g};/usr/src;'
.endif
+.if ${RUMPRUN} != "yes"
realall: tags
tags: ${SRCS}
${_MKTARGET_CREATE}
@@ -145,6 +150,7 @@ tags: ${SRCS}
FILES= tags
FILESNAME= libc.tags
FILESDIR= /var/db
+.endif
# workaround for I18N stuffs: build singlebyte setlocale() for libc.a,
Index: src/lib/libc/Makefile.inc
diff -u src/lib/libc/Makefile.inc:1.16 src/lib/libc/Makefile.inc:1.17
--- src/lib/libc/Makefile.inc:1.16 Thu Sep 19 21:18:17 2013
+++ src/lib/libc/Makefile.inc Wed Dec 10 00:37:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2013/09/19 21:18:17 christos Exp $
+# $NetBSD: Makefile.inc,v 1.17 2014/12/10 00:37:30 pooka Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -23,6 +23,10 @@ USE_SHLIBDIR= yes
.include
+# build libc suitable for rumprun software stack, i.e. are system calls
+# rump kernel function calls instead of kernel traps?
+RUMPRUN?= no
+
WARNS=5
CPPFLAGS+= -D_LIBC -DLIBC_SCCS -DSYSLIBC_SCCS -D_REENTRANT
CPPFLAGS+= -D_DIAGNOSTIC -DMLIBDIR=\"${MLIBDIR}\"
Index: src/lib/libc/sys/Makefile.inc
diff -u src/lib/libc/sys/Makefile.inc:1.225 src/lib/libc/sys/Makefile.inc:1.226
--- src/lib/libc/sys/Makefile.inc:1.225 Thu Sep 25 15:08:29 2014
+++ src/lib/libc/sys/Makefile.inc Wed Dec 10 00:37:30 2014
@@ -1,18 +1,22 @@
-# $NetBSD: Makefile.inc,v 1.225 2014/09/25 15:08:29 manu Exp $
+# $NetBSD: Makefile.inc,v 1.226 2014/12/10 00:37:30 pooka Exp $
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94
# sys sources
.PATH: ${ARCHDIR}/sys ${.CURDIR}/sys
+# other sources shared with the kernel, used in syscalls
+SRCS+= cpuset.c
+# glue to offer userland wrappers for some syscalls
+SRCS+= posix_fadvise.c posix_madvise.c sched.c sigqueue.c sigtimedwait.c \
+ sigwait.c sigwaitinfo.c statvfs.c swapon.c semctl.c
+
+.if ${RUMPRUN} != "yes"
# modules with non-default implementations on at least one architecture:
SRCS+= __clone.S __vfork14.S brk.S exect.S fork.S pipe.S \
getcontext.S \
ptrace.S sbrk.S shmat.S \
syscall.S __syscall.S __clone.S cerror.S
-# other sources shared with the kernel, used in syscalls
-SRCS+= cpuset.c
-
_LSRC+= Lint___clone.c Lint___vfork14.c Lint_brk.c Lint_clone.c \
Lint_getcontext.c Lint_exect.c Lint_pipe.c Lint_ptrace.c \
Lint_sbrk.c Lint___sigaction14.c Lint_syscall.c Lint___syscall.c \
@@ -24,10 +28,6 @@ DPSRCS+= ${_LSRC:MLintSys*.c}
CLEANFILES+= ${_LSRC:MLintSys*.c}
.endif
-# glue to offer userland wrappers for some syscalls
-SRCS+= posix_fadvise.c posix_madvise.c sched.c sigqueue.c sigtimedwait.c \
- sigwait.c sigwaitinfo.c st
CVS commit: src/sys/dev/pci
Module Name:src Committed By: christos Date: Wed Dec 10 00:15:26 UTC 2014 Modified Files: src/sys/dev/pci: if_sk.c Log Message: don't give up on mii tick before the interface is marked up. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/dev/pci/if_sk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_sk.c diff -u src/sys/dev/pci/if_sk.c:1.78 src/sys/dev/pci/if_sk.c:1.79 --- src/sys/dev/pci/if_sk.c:1.78 Sun Aug 10 12:44:36 2014 +++ src/sys/dev/pci/if_sk.c Tue Dec 9 19:15:26 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_sk.c,v 1.78 2014/08/10 16:44:36 tls Exp $ */ +/* $NetBSD: if_sk.c,v 1.79 2014/12/10 00:15:26 christos Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -115,7 +115,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.78 2014/08/10 16:44:36 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.79 2014/12/10 00:15:26 christos Exp $"); #include #include @@ -2220,7 +2220,10 @@ sk_tick(void *xsc_if) SK_XM_CLRBIT_2(sc_if, XM_IMR, XM_IMR_GP0_SET); SK_XM_READ_2(sc_if, XM_ISR); mii_tick(mii); - callout_stop(&sc_if->sk_tick_ch); + if (ifp->if_link_state != LINK_STATE_UP) + callout_reset(&sc_if->sk_tick_ch, hz, sk_tick, sc_if); + else + callout_stop(&sc_if->sk_tick_ch); } void @@ -2872,6 +2875,7 @@ sk_init(struct ifnet *ifp) ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; + callout_reset(&sc_if->sk_tick_ch, hz, sk_tick, sc_if); out: splx(s);
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Wed Dec 10 00:16:05 UTC 2014
Modified Files:
src/sys/sys: ioccom.h
Log Message:
provide a macro to symbolically print an ioctl number.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/sys/ioccom.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/sys/ioccom.h
diff -u src/sys/sys/ioccom.h:1.11 src/sys/sys/ioccom.h:1.12
--- src/sys/sys/ioccom.h:1.11 Wed Oct 19 06:53:12 2011
+++ src/sys/sys/ioccom.h Tue Dec 9 19:16:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ioccom.h,v 1.11 2011/10/19 10:53:12 yamt Exp $ */
+/* $NetBSD: ioccom.h,v 1.12 2014/12/10 00:16:05 christos Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -72,4 +72,11 @@
/* this should be _IORW, but stdio got there first */
#define _IOWR(g,n,t) _IOC(IOC_INOUT, (g), (n), sizeof(t))
+#define IOCSNPRINTF(buf, len, cmd) \
+snprintf((buf), (len), "_IO%s%s('%c', %hhu)", \
+ (((cmd) >> 30) & 1) ? "W" : "", \
+ (((cmd) >> 30) & 2) ? "R" : "", \
+ (char)IOCGROUP(cmd), (unsigned char)(cmd))
+
+
#endif /* !_SYS_IOCCOM_H_ */
CVS commit: src/doc
Module Name:src Committed By: roy Date: Tue Dec 9 20:25:43 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.6.5 To generate a diff of this commit: cvs rdiff -u -r1.1179 -r1.1180 src/doc/3RDPARTY cvs rdiff -u -r1.2023 -r1.2024 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1179 src/doc/3RDPARTY:1.1180 --- src/doc/3RDPARTY:1.1179 Sun Dec 7 10:05:21 2014 +++ src/doc/3RDPARTY Tue Dec 9 20:25:43 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1179 2014/12/07 10:05:21 jnemeth Exp $ +# $NetBSD: 3RDPARTY,v 1.1180 2014/12/09 20:25:43 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -305,8 +305,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 6.6.4 -Current Vers: 6.6.4 +Version: 6.6.5 +Current Vers: 6.6.5 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2023 src/doc/CHANGES:1.2024 --- src/doc/CHANGES:1.2023 Wed Nov 26 16:05:51 2014 +++ src/doc/CHANGES Tue Dec 9 20:25:43 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2023 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2024 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -109,3 +109,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: libpcap: Import 1.6.2. [christos 20141119] tcpdump(8): Import 4.6.2. [christos 20141119] dhcpcd(8): Import dhcpcd-6.6.4. [roy 20141126] + dhcpcd(8): Import dhcpcd-6.6.5. [roy 20141209]
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Tue Dec 9 20:24:40 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #303 - #307 To generate a diff of this commit: cvs rdiff -u -r1.1.2.124 -r1.1.2.125 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.124 src/doc/CHANGES-7.0:1.1.2.125 --- src/doc/CHANGES-7.0:1.1.2.124 Tue Dec 9 19:39:58 2014 +++ src/doc/CHANGES-7.0 Tue Dec 9 20:24:40 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.124 2014/12/09 19:39:58 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.125 2014/12/09 20:24:40 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -3353,3 +3353,35 @@ xsrc/external/mit/xorg-server/dist/xfixe CVE-2014-8103 [mrg, ticket #308] +lib/librumphijack/hijack.c 1.110 + + In case of no dup2'd fd's, make sure that F_CLOSEM for the + rump kernel starts from 0. + [gson, ticket #303] + +sys/dev/dkwedge/dk.c1.75-1.76 + + Fix iobuf setup, cleanup. + Really provide disk properties, the old code computed values that + were never attached to the device. + [mlelstv, ticket #304] + +sbin/ccdconfig/ccdconfig.c 1.56 + + Make ccdconfig resolve wedge names. + [mlelstv, ticket #305] + +distrib/sets/lists/base/shl.mi 1.723 +distrib/sets/lists/debug/shl.mi 1.82 +lib/libdm/Makefile1.4 + + libdm is needed by LVM early in the boot process. Fixes bin/49357. + [mlelstv, ticket #306] + +tests/lib/librumpclient/h_execthr.c 1.3 + + Update hardcoded fd expectations now that rump kernels open 0/1/2. + (since we exec, it's convenient to just assume the values of first + 4 fds) + [gson, ticket #307] +
CVS commit: [netbsd-7] src/tests/lib/librumpclient
Module Name:src
Committed By: martin
Date: Tue Dec 9 20:23:14 UTC 2014
Modified Files:
src/tests/lib/librumpclient [netbsd-7]: h_execthr.c
Log Message:
Pull up following revision(s) (requested by gson in ticket #307):
tests/lib/librumpclient/h_execthr.c: revision 1.3
Update hardcoded fd expectations now that rump kernels open 0/1/2.
(since we exec, it's convenient to just assume the values of first 4 fds)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.22.1 src/tests/lib/librumpclient/h_execthr.c
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/librumpclient/h_execthr.c
diff -u src/tests/lib/librumpclient/h_execthr.c:1.2 src/tests/lib/librumpclient/h_execthr.c:1.2.22.1
--- src/tests/lib/librumpclient/h_execthr.c:1.2 Tue Mar 8 15:35:28 2011
+++ src/tests/lib/librumpclient/h_execthr.c Tue Dec 9 20:23:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: h_execthr.c,v 1.2 2011/03/08 15:35:28 pooka Exp $ */
+/* $NetBSD: h_execthr.c,v 1.2.22.1 2014/12/09 20:23:14 martin Exp $ */
/*
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -51,6 +51,11 @@ static int canreturn = 0;
*/
#define NTHR 63
+#define P1_0 3
+#define P1_1 4
+#define P2_0 5
+#define P2_1 6
+
static void *
wrk(void *arg)
{
@@ -110,14 +115,14 @@ main(int argc, char *argv[], char *envp[
if (execd) {
canreturn = 1;
if (pthread_create(&pt, NULL,
- wrk, (void *)(uintptr_t)2) != 0)
+ wrk, (void *)(uintptr_t)P2_0) != 0)
errx(1, "exec pthread_create");
i = 37;
- rump_sys_write(3, &i, sizeof(i));
+ rump_sys_write(P2_1, &i, sizeof(i));
pthread_join(pt, NULL);
- n = rump_sys_read(0, &i, sizeof(i));
+ n = rump_sys_read(P1_0, &i, sizeof(i));
if (n != -1 || errno != EBADF)
errx(1, "post-exec cloexec works");
@@ -129,17 +134,17 @@ main(int argc, char *argv[], char *envp[
if (execd > 10)
exit(0);
- rump_sys_close(2);
- rump_sys_close(3);
+ rump_sys_close(P2_0);
+ rump_sys_close(P2_1);
}
if (rump_sys_pipe(p1) == -1)
err(1, "pipe1");
- if (p1[0] != 0 || p1[1] != 1)
+ if (p1[0] != P1_0 || p1[1] != P1_1)
errx(1, "p1 assumptions failed %d %d", p1[0], p1[1]);
if (rump_sys_pipe(p2) == -1)
err(1, "pipe1");
- if (p2[0] != 2 || p2[1] != 3)
+ if (p2[0] != P2_0 || p2[1] != P2_1)
errx(1, "p2 assumptions failed");
if (rump_sys_fcntl(p1[0], F_SETFD, FD_CLOEXEC) == -1)
err(1, "cloexec");
CVS commit: [netbsd-7] src
Module Name:src Committed By: martin Date: Tue Dec 9 20:21:05 UTC 2014 Modified Files: src/distrib/sets/lists/base [netbsd-7]: shl.mi src/distrib/sets/lists/debug [netbsd-7]: shl.mi src/lib/libdm [netbsd-7]: Makefile Log Message: Pull up following revision(s) (requested by mlelstv in ticket #306): lib/libdm/Makefile: revision 1.4 distrib/sets/lists/debug/shl.mi: revision 1.82 distrib/sets/lists/base/shl.mi: revision 1.723 libdm is needed by LVM early in the boot process. Fixes bin/49357. To generate a diff of this commit: cvs rdiff -u -r1.712.2.1 -r1.712.2.2 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.71.2.1 -r1.71.2.2 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.3 -r1.3.4.1 src/lib/libdm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.712.2.1 src/distrib/sets/lists/base/shl.mi:1.712.2.2 --- src/distrib/sets/lists/base/shl.mi:1.712.2.1 Mon Oct 13 20:05:15 2014 +++ src/distrib/sets/lists/base/shl.mi Tue Dec 9 20:21:05 2014 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.712.2.1 2014/10/13 20:05:15 martin Exp $ +# $NetBSD: shl.mi,v 1.712.2.2 2014/12/09 20:21:05 martin Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -25,6 +25,9 @@ ./lib/libdevmapper.sobase-lvm-shlib lvm,dynamicroot ./lib/libdevmapper.so.1base-lvm-shlib lvm,dynamicroot ./lib/libdevmapper.so.1.0 base-lvm-shlib lvm,dynamicroot +./lib/libdm.so base-sys-shlib dynamicroot +./lib/libdm.so.0base-sys-shlib dynamicroot +./lib/libdm.so.0.0base-sys-shlib dynamicroot ./lib/libedit.sobase-sys-shlib dynamicroot ./lib/libedit.so.3base-sys-shlib dynamicroot ./lib/libedit.so.3.1base-sys-shlib dynamicroot Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.71.2.1 src/distrib/sets/lists/debug/shl.mi:1.71.2.2 --- src/distrib/sets/lists/debug/shl.mi:1.71.2.1 Mon Oct 13 20:05:15 2014 +++ src/distrib/sets/lists/debug/shl.mi Tue Dec 9 20:21:05 2014 @@ -1,8 +1,9 @@ -# $NetBSD: shl.mi,v 1.71.2.1 2014/10/13 20:05:15 martin Exp $ +# $NetBSD: shl.mi,v 1.71.2.2 2014/12/09 20:21:05 martin Exp $ ./usr/libdata/debug/lib/libc.so.12.193.debug comp-sys-debug debug ./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug ./usr/libdata/debug/lib/libcrypto.so.8.3.debug comp-sys-debug debug ./usr/libdata/debug/lib/libdevmapper.so.1.0.debug comp-sys-debug debug +./usr/libdata/debug/lib/libdm.so.0.0.debug comp-sys-debug debug ./usr/libdata/debug/lib/libedit.so.3.1.debug comp-sys-debug debug ./usr/libdata/debug/lib/libevent.so.4.0.debug comp-sys-debug debug ./usr/libdata/debug/lib/libgcc_s.so.1.0.debug comp-sys-debug gcc,debug Index: src/lib/libdm/Makefile diff -u src/lib/libdm/Makefile:1.3 src/lib/libdm/Makefile:1.3.4.1 --- src/lib/libdm/Makefile:1.3 Wed Sep 11 23:04:10 2013 +++ src/lib/libdm/Makefile Tue Dec 9 20:21:05 2014 @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2013/09/11 23:04:10 joerg Exp $ +# $NetBSD: Makefile,v 1.3.4.1 2014/12/09 20:21:05 martin Exp $ + +USE_SHLIBDIR= yes USE_FORT?= no # network protocol library LIB=dm
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src
Committed By: roy
Date: Tue Dec 9 20:21:05 UTC 2014
Modified Files:
src/external/bsd/dhcpcd/dist: defs.h dhcp.c dhcpcd-run-hooks.in
dhcpcd.8.in dhcpcd.c if.c script.c
src/external/bsd/dhcpcd/dist/dhcpcd-hooks: 29-lookup-hostname
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/dhcpcd/dist/defs.h
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in
cvs rdiff -u -r1.37 -r1.38 src/external/bsd/dhcpcd/dist/dhcpcd.8.in
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/dhcpcd/dist/dhcpcd.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/dhcpcd/dist/if.c
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/dhcpcd/dist/script.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/defs.h
diff -u src/external/bsd/dhcpcd/dist/defs.h:1.9 src/external/bsd/dhcpcd/dist/defs.h:1.10
--- src/external/bsd/dhcpcd/dist/defs.h:1.9 Wed Nov 26 16:05:14 2014
+++ src/external/bsd/dhcpcd/dist/defs.h Tue Dec 9 20:21:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.9 2014/11/26 16:05:14 roy Exp $ */
+/* $NetBSD: defs.h,v 1.10 2014/12/09 20:21:05 roy Exp $ */
/*
* dhcpcd - DHCP client daemon
@@ -30,7 +30,7 @@
#define CONFIG_H
#define PACKAGE "dhcpcd"
-#define VERSION "6.6.4"
+#define VERSION "6.6.5"
#ifndef CONFIG
# define CONFIG SYSCONFDIR "/" PACKAGE ".conf"
Index: src/external/bsd/dhcpcd/dist/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/dhcp.c:1.24 src/external/bsd/dhcpcd/dist/dhcp.c:1.25
--- src/external/bsd/dhcpcd/dist/dhcp.c:1.24 Wed Nov 26 13:43:06 2014
+++ src/external/bsd/dhcpcd/dist/dhcp.c Tue Dec 9 20:21:05 2014
@@ -1,5 +1,5 @@
#include
- __RCSID("$NetBSD: dhcp.c,v 1.24 2014/11/26 13:43:06 roy Exp $");
+ __RCSID("$NetBSD: dhcp.c,v 1.25 2014/12/09 20:21:05 roy Exp $");
/*
* dhcpcd - DHCP client daemon
@@ -3077,11 +3077,14 @@ dhcp_start1(void *arg)
if (ifp->ctx->udp_fd == -1) {
ifp->ctx->udp_fd = dhcp_openudp(NULL);
if (ifp->ctx->udp_fd == -1) {
- syslog(LOG_ERR, "dhcp_openudp: %m");
- return;
- }
- eloop_event_add(ifp->ctx->eloop,
- ifp->ctx->udp_fd, dhcp_handleudp, ifp->ctx, NULL, NULL);
+ /* Don't log an error if some other process
+ * is handling this. */
+ if (errno != EADDRINUSE)
+syslog(LOG_ERR, "dhcp_openudp: %m");
+ } else
+ eloop_event_add(ifp->ctx->eloop,
+ ifp->ctx->udp_fd, dhcp_handleudp,
+ ifp->ctx, NULL, NULL);
}
if (dhcp_init(ifp) == -1) {
Index: src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in
diff -u src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in:1.7 src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in:1.8
--- src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in:1.7 Wed Nov 26 16:05:14 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in Tue Dec 9 20:21:05 2014
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: dhcpcd-run-hooks.in,v 1.7 2014/11/26 16:05:14 roy Exp $
+# $NetBSD: dhcpcd-run-hooks.in,v 1.8 2014/12/09 20:21:05 roy Exp $
# dhcpcd client configuration script
@@ -9,8 +9,6 @@ case "$reason" in
ifsuffix=":ra";;
INFORM6|BOUND6|RENEW6|REBIND6|REBOOT6|EXPIRE6|RELEASE6|STOP6)
ifsuffix=":dhcp6";;
- STOPPED) # This reason should never be processed
- exit 0;;
*)
ifsuffix=;;
esac
Index: src/external/bsd/dhcpcd/dist/dhcpcd.8.in
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.37 src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.38
--- src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.37 Wed Nov 26 13:43:06 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd.8.in Tue Dec 9 20:21:05 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: dhcpcd.8.in,v 1.37 2014/11/26 13:43:06 roy Exp $
+.\" $NetBSD: dhcpcd.8.in,v 1.38 2014/12/09 20:21:05 roy Exp $
.\" Copyright (c) 2006-2014 Roy Marples
.\" All rights reserved
.\"
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd November 18, 2014
+.Dd November 26, 2014
.Dt DHCPCD 8
.Os
.Sh NAME
@@ -557,6 +557,9 @@ with the reason of TEST which echos the
to the console.
The interface configuration isn't touched and neither are any configuration
files.
+The
+.Ar rapid_commit
+option is not sent in TEST mode so that the server does not lease an address.
To test INFORM the interface needs to be configured with the desired address
before starting
.Nm .
Index: src/external/bsd/dhcpcd/dist/dhcpcd.c
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.c:1.18 src/external/bsd/dhcpcd/dist/dhcpcd.c:1.19
--- src/external/bsd/dhcpcd/dist/dhcpcd.c:1.18 Wed Nov 26 13:43:06 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd.c Tue Dec 9 20:21:05 2014
@@ -1,5 +1,5 @@
#include
- __RCSID("$NetBSD: dhcpcd.c,v 1.18 2014/11/26 13:43:06 roy Exp $");
+ __RCSID("$NetBSD: dhcpcd.c,v 1.19 2014/12/09 2
CVS commit: [netbsd-7] src/sbin/ccdconfig
Module Name:src
Committed By: martin
Date: Tue Dec 9 20:18:47 UTC 2014
Modified Files:
src/sbin/ccdconfig [netbsd-7]: ccdconfig.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #305):
sbin/ccdconfig/ccdconfig.c: revision 1.56
Make ccdconfig resolve wedge names.
To generate a diff of this commit:
cvs rdiff -u -r1.53.6.1 -r1.53.6.2 src/sbin/ccdconfig/ccdconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ccdconfig/ccdconfig.c
diff -u src/sbin/ccdconfig/ccdconfig.c:1.53.6.1 src/sbin/ccdconfig/ccdconfig.c:1.53.6.2
--- src/sbin/ccdconfig/ccdconfig.c:1.53.6.1 Mon Aug 18 12:40:36 2014
+++ src/sbin/ccdconfig/ccdconfig.c Tue Dec 9 20:18:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ccdconfig.c,v 1.53.6.1 2014/08/18 12:40:36 martin Exp $ */
+/* $NetBSD: ccdconfig.c,v 1.53.6.2 2014/12/09 20:18:47 martin Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1996, 1997\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: ccdconfig.c,v 1.53.6.1 2014/08/18 12:40:36 martin Exp $");
+__RCSID("$NetBSD: ccdconfig.c,v 1.53.6.2 2014/12/09 20:18:47 martin Exp $");
#endif
#include
@@ -164,8 +164,10 @@ do_single(int argc, char **argv, int act
{
struct ccd_ioctl ccio;
char *ccd, *cp, *cp2, **disks;
+ char buf[MAXPATHLEN];
int noflags = 0, i, ileave, flags, j;
- unsigned int ui;
+ unsigned int ndisks, ui;
+ int ret = 1;
flags = 0;
memset(&ccio, 0, sizeof(ccio));
@@ -235,29 +237,34 @@ do_single(int argc, char **argv, int act
/* Next is the list of disks to make the ccd from. */
disks = emalloc(argc * sizeof(char *));
- for (ui = 0; argc != 0; ) {
- cp = *argv++; --argc;
+ for (ndisks = 0; argc != 0; ++argv, --argc) {
+ if (getfsspecname(buf, sizeof(buf), *argv) == NULL) {
+ warn("%s", *argv);
+ goto error;
+ }
+
+ cp = strdup(buf);
+ if (cp == NULL) {
+ warn("%s", cp);
+ goto error;
+ }
+
if ((j = checkdev(cp)) == 0)
- disks[ui++] = cp;
+ disks[ndisks++] = cp;
else {
warnx("%s: %s", cp, strerror(j));
- free(ccd);
- free(disks);
- return (1);
+ goto error;
}
}
/* Fill in the ccio. */
ccio.ccio_disks = disks;
- ccio.ccio_ndisks = ui;
+ ccio.ccio_ndisks = ndisks;
ccio.ccio_ileave = ileave;
ccio.ccio_flags = flags;
- if (do_io(ccd, CCDIOCSET, &ccio)) {
- free(ccd);
- free(disks);
- return (1);
- }
+ if (do_io(ccd, CCDIOCSET, &ccio))
+ goto error;
if (verbose) {
printf("ccd%d: %d components ", ccio.ccio_unit,
@@ -278,9 +285,14 @@ do_single(int argc, char **argv, int act
printf("concatenated\n");
}
+ ret = 0;
+
+error:
free(ccd);
+ while (ndisks > 0)
+ free(disks[--ndisks]);
free(disks);
- return (0);
+ return (ret);
}
static int
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Tue Dec 9 20:18:15 UTC 2014 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15493 Log Message: Import dhcpcd-6.6.5 with the followng changes: * Allow STOPPED to be processed by dhcpcd-run-hooks(8) * Don't attempt to match IFT to ARP types directly * If neither dig nor host are present, fallback to getent(1) * If IFF_UP is not set when we get a carrier up event, poll for it instead of giving up * Failure to bind to the DHCP port on the wildcard address when it's in-use is not an error Status: Vendor Tag: roy Release Tags: dhcpcd-6-6-5 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c C src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c C src/external/bsd/dhcpcd/dist/if.c U src/external/bsd/dhcpcd/dist/if-options.c C src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/arp.c C src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c U src/external/bsd/dhcpcd/dist/ipv6nd.c U src/external/bsd/dhcpcd/dist/dhcp6.c U src/external/bsd/dhcpcd/dist/auth.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in C src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in C src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/auth.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h C src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dev.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6nd.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c U src/external/bsd/dhcpcd/dist/crypt/crypt.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf C src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind 8 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist
CVS commit: [netbsd-7] src/sys/dev/dkwedge
Module Name:src
Committed By: martin
Date: Tue Dec 9 20:17:16 UTC 2014
Modified Files:
src/sys/dev/dkwedge [netbsd-7]: dk.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #304):
sys/dev/dkwedge/dk.c: revision 1.75
sys/dev/dkwedge/dk.c: revision 1.76
fix iobuf setup, cleanup
Really provide disk properties, the old code computed values that were
never attached to the device.
To generate a diff of this commit:
cvs rdiff -u -r1.72.2.2 -r1.72.2.3 src/sys/dev/dkwedge/dk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.72.2.2 src/sys/dev/dkwedge/dk.c:1.72.2.3
--- src/sys/dev/dkwedge/dk.c:1.72.2.2 Tue Nov 11 10:36:41 2014
+++ src/sys/dev/dkwedge/dk.c Tue Dec 9 20:17:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.72.2.2 2014/11/11 10:36:41 martin Exp $ */
+/* $NetBSD: dk.c,v 1.72.2.3 2014/12/09 20:17:16 martin Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.72.2.2 2014/11/11 10:36:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.72.2.3 2014/12/09 20:17:16 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_dkwedge.h"
@@ -217,10 +217,10 @@ dkwedge_compute_pdev(const char *pname,
pmaj = devsw_name2chr(name, devname, sizeof(devname));
break;
default:
- pmaj = -1;
+ pmaj = NODEVMAJOR;
break;
}
- if (pmaj == -1)
+ if (pmaj == NODEVMAJOR)
return (ENODEV);
name += strlen(devname);
@@ -258,20 +258,22 @@ dkwedge_array_expand(void)
}
static void
-dkgetproperties(struct disk *disk, struct dkwedge_info *dkw)
+dk_set_geometry(struct dkwedge_softc *sc)
{
+ struct disk *disk = &sc->sc_dk;
struct disk_geom *dg = &disk->dk_geom;
memset(dg, 0, sizeof(*dg));
- dg->dg_secperunit = dkw->dkw_size >> disk->dk_blkshift;
+ dg->dg_secperunit = sc->sc_size >> disk->dk_blkshift;
dg->dg_secsize = DEV_BSIZE << disk->dk_blkshift;
+
+ /* fake numbers, 1 cylinder is 1 MB with default sector size */
dg->dg_nsectors = 32;
dg->dg_ntracks = 64;
- /* XXX: why is that dkw->dkw_size instead of secperunit?!?! */
- dg->dg_ncylinders = dkw->dkw_size / (dg->dg_nsectors * dg->dg_ntracks);
+ dg->dg_ncylinders = dg->dg_secperunit / (dg->dg_nsectors * dg->dg_ntracks);
- disk_set_info(NULL, disk, "ESDI");
+ disk_set_info(sc->sc_dev, disk, NULL);
}
/*
@@ -454,7 +456,7 @@ dkwedge_add(struct dkwedge_info *dkw)
disk_init(&sc->sc_dk, device_xname(sc->sc_dev), NULL);
disk_blocksize(&sc->sc_dk, DEV_BSIZE << pdk->dk_blkshift);
- dkgetproperties(&sc->sc_dk, dkw);
+ dk_set_geometry(sc);
disk_attach(&sc->sc_dk);
/* Disk wedge is ready for use! */
@@ -927,6 +929,7 @@ dkwedge_discover(struct disk *pdk)
pdk->dk_name, error);
/* We'll just assume the vnode has been cleaned up. */
}
+
out:
rw_exit(&dkwedge_discovery_methods_lock);
}
@@ -957,9 +960,10 @@ dkwedge_read(struct disk *pdk, struct vn
bp->b_cflags = BC_BUSY;
bp->b_dev = devsw_chr2blk(vp->v_rdev);
bp->b_data = tbuf;
- bp->b_bufsize = bp->b_resid = bp->b_bcount = len;
- bp->b_lblkno = 0;
+ bp->b_bufsize = bp->b_bcount = len;
bp->b_blkno = blkno;
+ bp->b_cylinder = 0;
+ bp->b_error = 0;
error = bdev_open(bp->b_dev, FREAD, S_IFBLK, curlwp);
if (error)
@@ -1570,3 +1574,4 @@ dkwedge_get_parent_name(dev_t dev)
return NULL;
return sc->sc_parent->dk_name;
}
+
CVS commit: [netbsd-7] src/lib/librumphijack
Module Name:src
Committed By: martin
Date: Tue Dec 9 20:13:38 UTC 2014
Modified Files:
src/lib/librumphijack [netbsd-7]: hijack.c
Log Message:
Pull up following revision(s) (requested by gson in ticket #303):
lib/librumphijack/hijack.c: revision 1.110
In case of no dup2'd fd's, make sure that F_CLOSEM for the
rump kernel starts from 0.
Fixes rumphijack fdoff test (notably, this bug had nothing to do with
fdoff, and was exposed >3 years after writing the test when rump kernels
started providing fd's 0/1/2)
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.109.2.1 src/lib/librumphijack/hijack.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/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.109 src/lib/librumphijack/hijack.c:1.109.2.1
--- src/lib/librumphijack/hijack.c:1.109 Mon Jul 21 14:23:43 2014
+++ src/lib/librumphijack/hijack.c Tue Dec 9 20:13:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.109 2014/07/21 14:23:43 gson Exp $ */
+/* $NetBSD: hijack.c,v 1.109.2.1 2014/12/09 20:13:38 martin Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#include
#if !defined(lint)
-__RCSID("$NetBSD: hijack.c,v 1.109 2014/07/21 14:23:43 gson Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.109.2.1 2014/12/09 20:13:38 martin Exp $");
#endif
#include
@@ -1380,7 +1380,7 @@ fcntl(int fd, int cmd, ...)
* for the file descriptors not dup2'd.
*/
- for (i = 0, maxdup2 = 0; i <= DUP2HIGH; i++) {
+ for (i = 0, maxdup2 = -1; i <= DUP2HIGH; i++) {
if (dup2vec[i] & DUP2BIT) {
int val;
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: snj Date: Tue Dec 9 19:59:40 UTC 2014 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.6 Log Message: 1935 To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 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.4 src/doc/CHANGES-5.1.6:1.1.2.5 --- src/doc/CHANGES-5.1.6:1.1.2.4 Sun Nov 23 04:56:23 2014 +++ src/doc/CHANGES-5.1.6 Tue Dec 9 19:59:40 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.6,v 1.1.2.4 2014/11/23 04:56:23 snj Exp $ +# $NetBSD: CHANGES-5.1.6,v 1.1.2.5 2014/12/09 19:59:40 snj Exp $ A complete list of changes from the NetBSD 5.1.5 release to the NetBSD 5.1.6 release: @@ -45,3 +45,57 @@ share/zoneinfo/zone1970.tab patch * Changes to historical data. [apb, ticket #1934] +xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c patch +xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c patch +xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c patch +xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c patch +xsrc/external/mit/xorg-server/dist/Xi/sendexev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c patch +xsrc/external/mit/xorg-server/dist/dbe/dbe.cpatch +xsrc/external/mit/xorg-server/dist/dix/dispatch.c patch +xsrc/external/mit/xorg-server/dist/glx/glxcmds.c patch +xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c patch +xsrc/external/mit/xorg-server/dist/glx/glxserver.h patch +xsrc/external/mit/xorg-server/dist/glx/indirect_program.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h patch +xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_util.c patch +xsrc/external/mit/xorg-server/dist/glx/rensize.c patch +xsrc/external/mit/xorg-server/dist/glx/single2.c patch +xsrc/external/mit/xorg-server/dist/glx/single2swap.c patch +xsrc/external/mit/xorg-server/dist/glx/singlepix.c patch +xsrc/external/mit/xorg-server/dist/glx/singlepixswap.c patch +xsrc/external/mit/xorg-server/dist/glx/swap_interval.c patch +xsrc/external/mit/xorg-server/dist/glx/unpack.h patch +xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/dri2ext.c patch +xsrc/external/mit/xorg-server/dist/include/dix.h patch +xsrc/external/mit/xorg-server/dist/include/misc.h patch +xsrc/external/mit/xorg-server/dist/os/access.c patch +xsrc/external/mit/xorg-server/dist/os/rpcauth.c patch +xsrc/external/mit/xorg-server/dist/randr/rrsdispatch.c patch +xsrc/external/mit/xorg-server/dist/render/render.c patch +xsrc/external/mit/xorg-server/dist/xfixes/select.c patch + + apply fixes for X.Org Security Advisory: Dec. 9, 2014 + Protocol handling issues in X Window System servers + included are fixes for: + denial of service due to unchecked malloc in client authentication + CVE-2014-8091 + integer overflows calculating memory needs for requests + CVE-2014-8092 + CVE-2014-8093 + CVE-2014-8094 + out of bounds access due to not validating length or offset values + in requests + CVE-2014-8095 + CVE-2014-8096 + CVE-2014-8097 + CVE-2014-8098 + CVE-2014-8099 + CVE-2014-8100 + CVE-2014-8101 + CVE-2014-8102 + CVE-2014-8103 + [mrg, ticket #1935] +
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: snj Date: Tue Dec 9 20:00:16 UTC 2014 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.4 Log Message: 1935 To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 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.4 src/doc/CHANGES-5.2.4:1.1.2.5 --- src/doc/CHANGES-5.2.4:1.1.2.4 Sun Nov 23 05:00:24 2014 +++ src/doc/CHANGES-5.2.4 Tue Dec 9 20:00:15 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.4,v 1.1.2.4 2014/11/23 05:00:24 snj Exp $ +# $NetBSD: CHANGES-5.2.4,v 1.1.2.5 2014/12/09 20:00:15 snj Exp $ A complete list of changes from the NetBSD 5.2.3 release to the NetBSD 5.2.4 release: @@ -45,3 +45,57 @@ share/zoneinfo/zone1970.tab patch * Changes to historical data. [apb, ticket #1934] +xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c patch +xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c patch +xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c patch +xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c patch +xsrc/external/mit/xorg-server/dist/Xi/sendexev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c patch +xsrc/external/mit/xorg-server/dist/dbe/dbe.cpatch +xsrc/external/mit/xorg-server/dist/dix/dispatch.c patch +xsrc/external/mit/xorg-server/dist/glx/glxcmds.c patch +xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c patch +xsrc/external/mit/xorg-server/dist/glx/glxserver.h patch +xsrc/external/mit/xorg-server/dist/glx/indirect_program.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h patch +xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_util.c patch +xsrc/external/mit/xorg-server/dist/glx/rensize.c patch +xsrc/external/mit/xorg-server/dist/glx/single2.c patch +xsrc/external/mit/xorg-server/dist/glx/single2swap.c patch +xsrc/external/mit/xorg-server/dist/glx/singlepix.c patch +xsrc/external/mit/xorg-server/dist/glx/singlepixswap.c patch +xsrc/external/mit/xorg-server/dist/glx/swap_interval.c patch +xsrc/external/mit/xorg-server/dist/glx/unpack.h patch +xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/dri2ext.c patch +xsrc/external/mit/xorg-server/dist/include/dix.h patch +xsrc/external/mit/xorg-server/dist/include/misc.h patch +xsrc/external/mit/xorg-server/dist/os/access.c patch +xsrc/external/mit/xorg-server/dist/os/rpcauth.c patch +xsrc/external/mit/xorg-server/dist/randr/rrsdispatch.c patch +xsrc/external/mit/xorg-server/dist/render/render.c patch +xsrc/external/mit/xorg-server/dist/xfixes/select.c patch + + apply fixes for X.Org Security Advisory: Dec. 9, 2014 + Protocol handling issues in X Window System servers + included are fixes for: + denial of service due to unchecked malloc in client authentication + CVE-2014-8091 + integer overflows calculating memory needs for requests + CVE-2014-8092 + CVE-2014-8093 + CVE-2014-8094 + out of bounds access due to not validating length or offset values + in requests + CVE-2014-8095 + CVE-2014-8096 + CVE-2014-8097 + CVE-2014-8098 + CVE-2014-8099 + CVE-2014-8100 + CVE-2014-8101 + CVE-2014-8102 + CVE-2014-8103 + [mrg, ticket #1935] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Tue Dec 9 19:59:09 UTC 2014 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: 1935 To generate a diff of this commit: cvs rdiff -u -r1.1.2.82 -r1.1.2.83 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.82 src/doc/CHANGES-5.3:1.1.2.83 --- src/doc/CHANGES-5.3:1.1.2.82 Sun Nov 23 04:52:53 2014 +++ src/doc/CHANGES-5.3 Tue Dec 9 19:59:09 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.82 2014/11/23 04:52:53 snj Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.83 2014/12/09 19:59:09 snj Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -1189,3 +1189,57 @@ share/zoneinfo/zone1970.tab patch * Changes to historical data. [apb, ticket #1934] +xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c patch +xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c patch +xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c patch +xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c patch +xsrc/external/mit/xorg-server/dist/Xi/sendexev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c patch +xsrc/external/mit/xorg-server/dist/dbe/dbe.cpatch +xsrc/external/mit/xorg-server/dist/dix/dispatch.c patch +xsrc/external/mit/xorg-server/dist/glx/glxcmds.c patch +xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c patch +xsrc/external/mit/xorg-server/dist/glx/glxserver.h patch +xsrc/external/mit/xorg-server/dist/glx/indirect_program.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h patch +xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_util.c patch +xsrc/external/mit/xorg-server/dist/glx/rensize.c patch +xsrc/external/mit/xorg-server/dist/glx/single2.c patch +xsrc/external/mit/xorg-server/dist/glx/single2swap.c patch +xsrc/external/mit/xorg-server/dist/glx/singlepix.c patch +xsrc/external/mit/xorg-server/dist/glx/singlepixswap.c patch +xsrc/external/mit/xorg-server/dist/glx/swap_interval.c patch +xsrc/external/mit/xorg-server/dist/glx/unpack.h patch +xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/dri2ext.c patch +xsrc/external/mit/xorg-server/dist/include/dix.h patch +xsrc/external/mit/xorg-server/dist/include/misc.h patch +xsrc/external/mit/xorg-server/dist/os/access.c patch +xsrc/external/mit/xorg-server/dist/os/rpcauth.c patch +xsrc/external/mit/xorg-server/dist/randr/rrsdispatch.c patch +xsrc/external/mit/xorg-server/dist/render/render.c patch +xsrc/external/mit/xorg-server/dist/xfixes/select.c patch + + apply fixes for X.Org Security Advisory: Dec. 9, 2014 + Protocol handling issues in X Window System servers + included are fixes for: + denial of service due to unchecked malloc in client authentication + CVE-2014-8091 + integer overflows calculating memory needs for requests + CVE-2014-8092 + CVE-2014-8093 + CVE-2014-8094 + out of bounds access due to not validating length or offset values + in requests + CVE-2014-8095 + CVE-2014-8096 + CVE-2014-8097 + CVE-2014-8098 + CVE-2014-8099 + CVE-2014-8100 + CVE-2014-8101 + CVE-2014-8102 + CVE-2014-8103 + [mrg, ticket #1935] +
CVS commit: [netbsd-5-1] xsrc/external/mit/xorg-server/dist
Module Name:xsrc
Committed By: snj
Date: Tue Dec 9 19:56:35 UTC 2014
Modified Files:
xsrc/external/mit/xorg-server/dist/Xext [netbsd-5-1]: xcmisc.c xvdisp.c
xsrc/external/mit/xorg-server/dist/Xi [netbsd-5-1]: chgdctl.c chgfctl.c
sendexev.c xiproperty.c
xsrc/external/mit/xorg-server/dist/dbe [netbsd-5-1]: dbe.c
xsrc/external/mit/xorg-server/dist/dix [netbsd-5-1]: dispatch.c
xsrc/external/mit/xorg-server/dist/glx [netbsd-5-1]: glxcmds.c
glxcmdsswap.c glxserver.h indirect_program.c indirect_reqsize.c
indirect_reqsize.h indirect_texture_compression.c indirect_util.c
rensize.c single2.c single2swap.c singlepix.c singlepixswap.c
swap_interval.c unpack.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2 [netbsd-5-1]:
dri2ext.c
xsrc/external/mit/xorg-server/dist/include [netbsd-5-1]: dix.h misc.h
xsrc/external/mit/xorg-server/dist/os [netbsd-5-1]: access.c rpcauth.c
xsrc/external/mit/xorg-server/dist/randr [netbsd-5-1]: rrsdispatch.c
xsrc/external/mit/xorg-server/dist/render [netbsd-5-1]: render.c
xsrc/external/mit/xorg-server/dist/xfixes [netbsd-5-1]: select.c
Log Message:
Apply patch (requested by mrg in ticket #1935):
apply fixes for X.Org Security Advisory: Dec. 9, 2014
Protocol handling issues in X Window System servers
included are fixes for:
denial of service due to unchecked malloc in client authentication
CVE-2014-8091
integer overflows calculating memory needs for requests
CVE-2014-8092
CVE-2014-8093
CVE-2014-8094
out of bounds access due to not validating length or offset values in requests
CVE-2014-8095
CVE-2014-8096
CVE-2014-8097
CVE-2014-8098
CVE-2014-8099
CVE-2014-8100
CVE-2014-8101
CVE-2014-8102
CVE-2014-8103
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 \
xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c \
xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 \
xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c \
xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c \
xsrc/external/mit/xorg-server/dist/Xi/sendexev.c
cvs rdiff -u -r1.1.1.2.2.2 -r1.1.1.2.2.2.2.1 \
xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 \
xsrc/external/mit/xorg-server/dist/dbe/dbe.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 \
xsrc/external/mit/xorg-server/dist/dix/dispatch.c
cvs rdiff -u -r1.1.1.2.2.2 -r1.1.1.2.2.2.2.1 \
xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.2.2.1 \
xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c \
xsrc/external/mit/xorg-server/dist/glx/glxserver.h \
xsrc/external/mit/xorg-server/dist/glx/indirect_program.c \
xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c \
xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h \
xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c \
xsrc/external/mit/xorg-server/dist/glx/indirect_util.c \
xsrc/external/mit/xorg-server/dist/glx/rensize.c \
xsrc/external/mit/xorg-server/dist/glx/single2.c \
xsrc/external/mit/xorg-server/dist/glx/single2swap.c \
xsrc/external/mit/xorg-server/dist/glx/singlepix.c \
xsrc/external/mit/xorg-server/dist/glx/singlepixswap.c \
xsrc/external/mit/xorg-server/dist/glx/swap_interval.c \
xsrc/external/mit/xorg-server/dist/glx/unpack.h
cvs rdiff -u -r1.1.1.2.2.2 -r1.1.1.2.2.2.2.1 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/dri2ext.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 \
xsrc/external/mit/xorg-server/dist/include/dix.h \
xsrc/external/mit/xorg-server/dist/include/misc.h
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 \
xsrc/external/mit/xorg-server/dist/os/access.c \
xsrc/external/mit/xorg-server/dist/os/rpcauth.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 \
xsrc/external/mit/xorg-server/dist/randr/rrsdispatch.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 \
xsrc/external/mit/xorg-server/dist/render/render.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.2.1 \
xsrc/external/mit/xorg-server/dist/xfixes/select.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c
diff -u xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c:1.1.1.1.2.1 xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c:1.1.1.1.2.1.2.1
--- xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c:1.1.1.1.2.1 Thu Sep 17 03:34:49 2009
+++ xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c Tue Dec 9 19:56:34 2014
@@ -200,6 +200,7 @@ SProcXCMiscGetXIDList(client)
{
int n;
REQUEST(xXCMiscGetXIDListReq);
+REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
swaps(&stuff->le
CVS commit: [netbsd-5] xsrc/external/mit/xorg-server/dist
Module Name:xsrc
Committed By: snj
Date: Tue Dec 9 19:55:11 UTC 2014
Modified Files:
xsrc/external/mit/xorg-server/dist/Xext [netbsd-5]: xcmisc.c xvdisp.c
xsrc/external/mit/xorg-server/dist/Xi [netbsd-5]: chgdctl.c chgfctl.c
sendexev.c xiproperty.c
xsrc/external/mit/xorg-server/dist/dbe [netbsd-5]: dbe.c
xsrc/external/mit/xorg-server/dist/dix [netbsd-5]: dispatch.c
xsrc/external/mit/xorg-server/dist/glx [netbsd-5]: glxcmds.c
glxcmdsswap.c glxserver.h indirect_program.c indirect_reqsize.c
indirect_reqsize.h indirect_texture_compression.c indirect_util.c
rensize.c single2.c single2swap.c singlepix.c singlepixswap.c
swap_interval.c unpack.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2 [netbsd-5]:
dri2ext.c
xsrc/external/mit/xorg-server/dist/include [netbsd-5]: dix.h misc.h
xsrc/external/mit/xorg-server/dist/os [netbsd-5]: access.c rpcauth.c
xsrc/external/mit/xorg-server/dist/randr [netbsd-5]: rrsdispatch.c
xsrc/external/mit/xorg-server/dist/render [netbsd-5]: render.c
xsrc/external/mit/xorg-server/dist/xfixes [netbsd-5]: select.c
Log Message:
Apply patch (requested by mrg in ticket #1935):
apply fixes for X.Org Security Advisory: Dec. 9, 2014
Protocol handling issues in X Window System servers
included are fixes for:
denial of service due to unchecked malloc in client authentication
CVE-2014-8091
integer overflows calculating memory needs for requests
CVE-2014-8092
CVE-2014-8093
CVE-2014-8094
out of bounds access due to not validating length or offset values in requests
CVE-2014-8095
CVE-2014-8096
CVE-2014-8097
CVE-2014-8098
CVE-2014-8099
CVE-2014-8100
CVE-2014-8101
CVE-2014-8102
CVE-2014-8103
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c \
xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c \
xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c \
xsrc/external/mit/xorg-server/dist/Xi/sendexev.c
cvs rdiff -u -r1.1.1.2.2.2 -r1.1.1.2.2.3 \
xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xorg-server/dist/dbe/dbe.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xorg-server/dist/dix/dispatch.c
cvs rdiff -u -r1.1.1.2.2.2 -r1.1.1.2.2.3 \
xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \
xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c \
xsrc/external/mit/xorg-server/dist/glx/glxserver.h \
xsrc/external/mit/xorg-server/dist/glx/indirect_program.c \
xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c \
xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h \
xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c \
xsrc/external/mit/xorg-server/dist/glx/indirect_util.c \
xsrc/external/mit/xorg-server/dist/glx/rensize.c \
xsrc/external/mit/xorg-server/dist/glx/single2.c \
xsrc/external/mit/xorg-server/dist/glx/single2swap.c \
xsrc/external/mit/xorg-server/dist/glx/singlepix.c \
xsrc/external/mit/xorg-server/dist/glx/singlepixswap.c \
xsrc/external/mit/xorg-server/dist/glx/swap_interval.c \
xsrc/external/mit/xorg-server/dist/glx/unpack.h
cvs rdiff -u -r1.1.1.2.2.2 -r1.1.1.2.2.3 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/dri2ext.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xorg-server/dist/include/dix.h \
xsrc/external/mit/xorg-server/dist/include/misc.h
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xorg-server/dist/os/access.c \
xsrc/external/mit/xorg-server/dist/os/rpcauth.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xorg-server/dist/randr/rrsdispatch.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xorg-server/dist/render/render.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xorg-server/dist/xfixes/select.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c
diff -u xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c:1.1.1.1.2.1 xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c:1.1.1.1.2.2
--- xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c:1.1.1.1.2.1 Thu Sep 17 03:34:49 2009
+++ xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c Tue Dec 9 19:55:10 2014
@@ -200,6 +200,7 @@ SProcXCMiscGetXIDList(client)
{
int n;
REQUEST(xXCMiscGetXIDListReq);
+REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
swaps(&stuff->length, n);
swapl(&stuff->count, n);
Index: xsrc/external/mit/xorg-server/d
CVS commit: [netbsd-5-2] xsrc/external/mit/xorg-server/dist
Module Name:xsrc
Committed By: snj
Date: Tue Dec 9 19:58:24 UTC 2014
Modified Files:
xsrc/external/mit/xorg-server/dist/Xext [netbsd-5-2]: xcmisc.c xvdisp.c
xsrc/external/mit/xorg-server/dist/Xi [netbsd-5-2]: chgdctl.c chgfctl.c
sendexev.c xiproperty.c
xsrc/external/mit/xorg-server/dist/dbe [netbsd-5-2]: dbe.c
xsrc/external/mit/xorg-server/dist/dix [netbsd-5-2]: dispatch.c
xsrc/external/mit/xorg-server/dist/glx [netbsd-5-2]: glxcmds.c
glxcmdsswap.c glxserver.h indirect_program.c indirect_reqsize.c
indirect_reqsize.h indirect_texture_compression.c indirect_util.c
rensize.c single2.c single2swap.c singlepix.c singlepixswap.c
swap_interval.c unpack.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2 [netbsd-5-2]:
dri2ext.c
xsrc/external/mit/xorg-server/dist/include [netbsd-5-2]: dix.h misc.h
xsrc/external/mit/xorg-server/dist/os [netbsd-5-2]: access.c rpcauth.c
xsrc/external/mit/xorg-server/dist/randr [netbsd-5-2]: rrsdispatch.c
xsrc/external/mit/xorg-server/dist/render [netbsd-5-2]: render.c
xsrc/external/mit/xorg-server/dist/xfixes [netbsd-5-2]: select.c
Log Message:
Apply patch (requested by mrg in ticket #1935):
apply fixes for X.Org Security Advisory: Dec. 9, 2014
Protocol handling issues in X Window System servers
included are fixes for:
denial of service due to unchecked malloc in client authentication
CVE-2014-8091
integer overflows calculating memory needs for requests
CVE-2014-8092
CVE-2014-8093
CVE-2014-8094
out of bounds access due to not validating length or offset values in requests
CVE-2014-8095
CVE-2014-8096
CVE-2014-8097
CVE-2014-8098
CVE-2014-8099
CVE-2014-8100
CVE-2014-8101
CVE-2014-8102
CVE-2014-8103
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.4.1 \
xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c \
xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.4.1 \
xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c \
xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c \
xsrc/external/mit/xorg-server/dist/Xi/sendexev.c
cvs rdiff -u -r1.1.1.2.2.2 -r1.1.1.2.2.2.4.1 \
xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.4.1 \
xsrc/external/mit/xorg-server/dist/dbe/dbe.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.4.1 \
xsrc/external/mit/xorg-server/dist/dix/dispatch.c
cvs rdiff -u -r1.1.1.2.2.2 -r1.1.1.2.2.2.4.1 \
xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.2.4.1 \
xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c \
xsrc/external/mit/xorg-server/dist/glx/glxserver.h \
xsrc/external/mit/xorg-server/dist/glx/indirect_program.c \
xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c \
xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h \
xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c \
xsrc/external/mit/xorg-server/dist/glx/indirect_util.c \
xsrc/external/mit/xorg-server/dist/glx/rensize.c \
xsrc/external/mit/xorg-server/dist/glx/single2.c \
xsrc/external/mit/xorg-server/dist/glx/single2swap.c \
xsrc/external/mit/xorg-server/dist/glx/singlepix.c \
xsrc/external/mit/xorg-server/dist/glx/singlepixswap.c \
xsrc/external/mit/xorg-server/dist/glx/swap_interval.c \
xsrc/external/mit/xorg-server/dist/glx/unpack.h
cvs rdiff -u -r1.1.1.2.2.2 -r1.1.1.2.2.2.4.1 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/dri2ext.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.4.1 \
xsrc/external/mit/xorg-server/dist/include/dix.h \
xsrc/external/mit/xorg-server/dist/include/misc.h
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.4.1 \
xsrc/external/mit/xorg-server/dist/os/access.c \
xsrc/external/mit/xorg-server/dist/os/rpcauth.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.4.1 \
xsrc/external/mit/xorg-server/dist/randr/rrsdispatch.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.4.1 \
xsrc/external/mit/xorg-server/dist/render/render.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.1.4.1 \
xsrc/external/mit/xorg-server/dist/xfixes/select.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c
diff -u xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c:1.1.1.1.2.1 xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c:1.1.1.1.2.1.4.1
--- xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c:1.1.1.1.2.1 Thu Sep 17 03:34:49 2009
+++ xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c Tue Dec 9 19:58:23 2014
@@ -200,6 +200,7 @@ SProcXCMiscGetXIDList(client)
{
int n;
REQUEST(xXCMiscGetXIDListReq);
+REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
swaps(&stuff->le
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: snj Date: Tue Dec 9 19:50:52 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: 1208 To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 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.12 src/doc/CHANGES-6.1.6:1.1.2.13 --- src/doc/CHANGES-6.1.6:1.1.2.12 Wed Dec 3 13:04:32 2014 +++ src/doc/CHANGES-6.1.6 Tue Dec 9 19:50:52 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.12 2014/12/03 13:04:32 msaitoh Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.13 2014/12/09 19:50:52 snj Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -238,3 +238,79 @@ sys/dev/ppbus/ppbus_base.c 1.20 Fix debugging format in ppbus(4) reported by John D. Baker. Fixes PR/49281. [snj, ticket #1190] + +xsrc/external/mit/xorg-server/dist/configurepatch +xsrc/external/mit/xorg-server/dist/configure.ac patch +xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c patch +xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c patch +xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c patch +xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c patch +xsrc/external/mit/xorg-server/dist/Xi/sendexev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiallowev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xichangecursor.c patch +xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c patch +xsrc/external/mit/xorg-server/dist/Xi/xigetclientpointer.c patch +xsrc/external/mit/xorg-server/dist/Xi/xigrabdev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiquerydevice.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiquerypointer.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiselectev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xisetclientpointer.c patch +xsrc/external/mit/xorg-server/dist/Xi/xisetdevfocus.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiwarppointer.c patch +xsrc/external/mit/xorg-server/dist/dbe/dbe.cpatch +xsrc/external/mit/xorg-server/dist/dix/dispatch.c patch +xsrc/external/mit/xorg-server/dist/dix/region.c patch +xsrc/external/mit/xorg-server/dist/glx/glxcmds.c patch +xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c patch +xsrc/external/mit/xorg-server/dist/glx/glxserver.h patch +xsrc/external/mit/xorg-server/dist/glx/indirect_program.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h patch +xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_util.c patch +xsrc/external/mit/xorg-server/dist/glx/rensize.c patch +xsrc/external/mit/xorg-server/dist/glx/single2.c patch +xsrc/external/mit/xorg-server/dist/glx/single2swap.c patch +xsrc/external/mit/xorg-server/dist/glx/singlepix.c patch +xsrc/external/mit/xorg-server/dist/glx/singlepixswap.c patch +xsrc/external/mit/xorg-server/dist/glx/swap_interval.c patch +xsrc/external/mit/xorg-server/dist/glx/unpack.h patch +xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/dri2ext.c patch +xsrc/external/mit/xorg-server/dist/include/dix.h patch +xsrc/external/mit/xorg-server/dist/include/regionstr.h patch +xsrc/external/mit/xorg-server/dist/os/access.c patch +xsrc/external/mit/xorg-server/dist/os/rpcauth.c patch +xsrc/external/mit/xorg-server/dist/randr/rrsdispatch.c patch +xsrc/external/mit/xorg-server/dist/render/render.c patch +xsrc/external/mit/xorg-server/dist/test/Makefile.am patch +xsrc/external/mit/xorg-server/dist/test/xi1/Makefile.am patch +xsrc/external/mit/xorg-server/dist/test/xi1/protocol-xchangedevicecontrol.c patch +xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xigetclientpointer.c patch +xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c patch +xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c patch +xsrc/external/mit/xorg-server/dist/xfixes/select.c patch + + apply fixes for X.Org Security Advisory: Dec. 9, 2014 + Protocol handling issues in X Window System servers + included are fixes for: + denial of service due to unchecked malloc in client authentication + CVE-2014-8091 + integer overflows calculating memory needs for requests + CVE-2014-8092 + CVE-2014-8093 + CVE-2014-8094 + out of bounds access due to not validating length or offset values + in requests + CVE-2014-8095 + CVE-2014-8096 + CVE-2014-8097 + CVE-2014-8098 + CVE-2014-8099 + CVE-2014-8100 + CVE-2014-8101 + CVE-2014-8102 + CVE-2014-8103 + [mrg, ticket #1208] +
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: snj Date: Tue Dec 9 19:49:31 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: 1208 To generate a diff of this commit: cvs rdiff -u -r1.1.2.161 -r1.1.2.162 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.161 src/doc/CHANGES-6.2:1.1.2.162 --- src/doc/CHANGES-6.2:1.1.2.161 Sun Dec 7 16:44:14 2014 +++ src/doc/CHANGES-6.2 Tue Dec 9 19:49:31 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.161 2014/12/07 16:44:14 martin Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.162 2014/12/09 19:49:31 snj Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -278,7 +278,7 @@ sys/netinet6/nd6.h1.57 via patch sys/netinet6/nd6_rtr.c1.83,1.84 via patch 4 new sysctls to avoid ipv6 DoS attacks from OpenBSD. -Fix potentially uninitialised variable. + Fix potentially uninitialised variable. [christos, ticket #905] sys/dev/pci/pcidevs1.1145, 1.1147, 1.1150-1.1158 @@ -4677,3 +4677,79 @@ sys/dev/pci/if_bnxvar.h1.4-1.6 - Print some information (ASCI revision, PCI status, etc). From FreeBSD. [msaitoh, #1207] + +xsrc/external/mit/xorg-server/dist/configurepatch +xsrc/external/mit/xorg-server/dist/configure.ac patch +xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c patch +xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c patch +xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c patch +xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c patch +xsrc/external/mit/xorg-server/dist/Xi/sendexev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiallowev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xichangecursor.c patch +xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c patch +xsrc/external/mit/xorg-server/dist/Xi/xigetclientpointer.c patch +xsrc/external/mit/xorg-server/dist/Xi/xigrabdev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiquerydevice.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiquerypointer.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiselectev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xisetclientpointer.c patch +xsrc/external/mit/xorg-server/dist/Xi/xisetdevfocus.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiwarppointer.c patch +xsrc/external/mit/xorg-server/dist/dbe/dbe.cpatch +xsrc/external/mit/xorg-server/dist/dix/dispatch.c patch +xsrc/external/mit/xorg-server/dist/dix/region.c patch +xsrc/external/mit/xorg-server/dist/glx/glxcmds.c patch +xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c patch +xsrc/external/mit/xorg-server/dist/glx/glxserver.h patch +xsrc/external/mit/xorg-server/dist/glx/indirect_program.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h patch +xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_util.c patch +xsrc/external/mit/xorg-server/dist/glx/rensize.c patch +xsrc/external/mit/xorg-server/dist/glx/single2.c patch +xsrc/external/mit/xorg-server/dist/glx/single2swap.c patch +xsrc/external/mit/xorg-server/dist/glx/singlepix.c patch +xsrc/external/mit/xorg-server/dist/glx/singlepixswap.c patch +xsrc/external/mit/xorg-server/dist/glx/swap_interval.c patch +xsrc/external/mit/xorg-server/dist/glx/unpack.h patch +xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/dri2ext.c patch +xsrc/external/mit/xorg-server/dist/include/dix.h patch +xsrc/external/mit/xorg-server/dist/include/regionstr.h patch +xsrc/external/mit/xorg-server/dist/os/access.c patch +xsrc/external/mit/xorg-server/dist/os/rpcauth.c patch +xsrc/external/mit/xorg-server/dist/randr/rrsdispatch.c patch +xsrc/external/mit/xorg-server/dist/render/render.c patch +xsrc/external/mit/xorg-server/dist/test/Makefile.am patch +xsrc/external/mit/xorg-server/dist/test/xi1/Makefile.am patch +xsrc/external/mit/xorg-server/dist/test/xi1/protocol-xchangedevicecontrol.c patch +xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xigetclientpointer.c patch +xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c patch +xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c patch +xsrc/external/mit/xorg-server/dist/xfixes/select.c patch + + apply fixes for X.Org Security Advisory: Dec. 9, 2014 + Protocol handling issues in X Window System servers + included are fixes for: + denial of service due to unchecked malloc in client authentication + CVE-2014-8091 + integer overflows calculating memory needs for requests + CVE-2014-8092 + CVE-2014-8093 + CVE-2014-8094 + out of bounds access due to not validating length or offset values + in requests + CVE-2014-8095 + CVE-2014-8096 + CVE-2014-8097 + CVE-2014-8098 + CVE-2014-8099 + CVE-2014-8100
CVS commit: [netbsd-6-0] xsrc/external/mit/xorg-server/dist
Module Name:xsrc Committed By: snj Date: Tue Dec 9 19:44:42 UTC 2014 Modified Files: xsrc/external/mit/xorg-server/dist [netbsd-6-0]: configure configure.ac xsrc/external/mit/xorg-server/dist/Xext [netbsd-6-0]: xcmisc.c xvdisp.c xsrc/external/mit/xorg-server/dist/Xi [netbsd-6-0]: chgdctl.c chgfctl.c sendexev.c xiallowev.c xichangecursor.c xichangehierarchy.c xigetclientpointer.c xigrabdev.c xipassivegrab.c xiproperty.c xiquerydevice.c xiquerypointer.c xiselectev.c xisetclientpointer.c xisetdevfocus.c xiwarppointer.c xsrc/external/mit/xorg-server/dist/dbe [netbsd-6-0]: dbe.c xsrc/external/mit/xorg-server/dist/dix [netbsd-6-0]: dispatch.c region.c xsrc/external/mit/xorg-server/dist/glx [netbsd-6-0]: glxcmds.c glxcmdsswap.c glxserver.h indirect_program.c indirect_reqsize.c indirect_reqsize.h indirect_texture_compression.c indirect_util.c rensize.c single2.c single2swap.c singlepix.c singlepixswap.c swap_interval.c unpack.h xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2 [netbsd-6-0]: dri2ext.c xsrc/external/mit/xorg-server/dist/include [netbsd-6-0]: dix.h regionstr.h xsrc/external/mit/xorg-server/dist/os [netbsd-6-0]: access.c rpcauth.c xsrc/external/mit/xorg-server/dist/randr [netbsd-6-0]: rrsdispatch.c xsrc/external/mit/xorg-server/dist/render [netbsd-6-0]: render.c xsrc/external/mit/xorg-server/dist/test [netbsd-6-0]: Makefile.am xsrc/external/mit/xorg-server/dist/test/xi2 [netbsd-6-0]: protocol-xigetclientpointer.c protocol-xiquerypointer.c protocol-xiwarppointer.c xsrc/external/mit/xorg-server/dist/xfixes [netbsd-6-0]: select.c Added Files: xsrc/external/mit/xorg-server/dist/test/xi1 [netbsd-6-0]: Makefile.am protocol-xchangedevicecontrol.c Log Message: Apply patch (requested by mrg in ticket #1208): apply fixes for X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers included are fixes for: denial of service due to unchecked malloc in client authentication CVE-2014-8091 integer overflows calculating memory needs for requests CVE-2014-8092 CVE-2014-8093 CVE-2014-8094 out of bounds access due to not validating length or offset values in requests CVE-2014-8095 CVE-2014-8096 CVE-2014-8097 CVE-2014-8098 CVE-2014-8099 CVE-2014-8100 CVE-2014-8101 CVE-2014-8102 CVE-2014-8103 To generate a diff of this commit: cvs rdiff -u -r1.1.1.8 -r1.1.1.8.4.1 \ xsrc/external/mit/xorg-server/dist/configure \ xsrc/external/mit/xorg-server/dist/configure.ac cvs rdiff -u -r1.1.1.4 -r1.1.1.4.4.1 \ xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c cvs rdiff -u -r1.3 -r1.3.4.1 xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \ xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c \ xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c \ xsrc/external/mit/xorg-server/dist/Xi/sendexev.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ xsrc/external/mit/xorg-server/dist/Xi/xiallowev.c \ xsrc/external/mit/xorg-server/dist/Xi/xichangecursor.c \ xsrc/external/mit/xorg-server/dist/Xi/xigetclientpointer.c \ xsrc/external/mit/xorg-server/dist/Xi/xisetclientpointer.c \ xsrc/external/mit/xorg-server/dist/Xi/xisetdevfocus.c cvs rdiff -u -r1.1.1.2 -r1.1.1.2.4.1 \ xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c \ xsrc/external/mit/xorg-server/dist/Xi/xigrabdev.c \ xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c \ xsrc/external/mit/xorg-server/dist/Xi/xiquerydevice.c \ xsrc/external/mit/xorg-server/dist/Xi/xiquerypointer.c \ xsrc/external/mit/xorg-server/dist/Xi/xiselectev.c \ xsrc/external/mit/xorg-server/dist/Xi/xiwarppointer.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.4.1 \ xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.4.1 \ xsrc/external/mit/xorg-server/dist/dbe/dbe.c cvs rdiff -u -r1.1.1.6 -r1.1.1.6.4.1 \ xsrc/external/mit/xorg-server/dist/dix/dispatch.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ xsrc/external/mit/xorg-server/dist/dix/region.c cvs rdiff -u -r1.6 -r1.6.4.1 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \ xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c \ xsrc/external/mit/xorg-server/dist/glx/glxserver.h \ xsrc/external/mit/xorg-server/dist/glx/single2.c \ xsrc/external/mit/xorg-server/dist/glx/unpack.h cvs rdiff -u -r1.1.1.2 -r1.1.1.2.4.1 \ xsrc/external/mit/xorg-server/dist/glx/indirect_program.c \ xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c \ xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h \ xsrc/external/mit/xorg-server/dist/glx/indirect_texture_comp
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: snj Date: Tue Dec 9 19:50:15 UTC 2014 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: 1208 To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-6.0.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.7 diff -u src/doc/CHANGES-6.0.7:1.1.2.12 src/doc/CHANGES-6.0.7:1.1.2.13 --- src/doc/CHANGES-6.0.7:1.1.2.12 Wed Dec 3 13:04:48 2014 +++ src/doc/CHANGES-6.0.7 Tue Dec 9 19:50:15 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.7,v 1.1.2.12 2014/12/03 13:04:48 msaitoh Exp $ +# $NetBSD: CHANGES-6.0.7,v 1.1.2.13 2014/12/09 19:50:15 snj Exp $ A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7 release: @@ -238,3 +238,79 @@ sys/dev/ppbus/ppbus_base.c 1.20 Fix debugging format in ppbus(4) reported by John D. Baker. Fixes PR/49281. [snj, ticket #1190] + +xsrc/external/mit/xorg-server/dist/configurepatch +xsrc/external/mit/xorg-server/dist/configure.ac patch +xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c patch +xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c patch +xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c patch +xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c patch +xsrc/external/mit/xorg-server/dist/Xi/sendexev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiallowev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xichangecursor.c patch +xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c patch +xsrc/external/mit/xorg-server/dist/Xi/xigetclientpointer.c patch +xsrc/external/mit/xorg-server/dist/Xi/xigrabdev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiquerydevice.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiquerypointer.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiselectev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xisetclientpointer.c patch +xsrc/external/mit/xorg-server/dist/Xi/xisetdevfocus.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiwarppointer.c patch +xsrc/external/mit/xorg-server/dist/dbe/dbe.cpatch +xsrc/external/mit/xorg-server/dist/dix/dispatch.c patch +xsrc/external/mit/xorg-server/dist/dix/region.c patch +xsrc/external/mit/xorg-server/dist/glx/glxcmds.c patch +xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c patch +xsrc/external/mit/xorg-server/dist/glx/glxserver.h patch +xsrc/external/mit/xorg-server/dist/glx/indirect_program.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h patch +xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_util.c patch +xsrc/external/mit/xorg-server/dist/glx/rensize.c patch +xsrc/external/mit/xorg-server/dist/glx/single2.c patch +xsrc/external/mit/xorg-server/dist/glx/single2swap.c patch +xsrc/external/mit/xorg-server/dist/glx/singlepix.c patch +xsrc/external/mit/xorg-server/dist/glx/singlepixswap.c patch +xsrc/external/mit/xorg-server/dist/glx/swap_interval.c patch +xsrc/external/mit/xorg-server/dist/glx/unpack.h patch +xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/dri2ext.c patch +xsrc/external/mit/xorg-server/dist/include/dix.h patch +xsrc/external/mit/xorg-server/dist/include/regionstr.h patch +xsrc/external/mit/xorg-server/dist/os/access.c patch +xsrc/external/mit/xorg-server/dist/os/rpcauth.c patch +xsrc/external/mit/xorg-server/dist/randr/rrsdispatch.c patch +xsrc/external/mit/xorg-server/dist/render/render.c patch +xsrc/external/mit/xorg-server/dist/test/Makefile.am patch +xsrc/external/mit/xorg-server/dist/test/xi1/Makefile.am patch +xsrc/external/mit/xorg-server/dist/test/xi1/protocol-xchangedevicecontrol.c patch +xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xigetclientpointer.c patch +xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c patch +xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c patch +xsrc/external/mit/xorg-server/dist/xfixes/select.c patch + + apply fixes for X.Org Security Advisory: Dec. 9, 2014 + Protocol handling issues in X Window System servers + included are fixes for: + denial of service due to unchecked malloc in client authentication + CVE-2014-8091 + integer overflows calculating memory needs for requests + CVE-2014-8092 + CVE-2014-8093 + CVE-2014-8094 + out of bounds access due to not validating length or offset values + in requests + CVE-2014-8095 + CVE-2014-8096 + CVE-2014-8097 + CVE-2014-8098 + CVE-2014-8099 + CVE-2014-8100 + CVE-2014-8101 + CVE-2014-8102 + CVE-2014-8103 + [mrg, ticket #1208] +
CVS commit: [netbsd-6-1] xsrc/external/mit/xorg-server/dist
Module Name:xsrc Committed By: snj Date: Tue Dec 9 19:46:21 UTC 2014 Modified Files: xsrc/external/mit/xorg-server/dist [netbsd-6-1]: configure configure.ac xsrc/external/mit/xorg-server/dist/Xext [netbsd-6-1]: xcmisc.c xvdisp.c xsrc/external/mit/xorg-server/dist/Xi [netbsd-6-1]: chgdctl.c chgfctl.c sendexev.c xiallowev.c xichangecursor.c xichangehierarchy.c xigetclientpointer.c xigrabdev.c xipassivegrab.c xiproperty.c xiquerydevice.c xiquerypointer.c xiselectev.c xisetclientpointer.c xisetdevfocus.c xiwarppointer.c xsrc/external/mit/xorg-server/dist/dbe [netbsd-6-1]: dbe.c xsrc/external/mit/xorg-server/dist/dix [netbsd-6-1]: dispatch.c region.c xsrc/external/mit/xorg-server/dist/glx [netbsd-6-1]: glxcmds.c glxcmdsswap.c glxserver.h indirect_program.c indirect_reqsize.c indirect_reqsize.h indirect_texture_compression.c indirect_util.c rensize.c single2.c single2swap.c singlepix.c singlepixswap.c swap_interval.c unpack.h xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2 [netbsd-6-1]: dri2ext.c xsrc/external/mit/xorg-server/dist/include [netbsd-6-1]: dix.h regionstr.h xsrc/external/mit/xorg-server/dist/os [netbsd-6-1]: access.c rpcauth.c xsrc/external/mit/xorg-server/dist/randr [netbsd-6-1]: rrsdispatch.c xsrc/external/mit/xorg-server/dist/render [netbsd-6-1]: render.c xsrc/external/mit/xorg-server/dist/test [netbsd-6-1]: Makefile.am xsrc/external/mit/xorg-server/dist/test/xi2 [netbsd-6-1]: protocol-xigetclientpointer.c protocol-xiquerypointer.c protocol-xiwarppointer.c xsrc/external/mit/xorg-server/dist/xfixes [netbsd-6-1]: select.c Added Files: xsrc/external/mit/xorg-server/dist/test/xi1 [netbsd-6-1]: Makefile.am protocol-xchangedevicecontrol.c Log Message: Apply patch (requested by mrg in ticket #1208): apply fixes for X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers included are fixes for: denial of service due to unchecked malloc in client authentication CVE-2014-8091 integer overflows calculating memory needs for requests CVE-2014-8092 CVE-2014-8093 CVE-2014-8094 out of bounds access due to not validating length or offset values in requests CVE-2014-8095 CVE-2014-8096 CVE-2014-8097 CVE-2014-8098 CVE-2014-8099 CVE-2014-8100 CVE-2014-8101 CVE-2014-8102 CVE-2014-8103 To generate a diff of this commit: cvs rdiff -u -r1.1.1.8 -r1.1.1.8.6.1 \ xsrc/external/mit/xorg-server/dist/configure \ xsrc/external/mit/xorg-server/dist/configure.ac cvs rdiff -u -r1.1.1.4 -r1.1.1.4.6.1 \ xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c cvs rdiff -u -r1.3 -r1.3.6.1 xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.6.1 \ xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c \ xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c \ xsrc/external/mit/xorg-server/dist/Xi/sendexev.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \ xsrc/external/mit/xorg-server/dist/Xi/xiallowev.c \ xsrc/external/mit/xorg-server/dist/Xi/xichangecursor.c \ xsrc/external/mit/xorg-server/dist/Xi/xigetclientpointer.c \ xsrc/external/mit/xorg-server/dist/Xi/xisetclientpointer.c \ xsrc/external/mit/xorg-server/dist/Xi/xisetdevfocus.c cvs rdiff -u -r1.1.1.2 -r1.1.1.2.6.1 \ xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c \ xsrc/external/mit/xorg-server/dist/Xi/xigrabdev.c \ xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c \ xsrc/external/mit/xorg-server/dist/Xi/xiquerydevice.c \ xsrc/external/mit/xorg-server/dist/Xi/xiquerypointer.c \ xsrc/external/mit/xorg-server/dist/Xi/xiselectev.c \ xsrc/external/mit/xorg-server/dist/Xi/xiwarppointer.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.6.1 \ xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.6.1 \ xsrc/external/mit/xorg-server/dist/dbe/dbe.c cvs rdiff -u -r1.1.1.6 -r1.1.1.6.6.1 \ xsrc/external/mit/xorg-server/dist/dix/dispatch.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \ xsrc/external/mit/xorg-server/dist/dix/region.c cvs rdiff -u -r1.6 -r1.6.6.1 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.6.1 \ xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c \ xsrc/external/mit/xorg-server/dist/glx/glxserver.h \ xsrc/external/mit/xorg-server/dist/glx/single2.c \ xsrc/external/mit/xorg-server/dist/glx/unpack.h cvs rdiff -u -r1.1.1.2 -r1.1.1.2.6.1 \ xsrc/external/mit/xorg-server/dist/glx/indirect_program.c \ xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c \ xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h \ xsrc/external/mit/xorg-server/dist/glx/indirect_texture_comp
CVS commit: [netbsd-6] xsrc/external/mit/xorg-server/dist
Module Name:xsrc Committed By: snj Date: Tue Dec 9 19:43:13 UTC 2014 Modified Files: xsrc/external/mit/xorg-server/dist [netbsd-6]: configure configure.ac xsrc/external/mit/xorg-server/dist/Xext [netbsd-6]: xcmisc.c xvdisp.c xsrc/external/mit/xorg-server/dist/Xi [netbsd-6]: chgdctl.c chgfctl.c sendexev.c xiallowev.c xichangecursor.c xichangehierarchy.c xigetclientpointer.c xigrabdev.c xipassivegrab.c xiproperty.c xiquerydevice.c xiquerypointer.c xiselectev.c xisetclientpointer.c xisetdevfocus.c xiwarppointer.c xsrc/external/mit/xorg-server/dist/dbe [netbsd-6]: dbe.c xsrc/external/mit/xorg-server/dist/dix [netbsd-6]: dispatch.c region.c xsrc/external/mit/xorg-server/dist/glx [netbsd-6]: glxcmds.c glxcmdsswap.c glxserver.h indirect_program.c indirect_reqsize.c indirect_reqsize.h indirect_texture_compression.c indirect_util.c rensize.c single2.c single2swap.c singlepix.c singlepixswap.c swap_interval.c unpack.h xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2 [netbsd-6]: dri2ext.c xsrc/external/mit/xorg-server/dist/include [netbsd-6]: dix.h regionstr.h xsrc/external/mit/xorg-server/dist/os [netbsd-6]: access.c rpcauth.c xsrc/external/mit/xorg-server/dist/randr [netbsd-6]: rrsdispatch.c xsrc/external/mit/xorg-server/dist/render [netbsd-6]: render.c xsrc/external/mit/xorg-server/dist/test [netbsd-6]: Makefile.am xsrc/external/mit/xorg-server/dist/test/xi2 [netbsd-6]: protocol-xigetclientpointer.c protocol-xiquerypointer.c protocol-xiwarppointer.c xsrc/external/mit/xorg-server/dist/xfixes [netbsd-6]: select.c Added Files: xsrc/external/mit/xorg-server/dist/test/xi1 [netbsd-6]: Makefile.am protocol-xchangedevicecontrol.c Log Message: Apply patch (requested by mrg in ticket #1208): apply fixes for X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers included are fixes for: denial of service due to unchecked malloc in client authentication CVE-2014-8091 integer overflows calculating memory needs for requests CVE-2014-8092 CVE-2014-8093 CVE-2014-8094 out of bounds access due to not validating length or offset values in requests CVE-2014-8095 CVE-2014-8096 CVE-2014-8097 CVE-2014-8098 CVE-2014-8099 CVE-2014-8100 CVE-2014-8101 CVE-2014-8102 CVE-2014-8103 To generate a diff of this commit: cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 \ xsrc/external/mit/xorg-server/dist/configure \ xsrc/external/mit/xorg-server/dist/configure.ac cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \ xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c cvs rdiff -u -r1.3 -r1.3.2.1 xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.2.1 \ xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c \ xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c \ xsrc/external/mit/xorg-server/dist/Xi/sendexev.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \ xsrc/external/mit/xorg-server/dist/Xi/xiallowev.c \ xsrc/external/mit/xorg-server/dist/Xi/xichangecursor.c \ xsrc/external/mit/xorg-server/dist/Xi/xigetclientpointer.c \ xsrc/external/mit/xorg-server/dist/Xi/xisetclientpointer.c \ xsrc/external/mit/xorg-server/dist/Xi/xisetdevfocus.c cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \ xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c \ xsrc/external/mit/xorg-server/dist/Xi/xigrabdev.c \ xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c \ xsrc/external/mit/xorg-server/dist/Xi/xiquerydevice.c \ xsrc/external/mit/xorg-server/dist/Xi/xiquerypointer.c \ xsrc/external/mit/xorg-server/dist/Xi/xiselectev.c \ xsrc/external/mit/xorg-server/dist/Xi/xiwarppointer.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \ xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \ xsrc/external/mit/xorg-server/dist/dbe/dbe.c cvs rdiff -u -r1.1.1.6 -r1.1.1.6.2.1 \ xsrc/external/mit/xorg-server/dist/dix/dispatch.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \ xsrc/external/mit/xorg-server/dist/dix/region.c cvs rdiff -u -r1.6 -r1.6.2.1 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.2.1 \ xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c \ xsrc/external/mit/xorg-server/dist/glx/glxserver.h \ xsrc/external/mit/xorg-server/dist/glx/single2.c \ xsrc/external/mit/xorg-server/dist/glx/unpack.h cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \ xsrc/external/mit/xorg-server/dist/glx/indirect_program.c \ xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c \ xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h \ xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c \ xsrc/external/mit/xorg-ser
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Tue Dec 9 19:39:58 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 308 To generate a diff of this commit: cvs rdiff -u -r1.1.2.123 -r1.1.2.124 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.123 src/doc/CHANGES-7.0:1.1.2.124 --- src/doc/CHANGES-7.0:1.1.2.123 Tue Dec 9 19:31:06 2014 +++ src/doc/CHANGES-7.0 Tue Dec 9 19:39:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.123 2014/12/09 19:31:06 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.124 2014/12/09 19:39:58 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -3278,3 +3278,78 @@ external/gpl3/gdb/dist/gdb/amd64nbsd-tde live in their own lwp [chs, ticket #302] +xsrc/external/mit/xorg-server/dist/configurepatch +xsrc/external/mit/xorg-server/dist/configure.ac patch +xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c patch +xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c patch +xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c patch +xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c patch +xsrc/external/mit/xorg-server/dist/Xi/sendexev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiallowev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xichangecursor.c patch +xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c patch +xsrc/external/mit/xorg-server/dist/Xi/xigetclientpointer.c patch +xsrc/external/mit/xorg-server/dist/Xi/xigrabdev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiquerydevice.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiquerypointer.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiselectev.c patch +xsrc/external/mit/xorg-server/dist/Xi/xisetclientpointer.c patch +xsrc/external/mit/xorg-server/dist/Xi/xisetdevfocus.c patch +xsrc/external/mit/xorg-server/dist/Xi/xiwarppointer.c patch +xsrc/external/mit/xorg-server/dist/dbe/dbe.cpatch +xsrc/external/mit/xorg-server/dist/dix/dispatch.c patch +xsrc/external/mit/xorg-server/dist/dix/region.c patch +xsrc/external/mit/xorg-server/dist/glx/glxcmds.c patch +xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c patch +xsrc/external/mit/xorg-server/dist/glx/glxserver.h patch +xsrc/external/mit/xorg-server/dist/glx/indirect_program.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h patch +xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c patch +xsrc/external/mit/xorg-server/dist/glx/indirect_util.c patch +xsrc/external/mit/xorg-server/dist/glx/rensize.c patch +xsrc/external/mit/xorg-server/dist/glx/single2.c patch +xsrc/external/mit/xorg-server/dist/glx/single2swap.c patch +xsrc/external/mit/xorg-server/dist/glx/singlepix.c patch +xsrc/external/mit/xorg-server/dist/glx/singlepixswap.c patch +xsrc/external/mit/xorg-server/dist/glx/swap_interval.c patch +xsrc/external/mit/xorg-server/dist/glx/unpack.h patch +xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2/dri2ext.c patch +xsrc/external/mit/xorg-server/dist/include/dix.h patch +xsrc/external/mit/xorg-server/dist/include/regionstr.h patch +xsrc/external/mit/xorg-server/dist/os/access.c patch +xsrc/external/mit/xorg-server/dist/os/rpcauth.c patch +xsrc/external/mit/xorg-server/dist/randr/rrsdispatch.c patch +xsrc/external/mit/xorg-server/dist/render/render.c patch +xsrc/external/mit/xorg-server/dist/test/Makefile.am patch +xsrc/external/mit/xorg-server/dist/test/xi1/Makefile.am patch +xsrc/external/mit/xorg-server/dist/test/xi1/protocol-xchangedevicecontrol.c patch +xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xigetclientpointer.c patch +xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c patch +xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c patch +xsrc/external/mit/xorg-server/dist/xfixes/select.c patch + + apply fixes for X.Org Security Advisory: Dec. 9, 2014 + Protocol handling issues in X Window System servers + included are fixes for: + denial of service due to unchecked malloc in client authentication + CVE-2014-8091 + integer overflows calculating memory needs for requests + CVE-2014-8092 + CVE-2014-8093 + CVE-2014-8094 + out of bounds access due to not validating length or offset values + in requests + CVE-2014-8095 + CVE-2014-8096 + CVE-2014-8097 + CVE-2014-8098 + CVE-2014-8099 + CVE-2014-8100 + CVE-2014-8101 + CVE-2014-8102 + CVE-2014-8103 + [mrg, ticket #308] +
CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist
Module Name:xsrc Committed By: snj Date: Tue Dec 9 19:36:58 UTC 2014 Modified Files: xsrc/external/mit/xorg-server/dist [netbsd-7]: configure configure.ac xsrc/external/mit/xorg-server/dist/Xext [netbsd-7]: xcmisc.c xvdisp.c xsrc/external/mit/xorg-server/dist/Xi [netbsd-7]: chgdctl.c chgfctl.c sendexev.c xiallowev.c xichangecursor.c xichangehierarchy.c xigetclientpointer.c xigrabdev.c xipassivegrab.c xiproperty.c xiquerydevice.c xiquerypointer.c xiselectev.c xisetclientpointer.c xisetdevfocus.c xiwarppointer.c xsrc/external/mit/xorg-server/dist/dbe [netbsd-7]: dbe.c xsrc/external/mit/xorg-server/dist/dix [netbsd-7]: dispatch.c region.c xsrc/external/mit/xorg-server/dist/glx [netbsd-7]: glxcmds.c glxcmdsswap.c glxserver.h indirect_program.c indirect_reqsize.c indirect_reqsize.h indirect_texture_compression.c indirect_util.c rensize.c single2.c single2swap.c singlepix.c singlepixswap.c swap_interval.c unpack.h xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2 [netbsd-7]: dri2ext.c xsrc/external/mit/xorg-server/dist/include [netbsd-7]: dix.h regionstr.h xsrc/external/mit/xorg-server/dist/os [netbsd-7]: access.c rpcauth.c xsrc/external/mit/xorg-server/dist/randr [netbsd-7]: rrsdispatch.c xsrc/external/mit/xorg-server/dist/render [netbsd-7]: render.c xsrc/external/mit/xorg-server/dist/test [netbsd-7]: Makefile.am xsrc/external/mit/xorg-server/dist/test/xi2 [netbsd-7]: protocol-xigetclientpointer.c protocol-xiquerypointer.c protocol-xiwarppointer.c xsrc/external/mit/xorg-server/dist/xfixes [netbsd-7]: select.c Added Files: xsrc/external/mit/xorg-server/dist/test/xi1 [netbsd-7]: Makefile.am protocol-xchangedevicecontrol.c Log Message: Apply patch (requested by mrg in ticket #308): apply fixes for X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers included are fixes for: denial of service due to unchecked malloc in client authentication CVE-2014-8091 integer overflows calculating memory needs for requests CVE-2014-8092 CVE-2014-8093 CVE-2014-8094 out of bounds access due to not validating length or offset values in requests CVE-2014-8095 CVE-2014-8096 CVE-2014-8097 CVE-2014-8098 CVE-2014-8099 CVE-2014-8100 CVE-2014-8101 CVE-2014-8102 CVE-2014-8103 To generate a diff of this commit: cvs rdiff -u -r1.1.1.9 -r1.1.1.9.4.1 \ xsrc/external/mit/xorg-server/dist/configure \ xsrc/external/mit/xorg-server/dist/configure.ac cvs rdiff -u -r1.1.1.4 -r1.1.1.4.10.1 \ xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c cvs rdiff -u -r1.4 -r1.4.4.1 xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \ xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c \ xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c \ xsrc/external/mit/xorg-server/dist/Xi/sendexev.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.10.1 \ xsrc/external/mit/xorg-server/dist/Xi/xiallowev.c \ xsrc/external/mit/xorg-server/dist/Xi/xichangecursor.c \ xsrc/external/mit/xorg-server/dist/Xi/xigetclientpointer.c \ xsrc/external/mit/xorg-server/dist/Xi/xisetclientpointer.c \ xsrc/external/mit/xorg-server/dist/Xi/xisetdevfocus.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \ xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c \ xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c cvs rdiff -u -r1.1.1.2 -r1.1.1.2.10.1 \ xsrc/external/mit/xorg-server/dist/Xi/xigrabdev.c \ xsrc/external/mit/xorg-server/dist/Xi/xiquerydevice.c \ xsrc/external/mit/xorg-server/dist/Xi/xiquerypointer.c \ xsrc/external/mit/xorg-server/dist/Xi/xiselectev.c \ xsrc/external/mit/xorg-server/dist/Xi/xiwarppointer.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.10.1 \ xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c cvs rdiff -u -r1.1.1.4 -r1.1.1.4.10.1 \ xsrc/external/mit/xorg-server/dist/dbe/dbe.c cvs rdiff -u -r1.1.1.7 -r1.1.1.7.4.1 \ xsrc/external/mit/xorg-server/dist/dix/dispatch.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.10.1 \ xsrc/external/mit/xorg-server/dist/dix/region.c cvs rdiff -u -r1.6 -r1.6.10.1 \ xsrc/external/mit/xorg-server/dist/glx/glxcmds.c cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \ xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c \ xsrc/external/mit/xorg-server/dist/glx/glxserver.h \ xsrc/external/mit/xorg-server/dist/glx/single2.c \ xsrc/external/mit/xorg-server/dist/glx/unpack.h cvs rdiff -u -r1.1.1.2 -r1.1.1.2.10.1 \ xsrc/external/mit/xorg-server/dist/glx/indirect_program.c \ xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c \ xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h \ xsrc/external/mit/xorg-server/dist/glx/indirect_te
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Tue Dec 9 19:31:06 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #297 - #302 To generate a diff of this commit: cvs rdiff -u -r1.1.2.122 -r1.1.2.123 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.122 src/doc/CHANGES-7.0:1.1.2.123 --- src/doc/CHANGES-7.0:1.1.2.122 Sun Dec 7 14:34:38 2014 +++ src/doc/CHANGES-7.0 Tue Dec 9 19:31:06 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.122 2014/12/07 14:34:38 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.123 2014/12/09 19:31:06 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -3221,4 +3221,60 @@ tests/lib/libm/t_exp.c1.8 Kamada and Tetsuya Isaki for the analysis. [gson, ticket #296] +crypto/external/bsd/netpgp/bin/netpgpverify/Makefile 1.13 +crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd 1.2 +crypto/external/bsd/netpgp/dist/src/netpgpverify/libnetpgpverify.3 1.2 +crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c 1.5 +crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c 1.5 +crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c 1.2 +crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h 1.3 +crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c 1.2 +crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h 1.3 +crypto/external/bsd/netpgp/lib/verify/Makefile 1.7 +crypto/external/bsd/netpgp/lib/verify/config.h 1.1 + + Bring over the 20141204 portable version of netpgpverify from pkgsrc. + [agc, ticket #297] + +crypto/external/bsd/netpgp/Makefile 1.9 +crypto/external/bsd/netpgp/bin/hkpc/Makefile 1.3 +crypto/external/bsd/netpgp/bin/hkpd/Makefile 1.3 +crypto/external/bsd/netpgp/bin/netpgp/Makefile 1.3 +crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile 1.3 +crypto/external/bsd/netpgp/lib/Makefile 1.17 +crypto/external/bsd/netpgp/lib/netpgp/Makefile 1.2 (via patch) +crypto/external/bsd/netpgp/lib/netpgp/config.h 1.2 (via patch) +crypto/external/bsd/netpgp/lib/netpgp/shlib_version 1.2 (via patch) + + Set up the netpgp lib directory hierarchy a bit more logically: + - move libnetpgp to the same level as libnetpgpverify + - fix up all paths to the new directory structure + [agc, ticket #298] + +lib/librumpuser/rumpuser_sp.c 1.67 +sys/rump/librump/rumpkern/cons.c 1.4 +sys/rump/librump/rumpkern/rump.c 1.311 + + Fork newly connected rump kernel remote clients from proc1 instead of + creating a special process for that purpose. + [gson, ticket #299] + +sys/dev/ic/dwc_gmac.c1.29 + + If we dont have a mac address, make one up. + [jmcneill, ticket #300] + +sys/arch/arm/allwinner/awin_debe.c 1.12 +sys/arch/arm/allwinner/awin_reg.h 1.72 + + Set BGRA pixel sequence if __ARMEB__ is defined. + [jmcneill, ticket #301] + +external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c 1.11 + + - do not abort() if we read a zero cs or rip, or if we can't read + them + - end the backtrace when encountering a soft interrupt, since they + live in their own lwp + [chs, ticket #302]
CVS commit: xsrc/external/mit/xorg-server/dist
Module Name:xsrc Committed By: mrg Date: Tue Dec 9 19:26:19 UTC 2014 Modified Files: xsrc/external/mit/xorg-server/dist: configure configure.ac xsrc/external/mit/xorg-server/dist/Xext: xcmisc.c xvdisp.c xsrc/external/mit/xorg-server/dist/Xi: chgdctl.c chgfctl.c sendexev.c xiallowev.c xichangecursor.c xichangehierarchy.c xigetclientpointer.c xigrabdev.c xipassivegrab.c xiproperty.c xiquerydevice.c xiquerypointer.c xiselectev.c xisetclientpointer.c xisetdevfocus.c xiwarppointer.c xsrc/external/mit/xorg-server/dist/dbe: dbe.c xsrc/external/mit/xorg-server/dist/dix: dispatch.c region.c xsrc/external/mit/xorg-server/dist/glx: glxcmds.c glxcmdsswap.c glxserver.h indirect_program.c indirect_reqsize.c indirect_reqsize.h indirect_texture_compression.c indirect_util.c rensize.c single2.c single2swap.c singlepix.c singlepixswap.c swap_interval.c unpack.h xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2: dri2ext.c xsrc/external/mit/xorg-server/dist/include: dix.h regionstr.h xsrc/external/mit/xorg-server/dist/os: access.c rpcauth.c xsrc/external/mit/xorg-server/dist/randr: rrsdispatch.c xsrc/external/mit/xorg-server/dist/render: render.c xsrc/external/mit/xorg-server/dist/test: Makefile.am xsrc/external/mit/xorg-server/dist/test/xi2: protocol-xigetclientpointer.c protocol-xiquerypointer.c protocol-xiwarppointer.c xsrc/external/mit/xorg-server/dist/xfixes: select.c Added Files: xsrc/external/mit/xorg-server/dist/test/xi1: Makefile.am protocol-xchangedevicecontrol.c Log Message: apply fixes for: X.Org Security Advisory: Dec. 9, 2014 Protocol handling issues in X Window System servers backported to 1.10.x by myself. included are fixes for: denial of service due to unchecked malloc in client authentication CVE-2014-8091 integer overflows calculating memory needs for requests CVE-2014-8092 CVE-2014-8093 CVE-2014-8094 out of bounds access due to not validating length or offset values in requests CVE-2014-8095 CVE-2014-8096 CVE-2014-8097 CVE-2014-8098 CVE-2014-8099 CVE-2014-8100 CVE-2014-8101 CVE-2014-8102 CVE-2014-8103 To generate a diff of this commit: cvs rdiff -u -r1.1.1.9 -r1.2 xsrc/external/mit/xorg-server/dist/configure \ xsrc/external/mit/xorg-server/dist/configure.ac cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c \ xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c \ xsrc/external/mit/xorg-server/dist/Xi/sendexev.c \ xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c \ xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xorg-server/dist/Xi/xiallowev.c \ xsrc/external/mit/xorg-server/dist/Xi/xichangecursor.c \ xsrc/external/mit/xorg-server/dist/Xi/xigetclientpointer.c \ xsrc/external/mit/xorg-server/dist/Xi/xisetclientpointer.c \ xsrc/external/mit/xorg-server/dist/Xi/xisetdevfocus.c cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xorg-server/dist/Xi/xigrabdev.c \ xsrc/external/mit/xorg-server/dist/Xi/xiquerydevice.c \ xsrc/external/mit/xorg-server/dist/Xi/xiquerypointer.c \ xsrc/external/mit/xorg-server/dist/Xi/xiselectev.c \ xsrc/external/mit/xorg-server/dist/Xi/xiwarppointer.c cvs rdiff -u -r1.1.1.4 -r1.2 \ xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xorg-server/dist/dbe/dbe.c cvs rdiff -u -r1.1.1.7 -r1.2 \ xsrc/external/mit/xorg-server/dist/dix/dispatch.c cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xorg-server/dist/dix/region.c cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c \ xsrc/external/mit/xorg-server/dist/glx/glxserver.h \ xsrc/external/mit/xorg-server/dist/glx/single2.c \ xsrc/external/mit/xorg-server/dist/glx/unpack.h cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xorg-server/dist/glx/indirect_program.c \ xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c \ xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h \ xsrc/external/mit/xorg-server/dist/glx/indirect_texture_compression.c \ xsrc/external/mit/xorg-server/dist/glx/indirect_util.c \ xsrc/external/mit/xorg-server/dist/glx/rensize.c \ xsrc/external/mit/xorg-server/dist/glx/single2swap.c \ xsrc/external/mit/xorg-server/dist/glx/singlepix.c \ xsrc/external/mit/xorg-server/dist/glx/singlepixswap.c \ xsrc/external/mit/xorg-server/dist/glx/swap_inte
CVS commit: [netbsd-7] src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: martin
Date: Tue Dec 9 19:24:11 UTC 2014
Modified Files:
src/external/gpl3/gdb/dist/gdb [netbsd-7]: amd64nbsd-tdep.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #302):
external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c: revision 1.11
. do not abort() if we read a zero cs or rip, or if we can't read them
. end the backtrace when encountering a soft interrupt, since they live in
their own lwp
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 \
src/external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c:1.10 src/external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c:1.10.2.1
--- src/external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c:1.10 Sun Jun 22 23:52:57 2014
+++ src/external/gpl3/gdb/dist/gdb/amd64nbsd-tdep.c Tue Dec 9 19:24:11 2014
@@ -164,8 +164,6 @@ amd64nbsd_trapframe_cache(struct frame_i
+ amd64nbsd_tf_reg_offset[AMD64_CS_REGNUM], 8, byte_order);
rip = read_memory_unsigned_integer (addr
+ amd64nbsd_tf_reg_offset[AMD64_RIP_REGNUM], 8, byte_order);
- if (cs == 0 || rip == 0)
- abort();
/* The trap frame layout was changed lf the %rip value is less than 2^16 it
* is almost certainly the %ss of the old format. */
@@ -187,9 +185,10 @@ amd64nbsd_trapframe_cache(struct frame_i
}
}
- if ((cs & I386_SEL_RPL) == I386_SEL_UPL)
+ if ((cs & I386_SEL_RPL) == I386_SEL_UPL ||
+ (name && strncmp(name, "Xsoft", 5) == 0))
{
- /* Trap from user space; terminate backtrace. */
+ /* Trap from user space or soft interrupt; terminate backtrace. */
trad_frame_set_id (cache, outer_frame_id);
}
else
CVS commit: [netbsd-7] src/sys/arch/arm/allwinner
Module Name:src
Committed By: martin
Date: Tue Dec 9 19:21:09 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner [netbsd-7]: awin_debe.c awin_reg.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #301):
sys/arch/arm/allwinner/awin_reg.h: revision 1.72
sys/arch/arm/allwinner/awin_debe.c: revision 1.12
Set BGRA pixel sequence if __ARMEB__ is defined.
To generate a diff of this commit:
cvs rdiff -u -r1.6.2.5 -r1.6.2.6 src/sys/arch/arm/allwinner/awin_debe.c
cvs rdiff -u -r1.14.2.9 -r1.14.2.10 src/sys/arch/arm/allwinner/awin_reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_debe.c
diff -u src/sys/arch/arm/allwinner/awin_debe.c:1.6.2.5 src/sys/arch/arm/allwinner/awin_debe.c:1.6.2.6
--- src/sys/arch/arm/allwinner/awin_debe.c:1.6.2.5 Mon Dec 1 13:23:49 2014
+++ src/sys/arch/arm/allwinner/awin_debe.c Tue Dec 9 19:21:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_debe.c,v 1.6.2.5 2014/12/01 13:23:49 martin Exp $ */
+/* $NetBSD: awin_debe.c,v 1.6.2.6 2014/12/09 19:21:09 martin Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill
@@ -36,7 +36,7 @@
#define AWIN_DEBE_CURMAX 64
#include
-__KERNEL_RCSID(0, "$NetBSD: awin_debe.c,v 1.6.2.5 2014/12/01 13:23:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_debe.c,v 1.6.2.6 2014/12/09 19:21:09 martin Exp $");
#include
#include
@@ -473,6 +473,13 @@ awin_debe_set_videomode(const struct vid
AWIN_DEBE_ATTCTL1_LAY_FBFMT);
val &= ~AWIN_DEBE_ATTCTL1_LAY_BRSWAPEN;
val &= ~AWIN_DEBE_ATTCTL1_LAY_FBPS;
+#if __ARMEB__
+ val |= __SHIFTIN(AWIN_DEBE_ATTCTL1_LAY_FBPS_32BPP_BGRA,
+ AWIN_DEBE_ATTCTL1_LAY_FBPS);
+#else
+ val |= __SHIFTIN(AWIN_DEBE_ATTCTL1_LAY_FBPS_32BPP_ARGB,
+ AWIN_DEBE_ATTCTL1_LAY_FBPS);
+#endif
DEBE_WRITE(sc, AWIN_DEBE_ATTCTL1_REG, val);
val = DEBE_READ(sc, AWIN_DEBE_MODCTL_REG);
Index: src/sys/arch/arm/allwinner/awin_reg.h
diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.14.2.9 src/sys/arch/arm/allwinner/awin_reg.h:1.14.2.10
--- src/sys/arch/arm/allwinner/awin_reg.h:1.14.2.9 Thu Dec 4 11:08:38 2014
+++ src/sys/arch/arm/allwinner/awin_reg.h Tue Dec 9 19:21:09 2014
@@ -1710,6 +1710,8 @@ struct awin_mmc_idma_descriptor {
#define AWIN_DEBE_ATTCTL1_LAY_FBFMT_RGBA 13
#define AWIN_DEBE_ATTCTL1_LAY_BRSWAPEN __BIT(2)
#define AWIN_DEBE_ATTCTL1_LAY_FBPS __BITS(1,0)
+#define AWIN_DEBE_ATTCTL1_LAY_FBPS_32BPP_ARGB 0
+#define AWIN_DEBE_ATTCTL1_LAY_FBPS_32BPP_BGRA 2
#define AWIN_DEBE_REGBUFFCTL_REGAUTOLOAD_DIS __BIT(1)
#define AWIN_DEBE_REGBUFFCTL_REGLOADCTL __BIT(0)
CVS commit: [netbsd-7] src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Tue Dec 9 19:17:50 UTC 2014
Modified Files:
src/sys/dev/ic [netbsd-7]: dwc_gmac.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #300):
sys/dev/ic/dwc_gmac.c: revision 1.29
if we dont have a mac address, make one up
To generate a diff of this commit:
cvs rdiff -u -r1.24.2.3 -r1.24.2.4 src/sys/dev/ic/dwc_gmac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.24.2.3 src/sys/dev/ic/dwc_gmac.c:1.24.2.4
--- src/sys/dev/ic/dwc_gmac.c:1.24.2.3 Tue Nov 25 07:58:07 2014
+++ src/sys/dev/ic/dwc_gmac.c Tue Dec 9 19:17:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.24.2.3 2014/11/25 07:58:07 snj Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.24.2.4 2014/12/09 19:17:50 martin Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.24.2.3 2014/11/25 07:58:07 snj Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.24.2.4 2014/12/09 19:17:50 martin Exp $");
/* #define DWC_GMAC_DEBUG 1 */
@@ -53,6 +53,7 @@ __KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v
#include
#include
#include
+#include
#include
#include
@@ -162,9 +163,9 @@ dwc_gmac_attach(struct dwc_gmac_softc *s
AWIN_GMAC_MAC_ADDR0HI);
if (maclo == 0x && (machi & 0x) == 0x) {
- aprint_error_dev(sc->sc_dev,
- "couldn't read MAC address\n");
- return;
+ /* fake MAC address */
+ maclo = 0x00f2 | (cprng_strong32() << 16);
+ machi = cprng_strong32();
}
enaddr[0] = maclo & 0x0ff;
CVS commit: [netbsd-7] src
Module Name:src
Committed By: martin
Date: Tue Dec 9 19:14:27 UTC 2014
Modified Files:
src/lib/librumpuser [netbsd-7]: rumpuser_sp.c
src/sys/rump/librump/rumpkern [netbsd-7]: cons.c rump.c
Log Message:
Pull up following revision(s) (requested by gson in ticket #299):
sys/rump/librump/rumpkern/cons.c: revision 1.4
sys/rump/librump/rumpkern/rump.c: revision 1.311
lib/librumpuser/rumpuser_sp.c: revision 1.67
No longer create a special process context to fork remote clients off
of, simply always rfork off of proc1 closing all descriptors, and have
the rump kernel open 0/1/2 if the parent process is "1".
Fixes tests/rump/rumpkernel/t_sp, which was failing since the
abovementioned special process change due to attempting to deliver a
signal to the special process and the special process was not equipped
to handle one.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.66.2.1 src/lib/librumpuser/rumpuser_sp.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/rump/librump/rumpkern/cons.c
cvs rdiff -u -r1.308.2.1 -r1.308.2.2 src/sys/rump/librump/rumpkern/rump.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/librumpuser/rumpuser_sp.c
diff -u src/lib/librumpuser/rumpuser_sp.c:1.66 src/lib/librumpuser/rumpuser_sp.c:1.66.2.1
--- src/lib/librumpuser/rumpuser_sp.c:1.66 Sat Jun 14 11:52:42 2014
+++ src/lib/librumpuser/rumpuser_sp.c Tue Dec 9 19:14:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_sp.c,v 1.66 2014/06/14 11:52:42 pooka Exp $ */
+/* $NetBSD: rumpuser_sp.c,v 1.66.2.1 2014/12/09 19:14:27 martin Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -37,7 +37,7 @@
#include "rumpuser_port.h"
#if !defined(lint)
-__RCSID("$NetBSD: rumpuser_sp.c,v 1.66 2014/06/14 11:52:42 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_sp.c,v 1.66.2.1 2014/12/09 19:14:27 martin Exp $");
#endif /* !lint */
#include
@@ -957,7 +957,6 @@ schedulework(struct spclient *spc, enum
struct spservarg {
int sps_sock;
connecthook_fn sps_connhook;
- struct lwp *sps_l;
};
static void
@@ -983,8 +982,11 @@ handlereq(struct spclient *spc)
/* XXX make sure it contains sensible chars? */
comm[commlen] = '\0';
+ /* make sure we fork off of proc1 */
+ _DIAGASSERT(lwproc_curlwp() == NULL);
+
if ((error = lwproc_rfork(spc,
- RUMP_RFFDG, comm)) != 0) {
+ RUMP_RFFD_CLEAR, comm)) != 0) {
shutdown(spc->spc_fd, SHUT_RDWR);
}
@@ -1049,7 +1051,8 @@ handlereq(struct spclient *spc)
* the wrong spc pointer. (yea, optimize
* interfaces some day if anyone cares)
*/
- if ((error = lwproc_rfork(spc, 0, NULL)) != 0) {
+ if ((error = lwproc_rfork(spc,
+ RUMP_RFFD_SHARE, NULL)) != 0) {
send_error_resp(spc, reqno,
RUMPSP_ERR_RFORK_FAILED);
shutdown(spc->spc_fd, SHUT_RDWR);
@@ -1109,7 +1112,7 @@ handlereq(struct spclient *spc)
* above) so we can safely use it here.
*/
lwproc_switch(spc->spc_mainlwp);
- if ((error = lwproc_rfork(spc, RUMP_RFFDG, NULL)) != 0) {
+ if ((error = lwproc_rfork(spc, RUMP_RFFD_COPY, NULL)) != 0) {
DPRINTF(("rump_sp: fork failed: %d (%p)\n",error, spc));
send_error_resp(spc, reqno, RUMPSP_ERR_RFORK_FAILED);
lwproc_switch(NULL);
@@ -1194,8 +1197,6 @@ spserver(void *arg)
int rv;
unsigned int nfds, maxidx;
- lwproc_switch(sarg->sps_l);
-
for (idx = 0; idx < MAXCLI; idx++) {
pfdlist[idx].fd = -1;
pfdlist[idx].events = POLLIN;
@@ -1320,7 +1321,6 @@ rumpuser_sp_init(const char *url,
pthread_t pt;
struct spservarg *sarg;
struct sockaddr *sap;
- struct lwp *calllwp;
char *p;
unsigned idx = 0; /* XXXgcc */
int error, s;
@@ -1371,22 +1371,6 @@ rumpuser_sp_init(const char *url,
goto out;
}
- /*
- * Create a context that the client threads run off of.
- * We fork a dedicated context so as to ensure that all
- * client threads get the same set of fd's. We fork off
- * of whatever context the caller is running in (most likely
- * an implicit thread, i.e. proc 1) and do not
- * close fd's. The assumption is that people who
- * write servers (i.e. "kernels") know what they're doing.
- */
- calllwp = lwproc_curlwp();
- if ((error = lwproc_rfork(NULL, RUMP_RFFDG, "spserver")) != 0) {
- fprintf(stderr, "rump_sp: rfork failed");
- goto out;
- }
- sarg->sps_l = lwproc_curlwp();
- lwproc_switch(calllwp);
if ((error = pthread_create(&pt, NULL, spserver, sarg)) != 0) {
fprintf(stderr, "rump_sp: cannot create wrkr thread\n");
goto out;
Index: src/sys/rump/librump/rumpkern/cons.c
diff -u src/sys/rump/librump/rumpkern/cons.c:1.3 src/sys/rump/librump/rumpkern/cons.c:1.3.8.1
--- src/sys/rump/librump/rumpkern/cons.c:1.3 Sun Sep 8 04:37:17 2013
+++ src/sys/rump/librump/rumpkern/cons.c Tue Dec 9 19:14:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.c,v 1.3 2013/09/08 04:37:17 pooka Exp $ */
+/* $NetBSD: cons.c,v 1.3.8.1 2014
CVS commit: [netbsd-7] src/crypto/external/bsd/netpgp/dist/src/netpgpverify
Module Name:src
Committed By: martin
Date: Tue Dec 9 19:02:01 UTC 2014
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify [netbsd-7]:
tiger.c
Log Message:
Avoid type-punned pointer deref, requested by agc in #297
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.6.1 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c:1.1.6.1
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c:1.1 Sun Mar 9 00:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c Tue Dec 9 19:02:01 2014
@@ -819,7 +819,7 @@ TIGER_Update(TIGER_CTX *ctx, const void
for (; j < 56; j++) {
u.temp8[j] = 0;
}
- ((uint64_t *)(void *)(&(u.temp8[56])))[0] = ((uint64_t)length) << 3;
+ u.temp64[7] = ((uint64_t)length) << 3;
tiger_compress(u.temp64, ctx->ctx);
}
CVS commit: [netbsd-7] src/crypto/external/bsd/netpgp/lib/verify
Module Name:src
Committed By: martin
Date: Tue Dec 9 18:59:42 UTC 2014
Modified Files:
src/crypto/external/bsd/netpgp/lib/verify [netbsd-7]: Makefile
Log Message:
Downgrade WARNS to 4, requested by agc in #297
To generate a diff of this commit:
cvs rdiff -u -r1.6.4.1 -r1.6.4.2 \
src/crypto/external/bsd/netpgp/lib/verify/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.6.4.1 src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.6.4.2
--- src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.6.4.1 Mon Dec 8 20:22:07 2014
+++ src/crypto/external/bsd/netpgp/lib/verify/Makefile Tue Dec 9 18:59:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6.4.1 2014/12/08 20:22:07 martin Exp $
+# $NetBSD: Makefile,v 1.6.4.2 2014/12/09 18:59:42 martin Exp $
LIB=netpgpverify
SRCS+=b64.c
@@ -18,7 +18,7 @@ SRCS+=rmd160.c
SRCS+=tiger.c
CPPFLAGS+=-I${.CURDIR} -I${EXTDIST}/src/netpgpverify
MAN=libnetpgpverify.3
-WARNS=5
+WARNS=4
EXTDIST=${.CURDIR}/../../dist
.PATH: ${EXTDIST}/src/netpgpverify
CVS commit: src/sys/arch/i386/include
Module Name:src
Committed By: pooka
Date: Tue Dec 9 14:39:49 UTC 2014
Modified Files:
src/sys/arch/i386/include: ansi.h
Log Message:
On i386, prefer __WCHAR/WINT_TYPE__ where available instead of hardcoded
_BSD_WCHAR_T_ value.
This mimics some other ports, and more importantly fixes compilation with
i386 compilers which define __WCHAR_TYPE__ as "long int" instead of the
"int" we had in there. That superficial mismatch resulted in errors
such as:
lib/libc/gen/vis.c:109:1: error: array of inappropriate type initialized from
string constant
static const wchar_t char_shell[] = L"'`\";&<>()|{}]\\$!^~";
No change to NetBSD (our gcc does define __WCHAR_TYPE__, but it is
"int" ... as expected ... since the NetBSD build worked ;)
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/include/ansi.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/i386/include/ansi.h
diff -u src/sys/arch/i386/include/ansi.h:1.25 src/sys/arch/i386/include/ansi.h:1.26
--- src/sys/arch/i386/include/ansi.h:1.25 Sun Jul 17 20:54:41 2011
+++ src/sys/arch/i386/include/ansi.h Tue Dec 9 14:39:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.25 2011/07/17 20:54:41 joerg Exp $ */
+/* $NetBSD: ansi.h,v 1.26 2014/12/09 14:39:49 pooka Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -56,7 +56,16 @@
#define _BSD_TIMER_T_ int /* timer_t */
#define _BSD_SUSECONDS_T_ int /* suseconds_t */
#define _BSD_USECONDS_T_ unsigned int /* useconds_t */
+
+#if defined(__WCHAR_TYPE__)
+#define _BSD_WCHAR_T_ __WCHAR_TYPE__ /* wchar_t */
+#else
#define _BSD_WCHAR_T_ int /* wchar_t */
+#endif
+#if defined(__WINT_TYPE__)
+#define _BSD_WINT_T_ __WINT_TYPE__ /* wint_t */
+#else
#define _BSD_WINT_T_ int /* wint_t */
+#endif
#endif /* _I386_ANSI_H_ */
