CVS commit: src/sys/dev/pci
Module Name:src
Committed By: nonaka
Date: Wed Jul 22 15:18:01 UTC 2015
Modified Files:
src/sys/dev/pci: if_iwm.c if_iwmvar.h
Log Message:
iwm(4) can read the firmware image from disk when interface up.
This change is useful for full-disk encryption environment.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/if_iwm.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/if_iwmvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.35 src/sys/dev/pci/if_iwm.c:1.36
--- src/sys/dev/pci/if_iwm.c:1.35 Fri May 22 15:32:21 2015
+++ src/sys/dev/pci/if_iwm.c Wed Jul 22 15:18:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwm.c,v 1.35 2015/05/22 15:32:21 nonaka Exp $ */
+/* $NetBSD: if_iwm.c,v 1.36 2015/07/22 15:18:01 nonaka Exp $ */
/* OpenBSD: if_iwm.c,v 1.41 2015/05/22 06:50:54 kettenis Exp */
/*
@@ -105,7 +105,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.35 2015/05/22 15:32:21 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.36 2015/07/22 15:18:01 nonaka Exp $);
#include sys/param.h
#include sys/conf.h
@@ -437,6 +437,9 @@ static int iwm_activate(device_t, enum d
static void iwm_wakeup(struct iwm_softc *);
#endif
static void iwm_radiotap_attach(struct iwm_softc *);
+static int iwm_sysctl_fw_loaded_handler(SYSCTLFN_PROTO);
+
+static int iwm_sysctl_root_num;
static int
iwm_firmload(struct iwm_softc *sc)
@@ -445,6 +448,9 @@ iwm_firmload(struct iwm_softc *sc)
firmware_handle_t fwh;
int error;
+ if (ISSET(sc-sc_flags, IWM_FLAG_FW_LOADED))
+ return 0;
+
/* Open firmware image. */
if ((error = firmware_open(if_iwm, sc-sc_fwname, fwh)) != 0) {
aprint_error_dev(sc-sc_dev,
@@ -452,6 +458,11 @@ iwm_firmload(struct iwm_softc *sc)
return error;
}
+ if (fw-fw_rawdata != NULL fw-fw_rawsize 0) {
+ kmem_free(fw-fw_rawdata, fw-fw_rawsize);
+ fw-fw_rawdata = NULL;
+ }
+
fw-fw_rawsize = firmware_get_size(fwh);
/*
* Well, this is how the Linux driver checks it
@@ -466,8 +477,7 @@ iwm_firmload(struct iwm_softc *sc)
/* some sanity */
if (fw-fw_rawsize IWM_FWMAXSIZE) {
aprint_error_dev(sc-sc_dev,
- firmware size is ridiculous: %zd bytes\n,
- fw-fw_rawsize);
+ firmware size is ridiculous: %zd bytes\n, fw-fw_rawsize);
error = EINVAL;
goto out;
}
@@ -487,6 +497,7 @@ iwm_firmload(struct iwm_softc *sc)
goto out;
}
+ SET(sc-sc_flags, IWM_FLAG_FW_LOADED);
out:
/* caller will release memory, if necessary */
@@ -816,6 +827,7 @@ iwm_read_firmware(struct iwm_softc *sc)
if (error fw-fw_rawdata != NULL) {
kmem_free(fw-fw_rawdata, fw-fw_rawsize);
fw-fw_rawdata = NULL;
+ CLR(sc-sc_flags, IWM_FLAG_FW_LOADED);
}
return error;
}
@@ -5917,17 +5929,25 @@ iwm_ioctl(struct ifnet *ifp, u_long cmd,
case SIOCADDMULTI:
case SIOCDELMULTI:
+ if (!ISSET(sc-sc_flags, IWM_FLAG_ATTACHED)) {
+ error = ENXIO;
+ break;
+ }
sa = ifreq_getaddr(SIOCADDMULTI, (struct ifreq *)data);
error = (cmd == SIOCADDMULTI) ?
ether_addmulti(sa, sc-sc_ec) :
ether_delmulti(sa, sc-sc_ec);
-
if (error == ENETRESET)
error = 0;
break;
default:
+ if (!ISSET(sc-sc_flags, IWM_FLAG_ATTACHED)) {
+ error = ether_ioctl(ifp, cmd, data);
+ break;
+ }
error = ieee80211_ioctl(ic, cmd, data);
+ break;
}
if (error == ENETRESET) {
@@ -6523,13 +6543,9 @@ iwm_match(device_t parent, cfdata_t matc
static int
iwm_preinit(struct iwm_softc *sc)
{
+ struct ieee80211com *ic = sc-sc_ic;
int error;
- if ((error = iwm_prepare_card_hw(sc)) != 0) {
- aprint_error_dev(sc-sc_dev, could not initialize hardware\n);
- return error;
- }
-
if (sc-sc_flags IWM_FLAG_ATTACHED)
return 0;
@@ -6540,20 +6556,8 @@ iwm_preinit(struct iwm_softc *sc)
error = iwm_run_init_mvm_ucode(sc, 1);
iwm_stop_device(sc);
- return error;
-}
-
-static void
-iwm_attach_hook(device_t dev)
-{
- struct iwm_softc *sc = device_private(dev);
- struct ieee80211com *ic = sc-sc_ic;
- struct ifnet *ifp = sc-sc_ec.ec_if;
-
- KASSERT(!cold);
-
- if (iwm_preinit(sc) != 0)
- return;
+ if (error)
+ return error;
sc-sc_flags |= IWM_FLAG_ATTACHED;
@@ -6565,52 +6569,11 @@ iwm_attach_hook(device_t dev)
IWM_UCODE_API(sc-sc_fwver),
ether_sprintf(sc-sc_nvm.hw_addr));
- ic-ic_ifp = ifp;
- ic-ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */
- ic-ic_opmode = IEEE80211_M_STA; /* default to BSS mode */
- ic-ic_state = IEEE80211_S_INIT;
-
- /* Set device capabilities. */
- ic-ic_caps =
- IEEE80211_C_WEP | /* WEP */
- IEEE80211_C_WPA | /* 802.11i */
- IEEE80211_C_SHSLOT | /* short slot time supported */
- IEEE80211_C_SHPREAMBLE; /* short preamble supported */
-
/* not all hardware can do 5GHz band */
if (sc-sc_nvm.sku_cap_band_52GHz_enable)
ic-ic_sup_rates[IEEE80211_MODE_11A] = ieee80211_std_rateset_11a;
-
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 16:38:05 UTC 2015 Removed Files: xsrc/external/mit/xf86-video-radeonhd/dist: COPYING ChangeLog INSTALL Imakefile Makefile.am Makefile.in README RadeonHD.am RadeonHD.tmpl acinclude.m4 aclocal.m4 compile config.guess config.h.in config.sub configure configure.ac depcomp git_version.sh install-sh ltmain.sh missing shave-libtool.in shave.in xsrc/external/mit/xf86-video-radeonhd/dist/man: Imakefile Makefile.am Makefile.in radeonhd.man xsrc/external/mit/xf86-video-radeonhd/dist/src: Imakefile Makefile.am Makefile.in atombios_rev.h git_version.h r5xx_3dregs.h r5xx_accel.c r5xx_accel.h r5xx_exa.c r5xx_regs.h r5xx_xaa.c r600_exa.c r600_reg.h r600_reg_auto_r6xx.h r600_reg_r6xx.h r600_reg_r7xx.h r600_shader.c r600_shader.h r600_state.h r600_textured_videofuncs.c r6xx_accel.c r6xx_accel.h radeon_3d.c radeon_dri.h radeon_drm.h radeon_exa_render.c radeon_textured_videofuncs.c rhd.h rhd_acpi.c rhd_acpi.h rhd_atombios.c rhd_atombios.h rhd_atomcrtc.c rhd_atomout.c rhd_atomout.h rhd_atompll.c rhd_atomwrapper.c rhd_atomwrapper.h rhd_audio.c rhd_audio.h rhd_biosscratch.c rhd_biosscratch.h rhd_card.h rhd_connector.c rhd_connector.h rhd_crtc.c rhd_crtc.h rhd_cs.c rhd_cs.h rhd_cursor.c rhd_cursor.h rhd_dac.c rhd_ddia.c rhd_dig.c rhd_dri.c rhd_dri.h rhd_driver.c rhd_edid.c rhd_hdmi.c rhd_hdmi.h rhd_helper.c rhd_i2c.c rhd_i2c.h rhd_id.c rhd_lut.c rhd_lut.h rhd_lvtma.c rhd_mc.c rhd_mc.h rhd_modes.c rhd_modes.h rhd_monitor.c rhd_monitor.h rhd_output.c rhd_output.h rhd_pll.c rhd_pll.h rhd_pm.c rhd_pm.h rhd_randr.c rhd_randr.h rhd_regs.h rhd_shadow.c rhd_shadow.h rhd_tmds.c rhd_vga.c rhd_vga.h rhd_video.c rhd_video.h xsrc/external/mit/xf86-video-radeonhd/dist/src/AtomBios: CD_Operations.c Decoder.c hwserv_drv.c xsrc/external/mit/xf86-video-radeonhd/dist/src/AtomBios/includes: CD_Common_Types.h CD_Definitions.h CD_Opcodes.h CD_Structs.h CD_binding.h CD_hw_services.h Decoder.h ObjectID.h atombios.h regsdef.h xsrc/external/mit/xf86-video-radeonhd/dist/utils/conntest: Imakefile Makefile.am Makefile.in README git_version.h rhd_conntest.c rhd_dump.c xsrc/external/mit/xf86-video-radeonhd/include: config.h xsrc/external/mit/xf86-video-vga/dist: COPYING ChangeLog Makefile.am Makefile.in aclocal.m4 config.guess config.h.in config.sub configure configure.ac depcomp install-sh ltmain.sh missing xsrc/external/mit/xf86-video-vga/dist/man: Makefile.am Makefile.in vga.man xsrc/external/mit/xf86-video-vga/dist/src: Makefile.am Makefile.in generic.c Log Message: remove obsolete sources. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-radeonhd/dist/COPYING \ xsrc/external/mit/xf86-video-radeonhd/dist/Imakefile \ xsrc/external/mit/xf86-video-radeonhd/dist/RadeonHD.am \ xsrc/external/mit/xf86-video-radeonhd/dist/RadeonHD.tmpl \ xsrc/external/mit/xf86-video-radeonhd/dist/acinclude.m4 \ xsrc/external/mit/xf86-video-radeonhd/dist/compile \ xsrc/external/mit/xf86-video-radeonhd/dist/missing \ xsrc/external/mit/xf86-video-radeonhd/dist/shave-libtool.in \ xsrc/external/mit/xf86-video-radeonhd/dist/shave.in cvs rdiff -u -r1.1.1.4 -r0 \ xsrc/external/mit/xf86-video-radeonhd/dist/ChangeLog \ xsrc/external/mit/xf86-video-radeonhd/dist/Makefile.in \ xsrc/external/mit/xf86-video-radeonhd/dist/README \ xsrc/external/mit/xf86-video-radeonhd/dist/aclocal.m4 \ xsrc/external/mit/xf86-video-radeonhd/dist/config.h.in \ xsrc/external/mit/xf86-video-radeonhd/dist/configure \ xsrc/external/mit/xf86-video-radeonhd/dist/configure.ac cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xf86-video-radeonhd/dist/INSTALL \ xsrc/external/mit/xf86-video-radeonhd/dist/config.guess \ xsrc/external/mit/xf86-video-radeonhd/dist/config.sub \ xsrc/external/mit/xf86-video-radeonhd/dist/depcomp \ xsrc/external/mit/xf86-video-radeonhd/dist/git_version.sh \ xsrc/external/mit/xf86-video-radeonhd/dist/install-sh \ xsrc/external/mit/xf86-video-radeonhd/dist/ltmain.sh cvs rdiff -u -r1.1.1.3 -r0 \ xsrc/external/mit/xf86-video-radeonhd/dist/Makefile.am cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-video-radeonhd/dist/man/Imakefile \ xsrc/external/mit/xf86-video-radeonhd/dist/man/Makefile.am cvs rdiff -u -r1.1.1.4 -r0 \ xsrc/external/mit/xf86-video-radeonhd/dist/man/Makefile.in \ xsrc/external/mit/xf86-video-radeonhd/dist/man/radeonhd.man cvs rdiff -u -r1.1.1.3 -r0 \
CVS commit: src
Module Name:src Committed By: mrg Date: Wed Jul 22 16:37:33 UTC 2015 Modified Files: src/distrib/sets/lists/xdebug: md.amd64 md.cats md.i386 src/distrib/sets/lists/xserver: md.alpha md.amd64 md.cats md.i386 src/external/mit/xorg/server/drivers: Makefile Removed Files: src/external/mit/xorg/server/drivers/xf86-video-radeonhd: Makefile src/external/mit/xorg/server/drivers/xf86-video-vga: Makefile Log Message: delete obsolete vga and radeonhd drivers. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/xdebug/md.amd64 cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/xdebug/md.cats cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/xdebug/md.i386 cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.80 -r1.81 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/xserver/md.cats cvs rdiff -u -r1.99 -r1.100 src/distrib/sets/lists/xserver/md.i386 cvs rdiff -u -r1.67 -r1.68 src/external/mit/xorg/server/drivers/Makefile cvs rdiff -u -r1.7 -r0 \ src/external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile cvs rdiff -u -r1.2 -r0 \ src/external/mit/xorg/server/drivers/xf86-video-vga/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/xdebug/md.amd64 diff -u src/distrib/sets/lists/xdebug/md.amd64:1.19 src/distrib/sets/lists/xdebug/md.amd64:1.20 --- src/distrib/sets/lists/xdebug/md.amd64:1.19 Mon Jul 20 02:52:57 2015 +++ src/distrib/sets/lists/xdebug/md.amd64 Wed Jul 22 16:37:33 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.19 2015/07/20 02:52:57 mrg Exp $ +# $NetBSD: md.amd64,v 1.20 2015/07/22 16:37:33 mrg Exp $ ./usr/X11R7/lib/libI810XvMC_g.a-unknown- debuglib,xorg,compatx11file ./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg,compatx11file ./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg,compatx11file @@ -150,7 +150,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.6.debug -unknown- xorg,debug,obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.7.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1.debug -unknown- xorg,debug,obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3virge_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/savage_drv.so.2.debug -unknown- xorg,debug Index: src/distrib/sets/lists/xdebug/md.cats diff -u src/distrib/sets/lists/xdebug/md.cats:1.5 src/distrib/sets/lists/xdebug/md.cats:1.6 --- src/distrib/sets/lists/xdebug/md.cats:1.5 Mon Jul 20 02:50:42 2015 +++ src/distrib/sets/lists/xdebug/md.cats Wed Jul 22 16:37:33 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.cats,v 1.5 2015/07/20 02:50:42 mrg Exp $ +# $NetBSD: md.cats,v 1.6 2015/07/22 16:37:33 mrg Exp $ ./usr/X11R7/lib/modules/extensions/libcfb32_g.a -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libcfb_g.a -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,obsolete @@ -78,7 +78,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/neomagic_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nv_drv.so.2.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.6.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1.debug -unknown- xorg,debug,obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3virge_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/savage_drv.so.2.debug -unknown- xorg,debug Index: src/distrib/sets/lists/xdebug/md.i386 diff -u src/distrib/sets/lists/xdebug/md.i386:1.18 src/distrib/sets/lists/xdebug/md.i386:1.19 --- src/distrib/sets/lists/xdebug/md.i386:1.18 Mon Jul 20 02:52:57 2015 +++ src/distrib/sets/lists/xdebug/md.i386 Wed Jul 22 16:37:33 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.18 2015/07/20 02:52:57 mrg Exp $ +# $NetBSD: md.i386,v 1.19 2015/07/22 16:37:33 mrg Exp $ ./usr/X11R6/lib/modules/extensions/libGLcore_g.a -unknown- debuglib,x11 ./usr/X11R6/lib/modules/extensions/libdbe_g.a -unknown- debuglib,x11 ./usr/X11R6/lib/modules/extensions/libextmod_g.a -unknown- debuglib,x11 @@ -199,7 +199,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/r128_drv.so.6.debug -unknown- xorg,debug
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Wed Jul 22 16:56:03 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 883, 884 To generate a diff of this commit: cvs rdiff -u -r1.1.2.344 -r1.1.2.345 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.344 src/doc/CHANGES-7.0:1.1.2.345 --- src/doc/CHANGES-7.0:1.1.2.344 Mon Jul 20 06:13:52 2015 +++ src/doc/CHANGES-7.0 Wed Jul 22 16:56:03 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.344 2015/07/20 06:13:52 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.345 2015/07/22 16:56:03 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -33408,3 +33408,22 @@ sys/arch/sparc64/sparc64/pmap.c 1.295, .data and .bss segment. [martin, ticket #842] +distrib/sets/lists/debug/ad.aarch64 patch +distrib/sets/lists/debug/ad.arm patch +distrib/sets/lists/debug/ad.mips patch +distrib/sets/lists/debug/ad.powerpc patch +distrib/sets/lists/debug/md.amd64 patch +distrib/sets/lists/debug/md.sparc64 patch +distrib/sets/lists/debug/shl.mi patch + + Fix debug set lists after BIND update. + [skrll, ticket #883] + +sys/arch/amd64/conf/XEN3_DOM0 1.114 +sys/arch/amd64/conf/XEN3_DOMU 1.62 +sys/arch/i386/conf/XEN3_DOM0 1.96 +sys/arch/i386/conf/XEN3_DOMU 1.68 + + Uncoment options IPSEC in Xen kernels. + [bouyer, ticket #884] +
CVS commit: [netbsd-7] src/distrib/sets/lists/base
Module Name:src Committed By: snj Date: Wed Jul 22 17:24:55 UTC 2015 Modified Files: src/distrib/sets/lists/base [netbsd-7]: ad.aarch64 ad.arm ad.mips ad.powerpc md.amd64 md.sparc64 shl.mi Log Message: Revert part of ticket 878: we don't add obsolete entries for old libs when the minor gets bumped. To generate a diff of this commit: cvs rdiff -u -r1.2.2.6 -r1.2.2.7 src/distrib/sets/lists/base/ad.aarch64 cvs rdiff -u -r1.54.2.9 -r1.54.2.10 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.48.2.9 -r1.48.2.10 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.17.2.7 -r1.17.2.8 src/distrib/sets/lists/base/ad.powerpc cvs rdiff -u -r1.244.2.8 -r1.244.2.9 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.232.2.8 -r1.232.2.9 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.712.2.8 -r1.712.2.9 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.aarch64 diff -u src/distrib/sets/lists/base/ad.aarch64:1.2.2.6 src/distrib/sets/lists/base/ad.aarch64:1.2.2.7 --- src/distrib/sets/lists/base/ad.aarch64:1.2.2.6 Fri Jul 17 04:31:19 2015 +++ src/distrib/sets/lists/base/ad.aarch64 Wed Jul 22 17:24:54 2015 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.2.2.6 2015/07/17 04:31:19 snj Exp $ +# $NetBSD: ad.aarch64,v 1.2.2.7 2015/07/22 17:24:54 snj Exp $ ./lib/eabi base-compat-shlib compat ./lib/eabi/npf base-npf-shlib compat ./lib/eabi/npf/ext_log.so base-npf-shlib compat,pic @@ -98,7 +98,6 @@ ./usr/lib/eabi/libbfd.so.13 base-compat-shlib compat,pic,binutils ./usr/lib/eabi/libbfd.so.13.0 base-compat-shlib compat,pic,binutils ./usr/lib/eabi/libbind9.so.8 base-compat-shlib compat,pic -./usr/lib/eabi/libbind9.so.8.1 base-obsolete obsolete ./usr/lib/eabi/libbind9.so.8.2 base-compat-shlib compat,pic ./usr/lib/eabi/libblacklist.so.0 base-compat-shlib compat,pic ./usr/lib/eabi/libblacklist.so.0.0 base-compat-shlib compat,pic @@ -129,7 +128,6 @@ ./usr/lib/eabi/libdm.so.0base-compat-shlib compat,pic ./usr/lib/eabi/libdm.so.0.0 base-compat-shlib compat,pic ./usr/lib/eabi/libdns.so.8 base-compat-shlib compat,pic -./usr/lib/eabi/libdns.so.8.1 base-obsolete obsolete ./usr/lib/eabi/libdns.so.8.2 base-compat-shlib compat,pic ./usr/lib/eabi/libdns_sd.so.0 base-compat-shlib compat,pic,mdns ./usr/lib/eabi/libdns_sd.so.0.0 base-compat-shlib compat,pic,mdns @@ -176,16 +174,12 @@ ./usr/lib/eabi/libipsec.so.3 base-compat-shlib compat,pic ./usr/lib/eabi/libipsec.so.3.0 base-compat-shlib compat,pic ./usr/lib/eabi/libirs.so.8 base-compat-shlib compat,pic -./usr/lib/eabi/libirs.so.8.1 base-obsolete obsolete ./usr/lib/eabi/libirs.so.8.2 base-compat-shlib compat,pic ./usr/lib/eabi/libisc.so.8 base-compat-shlib compat,pic -./usr/lib/eabi/libisc.so.8.1 base-obsolete obsolete ./usr/lib/eabi/libisc.so.8.2 base-compat-shlib compat,pic ./usr/lib/eabi/libisccc.so.8 base-compat-shlib compat,pic -./usr/lib/eabi/libisccc.so.8.1 base-obsolete obsolete ./usr/lib/eabi/libisccc.so.8.2 base-compat-shlib compat,pic ./usr/lib/eabi/libisccfg.so.8 base-compat-shlib compat,pic -./usr/lib/eabi/libisccfg.so.8.1 base-obsolete obsolete ./usr/lib/eabi/libisccfg.so.8.2 base-compat-shlib compat,pic ./usr/lib/eabi/libiscsi.so.2 base-compat-shlib compat,pic,iscsi ./usr/lib/eabi/libiscsi.so.2.0 base-compat-shlib compat,pic,iscsi @@ -214,7 +208,6 @@ ./usr/lib/eabi/liblutok.so.2 base-compat-shlib compat,pic,kyua ./usr/lib/eabi/liblutok.so.2.0 base-compat-shlib compat,pic,kyua ./usr/lib/eabi/liblwres.so.8 base-compat-shlib compat,pic -./usr/lib/eabi/liblwres.so.8.1 base-obsolete obsolete ./usr/lib/eabi/liblwres.so.8.2 base-compat-shlib compat,pic ./usr/lib/eabi/liblzf.so.1 base-compat-shlib compat,pic ./usr/lib/eabi/liblzf.so.1.0 base-compat-shlib compat,pic @@ -421,7 +414,7 @@ #./usr/lib/eabihf/libbfd.so.13 base-compat-shlib compat,pic,binutils #./usr/lib/eabihf/libbfd.so.13.0 base-compat-shlib compat,pic,binutils #./usr/lib/eabihf/libbind9.so.8 base-compat-shlib compat,pic -#./usr/lib/eabihf/libbind9.so.8.1 base-compat-shlib compat,pic +#./usr/lib/eabihf/libbind9.so.8.2 base-compat-shlib compat,pic #./usr/lib/eabihf/libbluetooth.so.4 base-compat-shlib compat,pic #./usr/lib/eabihf/libbluetooth.so.4.2 base-compat-shlib compat,pic #./usr/lib/eabihf/libbsdmalloc.so.0 base-compat-shlib compat,pic @@ -449,7 +442,7 @@ #./usr/lib/eabihf/libdm.so.0base-compat-shlib compat,pic #./usr/lib/eabihf/libdm.so.0.0 base-compat-shlib compat,pic #./usr/lib/eabihf/libdns.so.8 base-compat-shlib compat,pic -#./usr/lib/eabihf/libdns.so.8.1 base-compat-shlib compat,pic +#./usr/lib/eabihf/libdns.so.8.2 base-compat-shlib compat,pic #./usr/lib/eabihf/libdns_sd.so.0 base-compat-shlib compat,pic,mdns #./usr/lib/eabihf/libdns_sd.so.0.0 base-compat-shlib
CVS commit: [netbsd-7] src/distrib/sets/lists/debug
Module Name:src Committed By: snj Date: Wed Jul 22 16:51:59 UTC 2015 Modified Files: src/distrib/sets/lists/debug [netbsd-7]: ad.aarch64 ad.arm ad.mips ad.powerpc md.amd64 md.sparc64 shl.mi Log Message: Apply patch (requested by skrll in ticket #883): Fix debug set lists after BIND update. To generate a diff of this commit: cvs rdiff -u -r1.2.2.6 -r1.2.2.7 src/distrib/sets/lists/debug/ad.aarch64 cvs rdiff -u -r1.42.2.8 -r1.42.2.9 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.38.2.7 -r1.38.2.8 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.18.2.7 -r1.18.2.8 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.63.2.7 -r1.63.2.8 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.61.2.7 -r1.61.2.8 src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.71.2.11 -r1.71.2.12 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/ad.aarch64 diff -u src/distrib/sets/lists/debug/ad.aarch64:1.2.2.6 src/distrib/sets/lists/debug/ad.aarch64:1.2.2.7 --- src/distrib/sets/lists/debug/ad.aarch64:1.2.2.6 Thu Apr 30 06:07:32 2015 +++ src/distrib/sets/lists/debug/ad.aarch64 Wed Jul 22 16:51:59 2015 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.2.2.6 2015/04/30 06:07:32 riz Exp $ +# $NetBSD: ad.aarch64,v 1.2.2.7 2015/07/22 16:51:59 snj Exp $ -./usr/libdata/debug/usr/tests/lib/libc/gen/t_fpsetmask.debug -./usr/libdata/debug/usr/tests/lib/libc/gen/t_fpsetround.debug ./usr/lib/eabi/libcrypto_g.a comp-c-debuglib compat,crypto,debuglib @@ -62,7 +62,7 @@ ./usr/libdata/debug/usr/lib/eabi/libatf-c.so.0.0.debug comp-compat-shlib compat,pic,atf,debug ./usr/libdata/debug/usr/lib/eabi/libavl.so.0.0.debug comp-zfs-debug zfs,dynamicroot,debug,compat ./usr/libdata/debug/usr/lib/eabi/libbfd.so.13.0.debug comp-sys-debug binutils,debug,compat -./usr/libdata/debug/usr/lib/eabi/libbind9.so.8.1.debug comp-bind-debug debug,compat +./usr/libdata/debug/usr/lib/eabi/libbind9.so.8.2.debug comp-bind-debug debug,compat ./usr/libdata/debug/usr/lib/eabi/libblacklist.so.0.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/eabi/libbluetooth.so.4.2.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/eabi/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compat @@ -78,7 +78,7 @@ ./usr/libdata/debug/usr/lib/eabi/libdes.so.8.2.debug comp-crypto-debug crypto,debug,compat ./usr/libdata/debug/usr/lib/eabi/libdevmapper.so.1.0.debug comp-lvm-debug lvm,debug,compat ./usr/libdata/debug/usr/lib/eabi/libdm.so.0.0.debug comp-sys-debug debug,compat -./usr/libdata/debug/usr/lib/eabi/libdns.so.8.1.debug comp-bind-debug debug,compat +./usr/libdata/debug/usr/lib/eabi/libdns.so.8.2.debug comp-bind-debug debug,compat ./usr/libdata/debug/usr/lib/eabi/libdns_sd.so.0.0.debug comp-mdns-debug mdns,debug,compat ./usr/libdata/debug/usr/lib/eabi/libdtrace.so.2.0.debug comp-sys-debug dtrace,debug,compat ./usr/libdata/debug/usr/lib/eabi/libdwarf.so.1.0.debug comp-sys-debug debug,compat @@ -103,10 +103,10 @@ ./usr/libdata/debug/usr/lib/eabi/libhx509.so.5.0.debug comp-krb5-debug kerberos,debug,compat ./usr/libdata/debug/usr/lib/eabi/libintl.so.1.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/eabi/libipsec.so.3.0.debug comp-net-debug debug,compat -./usr/libdata/debug/usr/lib/eabi/libirs.so.8.1.debug comp-bind-debug debug,compat -./usr/libdata/debug/usr/lib/eabi/libisc.so.8.1.debug comp-bind-debug debug,compat -./usr/libdata/debug/usr/lib/eabi/libisccc.so.8.1.debug comp-bind-debug debug,compat -./usr/libdata/debug/usr/lib/eabi/libisccfg.so.8.1.debug comp-bind-debug debug,compat +./usr/libdata/debug/usr/lib/eabi/libirs.so.8.2.debug comp-bind-debug debug,compat +./usr/libdata/debug/usr/lib/eabi/libisc.so.8.2.debug comp-bind-debug debug,compat +./usr/libdata/debug/usr/lib/eabi/libisccc.so.8.2.debug comp-bind-debug debug,compat +./usr/libdata/debug/usr/lib/eabi/libisccfg.so.8.2.debug comp-bind-debug debug,compat ./usr/libdata/debug/usr/lib/eabi/libiscsi.so.2.0.debug comp-iscsi-debug iscsi,debug,compat ./usr/libdata/debug/usr/lib/eabi/libisns.so.0.0.debug comp-isns-debug debug,compat ./usr/libdata/debug/usr/lib/eabi/libkadm5clnt.so.13.0.debug comp-compat-shlib compat,pic,kerberos,debug @@ -120,7 +120,7 @@ ./usr/libdata/debug/usr/lib/eabi/libldap_r.so.4.3.debug comp-ldap-debug ldap,debug,compat ./usr/libdata/debug/usr/lib/eabi/liblua.so.5.3.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/eabi/liblutok.so.2.0.debug comp-kyua-debug kyua,debug,compat -./usr/libdata/debug/usr/lib/eabi/liblwres.so.8.1.debug comp-bind-debug debug,compat +./usr/libdata/debug/usr/lib/eabi/liblwres.so.8.2.debug comp-bind-debug debug,compat ./usr/libdata/debug/usr/lib/eabi/liblzf.so.1.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/eabi/liblzma.so.1.1.debug comp-sys-debug debug,compat
CVS commit: [netbsd-7] src/sys/arch
Module Name:src Committed By: snj Date: Wed Jul 22 16:53:34 UTC 2015 Modified Files: src/sys/arch/amd64/conf [netbsd-7]: XEN3_DOM0 XEN3_DOMU src/sys/arch/i386/conf [netbsd-7]: XEN3_DOM0 XEN3_DOMU Log Message: Pull up following revision(s) (requested by bouyer in ticket #884): sys/arch/amd64/conf/XEN3_DOM0: revision 1.114 sys/arch/amd64/conf/XEN3_DOMU: revision 1.62 sys/arch/i386/conf/XEN3_DOM0: revision 1.96 sys/arch/i386/conf/XEN3_DOMU: revision 1.68 Uncoment options IPSEC, as requested by Gary Duzan in PR port-amd64/50052 To generate a diff of this commit: cvs rdiff -u -r1.103.2.3 -r1.103.2.4 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.54.2.3 -r1.54.2.4 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.85.2.4 -r1.85.2.5 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.59.2.4 -r1.59.2.5 src/sys/arch/i386/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.3 src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.4 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.3 Tue Nov 18 19:05:28 2014 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Wed Jul 22 16:53:34 2015 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.103.2.3 2014/11/18 19:05:28 snj Exp $ +# $NetBSD: XEN3_DOM0,v 1.103.2.4 2015/07/22 16:53:34 snj Exp $ include arch/amd64/conf/std.xen @@ -122,7 +122,7 @@ options UFS_EXTATTR # Extended attribut #options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP options INET6 # IPV6 -#options IPSEC # IP security +options IPSEC # IP security #options IPSEC_DEBUG # debug for IP security #options MROUTING # IP multicast routing #options PIM # Protocol Independent Multicast Index: src/sys/arch/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.54.2.3 src/sys/arch/amd64/conf/XEN3_DOMU:1.54.2.4 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.54.2.3 Tue Nov 18 19:05:28 2014 +++ src/sys/arch/amd64/conf/XEN3_DOMU Wed Jul 22 16:53:34 2015 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.54.2.3 2014/11/18 19:05:28 snj Exp $ +# $NetBSD: XEN3_DOMU,v 1.54.2.4 2015/07/22 16:53:34 snj Exp $ include arch/amd64/conf/std.xen @@ -116,7 +116,7 @@ options UFS_EXTATTR # Extended attribut #options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP options INET6 # IPV6 -#options IPSEC # IP security +options IPSEC # IP security #options IPSEC_DEBUG # debug for IP security #options MROUTING # IP multicast routing #options PIM # Protocol Independent Multicast Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.4 src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.5 --- src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.4 Fri Jun 5 16:52:39 2015 +++ src/sys/arch/i386/conf/XEN3_DOM0 Wed Jul 22 16:53:34 2015 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.85.2.4 2015/06/05 16:52:39 snj Exp $ +# $NetBSD: XEN3_DOM0,v 1.85.2.5 2015/07/22 16:53:34 snj Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -145,7 +145,7 @@ options UFS_EXTATTR # Extended attribut #options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP options INET6 # IPv6 -#options IPSEC # IP security +options IPSEC # IP security #options IPSEC_DEBUG # debug for IP security #options MROUTING # IP multicast routing #options PIM # Protocol Independent Multicast Index: src/sys/arch/i386/conf/XEN3_DOMU diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.59.2.4 src/sys/arch/i386/conf/XEN3_DOMU:1.59.2.5 --- src/sys/arch/i386/conf/XEN3_DOMU:1.59.2.4 Fri Jun 5 16:52:39 2015 +++ src/sys/arch/i386/conf/XEN3_DOMU Wed Jul 22 16:53:34 2015 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.59.2.4 2015/06/05 16:52:39 snj Exp $ +# $NetBSD: XEN3_DOMU,v 1.59.2.5 2015/07/22 16:53:34 snj Exp $ include arch/xen/conf/std.xen @@ -134,7 +134,7 @@ options UFS_EXTATTR # Extended attribut #options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP options INET6 # IPv6 -#options IPSEC # IP security +options IPSEC # IP security #options IPSEC_DEBUG # debug for IP security #options MROUTING # IP multicast routing #options PIM # Protocol Independent Multicast
CVS import: xsrc/external/mit/rgb/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 07:50:42 UTC 2015 Update of /cvsroot/xsrc/external/mit/rgb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14636 Log Message: initial import of rgb-1.0.6 Status: Vendor Tag: xorg Release Tags: rgb-1-0-6 U xsrc/external/mit/rgb/dist/COPYING U xsrc/external/mit/rgb/dist/configure U xsrc/external/mit/rgb/dist/README U xsrc/external/mit/rgb/dist/showrgb.c U xsrc/external/mit/rgb/dist/INSTALL U xsrc/external/mit/rgb/dist/configure.ac U xsrc/external/mit/rgb/dist/ChangeLog U xsrc/external/mit/rgb/dist/rgb.txt U xsrc/external/mit/rgb/dist/rgb.c U xsrc/external/mit/rgb/dist/config.h.in U xsrc/external/mit/rgb/dist/config.sub U xsrc/external/mit/rgb/dist/Makefile.am U xsrc/external/mit/rgb/dist/config.guess U xsrc/external/mit/rgb/dist/AUTHORS N xsrc/external/mit/rgb/dist/compile U xsrc/external/mit/rgb/dist/Makefile.in U xsrc/external/mit/rgb/dist/install-sh U xsrc/external/mit/rgb/dist/aclocal.m4 U xsrc/external/mit/rgb/dist/depcomp U xsrc/external/mit/rgb/dist/missing U xsrc/external/mit/rgb/dist/man/Makefile.am U xsrc/external/mit/rgb/dist/man/showrgb.man U xsrc/external/mit/rgb/dist/man/Makefile.in U xsrc/external/mit/rgb/dist/man/rgb.man U xsrc/external/mit/rgb/dist/others/raveling.txt U xsrc/external/mit/rgb/dist/others/README U xsrc/external/mit/rgb/dist/others/thomas.txt U xsrc/external/mit/rgb/dist/others/old-rgb.txt No conflicts created by this import
CVS commit: xsrc/external/mit/luit/include
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 07:54:38 UTC 2015 Removed Files: xsrc/external/mit/luit/include: config.h Log Message: merge luit 1.1.1. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 xsrc/external/mit/luit/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/luit/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 07:50:41 UTC 2015 Update of /cvsroot/xsrc/external/mit/luit/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28207 Log Message: initial import of luit-1.1.1 Status: Vendor Tag: xorg Release Tags: luit-1-1-1 U xsrc/external/mit/luit/dist/other.h U xsrc/external/mit/luit/dist/aclocal.m4 U xsrc/external/mit/luit/dist/depcomp U xsrc/external/mit/luit/dist/missing U xsrc/external/mit/luit/dist/install-sh U xsrc/external/mit/luit/dist/luit.c U xsrc/external/mit/luit/dist/acinclude.m4 U xsrc/external/mit/luit/dist/Makefile.in U xsrc/external/mit/luit/dist/parser.h U xsrc/external/mit/luit/dist/iso2022.h U xsrc/external/mit/luit/dist/other.c U xsrc/external/mit/luit/dist/charset.h U xsrc/external/mit/luit/dist/configure.ac U xsrc/external/mit/luit/dist/Makefile.am U xsrc/external/mit/luit/dist/locale.c U xsrc/external/mit/luit/dist/COPYING U xsrc/external/mit/luit/dist/sys.h U xsrc/external/mit/luit/dist/config.h.in U xsrc/external/mit/luit/dist/luit.h U xsrc/external/mit/luit/dist/config.guess U xsrc/external/mit/luit/dist/README U xsrc/external/mit/luit/dist/config.sub U xsrc/external/mit/luit/dist/ChangeLog U xsrc/external/mit/luit/dist/INSTALL U xsrc/external/mit/luit/dist/sys.c U xsrc/external/mit/luit/dist/charset.c U xsrc/external/mit/luit/dist/iso2022.c U xsrc/external/mit/luit/dist/configure U xsrc/external/mit/luit/dist/parser.c U xsrc/external/mit/luit/dist/man/Makefile.in U xsrc/external/mit/luit/dist/man/luit.man U xsrc/external/mit/luit/dist/man/Makefile.am No conflicts created by this import
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Wed Jul 22 08:17:32 UTC 2015
Modified Files:
xsrc/external/mit/fstobdf/dist: fstobdf.c
Removed Files:
xsrc/external/mit/ico/dist: ico.man
Log Message:
merge fstobdf 1.0.6 and ico 1.0.4.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/fstobdf/dist/fstobdf.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/ico/dist/ico.man
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/fstobdf/dist/fstobdf.c
diff -u xsrc/external/mit/fstobdf/dist/fstobdf.c:1.3 xsrc/external/mit/fstobdf/dist/fstobdf.c:1.4
--- xsrc/external/mit/fstobdf/dist/fstobdf.c:1.3 Fri May 31 05:11:35 2013
+++ xsrc/external/mit/fstobdf/dist/fstobdf.c Wed Jul 22 08:17:32 2015
@@ -43,22 +43,30 @@ in this Software without prior written a
* THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+# include config.h
+#endif
+
#include stdio.h
#include stdlib.h
#includestring.h
#include fstobdf.h
-static void _X_NORETURN
-usage(char *progName)
+static void _X_NORETURN _X_COLD
+usage(const char *progName, const char *msg)
{
-fprintf(stderr, Usage: %s [-s font server] -fn font name\n,
- progName);
+if (msg)
+fprintf(stderr, %s: %s\n, progName, msg);
+fprintf(stderr,
+ Usage: %s [-server font server] -fn font name\n
+ or: %s -version\n,
+ progName, progName);
exit(0);
}
-static void _X_NORETURN
-Fail(char *progName)
+static void _X_NORETURN _X_COLD
+Fail(const char *progName)
{
fprintf(stderr, %s: unable to dump font\n, progName);
exit(1);
@@ -90,17 +98,26 @@ main(int argc, char *argv[])
if (argv[++i])
serverName = argv[i];
else
- usage(argv[0]);
+ usage(argv[0], -server requires an argument);
} else if (!strncmp(argv[i], -fn, 3)) {
if (argv[++i])
fontName = argv[i];
else
- usage(argv[0]);
+ usage(argv[0], -fn requires an argument);
+ }
+ else if (!strcmp(argv[i], -version)) {
+ printf(%s\n, PACKAGE_STRING);
+ exit(0);
+ }
+ else {
+ fprintf(stderr, %s: unrecognized option '%s'\n,
+ argv[0], argv[i]);
+ usage(argv[0], NULL);
}
}
if (fontName == NULL)
- usage(argv[0]);
+ usage(argv[0], No font name specified);
fontServer = FSOpenServer(serverName);
if (!fontServer) {
@@ -109,8 +126,7 @@ main(int argc, char *argv[])
fprintf(stderr, %s: can't open font server \%s\\n,
argv[0], sn);
else
- fprintf(stderr, %s: No font server specified.\n,
- argv[0]);
+ usage(argv[0], No font server specified.);
exit(0);
}
bitmapFormat = 0;
CVS import: xsrc/external/mit/xkbcomp/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 08:34:46 UTC 2015 Update of /cvsroot/xsrc/external/mit/xkbcomp/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24150 Log Message: initial import of xkbcomp-1.3.0 Status: Vendor Tag: xorg Release Tags: xkbcomp-1-3-0 U xsrc/external/mit/xkbcomp/dist/geometry.c U xsrc/external/mit/xkbcomp/dist/tokens.h U xsrc/external/mit/xkbcomp/dist/xkbcomp.pc.in U xsrc/external/mit/xkbcomp/dist/keycodes.c U xsrc/external/mit/xkbcomp/dist/parseutils.c U xsrc/external/mit/xkbcomp/dist/configure U xsrc/external/mit/xkbcomp/dist/config.sub U xsrc/external/mit/xkbcomp/dist/keytypes.c U xsrc/external/mit/xkbcomp/dist/symbols.c U xsrc/external/mit/xkbcomp/dist/compat.h U xsrc/external/mit/xkbcomp/dist/keycodes.h C xsrc/external/mit/xkbcomp/dist/utils.h U xsrc/external/mit/xkbcomp/dist/xkbscan.c U xsrc/external/mit/xkbcomp/dist/configure.ac U xsrc/external/mit/xkbcomp/dist/compat.c U xsrc/external/mit/xkbcomp/dist/xkbcomp.c U xsrc/external/mit/xkbcomp/dist/ChangeLog U xsrc/external/mit/xkbcomp/dist/utils.c U xsrc/external/mit/xkbcomp/dist/aclocal.m4 U xsrc/external/mit/xkbcomp/dist/Makefile.in U xsrc/external/mit/xkbcomp/dist/misc.h U xsrc/external/mit/xkbcomp/dist/alias.h U xsrc/external/mit/xkbcomp/dist/xkbpath.c U xsrc/external/mit/xkbcomp/dist/xkbparse.c U xsrc/external/mit/xkbcomp/dist/action.c U xsrc/external/mit/xkbcomp/dist/xkbcomp.h U xsrc/external/mit/xkbcomp/dist/misc.c U xsrc/external/mit/xkbcomp/dist/expr.c U xsrc/external/mit/xkbcomp/dist/COPYING U xsrc/external/mit/xkbcomp/dist/vmod.c U xsrc/external/mit/xkbcomp/dist/config.guess U xsrc/external/mit/xkbcomp/dist/install-sh U xsrc/external/mit/xkbcomp/dist/missing U xsrc/external/mit/xkbcomp/dist/indicators.c U xsrc/external/mit/xkbcomp/dist/ylwrap U xsrc/external/mit/xkbcomp/dist/vmod.h U xsrc/external/mit/xkbcomp/dist/Makefile.am U xsrc/external/mit/xkbcomp/dist/depcomp U xsrc/external/mit/xkbcomp/dist/README U xsrc/external/mit/xkbcomp/dist/xkbparse.y U xsrc/external/mit/xkbcomp/dist/indicators.h U xsrc/external/mit/xkbcomp/dist/INSTALL U xsrc/external/mit/xkbcomp/dist/xkbpath.h N xsrc/external/mit/xkbcomp/dist/compile U xsrc/external/mit/xkbcomp/dist/parseutils.h U xsrc/external/mit/xkbcomp/dist/listing.c U xsrc/external/mit/xkbcomp/dist/keymap.c U xsrc/external/mit/xkbcomp/dist/action.h U xsrc/external/mit/xkbcomp/dist/config.h.in U xsrc/external/mit/xkbcomp/dist/expr.h U xsrc/external/mit/xkbcomp/dist/alias.c U xsrc/external/mit/xkbcomp/dist/man/xkbcomp.man U xsrc/external/mit/xkbcomp/dist/man/Makefile.in U xsrc/external/mit/xkbcomp/dist/man/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xkbcomp/dist
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src
Committed By: hannken
Date: Wed Jul 22 08:36:05 UTC 2015
Modified Files:
src/sys/rump/librump/rumpvfs: rump_vfs.c
Log Message:
rump_vfs_mount_print: use vfs_vnode_iterator to print attached vnodes.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/rump/librump/rumpvfs/rump_vfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpvfs/rump_vfs.c
diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.82 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.83
--- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.82 Wed May 6 15:57:08 2015
+++ src/sys/rump/librump/rumpvfs/rump_vfs.c Wed Jul 22 08:36:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_vfs.c,v 1.82 2015/05/06 15:57:08 hannken Exp $ */
+/* $NetBSD: rump_vfs.c,v 1.83 2015/07/22 08:36:05 hannken Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump_vfs.c,v 1.82 2015/05/06 15:57:08 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump_vfs.c,v 1.83 2015/07/22 08:36:05 hannken Exp $);
#include sys/param.h
#include sys/buf.h
@@ -468,12 +468,21 @@ rump_vfs_syncwait(struct mount *mp)
/*
* Dump info about mount point. No locking.
*/
+static bool
+rump_print_selector(void *cl, struct vnode *vp)
+{
+ int *full = cl;
+
+ vfs_vnode_print(vp, *full, (void *)rumpuser_dprintf);
+ return false;
+}
+
void
rump_vfs_mount_print(const char *path, int full)
{
#ifdef DEBUGPRINT
struct vnode *mvp;
- struct vnode *vp;
+ struct vnode_iterator *marker;
int error;
rumpuser_dprintf(\n dumping mountpoint at ``%s'' \n\n, path);
@@ -484,9 +493,9 @@ rump_vfs_mount_print(const char *path, i
vfs_mount_print(mvp-v_mount, full, (void *)rumpuser_dprintf);
if (full) {
rumpuser_dprintf(\n== dumping vnodes ==\n\n);
- TAILQ_FOREACH(vp, mvp-v_mount-mnt_vnodelist, v_mntvnodes) {
- vfs_vnode_print(vp, full, (void *)rumpuser_dprintf);
- }
+ vfs_vnode_iterator_init(mvp-v_mount, marker);
+ vfs_vnode_iterator_next(marker, rump_print_selector, full);
+ vfs_vnode_iterator_destroy(marker);
}
vrele(mvp);
rumpuser_dprintf(\n done \n\n);
CVS import: xsrc/external/mit/xkbevd/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 08:34:48 UTC 2015 Update of /cvsroot/xsrc/external/mit/xkbevd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20220 Log Message: initial import of xkbevd-1.1.4 Status: Vendor Tag: xorg Release Tags: xkbevd-1-1-4 U xsrc/external/mit/xkbevd/dist/utils.h U xsrc/external/mit/xkbevd/dist/Makefile.am U xsrc/external/mit/xkbevd/dist/compile U xsrc/external/mit/xkbevd/dist/COPYING U xsrc/external/mit/xkbevd/dist/configure.ac U xsrc/external/mit/xkbevd/dist/cfgparse.y U xsrc/external/mit/xkbevd/dist/cfgscan.c U xsrc/external/mit/xkbevd/dist/tokens.h U xsrc/external/mit/xkbevd/dist/example.cf U xsrc/external/mit/xkbevd/dist/README U xsrc/external/mit/xkbevd/dist/Makefile.in U xsrc/external/mit/xkbevd/dist/configure U xsrc/external/mit/xkbevd/dist/printev.c U xsrc/external/mit/xkbevd/dist/depcomp U xsrc/external/mit/xkbevd/dist/missing U xsrc/external/mit/xkbevd/dist/cfgparse.c U xsrc/external/mit/xkbevd/dist/xkbevd.c U xsrc/external/mit/xkbevd/dist/config.sub U xsrc/external/mit/xkbevd/dist/install-sh U xsrc/external/mit/xkbevd/dist/xkbevd.cf U xsrc/external/mit/xkbevd/dist/aclocal.m4 U xsrc/external/mit/xkbevd/dist/evargs.c U xsrc/external/mit/xkbevd/dist/ChangeLog U xsrc/external/mit/xkbevd/dist/INSTALL U xsrc/external/mit/xkbevd/dist/utils.c U xsrc/external/mit/xkbevd/dist/config.guess U xsrc/external/mit/xkbevd/dist/xkbevd.h U xsrc/external/mit/xkbevd/dist/config.h.in U xsrc/external/mit/xkbevd/dist/ylwrap N xsrc/external/mit/xkbevd/dist/man/Makefile.in N xsrc/external/mit/xkbevd/dist/man/xkbevd.man N xsrc/external/mit/xkbevd/dist/man/Makefile.am No conflicts created by this import
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Wed Jul 22 08:35:26 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xfsinfo: Makefile
src/external/mit/xorg/bin/xkbevd: Makefile
Log Message:
updates for xfsinfo 1.0.5 and xkbevd 1.1.4.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xfsinfo/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xkbevd/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/xfsinfo/Makefile
diff -u src/external/mit/xorg/bin/xfsinfo/Makefile:1.2 src/external/mit/xorg/bin/xfsinfo/Makefile:1.3
--- src/external/mit/xorg/bin/xfsinfo/Makefile:1.2 Fri May 31 07:22:21 2013
+++ src/external/mit/xorg/bin/xfsinfo/Makefile Wed Jul 22 08:35:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 07:22:21 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/22 08:35:26 mrg Exp $
.include bsd.own.mk
@@ -10,5 +10,7 @@ DPADD+= ${LIBFS}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include ../../xorg-pkg-ver.mk
+
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xkbevd/Makefile
diff -u src/external/mit/xorg/bin/xkbevd/Makefile:1.2 src/external/mit/xorg/bin/xkbevd/Makefile:1.3
--- src/external/mit/xorg/bin/xkbevd/Makefile:1.2 Thu Feb 17 23:50:18 2011
+++ src/external/mit/xorg/bin/xkbevd/Makefile Wed Jul 22 08:35:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/02/17 23:50:18 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/22 08:35:26 mrg Exp $
.include bsd.own.mk
@@ -8,11 +8,15 @@ SRCS= xkbevd.c cfgscan.c cfgparse.y evar
CPPFLAGS+=-DDFLT_XKB_CONFIG_ROOT='${X11ROOTDIR}/lib/X11/xkb'
CPPFLAGS+=-DDFLT_SOUND_CMD='/usr/bin/audioplay'
CPPFLAGS+=-DDFLT_SOUND_DIR='${X11ROOTDIR}/share/sounds/'
+CPPFLAGS+=-DHAVE_STRCASECMP
CPPFLAGS+=-I${X11SRCDIR.${PROG}}
LDADD+= -lxkbfile -lXext -lX11
DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
+
+.include ../../xorg-pkg-ver.mk
.include bsd.x11.mk
.include bsd.prog.mk
CVS import: xsrc/external/mit/font-sony-misc/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 07:31:19 UTC 2015 Update of /cvsroot/xsrc/external/mit/font-sony-misc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28475 Log Message: initial import of font-sony-misc-1.0.3 Status: Vendor Tag: xorg Release Tags: font-sony-misc-1-0-3 U xsrc/external/mit/font-sony-misc/dist/8x16rk.bdf U xsrc/external/mit/font-sony-misc/dist/aclocal.m4 U xsrc/external/mit/font-sony-misc/dist/README U xsrc/external/mit/font-sony-misc/dist/configure U xsrc/external/mit/font-sony-misc/dist/configure.ac N xsrc/external/mit/font-sony-misc/dist/config.guess U xsrc/external/mit/font-sony-misc/dist/install-sh N xsrc/external/mit/font-sony-misc/dist/config.sub U xsrc/external/mit/font-sony-misc/dist/missing U xsrc/external/mit/font-sony-misc/dist/12x24.bdf U xsrc/external/mit/font-sony-misc/dist/Makefile.am U xsrc/external/mit/font-sony-misc/dist/Makefile.in U xsrc/external/mit/font-sony-misc/dist/12x24rk.bdf U xsrc/external/mit/font-sony-misc/dist/INSTALL U xsrc/external/mit/font-sony-misc/dist/ChangeLog U xsrc/external/mit/font-sony-misc/dist/COPYING U xsrc/external/mit/font-sony-misc/dist/8x16.bdf No conflicts created by this import
CVS commit: xsrc/external/mit/font-sony-misc/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 07:31:49 UTC 2015 Removed Files: xsrc/external/mit/font-sony-misc/dist: AUTHORS NEWS autogen.sh mkinstalldirs Log Message: merge font-sony-misc 1.0.3. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/font-sony-misc/dist/AUTHORS \ xsrc/external/mit/font-sony-misc/dist/NEWS \ xsrc/external/mit/font-sony-misc/dist/autogen.sh \ xsrc/external/mit/font-sony-misc/dist/mkinstalldirs 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: knakahara Date: Wed Jul 22 08:22:56 UTC 2015 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Sorry, if_wm turns MSI/MSI-X default off by my mistake. To generate a diff of this commit: cvs rdiff -u -r1.340 -r1.341 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.340 src/sys/dev/pci/if_wm.c:1.341 --- src/sys/dev/pci/if_wm.c:1.340 Tue Jul 21 03:15:50 2015 +++ src/sys/dev/pci/if_wm.c Wed Jul 22 08:22:55 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.340 2015/07/21 03:15:50 knakahara Exp $ */ +/* $NetBSD: if_wm.c,v 1.341 2015/07/22 08:22:55 knakahara Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -81,7 +81,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.340 2015/07/21 03:15:50 knakahara Exp $); +__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.341 2015/07/22 08:22:55 knakahara Exp $); #ifdef _KERNEL_OPT #include opt_net_mpsafe.h @@ -155,9 +155,7 @@ int wm_debug = WM_DEBUG_TX | WM_DEBUG_RX #endif #ifdef __HAVE_PCI_MSI_MSIX -#if 0 /* off by default */ -#define WM_MSI_MSIX 1 -#endif +#define WM_MSI_MSIX 1 /* Enable by default */ #endif /*
CVS import: xsrc/external/mit/xinit/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 08:34:42 UTC 2015 Update of /cvsroot/xsrc/external/mit/xinit/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28038 Log Message: initial import of xinit-1.3.4 Status: Vendor Tag: xorg Release Tags: xinit-1-3-4 U xsrc/external/mit/xinit/dist/cpprules.in U xsrc/external/mit/xinit/dist/COPYING C xsrc/external/mit/xinit/dist/xinit.c U xsrc/external/mit/xinit/dist/INSTALL U xsrc/external/mit/xinit/dist/autogen.sh U xsrc/external/mit/xinit/dist/ChangeLog U xsrc/external/mit/xinit/dist/configure.ac U xsrc/external/mit/xinit/dist/missing U xsrc/external/mit/xinit/dist/Makefile.in U xsrc/external/mit/xinit/dist/config.h.in U xsrc/external/mit/xinit/dist/Makefile.am C xsrc/external/mit/xinit/dist/xinitrc.cpp U xsrc/external/mit/xinit/dist/configure U xsrc/external/mit/xinit/dist/config.sub C xsrc/external/mit/xinit/dist/startx.cpp U xsrc/external/mit/xinit/dist/compile U xsrc/external/mit/xinit/dist/aclocal.m4 U xsrc/external/mit/xinit/dist/README U xsrc/external/mit/xinit/dist/depcomp U xsrc/external/mit/xinit/dist/install-sh U xsrc/external/mit/xinit/dist/config.guess U xsrc/external/mit/xinit/dist/launchd/console_redirect.h U xsrc/external/mit/xinit/dist/launchd/console_redirect.c U xsrc/external/mit/xinit/dist/launchd/Makefile.in U xsrc/external/mit/xinit/dist/launchd/Makefile.am U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.plist.cpp U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.c U xsrc/external/mit/xinit/dist/launchd/privileged_startx/20-font_cache.cpp U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.defs U xsrc/external/mit/xinit/dist/launchd/privileged_startx/10-tmpdirs.cpp U xsrc/external/mit/xinit/dist/launchd/privileged_startx/server.c U xsrc/external/mit/xinit/dist/launchd/privileged_startx/Makefile.in U xsrc/external/mit/xinit/dist/launchd/privileged_startx/Makefile.am U xsrc/external/mit/xinit/dist/launchd/privileged_startx/client.c U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx_types.h U xsrc/external/mit/xinit/dist/launchd/user_startx/launchd_startx.c U xsrc/external/mit/xinit/dist/launchd/user_startx/Makefile.in U xsrc/external/mit/xinit/dist/launchd/user_startx/Makefile.am U xsrc/external/mit/xinit/dist/launchd/user_startx/startx.plist.cpp U xsrc/external/mit/xinit/dist/man/Makefile.in U xsrc/external/mit/xinit/dist/man/startx.man U xsrc/external/mit/xinit/dist/man/Makefile.am U xsrc/external/mit/xinit/dist/man/xinit.man 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xinit/dist
CVS import: xsrc/external/mit/xinput/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 08:34:45 UTC 2015 Update of /cvsroot/xsrc/external/mit/xinput/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16358 Log Message: initial import of xinput-1.6.1 Status: Vendor Tag: xorg Release Tags: xinput-1-6-1 U xsrc/external/mit/xinput/dist/Makefile.in U xsrc/external/mit/xinput/dist/COPYING U xsrc/external/mit/xinput/dist/missing U xsrc/external/mit/xinput/dist/ChangeLog U xsrc/external/mit/xinput/dist/README U xsrc/external/mit/xinput/dist/install-sh U xsrc/external/mit/xinput/dist/AUTHORS U xsrc/external/mit/xinput/dist/config.h.in U xsrc/external/mit/xinput/dist/Makefile.am U xsrc/external/mit/xinput/dist/config.sub U xsrc/external/mit/xinput/dist/configure U xsrc/external/mit/xinput/dist/config.guess U xsrc/external/mit/xinput/dist/NEWS U xsrc/external/mit/xinput/dist/aclocal.m4 U xsrc/external/mit/xinput/dist/configure.ac U xsrc/external/mit/xinput/dist/depcomp U xsrc/external/mit/xinput/dist/INSTALL U xsrc/external/mit/xinput/dist/man/Makefile.in U xsrc/external/mit/xinput/dist/man/Makefile.am U xsrc/external/mit/xinput/dist/man/xinput.man U xsrc/external/mit/xinput/dist/src/buttonmap.c C xsrc/external/mit/xinput/dist/src/xinput.c U xsrc/external/mit/xinput/dist/src/state.c U xsrc/external/mit/xinput/dist/src/Makefile.in U xsrc/external/mit/xinput/dist/src/setcp.c U xsrc/external/mit/xinput/dist/src/test_xi2.c U xsrc/external/mit/xinput/dist/src/setint.c U xsrc/external/mit/xinput/dist/src/setmode.c U xsrc/external/mit/xinput/dist/src/property.c U xsrc/external/mit/xinput/dist/src/list.c U xsrc/external/mit/xinput/dist/src/test.c U xsrc/external/mit/xinput/dist/src/Makefile.am U xsrc/external/mit/xinput/dist/src/transform.c U xsrc/external/mit/xinput/dist/src/hierarchy.c U xsrc/external/mit/xinput/dist/src/xinput.h U xsrc/external/mit/xinput/dist/src/feedback.c U xsrc/external/mit/xinput/dist/src/setptr.c 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xinput/dist
CVS import: xsrc/external/mit/xfsinfo/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 08:34:40 UTC 2015 Update of /cvsroot/xsrc/external/mit/xfsinfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16966 Log Message: initial import of xfsinfo-1.0.5 Status: Vendor Tag: xorg Release Tags: xfsinfo-1-0-5 U xsrc/external/mit/xfsinfo/dist/config.guess U xsrc/external/mit/xfsinfo/dist/INSTALL U xsrc/external/mit/xfsinfo/dist/COPYING U xsrc/external/mit/xfsinfo/dist/Makefile.am U xsrc/external/mit/xfsinfo/dist/xfsinfo.c U xsrc/external/mit/xfsinfo/dist/README U xsrc/external/mit/xfsinfo/dist/config.sub U xsrc/external/mit/xfsinfo/dist/Makefile.in C xsrc/external/mit/xfsinfo/dist/compile U xsrc/external/mit/xfsinfo/dist/config.h.in U xsrc/external/mit/xfsinfo/dist/depcomp U xsrc/external/mit/xfsinfo/dist/missing U xsrc/external/mit/xfsinfo/dist/configure U xsrc/external/mit/xfsinfo/dist/install-sh U xsrc/external/mit/xfsinfo/dist/ChangeLog U xsrc/external/mit/xfsinfo/dist/aclocal.m4 U xsrc/external/mit/xfsinfo/dist/configure.ac U xsrc/external/mit/xfsinfo/dist/man/Makefile.in U xsrc/external/mit/xfsinfo/dist/man/Makefile.am U xsrc/external/mit/xfsinfo/dist/man/xfsinfo.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xfsinfo/dist
CVS import: xsrc/external/mit/xwud/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 08:46:32 UTC 2015 Update of /cvsroot/xsrc/external/mit/xwud/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23150 Log Message: initial import of xwud-1.0.4 Status: Vendor Tag: xorg Release Tags: xwud-1-0-4 U xsrc/external/mit/xwud/dist/INSTALL U xsrc/external/mit/xwud/dist/Makefile.am U xsrc/external/mit/xwud/dist/config.sub U xsrc/external/mit/xwud/dist/config.guess U xsrc/external/mit/xwud/dist/Makefile.in U xsrc/external/mit/xwud/dist/aclocal.m4 U xsrc/external/mit/xwud/dist/install-sh U xsrc/external/mit/xwud/dist/configure U xsrc/external/mit/xwud/dist/README U xsrc/external/mit/xwud/dist/missing U xsrc/external/mit/xwud/dist/ChangeLog U xsrc/external/mit/xwud/dist/depcomp U xsrc/external/mit/xwud/dist/configure.ac U xsrc/external/mit/xwud/dist/COPYING U xsrc/external/mit/xwud/dist/xwud.c U xsrc/external/mit/xwud/dist/config.h.in N xsrc/external/mit/xwud/dist/man/Makefile.in N xsrc/external/mit/xwud/dist/man/xwud.man N xsrc/external/mit/xwud/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/xrandr/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 08:46:30 UTC 2015 Update of /cvsroot/xsrc/external/mit/xrandr/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17012 Log Message: initial import of xrandr-1.4.3 Status: Vendor Tag: xorg Release Tags: xrandr-1-4-3 U xsrc/external/mit/xrandr/dist/Makefile.am C xsrc/external/mit/xrandr/dist/xrandr.c U xsrc/external/mit/xrandr/dist/INSTALL U xsrc/external/mit/xrandr/dist/depcomp U xsrc/external/mit/xrandr/dist/ChangeLog U xsrc/external/mit/xrandr/dist/COPYING U xsrc/external/mit/xrandr/dist/README U xsrc/external/mit/xrandr/dist/configure U xsrc/external/mit/xrandr/dist/xrandr_test.pl U xsrc/external/mit/xrandr/dist/Makefile.in U xsrc/external/mit/xrandr/dist/configure.ac U xsrc/external/mit/xrandr/dist/aclocal.m4 U xsrc/external/mit/xrandr/dist/keystone.5c U xsrc/external/mit/xrandr/dist/config.sub U xsrc/external/mit/xrandr/dist/config.h.in U xsrc/external/mit/xrandr/dist/install-sh U xsrc/external/mit/xrandr/dist/config.guess U xsrc/external/mit/xrandr/dist/missing U xsrc/external/mit/xrandr/dist/man/xrandr.man U xsrc/external/mit/xrandr/dist/man/Makefile.am U xsrc/external/mit/xrandr/dist/man/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xrandr/dist
CVS import: xsrc/external/mit/font-misc-misc/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 07:31:18 UTC 2015 Update of /cvsroot/xsrc/external/mit/font-misc-misc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26144 Log Message: initial import of font-misc-misc-1.1.2 Status: Vendor Tag: xorg Release Tags: font-misc-misc-1-1-2 U xsrc/external/mit/font-misc-misc/dist/18x18ko.bdf U xsrc/external/mit/font-misc-misc/dist/nil2.bdf U xsrc/external/mit/font-misc-misc/dist/aclocal.m4 U xsrc/external/mit/font-misc-misc/dist/README U xsrc/external/mit/font-misc-misc/dist/configure U xsrc/external/mit/font-misc-misc/dist/6x13B.bdf U xsrc/external/mit/font-misc-misc/dist/4x6.bdf U xsrc/external/mit/font-misc-misc/dist/6x13O.bdf U xsrc/external/mit/font-misc-misc/dist/10x20.bdf U xsrc/external/mit/font-misc-misc/dist/k14.bdf U xsrc/external/mit/font-misc-misc/dist/configure.ac U xsrc/external/mit/font-misc-misc/dist/7x13.bdf U xsrc/external/mit/font-misc-misc/dist/7x14.bdf U xsrc/external/mit/font-misc-misc/dist/8x13B.bdf U xsrc/external/mit/font-misc-misc/dist/config.guess U xsrc/external/mit/font-misc-misc/dist/install-sh U xsrc/external/mit/font-misc-misc/dist/8x13O.bdf U xsrc/external/mit/font-misc-misc/dist/5x7.bdf U xsrc/external/mit/font-misc-misc/dist/5x8.bdf U xsrc/external/mit/font-misc-misc/dist/config.sub U xsrc/external/mit/font-misc-misc/dist/missing U xsrc/external/mit/font-misc-misc/dist/Makefile.am U xsrc/external/mit/font-misc-misc/dist/Makefile.in U xsrc/external/mit/font-misc-misc/dist/6x9.bdf U xsrc/external/mit/font-misc-misc/dist/9x15.bdf U xsrc/external/mit/font-misc-misc/dist/9x18.bdf U xsrc/external/mit/font-misc-misc/dist/AUTHORS U xsrc/external/mit/font-misc-misc/dist/6x10.bdf U xsrc/external/mit/font-misc-misc/dist/6x12.bdf U xsrc/external/mit/font-misc-misc/dist/6x13.bdf U xsrc/external/mit/font-misc-misc/dist/12x13ja.bdf U xsrc/external/mit/font-misc-misc/dist/INSTALL U xsrc/external/mit/font-misc-misc/dist/7x13B.bdf U xsrc/external/mit/font-misc-misc/dist/7x14B.bdf U xsrc/external/mit/font-misc-misc/dist/7x13O.bdf U xsrc/external/mit/font-misc-misc/dist/ChangeLog U xsrc/external/mit/font-misc-misc/dist/COPYING U xsrc/external/mit/font-misc-misc/dist/8x13.bdf U xsrc/external/mit/font-misc-misc/dist/9x15B.bdf U xsrc/external/mit/font-misc-misc/dist/18x18ja.bdf U xsrc/external/mit/font-misc-misc/dist/9x18B.bdf No conflicts created by this import
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Wed Jul 22 07:58:00 UTC 2015
Modified Files:
src/external/mit/xorg: xorg-pkg-ver.mk
src/external/mit/xorg/bin/fslsfonts: Makefile
src/external/mit/xorg/bin/fstobdf: Makefile
src/external/mit/xorg/bin/ico: Makefile
src/external/mit/xorg/bin/luit: Makefile
src/external/mit/xorg/bin/rgb: Makefile
Log Message:
updates for fslsfonts 1.0.5, fstobdf 1.0.6, ico 1.0.4, luit 1.1.1 and
rgb 1.0.6.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/xorg-pkg-ver.mk
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fslsfonts/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fstobdf/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/ico/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/luit/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/rgb/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/xorg-pkg-ver.mk
diff -u src/external/mit/xorg/xorg-pkg-ver.mk:1.4 src/external/mit/xorg/xorg-pkg-ver.mk:1.5
--- src/external/mit/xorg/xorg-pkg-ver.mk:1.4 Mon Jul 20 23:50:22 2015
+++ src/external/mit/xorg/xorg-pkg-ver.mk Wed Jul 22 07:58:00 2015
@@ -1,4 +1,4 @@
-# $NetBSD: xorg-pkg-ver.mk,v 1.4 2015/07/20 23:50:22 mrg Exp $
+# $NetBSD: xorg-pkg-ver.mk,v 1.5 2015/07/22 07:58:00 mrg Exp $
# when including this make sure PROG is set so that $X11SRCDIR.$PROG
# is a valid setting. set XORG_PKG_VER_PROG if PROG is wrong.
@@ -19,6 +19,7 @@ XORG_PKG_PACKAGE_VERSION!= \
}' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
.if !empty(XORG_PKG_PACKAGE_VERSION)
CPPFLAGS+= -DPACKAGE_VERSION=\${XORG_PKG_PACKAGE_VERSION:Q}\
+CPPFLAGS+= -DVERSION=\${XORG_PKG_PACKAGE_VERSION:Q}\
.endif
XORG_PKG_PACKAGE_STRING!= \
Index: src/external/mit/xorg/bin/fslsfonts/Makefile
diff -u src/external/mit/xorg/bin/fslsfonts/Makefile:1.2 src/external/mit/xorg/bin/fslsfonts/Makefile:1.3
--- src/external/mit/xorg/bin/fslsfonts/Makefile:1.2 Fri May 31 05:24:49 2013
+++ src/external/mit/xorg/bin/fslsfonts/Makefile Wed Jul 22 07:58:00 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 05:24:49 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/22 07:58:00 mrg Exp $
.include bsd.own.mk
@@ -10,5 +10,7 @@ DPADD+= ${LIBFS}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include ../../xorg-pkg-ver.mk
+
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/fstobdf/Makefile
diff -u src/external/mit/xorg/bin/fstobdf/Makefile:1.2 src/external/mit/xorg/bin/fstobdf/Makefile:1.3
--- src/external/mit/xorg/bin/fstobdf/Makefile:1.2 Fri May 31 05:24:49 2013
+++ src/external/mit/xorg/bin/fstobdf/Makefile Wed Jul 22 07:58:00 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 05:24:49 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/22 07:58:00 mrg Exp $
.include bsd.own.mk
@@ -11,5 +11,7 @@ DPADD+= ${LIBFS} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include ../../xorg-pkg-ver.mk
+
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/ico/Makefile
diff -u src/external/mit/xorg/bin/ico/Makefile:1.1.1.1 src/external/mit/xorg/bin/ico/Makefile:1.2
--- src/external/mit/xorg/bin/ico/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/ico/Makefile Wed Jul 22 07:58:00 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/22 07:58:00 mrg Exp $
.include bsd.own.mk
@@ -10,6 +10,7 @@ LDADD+= -lXext -lX11 -lpthread -lm
DPADD+= ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/luit/Makefile
diff -u src/external/mit/xorg/bin/luit/Makefile:1.4 src/external/mit/xorg/bin/luit/Makefile:1.5
--- src/external/mit/xorg/bin/luit/Makefile:1.4 Mon Oct 10 09:41:47 2011
+++ src/external/mit/xorg/bin/luit/Makefile Wed Jul 22 07:58:00 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/10/10 09:41:47 njoly Exp $
+# $NetBSD: Makefile,v 1.5 2015/07/22 07:58:00 mrg Exp $
.include bsd.own.mk
@@ -6,7 +6,10 @@ PROG= luit
SRCS= luit.c iso2022.c charset.c parser.c sys.c other.c
CPPFLAGS+=-DLOCALE_ALIAS_FILE=\${X11LIBDIR}/locale/locale.alias\
-CPPFLAGS+=-DHAVE_CONFIG_H -I${X11SRCDIR.${PROG}}/../include
+#CPPFLAGS+=-DHAVE_CONFIG_H -I${X11SRCDIR.${PROG}}/../include
+CPPFLAGS+=-DHAVE_PUTENV -DHAVE_WORKING_POLL -DHAVE_POLL_H
+CPPFLAGS+=-DHAVE_SYS_PARAM -DHAVE_OPENPTY -DHAVE_GRANTPT
+CPPFLAGS+=-DHAVE_POSIX_OPENPT -DHAVE_STRDUP
X11EXTRAMANDEFS+= -e 's,__locale_alias__,${X11LIBDIR}/locale/locale.alias,g'
@@ -15,5 +18,7 @@ DPADD+= ${LIBFONTENC} ${LIBZ}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+.include ../../xorg-pkg-ver.mk
+
.include bsd.x11.mk
.include
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Wed Jul 22 08:36:10 UTC 2015
Modified Files:
xsrc/external/mit/xinit/dist: startx.cpp xinit.c xinitrc.cpp
xsrc/external/mit/xinput/dist/src: xinput.c
xsrc/external/mit/xkbcomp/dist: utils.h
Added Files:
xsrc/external/mit/xfsinfo/dist: compile
Removed Files:
xsrc/external/mit/xkbevd/dist: xkbevd.man
Log Message:
merge xfsinfo 1.0.5, xinit 1.3.4, xinput 1.6.1 xkbcomp 1.3.0 and xkbevd 1.1.4.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xfsinfo/dist/compile
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xinit/dist/startx.cpp
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xinit/dist/xinit.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xinit/dist/xinitrc.cpp
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xinput/dist/src/xinput.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xkbcomp/dist/utils.h
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkbevd/dist/xkbevd.man
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/xinit/dist/startx.cpp
diff -u xsrc/external/mit/xinit/dist/startx.cpp:1.4 xsrc/external/mit/xinit/dist/startx.cpp:1.5
--- xsrc/external/mit/xinit/dist/startx.cpp:1.4 Mon Mar 17 09:43:11 2014
+++ xsrc/external/mit/xinit/dist/startx.cpp Wed Jul 22 08:36:10 2015
@@ -14,7 +14,7 @@ XCOMM
unset DBUS_SESSION_BUS_ADDRESS
unset SESSION_MANAGER
-#if defined(__SCO__) || defined(__UNIXWARE__) || defined(__APPLE__)
+#ifdef __APPLE__
XCOMM Check for /usr/bin/X11 and BINDIR in the path, if not add them.
XCOMM This allows startx to be placed in a place like /usr/bin or /usr/local/bin
@@ -33,11 +33,7 @@ case $PATH in
esac
XCOMM Now the old compiled path
-#ifdef __APPLE__
oldbindir=/usr/X11R6/bin
-#else
-oldbindir=/usr/bin/X11
-#endif
if [ -d $oldbindir ] ; then
case $PATH in
@@ -51,24 +47,8 @@ XCOMM so export the new PATH just in cas
export PATH
#endif
-#if defined(__SCO__) || defined(__UNIXWARE__)
-XCOMM Set up the XMERGE env var so that dos merge is happy under X
-
-if [ -f /usr/lib/merge/xmergeset.sh ]; then
- . /usr/lib/merge/xmergeset.sh
-elif [ -f /usr/lib/merge/console.disp ]; then
- XMERGE=`cat /usr/lib/merge/console.disp`
- export XMERGE
-fi
-
-userclientrc=$HOME/.startxrc
-sysclientrc=LIBDIR/sys.startxrc
-scouserclientrc=$HOME/.xinitrc
-scosysclientrc=XINITDIR/xinitrc
-#else
userclientrc=$HOME/.xinitrc
sysclientrc=XINITDIR/xinitrc
-#endif
userserverrc=$HOME/.xserverrc
sysserverrc=XINITDIR/xserverrc
@@ -79,6 +59,7 @@ defaultserverargs=-noretro
defaultdisplay=:0
clientargs=
serverargs=
+vtarg=
#ifdef __APPLE__
@@ -145,21 +126,6 @@ done
defaultdisplay=:$d
unset d
-#if defined(__SCO__) || defined(__UNIXWARE__)
-
-XCOMM SCO -t option: do not start an X server
-case $1 in
- -t) if [ -n $DISPLAY ]; then
-REMOTE_SERVER=TRUE
-shift
-else
-echo DISPLAY environment variable not set
-exit 1
-fi
-;;
-esac
-#endif
-
whoseargs=client
while [ x$1 != x ]; do
case $1 in
@@ -209,12 +175,6 @@ if [ x$client = x ]; then
client=$userclientrc
elif [ -f $sysclientrc ]; then
client=$sysclientrc
-#if defined(__SCO__) || defined(__UNIXWARE__)
-elif [ -f $scouserclientrc ]; then
-client=$scouserclientrc
-elif [ -f $scosysclientrc ]; then
-client=$scosysclientrc
-#endif
fi
fi
fi
@@ -228,6 +188,17 @@ XCOMM process server arguments
if [ x$server = x ]; then
server=$defaultserver
+#ifdef __linux__
+XCOMM When starting the defaultserver start X on the current tty to avoid
+XCOMM the startx session being seen as inactive:
+XCOMM https://bugzilla.redhat.com/show_bug.cgi?id=806491;
+tty=$(tty)
+if expr match $tty '^/dev/tty[0-9]\+$' /dev/null; then
+tty_num=$(echo $tty | grep -oE '[0-9]+$')
+vtarg=vt$tty_num
+fi
+#endif
+
XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
if [ x$serverargs = x -a x$display = x ]; then
if [ -f $userserverrc ]; then
@@ -243,6 +214,17 @@ if [ x$serverargs = x ]; then
serverargs=$defaultserverargs
fi
+XCOMM if no vt is specified add vtarg (which may be empty)
+have_vtarg=no
+for i in $serverargs; do
+if expr match $i '^vt[0-9]\+$' /dev/null; then
+have_vtarg=yes
+fi
+done
+if [ $have_vtarg = no ]; then
+serverargs=$serverargs $vtarg
+fi
+
XCOMM if no display, use default
if [ x$display = x ]; then
display=$defaultdisplay
@@ -319,21 +301,11 @@ EOF
done
fi
-#if defined(__SCO__) || defined(__UNIXWARE__)
-if [ $REMOTE_SERVER = TRUE ]; then
-exec SHELL_CMD ${client}
-else
-XINIT $client $clientargs -- $server $display $serverargs
-fi
-#else
-
#if defined(__APPLE__) || defined(__CYGWIN__)
eval XINIT \$client\
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Wed Jul 22 08:47:22 UTC 2015
Modified Files:
xsrc/external/mit/xrandr/dist: xrandr.c
Removed Files:
xsrc/external/mit/xmessage/dist: xmessage.man
xsrc/external/mit/xrandr/dist: compile
xsrc/external/mit/xwud/dist: xwud.man
Log Message:
merge xmessage 1.0.4, xrandr 1.4.3 and xwud 1.0.4.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xmessage/dist/xmessage.man
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xrandr/dist/compile
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xrandr/dist/xrandr.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xwud/dist/xwud.man
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/xrandr/dist/xrandr.c
diff -u xsrc/external/mit/xrandr/dist/xrandr.c:1.11 xsrc/external/mit/xrandr/dist/xrandr.c:1.12
--- xsrc/external/mit/xrandr/dist/xrandr.c:1.11 Fri Jul 11 18:23:08 2014
+++ xsrc/external/mit/xrandr/dist/xrandr.c Wed Jul 22 08:47:22 2015
@@ -139,6 +139,7 @@ usage(void)
--crtc crtc\n
--panning wxh[+x+y[/track:wxh+x+y[/border:l/t/r/b]]]\n
--gamma r:g:b\n
+ --brightness value\n
--primary\n
--noprimary\n
--newmode name clock MHz\n
@@ -1394,7 +1395,7 @@ set_gamma(void)
output_t *output;
for (output = all_outputs; output; output = output-next) {
- int i, size, shift;
+ int i, size;
crtc_t *crtc;
XRRCrtcGamma *crtc_gamma;
float gammaRed;
@@ -1429,14 +1430,6 @@ set_gamma(void)
continue;
}
- /*
- * The hardware color lookup table has a number of significant
- * bits equal to ffs(size) - 1; compute all values so that
- * they are in the range [0,size) then shift the values so
- * that they occupy the MSBs of the 16-bit X Color.
- */
- shift = 16 - (ffs(size) - 1);
-
crtc_gamma = XRRAllocGamma(size);
if (!crtc_gamma) {
fatal(Gamma allocation failed.\n);
@@ -1456,28 +1449,25 @@ set_gamma(void)
for (i = 0; i size; i++) {
if (gammaRed == 1.0 output-brightness == 1.0)
- crtc_gamma-red[i] = i;
+ crtc_gamma-red[i] = (double)i / (double)(size - 1) * 65535.0;
else
crtc_gamma-red[i] = dmin(pow((double)i/(double)(size - 1),
gammaRed) * output-brightness,
- 1.0) * (double)(size - 1);
- crtc_gamma-red[i] = shift;
+ 1.0) * 65535.0;
if (gammaGreen == 1.0 output-brightness == 1.0)
- crtc_gamma-green[i] = i;
+ crtc_gamma-green[i] = (double)i / (double)(size - 1) * 65535.0;
else
crtc_gamma-green[i] = dmin(pow((double)i/(double)(size - 1),
gammaGreen) * output-brightness,
- 1.0) * (double)(size - 1);
- crtc_gamma-green[i] = shift;
+ 1.0) * 65535.0;
if (gammaBlue == 1.0 output-brightness == 1.0)
- crtc_gamma-blue[i] = i;
+ crtc_gamma-blue[i] = (double)i / (double)(size - 1) * 65535.0;
else
crtc_gamma-blue[i] = dmin(pow((double)i/(double)(size - 1),
gammaBlue) * output-brightness,
- 1.0) * (double)(size - 1);
- crtc_gamma-blue[i] = shift;
+ 1.0) * 65535.0;
}
XRRSetCrtcGamma(dpy, crtc-crtc.xid, crtc_gamma);
@@ -2582,6 +2572,8 @@ main (int argc, char **argv)
Boolprovsetoffsink = False;
int major, minor;
Bool current = False;
+Bool toggle_x = False;
+Bool toggle_y = False;
program_name = argv[0];
for (i = 1; i argc; i++) {
@@ -2650,13 +2642,13 @@ main (int argc, char **argv)
}
if (!strcmp (-x, argv[i])) {
- reflection |= RR_Reflect_X;
+ toggle_x = True;
setit = True;
action_requested = True;
continue;
}
if (!strcmp (-y, argv[i])) {
- reflection |= RR_Reflect_Y;
+ toggle_y = True;
setit = True;
action_requested = True;
continue;
@@ -3266,13 +3258,13 @@ main (int argc, char **argv)
nelements = 1;
format = 32;
}
- else if ((type == XA_ATOM))
+ else if (type == XA_ATOM)
{
ulong_value = XInternAtom (dpy, prop-value, False);
data = (unsigned char *) ulong_value;
nelements = 1;
}
- else if ((type == XA_STRING || type == AnyPropertyType))
+ else if (type == XA_STRING || type == AnyPropertyType)
{
type = XA_STRING;
data = (unsigned char *) prop-value;
@@ -3835,6 +3827,9 @@ main (int argc, char **argv)
{
Rotation rotations = XRRConfigRotations(sc, current_rotation);
+ if (toggle_x !(current_rotation RR_Reflect_X)) reflection |= RR_Reflect_X;
+ if (toggle_y !(current_rotation RR_Reflect_Y)) reflection |= RR_Reflect_Y;
+
if (query) {
printf(Current rotation - %s\n,
rotation_name (current_rotation));
@@ -3872,10 +3867,6 @@ main (int argc, char **argv)
else
printf (neither axis);
printf (\n);
-
- if (reflection RR_Reflect_X) printf(Setting reflection on X axis\n);
-
- if (reflection RR_Reflect_Y)
CVS import: xsrc/external/mit/xmessage/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 08:46:29 UTC 2015 Update of /cvsroot/xsrc/external/mit/xmessage/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3469 Log Message: initial import of xmessage-1.0.4 Status: Vendor Tag: xorg Release Tags: xmessage-1-0-4 U xsrc/external/mit/xmessage/dist/Makefile.am U xsrc/external/mit/xmessage/dist/configure.ac U xsrc/external/mit/xmessage/dist/configure U xsrc/external/mit/xmessage/dist/makeform.c U xsrc/external/mit/xmessage/dist/INSTALL U xsrc/external/mit/xmessage/dist/README U xsrc/external/mit/xmessage/dist/readfile.c U xsrc/external/mit/xmessage/dist/ChangeLog U xsrc/external/mit/xmessage/dist/config.sub U xsrc/external/mit/xmessage/dist/xmessage.c U xsrc/external/mit/xmessage/dist/Makefile.in U xsrc/external/mit/xmessage/dist/missing U xsrc/external/mit/xmessage/dist/depcomp U xsrc/external/mit/xmessage/dist/install-sh U xsrc/external/mit/xmessage/dist/readfile.h U xsrc/external/mit/xmessage/dist/config.guess U xsrc/external/mit/xmessage/dist/config.h.in U xsrc/external/mit/xmessage/dist/xmessage.h U xsrc/external/mit/xmessage/dist/aclocal.m4 U xsrc/external/mit/xmessage/dist/COPYING U xsrc/external/mit/xmessage/dist/app-defaults/Xmessage-color U xsrc/external/mit/xmessage/dist/app-defaults/Xmessage N xsrc/external/mit/xmessage/dist/man/Makefile.in N xsrc/external/mit/xmessage/dist/man/xmessage.man N xsrc/external/mit/xmessage/dist/man/Makefile.am No conflicts created by this import
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Wed Jul 22 08:46:51 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xmessage: Makefile
src/external/mit/xorg/bin/xwud: Makefile
Log Message:
updates for xmessage 1.0.4 and xwud 1.0.4.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xmessage/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xwud/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/xmessage/Makefile
diff -u src/external/mit/xorg/bin/xmessage/Makefile:1.3 src/external/mit/xorg/bin/xmessage/Makefile:1.4
--- src/external/mit/xorg/bin/xmessage/Makefile:1.3 Fri May 31 08:01:59 2013
+++ src/external/mit/xorg/bin/xmessage/Makefile Wed Jul 22 08:46:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/22 08:46:51 mrg Exp $
.include bsd.own.mk
@@ -12,6 +12,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.PATH: ${X11SRCDIR.${PROG}}/app-defaults
.include bsd.x11.mk
Index: src/external/mit/xorg/bin/xwud/Makefile
diff -u src/external/mit/xorg/bin/xwud/Makefile:1.1.1.1 src/external/mit/xorg/bin/xwud/Makefile:1.2
--- src/external/mit/xorg/bin/xwud/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xwud/Makefile Wed Jul 22 08:46:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/22 08:46:51 mrg Exp $
.include bsd.own.mk
@@ -8,6 +8,7 @@ LDADD+= -lX11
DPADD+= ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
CVS import: xsrc/external/mit/xvinfo/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 08:46:31 UTC 2015 Update of /cvsroot/xsrc/external/mit/xvinfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv152 Log Message: initial import of xvinfo-1.1.3 Status: Vendor Tag: xorg Release Tags: xvinfo-1-1-3 U xsrc/external/mit/xvinfo/dist/COPYING U xsrc/external/mit/xvinfo/dist/install-sh U xsrc/external/mit/xvinfo/dist/missing U xsrc/external/mit/xvinfo/dist/depcomp U xsrc/external/mit/xvinfo/dist/xvinfo.c U xsrc/external/mit/xvinfo/dist/aclocal.m4 U xsrc/external/mit/xvinfo/dist/README U xsrc/external/mit/xvinfo/dist/config.h.in U xsrc/external/mit/xvinfo/dist/compile U xsrc/external/mit/xvinfo/dist/configure.ac U xsrc/external/mit/xvinfo/dist/config.guess U xsrc/external/mit/xvinfo/dist/Makefile.am U xsrc/external/mit/xvinfo/dist/config.sub U xsrc/external/mit/xvinfo/dist/configure U xsrc/external/mit/xvinfo/dist/ChangeLog U xsrc/external/mit/xvinfo/dist/Makefile.in U xsrc/external/mit/xvinfo/dist/INSTALL U xsrc/external/mit/xvinfo/dist/man/Makefile.in U xsrc/external/mit/xvinfo/dist/man/xvinfo.man U xsrc/external/mit/xvinfo/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/xf86-input-mouse/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 09:37:14 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-input-mouse/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7829 Log Message: initial import of xf86-input-mouse-1.9.1 Status: Vendor Tag: xorg Release Tags: xf86-input-mouse-1-9-1 U xsrc/external/mit/xf86-input-mouse/dist/configure.ac U xsrc/external/mit/xf86-input-mouse/dist/INSTALL N xsrc/external/mit/xf86-input-mouse/dist/compile U xsrc/external/mit/xf86-input-mouse/dist/install-sh U xsrc/external/mit/xf86-input-mouse/dist/aclocal.m4 U xsrc/external/mit/xf86-input-mouse/dist/configure U xsrc/external/mit/xf86-input-mouse/dist/ChangeLog U xsrc/external/mit/xf86-input-mouse/dist/config.h.in U xsrc/external/mit/xf86-input-mouse/dist/Makefile.am U xsrc/external/mit/xf86-input-mouse/dist/README U xsrc/external/mit/xf86-input-mouse/dist/xorg-mouse.pc.in U xsrc/external/mit/xf86-input-mouse/dist/config.sub U xsrc/external/mit/xf86-input-mouse/dist/COPYING U xsrc/external/mit/xf86-input-mouse/dist/ltmain.sh U xsrc/external/mit/xf86-input-mouse/dist/missing U xsrc/external/mit/xf86-input-mouse/dist/depcomp U xsrc/external/mit/xf86-input-mouse/dist/Makefile.in U xsrc/external/mit/xf86-input-mouse/dist/config.guess U xsrc/external/mit/xf86-input-mouse/dist/src/mousePriv.h U xsrc/external/mit/xf86-input-mouse/dist/src/mouse.h U xsrc/external/mit/xf86-input-mouse/dist/src/lnx_mouse.c U xsrc/external/mit/xf86-input-mouse/dist/src/pnp.c U xsrc/external/mit/xf86-input-mouse/dist/src/Makefile.am U xsrc/external/mit/xf86-input-mouse/dist/src/hurd_mouse.c C xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c C xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c U xsrc/external/mit/xf86-input-mouse/dist/src/Makefile.in U xsrc/external/mit/xf86-input-mouse/dist/src/compat-api.h U xsrc/external/mit/xf86-input-mouse/dist/src/sun_mouse.c U xsrc/external/mit/xf86-input-mouse/dist/man/mousedrv.man U xsrc/external/mit/xf86-input-mouse/dist/man/Makefile.in U xsrc/external/mit/xf86-input-mouse/dist/man/Makefile.am U xsrc/external/mit/xf86-input-mouse/dist/include/xf86-mouse-properties.h U xsrc/external/mit/xf86-input-mouse/dist/include/Makefile.am U xsrc/external/mit/xf86-input-mouse/dist/include/Makefile.in 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-input-mouse/dist
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-void
Module Name:src Committed By: mrg Date: Wed Jul 22 09:52:51 UTC 2015 Removed Files: src/external/mit/xorg/server/drivers/xf86-input-void: Makefile Log Message: remove unused makefile. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 \ src/external/mit/xorg/server/drivers/xf86-input-void/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
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 09:53:21 UTC 2015 Removed Files: xsrc/external/mit/printproto/dist: COPYING ChangeLog Makefile.am Makefile.in Print.h Printstr.h aclocal.m4 autogen.sh configure configure.ac install-sh missing printproto.pc.in xsrc/external/mit/xf86-input-void/dist: COPYING ChangeLog Makefile.am Makefile.in README aclocal.m4 autogen.sh config.guess config.h.in config.sub configure configure.ac depcomp install-sh ltmain.sh missing xsrc/external/mit/xf86-input-void/dist/man: Makefile.am Makefile.in void.man xsrc/external/mit/xf86-input-void/dist/src: Makefile.am Makefile.in void.c Log Message: remove unused sources. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/printproto/dist/COPYING \ xsrc/external/mit/printproto/dist/ChangeLog \ xsrc/external/mit/printproto/dist/Makefile.am \ xsrc/external/mit/printproto/dist/Makefile.in \ xsrc/external/mit/printproto/dist/Print.h \ xsrc/external/mit/printproto/dist/Printstr.h \ xsrc/external/mit/printproto/dist/aclocal.m4 \ xsrc/external/mit/printproto/dist/autogen.sh \ xsrc/external/mit/printproto/dist/configure \ xsrc/external/mit/printproto/dist/configure.ac \ xsrc/external/mit/printproto/dist/install-sh \ xsrc/external/mit/printproto/dist/missing \ xsrc/external/mit/printproto/dist/printproto.pc.in cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-input-void/dist/COPYING \ xsrc/external/mit/xf86-input-void/dist/Makefile.am \ xsrc/external/mit/xf86-input-void/dist/README \ xsrc/external/mit/xf86-input-void/dist/autogen.sh \ xsrc/external/mit/xf86-input-void/dist/config.h.in \ xsrc/external/mit/xf86-input-void/dist/depcomp \ xsrc/external/mit/xf86-input-void/dist/install-sh \ xsrc/external/mit/xf86-input-void/dist/missing cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xf86-input-void/dist/ChangeLog \ xsrc/external/mit/xf86-input-void/dist/Makefile.in \ xsrc/external/mit/xf86-input-void/dist/aclocal.m4 \ xsrc/external/mit/xf86-input-void/dist/config.guess \ xsrc/external/mit/xf86-input-void/dist/config.sub \ xsrc/external/mit/xf86-input-void/dist/configure \ xsrc/external/mit/xf86-input-void/dist/configure.ac \ xsrc/external/mit/xf86-input-void/dist/ltmain.sh cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/xf86-input-void/dist/man/Makefile.am \ xsrc/external/mit/xf86-input-void/dist/man/Makefile.in \ xsrc/external/mit/xf86-input-void/dist/man/void.man cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xf86-input-void/dist/src/Makefile.am cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/xf86-input-void/dist/src/Makefile.in \ xsrc/external/mit/xf86-input-void/dist/src/void.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: Wed Jul 22 10:32:17 UTC 2015
Modified Files:
src/sys/arch/arm/amlogic: amlogic_dwctwo.c
src/sys/arch/arm/rockchip: rockchip_dwctwo.c
src/sys/arch/evbarm/conf: GENERIC.common
src/sys/arch/mips/cavium/dev: octeon_dwctwo.c
src/sys/dev: dksubr.c ld.c
Log Message:
Trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/amlogic_dwctwo.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/rockchip/rockchip_dwctwo.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/GENERIC.common
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/dksubr.c
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/ld.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/amlogic/amlogic_dwctwo.c
diff -u src/sys/arch/arm/amlogic/amlogic_dwctwo.c:1.2 src/sys/arch/arm/amlogic/amlogic_dwctwo.c:1.3
--- src/sys/arch/arm/amlogic/amlogic_dwctwo.c:1.2 Sat Feb 28 18:50:57 2015
+++ src/sys/arch/arm/amlogic/amlogic_dwctwo.c Wed Jul 22 10:32:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_dwctwo.c,v 1.2 2015/02/28 18:50:57 jmcneill Exp $ */
+/* $NetBSD: amlogic_dwctwo.c,v 1.3 2015/07/22 10:32:16 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amlogic_dwctwo.c,v 1.2 2015/02/28 18:50:57 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: amlogic_dwctwo.c,v 1.3 2015/07/22 10:32:16 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -70,7 +70,7 @@ static struct dwc2_core_params amlogic_d
.host_rx_fifo_size = 512, /* 512 DWORDs */
.host_nperio_tx_fifo_size = 500, /* 500 DWORDs */
.host_perio_tx_fifo_size = -1, /* 256 DWORDs */
- .max_transfer_size = -1, /* 2047 to 65,535 */
+ .max_transfer_size = -1, /* 2047 to 65,535 */
.max_packet_count = -1, /* 15 to 511 */
.host_channels = -1, /* 1 to 16 */
.phy_type = 1, /* 1- UTMI+ Phy */
Index: src/sys/arch/arm/rockchip/rockchip_dwctwo.c
diff -u src/sys/arch/arm/rockchip/rockchip_dwctwo.c:1.2 src/sys/arch/arm/rockchip/rockchip_dwctwo.c:1.3
--- src/sys/arch/arm/rockchip/rockchip_dwctwo.c:1.2 Fri Dec 26 19:44:48 2014
+++ src/sys/arch/arm/rockchip/rockchip_dwctwo.c Wed Jul 22 10:32:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_dwctwo.c,v 1.2 2014/12/26 19:44:48 jmcneill Exp $ */
+/* $NetBSD: rockchip_dwctwo.c,v 1.3 2015/07/22 10:32:16 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rockchip_dwctwo.c,v 1.2 2014/12/26 19:44:48 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: rockchip_dwctwo.c,v 1.3 2015/07/22 10:32:16 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -69,7 +69,7 @@ static struct dwc2_core_params rkdwc2_pa
.host_rx_fifo_size = 520, /* 520 DWORDs */
.host_nperio_tx_fifo_size = 128, /* 128 DWORDs */
.host_perio_tx_fifo_size = 256, /* 256 DWORDs */
- .max_transfer_size = 65535,/* 2047 to 65,535 */
+ .max_transfer_size = 65535,/* 2047 to 65,535 */
.max_packet_count = 511, /* 15 to 511 */
.host_channels = 8, /* 1 to 16 */
.phy_type = 1, /* 1- UTMI+ Phy */
@@ -129,7 +129,7 @@ rkdwc2_attach(device_t parent, device_t
IST_LEVEL, dwc2_intr, sc-sc_dwc2);
#if 0
IST_EDGE, dwc2_intr, sc-sc_dwc2);
-#endif
+#endif
if (sc-sc_ih == NULL) {
aprint_error_dev(self, failed to establish interrupt %d\n,
Index: src/sys/arch/evbarm/conf/GENERIC.common
diff -u src/sys/arch/evbarm/conf/GENERIC.common:1.7 src/sys/arch/evbarm/conf/GENERIC.common:1.8
--- src/sys/arch/evbarm/conf/GENERIC.common:1.7 Mon Apr 20 10:09:09 2015
+++ src/sys/arch/evbarm/conf/GENERIC.common Wed Jul 22 10:32:16 2015
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC.common,v 1.7 2015/04/20 10:09:09 jmcneill Exp $
+# $NetBSD: GENERIC.common,v 1.8 2015/07/22 10:32:16 skrll Exp $
#
# GENERIC evbarm kernel config (template)
#
@@ -110,7 +110,7 @@ options KTRACE # system call tracing,
#options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-# Wedge support
+# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
Index: src/sys/arch/mips/cavium/dev/octeon_dwctwo.c
diff -u src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.3 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.4
--- src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.3 Sun Jun 7 06:07:49 2015
+++ src/sys/arch/mips/cavium/dev/octeon_dwctwo.c Wed Jul 22 10:32:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_dwctwo.c,v 1.3 2015/06/07 06:07:49 matt Exp $ */
+/* $NetBSD: octeon_dwctwo.c,v 1.4 2015/07/22 10:32:16 skrll Exp $ */
/*
* Copyright (c) 2015 Masao Uebayashi uebay...@tombiinc.com
@@ -43,7 +43,7 @@
*/
#include
CVS commit: xsrc/external/mit/xinit/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 09:16:23 UTC 2015 Modified Files: xsrc/external/mit/xinit/dist: startx.cpp Log Message: use portable expr(1). fixes, eg: 7oclock ~ startx expr: syntax error To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xinit/dist/startx.cpp 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/xinit/dist/startx.cpp diff -u xsrc/external/mit/xinit/dist/startx.cpp:1.5 xsrc/external/mit/xinit/dist/startx.cpp:1.6 --- xsrc/external/mit/xinit/dist/startx.cpp:1.5 Wed Jul 22 08:36:10 2015 +++ xsrc/external/mit/xinit/dist/startx.cpp Wed Jul 22 09:16:23 2015 @@ -217,7 +217,7 @@ fi XCOMM if no vt is specified add vtarg (which may be empty) have_vtarg=no for i in $serverargs; do -if expr match $i '^vt[0-9]\+$' /dev/null; then +if expr $i : '^vt[0-9]\+$' /dev/null; then have_vtarg=yes fi done
CVS commit: src/sys/dev/sdmmc
Module Name:src
Committed By: skrll
Date: Wed Jul 22 09:54:42 UTC 2015
Modified Files:
src/sys/dev/sdmmc: sdhc.c
Log Message:
Use C99 designated initializers.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/sdmmc/sdhc.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.59 src/sys/dev/sdmmc/sdhc.c:1.60
--- src/sys/dev/sdmmc/sdhc.c:1.59 Sat May 30 17:52:07 2015
+++ src/sys/dev/sdmmc/sdhc.c Wed Jul 22 09:54:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.59 2015/05/30 17:52:07 jmcneill Exp $ */
+/* $NetBSD: sdhc.c,v 1.60 2015/07/22 09:54:42 skrll Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.59 2015/05/30 17:52:07 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.60 2015/07/22 09:54:42 skrll Exp $);
#ifdef _KERNEL_OPT
#include opt_sdmmc.h
@@ -189,33 +189,32 @@ static void sdhc_write_data_pio(struct s
static void esdhc_read_data_pio(struct sdhc_host *, uint8_t *, u_int);
static void esdhc_write_data_pio(struct sdhc_host *, uint8_t *, u_int);
-
static struct sdmmc_chip_functions sdhc_functions = {
/* host controller reset */
- sdhc_host_reset,
+ .host_reset = sdhc_host_reset,
/* host controller capabilities */
- sdhc_host_ocr,
- sdhc_host_maxblklen,
+ .host_ocr = sdhc_host_ocr,
+ .host_maxblklen = sdhc_host_maxblklen,
/* card detection */
- sdhc_card_detect,
+ .card_detect = sdhc_card_detect,
/* write protect */
- sdhc_write_protect,
+ .write_protect = sdhc_write_protect,
- /* bus power, clock frequency and width */
- sdhc_bus_power,
- sdhc_bus_clock,
- sdhc_bus_width,
- sdhc_bus_rod,
+ /* bus power, clock frequency, width and ROD(OpenDrain/PushPull) */
+ .bus_power = sdhc_bus_power,
+ .bus_clock = sdhc_bus_clock,
+ .bus_width = sdhc_bus_width,
+ .bus_rod = sdhc_bus_rod,
/* command execution */
- sdhc_exec_command,
+ .exec_command = sdhc_exec_command,
/* card interrupt */
- sdhc_card_enable_intr,
- sdhc_card_intr_ack
+ .card_enable_intr = sdhc_card_enable_intr,
+ .card_intr_ack = sdhc_card_intr_ack
};
static int
CVS commit: xsrc/external/mit/xf86-input-mouse/dist/src
Module Name:xsrc
Committed By: mrg
Date: Wed Jul 22 09:42:15 UTC 2015
Modified Files:
xsrc/external/mit/xf86-input-mouse/dist/src: bsd_mouse.c mouse.c
Log Message:
merge xf86-input-mouse 1.9.1.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/xf86-input-mouse/dist/src/mouse.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-mouse/dist/src/bsd_mouse.c
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c:1.4 xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c:1.5
--- xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c:1.4 Wed Jun 5 07:11:16 2013
+++ xsrc/external/mit/xf86-input-mouse/dist/src/bsd_mouse.c Wed Jul 22 09:42:15 2015
@@ -97,9 +97,7 @@ static const char *mouseDevs[] = {
static int
SupportedInterfaces(void)
{
-#if defined(__NetBSD__)
-return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__NetBSD__)
return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
#else
return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
@@ -435,17 +433,13 @@ wsconsReadInput(InputInfoPtr pInfo)
break;
#endif
case WSCONS_EVENT_MOUSE_ABSOLUTE_X:
- miPointerGetPosition (pInfo-dev, x, y);
x = event-value;
- miPointerSetPosition (pInfo-dev, x, y);
- xf86PostMotionEvent(pInfo-dev, TRUE, 0, 2, x, y);
+ xf86PostMotionEvent(pInfo-dev, TRUE, 0, 1, x);
++event;
continue;
case WSCONS_EVENT_MOUSE_ABSOLUTE_Y:
- miPointerGetPosition (pInfo-dev, x, y);
y = event-value;
- miPointerSetPosition (pInfo-dev, x, y);
- xf86PostMotionEvent(pInfo-dev, TRUE, 0, 2, x, y);
+ xf86PostMotionEvent(pInfo-dev, TRUE, 1, 1, y);
++event;
continue;
#ifdef WSCONS_EVENT_MOUSE_ABSOLUTE_Z
Index: xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.16 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.17
--- xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.16 Wed Jun 5 07:26:12 2013
+++ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c Wed Jul 22 09:42:15 2015
@@ -80,6 +80,13 @@
#include mousePriv.h
#include mipointer.h
+/* Xorg = 1.10 provides an asprintf() implementation even if libc doesn't */
+#include xorgVersion.h
+#if defined(HAVE_ASPRINTF) || \
+(XORG_VERSION_CURRENT = XORG_VERSION_NUMERIC(1,10,0,0,0))
+# define USE_ASPRINTF
+#endif
+
enum {
/* number of bits in mapped nibble */
NIB_BITS=4,
@@ -447,20 +454,27 @@ MouseCommonOptions(InputInfoPtr pInfo)
} else if (sscanf(s, %d %d %d %d, b1, b2, b3, b4) = 2
b1 0 b1 = MSE_MAXBUTTONS
b2 0 b2 = MSE_MAXBUTTONS) {
-msg = xstrdup(buttons XX and YY);
-if (msg)
-sprintf(msg, buttons %d and %d, b1, b2);
pMse-negativeZ = 1 (b1-1);
pMse-positiveZ = 1 (b2-1);
if (b3 0 b3 = MSE_MAXBUTTONS
b4 0 b4 = MSE_MAXBUTTONS) {
-if (msg)
-free(msg);
-msg = xstrdup(buttons XX, YY, ZZ and WW);
-if (msg)
-sprintf(msg, buttons %d, %d, %d and %d, b1, b2, b3, b4);
pMse-negativeW = 1 (b3-1);
pMse-positiveW = 1 (b4-1);
+#ifdef USE_ASPRINTF
+if (asprintf(msg, buttons %d, %d, %d and %d,
+ b1, b2, b3, b4) == -1)
+msg = NULL;
+#else
+msg = Xprintf(buttons %d, %d, %d and %d, b1, b2, b3, b4);
+#endif
+}
+else {
+#ifdef USE_ASPRINTF
+if (asprintf(msg, buttons %d and %d, b1, b2) == -1)
+msg = NULL;
+#else
+msg = Xprintf(buttons %d and %d, b1, b2);
+#endif
}
if (b1 pMse-buttons) pMse-buttons = b1;
if (b2 pMse-buttons) pMse-buttons = b2;
@@ -515,9 +529,12 @@ MouseCommonOptions(InputInfoPtr pInfo)
if ((sscanf(s, %d %d, b1, b2) == 2)
b1 0 b1 = MSE_MAXBUTTONS
b2 0 b2 = MSE_MAXBUTTONS) {
-msg = xstrdup(buttons XX and YY);
-if (msg)
-sprintf(msg, buttons %d and %d, b1, b2);
+#ifdef USE_ASPRINTF
+if (asprintf(msg, buttons %d and %d, b1, b2) == -1)
+msg = NULL;
+#else
+msg = Xprintf(buttons %d and %d, b1, b2);
+#endif
pMse-negativeX = b1;
pMse-positiveX = b2;
if (b1 pMse-buttons) pMse-buttons = b1;
@@
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: knakahara
Date: Wed Jul 22 11:14:13 UTC 2015
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
fix typo
To generate a diff of this commit:
cvs rdiff -u -r1.341 -r1.342 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.341 src/sys/dev/pci/if_wm.c:1.342
--- src/sys/dev/pci/if_wm.c:1.341 Wed Jul 22 08:22:55 2015
+++ src/sys/dev/pci/if_wm.c Wed Jul 22 11:14:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.341 2015/07/22 08:22:55 knakahara Exp $ */
+/* $NetBSD: if_wm.c,v 1.342 2015/07/22 11:14:13 knakahara Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.341 2015/07/22 08:22:55 knakahara Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.342 2015/07/22 11:14:13 knakahara Exp $);
#ifdef _KERNEL_OPT
#include opt_net_mpsafe.h
@@ -786,7 +786,7 @@ struct _msix_matrix {
int cpuid;
} msix_matrix[WM_MSIX_NINTR] = {
{ TX, wm_txintr_msix, WM_MSIX_TXINTR_IDX, WM_MSIX_TXINTR_CPUID },
- { RX, wm_rxintr_msix, WM_MSIX_RXINTR_IDX, WM_MSIX_TXINTR_CPUID },
+ { RX, wm_rxintr_msix, WM_MSIX_RXINTR_IDX, WM_MSIX_RXINTR_CPUID },
{ LINK, wm_linkintr_msix, WM_MSIX_LINKINTR_IDX,
WM_MSIX_LINKINTR_CPUID },
};
CVS commit: xsrc/external/mit/xf86-input-mouse/include
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 09:49:02 UTC 2015 Removed Files: xsrc/external/mit/xf86-input-mouse/include: config.h Log Message: remove now not necessary file. To generate a diff of this commit: cvs rdiff -u -r1.6 -r0 xsrc/external/mit/xf86-input-mouse/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/server/drivers/xf86-input-mouse
Module Name:src
Committed By: mrg
Date: Wed Jul 22 09:49:51 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-mouse: Makefile
Log Message:
updates for xf86-input-mouse 1.9.1.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.6 Wed Jun 5 07:26:36 2013
+++ src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile Wed Jul 22 09:49:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/06/05 07:26:36 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2015/07/22 09:49:51 mrg Exp $
WARNS?= 2
@@ -8,9 +8,8 @@ DRIVER_NAME= mouse_drv
SRCS= mouse.c pnp.c bsd_mouse.c
MAN= mousedrv.4
-CPPFLAGS+= -DHAVE_CONFIG_H \
- -I${X11SRCDIR.${DRIVER}}/include \
- -I${X11SRCDIR.${DRIVER}}/../include
+CPPFLAGS+= -DHAVE_XORG_CONFIG_H -DHAVE_ASPRINTF
+CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/include
INCSDIR= ${X11INCDIR}/xorg
INCS= xf86-mouse-properties.h
@@ -22,3 +21,6 @@ PKGDIST.xorg-mouse= ${X11SRCDIR.${DRIVER
.PATH: ${X11SRCDIR.${DRIVER}}/include
.PATH: ${X11SRCDIR.${DRIVER}}
+
+XORG_PKG_VER_PROG= ${DRIVER}
+.include ../../../xorg-pkg-ver.mk
CVS commit: src/sys/dev/spi
Module Name:src Committed By: ryo Date: Wed Jul 22 10:07:59 UTC 2015 Modified Files: src/sys/dev/spi: spiflash.c Log Message: need to forward the data pointer To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/dev/spi/spiflash.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/spi/spiflash.c diff -u src/sys/dev/spi/spiflash.c:1.17 src/sys/dev/spi/spiflash.c:1.18 --- src/sys/dev/spi/spiflash.c:1.17 Sun Apr 26 15:15:20 2015 +++ src/sys/dev/spi/spiflash.c Wed Jul 22 10:07:59 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: spiflash.c,v 1.17 2015/04/26 15:15:20 mlelstv Exp $ */ +/* $NetBSD: spiflash.c,v 1.18 2015/07/22 10:07:59 ryo Exp $ */ /*- * Copyright (c) 2006 Urbana-Champaign Independent Media Center. @@ -42,7 +42,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: spiflash.c,v 1.17 2015/04/26 15:15:20 mlelstv Exp $); +__KERNEL_RCSID(0, $NetBSD: spiflash.c,v 1.18 2015/07/22 10:07:59 ryo Exp $); #include sys/param.h #include sys/conf.h @@ -681,6 +681,7 @@ spiflash_common_read(spiflash_handle_t s return rv; } + data += cnt; start += cnt; size -= cnt; }
CVS commit: src/lib/libc/time
Module Name:src
Committed By: ginsbach
Date: Wed Jul 22 13:33:59 UTC 2015
Modified Files:
src/lib/libc/time: strptime.c
Log Message:
More KNF style changes -- consistent use of whitespace in #defines.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/lib/libc/time/strptime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/strptime.c
diff -u src/lib/libc/time/strptime.c:1.46 src/lib/libc/time/strptime.c:1.47
--- src/lib/libc/time/strptime.c:1.46 Mon Jul 20 14:37:11 2015
+++ src/lib/libc/time/strptime.c Wed Jul 22 13:33:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: strptime.c,v 1.46 2015/07/20 14:37:11 ginsbach Exp $ */
+/* $NetBSD: strptime.c,v 1.47 2015/07/22 13:33:59 ginsbach Exp $ */
/*-
* Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: strptime.c,v 1.46 2015/07/20 14:37:11 ginsbach Exp $);
+__RCSID($NetBSD: strptime.c,v 1.47 2015/07/22 13:33:59 ginsbach Exp $);
#endif
#include namespace.h
@@ -63,19 +63,19 @@ static const u_char *find_string(const u
*/
#define ALT_E 0x01
#define ALT_O 0x02
-#define LEGAL_ALT(x) { if (alt_format ~(x)) return NULL; }
+#define LEGAL_ALT(x) { if (alt_format ~(x)) return NULL; }
-#define S_YEAR (1 0)
-#define S_MON (1 1)
-#define S_YDAY (1 2)
-#define S_MDAY (1 3)
-#define S_WDAY (1 4)
-
-#define HAVE_MDAY(s) (s S_MDAY)
-#define HAVE_MON(s) (s S_MON)
-#define HAVE_WDAY(s) (s S_WDAY)
-#define HAVE_YDAY(s) (s S_YDAY)
-#define HAVE_YEAR(s) (s S_YEAR)
+#define S_YEAR (1 0)
+#define S_MON (1 1)
+#define S_YDAY (1 2)
+#define S_MDAY (1 3)
+#define S_WDAY (1 4)
+
+#define HAVE_MDAY(s) (s S_MDAY)
+#define HAVE_MON(s) (s S_MON)
+#define HAVE_WDAY(s) (s S_WDAY)
+#define HAVE_YDAY(s) (s S_YDAY)
+#define HAVE_YEAR(s) (s S_YEAR)
static char gmt[] = { GMT };
static char utc[] = { UTC };
CVS import: xsrc/external/mit/fstobdf/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 07:50:39 UTC 2015 Update of /cvsroot/xsrc/external/mit/fstobdf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7241 Log Message: initial import of fstobdf-1.0.6 Status: Vendor Tag: xorg Release Tags: fstobdf-1-0-6 U xsrc/external/mit/fstobdf/dist/COPYING U xsrc/external/mit/fstobdf/dist/Makefile.in U xsrc/external/mit/fstobdf/dist/install-sh U xsrc/external/mit/fstobdf/dist/aclocal.m4 C xsrc/external/mit/fstobdf/dist/fstobdf.c U xsrc/external/mit/fstobdf/dist/README U xsrc/external/mit/fstobdf/dist/Makefile.am U xsrc/external/mit/fstobdf/dist/config.guess U xsrc/external/mit/fstobdf/dist/INSTALL U xsrc/external/mit/fstobdf/dist/fstobdf.h U xsrc/external/mit/fstobdf/dist/config.sub U xsrc/external/mit/fstobdf/dist/header.c U xsrc/external/mit/fstobdf/dist/configure.ac U xsrc/external/mit/fstobdf/dist/depcomp U xsrc/external/mit/fstobdf/dist/missing U xsrc/external/mit/fstobdf/dist/chars.c U xsrc/external/mit/fstobdf/dist/config.h.in U xsrc/external/mit/fstobdf/dist/props.c U xsrc/external/mit/fstobdf/dist/configure N xsrc/external/mit/fstobdf/dist/compile U xsrc/external/mit/fstobdf/dist/ChangeLog U xsrc/external/mit/fstobdf/dist/man/Makefile.in U xsrc/external/mit/fstobdf/dist/man/fstobdf.man U xsrc/external/mit/fstobdf/dist/man/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/fstobdf/dist
CVS import: xsrc/external/mit/ico/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 07:50:40 UTC 2015 Update of /cvsroot/xsrc/external/mit/ico/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4766 Log Message: initial import of ico-1.0.4 Status: Vendor Tag: xorg Release Tags: ico-1-0-4 U xsrc/external/mit/ico/dist/INSTALL U xsrc/external/mit/ico/dist/install-sh U xsrc/external/mit/ico/dist/allobjs.h U xsrc/external/mit/ico/dist/aclocal.m4 U xsrc/external/mit/ico/dist/configure.ac U xsrc/external/mit/ico/dist/config.h.in U xsrc/external/mit/ico/dist/README U xsrc/external/mit/ico/dist/ico.c U xsrc/external/mit/ico/dist/polyinfo.h U xsrc/external/mit/ico/dist/objico.h U xsrc/external/mit/ico/dist/missing U xsrc/external/mit/ico/dist/objplane.h U xsrc/external/mit/ico/dist/Makefile.am U xsrc/external/mit/ico/dist/depcomp U xsrc/external/mit/ico/dist/config.sub U xsrc/external/mit/ico/dist/config.guess U xsrc/external/mit/ico/dist/configure U xsrc/external/mit/ico/dist/objpyr.h U xsrc/external/mit/ico/dist/objcube.h U xsrc/external/mit/ico/dist/COPYING U xsrc/external/mit/ico/dist/objocta.h U xsrc/external/mit/ico/dist/ChangeLog U xsrc/external/mit/ico/dist/Makefile.in N xsrc/external/mit/ico/dist/man/Makefile.in N xsrc/external/mit/ico/dist/man/ico.man N xsrc/external/mit/ico/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/bdftopcf/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 07:50:36 UTC 2015 Update of /cvsroot/xsrc/external/mit/bdftopcf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17615 Log Message: initial import of bdftopcf-1.0.5 Status: Vendor Tag: xorg Release Tags: bdftopcf-1-0-5 U xsrc/external/mit/bdftopcf/dist/missing U xsrc/external/mit/bdftopcf/dist/configure U xsrc/external/mit/bdftopcf/dist/config.h.in U xsrc/external/mit/bdftopcf/dist/INSTALL U xsrc/external/mit/bdftopcf/dist/ChangeLog U xsrc/external/mit/bdftopcf/dist/config.guess U xsrc/external/mit/bdftopcf/dist/install-sh U xsrc/external/mit/bdftopcf/dist/README U xsrc/external/mit/bdftopcf/dist/aclocal.m4 U xsrc/external/mit/bdftopcf/dist/configure.ac U xsrc/external/mit/bdftopcf/dist/COPYING U xsrc/external/mit/bdftopcf/dist/compile U xsrc/external/mit/bdftopcf/dist/AUTHORS U xsrc/external/mit/bdftopcf/dist/Makefile.in U xsrc/external/mit/bdftopcf/dist/config.sub U xsrc/external/mit/bdftopcf/dist/bdftopcf.c U xsrc/external/mit/bdftopcf/dist/depcomp U xsrc/external/mit/bdftopcf/dist/Makefile.am U xsrc/external/mit/bdftopcf/dist/man/bdftopcf.man U xsrc/external/mit/bdftopcf/dist/man/Makefile.in U xsrc/external/mit/bdftopcf/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/fslsfonts/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 07:50:37 UTC 2015 Update of /cvsroot/xsrc/external/mit/fslsfonts/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21824 Log Message: initial import of fslsfonts-1.0.5 Status: Vendor Tag: xorg Release Tags: fslsfonts-1-0-5 U xsrc/external/mit/fslsfonts/dist/fslsfonts.c U xsrc/external/mit/fslsfonts/dist/missing U xsrc/external/mit/fslsfonts/dist/configure U xsrc/external/mit/fslsfonts/dist/config.sub U xsrc/external/mit/fslsfonts/dist/depcomp U xsrc/external/mit/fslsfonts/dist/ChangeLog N xsrc/external/mit/fslsfonts/dist/compile U xsrc/external/mit/fslsfonts/dist/config.h.in U xsrc/external/mit/fslsfonts/dist/config.guess U xsrc/external/mit/fslsfonts/dist/README U xsrc/external/mit/fslsfonts/dist/COPYING U xsrc/external/mit/fslsfonts/dist/Makefile.am U xsrc/external/mit/fslsfonts/dist/configure.ac U xsrc/external/mit/fslsfonts/dist/aclocal.m4 U xsrc/external/mit/fslsfonts/dist/install-sh U xsrc/external/mit/fslsfonts/dist/INSTALL U xsrc/external/mit/fslsfonts/dist/Makefile.in U xsrc/external/mit/fslsfonts/dist/man/fslsfonts.man U xsrc/external/mit/fslsfonts/dist/man/Makefile.am U xsrc/external/mit/fslsfonts/dist/man/Makefile.in No conflicts created by this import
CVS commit: xsrc/external/mit/luit/dist
Module Name:xsrc Committed By: mrg Date: Wed Jul 22 08:15:05 UTC 2015 Modified Files: xsrc/external/mit/luit/dist: other.h Log Message: hide config.h behind HAVE_CONFIG_H define. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/external/mit/luit/dist/other.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/luit/dist/other.h diff -u xsrc/external/mit/luit/dist/other.h:1.1.1.2 xsrc/external/mit/luit/dist/other.h:1.2 --- xsrc/external/mit/luit/dist/other.h:1.1.1.2 Sun Nov 21 02:14:15 2010 +++ xsrc/external/mit/luit/dist/other.h Wed Jul 22 08:15:05 2015 @@ -23,7 +23,9 @@ THE SOFTWARE. #ifndef LUIT_OTHER_H #define LUIT_OTHER_H 1 +#ifdef HAVE_CONFIG_H #include config.h /* include this, for self-contained headers */ +#endif #ifndef GCC_UNUSED #define GCC_UNUSED /* ARGSUSED */
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: hannken
Date: Wed Jul 22 08:33:51 UTC 2015
Modified Files:
src/sys/dev/ic: mpt_netbsd.c
Log Message:
Adapter leaks requests when mpt_event_notify_reply() has to acknowledge
an event leading to adapter resource shortage messages when the scsipi
subsystem tries to use all adapt_openings.
Change mpt_ctlop() to free the request on event MPI_FUNCTION_EVENT_ACK.
Tested on a SunFire X4275 with Symbios Logic SAS1068E (1000:0058, rev. 4).
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/ic/mpt_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/mpt_netbsd.c
diff -u src/sys/dev/ic/mpt_netbsd.c:1.31 src/sys/dev/ic/mpt_netbsd.c:1.32
--- src/sys/dev/ic/mpt_netbsd.c:1.31 Sun Sep 28 11:27:00 2014
+++ src/sys/dev/ic/mpt_netbsd.c Wed Jul 22 08:33:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mpt_netbsd.c,v 1.31 2014/09/28 11:27:00 jmcneill Exp $ */
+/* $NetBSD: mpt_netbsd.c,v 1.32 2015/07/22 08:33:51 hannken Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -77,7 +77,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mpt_netbsd.c,v 1.31 2014/09/28 11:27:00 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: mpt_netbsd.c,v 1.32 2015/07/22 08:33:51 hannken Exp $);
#include bio.h
@@ -1270,8 +1270,16 @@ mpt_ctlop(mpt_softc_t *mpt, void *vmsg,
break;
case MPI_FUNCTION_EVENT_ACK:
+ {
+ MSG_EVENT_ACK_REPLY *msg = vmsg;
+ int index = le32toh(msg-MsgContext) ~0x8000;
mpt_free_reply(mpt, (reply 1));
+ if (index = 0 index MPT_MAX_REQUESTS(mpt)) {
+ request_t *req = mpt-request_pool[index];
+ mpt_free_request(mpt, req);
+ }
break;
+ }
case MPI_FUNCTION_PORT_ENABLE:
{
CVS commit: xsrc/external/mit/xkbcomp/dist
Module Name:xsrc
Committed By: mrg
Date: Wed Jul 22 08:39:03 UTC 2015
Modified Files:
xsrc/external/mit/xkbcomp/dist: expr.c
Log Message:
adjust a nul-string assignment to avoid const issues.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xkbcomp/dist/expr.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/xkbcomp/dist/expr.c
diff -u xsrc/external/mit/xkbcomp/dist/expr.c:1.1.1.3 xsrc/external/mit/xkbcomp/dist/expr.c:1.2
--- xsrc/external/mit/xkbcomp/dist/expr.c:1.1.1.3 Wed Jul 22 08:34:46 2015
+++ xsrc/external/mit/xkbcomp/dist/expr.c Wed Jul 22 08:39:03 2015
@@ -729,7 +729,8 @@ ExprResolveString(ExprDef * expr,
val_rtrn-str = XkbAtomGetString(NULL, expr-value.str);
if (val_rtrn-str == NULL)
{
-static const char *empty = ;
+ static char empty_char = '\0';
+char *empty = empty_char;
val_rtrn-str = empty;
}
return True;
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-ark
Module Name:src
Committed By: mrg
Date: Thu Jul 23 02:04:09 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-ark: Makefile
Log Message:
update for ark 0.7.5.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile:1.4 Wed Jun 10 01:59:09 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile Thu Jul 23 02:04:09 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/10 01:59:09 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2015/07/23 02:04:09 mrg Exp $
DRIVER= xf86-video-ark
DRIVER_NAME= ark_drv
@@ -6,5 +6,6 @@ DRIVER_NAME= ark_drv
SRCS= ark_accel.c ark_driver.c
CPPFLAGS+= -DPACKAGE_VERSION=\${PACKAGE_VERSION}\
+CPPFLAGS+= -DHAVE_XAA_H
.include ../Makefile.xf86-driver
CVS import: xsrc/external/mit/xf86-video-i740/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 01:15:53 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-video-i740/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6726 Log Message: initial import of xf86-video-i740-1.3.5 Status: Vendor Tag: xorg Release Tags: xf86-video-i740-1-3-5 U xsrc/external/mit/xf86-video-i740/dist/config.h.in U xsrc/external/mit/xf86-video-i740/dist/COPYING U xsrc/external/mit/xf86-video-i740/dist/missing U xsrc/external/mit/xf86-video-i740/dist/Makefile.am U xsrc/external/mit/xf86-video-i740/dist/configure U xsrc/external/mit/xf86-video-i740/dist/config.sub U xsrc/external/mit/xf86-video-i740/dist/INSTALL U xsrc/external/mit/xf86-video-i740/dist/install-sh U xsrc/external/mit/xf86-video-i740/dist/configure.ac U xsrc/external/mit/xf86-video-i740/dist/aclocal.m4 U xsrc/external/mit/xf86-video-i740/dist/depcomp U xsrc/external/mit/xf86-video-i740/dist/README U xsrc/external/mit/xf86-video-i740/dist/ltmain.sh U xsrc/external/mit/xf86-video-i740/dist/config.guess U xsrc/external/mit/xf86-video-i740/dist/ChangeLog U xsrc/external/mit/xf86-video-i740/dist/Makefile.in U xsrc/external/mit/xf86-video-i740/dist/man/Makefile.am U xsrc/external/mit/xf86-video-i740/dist/man/i740.man U xsrc/external/mit/xf86-video-i740/dist/man/Makefile.in U xsrc/external/mit/xf86-video-i740/dist/src/i740_macros.h U xsrc/external/mit/xf86-video-i740/dist/src/i740_pcirename.h U xsrc/external/mit/xf86-video-i740/dist/src/i740_i2c.c U xsrc/external/mit/xf86-video-i740/dist/src/i740_cursor.c U xsrc/external/mit/xf86-video-i740/dist/src/i740_accel.c U xsrc/external/mit/xf86-video-i740/dist/src/compat-api.h U xsrc/external/mit/xf86-video-i740/dist/src/Makefile.am U xsrc/external/mit/xf86-video-i740/dist/src/i740_video.c C xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c C xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.c U xsrc/external/mit/xf86-video-i740/dist/src/i740_reg.h U xsrc/external/mit/xf86-video-i740/dist/src/i740.h U xsrc/external/mit/xf86-video-i740/dist/src/i740_dga.h U xsrc/external/mit/xf86-video-i740/dist/src/i740_io.c U xsrc/external/mit/xf86-video-i740/dist/src/Makefile.in 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-i740/dist
CVS import: xsrc/external/mit/xf86-video-mga/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 01:15:58 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-video-mga/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1008 Log Message: initial import of xf86-video-mga-1.6.4 Status: Vendor Tag: xorg Release Tags: xf86-video-mga-1-6-4 U xsrc/external/mit/xf86-video-mga/dist/ChangeLog N xsrc/external/mit/xf86-video-mga/dist/compile U xsrc/external/mit/xf86-video-mga/dist/configure.ac U xsrc/external/mit/xf86-video-mga/dist/configure U xsrc/external/mit/xf86-video-mga/dist/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/README U xsrc/external/mit/xf86-video-mga/dist/ltmain.sh U xsrc/external/mit/xf86-video-mga/dist/COPYING U xsrc/external/mit/xf86-video-mga/dist/config.guess U xsrc/external/mit/xf86-video-mga/dist/depcomp U xsrc/external/mit/xf86-video-mga/dist/README_HALLIB U xsrc/external/mit/xf86-video-mga/dist/missing U xsrc/external/mit/xf86-video-mga/dist/INSTALL U xsrc/external/mit/xf86-video-mga/dist/Makefile.in U xsrc/external/mit/xf86-video-mga/dist/config.sub U xsrc/external/mit/xf86-video-mga/dist/config.h.in U xsrc/external/mit/xf86-video-mga/dist/mga_PInS.txt U xsrc/external/mit/xf86-video-mga/dist/install-sh U xsrc/external/mit/xf86-video-mga/dist/aclocal.m4 U xsrc/external/mit/xf86-video-mga/dist/util/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/util/README U xsrc/external/mit/xf86-video-mga/dist/util/stormdwg.c U xsrc/external/mit/xf86-video-mga/dist/util/Makefile.in U xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c U xsrc/external/mit/xf86-video-mga/dist/src/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_macros.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_hwcurs.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_arc.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_maven.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_dripriv.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_shadow.c U xsrc/external/mit/xf86-video-mga/dist/src/mgareg_flags.h U xsrc/external/mit/xf86-video-mga/dist/src/Makefile.in U xsrc/external/mit/xf86-video-mga/dist/src/mga_common.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c U xsrc/external/mit/xf86-video-mga/dist/src/binding.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_sarea.h U xsrc/external/mit/xf86-video-mga/dist/src/client.h U xsrc/external/mit/xf86-video-mga/dist/src/compat-api.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_reg.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_halmod.c U xsrc/external/mit/xf86-video-mga/dist/src/mga.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_ucode.h U xsrc/external/mit/xf86-video-mga/dist/man/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/man/Makefile.in U xsrc/external/mit/xf86-video-mga/dist/man/mga.man No conflicts created by this import
CVS import: xsrc/external/mit/xf86-video-newport/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 01:16:00 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-video-newport/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27809 Log Message: initial import of xf86-video-newport-0.2.4 Status: Vendor Tag: xorg Release Tags: xf86-video-newport-0-2-4 U xsrc/external/mit/xf86-video-newport/dist/config.guess U xsrc/external/mit/xf86-video-newport/dist/missing U xsrc/external/mit/xf86-video-newport/dist/aclocal.m4 U xsrc/external/mit/xf86-video-newport/dist/COPYING U xsrc/external/mit/xf86-video-newport/dist/XF86Config.indy U xsrc/external/mit/xf86-video-newport/dist/config.h.in U xsrc/external/mit/xf86-video-newport/dist/depcomp U xsrc/external/mit/xf86-video-newport/dist/Makefile.in U xsrc/external/mit/xf86-video-newport/dist/config.sub U xsrc/external/mit/xf86-video-newport/dist/ChangeLog U xsrc/external/mit/xf86-video-newport/dist/README N xsrc/external/mit/xf86-video-newport/dist/INSTALL U xsrc/external/mit/xf86-video-newport/dist/Makefile.am U xsrc/external/mit/xf86-video-newport/dist/ltmain.sh U xsrc/external/mit/xf86-video-newport/dist/install-sh U xsrc/external/mit/xf86-video-newport/dist/configure U xsrc/external/mit/xf86-video-newport/dist/configure.ac C xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c U xsrc/external/mit/xf86-video-newport/dist/src/newport_regs.h U xsrc/external/mit/xf86-video-newport/dist/src/newport_accel.c C xsrc/external/mit/xf86-video-newport/dist/src/newport.h U xsrc/external/mit/xf86-video-newport/dist/src/Makefile.in U xsrc/external/mit/xf86-video-newport/dist/src/newport_cursor.c U xsrc/external/mit/xf86-video-newport/dist/src/Makefile.am U xsrc/external/mit/xf86-video-newport/dist/src/newport_cmap.c U xsrc/external/mit/xf86-video-newport/dist/src/newport_shadow.c U xsrc/external/mit/xf86-video-newport/dist/src/newport_regs.c U xsrc/external/mit/xf86-video-newport/dist/man/newport.man U xsrc/external/mit/xf86-video-newport/dist/man/Makefile.in U xsrc/external/mit/xf86-video-newport/dist/man/Makefile.am 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-newport/dist
CVS import: xsrc/external/mit/xf86-video-ark/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 01:15:49 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-video-ark/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6506 Log Message: initial import of xf86-video-ark-0.7.5 Status: Vendor Tag: xorg Release Tags: xf86-video-ark-0-7-5 U xsrc/external/mit/xf86-video-ark/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ark/dist/config.sub U xsrc/external/mit/xf86-video-ark/dist/ChangeLog U xsrc/external/mit/xf86-video-ark/dist/COPYING U xsrc/external/mit/xf86-video-ark/dist/config.h.in U xsrc/external/mit/xf86-video-ark/dist/install-sh U xsrc/external/mit/xf86-video-ark/dist/Makefile.am U xsrc/external/mit/xf86-video-ark/dist/INSTALL U xsrc/external/mit/xf86-video-ark/dist/ltmain.sh U xsrc/external/mit/xf86-video-ark/dist/depcomp U xsrc/external/mit/xf86-video-ark/dist/missing U xsrc/external/mit/xf86-video-ark/dist/configure.ac U xsrc/external/mit/xf86-video-ark/dist/README U xsrc/external/mit/xf86-video-ark/dist/config.guess U xsrc/external/mit/xf86-video-ark/dist/configure U xsrc/external/mit/xf86-video-ark/dist/Makefile.in U xsrc/external/mit/xf86-video-ark/dist/src/ark_driver.c U xsrc/external/mit/xf86-video-ark/dist/src/ark.h U xsrc/external/mit/xf86-video-ark/dist/src/Makefile.am U xsrc/external/mit/xf86-video-ark/dist/src/ark_reg.h N xsrc/external/mit/xf86-video-ark/dist/src/compat-api.h U xsrc/external/mit/xf86-video-ark/dist/src/ark_accel.c U xsrc/external/mit/xf86-video-ark/dist/src/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xf86-video-tdfx/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 01:16:02 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-video-tdfx/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28062 Log Message: initial import of xf86-video-tdfx-1.4.6 Status: Vendor Tag: xorg Release Tags: xf86-video-tdfx-1-4-6 U xsrc/external/mit/xf86-video-tdfx/dist/config.h.in U xsrc/external/mit/xf86-video-tdfx/dist/COPYING U xsrc/external/mit/xf86-video-tdfx/dist/missing U xsrc/external/mit/xf86-video-tdfx/dist/Makefile.am U xsrc/external/mit/xf86-video-tdfx/dist/configure U xsrc/external/mit/xf86-video-tdfx/dist/config.sub U xsrc/external/mit/xf86-video-tdfx/dist/INSTALL U xsrc/external/mit/xf86-video-tdfx/dist/install-sh U xsrc/external/mit/xf86-video-tdfx/dist/configure.ac U xsrc/external/mit/xf86-video-tdfx/dist/aclocal.m4 U xsrc/external/mit/xf86-video-tdfx/dist/depcomp U xsrc/external/mit/xf86-video-tdfx/dist/README U xsrc/external/mit/xf86-video-tdfx/dist/ltmain.sh U xsrc/external/mit/xf86-video-tdfx/dist/config.guess U xsrc/external/mit/xf86-video-tdfx/dist/ChangeLog U xsrc/external/mit/xf86-video-tdfx/dist/Makefile.in U xsrc/external/mit/xf86-video-tdfx/dist/man/Makefile.am U xsrc/external/mit/xf86-video-tdfx/dist/man/tdfx.man U xsrc/external/mit/xf86-video-tdfx/dist/man/Makefile.in C xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_sli.c C xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfxdefs.h U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dga.c U xsrc/external/mit/xf86-video-tdfx/dist/src/compat-api.h U xsrc/external/mit/xf86-video-tdfx/dist/src/Makefile.am U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx.h U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_io.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_accel.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_priv.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_hwcurs.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_video.c U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dripriv.h U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.h U xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_priv.h U xsrc/external/mit/xf86-video-tdfx/dist/src/Makefile.in 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-tdfx/dist
CVS commit: src/games/atc
Module Name:src Committed By: pgoyette Date: Thu Jul 23 01:19:20 UTC 2015 Modified Files: src/games/atc: atc.6 Log Message: Sync descriptive text with actual game definition. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/games/atc/atc.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/atc/atc.6 diff -u src/games/atc/atc.6:1.22 src/games/atc/atc.6:1.23 --- src/games/atc/atc.6:1.22 Thu Sep 15 02:09:41 2005 +++ src/games/atc/atc.6 Thu Jul 23 01:19:20 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: atc.6,v 1.22 2005/09/15 02:09:41 wiz Exp $ +.\ $NetBSD: atc.6,v 1.23 2015/07/23 01:19:20 pgoyette Exp $ .\ .\ Copyright (c) 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -456,7 +456,7 @@ diagonal. # This is the default game. update = 5; -newplane = 5; +newplane = 10; width = 30; height = 21;
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Thu Jul 23 01:19:17 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-i740/dist/src: i740_driver.c
xsrc/external/mit/xf86-video-newport/dist/src: newport.h
newport_driver.c
xsrc/external/mit/xf86-video-tdfx/dist/src: tdfx_dri.c tdfx_driver.c
Removed Files:
xsrc/external/mit/xf86-video-newport/dist: README.sgml
Log Message:
merge i740 1.3.5, newport 0.2.4 and tdfx 1.4.6.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-newport/dist/README.sgml
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-newport/dist/src/newport.h
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c
diff -u xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c:1.4 xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c:1.5
--- xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c:1.4 Sun Jun 2 21:44:44 2013
+++ xsrc/external/mit/xf86-video-i740/dist/src/i740_driver.c Thu Jul 23 01:19:16 2015
@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
#include compiler.h
-/* Drivers using the mi implementation of backing store need: */
-
-#include mibstore.h
-
/* All drivers using the vgahw module need this */
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include vgaHW.h
@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) {
}
}
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);
Index: xsrc/external/mit/xf86-video-newport/dist/src/newport.h
diff -u xsrc/external/mit/xf86-video-newport/dist/src/newport.h:1.3 xsrc/external/mit/xf86-video-newport/dist/src/newport.h:1.4
--- xsrc/external/mit/xf86-video-newport/dist/src/newport.h:1.3 Fri Dec 17 04:19:50 2010
+++ xsrc/external/mit/xf86-video-newport/dist/src/newport.h Thu Jul 23 01:19:16 2015
@@ -23,6 +23,7 @@
#include xf86.h
#include xf86_OSproc.h
#include compiler.h
+
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6
#include xf86Resources.h
#endif
Index: xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c
diff -u xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.10 xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.11
--- xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.10 Wed Jun 4 18:20:44 2014
+++ xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c Thu Jul 23 01:19:16 2015
@@ -1,6 +1,4 @@
/*
- * Id: newport_driver.c,v 1.2 2000/11/29 20:58:10 agx Exp $
- *
* Driver for the SGI Indy's Newport graphics card
*
* This driver is based on the newport.c newport_con.c kernel code
@@ -30,7 +28,6 @@
* Project.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_driver.c,v 1.25 2003/04/23 21:51:41 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -74,9 +71,9 @@
#define NEWPORT_VERSION 4000
#define NEWPORT_NAME NEWPORT
#define NEWPORT_DRIVER_NAME newport
-#define NEWPORT_MAJOR_VERSION 0
-#define NEWPORT_MINOR_VERSION 2
-#define NEWPORT_PATCHLEVEL 0
+#define NEWPORT_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define NEWPORT_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define NEWPORT_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
/* Prototypes --- */
@@ -117,36 +114,6 @@ static SymTabRec NewportChipsets[] = {
{-1, NULL }
};
-/* List of Symbols from other modules that this module references */
-
-static const char *fbSymbols[] = {
- fbPictureInit,
- fbScreenInit,
- NULL
-};
-
-static const char *ramdacSymbols[] = {
-xf86CreateCursorInfoRec,
-xf86InitCursor,
-NULL
-};
-
-static const char *shadowSymbols[] = {
- ShadowFBInit,
- NULL
-};
-
-static const char *xaaSymbols[] = {
-XAACreateInfoRec,
-XAADestroyInfoRec,
-XAAGetFallbackOps,
-XAAInit,
-NULL
-};
-
-
-#ifdef XFree86LOADER
-
static MODULESETUPPROTO(newportSetup);
static XF86ModuleVersionInfo newportVersRec =
@@ -187,14 +154,6 @@ newportSetup(pointer module, pointer opt
xf86AddDriver(NEWPORT, module, 0);
/*
- * Tell the loader about symbols from other modules that this module
- * might refer to.
- *
- */
- LoaderRefSymLists( fbSymbols, ramdacSymbols, shadowSymbols, xaaSymbols, NULL);
-
-
- /*
* The return value must be non-NULL on success even though
* there is no TearDownProc.
*/
@@ -205,8 +164,6 @@ newportSetup(pointer module, pointer opt
}
CVS import: xsrc/external/mit/libXpresent/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 05:30:32 UTC 2015 Update of /cvsroot/xsrc/external/mit/libXpresent/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18977 Log Message: initial import of libXpresent-1.0.0 Status: Vendor Tag: xorg Release Tags: libXpresent-1-0-0 N xsrc/external/mit/libXpresent/dist/Makefile.am N xsrc/external/mit/libXpresent/dist/README N xsrc/external/mit/libXpresent/dist/ChangeLog N xsrc/external/mit/libXpresent/dist/configure N xsrc/external/mit/libXpresent/dist/config.h.in N xsrc/external/mit/libXpresent/dist/aclocal.m4 N xsrc/external/mit/libXpresent/dist/compile N xsrc/external/mit/libXpresent/dist/ltmain.sh N xsrc/external/mit/libXpresent/dist/install-sh N xsrc/external/mit/libXpresent/dist/config.sub N xsrc/external/mit/libXpresent/dist/missing N xsrc/external/mit/libXpresent/dist/config.guess N xsrc/external/mit/libXpresent/dist/INSTALL N xsrc/external/mit/libXpresent/dist/xpresent.pc.in N xsrc/external/mit/libXpresent/dist/Makefile.in N xsrc/external/mit/libXpresent/dist/configure.ac N xsrc/external/mit/libXpresent/dist/COPYING N xsrc/external/mit/libXpresent/dist/AUTHORS N xsrc/external/mit/libXpresent/dist/depcomp N xsrc/external/mit/libXpresent/dist/include/X11/extensions/Xpresent.h N xsrc/external/mit/libXpresent/dist/man/Makefile.am N xsrc/external/mit/libXpresent/dist/man/Xpresent.man N xsrc/external/mit/libXpresent/dist/man/Makefile.in N xsrc/external/mit/libXpresent/dist/src/Makefile.am N xsrc/external/mit/libXpresent/dist/src/Xpresent.c N xsrc/external/mit/libXpresent/dist/src/Makefile.in No conflicts created by this import
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: mrg
Date: Thu Jul 23 05:45:09 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile
Log Message:
link against Xinerama now that xterm 318 would prefer to.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 src/external/mit/xorg/bin/xterm/Makefile:1.14
--- src/external/mit/xorg/bin/xterm/Makefile:1.13 Fri Jul 11 19:40:52 2014
+++ src/external/mit/xorg/bin/xterm/Makefile Thu Jul 23 05:45:09 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/07/11 19:40:52 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2015/07/23 05:45:09 mrg Exp $
.include bsd.own.mk
@@ -31,9 +31,10 @@ BUILDSYMLINKS= XTerm-col.ad XTerm-color.
LDADD+= -lXft -lfontconfig -lfreetype -lexpat -lXrender
DPADD+= ${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}
-LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lcurses -lterminfo -lutil
-DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
- ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBCURSES} ${LIBTERMINFO} ${LIBUTIL}
+LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXinerama -lXpm -lXext -lX11 -lcurses -lterminfo -lutil
+DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXINERAMA}
+LDADD+= -lXpm -lXext -lX11 -lcurses -lterminfo -lutil
+DPADD+= ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBCURSES} ${LIBTERMINFO} ${LIBUTIL}
SUBDIR= resize uxterm
CVS import: xsrc/external/mit/xterm/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 04:50:53 UTC 2015 Update of /cvsroot/xsrc/external/mit/xterm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12919 Log Message: initial import of xterm-318 Status: Vendor Tag: xorg Release Tags: xterm-318 U xsrc/external/mit/xterm/dist/xterm.appdata.xml U xsrc/external/mit/xterm/dist/config.guess U xsrc/external/mit/xterm/dist/version.c U xsrc/external/mit/xterm/dist/df-install.in U xsrc/external/mit/xterm/dist/terminfo U xsrc/external/mit/xterm/dist/88colres.h U xsrc/external/mit/xterm/dist/tabs.c U 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/trace.c 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/uxterm.desktop 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/KOI8RXTerm.ad U xsrc/external/mit/xterm/dist/aclocal.m4 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/doublechr.c U xsrc/external/mit/xterm/dist/menu.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 U xsrc/external/mit/xterm/dist/graphics.c U xsrc/external/mit/xterm/dist/Tekparse.def U xsrc/external/mit/xterm/dist/graphics_sixel.h 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/graphics_regis.c C xsrc/external/mit/xterm/dist/linedata.c U xsrc/external/mit/xterm/dist/graphics_regis.h 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/charclass.h U xsrc/external/mit/xterm/dist/THANKS U xsrc/external/mit/xterm/dist/ctlseqs.ms U xsrc/external/mit/xterm/dist/xutf8.h U xsrc/external/mit/xterm/dist/configure.in 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/charsets.c U xsrc/external/mit/xterm/dist/uxterm U xsrc/external/mit/xterm/dist/graphics_sixel.c U xsrc/external/mit/xterm/dist/256colres.h U xsrc/external/mit/xterm/dist/ctlseqs.txt U xsrc/external/mit/xterm/dist/Tekproc.c U xsrc/external/mit/xterm/dist/button.c U xsrc/external/mit/xterm/dist/link_axp.com U xsrc/external/mit/xterm/dist/xterm.h U xsrc/external/mit/xterm/dist/ptydata.c 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/256colres.pl 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/precompose.c U xsrc/external/mit/xterm/dist/util.c U xsrc/external/mit/xterm/dist/error.h U xsrc/external/mit/xterm/dist/input.c U xsrc/external/mit/xterm/dist/vms.h U xsrc/external/mit/xterm/dist/xterm_axp.opt U xsrc/external/mit/xterm/dist/wcwidth.c 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 U 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
CVS commit: xsrc/external/mit/xterm
Module Name:xsrc
Committed By: mrg
Date: Thu Jul 23 04:57:09 UTC 2015
Modified Files:
xsrc/external/mit/xterm/dist: fontutils.c linedata.c misc.c ptyx.h
xterm.man
xsrc/external/mit/xterm/include: xtermcfg.h
Log Message:
merge xterm 318.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xterm/dist/fontutils.c \
xsrc/external/mit/xterm/dist/linedata.c
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xterm/dist/ptyx.h
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xterm/dist/xterm.man
cvs rdiff -u -r1.9 -r1.10 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.
Modified files:
Index: xsrc/external/mit/xterm/dist/fontutils.c
diff -u xsrc/external/mit/xterm/dist/fontutils.c:1.4 xsrc/external/mit/xterm/dist/fontutils.c:1.5
--- xsrc/external/mit/xterm/dist/fontutils.c:1.4 Fri Jul 11 19:40:23 2014
+++ xsrc/external/mit/xterm/dist/fontutils.c Thu Jul 23 04:57:09 2015
@@ -1,7 +1,7 @@
-/* $XTermId: fontutils.c,v 1.439 2014/06/17 20:38:27 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.448 2015/03/02 13:19:36 tom Exp $ */
/*
- * Copyright 1998-2013,2014 by Thomas E. Dickey
+ * Copyright 1998-2014,2015 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -51,12 +51,6 @@
#include stdio.h
#include ctype.h
-#define ALLOC_STRING(name) \
- if (name != 0) \
- name = x_strdup(name)
-#define FREE_STRING(name) \
- free_string(name)
-
#define SetFontWidth(screen,dst,src) (dst)-f_width = (src)
#define SetFontHeight(screen,dst,src) (dst)-f_height = dimRound((screen)-scale_height * (float) (src))
@@ -126,12 +120,6 @@ typedef struct {
char *end;
} FontNameProperties;
-static void
-free_string(String value)
-{
-free((void *) value);
-}
-
#if OPT_RENDERFONT
static void fillInFaceSize(XtermWidget, int);
#endif
@@ -1145,7 +1133,9 @@ xtermLoadFont(XtermWidget xw,
fnts[fNorm],
warn[fNorm],
(fontnum == fontMenu_default))) {
- SetItemSensitivity(fontMenuEntries[fontnum].widget, False);
+ if (fontnum != fontMenu_fontsel) {
+ SetItemSensitivity(fontMenuEntries[fontnum].widget, False);
+ }
goto bad;
}
@@ -1437,8 +1427,7 @@ xtermLoadFont(XtermWidget xw,
FREE_STRING(screen-MenuFontName(fontnum));
screen-MenuFontName(fontnum) = tmpname;
if (fontnum == fontMenu_fontescape) {
- SetItemSensitivity(fontMenuEntries[fontMenu_fontescape].widget,
- True);
+ update_font_escape();
}
#if OPT_SHIFT_FONTS
screen-menu_font_sizes[fontnum] = FontSize(fnts[fNorm].fs);
@@ -1477,7 +1466,7 @@ xtermLoadFont(XtermWidget xw,
free(tmpname);
#if OPT_RENDERFONT
-if (fontnum == fontMenu_fontsel) {
+if ((fontnum == fontMenu_fontsel) (fontnum != screen-menu_font_number)) {
int old_fontnum = screen-menu_font_number;
#if OPT_TOOLBAR
SetItemSensitivity(fontMenuEntries[fontnum].widget, True);
@@ -1492,8 +1481,10 @@ xtermLoadFont(XtermWidget xw,
TRACE((...recovering for TrueType fonts\n));
code = xtermLoadFont(xw, myfonts, doresize, fontnum);
if (code) {
- SetItemSensitivity(fontMenuEntries[fontnum].widget,
- UsingRenderFont(xw));
+ if (fontnum != fontMenu_fontsel) {
+ SetItemSensitivity(fontMenuEntries[fontnum].widget,
+ UsingRenderFont(xw));
+ }
TRACE((...recovered size %dx%d\n,
FontHeight(screen),
FontWidth(screen)));
@@ -1598,7 +1589,7 @@ xtermLoadItalics(XtermWidget xw)
FREE_STRING(dst.menu_font_names[n][m]); \
dst.menu_font_names[n][m] = x_strdup(src.menu_font_names[n][m]); \
} \
- TRACE((.. #dst .menu_fonts_names[%d] = %s\n, n, dst.menu_font_names[n][fNorm])); \
+ TRACE((.. #dst .menu_fonts_names[%d] = %s\n, n, NonNull(dst.menu_font_names[n][fNorm]))); \
}
#define COPY_DEFAULT_FONTS(target, source) \
@@ -1869,37 +1860,42 @@ HandleLoadVTFonts(Widget w,
char name_buf[80];
char class_buf[80];
String name = (String) ((*param_count 0) ? params[0] : empty);
- char *myName = (char *) MyStackAlloc(strlen(name) + 1, name_buf);
- String convert = (String) ((*param_count 1) ? params[1] : myName);
- char *myClass = (char *) MyStackAlloc(strlen(convert) + 1, class_buf);
- int n;
+ char *myName = MyStackAlloc(strlen(name) + 1, name_buf);
TRACE((HandleLoadVTFonts(%d)\n, *param_count));
- strcpy(myName, name);
- strcpy(myClass, convert);
- if (*param_count == 1)
- myClass[0] = x_toupper(myClass[0]);
+ if (myName != 0) {
+ String convert = (String) ((*param_count 1) ? params[1] : myName);
+ char *myClass = MyStackAlloc(strlen(convert) + 1, class_buf);
+ int n;
+
+ strcpy(myName, name);
+ if (myClass != 0) {
+ strcpy(myClass, convert);
+ if (*param_count == 1)
+ myClass[0] = x_toupper(myClass[0]);
- if (xtermLoadVTFonts(xw, myName, myClass)) {
- /*
- * When switching fonts,
CVS commit: src
Module Name:src Committed By: mrg Date: Thu Jul 23 05:46:39 UTC 2015 Modified Files: src/distrib/sets/lists/xbase: shl.mi src/distrib/sets/lists/xcomp: mi shl.mi src/distrib/sets/lists/xdebug: mi shl.mi src/external/mit/xorg/lib: Makefile Added Files: src/external/mit/xorg/lib/libXpresent: Makefile shlib_version Log Message: build libXpresent. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.172 -r1.173 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/xcomp/shl.mi cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/xdebug/mi cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.34 -r1.35 src/external/mit/xorg/lib/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libXpresent/Makefile \ src/external/mit/xorg/lib/libXpresent/shlib_version 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/shl.mi diff -u src/distrib/sets/lists/xbase/shl.mi:1.67 src/distrib/sets/lists/xbase/shl.mi:1.68 --- src/distrib/sets/lists/xbase/shl.mi:1.67 Mon Jul 20 04:10:40 2015 +++ src/distrib/sets/lists/xbase/shl.mi Thu Jul 23 05:46:39 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.67 2015/07/20 04:10:40 mrg Exp $ +# $NetBSD: shl.mi,v 1.68 2015/07/23 05:46:39 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -261,6 +261,9 @@ ./usr/X11R7/lib/libXp.so -obsolete- obsolete ./usr/X11R7/lib/libXp.so.7 -obsolete- obsolete ./usr/X11R7/lib/libXp.so.7.0 -obsolete- obsolete +./usr/X11R7/lib/libXpresent.so -unknown- xorg,compatx11file +./usr/X11R7/lib/libXpresent.so.1 -unknown- xorg,compatx11file +./usr/X11R7/lib/libXpresent.so.1.0 -unknown- xorg,compatx11file ./usr/X11R7/lib/libXpm.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libXpm.so.5 -unknown- xorg,compatx11file ./usr/X11R7/lib/libXpm.so.5.0 -unknown- xorg,compatx11file Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.172 src/distrib/sets/lists/xcomp/mi:1.173 --- src/distrib/sets/lists/xcomp/mi:1.172 Mon Jul 20 04:10:41 2015 +++ src/distrib/sets/lists/xcomp/mi Thu Jul 23 05:46:39 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.172 2015/07/20 04:10:41 mrg Exp $ +# $NetBSD: mi,v 1.173 2015/07/23 05:46:39 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -5494,6 +5494,7 @@ ./usr/X11R7/include/X11/extensions/Xfixes.h -unknown- xorg ./usr/X11R7/include/X11/extensions/Xge.h -unknown- xorg ./usr/X11R7/include/X11/extensions/Xinerama.h -unknown- xorg +./usr/X11R7/include/X11/extensions/Xpresent.h -unknown- xorg ./usr/X11R7/include/X11/extensions/Xrandr.h -unknown- xorg ./usr/X11R7/include/X11/extensions/Xrender.h -unknown- xorg ./usr/X11R7/include/X11/extensions/Xv.h -unknown- xorg @@ -6224,6 +6225,8 @@ ./usr/X11R7/lib/libXmuu_p.a-unknown- profile,xorg,compatx11file ./usr/X11R7/lib/libXp.a -obsolete- obsolete,compatx11file ./usr/X11R7/lib/libXp_p.a-obsolete- obsolete,compatx11file +./usr/X11R7/lib/libXpresent.a-unknown- xorg,compatx11file +./usr/X11R7/lib/libXpresent_p.a-unknown- profile,xorg,compatx11file ./usr/X11R7/lib/libXpm.a-unknown- xorg,compatx11file ./usr/X11R7/lib/libXpm_p.a-unknown- profile,xorg,compatx11file ./usr/X11R7/lib/libXprintAppUtil.a -obsolete- obsolete,compatx11file @@ -6463,6 +6466,7 @@ ./usr/X11R7/lib/pkgconfig/xorg-mouse.pc -unknown- xorg,xorg_server ./usr/X11R7/lib/pkgconfig/xorg-server.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/xp.pc-obsolete- obsolete +./usr/X11R7/lib/pkgconfig/xpresent.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/xpm.pc -unknown- xorg ./usr/X11R7/lib/pkgconfig/xprintapputil.pc -obsolete- obsolete ./usr/X11R7/lib/pkgconfig/xprintutil.pc -obsolete- obsolete @@ -7095,6 +7099,7 @@ ./usr/X11R7/man/cat3/XpStartDoc.0 -obsolete- obsolete ./usr/X11R7/man/cat3/XpStartJob.0 -obsolete- obsolete ./usr/X11R7/man/cat3/XpStartPage.0 -obsolete- obsolete +./usr/X11R7/man/cat3/Xpresent.0-unknown- .cat,xorg ./usr/X11R7/man/cat3/Xrandr.0-unknown- .cat,xorg ./usr/X11R7/man/cat3/XrmEnumerateDatabase.0 -unknown- .cat,xorg ./usr/X11R7/man/cat3/XrmGetFileDatabase.0 -unknown- .cat,xorg @@ -8005,6 +8010,7 @@ ./usr/X11R7/man/html3/XpStartDoc.html -obsolete- obsolete ./usr/X11R7/man/html3/XpStartJob.html -obsolete- obsolete ./usr/X11R7/man/html3/XpStartPage.html -obsolete- obsolete +./usr/X11R7/man/html3/Xpresent.html -unknown- html,xorg ./usr/X11R7/man/html3/Xrandr.html -unknown- html,xorg ./usr/X11R7/man/html3/XrmEnumerateDatabase.html -unknown- html,xorg ./usr/X11R7/man/html3/XrmGetFileDatabase.html -unknown- html,xorg @@ -8914,6 +8920,7 @@ ./usr/X11R7/man/man3/XpStartDoc.3 -obsolete- obsolete
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Thu Jul 23 05:44:26 UTC 2015
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
add libXpresent.
To generate a diff of this commit:
cvs rdiff -u -r1.859 -r1.860 src/share/mk/bsd.own.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.own.mk
diff -u src/share/mk/bsd.own.mk:1.859 src/share/mk/bsd.own.mk:1.860
--- src/share/mk/bsd.own.mk:1.859 Sat Jun 27 16:21:07 2015
+++ src/share/mk/bsd.own.mk Thu Jul 23 05:44:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.859 2015/06/27 16:21:07 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.860 2015/07/23 05:44:26 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1263,7 +1263,7 @@ X11USRLIBDIR?= ${X11ROOTDIR}/lib${MLIBD
X11SRCDIRMIT?= ${X11SRCDIR}/external/mit
.for _lib in \
FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \
- Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xpm \
+ Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xpresent Xpm \
Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
fontenc xkbfile xkbui Xaw Xfontcache pciaccess xcb \
pthread-stubs
CVS import: xsrc/external/mit/xcb-proto/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 00:14:24 UTC 2015 Update of /cvsroot/xsrc/external/mit/xcb-proto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26224 Log Message: initial import of xcb-proto-1.11 Status: Vendor Tag: xorg Release Tags: xcb-proto-1-11 U xsrc/external/mit/xcb-proto/dist/Makefile.am U xsrc/external/mit/xcb-proto/dist/missing U xsrc/external/mit/xcb-proto/dist/xcb-proto.pc.in U xsrc/external/mit/xcb-proto/dist/configure U xsrc/external/mit/xcb-proto/dist/Makefile.in U xsrc/external/mit/xcb-proto/dist/NEWS U xsrc/external/mit/xcb-proto/dist/install-sh U xsrc/external/mit/xcb-proto/dist/TODO U xsrc/external/mit/xcb-proto/dist/autogen.sh U xsrc/external/mit/xcb-proto/dist/INSTALL U xsrc/external/mit/xcb-proto/dist/COPYING U xsrc/external/mit/xcb-proto/dist/README U xsrc/external/mit/xcb-proto/dist/py-compile U xsrc/external/mit/xcb-proto/dist/configure.ac U xsrc/external/mit/xcb-proto/dist/aclocal.m4 U xsrc/external/mit/xcb-proto/dist/src/screensaver.xml U xsrc/external/mit/xcb-proto/dist/src/xfixes.xml U xsrc/external/mit/xcb-proto/dist/src/xvmc.xml U xsrc/external/mit/xcb-proto/dist/src/Makefile.am U xsrc/external/mit/xcb-proto/dist/src/glx.xml U xsrc/external/mit/xcb-proto/dist/src/xc_misc.xml U xsrc/external/mit/xcb-proto/dist/src/xinput.xml U xsrc/external/mit/xcb-proto/dist/src/xinerama.xml U xsrc/external/mit/xcb-proto/dist/src/dpms.xml U xsrc/external/mit/xcb-proto/dist/src/shm.xml U xsrc/external/mit/xcb-proto/dist/src/xv.xml U xsrc/external/mit/xcb-proto/dist/src/dri3.xml U xsrc/external/mit/xcb-proto/dist/src/composite.xml U xsrc/external/mit/xcb-proto/dist/src/xprint.xml U xsrc/external/mit/xcb-proto/dist/src/res.xml U xsrc/external/mit/xcb-proto/dist/src/xevie.xml U xsrc/external/mit/xcb-proto/dist/src/xcb.xsd U xsrc/external/mit/xcb-proto/dist/src/dri2.xml U xsrc/external/mit/xcb-proto/dist/src/sync.xml U xsrc/external/mit/xcb-proto/dist/src/xf86vidmode.xml U xsrc/external/mit/xcb-proto/dist/src/xselinux.xml U xsrc/external/mit/xcb-proto/dist/src/Makefile.in U xsrc/external/mit/xcb-proto/dist/src/render.xml U xsrc/external/mit/xcb-proto/dist/src/shape.xml U xsrc/external/mit/xcb-proto/dist/src/damage.xml U xsrc/external/mit/xcb-proto/dist/src/xproto.xml U xsrc/external/mit/xcb-proto/dist/src/bigreq.xml U xsrc/external/mit/xcb-proto/dist/src/randr.xml U xsrc/external/mit/xcb-proto/dist/src/ge.xml U xsrc/external/mit/xcb-proto/dist/src/present.xml U xsrc/external/mit/xcb-proto/dist/src/xkb.xml U xsrc/external/mit/xcb-proto/dist/src/xtest.xml U xsrc/external/mit/xcb-proto/dist/src/record.xml U xsrc/external/mit/xcb-proto/dist/src/xf86dri.xml U xsrc/external/mit/xcb-proto/dist/xcbgen/matcher.py U xsrc/external/mit/xcb-proto/dist/xcbgen/Makefile.am U xsrc/external/mit/xcb-proto/dist/xcbgen/xtypes.py U xsrc/external/mit/xcb-proto/dist/xcbgen/Makefile.in U xsrc/external/mit/xcb-proto/dist/xcbgen/error.py U xsrc/external/mit/xcb-proto/dist/xcbgen/state.py U xsrc/external/mit/xcb-proto/dist/xcbgen/__init__.py U xsrc/external/mit/xcb-proto/dist/xcbgen/expr.py U xsrc/external/mit/xcb-proto/dist/doc/xml-xcb.txt No conflicts created by this import
CVS commit: xsrc/external/mit/libxcb/include
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 01:06:17 UTC 2015 Modified Files: xsrc/external/mit/libxcb/include: config.h Log Message: update for libxcb 1.11. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libxcb/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/libxcb/include/config.h diff -u xsrc/external/mit/libxcb/include/config.h:1.5 xsrc/external/mit/libxcb/include/config.h:1.6 --- xsrc/external/mit/libxcb/include/config.h:1.5 Mon Mar 17 03:08:52 2014 +++ xsrc/external/mit/libxcb/include/config.h Thu Jul 23 01:06:17 2015 @@ -69,13 +69,13 @@ #define PACKAGE libxcb /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT x...@lists.freedesktop.org +#define PACKAGE_BUGREPORT https://bugs.freedesktop.org/enter_bug.cgi?product=xcb; /* Define to the full name of this package. */ #define PACKAGE_NAME libxcb /* Define to the full name and version of this package. */ -#define PACKAGE_STRING libxcb 1.10 +#define PACKAGE_STRING libxcb 1.11 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME libxcb @@ -84,7 +84,16 @@ #define PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION 1.10 +#define PACKAGE_VERSION 1.11 + +/* Major version of this package */ +#define PACKAGE_VERSION_MAJOR 1 + +/* Minor version of this package */ +#define PACKAGE_VERSION_MINOR 11 + +/* Patch version of this package */ +#define PACKAGE_VERSION_PATCHLEVEL 0 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -115,7 +124,7 @@ /* Version number of package */ -#define VERSION 1.10 +#define VERSION 1.11 /* XCB buffer queue size */ #define XCB_QUEUE_BUFFER_SIZE 16384
CVS commit: src/external/mit/xorg/lib/libxcb
Module Name:src Committed By: mrg Date: Thu Jul 23 01:06:33 UTC 2015 Modified Files: src/external/mit/xorg/lib/libxcb/files: Makefile.xmlsrcs bigreq.c bigreq.h composite.c composite.h damage.c damage.h dpms.c dpms.h dri2.c dri2.h dri3.c dri3.h glx.c glx.h present.c present.h randr.c randr.h record.c record.h render.c render.h res.c res.h screensaver.c screensaver.h shape.c shape.h shm.c shm.h sync.c sync.h xc_misc.c xc_misc.h xevie.c xevie.h xf86dri.c xf86dri.h xfixes.c xfixes.h xinerama.c xinerama.h xinput.c xinput.h xkb.c xkb.h xprint.c xprint.h xproto.c xproto.h xselinux.c xselinux.h xtest.c xtest.h xv.c xv.h xvmc.c xvmc.h src/external/mit/xorg/lib/libxcb/libxcb: Makefile Removed Files: src/external/mit/xorg/lib/libxcb/files: xcb.h xcb_auth.c xcb_conn.c xcb_ext.c xcb_in.c xcb_list.c xcb_out.c xcb_util.c xcb_windefs.h xcb_xid.c xcbext.h xcbint.h Log Message: update for libxcb 1.11. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/lib/libxcb/files/Makefile.xmlsrcs \ src/external/mit/xorg/lib/libxcb/files/composite.h \ src/external/mit/xorg/lib/libxcb/files/damage.h \ src/external/mit/xorg/lib/libxcb/files/dpms.h \ src/external/mit/xorg/lib/libxcb/files/dri2.c \ src/external/mit/xorg/lib/libxcb/files/dri2.h \ src/external/mit/xorg/lib/libxcb/files/glx.c \ src/external/mit/xorg/lib/libxcb/files/glx.h \ src/external/mit/xorg/lib/libxcb/files/randr.c \ src/external/mit/xorg/lib/libxcb/files/randr.h \ src/external/mit/xorg/lib/libxcb/files/record.c \ src/external/mit/xorg/lib/libxcb/files/render.c \ src/external/mit/xorg/lib/libxcb/files/render.h \ src/external/mit/xorg/lib/libxcb/files/res.c \ src/external/mit/xorg/lib/libxcb/files/res.h \ src/external/mit/xorg/lib/libxcb/files/screensaver.c \ src/external/mit/xorg/lib/libxcb/files/screensaver.h \ src/external/mit/xorg/lib/libxcb/files/shape.c \ src/external/mit/xorg/lib/libxcb/files/shape.h \ src/external/mit/xorg/lib/libxcb/files/shm.c \ src/external/mit/xorg/lib/libxcb/files/shm.h \ src/external/mit/xorg/lib/libxcb/files/sync.c \ src/external/mit/xorg/lib/libxcb/files/sync.h \ src/external/mit/xorg/lib/libxcb/files/xc_misc.c \ src/external/mit/xorg/lib/libxcb/files/xevie.h \ src/external/mit/xorg/lib/libxcb/files/xf86dri.c \ src/external/mit/xorg/lib/libxcb/files/xfixes.c \ src/external/mit/xorg/lib/libxcb/files/xfixes.h \ src/external/mit/xorg/lib/libxcb/files/xinerama.c \ src/external/mit/xorg/lib/libxcb/files/xinput.c \ src/external/mit/xorg/lib/libxcb/files/xinput.h \ src/external/mit/xorg/lib/libxcb/files/xproto.c \ src/external/mit/xorg/lib/libxcb/files/xproto.h \ src/external/mit/xorg/lib/libxcb/files/xselinux.c \ src/external/mit/xorg/lib/libxcb/files/xtest.h \ src/external/mit/xorg/lib/libxcb/files/xv.c \ src/external/mit/xorg/lib/libxcb/files/xv.h \ src/external/mit/xorg/lib/libxcb/files/xvmc.c cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libxcb/files/bigreq.c \ src/external/mit/xorg/lib/libxcb/files/bigreq.h \ src/external/mit/xorg/lib/libxcb/files/composite.c \ src/external/mit/xorg/lib/libxcb/files/damage.c \ src/external/mit/xorg/lib/libxcb/files/dpms.c \ src/external/mit/xorg/lib/libxcb/files/record.h \ src/external/mit/xorg/lib/libxcb/files/xc_misc.h \ src/external/mit/xorg/lib/libxcb/files/xevie.c \ src/external/mit/xorg/lib/libxcb/files/xf86dri.h \ src/external/mit/xorg/lib/libxcb/files/xinerama.h \ src/external/mit/xorg/lib/libxcb/files/xkb.c \ src/external/mit/xorg/lib/libxcb/files/xkb.h \ src/external/mit/xorg/lib/libxcb/files/xprint.c \ src/external/mit/xorg/lib/libxcb/files/xselinux.h \ src/external/mit/xorg/lib/libxcb/files/xtest.c \ src/external/mit/xorg/lib/libxcb/files/xvmc.h cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libxcb/files/dri3.c \ src/external/mit/xorg/lib/libxcb/files/dri3.h \ src/external/mit/xorg/lib/libxcb/files/present.c \ src/external/mit/xorg/lib/libxcb/files/present.h \ src/external/mit/xorg/lib/libxcb/files/xprint.h cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/libxcb/files/xcb.h \ src/external/mit/xorg/lib/libxcb/files/xcb_conn.c \ src/external/mit/xorg/lib/libxcb/files/xcb_in.c \ src/external/mit/xorg/lib/libxcb/files/xcb_list.c \ src/external/mit/xorg/lib/libxcb/files/xcb_out.c \ src/external/mit/xorg/lib/libxcb/files/xcb_util.c \ src/external/mit/xorg/lib/libxcb/files/xcbext.h \ src/external/mit/xorg/lib/libxcb/files/xcbint.h cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/libxcb/files/xcb_auth.c \ src/external/mit/xorg/lib/libxcb/files/xcb_ext.c \ src/external/mit/xorg/lib/libxcb/files/xcb_windefs.h \
CVS import: xsrc/external/mit/libxcb/dist
Module Name:xsrc Committed By: mrg Date: Thu Jul 23 00:54:07 UTC 2015 Update of /cvsroot/xsrc/external/mit/libxcb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13120 Log Message: initial import of libxcb-1.11 Status: Vendor Tag: xorg Release Tags: libxcb-1-11 U xsrc/external/mit/libxcb/dist/xcb-xtest.pc.in U xsrc/external/mit/libxcb/dist/xcb.pc.in U xsrc/external/mit/libxcb/dist/Makefile.am U xsrc/external/mit/libxcb/dist/compile U xsrc/external/mit/libxcb/dist/missing U xsrc/external/mit/libxcb/dist/config.sub N xsrc/external/mit/libxcb/dist/check-pc-requires U xsrc/external/mit/libxcb/dist/xcb-xevie.pc.in U xsrc/external/mit/libxcb/dist/xcb-render.pc.in U xsrc/external/mit/libxcb/dist/xcb-res.pc.in U xsrc/external/mit/libxcb/dist/xcb-damage.pc.in U xsrc/external/mit/libxcb/dist/xcb-record.pc.in U xsrc/external/mit/libxcb/dist/xcb-xinerama.pc.in U xsrc/external/mit/libxcb/dist/xcb-xvmc.pc.in U xsrc/external/mit/libxcb/dist/xcb-randr.pc.in U xsrc/external/mit/libxcb/dist/xcb-dpms.pc.in U xsrc/external/mit/libxcb/dist/configure U xsrc/external/mit/libxcb/dist/Makefile.in U xsrc/external/mit/libxcb/dist/xcb-shm.pc.in U xsrc/external/mit/libxcb/dist/NEWS U xsrc/external/mit/libxcb/dist/xcb-xv.pc.in U xsrc/external/mit/libxcb/dist/xcb-xkb.pc.in U xsrc/external/mit/libxcb/dist/install-sh U xsrc/external/mit/libxcb/dist/xcb-present.pc.in U xsrc/external/mit/libxcb/dist/xcb-sync.pc.in U xsrc/external/mit/libxcb/dist/xcb-dri2.pc.in U xsrc/external/mit/libxcb/dist/config.guess U xsrc/external/mit/libxcb/dist/xcb-glx.pc.in U xsrc/external/mit/libxcb/dist/autogen.sh U xsrc/external/mit/libxcb/dist/xcb-screensaver.pc.in U xsrc/external/mit/libxcb/dist/INSTALL U xsrc/external/mit/libxcb/dist/depcomp U xsrc/external/mit/libxcb/dist/COPYING U xsrc/external/mit/libxcb/dist/README U xsrc/external/mit/libxcb/dist/xcb-xf86dri.pc.in U xsrc/external/mit/libxcb/dist/xcb-xprint.pc.in U xsrc/external/mit/libxcb/dist/xcb-xinput.pc.in U xsrc/external/mit/libxcb/dist/xcb-composite.pc.in U xsrc/external/mit/libxcb/dist/xcb-xselinux.pc.in U xsrc/external/mit/libxcb/dist/xcb-xfixes.pc.in U xsrc/external/mit/libxcb/dist/ltmain.sh U xsrc/external/mit/libxcb/dist/xcb-shape.pc.in U xsrc/external/mit/libxcb/dist/xcb-dri3.pc.in U xsrc/external/mit/libxcb/dist/configure.ac U xsrc/external/mit/libxcb/dist/aclocal.m4 U xsrc/external/mit/libxcb/dist/src/xcb_windefs.h U xsrc/external/mit/libxcb/dist/src/xcb_xid.c U xsrc/external/mit/libxcb/dist/src/xcb_out.c U xsrc/external/mit/libxcb/dist/src/Makefile.am U xsrc/external/mit/libxcb/dist/src/xcb_list.c U xsrc/external/mit/libxcb/dist/src/c_client.py U xsrc/external/mit/libxcb/dist/src/xcbint.h U xsrc/external/mit/libxcb/dist/src/Makefile.in C xsrc/external/mit/libxcb/dist/src/xcb_in.c U xsrc/external/mit/libxcb/dist/src/xcb_ext.c U xsrc/external/mit/libxcb/dist/src/xcbext.h U xsrc/external/mit/libxcb/dist/src/xcb_auth.c U xsrc/external/mit/libxcb/dist/src/xcb.h U xsrc/external/mit/libxcb/dist/src/xcb_conn.c U xsrc/external/mit/libxcb/dist/src/xcb_util.c U xsrc/external/mit/libxcb/dist/src/config.h.in U xsrc/external/mit/libxcb/dist/tools/constants U xsrc/external/mit/libxcb/dist/tools/api_conv.pl U xsrc/external/mit/libxcb/dist/tools/README U xsrc/external/mit/libxcb/dist/build-aux/config.sub U xsrc/external/mit/libxcb/dist/build-aux/compile U xsrc/external/mit/libxcb/dist/build-aux/missing U xsrc/external/mit/libxcb/dist/build-aux/install-sh U xsrc/external/mit/libxcb/dist/build-aux/config.guess U xsrc/external/mit/libxcb/dist/build-aux/depcomp U xsrc/external/mit/libxcb/dist/build-aux/ltmain.sh U xsrc/external/mit/libxcb/dist/build-aux/test-driver N xsrc/external/mit/libxcb/dist/man/xcb-examples.man N xsrc/external/mit/libxcb/dist/man/Makefile.am N xsrc/external/mit/libxcb/dist/man/Makefile.in N xsrc/external/mit/libxcb/dist/man/xcb-requests.man U xsrc/external/mit/libxcb/dist/m4/lt~obsolete.m4 U xsrc/external/mit/libxcb/dist/m4/ltoptions.m4 U xsrc/external/mit/libxcb/dist/m4/xcb.m4 U xsrc/external/mit/libxcb/dist/m4/ltversion.m4 U xsrc/external/mit/libxcb/dist/m4/libtool.m4 U xsrc/external/mit/libxcb/dist/m4/ltsugar.m4 U xsrc/external/mit/libxcb/dist/tests/check_public.c U xsrc/external/mit/libxcb/dist/tests/CheckLog.xsl U xsrc/external/mit/libxcb/dist/tests/Makefile.am U xsrc/external/mit/libxcb/dist/tests/check_suites.h U xsrc/external/mit/libxcb/dist/tests/check_all.c U xsrc/external/mit/libxcb/dist/tests/Makefile.in U xsrc/external/mit/libxcb/dist/doc/Makefile.am U xsrc/external/mit/libxcb/dist/doc/xcb.doxygen.in U xsrc/external/mit/libxcb/dist/doc/Makefile.in U xsrc/external/mit/libxcb/dist/doc/xkb_issues U xsrc/external/mit/libxcb/dist/doc/xkb_internals U xsrc/external/mit/libxcb/dist/doc/tutorial/index.html U xsrc/external/mit/libxcb/dist/doc/tutorial/xcb.css 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libxcb/dist
CVS commit: src/sys/arch/evbarm/beagle
Module Name:src Committed By: maxv Date: Wed Jul 22 14:10:45 UTC 2015 Modified Files: src/sys/arch/evbarm/beagle: beagle_machdep.c Log Message: Double compiler branch. Found by Brainy To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/evbarm/beagle/beagle_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/evbarm/beagle/beagle_machdep.c diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.60 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.61 --- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.60 Mon Jul 21 22:17:44 2014 +++ src/sys/arch/evbarm/beagle/beagle_machdep.c Wed Jul 22 14:10:45 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: beagle_machdep.c,v 1.60 2014/07/21 22:17:44 riz Exp $ */ +/* $NetBSD: beagle_machdep.c,v 1.61 2015/07/22 14:10:45 maxv Exp $ */ /* * Machine dependent functions for kernel setup for TI OSK5912 board. @@ -125,7 +125,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: beagle_machdep.c,v 1.60 2014/07/21 22:17:44 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: beagle_machdep.c,v 1.61 2015/07/22 14:10:45 maxv Exp $); #include opt_machdep.h #include opt_ddb.h @@ -697,7 +697,6 @@ beagle_reset(void) *(volatile uint32_t *)(OMAP_L4_CORE_VBASE + (OMAP_L4_WAKEUP_BASE - OMAP_L4_CORE_BASE) + OMAP4_PRM_RSTCTRL) = OMAP4_PRM_RSTCTRL_WARM; #elif defined(OMAP_5XXX) *(volatile uint32_t *)(OMAP_L4_CORE_VBASE + (OMAP_L4_WAKEUP_BASE - OMAP_L4_CORE_BASE) + OMAP5_PRM_RSTCTRL) = OMAP4_PRM_RSTCTRL_COLD; -#elif defined(OMAP_5XXX) #elif defined(TI_AM335X) *(volatile uint32_t *)(OMAP_L4_CORE_VBASE + (OMAP2_CM_BASE - OMAP_L4_CORE_BASE) + AM335X_PRCM_PRM_DEVICE + PRM_RSTCTRL) = RST_GLOBAL_WARM_SW; #else
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: maxv
Date: Wed Jul 22 14:25:39 UTC 2015
Modified Files:
src/sys/compat/netbsd32: netbsd32_socket.c
Log Message:
Memory leak, triggerable from an unprivileged user.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/compat/netbsd32/netbsd32_socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_socket.c
diff -u src/sys/compat/netbsd32/netbsd32_socket.c:1.41 src/sys/compat/netbsd32/netbsd32_socket.c:1.42
--- src/sys/compat/netbsd32/netbsd32_socket.c:1.41 Sat Aug 18 15:25:15 2012
+++ src/sys/compat/netbsd32/netbsd32_socket.c Wed Jul 22 14:25:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_socket.c,v 1.41 2012/08/18 15:25:15 martin Exp $ */
+/* $NetBSD: netbsd32_socket.c,v 1.42 2015/07/22 14:25:39 maxv Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_socket.c,v 1.41 2012/08/18 15:25:15 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_socket.c,v 1.42 2015/07/22 14:25:39 maxv Exp $);
#include sys/param.h
#include sys/systm.h
@@ -331,7 +331,7 @@ netbsd32_sendmsg(struct lwp *l, const st
} */
struct msghdr msg;
struct netbsd32_msghdr msg32;
- struct iovec aiov[UIO_SMALLIOV], *iov;
+ struct iovec aiov[UIO_SMALLIOV], *iov = aiov;
struct netbsd32_iovec *iov32;
size_t iovsz;
int error;
@@ -346,6 +346,7 @@ netbsd32_sendmsg(struct lwp *l, const st
error = copyin32_msg_control(l, msg);
if (error)
return (error);
+ /* From here on, msg.msg_control is allocated */
} else {
msg.msg_control = NULL;
msg.msg_controllen = 0;
@@ -353,23 +354,32 @@ netbsd32_sendmsg(struct lwp *l, const st
iovsz = msg.msg_iovlen * sizeof(struct iovec);
if ((u_int)msg.msg_iovlen UIO_SMALLIOV) {
- if ((u_int)msg.msg_iovlen IOV_MAX)
- return (EMSGSIZE);
+ if ((u_int)msg.msg_iovlen IOV_MAX) {
+ error = EMSGSIZE;
+ goto out;
+ }
iov = kmem_alloc(iovsz, KM_SLEEP);
- } else
- iov = aiov;
+ }
iov32 = NETBSD32PTR64(msg32.msg_iov);
error = netbsd32_to_iovecin(iov32, iov, msg.msg_iovlen);
if (error)
- goto done;
+ goto out;
msg.msg_iov = iov;
error = do_sys_sendmsg(l, SCARG(uap, s), msg, SCARG(uap, flags), retval);
-done:
+ /* msg.msg_control freed by do_sys_sendmsg() */
+
if (iov != aiov)
kmem_free(iov, iovsz);
return (error);
+
+out:
+ if (iov != aiov)
+ kmem_free(iov, iovsz);
+ if (msg.msg_control)
+ m_free(msg.msg_control);
+ return error;
}
int
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: maxv Date: Wed Jul 22 14:06:26 UTC 2015 Modified Files: src/sys/compat/netbsd32: netbsd32_time.c Log Message: Set 'error' properly. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/compat/netbsd32/netbsd32_time.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/netbsd32/netbsd32_time.c diff -u src/sys/compat/netbsd32/netbsd32_time.c:1.44 src/sys/compat/netbsd32/netbsd32_time.c:1.45 --- src/sys/compat/netbsd32/netbsd32_time.c:1.44 Fri Jul 17 06:42:48 2015 +++ src/sys/compat/netbsd32/netbsd32_time.c Wed Jul 22 14:06:26 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_time.c,v 1.44 2015/07/17 06:42:48 skrll Exp $ */ +/* $NetBSD: netbsd32_time.c,v 1.45 2015/07/22 14:06:26 maxv Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_time.c,v 1.44 2015/07/17 06:42:48 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: netbsd32_time.c,v 1.45 2015/07/22 14:06:26 maxv Exp $); #if defined(_KERNEL_OPT) #include opt_ntp.h @@ -323,7 +323,7 @@ netbsd32___adjtime50(struct lwp *l, cons atv.tv_usec += 100; atv.tv_sec--; } - (void) copyout(atv, SCARG_P32(uap, olddelta), sizeof(atv)); + error = copyout(atv, SCARG_P32(uap, olddelta), sizeof(atv)); if (error) return (error); }
CVS commit: src/sys/kern
Module Name:src
Committed By: maxv
Date: Wed Jul 22 14:18:08 UTC 2015
Modified Files:
src/sys/kern: uipc_syscalls.c
Log Message:
Memory leak. Triggerable from an unprivileged user via COMPAT_43.
To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/sys/kern/uipc_syscalls.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/uipc_syscalls.c
diff -u src/sys/kern/uipc_syscalls.c:1.178 src/sys/kern/uipc_syscalls.c:1.179
--- src/sys/kern/uipc_syscalls.c:1.178 Sat May 9 15:22:47 2015
+++ src/sys/kern/uipc_syscalls.c Wed Jul 22 14:18:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls.c,v 1.178 2015/05/09 15:22:47 rtr Exp $ */
+/* $NetBSD: uipc_syscalls.c,v 1.179 2015/07/22 14:18:08 maxv Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_syscalls.c,v 1.178 2015/05/09 15:22:47 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_syscalls.c,v 1.179 2015/07/22 14:18:08 maxv Exp $);
#include opt_pipe.h
@@ -659,9 +659,16 @@ do_sys_sendmsg(struct lwp *l, int s, str
struct socket *so;
file_t *fp;
- if ((error = fd_getsock1(s, so, fp)) != 0)
+ if ((error = fd_getsock1(s, so, fp)) != 0) {
+ /* We have to free msg_name and msg_control ourselves */
+ if (mp-msg_flags MSG_NAMEMBUF)
+ m_freem(mp-msg_name);
+ if (mp-msg_flags MSG_CONTROLMBUF)
+ m_freem(mp-msg_control);
return error;
+ }
error = do_sys_sendmsg_so(l, s, so, fp, mp, flags, retsize);
+ /* msg_name and msg_control freed */
fd_putfile(s);
return error;
}
