Re: CVS commit: src/sys
Nick Hudson sk...@netbsd.org wrote: Module Name: src Committed By: skrll Date: Thu Mar 20 06:48:54 UTC 2014 Modified Files: src/sys/arch/arm/ixp12x0: ixp12x0_intr.c src/sys/arch/arm/xscale: ixp425_if_npe.c ixp425_npe.c ixp425_npevar.h src/sys/arch/xen/include: xbdvar.h src/sys/coda: coda_vnops.c src/sys/dev/mca: ed_mca.c edc_mca.c edvar.h src/sys/dev/pci: cy82c693.c src/sys/dev/pci/cxgb: cxgb_osdep.h src/sys/net: if_tap.c if_tun.c Log Message: Mechanically replace simplelock with kmutex_t. That is great! Thanks. -- Mindaugas
CVS commit: xsrc/external/mit/xkbutils/include
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 06:17:54 UTC 2014 Added Files: xsrc/external/mit/xkbutils/include: config.h Log Message: xkbutils needs a config.h now. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 xsrc/external/mit/xkbutils/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: xsrc/external/mit/xkbutils/include/config.h diff -u /dev/null xsrc/external/mit/xkbutils/include/config.h:1.1 --- /dev/null Thu Mar 20 06:17:54 2014 +++ xsrc/external/mit/xkbutils/include/config.h Thu Mar 20 06:17:54 2014 @@ -0,0 +1,71 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the inttypes.h header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the memory.h header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the stdint.h header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the stdlib.h header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strcasecmp' function. */ +#define HAVE_STRCASECMP 1 + +/* Define to 1 if you have the strings.h header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the string.h header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the sys/stat.h header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the sys/types.h header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the unistd.h header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O */ + +/* Name of package */ +#define PACKAGE xkbutils + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT https://bugs.freedesktop.org/enter_bug.cgi?product=xorg; + +/* Define to the full name of this package. */ +#define PACKAGE_NAME xkbutils + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING xkbutils 1.0.4 + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME xkbutils + +/* Define to the home page for this package. */ +#define PACKAGE_URL + +/* Define to the version of this package. */ +#define PACKAGE_VERSION 1.0.4 + +/* Major version of this package */ +#define PACKAGE_VERSION_MAJOR 1 + +/* Minor version of this package */ +#define PACKAGE_VERSION_MINOR 0 + +/* Patch version of this package */ +#define PACKAGE_VERSION_PATCHLEVEL 4 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION 1.0.4
CVS commit: src/external/mit/xorg/bin/xkbutils
Module Name:src
Committed By: mrg
Date: Thu Mar 20 06:18:20 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xkbutils: Makefile.xkbutils
Log Message:
look for config.h.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils
diff -u src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils:1.3 src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils:1.4
--- src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils:1.3 Wed Mar 19 23:46:22 2014
+++ src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils Thu Mar 20 06:18:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xkbutils,v 1.3 2014/03/19 23:46:22 mrg Exp $
+# $NetBSD: Makefile.xkbutils,v 1.4 2014/03/20 06:18:20 mrg Exp $
.include bsd.own.mk
@@ -8,7 +8,7 @@ LDADD+= -lxkbfile -lXaw -lXmu -lXt -lSM
DPADD+= ${LIBXKBFILE} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11}
-CPPFLAGS+= -DHAVE_STRCASECMP
+CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.xkbutils}/../include
.PATH: ${X11SRCDIR.xkbutils} ${X11SRCDIR.xkbutils}/man
CVS import: xsrc/external/mit/xf86-input-keyboard/dist
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 06:24:39 UTC 2014 Update of /cvsroot/xsrc/external/mit/xf86-input-keyboard/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17803 Log Message: initial import of xf86-input-keyboard-1.8.0 Status: Vendor Tag: xorg Release Tags: xf86-input-keyboard-1-8-0 U xsrc/external/mit/xf86-input-keyboard/dist/Makefile.in U xsrc/external/mit/xf86-input-keyboard/dist/COPYING U xsrc/external/mit/xf86-input-keyboard/dist/missing U xsrc/external/mit/xf86-input-keyboard/dist/ChangeLog U xsrc/external/mit/xf86-input-keyboard/dist/README U xsrc/external/mit/xf86-input-keyboard/dist/install-sh U xsrc/external/mit/xf86-input-keyboard/dist/config.h.in U xsrc/external/mit/xf86-input-keyboard/dist/Makefile.am U xsrc/external/mit/xf86-input-keyboard/dist/config.sub U xsrc/external/mit/xf86-input-keyboard/dist/configure U xsrc/external/mit/xf86-input-keyboard/dist/config.guess U xsrc/external/mit/xf86-input-keyboard/dist/aclocal.m4 U xsrc/external/mit/xf86-input-keyboard/dist/configure.ac U xsrc/external/mit/xf86-input-keyboard/dist/depcomp U xsrc/external/mit/xf86-input-keyboard/dist/ltmain.sh U xsrc/external/mit/xf86-input-keyboard/dist/INSTALL U xsrc/external/mit/xf86-input-keyboard/dist/man/Makefile.in U xsrc/external/mit/xf86-input-keyboard/dist/man/kbd.man U xsrc/external/mit/xf86-input-keyboard/dist/man/Makefile.am U xsrc/external/mit/xf86-input-keyboard/dist/src/Makefile.in C xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c U xsrc/external/mit/xf86-input-keyboard/dist/src/at_scancode.c U xsrc/external/mit/xf86-input-keyboard/dist/src/sun_kbdMap.c C xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h C xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c U xsrc/external/mit/xf86-input-keyboard/dist/src/sun_kbd.h U xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_kbd.c U xsrc/external/mit/xf86-input-keyboard/dist/src/hurd_kbd.c U xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_kbd.h U xsrc/external/mit/xf86-input-keyboard/dist/src/xf86Keymap.h U xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_KbdMap.c U xsrc/external/mit/xf86-input-keyboard/dist/src/sun_kbd.c U xsrc/external/mit/xf86-input-keyboard/dist/src/Makefile.am U xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h C xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c U xsrc/external/mit/xf86-input-keyboard/dist/src/atKeynames.h 4 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-input-keyboard/dist
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: mrg
Date: Thu Mar 20 06:40:47 UTC 2014
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_KbdMap.c bsd_kbd.c
Log Message:
merge xf86-input-keyboard 1.8.0.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.8 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.9
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c:1.8 Mon Jul 16 12:49:42 2012
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c Thu Mar 20 06:40:47 2014
@@ -260,7 +260,6 @@ static CARD8 wsUsbMap[] = {
/* 47 */ KEY_LBrace, /* [ { */
/* 48 */ KEY_RBrace, /* ] } */
/* 49 */ KEY_BSlash, /* \ | */
- /* this was KEY_BSlash2 which seems bogus */
/* 50 */ KEY_BSlash,/* \ _ # ~ on some keyboards */
/* 51 */ KEY_SemiColon, /* ; : */
/* 52 */ KEY_Quote, /* ' */
@@ -444,7 +443,7 @@ static CARD8 wsUsbMap[] = {
/* 230 */ KEY_AltLang, /* Right Alt, AKA AltGr */
/* 231 */ KEY_LMeta, /* Right Meta XXX */
};
-#define WS_USB_MAP_SIZE (sizeof(wsUsbMap)/sizeof(unsigned char))
+#define WS_USB_MAP_SIZE (sizeof(wsUsbMap)/sizeof(*wsUsbMap))
static
TransMapRec wsUsb = {
@@ -458,7 +457,7 @@ static CARD8 wsXtMap[] = {
/* 1 */ KEY_Escape,
/* 2 */ KEY_1,
/* 3 */ KEY_2,
- /* 4 */ KEY_3,
+ /* 4 */ KEY_3,
/* 5 */ KEY_4,
/* 6 */ KEY_5,
/* 7 */ KEY_6,
@@ -677,7 +676,7 @@ static CARD8 wsXtMap[] = {
/* 220 */ KEY_RMeta,
/* 221 */ KEY_Menu,
};
-#define WS_XT_MAP_SIZE (sizeof(wsXtMap)/sizeof(unsigned char))
+#define WS_XT_MAP_SIZE (sizeof(wsXtMap)/sizeof(*wsXtMap))
static
TransMapRec wsXt = {
@@ -817,7 +816,7 @@ static CARD8 wsAdbMap[] = {
/* 126 */ KEY_NOTUSED,
/* 127 */ KEY_Power
};
-#define WS_ADB_MAP_SIZE (sizeof(wsAdbMap)/sizeof(unsigned char))
+#define WS_ADB_MAP_SIZE (sizeof(wsAdbMap)/sizeof(*wsAdbMap))
static
TransMapRec wsAdb = {
@@ -1081,7 +1080,7 @@ static CARD8 wsLk201Map[] = {
/* 250 */ KEY_NOTUSED,
/* 251 */ KEY_NOTUSED,
};
-#define WS_LK201_MAP_SIZE (sizeof(wsLk201Map)/sizeof(unsigned char))
+#define WS_LK201_MAP_SIZE (sizeof(wsLk201Map)/sizeof(*wsLk201Map))
static
TransMapRec wsLk201 = {
@@ -1220,7 +1219,7 @@ static CARD8 wsSunMap[] = {
/* 0x7e */ KEY_NOTUSED,
/* 0x7f */ KEY_NOTUSED
};
-#define WS_SUN_MAP_SIZE (sizeof(wsSunMap)/sizeof(unsigned char))
+#define WS_SUN_MAP_SIZE (sizeof(wsSunMap)/sizeof(*wsSunMap))
static
TransMapRec wsSun = {
@@ -1373,7 +1372,7 @@ KbdGetMapping (InputInfoPtr pInfo, KeySy
#endif
#ifdef WSKBD_TYPE_LK201
case WSKBD_TYPE_LK201:
-pKbd-scancodeMap = wsLk201;
+pKbd-scancodeMap = wsLk201;
break;
#endif
#ifdef WSKBD_TYPE_SUN
Index: xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.18 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.19
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.18 Mon Mar 18 11:50:08 2013
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Thu Mar 20 06:40:47 2014
@@ -39,6 +39,21 @@ typedef struct {
struct termios kbdtty;
} BsdKbdPrivRec, *BsdKbdPrivPtr;
+#ifdef WSCONS_SUPPORT
+static Bool
+WSSetVersion(int fd, const char *name)
+{
+#ifdef WSKBDIO_SETVERSION
+int version = WSKBDIO_EVENT_VERSION;
+if (ioctl(fd, WSKBDIO_SETVERSION, version) == -1) {
+xf86Msg(X_WARNING, %s: cannot set version\n, name);
+return FALSE;
+}
+#endif
+return TRUE;
+}
+#endif
+
static
int KbdInit(InputInfoPtr pInfo, int what)
{
@@ -54,7 +69,7 @@ int KbdInit(InputInfoPtr pInfo, int what
#if defined WSCONS_SUPPORT
case WSCONS:
#endif
- tcgetattr(pInfo-fd, (priv-kbdtty));
+ tcgetattr(pInfo-fd, (priv-kbdtty));
#endif
break;
}
@@ -173,8 +188,8 @@ KbdOn(InputInfoPtr pInfo, int what)
xf86Msg(X_ERROR, KbdOn: tcsetattr: %s\n,
strerror(errno));
}
- break;
-#endif
+ break;
+#endif
}
#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) || defined (WSCONS_SUPPORT)
switch (pKbd-consType) {
@@ -208,18 +223,17 @@ KbdOn(InputInfoPtr pInfo, int what)
switch (pKbd-consType) {
#ifdef WSCONS_SUPPORT
case WSCONS:
- if ((pKbd-wsKbdDev[0] != 0) (pInfo-fd == -1)) {
- xf86Msg(X_INFO, opening %s\n, pKbd-wsKbdDev);
- pInfo-fd = open(pKbd-wsKbdDev, O_RDONLY | O_NONBLOCK | O_EXCL);
-#ifdef WSKBDIO_SETVERSION
- int version = WSKBDIO_EVENT_VERSION;
- if
CVS commit: src/sys
Module Name:src
Committed By: skrll
Date: Thu Mar 20 06:48:54 UTC 2014
Modified Files:
src/sys/arch/arm/ixp12x0: ixp12x0_intr.c
src/sys/arch/arm/xscale: ixp425_if_npe.c ixp425_npe.c ixp425_npevar.h
src/sys/arch/xen/include: xbdvar.h
src/sys/coda: coda_vnops.c
src/sys/dev/mca: ed_mca.c edc_mca.c edvar.h
src/sys/dev/pci: cy82c693.c
src/sys/dev/pci/cxgb: cxgb_osdep.h
src/sys/net: if_tap.c if_tun.c
Log Message:
Mechanically replace simplelock with kmutex_t.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/ixp12x0/ixp12x0_intr.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/xscale/ixp425_if_npe.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/xscale/ixp425_npe.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/xscale/ixp425_npevar.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/xen/include/xbdvar.h
cvs rdiff -u -r1.95 -r1.96 src/sys/coda/coda_vnops.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/mca/ed_mca.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/mca/edc_mca.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/mca/edvar.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/cy82c693.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/cxgb/cxgb_osdep.h
cvs rdiff -u -r1.73 -r1.74 src/sys/net/if_tap.c
cvs rdiff -u -r1.116 -r1.117 src/sys/net/if_tun.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/ixp12x0/ixp12x0_intr.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.27 src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.28
--- src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.27 Sun Mar 2 13:23:32 2014
+++ src/sys/arch/arm/ixp12x0/ixp12x0_intr.c Thu Mar 20 06:48:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_intr.c,v 1.27 2014/03/02 13:23:32 joerg Exp $ */
+/* $NetBSD: ixp12x0_intr.c,v 1.28 2014/03/20 06:48:54 skrll Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ixp12x0_intr.c,v 1.27 2014/03/02 13:23:32 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: ixp12x0_intr.c,v 1.28 2014/03/20 06:48:54 skrll Exp $);
/*
* Interrupt support for the Intel ixp12x0
@@ -39,7 +39,6 @@ __KERNEL_RCSID(0, $NetBSD: ixp12x0_intr
#include sys/param.h
#include sys/systm.h
#include sys/malloc.h
-#include sys/simplelock.h
#include sys/termios.h
#include sys/bus.h
#include sys/intr.h
Index: src/sys/arch/arm/xscale/ixp425_if_npe.c
diff -u src/sys/arch/arm/xscale/ixp425_if_npe.c:1.24 src/sys/arch/arm/xscale/ixp425_if_npe.c:1.25
--- src/sys/arch/arm/xscale/ixp425_if_npe.c:1.24 Mon Feb 24 10:47:46 2014
+++ src/sys/arch/arm/xscale/ixp425_if_npe.c Thu Mar 20 06:48:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425_if_npe.c,v 1.24 2014/02/24 10:47:46 martin Exp $ */
+/* $NetBSD: ixp425_if_npe.c,v 1.25 2014/03/20 06:48:54 skrll Exp $ */
/*-
* Copyright (c) 2006 Sam Leffler. All rights reserved.
@@ -28,7 +28,7 @@
#if 0
__FBSDID($FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $);
#endif
-__KERNEL_RCSID(0, $NetBSD: ixp425_if_npe.c,v 1.24 2014/02/24 10:47:46 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: ixp425_if_npe.c,v 1.25 2014/03/20 06:48:54 skrll Exp $);
/*
* Intel XScale NPE Ethernet driver.
@@ -57,7 +57,6 @@ __KERNEL_RCSID(0, $NetBSD: ixp425_if_np
#include sys/socket.h
#include sys/endian.h
#include sys/ioctl.h
-#include sys/simplelock.h
#include sys/syslog.h
#include sys/bus.h
Index: src/sys/arch/arm/xscale/ixp425_npe.c
diff -u src/sys/arch/arm/xscale/ixp425_npe.c:1.9 src/sys/arch/arm/xscale/ixp425_npe.c:1.10
--- src/sys/arch/arm/xscale/ixp425_npe.c:1.9 Sun Oct 14 14:20:58 2012
+++ src/sys/arch/arm/xscale/ixp425_npe.c Thu Mar 20 06:48:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425_npe.c,v 1.9 2012/10/14 14:20:58 msaitoh Exp $ */
+/* $NetBSD: ixp425_npe.c,v 1.10 2014/03/20 06:48:54 skrll Exp $ */
/*-
* Copyright (c) 2006 Sam Leffler, Errno Consulting
@@ -62,7 +62,7 @@
#if 0
__FBSDID($FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $);
#endif
-__KERNEL_RCSID(0, $NetBSD: ixp425_npe.c,v 1.9 2012/10/14 14:20:58 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: ixp425_npe.c,v 1.10 2014/03/20 06:48:54 skrll Exp $);
/*
* Intel XScale Network Processing Engine (NPE) support.
@@ -86,7 +86,7 @@ __KERNEL_RCSID(0, $NetBSD: ixp425_npe.c
#include sys/systm.h
#include sys/kernel.h
#include sys/malloc.h
-#include sys/simplelock.h
+#include sys/mutex.h
#include sys/time.h
#include sys/proc.h
@@ -274,7 +274,7 @@ ixpnpe_attach(device_t parent, device_t
sc-sc_dt = ixa-ixa_dt;
sc-sc_unit = ixa-ixa_npe;
-simple_lock_init(sc-sc_lock);
+mutex_init(sc-sc_lock, MUTEX_DEFAULT, IPL_VM);
/* XXX: Check features to ensure this NPE is enabled */
@@ -353,13 +353,13 @@ ixpnpe_stopandreset(struct ixpnpe_softc
{
int error;
-simple_lock(sc-sc_lock);
+mutex_enter(sc-sc_lock);
error = npe_cpu_stop(sc); /*
CVS commit: src/sys/kern
Module Name:src
Committed By: mlelstv
Date: Thu Mar 20 06:48:22 UTC 2014
Modified Files:
src/sys/kern: subr_vmem.c
Log Message:
Incorrect use of pointer arithmetic.
CID 1193195: Extra sizeof expression
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/kern/subr_vmem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_vmem.c
diff -u src/sys/kern/subr_vmem.c:1.89 src/sys/kern/subr_vmem.c:1.90
--- src/sys/kern/subr_vmem.c:1.89 Tue Mar 11 20:32:05 2014
+++ src/sys/kern/subr_vmem.c Thu Mar 20 06:48:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_vmem.c,v 1.89 2014/03/11 20:32:05 pooka Exp $ */
+/* $NetBSD: subr_vmem.c,v 1.90 2014/03/20 06:48:22 mlelstv Exp $ */
/*-
* Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi,
@@ -46,7 +46,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_vmem.c,v 1.89 2014/03/11 20:32:05 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_vmem.c,v 1.90 2014/03/20 06:48:22 mlelstv Exp $);
#if defined(_KERNEL)
#include opt_ddb.h
@@ -324,7 +324,7 @@ bt_freetrim(vmem_t *vm, int freelimit)
LIST_REMOVE(bt, bt_freelist);
vm-vm_nfreetags--;
if (bt = static_bts
- bt static_bts + sizeof(static_bts)) {
+ bt static_bts[STATIC_BT_COUNT]) {
mutex_enter(vmem_btag_lock);
LIST_INSERT_HEAD(vmem_btag_freelist, bt, bt_freelist);
vmem_btag_freelist_count++;
CVS import: xsrc/external/mit/xf86-video-vesa/dist
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 06:50:55 UTC 2014 Update of /cvsroot/xsrc/external/mit/xf86-video-vesa/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3025 Log Message: initial import of xf86-video-vesa-2.3.3 Status: Vendor Tag: xorg Release Tags: xf86-video-vesa-2-3-3 C xsrc/external/mit/xf86-video-vesa/dist/config.sub U xsrc/external/mit/xf86-video-vesa/dist/README C xsrc/external/mit/xf86-video-vesa/dist/depcomp C xsrc/external/mit/xf86-video-vesa/dist/configure U xsrc/external/mit/xf86-video-vesa/dist/INSTALL U xsrc/external/mit/xf86-video-vesa/dist/ChangeLog U xsrc/external/mit/xf86-video-vesa/dist/Makefile.am C xsrc/external/mit/xf86-video-vesa/dist/install-sh C xsrc/external/mit/xf86-video-vesa/dist/config.guess U xsrc/external/mit/xf86-video-vesa/dist/COPYING C xsrc/external/mit/xf86-video-vesa/dist/aclocal.m4 C xsrc/external/mit/xf86-video-vesa/dist/missing U xsrc/external/mit/xf86-video-vesa/dist/config.h.in C xsrc/external/mit/xf86-video-vesa/dist/ltmain.sh C xsrc/external/mit/xf86-video-vesa/dist/configure.ac C xsrc/external/mit/xf86-video-vesa/dist/Makefile.in U xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.am C xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c U xsrc/external/mit/xf86-video-vesa/dist/src/compat-api.h C xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.in U xsrc/external/mit/xf86-video-vesa/dist/src/vesa.h U xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.am U xsrc/external/mit/xf86-video-vesa/dist/man/vesa.man C xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.in 13 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-vesa/dist
CVS commit: src
Module Name:src Committed By: skrll Date: Thu Mar 20 06:50:55 UTC 2014 Modified Files: src/distrib/sets/lists/comp: mi src/sys/sys: Makefile Log Message: simplelock.h is no longer used. To generate a diff of this commit: cvs rdiff -u -r1.1882 -r1.1883 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.147 -r1.148 src/sys/sys/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1882 src/distrib/sets/lists/comp/mi:1.1883 --- src/distrib/sets/lists/comp/mi:1.1882 Tue Mar 18 10:21:47 2014 +++ src/distrib/sets/lists/comp/mi Thu Mar 20 06:50:54 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1882 2014/03/18 10:21:47 hannken Exp $ +# $NetBSD: mi,v 1.1883 2014/03/20 06:50:54 skrll Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3266,7 +3266,7 @@ ./usr/include/sys/signal.h comp-c-include ./usr/include/sys/signalvar.h comp-c-include ./usr/include/sys/sigtypes.h comp-c-include -./usr/include/sys/simplelock.h comp-c-include +./usr/include/sys/simplelock.h comp-c-include obsolete ./usr/include/sys/sleepq.h comp-c-include ./usr/include/sys/socket.h comp-c-include ./usr/include/sys/socketvar.h comp-c-include Index: src/sys/sys/Makefile diff -u src/sys/sys/Makefile:1.147 src/sys/sys/Makefile:1.148 --- src/sys/sys/Makefile:1.147 Fri Jan 10 15:54:59 2014 +++ src/sys/sys/Makefile Thu Mar 20 06:50:54 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.147 2014/01/10 15:54:59 christos Exp $ +# $NetBSD: Makefile,v 1.148 2014/03/20 06:50:54 skrll Exp $ .include bsd.own.mk @@ -30,7 +30,7 @@ INCS= acct.h agpio.h aio.h ansi.h aout_m ras.h rbtree.h reboot.h radioio.h resource.h resourcevar.h rmd160.h \ rnd.h rwlock.h \ scanio.h sched.h scsiio.h sdt.h select.h selinfo.h sem.h sha1.h \ - sha2.h shm.h siginfo.h signal.h signalvar.h sigtypes.h simplelock.h \ + sha2.h shm.h siginfo.h signal.h signalvar.h sigtypes.h \ sleepq.h socket.h \ socketvar.h sockio.h spawn.h specificdata.h stat.h \ statvfs.h syscall.h syscallargs.h sysctl.h stdarg.h stdint.h swap.h \
CVS commit: xsrc/external/mit/xf86-video-geode
Module Name:xsrc
Committed By: mrg
Date: Thu Mar 20 06:57:26 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-geode/dist/src: geode_msr.c
xsrc/external/mit/xf86-video-geode/include: config.h
Removed Files:
xsrc/external/mit/xf86-video-geode/dist: config.guess config.sub
depcomp install-sh ltmain.sh missing
Log Message:
merge xf86-video-geode 2.11.15.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-geode/dist/config.guess \
xsrc/external/mit/xf86-video-geode/dist/config.sub \
xsrc/external/mit/xf86-video-geode/dist/depcomp \
xsrc/external/mit/xf86-video-geode/dist/install-sh \
xsrc/external/mit/xf86-video-geode/dist/missing
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xf86-video-geode/dist/ltmain.sh
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-geode/dist/src/geode_msr.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-geode/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-geode/dist/src/geode_msr.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/geode_msr.c:1.3 xsrc/external/mit/xf86-video-geode/dist/src/geode_msr.c:1.4
--- xsrc/external/mit/xf86-video-geode/dist/src/geode_msr.c:1.3 Wed May 18 21:07:09 2011
+++ xsrc/external/mit/xf86-video-geode/dist/src/geode_msr.c Thu Mar 20 06:57:26 2014
@@ -1,4 +1,33 @@
-#define _LARGEFILE64_SOURCE
+/*
+ * Copyright (c) 2008 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the Software),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Neither the name of the Advanced Micro Devices, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include config.h
+#endif
+
#include stdio.h
#include unistd.h
#include fcntl.h
@@ -13,9 +42,9 @@ _msr_open(void)
static int msrfd = 0;
if (msrfd == 0) {
- msrfd = open(/dev/cpu/0/msr, O_RDWR);
- if (msrfd == -1)
- ErrorF(Unable to open /dev/cpu/0/msr: %d\n, errno);
+msrfd = open(/dev/cpu/0/msr, O_RDWR);
+if (msrfd == -1)
+ErrorF(Unable to open /dev/cpu/0/msr: %d\n, errno);
}
return msrfd;
@@ -29,17 +58,17 @@ GeodeReadMSR(unsigned long addr, unsigne
int ret;
if (fd == -1)
- return -1;
+return -1;
-ret = lseek64(fd, (off64_t) addr, SEEK_SET);
+ret = lseek(fd, (off_t) addr, SEEK_SET);
if (ret == -1)
- return -1;
+return -1;
-ret = read(fd, (void *)data, sizeof(data));
+ret = read(fd, (void *) data, sizeof(data));
if (ret != 8)
- return -1;
+return -1;
*hi = data[1];
*lo = data[0];
@@ -54,16 +83,16 @@ GeodeWriteMSR(unsigned long addr, unsign
int fd = _msr_open();
if (fd == -1)
- return -1;
+return -1;
-if (lseek64(fd, (off64_t) addr, SEEK_SET) == -1)
- return -1;
+if (lseek(fd, (off_t) addr, SEEK_SET) == -1)
+return -1;
data[0] = lo;
data[1] = hi;
-if (write(fd, (void *)data, 8) != 8)
- return -1;
+if (write(fd, (void *) data, 8) != 8)
+return -1;
return 0;
}
Index: xsrc/external/mit/xf86-video-geode/include/config.h
diff -u xsrc/external/mit/xf86-video-geode/include/config.h:1.3 xsrc/external/mit/xf86-video-geode/include/config.h:1.4
--- xsrc/external/mit/xf86-video-geode/include/config.h:1.3 Tue Feb 22 00:57:21 2011
+++ xsrc/external/mit/xf86-video-geode/include/config.h Thu Mar 20 06:57:26 2014
@@ -21,6 +21,9 @@
/* Define to 1 if you have the inttypes.h header file. */
#define HAVE_INTTYPES_H 1
+/* Define to 1 if you have the linux/videodev2.h header file. */
+/* #undef HAVE_LINUX_VIDEODEV2_H */
+
/* Define to 1 if you have the memory.h header file. */
#define HAVE_MEMORY_H 1
@@ -45,6 +48,9 @@
/* Define to 1
CVS import: xsrc/external/mit/xf86-video-geode/dist
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 06:54:21 UTC 2014 Update of /cvsroot/xsrc/external/mit/xf86-video-geode/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20442 Log Message: initial import of xf86-video-geode-2.11.15 Status: Vendor Tag: xorg Release Tags: xf86-video-geode-2-11-15 U xsrc/external/mit/xf86-video-geode/dist/Makefile.in U xsrc/external/mit/xf86-video-geode/dist/configure U xsrc/external/mit/xf86-video-geode/dist/configure.ac U xsrc/external/mit/xf86-video-geode/dist/COPYING U xsrc/external/mit/xf86-video-geode/dist/NEWS U xsrc/external/mit/xf86-video-geode/dist/Makefile.am U xsrc/external/mit/xf86-video-geode/dist/INSTALL U xsrc/external/mit/xf86-video-geode/dist/ChangeLog U xsrc/external/mit/xf86-video-geode/dist/autogen.sh U xsrc/external/mit/xf86-video-geode/dist/README U xsrc/external/mit/xf86-video-geode/dist/aclocal.m4 U xsrc/external/mit/xf86-video-geode/dist/config.h.in U xsrc/external/mit/xf86-video-geode/dist/TODO U xsrc/external/mit/xf86-video-geode/dist/src/geode_common.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_vga.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_driver.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_dcon.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_accel.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_display.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_video.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_panel.c U xsrc/external/mit/xf86-video-geode/dist/src/Makefile.in U xsrc/external/mit/xf86-video-geode/dist/src/geode_blend.h U xsrc/external/mit/xf86-video-geode/dist/src/geode_ddc.c C xsrc/external/mit/xf86-video-geode/dist/src/geode_msr.c U xsrc/external/mit/xf86-video-geode/dist/src/panel.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_memory.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_fourcc.h U xsrc/external/mit/xf86-video-geode/dist/src/durango.c U xsrc/external/mit/xf86-video-geode/dist/src/Makefile.am U xsrc/external/mit/xf86-video-geode/dist/src/cim_dev.h U xsrc/external/mit/xf86-video-geode/dist/src/lx_cursor.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_randr.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_output.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_pcirename.h U xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c N xsrc/external/mit/xf86-video-geode/dist/src/compat-api.h U xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_rotate.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_vga.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_regacc.c U xsrc/external/mit/xf86-video-geode/dist/src/geode.h U xsrc/external/mit/xf86-video-geode/dist/src/gx_cursor.c U xsrc/external/mit/xf86-video-geode/dist/src/cimarron.c U xsrc/external/mit/xf86-video-geode/dist/src/z4l.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_video.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_exa.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_version.h U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_defs.h U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_init.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_regs.h U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_modes.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_filter.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_vip.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_vop.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_df.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_gp.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_vg.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_parm.h U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_rtns.h U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_msr.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/doc/release.txt U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_mode.h U xsrc/external/mit/xf86-video-geode/dist/src/gfx/init_gu2.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/release.txt U xsrc/external/mit/xf86-video-geode/dist/src/gfx/tv_1200.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/vid_rdcl.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_vid.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_rndr.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_priv.h U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_vga.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/tv_fs450.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/disp_gu1.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_vip.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_i2c.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_disp.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/saa7114.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/history.h U xsrc/external/mit/xf86-video-geode/dist/src/gfx/vid_5530.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_dcdr.c U
CVS import: xsrc/external/mit/xterm/dist
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 07:00:11 UTC 2014 Update of /cvsroot/xsrc/external/mit/xterm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18369 Log Message: initial import of xterm-303 Status: Vendor Tag: xorg Release Tags: xterm-303 U xsrc/external/mit/xterm/dist/df-install.in U xsrc/external/mit/xterm/dist/config.guess U xsrc/external/mit/xterm/dist/version.c U xsrc/external/mit/xterm/dist/terminfo U xsrc/external/mit/xterm/dist/88colres.h U xsrc/external/mit/xterm/dist/tabs.c C xsrc/external/mit/xterm/dist/XTerm.ad U xsrc/external/mit/xterm/dist/charproc.c U xsrc/external/mit/xterm/dist/README U xsrc/external/mit/xterm/dist/menu.h U xsrc/external/mit/xterm/dist/termcap U xsrc/external/mit/xterm/dist/uxterm.desktop U xsrc/external/mit/xterm/dist/gen-pc-fkeys.pl C xsrc/external/mit/xterm/dist/xterm.man U xsrc/external/mit/xterm/dist/fontutils.h U xsrc/external/mit/xterm/dist/xtermcfg.hin U xsrc/external/mit/xterm/dist/Imakefile U xsrc/external/mit/xterm/dist/UXTerm.ad U xsrc/external/mit/xterm/dist/trace.h U xsrc/external/mit/xterm/dist/xterm_io.h U xsrc/external/mit/xterm/dist/keysym2ucs.c U xsrc/external/mit/xterm/dist/data.c U xsrc/external/mit/xterm/dist/uxterm.man U xsrc/external/mit/xterm/dist/Makefile.in C xsrc/external/mit/xterm/dist/fontutils.c U xsrc/external/mit/xterm/dist/XTerm-col.ad U xsrc/external/mit/xterm/dist/charclass.c U xsrc/external/mit/xterm/dist/xterm.desktop U xsrc/external/mit/xterm/dist/README.i18n U xsrc/external/mit/xterm/dist/aclocal.m4 U xsrc/external/mit/xterm/dist/trace.c U xsrc/external/mit/xterm/dist/KOI8RXTerm.ad U xsrc/external/mit/xterm/dist/install-sh U xsrc/external/mit/xterm/dist/AAA_README_VMS.txt U xsrc/external/mit/xterm/dist/wcwidth.h U xsrc/external/mit/xterm/dist/Tekparse.h U xsrc/external/mit/xterm/dist/TekPrsTbl.c U xsrc/external/mit/xterm/dist/vms.c U xsrc/external/mit/xterm/dist/xstrings.c U xsrc/external/mit/xterm/dist/util.c U xsrc/external/mit/xterm/dist/run-tic.sh U xsrc/external/mit/xterm/dist/minstall.in U xsrc/external/mit/xterm/dist/MANIFEST N xsrc/external/mit/xterm/dist/graphics.c U xsrc/external/mit/xterm/dist/Tekparse.def U xsrc/external/mit/xterm/dist/make.com U xsrc/external/mit/xterm/dist/xterm.log.html U xsrc/external/mit/xterm/dist/precompose.h U xsrc/external/mit/xterm/dist/README.os390 U xsrc/external/mit/xterm/dist/xtermcap.c U xsrc/external/mit/xterm/dist/cachedGCs.c U xsrc/external/mit/xterm/dist/menu.c U xsrc/external/mit/xterm/dist/doublechr.c U xsrc/external/mit/xterm/dist/linedata.c U xsrc/external/mit/xterm/dist/xtermcap.h U xsrc/external/mit/xterm/dist/data.h U xsrc/external/mit/xterm/dist/version.h U xsrc/external/mit/xterm/dist/THANKS U xsrc/external/mit/xterm/dist/charclass.h U xsrc/external/mit/xterm/dist/xutf8.h U xsrc/external/mit/xterm/dist/ctlseqs.ms U xsrc/external/mit/xterm/dist/config.sub U xsrc/external/mit/xterm/dist/xcharmouse.h U xsrc/external/mit/xterm/dist/sinstall.sh U xsrc/external/mit/xterm/dist/configure U xsrc/external/mit/xterm/dist/koi8rxterm U xsrc/external/mit/xterm/dist/Tests U xsrc/external/mit/xterm/dist/print.c U xsrc/external/mit/xterm/dist/resize.c U xsrc/external/mit/xterm/dist/plink.sh U xsrc/external/mit/xterm/dist/configure.in U xsrc/external/mit/xterm/dist/uxterm U xsrc/external/mit/xterm/dist/charsets.c U xsrc/external/mit/xterm/dist/256colres.h U xsrc/external/mit/xterm/dist/ctlseqs.txt U xsrc/external/mit/xterm/dist/button.c U xsrc/external/mit/xterm/dist/Tekproc.c U xsrc/external/mit/xterm/dist/xterm.h U xsrc/external/mit/xterm/dist/link_axp.com U xsrc/external/mit/xterm/dist/xutf8.c C xsrc/external/mit/xterm/dist/misc.c U xsrc/external/mit/xterm/dist/main.c U xsrc/external/mit/xterm/dist/ptydata.c U xsrc/external/mit/xterm/dist/scrollbar.c U xsrc/external/mit/xterm/dist/scrollback.c U xsrc/external/mit/xterm/dist/VTparse.def U xsrc/external/mit/xterm/dist/VTparse.h U xsrc/external/mit/xterm/dist/koi8rxterm.man U xsrc/external/mit/xterm/dist/xstrings.h U xsrc/external/mit/xterm/dist/VTPrsTbl.c U xsrc/external/mit/xterm/dist/256colres.pl U xsrc/external/mit/xterm/dist/precompose.c U xsrc/external/mit/xterm/dist/error.h U xsrc/external/mit/xterm/dist/input.c U xsrc/external/mit/xterm/dist/xterm_axp.opt U xsrc/external/mit/xterm/dist/wcwidth.c U xsrc/external/mit/xterm/dist/vms.h U xsrc/external/mit/xterm/dist/resize.man U xsrc/external/mit/xterm/dist/INSTALL C xsrc/external/mit/xterm/dist/ptyx.h U xsrc/external/mit/xterm/dist/testxmc.c N xsrc/external/mit/xterm/dist/graphics.h U xsrc/external/mit/xterm/dist/xterm.dat U xsrc/external/mit/xterm/dist/cursor.c U xsrc/external/mit/xterm/dist/keysym2ucs.h U xsrc/external/mit/xterm/dist/main.h U xsrc/external/mit/xterm/dist/88colres.pl U xsrc/external/mit/xterm/dist/screen.c U xsrc/external/mit/xterm/dist/vttests/query-color.pl U xsrc/external/mit/xterm/dist/vttests/dynamic.sh U xsrc/external/mit/xterm/dist/vttests/256colors.pl U xsrc/external/mit/xterm/dist/vttests/tcapquery.pl
CVS commit: xsrc/external/mit/xf86-video-geode/include
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 06:58:46 UTC 2014 Modified Files: xsrc/external/mit/xf86-video-geode/include: config.h Log Message: re-do the previous correctly. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-geode/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-geode/include/config.h diff -u xsrc/external/mit/xf86-video-geode/include/config.h:1.4 xsrc/external/mit/xf86-video-geode/include/config.h:1.5 --- xsrc/external/mit/xf86-video-geode/include/config.h:1.4 Thu Mar 20 06:57:26 2014 +++ xsrc/external/mit/xf86-video-geode/include/config.h Thu Mar 20 06:58:46 2014 @@ -68,7 +68,7 @@ #define PACKAGE_NAME xf86-video-geode /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xf86-video-geode 2.11.12 +#define PACKAGE_STRING xf86-video-geode 2.11.15 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xf86-video-geode @@ -77,7 +77,7 @@ #define PACKAGE_URL http://www.x.org/wiki/GeodeDriver; /* Define to the version of this package. */ -#define PACKAGE_VERSION 2.11.12 +#define PACKAGE_VERSION 2.11.15 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 2 @@ -86,10 +86,10 @@ #define PACKAGE_VERSION_MINOR 11 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 12 +#define PACKAGE_VERSION_PATCHLEVEL 15 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 2.11.12 +#define VERSION 2.11.15
CVS commit: xsrc/external/mit/xterm/include
Module Name:xsrc
Committed By: mrg
Date: Thu Mar 20 07:13:32 UTC 2014
Added Files:
xsrc/external/mit/xterm/include: builtin_icons.h
Log Message:
new generated file for xterm.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/xterm/include/builtin_icons.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: xsrc/external/mit/xterm/include/builtin_icons.h
diff -u /dev/null xsrc/external/mit/xterm/include/builtin_icons.h:1.1
--- /dev/null Thu Mar 20 07:13:32 2014
+++ xsrc/external/mit/xterm/include/builtin_icons.h Thu Mar 20 07:13:31 2014
@@ -0,0 +1,271 @@
+#if OPT_BUILTIN_XPMS
+#include icons/mini.xterm.xpms
+#include icons/filled-xterm.xpms
+#include icons/xterm.xpms
+#include icons/xterm-color.xpms
+#else
+/* XPM */
+static const char * mini_xterm_48x48_xpm[] = {
+48 48 213 2,
+ c None,
+. c #FF,
++ c #FF5300,
+@ c #FF5E00,
+# c #FF4800,
+$ c #FF4200,
+% c #FF4000,
+ c #FF4B00,
+* c #FF5200,
+= c #FF5400,
+- c #FF3500,
+; c #FF5100,
+ c #FF5C00,
+, c #FF3000,
+' c #FF4500,
+) c #FF2000,
+! c #FF0300,
+~ c #FF1600,
+{ c #FF5D00,
+] c #FF3800,
+^ c #FF0200,
+/ c #FF0900,
+( c #FF2B00,
+_ c #FF3300,
+: c #FF1A00,
+ c #FF1300,
+[ c #FF1200,
+} c #FF5700,
+| c #4577BA,
+1 c #874E78,
+2 c #887577,
+3 c #887E77,
+4 c #887977,
+5 c #875078,
+6 c #566CA9,
+7 c #5E70A1,
+8 c #884E77,
+9 c #887677,
+0 c #7C5B83,
+a c #795686,
+b c #008DFE,
+c c #0012F3,
+d c #000BF2,
+e c #008FFE,
+f c #006CFA,
+g c #F1,
+h c #0001F1,
+i c #0020F4,
+j c #0040F6,
+k c #0959F0,
+l c #1158E8,
+m c #1159E8,
+n c #0058F9,
+o c #001DF4,
+p c #0023F4,
+q c #005BFA,
+r c #0060FA,
+s c #0E58EB,
+t c #0651F3,
+u c #0033F5,
+v c #000EF2,
+w c #006EFA,
+x c #0092FF,
+y c #001FF4,
+z c #000FF2,
+A c #0C51EC,
+B c #326AC9,
+C c #7A6583,
+D c #CA6234,
+E c #FC5F03,
+F c #FF5800,
+G c #FF0800,
+H c #F4060B,
+I c #007CFB,
+J c #0013F3,
+K c #007EFB,
+L c #FF1800,
+M c #F3590C,
+N c #AB6152,
+O c #4F4EAD,
+P c #175CE4,
+Q c #0036F5,
+R c #0022F4,
+S c #0095FD,
+T c #0084FD,
+U c #0004F1,
+V c #0051F8,
+W c #345AC7,
+X c #E61519,
+Y c #FF5900,
+Z c #FF4600,
+` c #FF0100,
+ . c #446EB9,
+.. c #0034F6,
++. c #0032F5,
+@. c #FF2200,
+#. c #006FFA,
+$. c #002DF5,
+%. c #0086FD,
+. c #0046F7,
+*. c #0015F3,
+=. c #0076FC,
+-. c #FF0400,
+;. c #FF2300,
+. c #FF2900,
+,. c #9E3E61,
+'. c #0039F6,
+). c #FF2A00,
+!. c #FF4300,
+~. c #0071FB,
+{. c #005EF9,
+]. c #004DF7,
+^. c #008CFE,
+/. c #0008F2,
+(. c #001DF3,
+_. c #007DFB,
+:. c #FF4100,
+. c #FF5B00,
+[. c #A3425C,
+}. c #994C66,
+|. c #FF1100,
+1. c #0072FB,
+2. c #000AF2,
+3. c #006EFC,
+4. c #0017F3,
+5. c #007FFB,
+6. c #FF0600,
+7. c #FF5600,
+8. c #A56A5A,
+9. c #A53B5A,
+0. c #FF4F00,
+a. c #0076FB,
+b. c #0076FA,
+c. c #0093FF,
+d. c #007DFC,
+e. c #FF1C00,
+f. c #A5765A,
+g. c #A55D5A,
+h. c #006FFB,
+i. c #002CF5,
+j. c #008AFD,
+k. c #006BF9,
+l. c #FF3A00,
+m. c #FF5000,
+n. c #007BFB,
+o. c #008BFD,
+p. c #A5755A,
+q. c #9A5565,
+r. c #A43A5B,
+s. c #FF4D00,
+t. c #80507F,
+u. c #FF0F00,
+v. c #7A5485,
+w. c #AA,
+x. c #FF0A00,
+y. c #A53D5A,
+z. c #A4515B,
+A. c #A5685A,
+B. c #A5735A,
+C. c #FF0700,
+D. c #FF2E00,
+E. c #FF1500,
+F. c #A3705C,
+G. c #FF0500,
+H. c #9A4965,
+I. c #FF0E00,
+J. c #FF3B00,
+K. c #FF2D00,
+L. c #A13C5E,
+M. c #FF4C00,
+N. c #62649D,
+O. c #FF0B00,
+P. c #FF4700,
+Q. c #FF1D00,
+R. c #A56D5A,
+S. c #FF2C00,
+T. c #A4465B,
+U. c #FF1400,
+V. c #A03E61,
+W. c #FF3100,
+X. c #FF1B00,
+Y. c #FF1000,
+Z. c #0029F5,
+`. c #0027F4,
+ + c #4571BA,
+.+ c #FF3900,
+++ c #FF3200,
+@+ c #008EFD,
+#+ c #0019F3,
+$+ c #0090FD,
+%+ c #FF0D00,
++ c #FF1E00,
+*+ c #FF4E00,
+=+ c #0088FC,
+-+ c #0087FC,
+;+ c #FF1900,
++ c #0036F6,
+,+ c #FF2100,
+'+ c #0073FB,
+)+ c #0062FA,
+!+ c #001AF3,
+~+ c #2463D8,
+{+ c #3E58BE,
+]+ c #2A7FD3,
+^+ c #807B7F,
+/+ c #008EFB,
+(+ c #006AFA,
+_+ c #004CF8,
+:+ c #717B8D,
++ c #EE0B11,
+[+ c #F73E08,
+}+ c #FF1F00,
+|+ c #FF5500,
+,
+,
+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ,
+. + @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ . . # @ @ @ @ @ @ @ @ @ @ @ @ $ . ,
+. %* @ @ @ @ @ = . . - ; @ , . ,
+. . . . . . * @ @ @ @ ; . . . . . . . . . . . . . ' @ ) . . . . . . ,
+ ! ~ { @ @ @ @ ] ^ / ( @ $ . ,
+^ _ @ @ @ @ @ : ![ } ^ . ,
+| 1 2 3 3 3 3 4 5 6 7 8 9 3 0 a ,
+b c d d
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src Committed By: mrg Date: Thu Mar 20 07:13:53 UTC 2014 Modified Files: src/external/mit/xorg/bin/xterm: Makefile Log Message: add a note about builtin_icons.h. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/bin/xterm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xterm/Makefile diff -u src/external/mit/xorg/bin/xterm/Makefile:1.11 src/external/mit/xorg/bin/xterm/Makefile:1.12 --- src/external/mit/xorg/bin/xterm/Makefile:1.11 Fri May 31 21:40:29 2013 +++ src/external/mit/xorg/bin/xterm/Makefile Thu Mar 20 07:13:53 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2013/05/31 21:40:29 mrg Exp $ +# $NetBSD: Makefile,v 1.12 2014/03/20 07:13:53 mrg Exp $ .include bsd.own.mk @@ -38,6 +38,8 @@ SUBDIR= resize uxterm COPTS.input.c+= -Wno-error # uses XKeycodeToKeysym +# XXXMRG should probably build builtin_icons.h + .include Makefile.inc .include bsd.x11.mk
CVS import: xsrc/external/mit/fontconfig/dist
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 07:41:48 UTC 2014 Update of /cvsroot/xsrc/external/mit/fontconfig/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16557 Log Message: initial import of fontconfig-2.11.0 Status: Vendor Tag: xorg Release Tags: fontconfig-2-11-0 U xsrc/external/mit/fontconfig/dist/AUTHORS U xsrc/external/mit/fontconfig/dist/fonts.conf.in U xsrc/external/mit/fontconfig/dist/configure U xsrc/external/mit/fontconfig/dist/test-driver U xsrc/external/mit/fontconfig/dist/Makefile.am U xsrc/external/mit/fontconfig/dist/config.sub U xsrc/external/mit/fontconfig/dist/missing U xsrc/external/mit/fontconfig/dist/fontconfig.spec U xsrc/external/mit/fontconfig/dist/ChangeLog U xsrc/external/mit/fontconfig/dist/COPYING U xsrc/external/mit/fontconfig/dist/depcomp U xsrc/external/mit/fontconfig/dist/INSTALL U xsrc/external/mit/fontconfig/dist/fontconfig.pc.in U xsrc/external/mit/fontconfig/dist/install-sh U xsrc/external/mit/fontconfig/dist/fontconfig-zip.in U xsrc/external/mit/fontconfig/dist/config-fixups.h U xsrc/external/mit/fontconfig/dist/NEWS U xsrc/external/mit/fontconfig/dist/README U xsrc/external/mit/fontconfig/dist/fonts.dtd U xsrc/external/mit/fontconfig/dist/Tools.mk U xsrc/external/mit/fontconfig/dist/fontconfig.spec.in U xsrc/external/mit/fontconfig/dist/ltmain.sh U xsrc/external/mit/fontconfig/dist/aclocal.m4 U xsrc/external/mit/fontconfig/dist/config.guess U xsrc/external/mit/fontconfig/dist/config.h.in U xsrc/external/mit/fontconfig/dist/Makefile.in U xsrc/external/mit/fontconfig/dist/configure.ac N xsrc/external/mit/fontconfig/dist/compile U xsrc/external/mit/fontconfig/dist/conf.d/10-scale-bitmap-fonts.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-vrgb.conf U xsrc/external/mit/fontconfig/dist/conf.d/70-yes-bitmaps.conf U xsrc/external/mit/fontconfig/dist/conf.d/README.in U xsrc/external/mit/fontconfig/dist/conf.d/25-unhint-nonlatin.conf U xsrc/external/mit/fontconfig/dist/conf.d/Makefile.am U xsrc/external/mit/fontconfig/dist/conf.d/80-delicious.conf U xsrc/external/mit/fontconfig/dist/conf.d/30-metric-aliases.conf U xsrc/external/mit/fontconfig/dist/conf.d/49-sansserif.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-bgr.conf U xsrc/external/mit/fontconfig/dist/conf.d/11-lcdfilter-legacy.conf U xsrc/external/mit/fontconfig/dist/conf.d/20-unhint-small-vera.conf U xsrc/external/mit/fontconfig/dist/conf.d/65-fonts-persian.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-vbgr.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-unhinted.conf U xsrc/external/mit/fontconfig/dist/conf.d/11-lcdfilter-light.conf U xsrc/external/mit/fontconfig/dist/conf.d/40-nonlatin.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-rgb.conf U xsrc/external/mit/fontconfig/dist/conf.d/60-latin.conf U xsrc/external/mit/fontconfig/dist/conf.d/65-khmer.conf U xsrc/external/mit/fontconfig/dist/conf.d/README U xsrc/external/mit/fontconfig/dist/conf.d/11-lcdfilter-default.conf U xsrc/external/mit/fontconfig/dist/conf.d/30-urw-aliases.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-no-sub-pixel.conf U xsrc/external/mit/fontconfig/dist/conf.d/50-user.conf U xsrc/external/mit/fontconfig/dist/conf.d/90-synthetic.conf U xsrc/external/mit/fontconfig/dist/conf.d/Makefile.in U xsrc/external/mit/fontconfig/dist/conf.d/51-local.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-autohint.conf U xsrc/external/mit/fontconfig/dist/conf.d/69-unifont.conf U xsrc/external/mit/fontconfig/dist/conf.d/70-no-bitmaps.conf U xsrc/external/mit/fontconfig/dist/conf.d/45-latin.conf U xsrc/external/mit/fontconfig/dist/conf.d/65-nonlatin.conf U xsrc/external/mit/fontconfig/dist/fc-query/fc-query.sgml U xsrc/external/mit/fontconfig/dist/fc-query/Makefile.am U xsrc/external/mit/fontconfig/dist/fc-query/fc-query.c U xsrc/external/mit/fontconfig/dist/fc-query/fc-query.1 U xsrc/external/mit/fontconfig/dist/fc-query/Makefile.in U xsrc/external/mit/fontconfig/dist/fc-validate/fc-validate.1 U xsrc/external/mit/fontconfig/dist/fc-validate/Makefile.am U xsrc/external/mit/fontconfig/dist/fc-validate/fc-validate.sgml U xsrc/external/mit/fontconfig/dist/fc-validate/Makefile.in U xsrc/external/mit/fontconfig/dist/fc-validate/fc-validate.c U xsrc/external/mit/fontconfig/dist/fc-glyphname/fcglyphname.tmpl.h U xsrc/external/mit/fontconfig/dist/fc-glyphname/fc-glyphname.c U xsrc/external/mit/fontconfig/dist/fc-glyphname/Makefile.am U xsrc/external/mit/fontconfig/dist/fc-glyphname/fcglyphname.h U xsrc/external/mit/fontconfig/dist/fc-glyphname/Makefile.in U xsrc/external/mit/fontconfig/dist/fc-glyphname/zapfdingbats.txt U xsrc/external/mit/fontconfig/dist/fc-match/fc-match.sgml U xsrc/external/mit/fontconfig/dist/fc-match/Makefile.am U xsrc/external/mit/fontconfig/dist/fc-match/fc-match.c U xsrc/external/mit/fontconfig/dist/fc-match/Makefile.in U xsrc/external/mit/fontconfig/dist/fc-match/fc-match.1 U
CVS commit: xsrc/external/mit/fontconfig/dist
Module Name:xsrc
Committed By: mrg
Date: Thu Mar 20 07:49:26 UTC 2014
Modified Files:
xsrc/external/mit/fontconfig/dist/fc-cache: fc-cache.c
xsrc/external/mit/fontconfig/dist/src: fccache.c fchash.c fcint.h
fcmatch.c fcname.c fcstat.c
Log Message:
merge fontconfig 2.11.0.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fontconfig/dist/src/fccache.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/fontconfig/dist/src/fchash.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/fontconfig/dist/src/fcint.h \
xsrc/external/mit/fontconfig/dist/src/fcmatch.c \
xsrc/external/mit/fontconfig/dist/src/fcname.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/fontconfig/dist/src/fcstat.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/fontconfig/dist/fc-cache/fc-cache.c
diff -u xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.4 xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.5
--- xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.4 Mon Jun 3 19:49:01 2013
+++ xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c Thu Mar 20 07:49:26 2014
@@ -121,7 +121,7 @@ usage (char *program, int error)
static FcStrSet *processed_dirs;
static int
-scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, int *changed)
+scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, FcBool recursive, int *changed)
{
int ret = 0;
const FcChar8 *dir;
@@ -144,7 +144,7 @@ scanDirs (FcStrList *list, FcConfig *con
fflush (stdout);
}
- if (FcStrSetMember (processed_dirs, dir))
+ if (recursive FcStrSetMember (processed_dirs, dir))
{
if (verbose)
printf (skipping, looped directory detected\n);
@@ -216,32 +216,37 @@ scanDirs (FcStrList *list, FcConfig *con
ret++;
}
}
-
- subdirs = FcStrSetCreate ();
- if (!subdirs)
+
+ if (recursive)
{
- fprintf (stderr, %s: Can't create subdir set\n, dir);
- ret++;
- FcDirCacheUnload (cache);
- continue;
- }
- for (i = 0; i FcCacheNumSubdir (cache); i++)
- FcStrSetAdd (subdirs, FcCacheSubdir (cache, i));
+ subdirs = FcStrSetCreate ();
+ if (!subdirs)
+ {
+ fprintf (stderr, %s: Can't create subdir set\n, dir);
+ ret++;
+ FcDirCacheUnload (cache);
+ continue;
+ }
+ for (i = 0; i FcCacheNumSubdir (cache); i++)
+ FcStrSetAdd (subdirs, FcCacheSubdir (cache, i));
- FcDirCacheUnload (cache);
+ FcDirCacheUnload (cache);
- sublist = FcStrListCreate (subdirs);
- FcStrSetDestroy (subdirs);
- if (!sublist)
- {
- fprintf (stderr, %s: Can't create subdir list\n, dir);
- ret++;
- continue;
+ sublist = FcStrListCreate (subdirs);
+ FcStrSetDestroy (subdirs);
+ if (!sublist)
+ {
+ fprintf (stderr, %s: Can't create subdir list\n, dir);
+ ret++;
+ continue;
+ }
+ FcStrSetAdd (processed_dirs, dir);
+ ret += scanDirs (sublist, config, force, really_force, verbose, recursive, changed);
+ FcStrListDone (sublist);
}
- FcStrSetAdd (processed_dirs, dir);
- ret += scanDirs (sublist, config, force, really_force, verbose, changed);
+ else
+ FcDirCacheUnload (cache);
}
-FcStrListDone (list);
return ret;
}
@@ -373,7 +378,11 @@ main (int argc, char **argv)
}
changed = 0;
-ret = scanDirs (list, config, force, really_force, verbose, changed);
+ret = scanDirs (list, config, force, really_force, verbose, FcTrue, changed);
+/* Update the directory cache again to avoid the race condition as much as possible */
+FcStrListFirst (list);
+ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, changed);
+FcStrListDone (list);
/*
* Try to create CACHEDIR.TAG anyway.
@@ -386,6 +395,8 @@ main (int argc, char **argv)
cleanCacheDirectories (config, verbose);
+FcConfigDestroy (config);
+FcFini ();
/*
* Now we need to sleep a second (or two, to be extra sure), to make
* sure that timestamps for changes after this run of fc-cache are later
@@ -393,8 +404,7 @@ main (int argc, char **argv)
* sleep(3) can't be interrupted by a signal here -- this isn't in the
* library, and there aren't any signals flying around here.
*/
-FcConfigDestroy (config);
-FcFini ();
+/* the resolution of mtime on FAT is 2 seconds */
if (!quick changed)
sleep (2);
if (verbose)
Index: xsrc/external/mit/fontconfig/dist/src/fccache.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccache.c:1.4 xsrc/external/mit/fontconfig/dist/src/fccache.c:1.5
--- xsrc/external/mit/fontconfig/dist/src/fccache.c:1.4 Mon Jun 3 19:49:01 2013
+++ xsrc/external/mit/fontconfig/dist/src/fccache.c Thu Mar 20 07:49:26 2014
@@ -20,9 +20,6 @@
*
CVS commit: xsrc/external/mit/fontconfig/include
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 07:57:19 UTC 2014 Modified Files: xsrc/external/mit/fontconfig/include: config.h fcalias.h fcaliastail.h Log Message: merge fontconfig 2.11.0. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/fontconfig/include/config.h \ xsrc/external/mit/fontconfig/include/fcalias.h \ xsrc/external/mit/fontconfig/include/fcaliastail.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/fontconfig/include/config.h diff -u xsrc/external/mit/fontconfig/include/config.h:1.3 xsrc/external/mit/fontconfig/include/config.h:1.4 --- xsrc/external/mit/fontconfig/include/config.h:1.3 Mon Jun 3 20:43:29 2013 +++ xsrc/external/mit/fontconfig/include/config.h Thu Mar 20 07:57:19 2014 @@ -85,10 +85,10 @@ /* Define to 1 if you have the `getprogname' function. */ #define HAVE_GETPROGNAME 1 -#if 0 +//#if 0 // fontconfig 2.10, but we should have this in -current now /* Have Intel __sync_* atomic primitives */ #define HAVE_INTEL_ATOMIC_PRIMITIVES 1 -#endif +//#endif /* Define to 1 if you have the inttypes.h header file. */ #define HAVE_INTTYPES_H 1 @@ -153,6 +153,13 @@ /* Define to 1 if you have the `regfree' function. */ #define HAVE_REGFREE 1 +/* Define to 1 if you have the 'scandir' function. */ +/* #undef HAVE_SCANDIR */ + +/* Define to 1 if you have the 'scandir' function with int (* compar)(const + void *, const void *) */ +#define HAVE_SCANDIR_VOID_P 1 + /* Define to 1 if you have the sched.h header file. */ /* #undef HAVE_SCHED_H */ @@ -241,13 +248,13 @@ #define PACKAGE fontconfig /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT https://bugs.freedesktop.org/enger_bug.cgi?product=fontconfig; +#define PACKAGE_BUGREPORT https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig; /* Define to the full name of this package. */ #define PACKAGE_NAME fontconfig /* Define to the full name and version of this package. */ -#define PACKAGE_STRING fontconfig 2.10.93 +#define PACKAGE_STRING fontconfig 2.11.0 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME fontconfig @@ -256,7 +263,7 @@ #define PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION 2.10.93 +#define PACKAGE_VERSION 2.11.0 /* Define to necessary symbol if this constant uses a non-standard name on your system. */ @@ -312,7 +319,7 @@ /* Version number of package */ -#define VERSION 2.10.93 +#define VERSION 2.11.0 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ Index: xsrc/external/mit/fontconfig/include/fcalias.h diff -u xsrc/external/mit/fontconfig/include/fcalias.h:1.3 xsrc/external/mit/fontconfig/include/fcalias.h:1.4 --- xsrc/external/mit/fontconfig/include/fcalias.h:1.3 Mon Jun 3 20:22:55 2013 +++ xsrc/external/mit/fontconfig/include/fcalias.h Thu Mar 20 07:57:19 2014 @@ -376,6 +376,8 @@ extern __typeof (FcStrSetDestroy) IA__Fc #define FcStrSetDestroy IA__FcStrSetDestroy extern __typeof (FcStrListCreate) IA__FcStrListCreate __attribute((visibility(hidden))); #define FcStrListCreate IA__FcStrListCreate +extern __typeof (FcStrListFirst) IA__FcStrListFirst __attribute((visibility(hidden))); +#define FcStrListFirst IA__FcStrListFirst extern __typeof (FcStrListNext) IA__FcStrListNext __attribute((visibility(hidden))); #define FcStrListNext IA__FcStrListNext extern __typeof (FcStrListDone) IA__FcStrListDone __attribute((visibility(hidden))); Index: xsrc/external/mit/fontconfig/include/fcaliastail.h diff -u xsrc/external/mit/fontconfig/include/fcaliastail.h:1.3 xsrc/external/mit/fontconfig/include/fcaliastail.h:1.4 --- xsrc/external/mit/fontconfig/include/fcaliastail.h:1.3 Mon Jun 3 20:22:55 2013 +++ xsrc/external/mit/fontconfig/include/fcaliastail.h Thu Mar 20 07:57:19 2014 @@ -420,6 +420,8 @@ extern __typeof (FcStrSetDel) FcStrSetDe extern __typeof (FcStrSetDestroy) FcStrSetDestroy __attribute((alias(IA__FcStrSetDestroy), visibility(default))); # undef FcStrListCreate extern __typeof (FcStrListCreate) FcStrListCreate __attribute((alias(IA__FcStrListCreate), visibility(default))); +# undef FcStrListFirst +extern __typeof (FcStrListFirst) FcStrListFirst __attribute((alias(IA__FcStrListFirst), visibility(default))); # undef FcStrListNext extern __typeof (FcStrListNext) FcStrListNext __attribute((alias(IA__FcStrListNext), visibility(default))); # undef FcStrListDone
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc
Committed By: mrg
Date: Thu Mar 20 08:04:41 UTC 2014
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fccfg.c
Log Message:
avoid CPP when the C compiler can do it more sanely.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/fontconfig/dist/src/fccfg.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/fontconfig/dist/src/fccfg.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.1.1.5 xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.1.1.5 Thu Mar 20 07:41:43 2014
+++ xsrc/external/mit/fontconfig/dist/src/fccfg.c Thu Mar 20 08:04:41 2014
@@ -1546,19 +1546,19 @@ FcConfigSubstituteWithPat (FcConfig*
}
nobjs = FC_MAX_BASE_OBJECT + config-maxObjects + 2;
-value = (FcValueList **) malloc (SIZEOF_VOID_P * nobjs);
+value = (FcValueList **) malloc (sizeof(void *) * nobjs);
if (!value)
{
retval = FcFalse;
goto bail1;
}
-elt = (FcPatternElt **) malloc (SIZEOF_VOID_P * nobjs);
+elt = (FcPatternElt **) malloc (sizeof(void *) * nobjs);
if (!elt)
{
retval = FcFalse;
goto bail1;
}
-tst = (FcTest **) malloc (SIZEOF_VOID_P * nobjs);
+tst = (FcTest **) malloc (sizeof(void *) * nobjs);
if (!tst)
{
retval = FcFalse;
CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src
Committed By: mrg
Date: Thu Mar 20 08:05:30 UTC 2014
Modified Files:
src/external/mit/xorg/tools/fc-cache: Makefile
Log Message:
the host tool relies on scandir now days. (it tries to avoid it,
but needs work for this code to work again. if this is fixed, we
may want to run ./configure for this tool.)
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/tools/fc-cache/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.8 src/external/mit/xorg/tools/fc-cache/Makefile:1.9
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.8 Mon Jun 3 20:23:40 2013
+++ src/external/mit/xorg/tools/fc-cache/Makefile Thu Mar 20 08:05:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/06/03 20:23:40 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2014/03/20 08:05:30 mrg Exp $
NOMAN= 1
@@ -104,6 +104,7 @@ HOST_CPPFLAGS= -DFONTCONFIG_PATH='${DES
-DHAVE_STDINT_H -DHAVE_RANDOM -DDARWIN_NO_CARBON \
-DHAVE_SYS_TYPES_H -DHAVE_FCNTL_H -DHAVE_SYS_STAT_H \
-DHAVE_MKSTEMP \
+ -DHAVE_SCANDIR \
-DFLEXIBLE_ARRAY_MEMBER=/**/
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \
CVS commit: xsrc/external/mit/freetype/dist
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 08:35:40 UTC 2014 Modified Files: xsrc/external/mit/freetype/dist/builds/unix: freetype-config.in xsrc/external/mit/freetype/dist/src/cff: cffload.c xsrc/external/mit/freetype/dist/src/gzip: ftgzip.c xsrc/external/mit/freetype/dist/src/sfnt: ttcmap.c xsrc/external/mit/freetype/dist/src/smooth: ftsmooth.c Removed Files: xsrc/external/mit/freetype/dist/builds/amiga/include/freetype/config: ftconfig.h ftmodule.h xsrc/external/mit/freetype/dist/builds/unix: ft2unix.h xsrc/external/mit/freetype/dist/builds/win32: detect.mk ftdebug.c w32-bcc.mk w32-bccd.mk w32-dev.mk w32-gcc.mk w32-icc.mk w32-intl.mk w32-lcc.mk w32-mingw32.mk w32-vcc.mk w32-wat.mk win32-def.mk xsrc/external/mit/freetype/dist/builds/win32/vc2005: freetype.sln freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/win32/vc2008: freetype.sln freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/win32/vc2010: freetype.sln freetype.vcxproj freetype.vcxproj.filters index.html xsrc/external/mit/freetype/dist/builds/win32/visualc: freetype.dsp freetype.dsw freetype.sln freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/win32/visualce: freetype.dsp freetype.dsw freetype.vcproj index.html xsrc/external/mit/freetype/dist/include/freetype: freetype.h ftadvanc.h ftautoh.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h ftcffdrv.h ftchapters.h ftcid.h fterrdef.h fterrors.h ftgasp.h ftglyph.h ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h ftsystem.h fttrigon.h fttypes.h ftwinfnt.h ftxf86.h t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h xsrc/external/mit/freetype/dist/include/freetype/config: ftconfig.h ftheader.h ftmodule.h ftoption.h ftstdlib.h xsrc/external/mit/freetype/dist/include/freetype/internal: autohint.h ftcalc.h ftdebug.h ftdriver.h ftgloadr.h ftmemory.h ftobjs.h ftpic.h ftrfork.h ftserv.h ftstream.h fttrace.h ftvalid.h internal.h psaux.h pshints.h sfnt.h t1types.h tttypes.h xsrc/external/mit/freetype/dist/include/freetype/internal/services: svbdf.h svcid.h svgldict.h svgxval.h svkern.h svmm.h svotval.h svpfr.h svpostnm.h svprop.h svpscmap.h svpsinfo.h svsfnt.h svttcmap.h svtteng.h svttglyf.h svwinfnt.h svxf86nm.h xsrc/external/mit/freetype/dist/src/sfnt: ttsbit0.c Log Message: merge freetype 2.5.3. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/freetype/dist/builds/amiga/include/freetype/config/ftconfig.h cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/freetype/dist/builds/amiga/include/freetype/config/ftmodule.h cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/freetype/dist/builds/unix/ft2unix.h cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/detect.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-bcc.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-bccd.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-dev.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-gcc.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-icc.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-intl.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-lcc.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-mingw32.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-vcc.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-wat.mk cvs rdiff -u -r1.1.1.3 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/ftdebug.c cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/win32-def.mk cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/vc2005/freetype.sln cvs rdiff -u -r1.1.1.5 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/vc2005/freetype.vcproj \ xsrc/external/mit/freetype/dist/builds/win32/vc2005/index.html cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/vc2008/freetype.sln cvs rdiff -u -r1.1.1.5 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/vc2008/freetype.vcproj \ xsrc/external/mit/freetype/dist/builds/win32/vc2008/index.html cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/vc2010/freetype.sln \ xsrc/external/mit/freetype/dist/builds/win32/vc2010/freetype.vcxproj.filters cvs rdiff -u -r1.1.1.2 -r0 \
CVS commit: src/external/mit/xorg/lib/freetype
Module Name:src
Committed By: mrg
Date: Thu Mar 20 08:57:48 UTC 2014
Modified Files:
src/external/mit/xorg/lib/freetype: Makefile freetype2.pc.in
shlib_version
src/external/mit/xorg/lib/freetype/freetype: Makefile
src/external/mit/xorg/lib/freetype/freetype/cache: Makefile
src/external/mit/xorg/lib/freetype/freetype/config: Makefile
Log Message:
merge freetype 2.5.3.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/freetype/freetype2.pc.in
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/freetype/shlib_version
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/lib/freetype/freetype/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/lib/freetype/freetype/cache/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/lib/freetype/freetype/config/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.11 src/external/mit/xorg/lib/freetype/Makefile:1.12
--- src/external/mit/xorg/lib/freetype/Makefile:1.11 Wed Jun 5 08:42:56 2013
+++ src/external/mit/xorg/lib/freetype/Makefile Thu Mar 20 08:57:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/06/05 08:42:56 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2014/03/20 08:57:48 mrg Exp $
.include bsd.own.mk
@@ -87,7 +87,7 @@ CPPFLAGS+= -DFT_CONFIG_OPTION_SYSTEM_ZLI
-DFT2_BUILD_LIBRARY \
-DFT_CONFIG_MODULES_H=ftmodule.h
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 \
- -I${DESTDIR}${X11INCDIR}/freetype2/freetype/config \
+ -I${DESTDIR}${X11INCDIR}/freetype2/config \
-I${X11SRCDIR.${LIB}}/include
.if !defined(MKSUBPIXEL) || ${MKSUBPIXEL} != no
Index: src/external/mit/xorg/lib/freetype/freetype2.pc.in
diff -u src/external/mit/xorg/lib/freetype/freetype2.pc.in:1.1 src/external/mit/xorg/lib/freetype/freetype2.pc.in:1.2
--- src/external/mit/xorg/lib/freetype/freetype2.pc.in:1.1 Sat Sep 13 04:31:12 2008
+++ src/external/mit/xorg/lib/freetype/freetype2.pc.in Thu Mar 20 08:57:48 2014
@@ -7,5 +7,5 @@ Name: FreeType 2
Description: A free, high-quality, and portable font engine.
Version: @VERSION@
Requires:
-Libs: -L${libdir} -lfreetype -lz
+Libs: -L${libdir} -lfreetype -lz -lbz2
Cflags: -I${includedir}/freetype2 -I${includedir}
Index: src/external/mit/xorg/lib/freetype/shlib_version
diff -u src/external/mit/xorg/lib/freetype/shlib_version:1.6 src/external/mit/xorg/lib/freetype/shlib_version:1.7
--- src/external/mit/xorg/lib/freetype/shlib_version:1.6 Wed Jun 5 08:42:56 2013
+++ src/external/mit/xorg/lib/freetype/shlib_version Thu Mar 20 08:57:48 2014
@@ -1,6 +1,5 @@
-# $NetBSD: shlib_version,v 1.6 2013/06/05 08:42:56 mrg Exp $
+# $NetBSD: shlib_version,v 1.7 2014/03/20 08:57:48 mrg Exp $
#
-# XXX XXX XXX netbsd xsrc xfree 4.5 freetype used major=9!
-#
-major=7
-minor=4
+major=17
+minor=2
+teeny=11
Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.15 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.16
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.15 Mon Jun 10 17:37:22 2013
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile Thu Mar 20 08:57:48 2014
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2013/06/10 17:37:22 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2014/03/20 08:57:48 mrg Exp $
.include bsd.own.mk
SUBDIR= config
-.PATH: ${X11SRCDIR.freetype}/include/freetype
+.PATH: ${X11SRCDIR.freetype}/include
-INCSDIR=${X11INCDIR}/freetype2/freetype
+INCSDIR=${X11INCDIR}/freetype2
INCS= freetype.h ftadvanc.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h \
ftchapters.h ftcid.h fterrdef.h fterrors.h ftgasp.h ftglyph.h \
Index: src/external/mit/xorg/lib/freetype/freetype/cache/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/cache/Makefile:1.1.1.1 src/external/mit/xorg/lib/freetype/freetype/cache/Makefile:1.2
--- src/external/mit/xorg/lib/freetype/freetype/cache/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/lib/freetype/freetype/cache/Makefile Thu Mar 20 08:57:48 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/20 08:57:48 mrg Exp $
.include bsd.own.mk
-.PATH: ${X11SRCDIR.freetype}/include/freetype/cache
+.PATH: ${X11SRCDIR.freetype}/include/cache
-INCSDIR=${X11INCDIR}/freetype2/freetype/cache
+INCSDIR=${X11INCDIR}/freetype2/cache
INCS= ftcimage.h ftcmanag.h \
ftcsbits.h ftcmru.h
Index: src/external/mit/xorg/lib/freetype/freetype/config/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/config/Makefile:1.1.1.1 src/external/mit/xorg/lib/freetype/freetype/config/Makefile:1.2
--- src/external/mit/xorg/lib/freetype/freetype/config/Makefile:1.1.1.1
CVS commit: xsrc/external/mit/libXft/dist/src
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 08:58:36 UTC 2014 Modified Files: xsrc/external/mit/libXft/dist/src: xftglyphs.c Log Message: pull over pkgsrc patch patch-src_xftglyphs.c to work with modern freetype. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/libXft/dist/src/xftglyphs.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/libXft/dist/src/xftglyphs.c diff -u xsrc/external/mit/libXft/dist/src/xftglyphs.c:1.1.1.3 xsrc/external/mit/libXft/dist/src/xftglyphs.c:1.2 --- xsrc/external/mit/libXft/dist/src/xftglyphs.c:1.1.1.3 Fri May 31 21:03:35 2013 +++ xsrc/external/mit/libXft/dist/src/xftglyphs.c Thu Mar 20 08:58:36 2014 @@ -21,10 +21,10 @@ */ #include xftint.h -#include freetype/ftoutln.h -#include freetype/ftlcdfil.h - -#include freetype/ftsynth.h +#include ft2build.h +#include FT_FREETYPE_H +#include FT_LCD_FILTER_H +#include FT_SYNTHESIS_H /* * Validate the memory info for a font
CVS commit: src
Module Name:src Committed By: mrg Date: Thu Mar 20 09:05:28 UTC 2014 Modified Files: src/distrib/sets/lists/xbase: mi shl.mi src/distrib/sets/lists/xcomp: mi src/etc/mtree: NetBSD.dist.Xorg Log Message: merge freetype 2.5.3. To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.121 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.148 -r1.149 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.13 -r1.14 src/etc/mtree/NetBSD.dist.Xorg 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/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.120 src/distrib/sets/lists/xbase/mi:1.121 --- src/distrib/sets/lists/xbase/mi:1.120 Sun Mar 16 23:25:15 2014 +++ src/distrib/sets/lists/xbase/mi Thu Mar 20 09:05:28 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.120 2014/03/16 23:25:15 mrg Exp $ +# $NetBSD: mi,v 1.121 2014/03/20 09:05:28 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1519,11 +1519,16 @@ ./usr/X11R7/include/drm base-x11-root obsolete ./usr/X11R7/include/fontconfigbase-x11-root xorg ./usr/X11R7/include/freetype2base-x11-root xorg -./usr/X11R7/include/freetype2/freetype base-x11-root xorg -./usr/X11R7/include/freetype2/freetype/cache base-x11-root xorg -./usr/X11R7/include/freetype2/freetype/config base-x11-root xorg -./usr/X11R7/include/freetype2/freetype/internal base-x11-root xorg -./usr/X11R7/include/freetype2/freetype/internal/services base-x11-root xorg +./usr/X11R7/include/freetype2/freetype base-obsolete obsolete +./usr/X11R7/include/freetype2/freetype/cache base-obsolete obsolete +./usr/X11R7/include/freetype2/freetype/config base-obsolete obsolete +./usr/X11R7/include/freetype2/freetype/internal base-obsolete obsolete +./usr/X11R7/include/freetype2/freetype/internal/services base-obsolete obsolete +./usr/X11R7/include/freetype2base-x11-root xorg +./usr/X11R7/include/freetype2/cache base-x11-root xorg +./usr/X11R7/include/freetype2/config base-x11-root xorg +./usr/X11R7/include/freetype2/internal base-x11-root xorg +./usr/X11R7/include/freetype2/internal/services base-x11-root xorg ./usr/X11R7/include/libdrmbase-x11-root xorg ./usr/X11R7/include/libkmsbase-x11-root xorg ./usr/X11R7/include/pixman-1base-x11-root xorg Index: src/distrib/sets/lists/xbase/shl.mi diff -u src/distrib/sets/lists/xbase/shl.mi:1.54 src/distrib/sets/lists/xbase/shl.mi:1.55 --- src/distrib/sets/lists/xbase/shl.mi:1.54 Mon Mar 17 07:25:34 2014 +++ src/distrib/sets/lists/xbase/shl.mi Thu Mar 20 09:05:28 2014 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.54 2014/03/17 07:25:34 mrg Exp $ +# $NetBSD: shl.mi,v 1.55 2014/03/20 09:05:28 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -319,8 +319,8 @@ ./usr/X11R7/lib/libfontenc.so.2 -unknown- xorg ./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg ./usr/X11R7/lib/libfreetype.so -unknown- xorg -./usr/X11R7/lib/libfreetype.so.7 -unknown- xorg -./usr/X11R7/lib/libfreetype.so.7.4 -unknown- xorg +./usr/X11R7/lib/libfreetype.so.17 -unknown- xorg +./usr/X11R7/lib/libfreetype.so.17.2.11 -unknown- xorg ./usr/X11R7/lib/libglut.so -unknown- xorg ./usr/X11R7/lib/libglut.so.4 -unknown- xorg ./usr/X11R7/lib/libglut.so.4.0 -unknown- xorg Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.148 src/distrib/sets/lists/xcomp/mi:1.149 --- src/distrib/sets/lists/xcomp/mi:1.148 Mon Mar 17 08:11:32 2014 +++ src/distrib/sets/lists/xcomp/mi Thu Mar 20 09:05:28 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.148 2014/03/17 08:11:32 mrg Exp $ +# $NetBSD: mi,v 1.149 2014/03/20 09:05:28 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -5658,50 +5658,50 @@ ./usr/X11R7/include/fontconfig/fcfreetype.h -unknown- xorg ./usr/X11R7/include/fontconfig/fcprivate.h -unknown- xorg ./usr/X11R7/include/fontconfig/fontconfig.h -unknown- xorg -./usr/X11R7/include/freetype2/freetype/config/ftconfig.h -unknown- xorg -./usr/X11R7/include/freetype2/freetype/config/ftheader.h -unknown- xorg -./usr/X11R7/include/freetype2/freetype/config/ftmodule.h -unknown- xorg -./usr/X11R7/include/freetype2/freetype/config/ftoption.h -unknown- xorg -./usr/X11R7/include/freetype2/freetype/config/ftstdlib.h -unknown- xorg -./usr/X11R7/include/freetype2/freetype/freetype.h -unknown- xorg -./usr/X11R7/include/freetype2/freetype/ftadvanc.h -unknown- xorg -./usr/X11R7/include/freetype2/freetype/ftautoh.h -unknown- xorg -./usr/X11R7/include/freetype2/freetype/ftbbox.h -unknown- xorg -./usr/X11R7/include/freetype2/freetype/ftbdf.h -unknown- xorg -./usr/X11R7/include/freetype2/freetype/ftbitmap.h -unknown- xorg -./usr/X11R7/include/freetype2/freetype/ftbzip2.h -unknown- xorg
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Thu Mar 20 10:15:14 UTC 2014 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax: config.h src/external/gpl3/gcc/usr.bin/gcc/arch/vax: auto-host.h configargs.h src/external/gpl3/gcc/usr.bin/libcpp/arch/vax: config.h Log Message: regenerate after recent vax specific fixes. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax/config.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gcc/usr.bin/gcc/arch/vax/auto-host.h cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/gcc/usr.bin/gcc/arch/vax/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/libcpp/arch/vax/config.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/gpl3/gcc/lib/libstdc++-v3/arch/vax/config.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax/config.h:1.8 src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax/config.h:1.9 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax/config.h:1.8 Sat Mar 1 10:00:47 2014 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax/config.h Thu Mar 20 10:15:13 2014 @@ -1,6 +1,6 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.70 2013/05/05 07:11:34 skrll Exp */ -/* Generated from: NetBSD: mknative.common,v 1.8 2006/05/26 19:17:21 mrg Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.78 2014/03/02 04:58:20 mrg Exp */ +/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp */ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ Index: src/external/gpl3/gcc/usr.bin/gcc/arch/vax/auto-host.h diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/vax/auto-host.h:1.4 src/external/gpl3/gcc/usr.bin/gcc/arch/vax/auto-host.h:1.5 --- src/external/gpl3/gcc/usr.bin/gcc/arch/vax/auto-host.h:1.4 Tue Mar 4 08:56:53 2014 +++ src/external/gpl3/gcc/usr.bin/gcc/arch/vax/auto-host.h Thu Mar 20 10:15:13 2014 @@ -1009,13 +1009,13 @@ /* Define 0/1 if your assembler supports CFI directives. */ -#define HAVE_GAS_CFI_DIRECTIVE 0 +#define HAVE_GAS_CFI_DIRECTIVE 1 /* Define 0/1 if your assembler supports .cfi_personality. */ -#define HAVE_GAS_CFI_PERSONALITY_DIRECTIVE 0 +#define HAVE_GAS_CFI_PERSONALITY_DIRECTIVE 1 /* Define 0/1 if your assembler supports .cfi_sections. */ -#define HAVE_GAS_CFI_SECTIONS_DIRECTIVE 0 +#define HAVE_GAS_CFI_SECTIONS_DIRECTIVE 1 /* Define if your assembler supports the .loc discriminator sub-directive. */ #ifndef USED_FOR_TARGET Index: src/external/gpl3/gcc/usr.bin/gcc/arch/vax/configargs.h diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/vax/configargs.h:1.10 src/external/gpl3/gcc/usr.bin/gcc/arch/vax/configargs.h:1.11 --- src/external/gpl3/gcc/usr.bin/gcc/arch/vax/configargs.h:1.10 Tue Mar 4 08:56:53 2014 +++ src/external/gpl3/gcc/usr.bin/gcc/arch/vax/configargs.h Thu Mar 20 10:15:13 2014 @@ -3,7 +3,7 @@ /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp */ /* Generated automatically. */ -static const char configuration_arguments[] = /usr/src6/tools/gcc/../../external/gpl3/gcc/dist/configure --target=vax--netbsdelf --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb1 20120916' --with-system-zlib --enable-__cxa_atexit --with-mpc-lib=/var/obj/mknative/vax/usr/src6/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/mknative/vax/usr/src6/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/mknative/vax/usr/src6/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src6/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src6/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src6/external/lgpl3/gmp/lib/libgmp/arch/vax --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd6.0. --host=vax--netbsdelf --with-sysroot=/var/obj/mknative/vax/usr/src6/destdir.vax; +static const char configuration_arguments[] = /usr/src7/tools/gcc/../../external/gpl3/gcc/dist/configure --target=vax--netbsdelf --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb1 20120916' --with-system-zlib --enable-__cxa_atexit --with-mpc-lib=/var/obj/mknative/vax/usr/src7/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/mknative/vax/usr/src7/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/mknative/vax/usr/src7/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src7/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src7/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src7/external/lgpl3/gmp/lib/libgmp/arch/vax --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd6.0. --host=vax--netbsdelf
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc
Committed By: wiz
Date: Thu Mar 20 10:27:39 UTC 2014
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c
Log Message:
Remove obsolete chunk.
No diffs to upstream remaining :)
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.19 xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.20
--- xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c:1.19 Thu Mar 20 06:40:47 2014
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Thu Mar 20 10:27:39 2014
@@ -438,12 +438,6 @@ OpenKeyboard(InputInfoPtr pInfo)
close(pInfo-fd);
return FALSE;
}
- /* If wsKbdType==0, no keyboard attached to the mux. Assume USB. */
- if (pKbd-wsKbdType == 0) {
- xf86Msg(X_WARNING, %s: No keyboard attached, assuming USB\n,
- pInfo-name);
- pKbd-wsKbdType = WSKBD_TYPE_USB;
- }
switch (pKbd-wsKbdType) {
case WSKBD_TYPE_PC_XT:
printWsType(XT, pInfo-name);
CVS commit: src
Module Name:src
Committed By: roy
Date: Thu Mar 20 13:34:36 UTC 2014
Modified Files:
src/sys/netinet6: nd6.c
src/usr.sbin/ndp: ndp.8
Log Message:
If IPv6 is disabled for an interface, mark all addresses as tentative.
If enabled, check for a duplicated link-local address and abort enabling
as per RFC 4862, section 5.4.5. If allowed to enable, perform DAD
on the tentative addresses.
Taken from FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/ndp/ndp.8
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/nd6.c
diff -u src/sys/netinet6/nd6.c:1.147 src/sys/netinet6/nd6.c:1.148
--- src/sys/netinet6/nd6.c:1.147 Wed Jan 15 10:25:04 2014
+++ src/sys/netinet6/nd6.c Thu Mar 20 13:34:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.147 2014/01/15 10:25:04 roy Exp $ */
+/* $NetBSD: nd6.c,v 1.148 2014/03/20 13:34:35 roy Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nd6.c,v 1.147 2014/01/15 10:25:04 roy Exp $);
+__KERNEL_RCSID(0, $NetBSD: nd6.c,v 1.148 2014/03/20 13:34:35 roy Exp $);
#include opt_ipsec.h
@@ -1647,6 +1647,59 @@ nd6_ioctl(u_long cmd, void *data, struct
ND_IFINFO(ifp)-chlim = ND.chlim;
/* FALLTHROUGH */
case SIOCSIFINFO_FLAGS:
+ {
+ struct ifaddr *ifa;
+ struct in6_ifaddr *ia;
+
+ if ((ND_IFINFO(ifp)-flags ND6_IFF_IFDISABLED)
+ !(ND.flags ND6_IFF_IFDISABLED))
+ {
+ /*
+ * If the interface is marked as ND6_IFF_IFDISABLED and
+ * has a link-local address with IN6_IFF_DUPLICATED,
+ * do not clear ND6_IFF_IFDISABLED.
+ * See RFC 4862, section 5.4.5.
+ */
+ int duplicated_linklocal = 0;
+
+ IFADDR_FOREACH(ifa, ifp) {
+if (ifa-ifa_addr-sa_family != AF_INET6)
+ continue;
+ia = (struct in6_ifaddr *)ifa;
+if ((ia-ia6_flags IN6_IFF_DUPLICATED)
+IN6_IS_ADDR_LINKLOCAL(IA6_IN6(ia)))
+{
+ duplicated_linklocal = 1;
+ break;
+}
+ }
+
+ if (duplicated_linklocal) {
+ND.flags |= ND6_IFF_IFDISABLED;
+log(LOG_ERR, Cannot enable an interface
+ with a link-local address marked
+ duplicate.\n);
+ } else {
+ND_IFINFO(ifp)-flags = ~ND6_IFF_IFDISABLED;
+if (ifp-if_flags IFF_UP)
+ in6_if_up(ifp);
+ }
+ } else if (!(ND_IFINFO(ifp)-flags ND6_IFF_IFDISABLED)
+ (ND.flags ND6_IFF_IFDISABLED))
+ {
+ /* Mark all IPv6 addresses as tentative. */
+
+ ND_IFINFO(ifp)-flags |= ND6_IFF_IFDISABLED;
+ IFADDR_FOREACH(ifa, ifp) {
+if (ifa-ifa_addr-sa_family != AF_INET6)
+ continue;
+nd6_dad_stop(ifa);
+ia = (struct in6_ifaddr *)ifa;
+ia-ia6_flags |= IN6_IFF_TENTATIVE;
+ }
+ }
+ }
+
ND_IFINFO(ifp)-flags = ND.flags;
break;
#undef ND
Index: src/usr.sbin/ndp/ndp.8
diff -u src/usr.sbin/ndp/ndp.8:1.25 src/usr.sbin/ndp/ndp.8:1.26
--- src/usr.sbin/ndp/ndp.8:1.25 Fri Nov 6 20:51:43 2009
+++ src/usr.sbin/ndp/ndp.8 Thu Mar 20 13:34:35 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: ndp.8,v 1.25 2009/11/06 20:51:43 dyoung Exp $
+.\ $NetBSD: ndp.8,v 1.26 2014/03/20 13:34:35 roy Exp $
.\ $KAME: ndp.8,v 1.33 2005/10/19 14:57:42 suz Exp $
.\
.\ Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\ SUCH DAMAGE.
.\
-.Dd November 6, 2009
+.Dd March 20, 2014
.Dt NDP 8
.Os
.\
@@ -210,7 +210,10 @@ file supplied with the KAME kit.
.It Ic disabled
Disable IPv6 operation on the interface.
When disabled, the interface discards any IPv6 packets
-received on or being sent to the interface.
+received on or being sent to the interface and any IPv6 addresses
+on the interface are marked as
+.Dq tentative .
+When the disabled flag is cleared, DAD will be performed.
In the sending case, an error of ENETDOWN will be returned to the
application.
This flag is typically set automatically in the kernel as a result of
CVS commit: src/sys/external/bsd/acpica/dist/tables
Module Name:src Committed By: riastradh Date: Thu Mar 20 13:40:02 UTC 2014 Modified Files: src/sys/external/bsd/acpica/dist/tables: tbutils.c Log Message: Don't unmap Rsdp until we've finished using it. XXX Let me know how this is supposed to be upstreamed if you know and have time... To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/tables/tbutils.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/acpica/dist/tables/tbutils.c diff -u src/sys/external/bsd/acpica/dist/tables/tbutils.c:1.4 src/sys/external/bsd/acpica/dist/tables/tbutils.c:1.5 --- src/sys/external/bsd/acpica/dist/tables/tbutils.c:1.4 Fri Dec 27 18:50:57 2013 +++ src/sys/external/bsd/acpica/dist/tables/tbutils.c Thu Mar 20 13:40:02 2014 @@ -545,12 +545,6 @@ AcpiTbParseRootTable ( } /* - * It is not possible to map more than one entry in some environments, - * so unmap the RSDP here before mapping other tables - */ -AcpiOsUnmapMemory (Rsdp, sizeof (ACPI_TABLE_RSDP)); - -/* * If it is present and used, validate the XSDT for access/size * and ensure that all table entries are at least non-NULL */ @@ -569,6 +563,12 @@ AcpiTbParseRootTable ( } } +/* + * It is not possible to map more than one entry in some environments, + * so unmap the RSDP here before mapping other tables + */ +AcpiOsUnmapMemory (Rsdp, sizeof (ACPI_TABLE_RSDP)); + /* Map the RSDT/XSDT table header to get the full table length */ Table = AcpiOsMapMemory (Address, sizeof (ACPI_TABLE_HEADER));
CVS commit: src/usr.sbin/acpitools/acpidump
Module Name:src Committed By: riastradh Date: Thu Mar 20 14:39:43 UTC 2014 Modified Files: src/usr.sbin/acpitools/acpidump: acpi.c Log Message: Don't choke on an assertion for an RSDT with a null address entry. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/acpitools/acpidump/acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/acpitools/acpidump/acpi.c diff -u src/usr.sbin/acpitools/acpidump/acpi.c:1.8 src/usr.sbin/acpitools/acpidump/acpi.c:1.9 --- src/usr.sbin/acpitools/acpidump/acpi.c:1.8 Thu Feb 17 10:18:05 2011 +++ src/usr.sbin/acpitools/acpidump/acpi.c Thu Mar 20 14:39:43 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi.c,v 1.8 2011/02/17 10:18:05 jmcneill Exp $ */ +/* $NetBSD: acpi.c,v 1.9 2014/03/20 14:39:43 riastradh Exp $ */ /*- * Copyright (c) 1998 Doug Rabson @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: acpi.c,v 1.8 2011/02/17 10:18:05 jmcneill Exp $); +__RCSID($NetBSD: acpi.c,v 1.9 2014/03/20 14:39:43 riastradh Exp $); #include sys/param.h #include sys/endian.h @@ -1949,9 +1949,8 @@ acpi_print_rsdt(ACPI_TABLE_HEADER *rsdp) addr = le64toh(xsdt-TableOffsetEntry[i]); break; default: - addr = 0; + assert((addr = 0)); } - assert(addr != 0); printf(0x%08lx, addr); } printf( }\n);
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: riastradh Date: Thu Mar 20 15:20:44 UTC 2014 Modified Files: src/distrib/sets/lists/xdebug: shl.mi Log Message: Update libfreetype debug data version. Hi mrg! To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/xdebug/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/xdebug/shl.mi diff -u src/distrib/sets/lists/xdebug/shl.mi:1.13 src/distrib/sets/lists/xdebug/shl.mi:1.14 --- src/distrib/sets/lists/xdebug/shl.mi:1.13 Mon Mar 17 07:25:34 2014 +++ src/distrib/sets/lists/xdebug/shl.mi Thu Mar 20 15:20:44 2014 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.13 2014/03/17 07:25:34 mrg Exp $ +# $NetBSD: shl.mi,v 1.14 2014/03/20 15:20:44 riastradh Exp $ ./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug ./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug ./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug @@ -104,7 +104,7 @@ ./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete ./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.7.4.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.17.2.11.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.3.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug -unknown- xorg,debug
CVS commit: src/external/gpl3/gcc/lib/libgcc/arch/earm
Module Name:src Committed By: skrll Date: Thu Mar 20 15:21:46 UTC 2014 Removed Files: src/external/gpl3/gcc/lib/libgcc/arch/earm: libgcc-std.ver Log Message: Remove a file that should be generated and fix the build To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 \ src/external/gpl3/gcc/lib/libgcc/arch/earm/libgcc-std.ver Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc/config/vax
Module Name:src
Committed By: joerg
Date: Thu Mar 20 16:53:55 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/vax: vax.c vax.h vax.md
Log Message:
Annotation for the Processor Status Word. Sensible DWARF frame layout.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/config/vax/vax.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl3/gcc/dist/gcc/config/vax/vax.h
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/gcc/config/vax/vax.md
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/gcc/dist/gcc/config/vax/vax.c
diff -u src/external/gpl3/gcc/dist/gcc/config/vax/vax.c:1.4 src/external/gpl3/gcc/dist/gcc/config/vax/vax.c:1.5
--- src/external/gpl3/gcc/dist/gcc/config/vax/vax.c:1.4 Sat Mar 1 09:04:13 2014
+++ src/external/gpl3/gcc/dist/gcc/config/vax/vax.c Thu Mar 20 16:53:55 2014
@@ -162,9 +162,13 @@ vax_expand_prologue (void)
HOST_WIDE_INT size;
rtx insn;
+ offset = 20;
for (regno = 0; regno FIRST_PSEUDO_REGISTER; regno++)
if (df_regs_ever_live_p (regno) !call_used_regs[regno])
- mask |= 1 regno;
+ {
+mask |= 1 regno;
+offset += 4;
+ }
insn = emit_insn (gen_procedure_entry_mask (GEN_INT (mask)));
RTX_FRAME_RELATED_P (insn) = 1;
@@ -186,11 +190,17 @@ vax_expand_prologue (void)
The rest of the prologue will adjust the SP for the local frame. */
- vax_add_reg_cfa_offset (insn, 4, arg_pointer_rtx);
- vax_add_reg_cfa_offset (insn, 8, frame_pointer_rtx);
- vax_add_reg_cfa_offset (insn, 12, pc_rtx);
+ add_reg_note (insn, REG_CFA_DEF_CFA,
+plus_constant (Pmode, frame_pointer_rtx, offset));
+ insn = emit_insn (gen_blockage ());
+ RTX_FRAME_RELATED_P (insn) = 1;
- offset = 16;
+ vax_add_reg_cfa_offset (insn, 4, gen_rtx_REG (Pmode, PSW_REGNUM));
+ vax_add_reg_cfa_offset (insn, 8, arg_pointer_rtx);
+ vax_add_reg_cfa_offset (insn, 12, frame_pointer_rtx);
+ vax_add_reg_cfa_offset (insn, 16, pc_rtx);
+
+ offset = 20;
for (regno = 0; regno FIRST_PSEUDO_REGISTER; regno++)
if (mask (1 regno))
{
@@ -198,12 +208,6 @@ vax_expand_prologue (void)
offset += 4;
}
- /* Because add_reg_note pushes the notes, adding this last means that
- it will be processed first. This is required to allow the other
- notes be interpreted properly. */
- add_reg_note (insn, REG_CFA_DEF_CFA,
- plus_constant (Pmode, frame_pointer_rtx, offset));
-
/* Allocate the local stack frame. */
size = get_frame_size ();
size -= STARTING_FRAME_OFFSET;
Index: src/external/gpl3/gcc/dist/gcc/config/vax/vax.h
diff -u src/external/gpl3/gcc/dist/gcc/config/vax/vax.h:1.1.1.2 src/external/gpl3/gcc/dist/gcc/config/vax/vax.h:1.2
--- src/external/gpl3/gcc/dist/gcc/config/vax/vax.h:1.1.1.2 Sat Mar 1 08:43:34 2014
+++ src/external/gpl3/gcc/dist/gcc/config/vax/vax.h Thu Mar 20 16:53:55 2014
@@ -156,6 +156,9 @@ along with GCC; see the file COPYING3.
/* Specify the registers used for certain standard purposes.
The values of these macros are register numbers. */
+/* VAX PSW for DWARF-2 */
+#define PSW_REGNUM VAX_PSW_REGNUM
+
/* VAX pc is overloaded on a register. */
#define PC_REGNUM VAX_PC_REGNUM
Index: src/external/gpl3/gcc/dist/gcc/config/vax/vax.md
diff -u src/external/gpl3/gcc/dist/gcc/config/vax/vax.md:1.6 src/external/gpl3/gcc/dist/gcc/config/vax/vax.md:1.7
--- src/external/gpl3/gcc/dist/gcc/config/vax/vax.md:1.6 Sat Mar 1 09:44:50 2014
+++ src/external/gpl3/gcc/dist/gcc/config/vax/vax.md Thu Mar 20 16:53:55 2014
@@ -40,6 +40,7 @@
(VAX_FP_REGNUM 13) ; Register 13 contains the frame pointer
(VAX_SP_REGNUM 14) ; Register 14 contains the stack pointer
(VAX_PC_REGNUM 15) ; Register 15 contains the program counter
+ (VAX_PSW_REGNUM 16) ; Program Status Word
]
)
CVS commit: src/lib/libc/include
Module Name:src Committed By: christos Date: Thu Mar 20 17:25:23 UTC 2014 Modified Files: src/lib/libc/include: port_before.h Log Message: CID 273814, don't confuse coverity. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/include/port_before.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/include/port_before.h diff -u src/lib/libc/include/port_before.h:1.3 src/lib/libc/include/port_before.h:1.4 --- src/lib/libc/include/port_before.h:1.3 Thu Mar 17 15:48:50 2005 +++ src/lib/libc/include/port_before.h Thu Mar 20 13:25:23 2014 @@ -2,8 +2,12 @@ #include sys/cdefs.h #define ISC_FORMAT_PRINTF(a,b) __attribute__((__format__(__printf__,a,b))) #define ISC_SOCKLEN_T socklen_t +#ifdef __NetBSD__ +#define DE_CONST(c,v) v = __UNCONST(c) +#else #define DE_CONST(c,v) v = ((c) ? \ strchr((const void *)(c), *(const char *)(const void *)(c)) : NULL) +#endif #ifndef lint #define UNUSED(a) (void)a #else
CVS commit: src/sys/arch/sh3/sh3
Module Name:src Committed By: christos Date: Thu Mar 20 18:01:19 UTC 2014 Modified Files: src/sys/arch/sh3/sh3: db_disasm.c Log Message: kill sprintf To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sh3/sh3/db_disasm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sh3/sh3/db_disasm.c diff -u src/sys/arch/sh3/sh3/db_disasm.c:1.21 src/sys/arch/sh3/sh3/db_disasm.c:1.22 --- src/sys/arch/sh3/sh3/db_disasm.c:1.21 Fri Jun 6 22:43:10 2008 +++ src/sys/arch/sh3/sh3/db_disasm.c Thu Mar 20 14:01:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: db_disasm.c,v 1.21 2008/06/07 02:43:10 uwe Exp $ */ +/* $NetBSD: db_disasm.c,v 1.22 2014/03/20 18:01:19 christos Exp $ */ /* * Copyright (c) 1998-2000 Internet Initiative Japan Inc. @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.21 2008/06/07 02:43:10 uwe Exp $); +__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.22 2014/03/20 18:01:19 christos Exp $); #include sys/param.h #include sys/systm.h @@ -42,62 +42,62 @@ __KERNEL_RCSID(0, $NetBSD: db_disasm.c, static uint16_t get_insn(const void *); -static void get_opcode(const uint16_t *, char *); +static void get_opcode(const uint16_t *, char *, size_t); -static void f_02(const uint16_t *, char *); -static void f_03(const uint16_t *, char *); -static void f_04(const uint16_t *, char *); -static void f_08(const uint16_t *, char *); -static void f_09(const uint16_t *, char *); -static void f_0a(const uint16_t *, char *); -static void f_0b(const uint16_t *, char *); -static void f_0c(const uint16_t *, char *); -static void f_10(const uint16_t *, char *); -static void f_20(const uint16_t *, char *); -static void f_24(const uint16_t *, char *); -static void f_28(const uint16_t *, char *); -static void f_2c(const uint16_t *, char *); -static void f_30(const uint16_t *, char *); -static void f_34(const uint16_t *, char *); -static void f_38(const uint16_t *, char *); -static void f_3c(const uint16_t *, char *); -static void f_40(const uint16_t *, char *); -static void f_41(const uint16_t *, char *); -static void f_42(const uint16_t *, char *); -static void f_43(const uint16_t *, char *); -static void f_44(const uint16_t *, char *); -static void f_45(const uint16_t *, char *); -static void f_46(const uint16_t *, char *); -static void f_47(const uint16_t *, char *); -static void f_48(const uint16_t *, char *); -static void f_49(const uint16_t *, char *); -static void f_4a(const uint16_t *, char *); -static void f_4b(const uint16_t *, char *); -static void f_4c(const uint16_t *, char *); -static void f_4d(const uint16_t *, char *); -static void f_4e(const uint16_t *, char *); -static void f_4f(const uint16_t *, char *); -static void f_50(const uint16_t *, char *); -static void f_60(const uint16_t *, char *); -static void f_64(const uint16_t *, char *); -static void f_68(const uint16_t *, char *); -static void f_6c(const uint16_t *, char *); -static void f_70(const uint16_t *, char *); -static void f_80(const uint16_t *, char *); -static void f_90(const uint16_t *, char *); -static void f_a0(const uint16_t *, char *); -static void f_b0(const uint16_t *, char *); -static void f_c0(const uint16_t *, char *); -static void f_d0(const uint16_t *, char *); -static void f_e0(const uint16_t *, char *); -static void f_f0(const uint16_t *, char *); -static void f_f4(const uint16_t *, char *); -static void f_f8(const uint16_t *, char *); -static void f_fc(const uint16_t *, char *); -static void f_fd(const uint16_t *, char *); -static void f_fe(const uint16_t *, char *); +static void f_02(const uint16_t *, char *, size_t); +static void f_03(const uint16_t *, char *, size_t); +static void f_04(const uint16_t *, char *, size_t); +static void f_08(const uint16_t *, char *, size_t); +static void f_09(const uint16_t *, char *, size_t); +static void f_0a(const uint16_t *, char *, size_t); +static void f_0b(const uint16_t *, char *, size_t); +static void f_0c(const uint16_t *, char *, size_t); +static void f_10(const uint16_t *, char *, size_t); +static void f_20(const uint16_t *, char *, size_t); +static void f_24(const uint16_t *, char *, size_t); +static void f_28(const uint16_t *, char *, size_t); +static void f_2c(const uint16_t *, char *, size_t); +static void f_30(const uint16_t *, char *, size_t); +static void f_34(const uint16_t *, char *, size_t); +static void f_38(const uint16_t *, char *, size_t); +static void f_3c(const uint16_t *, char *, size_t); +static void f_40(const uint16_t *, char *, size_t); +static void f_41(const uint16_t *, char *, size_t); +static void f_42(const uint16_t *, char *, size_t); +static void f_43(const uint16_t *, char *, size_t); +static void f_44(const uint16_t *, char *, size_t); +static void f_45(const uint16_t *, char *, size_t); +static void f_46(const uint16_t *, char *, size_t); +static void f_47(const uint16_t *, char
CVS commit: src/sys/miscfs/fdesc
Module Name:src Committed By: christos Date: Thu Mar 20 18:04:05 UTC 2014 Modified Files: src/sys/miscfs/fdesc: fdesc_vnops.c Log Message: kill sprintf To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 src/sys/miscfs/fdesc/fdesc_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/miscfs/fdesc/fdesc_vnops.c diff -u src/sys/miscfs/fdesc/fdesc_vnops.c:1.118 src/sys/miscfs/fdesc/fdesc_vnops.c:1.119 --- src/sys/miscfs/fdesc/fdesc_vnops.c:1.118 Thu Feb 27 11:51:38 2014 +++ src/sys/miscfs/fdesc/fdesc_vnops.c Thu Mar 20 14:04:05 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fdesc_vnops.c,v 1.118 2014/02/27 16:51:38 hannken Exp $ */ +/* $NetBSD: fdesc_vnops.c,v 1.119 2014/03/20 18:04:05 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -41,7 +41,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fdesc_vnops.c,v 1.118 2014/02/27 16:51:38 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: fdesc_vnops.c,v 1.119 2014/03/20 18:04:05 christos Exp $); #include sys/param.h #include sys/systm.h @@ -755,7 +755,8 @@ fdesc_readdir(void *v) dt-dt_ff[j]-ff_file == NULL) continue; d.d_fileno = j + FD_STDIN; -d.d_namlen = sprintf(d.d_name, %d, j); +d.d_namlen = snprintf(d.d_name, +sizeof(d.d_name), %d, j); d.d_type = DT_UNKNOWN; break; }
CVS commit: src/sys/dev/i2o
Module Name:src
Committed By: christos
Date: Thu Mar 20 20:40:42 UTC 2014
Modified Files:
src/sys/dev/i2o: dpti.c
Log Message:
make this compile again.
XXX: 32 bit pointer issues.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/i2o/dpti.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/i2o/dpti.c
diff -u src/sys/dev/i2o/dpti.c:1.46 src/sys/dev/i2o/dpti.c:1.47
--- src/sys/dev/i2o/dpti.c:1.46 Sun Mar 16 01:20:27 2014
+++ src/sys/dev/i2o/dpti.c Thu Mar 20 16:40:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dpti.c,v 1.46 2014/03/16 05:20:27 dholland Exp $ */
+/* $NetBSD: dpti.c,v 1.47 2014/03/20 20:40:42 christos Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dpti.c,v 1.46 2014/03/16 05:20:27 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: dpti.c,v 1.47 2014/03/20 20:40:42 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -90,40 +90,40 @@ __KERNEL_RCSID(0, $NetBSD: dpti.c,v 1.4
#endif
static struct dpt_sig dpti_sig = {
- { 'd', 'P', 't', 'S', 'i', 'G'},
- SIG_VERSION,
+ .dsSignature = { 'd', 'P', 't', 'S', 'i', 'G'},
+ .dsSigVersion = SIG_VERSION,
#if defined(__i386__)
- PROC_INTEL,
+ .dsProcessorFamily = PROC_INTEL,
#elif defined(__powerpc__)
- PROC_POWERPC,
+ .dsProcessorFamily = PROC_POWERPC,
#elif defined(__alpha__)
- PROC_ALPHA,
+ .dsProcessorFamily = PROC_ALPHA,
#elif defined(__mips__)
- PROC_MIPS,
+ .dsProcessorFamily = PROC_MIPS,
#elif defined(__sparc64__)
- PROC_ULTRASPARC,
+ .dsProcessorFamily = PROC_ULTRASPARC,
#endif
#if defined(__i386__)
- PROC_386 | PROC_486 | PROC_PENTIUM | PROC_SEXIUM,
+ .dsProcessor = PROC_386 | PROC_486 | PROC_PENTIUM | PROC_SEXIUM,
#else
- 0,
+ .dsProcessor = 0,
#endif
- FT_HBADRVR,
- 0,
- OEM_DPT,
- OS_FREE_BSD, /* XXX */
- CAP_ABOVE16MB,
- DEV_ALL,
- ADF_ALL_SC5,
- 0,
- 0,
- DPTI_VERSION,
- DPTI_REVISION,
- DPTI_SUBREVISION,
- DPTI_MONTH,
- DPTI_DAY,
- DPTI_YEAR,
- /* Will be filled later */
+ .dsFiletype = FT_HBADRVR,
+ .dsFiletypeFlags = 0,
+ .dsOEM = OEM_DPT,
+ .dsOS = (uint32_t)OS_FREE_BSD, /* XXX */
+ .dsCapabilities = CAP_ABOVE16MB,
+ .dsDeviceSupp = DEV_ALL,
+ .dsAdapterSupp = ADF_ALL_SC5,
+ .dsApplication = 0,
+ .dsRequirements = 0,
+ .dsVersion = DPTI_VERSION,
+ .dsRevision = DPTI_REVISION,
+ .dsSubRevision = DPTI_SUBREVISION,
+ .dsMonth = DPTI_MONTH,
+ .dsDay = DPTI_DAY,
+ .dsYear = DPTI_YEAR,
+ .dsDescription = { '\0' }, /* Will be filled later */
};
void dpti_attach(device_t, device_t, void *);
@@ -583,7 +583,8 @@ dpti_passthrough(struct dpti_softc *sc,
goto bad;
}
-bufs[nbuf].db_ptr = (void *)p[1];
+// XXX: 32 bits
+bufs[nbuf].db_ptr = (void *)(intptr_t)p[1];
bufs[nbuf].db_proc = proc;
bufs[nbuf].db_size = p[0] 0x00ff;
@@ -608,8 +609,9 @@ dpti_passthrough(struct dpti_softc *sc,
bufs[nbuf].db_frags[nfrag].iov_len =
p[0] 0x00ff;
+// XXX: 32 bits
bufs[nbuf].db_frags[nfrag].iov_base =
-(void *)p[1];
+(void *)(intptr_t)p[1];
sz += p[0] 0x00ff;
nfrag++;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Thu Mar 20 20:41:11 UTC 2014
Modified Files:
src/sys/dev/pci: oboe.c
Log Message:
make it compile on amd64
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/pci/oboe.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/oboe.c
diff -u src/sys/dev/pci/oboe.c:1.39 src/sys/dev/pci/oboe.c:1.40
--- src/sys/dev/pci/oboe.c:1.39 Sat Oct 27 13:18:35 2012
+++ src/sys/dev/pci/oboe.c Thu Mar 20 16:41:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: oboe.c,v 1.39 2012/10/27 17:18:35 chs Exp $ */
+/* $NetBSD: oboe.c,v 1.40 2014/03/20 20:41:11 christos Exp $ */
/* FVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage */
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: oboe.c,v 1.39 2012/10/27 17:18:35 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: oboe.c,v 1.40 2014/03/20 20:41:11 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -298,9 +298,9 @@ oboe_read(void *h, struct uio *uio, int
int s;
int slot;
- DPRINTF((%s: resid=%d, iovcnt=%d, offset=%ld\n,
+ DPRINTF((%s: resid=%zu, iovcnt=%d, offset=%td\n,
__func__, uio-uio_resid, uio-uio_iovcnt,
- (long)uio-uio_offset));
+ uio-uio_offset));
s = splir();
while (sc-sc_saved == 0) {
@@ -324,7 +324,7 @@ oboe_read(void *h, struct uio *uio, int
slot = (sc-sc_rxs - sc-sc_saved + RX_SLOTS) % RX_SLOTS;
if (uio-uio_resid sc-sc_lens[slot]) {
DPRINTF((oboe_read: uio buffer smaller than frame size
- (%d %d)\n, uio-uio_resid, sc-sc_lens[slot]));
+ (%zu %d)\n, uio-uio_resid, sc-sc_lens[slot]));
error = EINVAL;
} else {
DPRINTF((oboe_read: moving %d bytes from %p\n,
@@ -618,14 +618,14 @@ oboe_init_taskfile(struct oboe_softc *sc
sc-sc_taskfile-xmit[i].len = 0;
sc-sc_taskfile-xmit[i].control = 0x00;
sc-sc_taskfile-xmit[i].buffer =
- vtophys((u_int)sc-sc_xmit_bufs[i]); /* u_int? */
+ vtophys((uintptr_t)sc-sc_xmit_bufs[i]);
}
for (i = 0; i RX_SLOTS; ++i) {
sc-sc_taskfile-recv[i].len = 0;
sc-sc_taskfile-recv[i].control = 0x83;
sc-sc_taskfile-recv[i].buffer =
- vtophys((u_int)sc-sc_recv_bufs[i]); /* u_int? */
+ vtophys((uintptr_t)sc-sc_recv_bufs[i]);
}
sc-sc_txpending = 0;
@@ -638,7 +638,8 @@ oboe_alloc_taskfile(struct oboe_softc *s
{
int i;
/* XXX */
- uint32_t addr = (uint32_t)malloc(OBOE_TASK_BUF_LEN, M_DEVBUF, M_WAITOK);
+ uintptr_t addr =
+ (uintptr_t)malloc(OBOE_TASK_BUF_LEN, M_DEVBUF, M_WAITOK);
if (addr == 0) {
goto bad;
}
@@ -686,7 +687,7 @@ oboe_startchip (struct oboe_softc *sc)
OUTB(sc, 0x0f, OBOE_REG_1A);
OUTB(sc, 0xff, OBOE_REG_1B);
- physaddr = vtophys((u_int)sc-sc_taskfile); /* u_int? */
+ physaddr = vtophys((uintptr_t)sc-sc_taskfile);
OUTB(sc, (physaddr 0x0a) 0xff, OBOE_TFP0);
OUTB(sc, (physaddr 0x12) 0xff, OBOE_TFP1);
CVS commit: src/sys/rump
Module Name:src
Committed By: christos
Date: Thu Mar 20 20:42:08 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libugenhc: ugenhc.c
src/sys/rump/librump/rumpkern: rump.c
src/sys/rump/librump/rumpvfs: devnodes.c
src/sys/rump/net/lib/libshmif: if_shmem.c
src/sys/rump/net/lib/libvirtif: if_virt.c
Log Message:
kill sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/dev/lib/libugenhc/ugenhc.c
cvs rdiff -u -r1.290 -r1.291 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpvfs/devnodes.c
cvs rdiff -u -r1.59 -r1.60 src/sys/rump/net/lib/libshmif/if_shmem.c
cvs rdiff -u -r1.45 -r1.46 src/sys/rump/net/lib/libvirtif/if_virt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/libugenhc/ugenhc.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.17 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.18
--- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.17 Wed Mar 12 21:38:11 2014
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Thu Mar 20 16:42:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc.c,v 1.17 2014/03/13 01:38:11 pooka Exp $ */
+/* $NetBSD: ugenhc.c,v 1.18 2014/03/20 20:42:08 christos Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.17 2014/03/13 01:38:11 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.18 2014/03/20 20:42:08 christos Exp $);
#include sys/param.h
#include sys/bus.h
@@ -120,11 +120,11 @@ struct rusb_xfer {
#define UGENDEV_BASESTR /dev/ugen
#define UGENDEV_BUFSIZE 32
static void
-makeugendevstr(int devnum, int endpoint, char *buf)
+makeugendevstr(int devnum, int endpoint, char *buf, size_t len)
{
CTASSERT(UGENDEV_BUFSIZE sizeof(UGENDEV_BASESTR)+sizeof(0.00)+1);
- sprintf(buf, %s%d.%02d, UGENDEV_BASESTR, devnum, endpoint);
+ snprintf(buf, len, %s%d.%02d, UGENDEV_BASESTR, devnum, endpoint);
}
/*
@@ -596,7 +596,7 @@ rhscintr(void *arg)
usbd_xfer_handle xfer;
int fd, error;
- makeugendevstr(sc-sc_devnum, 0, buf);
+ makeugendevstr(sc-sc_devnum, 0, buf, sizeof(buf));
for (;;) {
/*
@@ -969,7 +969,7 @@ ugenhc_open(struct usbd_pipe *pipe)
oflags = O_RDWR;
}
- makeugendevstr(sc-sc_devnum, endpt, buf);
+ makeugendevstr(sc-sc_devnum, endpt, buf, sizeof(buf));
/* XXX: theoretically should convert oflags */
error = rumpuser_open(buf, oflags, fd);
if (error != 0) {
@@ -1057,7 +1057,7 @@ ugenhc_probe(device_t parent, cfdata_t m
{
char buf[UGENDEV_BUFSIZE];
- makeugendevstr(match-cf_unit, 0, buf);
+ makeugendevstr(match-cf_unit, 0, buf, sizeof(buf));
if (rumpuser_getfileinfo(buf, NULL, NULL) != 0)
return 0;
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.290 src/sys/rump/librump/rumpkern/rump.c:1.291
--- src/sys/rump/librump/rumpkern/rump.c:1.290 Sat Mar 15 11:15:27 2014
+++ src/sys/rump/librump/rumpkern/rump.c Thu Mar 20 16:42:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.290 2014/03/15 15:15:27 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.291 2014/03/20 20:42:08 christos Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.290 2014/03/15 15:15:27 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.291 2014/03/20 20:42:08 christos Exp $);
#include sys/systm.h
#define ELFSIZE ARCH_ELFSIZE
@@ -512,7 +512,8 @@ rump_init(void)
#undef CPFX
#undef CPFXLEN
} else {
- sprintf(buf, rumpns_sys_%s, syscallnames[i]);
+ snprintf(buf, sizeof(buf), rumpns_sys_%s,
+ syscallnames[i]);
}
if ((sym = rumpuser_dl_globalsym(buf)) != NULL
sym != rump_sysent[i].sy_call) {
Index: src/sys/rump/librump/rumpvfs/devnodes.c
diff -u src/sys/rump/librump/rumpvfs/devnodes.c:1.8 src/sys/rump/librump/rumpvfs/devnodes.c:1.9
--- src/sys/rump/librump/rumpvfs/devnodes.c:1.8 Thu Mar 7 17:12:34 2013
+++ src/sys/rump/librump/rumpvfs/devnodes.c Thu Mar 20 16:42:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: devnodes.c,v 1.8 2013/03/07 22:12:34 pooka Exp $ */
+/* $NetBSD: devnodes.c,v 1.9 2014/03/20 20:42:08 christos Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: devnodes.c,v 1.8 2013/03/07 22:12:34 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: devnodes.c,v 1.9 2014/03/20 20:42:08 christos Exp $);
#include sys/param.h
#include sys/device.h
@@ -110,8 +110,8 @@ doesitexist(const char *path, bool isblk
}
static void
-makeonenode(char *buf, devmajor_t blk, devmajor_t chr, devminor_t dmin,
- const char *base, int c1, int c2)
+makeonenode(char *buf, size_t len, devmajor_t blk, devmajor_t chr,
+devminor_t dmin, const char *base, int c1, int c2)
{
char cstr1[2] = {0,0}, cstr2[2] =
CVS commit: src/sys/lib/libsa
Module Name:src Committed By: christos Date: Thu Mar 20 20:42:37 UTC 2014 Modified Files: src/sys/lib/libsa: bootp.c Log Message: kill sprintf To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/lib/libsa/bootp.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/lib/libsa/bootp.c diff -u src/sys/lib/libsa/bootp.c:1.38 src/sys/lib/libsa/bootp.c:1.39 --- src/sys/lib/libsa/bootp.c:1.38 Wed May 11 12:23:40 2011 +++ src/sys/lib/libsa/bootp.c Thu Mar 20 16:42:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: bootp.c,v 1.38 2011/05/11 16:23:40 zoltan Exp $ */ +/* $NetBSD: bootp.c,v 1.39 2014/03/20 20:42:37 christos Exp $ */ /* * Copyright (c) 1992 Regents of the University of California. @@ -106,7 +106,7 @@ bootp_addvend(u_char *area) *area++ = TAG_SWAPSERVER; /* Insert a NetBSD Vendor Class Identifier option. */ - sprintf(vci, NetBSD:%s:libsa, MACHINE); + snprintf(vci, sizeof(vci), NetBSD:%s:libsa, MACHINE); vcilen = strlen(vci); *area++ = TAG_CLASSID; *area++ = vcilen;
CVS commit: src/sys/netisdn
Module Name:src Committed By: christos Date: Thu Mar 20 20:43:35 UTC 2014 Modified Files: src/sys/netisdn: i4b_capi_msgs.c Log Message: XXX: 32 bit pointer To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/netisdn/i4b_capi_msgs.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/netisdn/i4b_capi_msgs.c diff -u src/sys/netisdn/i4b_capi_msgs.c:1.7 src/sys/netisdn/i4b_capi_msgs.c:1.8 --- src/sys/netisdn/i4b_capi_msgs.c:1.7 Sun Dec 11 07:25:06 2005 +++ src/sys/netisdn/i4b_capi_msgs.c Thu Mar 20 16:43:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: i4b_capi_msgs.c,v 1.7 2005/12/11 12:25:06 christos Exp $ */ +/* $NetBSD: i4b_capi_msgs.c,v 1.8 2014/03/20 20:43:35 christos Exp $ */ /* * Copyright (c) 2001-2003 Cubical Solutions Ltd. All rights reserved. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: i4b_capi_msgs.c,v 1.7 2005/12/11 12:25:06 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: i4b_capi_msgs.c,v 1.8 2014/03/20 20:43:35 christos Exp $); #include sys/param.h #include sys/kernel.h @@ -726,7 +726,8 @@ void capi_data_b3_req(capi_softc_t *sc, msg = capimsg_setu16(msg, msgid); msg = capimsg_setu32(msg, sc-sc_bchan[chan].ncci); -msg = capimsg_setu32(msg, (u_int32_t) m_b3-m_data); /* Pointer */ +/* XXX: 32bit Pointer */ +msg = capimsg_setu32(msg, (u_int32_t)(intptr_t)m_b3-m_data); msg = capimsg_setu16(msg, m_b3-m_len); msg = capimsg_setu16(msg, chan); msg = capimsg_setu16(msg, 0); /* Flags */
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src
Committed By: christos
Date: Thu Mar 20 20:43:12 UTC 2014
Modified Files:
src/sys/external/bsd/ipf/netinet: fil.c ip_compat.h ip_fil_compat.c
ip_ftp_pxy.c ip_htable.c ip_irc_pxy.c ip_lookup.c ip_pool.c
ip_rpcb_pxy.c radix_ipf.c
Log Message:
kill sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/ipf/netinet/fil.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/ipf/netinet/ip_compat.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/ipf/netinet/ip_fil_compat.c \
src/sys/external/bsd/ipf/netinet/ip_irc_pxy.c \
src/sys/external/bsd/ipf/netinet/ip_lookup.c \
src/sys/external/bsd/ipf/netinet/ip_pool.c \
src/sys/external/bsd/ipf/netinet/ip_rpcb_pxy.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/ipf/netinet/ip_ftp_pxy.c \
src/sys/external/bsd/ipf/netinet/radix_ipf.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/ipf/netinet/ip_htable.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/ipf/netinet/fil.c
diff -u src/sys/external/bsd/ipf/netinet/fil.c:1.13 src/sys/external/bsd/ipf/netinet/fil.c:1.14
--- src/sys/external/bsd/ipf/netinet/fil.c:1.13 Wed Nov 27 17:18:06 2013
+++ src/sys/external/bsd/ipf/netinet/fil.c Thu Mar 20 16:43:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fil.c,v 1.13 2013/11/27 22:18:06 christos Exp $ */
+/* $NetBSD: fil.c,v 1.14 2014/03/20 20:43:12 christos Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -138,7 +138,7 @@ extern struct timeout ipf_slowtimer_ch;
#if !defined(lint)
#if defined(__NetBSD__)
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fil.c,v 1.13 2013/11/27 22:18:06 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: fil.c,v 1.14 2014/03/20 20:43:12 christos Exp $);
#else
static const char sccsid[] = @(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed;
static const char rcsid[] = @(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $;
@@ -4196,14 +4196,14 @@ ipf_getstat(ipf_main_softc_t *softc, fri
fiop-f_features = ipf_features;
#ifdef IPFILTER_COMPAT
- sprintf(fiop-f_version, IP Filter: v%d.%d.%d,
- (rev / 100) % 100,
- (rev / 1) % 100,
- (rev / 100) % 100);
+ snprintf(fiop-f_version, sizeof(fiop-f_version),
+ IP Filter: v%d.%d.%d, (rev / 100) % 100,
+ (rev / 1) % 100, (rev / 100) % 100);
#else
rev = rev;
(void) strncpy(fiop-f_version, ipfilter_version,
sizeof(fiop-f_version));
+fiop-f_version[sizeof(fiop-f_version) - 1] = '\0';
#endif
}
@@ -5392,11 +5392,7 @@ ipf_grpmapinit(ipf_main_softc_t *softc,
char name[FR_GROUPLEN];
iphtable_t *iph;
-#if defined(SNPRINTF) defined(_KERNEL)
- SNPRINTF(name, sizeof(name), %d, fr-fr_arg);
-#else
- (void) sprintf(name, %d, fr-fr_arg);
-#endif
+ (void) snprintf(name, sizeof(name), %d, fr-fr_arg);
iph = ipf_lookup_find_htable(softc, IPL_LOGIPF, name);
if (iph == NULL) {
IPFERROR(38);
@@ -5932,12 +5928,9 @@ ipf_getifname(ifp, buffer)
unit = ifp-if_unit;
space = LIFNAMSIZ - (s - buffer);
if ((space 0) (unit = 0)) {
-# if defined(SNPRINTF) defined(_KERNEL)
- SNPRINTF(temp, sizeof(temp), %d, unit);
-# else
- (void) sprintf(temp, %d, unit);
-# endif
+ snprintf(temp, sizeof(temp), %d, unit);
(void) strncpy(s, temp, space);
+ s[space - 1] = '\0';
}
# endif
return buffer;
Index: src/sys/external/bsd/ipf/netinet/ip_compat.h
diff -u src/sys/external/bsd/ipf/netinet/ip_compat.h:1.6 src/sys/external/bsd/ipf/netinet/ip_compat.h:1.7
--- src/sys/external/bsd/ipf/netinet/ip_compat.h:1.6 Wed Jan 9 08:23:20 2013
+++ src/sys/external/bsd/ipf/netinet/ip_compat.h Thu Mar 20 16:43:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_compat.h,v 1.6 2013/01/09 13:23:20 christos Exp $ */
+/* $NetBSD: ip_compat.h,v 1.7 2014/03/20 20:43:12 christos Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -235,7 +235,6 @@ struct file;
# include inet/ip_ire.h
# endif
# if SOLARIS2 = 8
-# define SNPRINTF snprintf
# include inet/ip_if.h
# define ipif_local_addr ipif_lcl_addr
@@ -431,7 +430,6 @@ typedef struct ip6_hdr ip6_t;
# ifdef _KERNEL
# define FASTROUTE_RECURSION 1
-# define SNPRINTF sprintf
# if (HPUXREV = )
# define IPL_SELECT
# ifdef IPL_SELECT
@@ -1173,7 +1171,6 @@ typedef u_int32_t u_32_t;
# include bpfilter.h
# endif
# if (OpenBSD = 200311)
-# define SNPRINTF snprintf
# if defined(USE_INET6)
#include netinet6/in6_var.h
#include netinet6/nd6.h
Index: src/sys/external/bsd/ipf/netinet/ip_fil_compat.c
diff -u src/sys/external/bsd/ipf/netinet/ip_fil_compat.c:1.3 src/sys/external/bsd/ipf/netinet/ip_fil_compat.c:1.4
--- src/sys/external/bsd/ipf/netinet/ip_fil_compat.c:1.3 Sun Jul 22 10:27:51 2012
+++ src/sys/external/bsd/ipf/netinet/ip_fil_compat.c Thu Mar 20 16:43:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil_compat.c,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */
+/* $NetBSD: ip_fil_compat.c,v 1.4 2014/03/20
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: christos Date: Thu Mar 20 20:44:42 UTC 2014 Modified Files: src/sys/arch/x86/x86: sys_machdep.c Log Message: need compat_netbsd.h To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x86/x86/sys_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/x86/sys_machdep.c diff -u src/sys/arch/x86/x86/sys_machdep.c:1.26 src/sys/arch/x86/x86/sys_machdep.c:1.27 --- src/sys/arch/x86/x86/sys_machdep.c:1.26 Thu Oct 4 17:23:45 2012 +++ src/sys/arch/x86/x86/sys_machdep.c Thu Mar 20 16:44:42 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_machdep.c,v 1.26 2012/10/04 21:23:45 dsl Exp $ */ +/* $NetBSD: sys_machdep.c,v 1.27 2014/03/20 20:44:42 christos Exp $ */ /*- * Copyright (c) 1998, 2007, 2009 The NetBSD Foundation, Inc. @@ -30,11 +30,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sys_machdep.c,v 1.26 2012/10/04 21:23:45 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: sys_machdep.c,v 1.27 2014/03/20 20:44:42 christos Exp $); #include opt_mtrr.h #include opt_perfctrs.h #include opt_user_ldt.h +#include opt_compat_netbsd.h #ifdef i386 #include opt_vm86.h #endif
CVS commit: src/sys/netinet
Module Name:src Committed By: christos Date: Thu Mar 20 20:44:15 UTC 2014 Modified Files: src/sys/netinet: in_proto.c Log Message: need compat header. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/netinet/in_proto.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/netinet/in_proto.c diff -u src/sys/netinet/in_proto.c:1.107 src/sys/netinet/in_proto.c:1.108 --- src/sys/netinet/in_proto.c:1.107 Thu Jan 2 13:29:01 2014 +++ src/sys/netinet/in_proto.c Thu Mar 20 16:44:15 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: in_proto.c,v 1.107 2014/01/02 18:29:01 pooka Exp $ */ +/* $NetBSD: in_proto.c,v 1.108 2014/03/20 20:44:15 christos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,13 +61,14 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: in_proto.c,v 1.107 2014/01/02 18:29:01 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: in_proto.c,v 1.108 2014/03/20 20:44:15 christos Exp $); #include opt_mrouting.h #include opt_inet.h #include opt_ipsec.h #include opt_pim.h #include opt_gateway.h +#include opt_compat_netbsd.h #include sys/param.h #include sys/socket.h
CVS commit: src/sys/arch/amd64/include
Module Name:src Committed By: christos Date: Thu Mar 20 20:45:32 UTC 2014 Modified Files: src/sys/arch/amd64/include: pmc.h types.h Log Message: make pmc compile with amd64 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amd64/include/pmc.h cvs rdiff -u -r1.43 -r1.44 src/sys/arch/amd64/include/types.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/amd64/include/pmc.h diff -u src/sys/arch/amd64/include/pmc.h:1.1 src/sys/arch/amd64/include/pmc.h:1.2 --- src/sys/arch/amd64/include/pmc.h:1.1 Sat Apr 26 14:39:46 2003 +++ src/sys/arch/amd64/include/pmc.h Thu Mar 20 16:45:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: pmc.h,v 1.1 2003/04/26 18:39:46 fvdl Exp $ */ +/* $NetBSD: pmc.h,v 1.2 2014/03/20 20:45:32 christos Exp $ */ /*- * Copyright (c) 2000 Zembu Labs, Inc. @@ -34,10 +34,38 @@ */ #ifdef _KERNEL +/* + * LEGACY PMC support + */ +struct x86_64_pmc_info_args; int pmc_info(struct proc *, struct x86_64_pmc_info_args *, register_t *); +struct x86_64_pmc_startstop_args; int pmc_startstop(struct proc *, struct x86_64_pmc_startstop_args *, register_t *); +struct x86_64_pmc_read_args; int pmc_read(struct proc *, struct x86_64_pmc_read_args *, register_t *); +/* END LEGACY PMC SUPPORT */ + +#define pmc_md_fork(p1,p2) +#define pmc_get_num_counters() (0) +#define pmc_get_counter_type(c) (0) +#define pmc_save_context(p) +#define pmc_restore_context(p) +#define pmc_enable_counter(p,c) +#define pmc_disable_counter(p,c) +#define pmc_accumulate(p1,p2) +#define pmc_process_exit(p1) +#define pmc_counter_isconfigured(p,c) (0) +#define pmc_counter_isrunning(p,c) (0) +#define pmc_start_profiling(c,f) (0) +#define pmc_stop_profiling(c) (0) +#define pmc_alloc_kernel_counter(c,f) (0) +#define pmc_free_kernel_counter(c) (0) +#define pmc_configure_counter(p,c,f) (0) +#define pmc_get_counter_value(p,c,f,pv) (0) + +#define PMC_ENABLED(p) (0) + #endif Index: src/sys/arch/amd64/include/types.h diff -u src/sys/arch/amd64/include/types.h:1.43 src/sys/arch/amd64/include/types.h:1.44 --- src/sys/arch/amd64/include/types.h:1.43 Sat Nov 30 20:05:16 2013 +++ src/sys/arch/amd64/include/types.h Thu Mar 20 16:45:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.43 2013/12/01 01:05:16 christos Exp $ */ +/* $NetBSD: types.h,v 1.44 2014/03/20 20:45:32 christos Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -60,6 +60,8 @@ typedef unsigned long vsize_t; #define PRIuVSIZE lu #endif +typedef int pmc_evid_t; +typedef __uint64_t pmc_ctr_t; typedef long int register_t; typedef int register32_t; #define PRIxREGISTER lx
CVS commit: src/sys/arch/alpha/alpha
Module Name:src
Committed By: christos
Date: Thu Mar 20 20:51:40 UTC 2014
Modified Files:
src/sys/arch/alpha/alpha: db_disasm.c machdep.c trap.c
Log Message:
kill sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/alpha/alpha/db_disasm.c
cvs rdiff -u -r1.342 -r1.343 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.129 -r1.130 src/sys/arch/alpha/alpha/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/alpha/db_disasm.c
diff -u src/sys/arch/alpha/alpha/db_disasm.c:1.15 src/sys/arch/alpha/alpha/db_disasm.c:1.16
--- src/sys/arch/alpha/alpha/db_disasm.c:1.15 Sun Feb 5 21:14:10 2012
+++ src/sys/arch/alpha/alpha/db_disasm.c Thu Mar 20 16:51:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.15 2012/02/06 02:14:10 matt Exp $ */
+/* $NetBSD: db_disasm.c,v 1.16 2014/03/20 20:51:40 christos Exp $ */
/*
* Mach Operating System
@@ -48,7 +48,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.15 2012/02/06 02:14:10 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_disasm.c,v 1.16 2014/03/20 20:51:40 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -199,7 +199,7 @@ pal_opname(int op)
return (pal_op_tbl[i].name);
}
- sprintf(unk, 0x%x, op);
+ snprintf(unk, sizeof(unk), 0x%x, op);
return (unk);
}
@@ -253,7 +253,7 @@ arit_name(int op)
if (name != NULL)
return (name);
- sprintf(unk, ?arit 0x%x?, op);
+ snprintf(unk, sizeof(unk), ?arit 0x%x?, op);
return (unk);
}
@@ -301,7 +301,7 @@ logical_name(int op)
if (name != NULL)
return (name);
- sprintf(unk, ?logical 0x%x?, op);
+ snprintf(unk, sizeof(unk), ?logical 0x%x?, op);
return (unk);
}
@@ -344,7 +344,7 @@ bitop_name(int op)
if (name != NULL)
return (name);
- sprintf(unk, ?bit 0x%x?, op);
+ snprintf(unk, sizeof(unk), ?bit 0x%x?, op);
return (unk);
}
@@ -366,7 +366,7 @@ mul_name(int op)
if (name != NULL)
return (name);
- sprintf(unk, ?mul 0x%x?, op);
+ snprintf(unk, sizeof(unk), ?mul 0x%x?, op);
return (unk);
}
@@ -398,7 +398,7 @@ special_name(int op)
if (name != NULL)
return (name);
- sprintf(unk, ?special 0x%x?, op);
+ snprintf(unk, sizeof(unk), ?special 0x%x?, op);
return (unk);
}
@@ -435,7 +435,7 @@ intmisc_name(int op)
case op_ftois: return (ftois);
}
- sprintf(unk, ?intmisc 0x%x?, op);
+ snprintf(unk, sizeof(unk), ?intmisc 0x%x?, op);
return (unk);
}
@@ -450,7 +450,7 @@ float_name(const struct tbl *tbl, int op
return (tbl[i].name);
}
- sprintf(unk, ?%s 0x%x?, type, op);
+ snprintf(unk, sizeof(unk), ?%s 0x%x?, type, op);
return (unk);
}
Index: src/sys/arch/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.342 src/sys/arch/alpha/alpha/machdep.c:1.343
--- src/sys/arch/alpha/alpha/machdep.c:1.342 Tue Sep 11 22:00:53 2012
+++ src/sys/arch/alpha/alpha/machdep.c Thu Mar 20 16:51:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.342 2012/09/12 02:00:53 manu Exp $ */
+/* $NetBSD: machdep.c,v 1.343 2014/03/20 20:51:40 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.342 2012/09/12 02:00:53 manu Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.343 2014/03/20 20:51:40 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -928,7 +928,7 @@ alpha_unknown_sysname(void)
{
static char s[128]; /* safe size */
- sprintf(s, %s family, unknown model variation 0x%lx,
+ snprintf(s, sizeof(s), %s family, unknown model variation 0x%lx,
platform.family, hwrpb-rpb_variation SV_ST_MASK);
return ((const char *)s);
}
Index: src/sys/arch/alpha/alpha/trap.c
diff -u src/sys/arch/alpha/alpha/trap.c:1.129 src/sys/arch/alpha/alpha/trap.c:1.130
--- src/sys/arch/alpha/alpha/trap.c:1.129 Mon Nov 4 11:57:32 2013
+++ src/sys/arch/alpha/alpha/trap.c Thu Mar 20 16:51:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.129 2013/11/04 16:57:32 christos Exp $ */
+/* $NetBSD: trap.c,v 1.130 2014/03/20 20:51:40 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.129 2013/11/04 16:57:32 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.130 2014/03/20 20:51:40 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -174,7 +174,7 @@ printtrap(const u_long a0, const u_long
entryname = system call;
break;
default:
- sprintf(ubuf, type %lx, entry);
+ snprintf(ubuf, sizeof(ubuf), type %lx, entry);
entryname = (const char *) ubuf;
break;
}
CVS commit: src/sys/altq
Module Name:src
Committed By: christos
Date: Thu Mar 20 20:51:54 UTC 2014
Modified Files:
src/sys/altq: altq_afmap.c altq_cbq.c altq_wfq.c
Log Message:
kill sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/altq/altq_afmap.c src/sys/altq/altq_wfq.c
cvs rdiff -u -r1.26 -r1.27 src/sys/altq/altq_cbq.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/altq/altq_afmap.c
diff -u src/sys/altq/altq_afmap.c:1.19 src/sys/altq/altq_afmap.c:1.20
--- src/sys/altq/altq_afmap.c:1.19 Thu Nov 6 19:20:01 2008
+++ src/sys/altq/altq_afmap.c Thu Mar 20 16:51:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_afmap.c,v 1.19 2008/11/07 00:20:01 dyoung Exp $ */
+/* $NetBSD: altq_afmap.c,v 1.20 2014/03/20 20:51:54 christos Exp $ */
/* $KAME: altq_afmap.c,v 1.12 2005/04/13 03:44:24 suz Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: altq_afmap.c,v 1.19 2008/11/07 00:20:01 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: altq_afmap.c,v 1.20 2014/03/20 20:51:54 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_altq.h
@@ -334,7 +334,8 @@ afmclose(dev_t dev, int flag, int fmt, s
head = head-afh_chain.le_next) {
/* call interface to clean up maps */
- sprintf(fmap.af_ifname, %s, head-afh_ifp-if_xname);
+ snprintf(fmap.af_ifname, sizeof(fmap.af_ifname),
+ %s, head-afh_ifp-if_xname);
err = afmioctl(dev, AFM_CLEANFMAP, (void *)fmap, flag, l);
if (err error == 0)
error = err;
Index: src/sys/altq/altq_wfq.c
diff -u src/sys/altq/altq_wfq.c:1.19 src/sys/altq/altq_wfq.c:1.20
--- src/sys/altq/altq_wfq.c:1.19 Thu Sep 11 13:58:59 2008
+++ src/sys/altq/altq_wfq.c Thu Mar 20 16:51:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_wfq.c,v 1.19 2008/09/11 17:58:59 joerg Exp $ */
+/* $NetBSD: altq_wfq.c,v 1.20 2014/03/20 20:51:54 christos Exp $ */
/* $KAME: altq_wfq.c,v 1.14 2005/04/13 03:44:25 suz Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: altq_wfq.c,v 1.19 2008/09/11 17:58:59 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: altq_wfq.c,v 1.20 2014/03/20 20:51:54 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_altq.h
@@ -658,7 +658,8 @@ wfqclose(dev_t dev, int flag, int fmt,
s = splnet();
while ((wfqp = wfq_list) != NULL) {
ifp = wfqp-ifq-altq_ifp;
- sprintf(iface.wfq_ifacename, %s, ifp-if_xname);
+ snprintf(iface.wfq_ifacename, sizeof(iface.wfq_ifacename),
+ %s, ifp-if_xname);
wfq_ifdetach(iface);
}
splx(s);
Index: src/sys/altq/altq_cbq.c
diff -u src/sys/altq/altq_cbq.c:1.26 src/sys/altq/altq_cbq.c:1.27
--- src/sys/altq/altq_cbq.c:1.26 Sun Nov 22 13:40:26 2009
+++ src/sys/altq/altq_cbq.c Thu Mar 20 16:51:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cbq.c,v 1.26 2009/11/22 18:40:26 mbalmer Exp $ */
+/* $NetBSD: altq_cbq.c,v 1.27 2014/03/20 20:51:54 christos Exp $ */
/* $KAME: altq_cbq.c,v 1.21 2005/04/13 03:44:24 suz Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: altq_cbq.c,v 1.26 2009/11/22 18:40:26 mbalmer Exp $);
+__KERNEL_RCSID(0, $NetBSD: altq_cbq.c,v 1.27 2014/03/20 20:51:54 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_altq.h
@@ -990,7 +990,8 @@ cbqclose(dev_t dev, int flag, int fmt,
while (cbq_list) {
ifp = cbq_list-ifnp.ifq_-altq_ifp;
- sprintf(iface.cbq_ifacename, %s, ifp-if_xname);
+ snprintf(iface.cbq_ifacename, sizeof(iface.cbq_ifacename),
+ %s, ifp-if_xname);
err = cbq_ifdetach(iface);
if (err != 0 error == 0)
error = err;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Thu Mar 20 21:30:52 UTC 2014
Modified Files:
src/sys/dev/pci: oboe.c
Log Message:
fix format confusion
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/pci/oboe.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/oboe.c
diff -u src/sys/dev/pci/oboe.c:1.40 src/sys/dev/pci/oboe.c:1.41
--- src/sys/dev/pci/oboe.c:1.40 Thu Mar 20 16:41:11 2014
+++ src/sys/dev/pci/oboe.c Thu Mar 20 17:30:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: oboe.c,v 1.40 2014/03/20 20:41:11 christos Exp $ */
+/* $NetBSD: oboe.c,v 1.41 2014/03/20 21:30:52 christos Exp $ */
/* FVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage */
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: oboe.c,v 1.40 2014/03/20 20:41:11 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: oboe.c,v 1.41 2014/03/20 21:30:52 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -298,9 +298,9 @@ oboe_read(void *h, struct uio *uio, int
int s;
int slot;
- DPRINTF((%s: resid=%zu, iovcnt=%d, offset=%td\n,
+ DPRINTF((%s: resid=%zu, iovcnt=%d, offset=%jd\n,
__func__, uio-uio_resid, uio-uio_iovcnt,
- uio-uio_offset));
+ (intmax_t)uio-uio_offset));
s = splir();
while (sc-sc_saved == 0) {
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Thu Mar 20 22:19:38 UTC 2014
Modified Files:
src/sys/arch/arm/arm32: cpu.c
Log Message:
Define cache type 13
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/arm/arm32/cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.101 src/sys/arch/arm/arm32/cpu.c:1.102
--- src/sys/arch/arm/arm32/cpu.c:1.101 Mon Mar 3 08:15:36 2014
+++ src/sys/arch/arm/arm32/cpu.c Thu Mar 20 22:19:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.101 2014/03/03 08:15:36 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.102 2014/03/20 22:19:38 matt Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.101 2014/03/03 08:15:36 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.102 2014/03/20 22:19:38 matt Exp $);
#include sys/systm.h
#include sys/conf.h
@@ -556,7 +556,7 @@ static const char * const wtnames[] = {
**unknown 10**,
**unknown 11**,
**unknown 12**,
- **unknown 13**,
+ write-back-locking-line,
write-back-locking-C,
write-back-locking-D,
};
CVS commit: src/external/mit/xorg/lib/freetype/freetype
Module Name:src
Committed By: mrg
Date: Thu Mar 20 22:23:30 UTC 2014
Modified Files:
src/external/mit/xorg/lib/freetype/freetype: Makefile
Log Message:
substitute %LIBS_CONFIG% and %LIBSSTATIC_CONFIG%.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/lib/freetype/freetype/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.16 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.17
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.16 Thu Mar 20 08:57:48 2014
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile Thu Mar 20 22:23:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/03/20 08:57:48 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2014/03/20 22:23:30 mrg Exp $
.include bsd.own.mk
@@ -30,6 +30,8 @@ CONFIG_SUBST= ${TOOL_SED} \
-e 's,%libdir%,${X11USRLIBDIR},g' \
-e 's,%includedir%,${X11INCDIR},' \
-e 's,%ft_version%,${FT_VERSION},' \
+ -e 's,%LIBS_CONFIG%,-lfreetype -lz -lbz2,' \
+ -e 's,%LIBSSTATIC_CONFIG%,-lfreetype -lz -lbz2,' \
-e 's,%build_libtool_libs%,yes,' \
-e 's,%FT2_EXTRA_LIBS%,,' \
-e 's,%LIBZ%,-lz,' \
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Thu Mar 20 22:24:32 UTC 2014
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
substitute several more values for .pc files:
+ s,@LIBXML2_CFLAGS@,,; \
+ s,@ICONV_CFLAGS@,,; \
+ s,@PACKAGE@,${PKGDIST},; \
+ s,@PKGCONFIG_REQUIRES@,xx,; \
+ s,@PKGCONFIG_REQUIRES_PRIVATELY@,xx,; \
+ s,@ERRORDBDIR@,${X11LIBDIR},; \
+ s,@EXPAT_CFLAGS@,,; \
+ s,@FREETYPE_CFLAGS@,-I${X11ROOTDIR}/include/freetype2
-I${X11ROOTDIR}/include,; \
+ s,@SDK_REQUIRED_MODULES@,xproto = 7.0.17 randrproto =
1.2.99.3 renderproto = 0.11 xextproto = 7.1.99 inputproto = 1.9.99.902
kbproto = 1.0.3 fontsproto, \
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.108 src/share/mk/bsd.x11.mk:1.109
--- src/share/mk/bsd.x11.mk:1.108 Wed Jun 5 23:14:13 2013
+++ src/share/mk/bsd.x11.mk Thu Mar 20 22:24:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.108 2013/06/05 23:14:13 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.109 2014/03/20 22:24:32 mrg Exp $
.include bsd.init.mk
@@ -255,8 +255,8 @@ ${_pkg}.pc: ${PKGDIST.${_pkg}}/configure
# The sed script is very, very ugly. What we actually need is a
# mknative-xorg script that will generate all the .pc files from
# running the autoconfigure script.
-# And yes, it has to be splitted in two otherwise it's too long
-# for sed to handle.
+# And yes, it has to be split in multiple parts otherwise it's
+# too long for sed to handle.
# hacky transforms:
# @XCBPROTO_VERSION@
@@ -297,6 +297,8 @@ ${_pkg}.pc: ${PKGDIST.${_pkg}}/configure
s,@xcbincludedir@,\\$$\{prefix\}/share/xcb,; \
s,@fontrootdir@,\\$$\{libdir\}/X11/fonts,; \
s,@LIBXML2_LIBS@,,; \
+ s,@LIBXML2_CFLAGS@,,; \
+ s,@ICONV_CFLAGS@,,; \
s,@ICONV_LIBS@,,; \
s,@NEEDED@,,; \
s,@FT2_EXTRA_LIBS@,, \
@@ -342,6 +344,14 @@ ${_pkg}.pc: ${PKGDIST.${_pkg}}/configure
s,@abi_font@,0.6,; \
s,@fchown_define@,-DHAS_FCHOWN,; \
s,@sticky_bit_define@,-DHAS_STICKY_DIR_BIT, \
+ -e s,@PKG_CONFIG_LIBS@,xx,; \
+ s,@PACKAGE@,${PKGDIST},; \
+ s,@PKGCONFIG_REQUIRES@,xx,; \
+ s,@PKGCONFIG_REQUIRES_PRIVATELY@,xx,; \
+ s,@ERRORDBDIR@,${X11LIBDIR},; \
+ s,@EXPAT_CFLAGS@,,; \
+ s,@FREETYPE_CFLAGS@,-I${X11ROOTDIR}/include/freetype2 -I${X11ROOTDIR}/include,; \
+ s,@SDK_REQUIRED_MODULES@,xproto = 7.0.17 randrproto = 1.2.99.3 renderproto = 0.11 xextproto = 7.1.99 inputproto = 1.9.99.902 kbproto = 1.0.3 fontsproto, \
-e '/^Libs:/ s%-L\([^ ]*\)%-Wl,-rpath,\1 %g' \
${.IMPSRC} ${.TARGET}.tmp \
mv -f ${.TARGET}.tmp ${.TARGET}
CVS commit: src/sys/arch/arm/cortex
Module Name:src
Committed By: matt
Date: Thu Mar 20 22:28:37 UTC 2014
Modified Files:
src/sys/arch/arm/cortex: pl310.c
Log Message:
pl310 cache is PIPT
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/cortex/pl310.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/pl310.c
diff -u src/sys/arch/arm/cortex/pl310.c:1.13 src/sys/arch/arm/cortex/pl310.c:1.14
--- src/sys/arch/arm/cortex/pl310.c:1.13 Sun Feb 23 21:19:06 2014
+++ src/sys/arch/arm/cortex/pl310.c Thu Mar 20 22:28:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pl310.c,v 1.13 2014/02/23 21:19:06 matt Exp $ */
+/* $NetBSD: pl310.c,v 1.14 2014/03/20 22:28:37 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pl310.c,v 1.13 2014/02/23 21:19:06 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pl310.c,v 1.14 2014/03/20 22:28:37 matt Exp $);
#include sys/param.h
#include sys/bus.h
@@ -265,6 +265,8 @@ arml2cc_init(bus_space_tag_t bst, bus_sp
info-dcache_ways = 8 __SHIFTOUT(cfg_dsize, CACHE_TYPE_xASSOC);
info-dcache_line_size = 32 __SHIFTOUT(cfg_dsize, CACHE_TYPE_xLINESIZE);
info-dcache_size = info-dcache_ways * d_waysize;
+ info-dcache_type = CACHE_TYPE_PIPT;
+ info-icache_type = CACHE_TYPE_PIPT;
if (info-cache_unified) {
info-icache_ways = info-dcache_ways;
CVS commit: src/external/bsd/pcc/dist/pcc/cc/ccom
Module Name:src
Committed By: christos
Date: Fri Mar 21 01:17:40 UTC 2014
Modified Files:
src/external/bsd/pcc/dist/pcc/cc/ccom: trees.c
Log Message:
fix Big Endian compilation
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pcc/dist/pcc/cc/ccom/trees.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/pcc/dist/pcc/cc/ccom/trees.c
diff -u src/external/bsd/pcc/dist/pcc/cc/ccom/trees.c:1.2 src/external/bsd/pcc/dist/pcc/cc/ccom/trees.c:1.3
--- src/external/bsd/pcc/dist/pcc/cc/ccom/trees.c:1.2 Thu Mar 13 20:06:52 2014
+++ src/external/bsd/pcc/dist/pcc/cc/ccom/trees.c Thu Mar 20 21:17:40 2014
@@ -1,5 +1,5 @@
/* Id: trees.c,v 1.306 2012/03/22 18:51:40 plunky Exp */
-/* $NetBSD: trees.c,v 1.2 2014/03/14 00:06:52 christos Exp $ */
+/* $NetBSD: trees.c,v 1.3 2014/03/21 01:17:40 christos Exp $ */
/*
* Copyright (c) 2003 Anders Magnusson (ra...@ludd.luth.se).
* All rights reserved.
@@ -2540,7 +2540,7 @@ rmfldops(NODE *p)
foff = UPKFOFF(q-n_rval);
t = q-n_left-n_type;
#if TARGET_ENDIAN == TARGET_BE
- foff = tsz - fsz - foff;
+ foff = (int)tsize(t, 0, 0) - fsz - foff;
#endif
bt = NULL;
if (p-n_right-n_op != ICON p-n_right-n_op != NAME) {
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: matt Date: Fri Mar 21 01:40:42 UTC 2014 Modified Files: src/libexec/ld.elf_so: symbol.c Log Message: Don't resolve symbols to PLT entries on the VAX. It just causes a lot of overhead. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/libexec/ld.elf_so/symbol.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/symbol.c diff -u src/libexec/ld.elf_so/symbol.c:1.63 src/libexec/ld.elf_so/symbol.c:1.64 --- src/libexec/ld.elf_so/symbol.c:1.63 Fri May 3 10:27:05 2013 +++ src/libexec/ld.elf_so/symbol.c Fri Mar 21 01:40:41 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: symbol.c,v 1.63 2013/05/03 10:27:05 skrll Exp $ */ +/* $NetBSD: symbol.c,v 1.64 2014/03/21 01:40:41 matt Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -40,7 +40,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: symbol.c,v 1.63 2013/05/03 10:27:05 skrll Exp $); +__RCSID($NetBSD: symbol.c,v 1.64 2014/03/21 01:40:41 matt Exp $); #endif /* not lint */ #include err.h @@ -260,7 +260,7 @@ _rtld_symlook_obj(const char *name, unsi rdbg((check \%s\ vs \%s\ in %s, name, strp, obj-path)); if (name[1] != strp[1] || strcmp(name, strp)) continue; -#ifdef __mips__ +#if defined(__mips__) || defined(__vax__) if (symp-st_shndx == SHN_UNDEF) continue; #else
CVS commit: src/libexec/ld.elf_so/arch/vax
Module Name:src Committed By: matt Date: Fri Mar 21 01:43:33 UTC 2014 Modified Files: src/libexec/ld.elf_so/arch/vax: mdreloc.c Log Message: Improve some of the rdbg messages to print the address of the pltgot slot being modified. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/libexec/ld.elf_so/arch/vax/mdreloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/arch/vax/mdreloc.c diff -u src/libexec/ld.elf_so/arch/vax/mdreloc.c:1.28 src/libexec/ld.elf_so/arch/vax/mdreloc.c:1.29 --- src/libexec/ld.elf_so/arch/vax/mdreloc.c:1.28 Fri Mar 25 18:07:07 2011 +++ src/libexec/ld.elf_so/arch/vax/mdreloc.c Fri Mar 21 01:43:33 2014 @@ -1,13 +1,13 @@ -/* $NetBSD: mdreloc.c,v 1.28 2011/03/25 18:07:07 joerg Exp $ */ +/* $NetBSD: mdreloc.c,v 1.29 2014/03/21 01:43:33 matt Exp $ */ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: mdreloc.c,v 1.28 2011/03/25 18:07:07 joerg Exp $); +__RCSID($NetBSD: mdreloc.c,v 1.29 2014/03/21 01:43:33 matt Exp $); #endif /* not lint */ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: mdreloc.c,v 1.28 2011/03/25 18:07:07 joerg Exp $); +__RCSID($NetBSD: mdreloc.c,v 1.29 2014/03/21 01:43:33 matt Exp $); #endif /* not lint */ #include sys/types.h @@ -142,7 +142,8 @@ _rtld_relocate_plt_lazy(const Obj_Entry /* Just relocate the GOT slots pointing into the PLT */ *where += (Elf_Addr)obj-relocbase; - rdbg((fixup !main in %s -- %p, obj-path, (void *)*where)); + rdbg((lazy fixup pltgot %p in %s -- %p, where, obj-path, + (void *)*where)); } return 0; @@ -167,7 +168,7 @@ _rtld_relocate_plt_object(const Obj_Entr new_value = (Elf_Addr)(defobj-relocbase + def-st_value + rela-r_addend); - rdbg((bind now/fixup in %s -- old=%p new=%p, + rdbg((bind now/fixup pltgot %p in %s -- old=%p new=%p, where, defobj-strtab + def-st_name, (void *)*where, (void *)new_value)); if (*where != new_value) *where = new_value;
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Fri Mar 21 02:25:05 UTC 2014 Modified Files: src/sys/external/bsd/drm2/include/linux: kernel.h Log Message: Make uninitialized_var kludge expand to `x = 0'. Forgot to commit this the other day. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/linux/kernel.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/include/linux/kernel.h diff -u src/sys/external/bsd/drm2/include/linux/kernel.h:1.2 src/sys/external/bsd/drm2/include/linux/kernel.h:1.3 --- src/sys/external/bsd/drm2/include/linux/kernel.h:1.2 Tue Mar 18 18:20:43 2014 +++ src/sys/external/bsd/drm2/include/linux/kernel.h Fri Mar 21 02:25:05 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kernel.h,v 1.2 2014/03/18 18:20:43 riastradh Exp $ */ +/* $NetBSD: kernel.h,v 1.3 2014/03/21 02:25:05 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -44,7 +44,11 @@ #define barrier() __insn_barrier() #define unlikely(X) __predict_false(X) -#define uninitialized_var(x) x +/* + * XXX Linux kludge to work around GCC uninitialized variable warning. + * Linux does `x = x', which is bollocks. + */ +#define uninitialized_var(x) x = 0 /* XXX These will multiply evaluate their arguments. */ #define max_t(T, X, Y) MAX(X, Y)
CVS commit: xsrc/external/mit/xkbutils/include
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 06:17:54 UTC 2014 Added Files: xsrc/external/mit/xkbutils/include: config.h Log Message: xkbutils needs a config.h now. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 xsrc/external/mit/xkbutils/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/bin/xkbutils
Module Name:src Committed By: mrg Date: Thu Mar 20 06:18:20 UTC 2014 Modified Files: src/external/mit/xorg/bin/xkbutils: Makefile.xkbutils Log Message: look for config.h. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/xf86-input-keyboard/dist
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 06:24:39 UTC 2014 Update of /cvsroot/xsrc/external/mit/xf86-input-keyboard/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17803 Log Message: initial import of xf86-input-keyboard-1.8.0 Status: Vendor Tag: xorg Release Tags: xf86-input-keyboard-1-8-0 U xsrc/external/mit/xf86-input-keyboard/dist/Makefile.in U xsrc/external/mit/xf86-input-keyboard/dist/COPYING U xsrc/external/mit/xf86-input-keyboard/dist/missing U xsrc/external/mit/xf86-input-keyboard/dist/ChangeLog U xsrc/external/mit/xf86-input-keyboard/dist/README U xsrc/external/mit/xf86-input-keyboard/dist/install-sh U xsrc/external/mit/xf86-input-keyboard/dist/config.h.in U xsrc/external/mit/xf86-input-keyboard/dist/Makefile.am U xsrc/external/mit/xf86-input-keyboard/dist/config.sub U xsrc/external/mit/xf86-input-keyboard/dist/configure U xsrc/external/mit/xf86-input-keyboard/dist/config.guess U xsrc/external/mit/xf86-input-keyboard/dist/aclocal.m4 U xsrc/external/mit/xf86-input-keyboard/dist/configure.ac U xsrc/external/mit/xf86-input-keyboard/dist/depcomp U xsrc/external/mit/xf86-input-keyboard/dist/ltmain.sh U xsrc/external/mit/xf86-input-keyboard/dist/INSTALL U xsrc/external/mit/xf86-input-keyboard/dist/man/Makefile.in U xsrc/external/mit/xf86-input-keyboard/dist/man/kbd.man U xsrc/external/mit/xf86-input-keyboard/dist/man/Makefile.am U xsrc/external/mit/xf86-input-keyboard/dist/src/Makefile.in C xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c U xsrc/external/mit/xf86-input-keyboard/dist/src/at_scancode.c U xsrc/external/mit/xf86-input-keyboard/dist/src/sun_kbdMap.c C xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h C xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c U xsrc/external/mit/xf86-input-keyboard/dist/src/sun_kbd.h U xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_kbd.c U xsrc/external/mit/xf86-input-keyboard/dist/src/hurd_kbd.c U xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_kbd.h U xsrc/external/mit/xf86-input-keyboard/dist/src/xf86Keymap.h U xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_KbdMap.c U xsrc/external/mit/xf86-input-keyboard/dist/src/sun_kbd.c U xsrc/external/mit/xf86-input-keyboard/dist/src/Makefile.am U xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h C xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c U xsrc/external/mit/xf86-input-keyboard/dist/src/atKeynames.h 4 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-input-keyboard/dist
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 06:40:47 UTC 2014 Modified Files: xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_KbdMap.c bsd_kbd.c Log Message: merge xf86-input-keyboard 1.8.0. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c cvs rdiff -u -r1.18 -r1.19 \ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: mlelstv Date: Thu Mar 20 06:48:22 UTC 2014 Modified Files: src/sys/kern: subr_vmem.c Log Message: Incorrect use of pointer arithmetic. CID 1193195: Extra sizeof expression To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/kern/subr_vmem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: skrll Date: Thu Mar 20 06:48:54 UTC 2014 Modified Files: src/sys/arch/arm/ixp12x0: ixp12x0_intr.c src/sys/arch/arm/xscale: ixp425_if_npe.c ixp425_npe.c ixp425_npevar.h src/sys/arch/xen/include: xbdvar.h src/sys/coda: coda_vnops.c src/sys/dev/mca: ed_mca.c edc_mca.c edvar.h src/sys/dev/pci: cy82c693.c src/sys/dev/pci/cxgb: cxgb_osdep.h src/sys/net: if_tap.c if_tun.c Log Message: Mechanically replace simplelock with kmutex_t. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/ixp12x0/ixp12x0_intr.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/xscale/ixp425_if_npe.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/xscale/ixp425_npe.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/xscale/ixp425_npevar.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/xen/include/xbdvar.h cvs rdiff -u -r1.95 -r1.96 src/sys/coda/coda_vnops.c cvs rdiff -u -r1.54 -r1.55 src/sys/dev/mca/ed_mca.c cvs rdiff -u -r1.48 -r1.49 src/sys/dev/mca/edc_mca.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/mca/edvar.h cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/cy82c693.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/cxgb/cxgb_osdep.h cvs rdiff -u -r1.73 -r1.74 src/sys/net/if_tap.c cvs rdiff -u -r1.116 -r1.117 src/sys/net/if_tun.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: skrll Date: Thu Mar 20 06:50:55 UTC 2014 Modified Files: src/distrib/sets/lists/comp: mi src/sys/sys: Makefile Log Message: simplelock.h is no longer used. To generate a diff of this commit: cvs rdiff -u -r1.1882 -r1.1883 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.147 -r1.148 src/sys/sys/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/xf86-video-vesa/dist
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 06:50:55 UTC 2014 Update of /cvsroot/xsrc/external/mit/xf86-video-vesa/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3025 Log Message: initial import of xf86-video-vesa-2.3.3 Status: Vendor Tag: xorg Release Tags: xf86-video-vesa-2-3-3 C xsrc/external/mit/xf86-video-vesa/dist/config.sub U xsrc/external/mit/xf86-video-vesa/dist/README C xsrc/external/mit/xf86-video-vesa/dist/depcomp C xsrc/external/mit/xf86-video-vesa/dist/configure U xsrc/external/mit/xf86-video-vesa/dist/INSTALL U xsrc/external/mit/xf86-video-vesa/dist/ChangeLog U xsrc/external/mit/xf86-video-vesa/dist/Makefile.am C xsrc/external/mit/xf86-video-vesa/dist/install-sh C xsrc/external/mit/xf86-video-vesa/dist/config.guess U xsrc/external/mit/xf86-video-vesa/dist/COPYING C xsrc/external/mit/xf86-video-vesa/dist/aclocal.m4 C xsrc/external/mit/xf86-video-vesa/dist/missing U xsrc/external/mit/xf86-video-vesa/dist/config.h.in C xsrc/external/mit/xf86-video-vesa/dist/ltmain.sh C xsrc/external/mit/xf86-video-vesa/dist/configure.ac C xsrc/external/mit/xf86-video-vesa/dist/Makefile.in U xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.am C xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c U xsrc/external/mit/xf86-video-vesa/dist/src/compat-api.h C xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.in U xsrc/external/mit/xf86-video-vesa/dist/src/vesa.h U xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.am U xsrc/external/mit/xf86-video-vesa/dist/man/vesa.man C xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.in 13 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-vesa/dist
CVS commit: xsrc/external/mit/xf86-video-vesa/dist
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 06:51:54 UTC 2014 Modified Files: xsrc/external/mit/xf86-video-vesa/dist: Makefile.in aclocal.m4 config.guess config.sub configure configure.ac depcomp install-sh ltmain.sh missing xsrc/external/mit/xf86-video-vesa/dist/man: Makefile.in xsrc/external/mit/xf86-video-vesa/dist/src: Makefile.in vesa.c Log Message: merge xf86-video-vesa 2.3.3. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-vesa/dist/Makefile.in \ xsrc/external/mit/xf86-video-vesa/dist/aclocal.m4 \ xsrc/external/mit/xf86-video-vesa/dist/configure \ xsrc/external/mit/xf86-video-vesa/dist/configure.ac \ xsrc/external/mit/xf86-video-vesa/dist/depcomp \ xsrc/external/mit/xf86-video-vesa/dist/install-sh \ xsrc/external/mit/xf86-video-vesa/dist/ltmain.sh \ xsrc/external/mit/xf86-video-vesa/dist/missing cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-vesa/dist/config.guess \ xsrc/external/mit/xf86-video-vesa/dist/config.sub cvs rdiff -u -r1.6 -r1.7 \ xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.in cvs rdiff -u -r1.6 -r1.7 \ xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.in cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-geode
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 06:57:26 UTC 2014 Modified Files: xsrc/external/mit/xf86-video-geode/dist/src: geode_msr.c xsrc/external/mit/xf86-video-geode/include: config.h Removed Files: xsrc/external/mit/xf86-video-geode/dist: config.guess config.sub depcomp install-sh ltmain.sh missing Log Message: merge xf86-video-geode 2.11.15. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-geode/dist/config.guess \ xsrc/external/mit/xf86-video-geode/dist/config.sub \ xsrc/external/mit/xf86-video-geode/dist/depcomp \ xsrc/external/mit/xf86-video-geode/dist/install-sh \ xsrc/external/mit/xf86-video-geode/dist/missing cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xf86-video-geode/dist/ltmain.sh cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-geode/dist/src/geode_msr.c cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-geode/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/xf86-video-geode/dist
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 06:54:21 UTC 2014 Update of /cvsroot/xsrc/external/mit/xf86-video-geode/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20442 Log Message: initial import of xf86-video-geode-2.11.15 Status: Vendor Tag: xorg Release Tags: xf86-video-geode-2-11-15 U xsrc/external/mit/xf86-video-geode/dist/Makefile.in U xsrc/external/mit/xf86-video-geode/dist/configure U xsrc/external/mit/xf86-video-geode/dist/configure.ac U xsrc/external/mit/xf86-video-geode/dist/COPYING U xsrc/external/mit/xf86-video-geode/dist/NEWS U xsrc/external/mit/xf86-video-geode/dist/Makefile.am U xsrc/external/mit/xf86-video-geode/dist/INSTALL U xsrc/external/mit/xf86-video-geode/dist/ChangeLog U xsrc/external/mit/xf86-video-geode/dist/autogen.sh U xsrc/external/mit/xf86-video-geode/dist/README U xsrc/external/mit/xf86-video-geode/dist/aclocal.m4 U xsrc/external/mit/xf86-video-geode/dist/config.h.in U xsrc/external/mit/xf86-video-geode/dist/TODO U xsrc/external/mit/xf86-video-geode/dist/src/geode_common.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_vga.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_driver.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_dcon.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_accel.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_display.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_video.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_panel.c U xsrc/external/mit/xf86-video-geode/dist/src/Makefile.in U xsrc/external/mit/xf86-video-geode/dist/src/geode_blend.h U xsrc/external/mit/xf86-video-geode/dist/src/geode_ddc.c C xsrc/external/mit/xf86-video-geode/dist/src/geode_msr.c U xsrc/external/mit/xf86-video-geode/dist/src/panel.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_memory.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_fourcc.h U xsrc/external/mit/xf86-video-geode/dist/src/durango.c U xsrc/external/mit/xf86-video-geode/dist/src/Makefile.am U xsrc/external/mit/xf86-video-geode/dist/src/cim_dev.h U xsrc/external/mit/xf86-video-geode/dist/src/lx_cursor.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_randr.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_output.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_pcirename.h U xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c N xsrc/external/mit/xf86-video-geode/dist/src/compat-api.h U xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_rotate.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_vga.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_regacc.c U xsrc/external/mit/xf86-video-geode/dist/src/geode.h U xsrc/external/mit/xf86-video-geode/dist/src/gx_cursor.c U xsrc/external/mit/xf86-video-geode/dist/src/cimarron.c U xsrc/external/mit/xf86-video-geode/dist/src/z4l.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_video.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_exa.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_version.h U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_defs.h U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_init.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_regs.h U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_modes.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_filter.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_vip.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_vop.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_df.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_gp.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_vg.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_parm.h U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_rtns.h U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_msr.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/doc/release.txt U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_mode.h U xsrc/external/mit/xf86-video-geode/dist/src/gfx/init_gu2.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/release.txt U xsrc/external/mit/xf86-video-geode/dist/src/gfx/tv_1200.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/vid_rdcl.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_vid.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_rndr.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_priv.h U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_vga.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/tv_fs450.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/disp_gu1.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_vip.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_i2c.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_disp.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/saa7114.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/history.h U xsrc/external/mit/xf86-video-geode/dist/src/gfx/vid_5530.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_dcdr.c U
CVS commit: xsrc/external/mit/xf86-video-geode/include
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 06:58:46 UTC 2014 Modified Files: xsrc/external/mit/xf86-video-geode/include: config.h Log Message: re-do the previous correctly. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-geode/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/xterm/dist
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 07:00:11 UTC 2014 Update of /cvsroot/xsrc/external/mit/xterm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18369 Log Message: initial import of xterm-303 Status: Vendor Tag: xorg Release Tags: xterm-303 U xsrc/external/mit/xterm/dist/df-install.in U xsrc/external/mit/xterm/dist/config.guess U xsrc/external/mit/xterm/dist/version.c U xsrc/external/mit/xterm/dist/terminfo U xsrc/external/mit/xterm/dist/88colres.h U xsrc/external/mit/xterm/dist/tabs.c C xsrc/external/mit/xterm/dist/XTerm.ad U xsrc/external/mit/xterm/dist/charproc.c U xsrc/external/mit/xterm/dist/README U xsrc/external/mit/xterm/dist/menu.h U xsrc/external/mit/xterm/dist/termcap U xsrc/external/mit/xterm/dist/uxterm.desktop U xsrc/external/mit/xterm/dist/gen-pc-fkeys.pl C xsrc/external/mit/xterm/dist/xterm.man U xsrc/external/mit/xterm/dist/fontutils.h U xsrc/external/mit/xterm/dist/xtermcfg.hin U xsrc/external/mit/xterm/dist/Imakefile U xsrc/external/mit/xterm/dist/UXTerm.ad U xsrc/external/mit/xterm/dist/trace.h U xsrc/external/mit/xterm/dist/xterm_io.h U xsrc/external/mit/xterm/dist/keysym2ucs.c U xsrc/external/mit/xterm/dist/data.c U xsrc/external/mit/xterm/dist/uxterm.man U xsrc/external/mit/xterm/dist/Makefile.in C xsrc/external/mit/xterm/dist/fontutils.c U xsrc/external/mit/xterm/dist/XTerm-col.ad U xsrc/external/mit/xterm/dist/charclass.c U xsrc/external/mit/xterm/dist/xterm.desktop U xsrc/external/mit/xterm/dist/README.i18n U xsrc/external/mit/xterm/dist/aclocal.m4 U xsrc/external/mit/xterm/dist/trace.c U xsrc/external/mit/xterm/dist/KOI8RXTerm.ad U xsrc/external/mit/xterm/dist/install-sh U xsrc/external/mit/xterm/dist/AAA_README_VMS.txt U xsrc/external/mit/xterm/dist/wcwidth.h U xsrc/external/mit/xterm/dist/Tekparse.h U xsrc/external/mit/xterm/dist/TekPrsTbl.c U xsrc/external/mit/xterm/dist/vms.c U xsrc/external/mit/xterm/dist/xstrings.c U xsrc/external/mit/xterm/dist/util.c U xsrc/external/mit/xterm/dist/run-tic.sh U xsrc/external/mit/xterm/dist/minstall.in U xsrc/external/mit/xterm/dist/MANIFEST N xsrc/external/mit/xterm/dist/graphics.c U xsrc/external/mit/xterm/dist/Tekparse.def U xsrc/external/mit/xterm/dist/make.com U xsrc/external/mit/xterm/dist/xterm.log.html U xsrc/external/mit/xterm/dist/precompose.h U xsrc/external/mit/xterm/dist/README.os390 U xsrc/external/mit/xterm/dist/xtermcap.c U xsrc/external/mit/xterm/dist/cachedGCs.c U xsrc/external/mit/xterm/dist/menu.c U xsrc/external/mit/xterm/dist/doublechr.c U xsrc/external/mit/xterm/dist/linedata.c U xsrc/external/mit/xterm/dist/xtermcap.h U xsrc/external/mit/xterm/dist/data.h U xsrc/external/mit/xterm/dist/version.h U xsrc/external/mit/xterm/dist/THANKS U xsrc/external/mit/xterm/dist/charclass.h U xsrc/external/mit/xterm/dist/xutf8.h U xsrc/external/mit/xterm/dist/ctlseqs.ms U xsrc/external/mit/xterm/dist/config.sub U xsrc/external/mit/xterm/dist/xcharmouse.h U xsrc/external/mit/xterm/dist/sinstall.sh U xsrc/external/mit/xterm/dist/configure U xsrc/external/mit/xterm/dist/koi8rxterm U xsrc/external/mit/xterm/dist/Tests U xsrc/external/mit/xterm/dist/print.c U xsrc/external/mit/xterm/dist/resize.c U xsrc/external/mit/xterm/dist/plink.sh U xsrc/external/mit/xterm/dist/configure.in U xsrc/external/mit/xterm/dist/uxterm U xsrc/external/mit/xterm/dist/charsets.c U xsrc/external/mit/xterm/dist/256colres.h U xsrc/external/mit/xterm/dist/ctlseqs.txt U xsrc/external/mit/xterm/dist/button.c U xsrc/external/mit/xterm/dist/Tekproc.c U xsrc/external/mit/xterm/dist/xterm.h U xsrc/external/mit/xterm/dist/link_axp.com U xsrc/external/mit/xterm/dist/xutf8.c C xsrc/external/mit/xterm/dist/misc.c U xsrc/external/mit/xterm/dist/main.c U xsrc/external/mit/xterm/dist/ptydata.c U xsrc/external/mit/xterm/dist/scrollbar.c U xsrc/external/mit/xterm/dist/scrollback.c U xsrc/external/mit/xterm/dist/VTparse.def U xsrc/external/mit/xterm/dist/VTparse.h U xsrc/external/mit/xterm/dist/koi8rxterm.man U xsrc/external/mit/xterm/dist/xstrings.h U xsrc/external/mit/xterm/dist/VTPrsTbl.c U xsrc/external/mit/xterm/dist/256colres.pl U xsrc/external/mit/xterm/dist/precompose.c U xsrc/external/mit/xterm/dist/error.h U xsrc/external/mit/xterm/dist/input.c U xsrc/external/mit/xterm/dist/xterm_axp.opt U xsrc/external/mit/xterm/dist/wcwidth.c U xsrc/external/mit/xterm/dist/vms.h U xsrc/external/mit/xterm/dist/resize.man U xsrc/external/mit/xterm/dist/INSTALL C xsrc/external/mit/xterm/dist/ptyx.h U xsrc/external/mit/xterm/dist/testxmc.c N xsrc/external/mit/xterm/dist/graphics.h U xsrc/external/mit/xterm/dist/xterm.dat U xsrc/external/mit/xterm/dist/cursor.c U xsrc/external/mit/xterm/dist/keysym2ucs.h U xsrc/external/mit/xterm/dist/main.h U xsrc/external/mit/xterm/dist/88colres.pl U xsrc/external/mit/xterm/dist/screen.c U xsrc/external/mit/xterm/dist/vttests/query-color.pl U xsrc/external/mit/xterm/dist/vttests/dynamic.sh U xsrc/external/mit/xterm/dist/vttests/256colors.pl U xsrc/external/mit/xterm/dist/vttests/tcapquery.pl
CVS commit: xsrc/external/mit/xterm
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 07:03:44 UTC 2014 Modified Files: xsrc/external/mit/xterm/dist: XTerm.ad fontutils.c misc.c ptyx.h xterm.man xsrc/external/mit/xterm/include: xtermcfg.h Log Message: merge xterm 303. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xterm/dist/XTerm.ad cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xterm/dist/fontutils.c cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xterm/dist/misc.c cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xterm/dist/ptyx.h cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xterm/dist/xterm.man cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xterm/include/xtermcfg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xterm/include
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 07:13:32 UTC 2014 Added Files: xsrc/external/mit/xterm/include: builtin_icons.h Log Message: new generated file for xterm. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 xsrc/external/mit/xterm/include/builtin_icons.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src Committed By: mrg Date: Thu Mar 20 07:13:53 UTC 2014 Modified Files: src/external/mit/xorg/bin/xterm: Makefile Log Message: add a note about builtin_icons.h. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/bin/xterm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/fontconfig/dist
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 07:41:48 UTC 2014 Update of /cvsroot/xsrc/external/mit/fontconfig/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16557 Log Message: initial import of fontconfig-2.11.0 Status: Vendor Tag: xorg Release Tags: fontconfig-2-11-0 U xsrc/external/mit/fontconfig/dist/AUTHORS U xsrc/external/mit/fontconfig/dist/fonts.conf.in U xsrc/external/mit/fontconfig/dist/configure U xsrc/external/mit/fontconfig/dist/test-driver U xsrc/external/mit/fontconfig/dist/Makefile.am U xsrc/external/mit/fontconfig/dist/config.sub U xsrc/external/mit/fontconfig/dist/missing U xsrc/external/mit/fontconfig/dist/fontconfig.spec U xsrc/external/mit/fontconfig/dist/ChangeLog U xsrc/external/mit/fontconfig/dist/COPYING U xsrc/external/mit/fontconfig/dist/depcomp U xsrc/external/mit/fontconfig/dist/INSTALL U xsrc/external/mit/fontconfig/dist/fontconfig.pc.in U xsrc/external/mit/fontconfig/dist/install-sh U xsrc/external/mit/fontconfig/dist/fontconfig-zip.in U xsrc/external/mit/fontconfig/dist/config-fixups.h U xsrc/external/mit/fontconfig/dist/NEWS U xsrc/external/mit/fontconfig/dist/README U xsrc/external/mit/fontconfig/dist/fonts.dtd U xsrc/external/mit/fontconfig/dist/Tools.mk U xsrc/external/mit/fontconfig/dist/fontconfig.spec.in U xsrc/external/mit/fontconfig/dist/ltmain.sh U xsrc/external/mit/fontconfig/dist/aclocal.m4 U xsrc/external/mit/fontconfig/dist/config.guess U xsrc/external/mit/fontconfig/dist/config.h.in U xsrc/external/mit/fontconfig/dist/Makefile.in U xsrc/external/mit/fontconfig/dist/configure.ac N xsrc/external/mit/fontconfig/dist/compile U xsrc/external/mit/fontconfig/dist/conf.d/10-scale-bitmap-fonts.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-vrgb.conf U xsrc/external/mit/fontconfig/dist/conf.d/70-yes-bitmaps.conf U xsrc/external/mit/fontconfig/dist/conf.d/README.in U xsrc/external/mit/fontconfig/dist/conf.d/25-unhint-nonlatin.conf U xsrc/external/mit/fontconfig/dist/conf.d/Makefile.am U xsrc/external/mit/fontconfig/dist/conf.d/80-delicious.conf U xsrc/external/mit/fontconfig/dist/conf.d/30-metric-aliases.conf U xsrc/external/mit/fontconfig/dist/conf.d/49-sansserif.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-bgr.conf U xsrc/external/mit/fontconfig/dist/conf.d/11-lcdfilter-legacy.conf U xsrc/external/mit/fontconfig/dist/conf.d/20-unhint-small-vera.conf U xsrc/external/mit/fontconfig/dist/conf.d/65-fonts-persian.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-vbgr.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-unhinted.conf U xsrc/external/mit/fontconfig/dist/conf.d/11-lcdfilter-light.conf U xsrc/external/mit/fontconfig/dist/conf.d/40-nonlatin.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-rgb.conf U xsrc/external/mit/fontconfig/dist/conf.d/60-latin.conf U xsrc/external/mit/fontconfig/dist/conf.d/65-khmer.conf U xsrc/external/mit/fontconfig/dist/conf.d/README U xsrc/external/mit/fontconfig/dist/conf.d/11-lcdfilter-default.conf U xsrc/external/mit/fontconfig/dist/conf.d/30-urw-aliases.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-no-sub-pixel.conf U xsrc/external/mit/fontconfig/dist/conf.d/50-user.conf U xsrc/external/mit/fontconfig/dist/conf.d/90-synthetic.conf U xsrc/external/mit/fontconfig/dist/conf.d/Makefile.in U xsrc/external/mit/fontconfig/dist/conf.d/51-local.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-autohint.conf U xsrc/external/mit/fontconfig/dist/conf.d/69-unifont.conf U xsrc/external/mit/fontconfig/dist/conf.d/70-no-bitmaps.conf U xsrc/external/mit/fontconfig/dist/conf.d/45-latin.conf U xsrc/external/mit/fontconfig/dist/conf.d/65-nonlatin.conf U xsrc/external/mit/fontconfig/dist/fc-query/fc-query.sgml U xsrc/external/mit/fontconfig/dist/fc-query/Makefile.am U xsrc/external/mit/fontconfig/dist/fc-query/fc-query.c U xsrc/external/mit/fontconfig/dist/fc-query/fc-query.1 U xsrc/external/mit/fontconfig/dist/fc-query/Makefile.in U xsrc/external/mit/fontconfig/dist/fc-validate/fc-validate.1 U xsrc/external/mit/fontconfig/dist/fc-validate/Makefile.am U xsrc/external/mit/fontconfig/dist/fc-validate/fc-validate.sgml U xsrc/external/mit/fontconfig/dist/fc-validate/Makefile.in U xsrc/external/mit/fontconfig/dist/fc-validate/fc-validate.c U xsrc/external/mit/fontconfig/dist/fc-glyphname/fcglyphname.tmpl.h U xsrc/external/mit/fontconfig/dist/fc-glyphname/fc-glyphname.c U xsrc/external/mit/fontconfig/dist/fc-glyphname/Makefile.am U xsrc/external/mit/fontconfig/dist/fc-glyphname/fcglyphname.h U xsrc/external/mit/fontconfig/dist/fc-glyphname/Makefile.in U xsrc/external/mit/fontconfig/dist/fc-glyphname/zapfdingbats.txt U xsrc/external/mit/fontconfig/dist/fc-match/fc-match.sgml U xsrc/external/mit/fontconfig/dist/fc-match/Makefile.am U xsrc/external/mit/fontconfig/dist/fc-match/fc-match.c U xsrc/external/mit/fontconfig/dist/fc-match/Makefile.in U xsrc/external/mit/fontconfig/dist/fc-match/fc-match.1 U
CVS commit: xsrc/external/mit/fontconfig/dist
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 07:49:26 UTC 2014 Modified Files: xsrc/external/mit/fontconfig/dist/fc-cache: fc-cache.c xsrc/external/mit/fontconfig/dist/src: fccache.c fchash.c fcint.h fcmatch.c fcname.c fcstat.c Log Message: merge fontconfig 2.11.0. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fontconfig/dist/src/fccache.c cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/fontconfig/dist/src/fchash.c cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/fontconfig/dist/src/fcint.h \ xsrc/external/mit/fontconfig/dist/src/fcmatch.c \ xsrc/external/mit/fontconfig/dist/src/fcname.c cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/fontconfig/dist/src/fcstat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/fontconfig/include
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 07:57:19 UTC 2014 Modified Files: xsrc/external/mit/fontconfig/include: config.h fcalias.h fcaliastail.h Log Message: merge fontconfig 2.11.0. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/fontconfig/include/config.h \ xsrc/external/mit/fontconfig/include/fcalias.h \ xsrc/external/mit/fontconfig/include/fcaliastail.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 08:04:41 UTC 2014 Modified Files: xsrc/external/mit/fontconfig/dist/src: fccfg.c Log Message: avoid CPP when the C compiler can do it more sanely. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/fontconfig/dist/src/fccfg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src Committed By: mrg Date: Thu Mar 20 08:05:30 UTC 2014 Modified Files: src/external/mit/xorg/tools/fc-cache: Makefile Log Message: the host tool relies on scandir now days. (it tries to avoid it, but needs work for this code to work again. if this is fixed, we may want to run ./configure for this tool.) To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/tools/fc-cache/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/freetype/dist
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 08:35:40 UTC 2014 Modified Files: xsrc/external/mit/freetype/dist/builds/unix: freetype-config.in xsrc/external/mit/freetype/dist/src/cff: cffload.c xsrc/external/mit/freetype/dist/src/gzip: ftgzip.c xsrc/external/mit/freetype/dist/src/sfnt: ttcmap.c xsrc/external/mit/freetype/dist/src/smooth: ftsmooth.c Removed Files: xsrc/external/mit/freetype/dist/builds/amiga/include/freetype/config: ftconfig.h ftmodule.h xsrc/external/mit/freetype/dist/builds/unix: ft2unix.h xsrc/external/mit/freetype/dist/builds/win32: detect.mk ftdebug.c w32-bcc.mk w32-bccd.mk w32-dev.mk w32-gcc.mk w32-icc.mk w32-intl.mk w32-lcc.mk w32-mingw32.mk w32-vcc.mk w32-wat.mk win32-def.mk xsrc/external/mit/freetype/dist/builds/win32/vc2005: freetype.sln freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/win32/vc2008: freetype.sln freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/win32/vc2010: freetype.sln freetype.vcxproj freetype.vcxproj.filters index.html xsrc/external/mit/freetype/dist/builds/win32/visualc: freetype.dsp freetype.dsw freetype.sln freetype.vcproj index.html xsrc/external/mit/freetype/dist/builds/win32/visualce: freetype.dsp freetype.dsw freetype.vcproj index.html xsrc/external/mit/freetype/dist/include/freetype: freetype.h ftadvanc.h ftautoh.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h ftcffdrv.h ftchapters.h ftcid.h fterrdef.h fterrors.h ftgasp.h ftglyph.h ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h ftsystem.h fttrigon.h fttypes.h ftwinfnt.h ftxf86.h t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h xsrc/external/mit/freetype/dist/include/freetype/config: ftconfig.h ftheader.h ftmodule.h ftoption.h ftstdlib.h xsrc/external/mit/freetype/dist/include/freetype/internal: autohint.h ftcalc.h ftdebug.h ftdriver.h ftgloadr.h ftmemory.h ftobjs.h ftpic.h ftrfork.h ftserv.h ftstream.h fttrace.h ftvalid.h internal.h psaux.h pshints.h sfnt.h t1types.h tttypes.h xsrc/external/mit/freetype/dist/include/freetype/internal/services: svbdf.h svcid.h svgldict.h svgxval.h svkern.h svmm.h svotval.h svpfr.h svpostnm.h svprop.h svpscmap.h svpsinfo.h svsfnt.h svttcmap.h svtteng.h svttglyf.h svwinfnt.h svxf86nm.h xsrc/external/mit/freetype/dist/src/sfnt: ttsbit0.c Log Message: merge freetype 2.5.3. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/freetype/dist/builds/amiga/include/freetype/config/ftconfig.h cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/freetype/dist/builds/amiga/include/freetype/config/ftmodule.h cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/freetype/dist/builds/unix/ft2unix.h cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/detect.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-bcc.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-bccd.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-dev.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-gcc.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-icc.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-intl.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-lcc.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-mingw32.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-vcc.mk \ xsrc/external/mit/freetype/dist/builds/win32/w32-wat.mk cvs rdiff -u -r1.1.1.3 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/ftdebug.c cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/win32-def.mk cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/vc2005/freetype.sln cvs rdiff -u -r1.1.1.5 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/vc2005/freetype.vcproj \ xsrc/external/mit/freetype/dist/builds/win32/vc2005/index.html cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/vc2008/freetype.sln cvs rdiff -u -r1.1.1.5 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/vc2008/freetype.vcproj \ xsrc/external/mit/freetype/dist/builds/win32/vc2008/index.html cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/freetype/dist/builds/win32/vc2010/freetype.sln \ xsrc/external/mit/freetype/dist/builds/win32/vc2010/freetype.vcxproj.filters cvs rdiff -u -r1.1.1.2 -r0 \
CVS commit: src/external/mit/xorg/lib/freetype
Module Name:src Committed By: mrg Date: Thu Mar 20 08:57:48 UTC 2014 Modified Files: src/external/mit/xorg/lib/freetype: Makefile freetype2.pc.in shlib_version src/external/mit/xorg/lib/freetype/freetype: Makefile src/external/mit/xorg/lib/freetype/freetype/cache: Makefile src/external/mit/xorg/lib/freetype/freetype/config: Makefile Log Message: merge freetype 2.5.3. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/freetype/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/freetype/freetype2.pc.in cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/freetype/shlib_version cvs rdiff -u -r1.15 -r1.16 \ src/external/mit/xorg/lib/freetype/freetype/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/mit/xorg/lib/freetype/freetype/cache/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/mit/xorg/lib/freetype/freetype/config/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libXft/dist/src
Module Name:xsrc Committed By: mrg Date: Thu Mar 20 08:58:36 UTC 2014 Modified Files: xsrc/external/mit/libXft/dist/src: xftglyphs.c Log Message: pull over pkgsrc patch patch-src_xftglyphs.c to work with modern freetype. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/libXft/dist/src/xftglyphs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: mrg Date: Thu Mar 20 09:05:28 UTC 2014 Modified Files: src/distrib/sets/lists/xbase: mi shl.mi src/distrib/sets/lists/xcomp: mi src/etc/mtree: NetBSD.dist.Xorg Log Message: merge freetype 2.5.3. To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.121 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.148 -r1.149 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.13 -r1.14 src/etc/mtree/NetBSD.dist.Xorg Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Thu Mar 20 10:15:14 UTC 2014 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax: config.h src/external/gpl3/gcc/usr.bin/gcc/arch/vax: auto-host.h configargs.h src/external/gpl3/gcc/usr.bin/libcpp/arch/vax: config.h Log Message: regenerate after recent vax specific fixes. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax/config.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gcc/usr.bin/gcc/arch/vax/auto-host.h cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/gcc/usr.bin/gcc/arch/vax/configargs.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/libcpp/arch/vax/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc Committed By: wiz Date: Thu Mar 20 10:27:39 UTC 2014 Modified Files: xsrc/external/mit/xf86-input-keyboard/dist/src: bsd_kbd.c Log Message: Remove obsolete chunk. No diffs to upstream remaining :) To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 \ xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: roy Date: Thu Mar 20 13:34:36 UTC 2014 Modified Files: src/sys/netinet6: nd6.c src/usr.sbin/ndp: ndp.8 Log Message: If IPv6 is disabled for an interface, mark all addresses as tentative. If enabled, check for a duplicated link-local address and abort enabling as per RFC 4862, section 5.4.5. If allowed to enable, perform DAD on the tentative addresses. Taken from FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.147 -r1.148 src/sys/netinet6/nd6.c cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/ndp/ndp.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/acpica/dist/tables
Module Name:src Committed By: riastradh Date: Thu Mar 20 13:40:02 UTC 2014 Modified Files: src/sys/external/bsd/acpica/dist/tables: tbutils.c Log Message: Don't unmap Rsdp until we've finished using it. XXX Let me know how this is supposed to be upstreamed if you know and have time... To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/tables/tbutils.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/acpitools/acpidump
Module Name:src Committed By: riastradh Date: Thu Mar 20 14:39:43 UTC 2014 Modified Files: src/usr.sbin/acpitools/acpidump: acpi.c Log Message: Don't choke on an assertion for an RSDT with a null address entry. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/acpitools/acpidump/acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: riastradh Date: Thu Mar 20 15:20:44 UTC 2014 Modified Files: src/distrib/sets/lists/xdebug: shl.mi Log Message: Update libfreetype debug data version. Hi mrg! To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/xdebug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/lib/libgcc/arch/earm
Module Name:src Committed By: skrll Date: Thu Mar 20 15:21:46 UTC 2014 Removed Files: src/external/gpl3/gcc/lib/libgcc/arch/earm: libgcc-std.ver Log Message: Remove a file that should be generated and fix the build To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 \ src/external/gpl3/gcc/lib/libgcc/arch/earm/libgcc-std.ver Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc/config/vax
Module Name:src Committed By: joerg Date: Thu Mar 20 16:53:55 UTC 2014 Modified Files: src/external/gpl3/gcc/dist/gcc/config/vax: vax.c vax.h vax.md Log Message: Annotation for the Processor Status Word. Sensible DWARF frame layout. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/config/vax/vax.c cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl3/gcc/dist/gcc/config/vax/vax.h cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/gcc/config/vax/vax.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/include
Module Name:src Committed By: christos Date: Thu Mar 20 17:25:23 UTC 2014 Modified Files: src/lib/libc/include: port_before.h Log Message: CID 273814, don't confuse coverity. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/include/port_before.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sh3/sh3
Module Name:src Committed By: christos Date: Thu Mar 20 18:01:19 UTC 2014 Modified Files: src/sys/arch/sh3/sh3: db_disasm.c Log Message: kill sprintf To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sh3/sh3/db_disasm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/miscfs/fdesc
Module Name:src Committed By: christos Date: Thu Mar 20 18:04:05 UTC 2014 Modified Files: src/sys/miscfs/fdesc: fdesc_vnops.c Log Message: kill sprintf To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 src/sys/miscfs/fdesc/fdesc_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Thu Mar 20 20:40:09 UTC 2014 Added Files: src/sys/arch/amd64/conf: ALL Log Message: First attempt at an ALL kernel based on the i386 one To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/amd64/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/i2o
Module Name:src Committed By: christos Date: Thu Mar 20 20:40:42 UTC 2014 Modified Files: src/sys/dev/i2o: dpti.c Log Message: make this compile again. XXX: 32 bit pointer issues. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/dev/i2o/dpti.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: christos Date: Thu Mar 20 20:41:11 UTC 2014 Modified Files: src/sys/dev/pci: oboe.c Log Message: make it compile on amd64 To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/dev/pci/oboe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src Committed By: christos Date: Thu Mar 20 20:42:08 UTC 2014 Modified Files: src/sys/rump/dev/lib/libugenhc: ugenhc.c src/sys/rump/librump/rumpkern: rump.c src/sys/rump/librump/rumpvfs: devnodes.c src/sys/rump/net/lib/libshmif: if_shmem.c src/sys/rump/net/lib/libvirtif: if_virt.c Log Message: kill sprintf To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/rump/dev/lib/libugenhc/ugenhc.c cvs rdiff -u -r1.290 -r1.291 src/sys/rump/librump/rumpkern/rump.c cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpvfs/devnodes.c cvs rdiff -u -r1.59 -r1.60 src/sys/rump/net/lib/libshmif/if_shmem.c cvs rdiff -u -r1.45 -r1.46 src/sys/rump/net/lib/libvirtif/if_virt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/lib/libsa
Module Name:src Committed By: christos Date: Thu Mar 20 20:42:37 UTC 2014 Modified Files: src/sys/lib/libsa: bootp.c Log Message: kill sprintf To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/lib/libsa/bootp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src Committed By: christos Date: Thu Mar 20 20:43:12 UTC 2014 Modified Files: src/sys/external/bsd/ipf/netinet: fil.c ip_compat.h ip_fil_compat.c ip_ftp_pxy.c ip_htable.c ip_irc_pxy.c ip_lookup.c ip_pool.c ip_rpcb_pxy.c radix_ipf.c Log Message: kill sprintf To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/ipf/netinet/fil.c cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/ipf/netinet/ip_compat.h cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/ipf/netinet/ip_fil_compat.c \ src/sys/external/bsd/ipf/netinet/ip_irc_pxy.c \ src/sys/external/bsd/ipf/netinet/ip_lookup.c \ src/sys/external/bsd/ipf/netinet/ip_pool.c \ src/sys/external/bsd/ipf/netinet/ip_rpcb_pxy.c cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/ipf/netinet/ip_ftp_pxy.c \ src/sys/external/bsd/ipf/netinet/radix_ipf.c cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/ipf/netinet/ip_htable.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netisdn
Module Name:src Committed By: christos Date: Thu Mar 20 20:43:35 UTC 2014 Modified Files: src/sys/netisdn: i4b_capi_msgs.c Log Message: XXX: 32 bit pointer To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/netisdn/i4b_capi_msgs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: christos Date: Thu Mar 20 20:44:42 UTC 2014 Modified Files: src/sys/arch/x86/x86: sys_machdep.c Log Message: need compat_netbsd.h To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x86/x86/sys_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src Committed By: christos Date: Thu Mar 20 20:44:15 UTC 2014 Modified Files: src/sys/netinet: in_proto.c Log Message: need compat header. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/sys/netinet/in_proto.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
