Module Name: xsrc
Committed By: martin
Date: Wed Oct 4 12:29:56 UTC 2023
Modified Files:
xsrc/external/mit/libX11/dist [netbsd-10]: ChangeLog README.md
configure configure.ac
xsrc/external/mit/libX11/dist/include/X11 [netbsd-10]: Xutil.h
xsrc/external/mit/libX11/dist/man/xkb [netbsd-10]: Makefile.am
Makefile.in XkbAllocDeviceInfo.man XkbChangeControls.man
XkbGetKeyTypes.man
xsrc/external/mit/libX11/dist/nls/am_ET.UTF-8 [netbsd-10]: Compose.pre
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8 [netbsd-10]: Compose.pre
xsrc/external/mit/libX11/dist/specs/XKB [netbsd-10]: ch08.xml ch10.xml
ch15.xml ch16.xml ch18.xml ch21.xml
xsrc/external/mit/libX11/dist/src [netbsd-10]: CrPixmap.c ImUtil.c
OpenDis.c PutImage.c
xsrc/external/mit/libX11/dist/src/xkb [netbsd-10]: XKBGetMap.c
xsrc/external/mit/libXpm/dist [netbsd-10]: ChangeLog Makefile.in
aclocal.m4 compile config.guess config.h.in config.sub configure
configure.ac depcomp install-sh ltmain.sh missing tap-driver.sh
test-driver
xsrc/external/mit/libXpm/dist/cxpm [netbsd-10]: Makefile.in
xsrc/external/mit/libXpm/dist/doc [netbsd-10]: Makefile.in
xsrc/external/mit/libXpm/dist/include [netbsd-10]: Makefile.in
xsrc/external/mit/libXpm/dist/include/X11 [netbsd-10]: xpm.h
xsrc/external/mit/libXpm/dist/m4 [netbsd-10]: libtool.m4 ltoptions.m4
ltsugar.m4 ltversion.m4 lt~obsolete.m4
xsrc/external/mit/libXpm/dist/man [netbsd-10]: Makefile.in
xsrc/external/mit/libXpm/dist/src [netbsd-10]: CrDatFrI.c CrPFrBuf.c
CrPFrDat.c CrPFrI.c Makefile.in RdFToBuf.c RdFToI.c RdFToP.c
WrFFrBuf.c WrFFrI.c XpmI.h create.c data.c parse.c rgb.c
xsrc/external/mit/libXpm/dist/sxpm [netbsd-10]: Makefile.in
xsrc/external/mit/libXpm/dist/test [netbsd-10]: Makefile.am Makefile.in
TestAllFiles.h XpmCreate.c XpmMisc.c XpmRead.c XpmWrite.c
Added Files:
xsrc/external/mit/libX11/dist/man/xkb [netbsd-10]:
XkbActionSetCtrls.man XkbKeyKeyType.man XkbKeyKeyTypeIndex.man
xsrc/external/mit/libXpm/dist/test [netbsd-10]: rgb.c rgb.txt
Removed Files:
xsrc/external/mit/libX11/dist/man/xkb [netbsd-10]:
XkbAllocDeviceLedInfo.man XkbChangeIndicators.man
XkbGetAccessXTimeout.man XkbGetBounceKeysDelay.man
XkbGetIndicatorChanges.man XkbGetNameChanges.man
XkbGetSlowKeysDelay.man XkbGetStickyKeysOptions.man
XkbKeySymsOffset.man XkbKeyType.man XkbKeyTypeIndex.man
XkbNoteIndicatorChanges.man XkbSAActionSetCtrls.man
XkbSetAccessXTimeout.man XkbSetBounceKeysDelay.man
Log Message:
Sync to to HEAD, requested by mrg in #392:
external/mit/libX11/dist/man/xkb/XkbKeyKeyTypeIndex.man up to 1.1.1.1
external/mit/libX11/dist/man/xkb/XkbKeyKeyType.man up to 1.1.1.1
external/mit/libX11/dist/man/xkb/XkbActionSetCtrls.man up to 1.1.1.1
external/mit/libX11/dist/man/xkb/XkbAllocDeviceLedInfo.man delete
external/mit/libX11/dist/man/xkb/XkbChangeIndicators.man delete
external/mit/libX11/dist/man/xkb/XkbGetAccessXTimeout.man delete
external/mit/libX11/dist/man/xkb/XkbGetBounceKeysDelay.man delete
external/mit/libX11/dist/man/xkb/XkbGetIndicatorChanges.man delete
external/mit/libX11/dist/man/xkb/XkbGetNameChanges.man delete
external/mit/libX11/dist/man/xkb/XkbGetSlowKeysDelay.man delete
external/mit/libX11/dist/man/xkb/XkbGetStickyKeysOptions.man delete
external/mit/libX11/dist/man/xkb/XkbKeySymsOffset.man delete
external/mit/libX11/dist/man/xkb/XkbKeyType.man delete
external/mit/libX11/dist/man/xkb/XkbKeyTypeIndex.man delete
external/mit/libX11/dist/man/xkb/XkbNoteIndicatorChanges.man delete
external/mit/libX11/dist/man/xkb/XkbSAActionSetCtrls.man delete
external/mit/libX11/dist/man/xkb/XkbSetAccessXTimeout.man delete
external/mit/libX11/dist/man/xkb/XkbSetBounceKeysDelay.man delete
external/mit/libX11/dist/ChangeLog up to 1.6
external/mit/libX11/dist/README.md up to 1.5
external/mit/libX11/dist/configure up to 1.6
external/mit/libX11/dist/configure.ac up to 1.6
external/mit/libX11/dist/include/X11/Xutil.h up to 1.1.1.6
external/mit/libX11/dist/man/xkb/Makefile.am up to 1.1.1.7
external/mit/libX11/dist/man/xkb/Makefile.in up to 1.1.1.27
external/mit/libX11/dist/man/xkb/XkbAllocDeviceInfo.man up to 1.1.1.6
external/mit/libX11/dist/man/xkb/XkbChangeControls.man up to 1.1.1.7
external/mit/libX11/dist/man/xkb/XkbGetKeyTypes.man up to 1.1.1.5
external/mit/libX11/dist/nls/am_ET.UTF-8/Compose.pre up to 1.1.1.5
external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre up to 1.13
external/mit/libX11/dist/specs/XKB/ch08.xml up to 1.1.1.5
external/mit/libX11/dist/specs/XKB/ch10.xml up to 1.1.1.4
external/mit/libX11/dist/specs/XKB/ch15.xml up to 1.1.1.4
external/mit/libX11/dist/specs/XKB/ch16.xml up to 1.1.1.4
external/mit/libX11/dist/specs/XKB/ch18.xml up to 1.1.1.4
external/mit/libX11/dist/specs/XKB/ch21.xml up to 1.1.1.4
external/mit/libX11/dist/src/CrPixmap.c up to 1.1.1.3
external/mit/libX11/dist/src/ImUtil.c up to 1.1.1.10
external/mit/libX11/dist/src/OpenDis.c up to 1.4
external/mit/libX11/dist/src/PutImage.c up to 1.1.1.10
external/mit/libX11/dist/src/xkb/XKBGetMap.c up to 1.1.1.8
external/mit/libXpm/dist/test/rgb.txt up to 1.1.1.1
external/mit/libXpm/dist/test/rgb.c up to 1.1.1.2
external/mit/libXpm/dist/ChangeLog up to 1.1.1.11
external/mit/libXpm/dist/Makefile.in up to 1.1.1.10
external/mit/libXpm/dist/aclocal.m4 up to 1.1.1.11
external/mit/libXpm/dist/compile up to 1.1.1.5
external/mit/libXpm/dist/config.guess up to 1.1.1.9
external/mit/libXpm/dist/config.h.in up to 1.1.1.8
external/mit/libXpm/dist/config.sub up to 1.1.1.10
external/mit/libXpm/dist/configure up to 1.1.1.11
external/mit/libXpm/dist/configure.ac up to 1.1.1.11
external/mit/libXpm/dist/depcomp up to 1.1.1.7
external/mit/libXpm/dist/install-sh up to 1.1.1.7
external/mit/libXpm/dist/ltmain.sh up to 1.1.1.11
external/mit/libXpm/dist/missing up to 1.1.1.8
external/mit/libXpm/dist/tap-driver.sh up to 1.1.1.2
external/mit/libXpm/dist/test-driver up to 1.1.1.2
external/mit/libXpm/dist/cxpm/Makefile.in up to 1.1.1.10
external/mit/libXpm/dist/doc/Makefile.in up to 1.1.1.8
external/mit/libXpm/dist/include/Makefile.in up to 1.1.1.8
external/mit/libXpm/dist/include/X11/xpm.h up to 1.1.1.4
external/mit/libXpm/dist/m4/libtool.m4 up to 1.1.1.6
external/mit/libXpm/dist/m4/ltoptions.m4 up to 1.1.1.5
external/mit/libXpm/dist/m4/ltsugar.m4 up to 1.1.1.5
external/mit/libXpm/dist/m4/ltversion.m4 up to 1.1.1.5
external/mit/libXpm/dist/m4/lt~obsolete.m4 up to 1.1.1.5
external/mit/libXpm/dist/man/Makefile.in up to 1.1.1.7
external/mit/libXpm/dist/src/CrDatFrI.c up to 1.1.1.6
external/mit/libXpm/dist/src/CrPFrBuf.c up to 1.1.1.3
external/mit/libXpm/dist/src/CrPFrDat.c up to 1.1.1.3
external/mit/libXpm/dist/src/CrPFrI.c up to 1.1.1.3
external/mit/libXpm/dist/src/Makefile.in up to 1.1.1.10
external/mit/libXpm/dist/src/RdFToBuf.c up to 1.1.1.7
external/mit/libXpm/dist/src/RdFToI.c up to 1.1.1.7
external/mit/libXpm/dist/src/RdFToP.c up to 1.1.1.4
external/mit/libXpm/dist/src/WrFFrBuf.c up to 1.1.1.5
external/mit/libXpm/dist/src/WrFFrI.c up to 1.1.1.9
external/mit/libXpm/dist/src/XpmI.h up to 1.1.1.6
external/mit/libXpm/dist/src/create.c up to 1.7
external/mit/libXpm/dist/src/data.c up to 1.1.1.6
external/mit/libXpm/dist/src/parse.c up to 1.1.1.9
external/mit/libXpm/dist/src/rgb.c up to 1.1.1.5
external/mit/libXpm/dist/sxpm/Makefile.in up to 1.1.1.10
external/mit/libXpm/dist/test/Makefile.am up to 1.1.1.2
external/mit/libXpm/dist/test/Makefile.in up to 1.1.1.2
external/mit/libXpm/dist/test/TestAllFiles.h up to 1.1.1.3
external/mit/libXpm/dist/test/XpmCreate.c up to 1.1.1.2
external/mit/libXpm/dist/test/XpmMisc.c up to 1.1.1.2
external/mit/libXpm/dist/test/XpmRead.c up to 1.1.1.3
external/mit/libXpm/dist/test/XpmWrite.c up to 1.1.1.3
Fix these CVEs (though cvs.mitre.org says they're rejected):
CVE-2023-43785 libX11: out-of-bounds memory access in _XkbReadKeySyms()
CVE-2023-43786 libX11: stack exhaustion from infinite recursion in
PutSubImage()
CVE-2023-43787 libX11: integer overflow in XCreateImage() leading to a
heap overflow
CVE-2023-43788 libXpm: out of bounds read in XpmCreateXpmImageFromBuffer()
CVE-2023-43789 libXpm: out of bounds read on XPM with corrupted colormap
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.27.2.5 -r1.1.1.27.2.6 \
xsrc/external/mit/libX11/dist/ChangeLog \
xsrc/external/mit/libX11/dist/configure \
xsrc/external/mit/libX11/dist/configure.ac
cvs rdiff -u -r1.1.1.7.2.4 -r1.1.1.7.2.5 \
xsrc/external/mit/libX11/dist/README.md
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.14.1 \
xsrc/external/mit/libX11/dist/include/X11/Xutil.h
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.4.1 \
xsrc/external/mit/libX11/dist/man/xkb/Makefile.am
cvs rdiff -u -r1.1.1.24.2.2 -r1.1.1.24.2.3 \
xsrc/external/mit/libX11/dist/man/xkb/Makefile.in
cvs rdiff -u -r0 -r1.1.1.1.2.2 \
xsrc/external/mit/libX11/dist/man/xkb/XkbActionSetCtrls.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbKeyKeyType.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbKeyKeyTypeIndex.man
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.2.1 \
xsrc/external/mit/libX11/dist/man/xkb/XkbAllocDeviceInfo.man
cvs rdiff -u -r1.1.1.5 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbAllocDeviceLedInfo.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbChangeIndicators.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetIndicatorChanges.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetStickyKeysOptions.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbKeyType.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbNoteIndicatorChanges.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbSetAccessXTimeout.man
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.2.1 \
xsrc/external/mit/libX11/dist/man/xkb/XkbChangeControls.man
cvs rdiff -u -r1.1.1.6 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetAccessXTimeout.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbSAActionSetCtrls.man
cvs rdiff -u -r1.1.1.7 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetBounceKeysDelay.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetSlowKeysDelay.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbSetBounceKeysDelay.man
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetKeyTypes.man
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/libX11/dist/man/xkb/XkbGetNameChanges.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbKeySymsOffset.man \
xsrc/external/mit/libX11/dist/man/xkb/XkbKeyTypeIndex.man
cvs rdiff -u -r1.1.1.3.2.1 -r1.1.1.3.2.2 \
xsrc/external/mit/libX11/dist/nls/am_ET.UTF-8/Compose.pre
cvs rdiff -u -r1.10.2.2 -r1.10.2.3 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.4.1 \
xsrc/external/mit/libX11/dist/specs/XKB/ch08.xml
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.6.1 \
xsrc/external/mit/libX11/dist/specs/XKB/ch10.xml \
xsrc/external/mit/libX11/dist/specs/XKB/ch15.xml \
xsrc/external/mit/libX11/dist/specs/XKB/ch16.xml \
xsrc/external/mit/libX11/dist/specs/XKB/ch18.xml \
xsrc/external/mit/libX11/dist/specs/XKB/ch21.xml
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.20.1 \
xsrc/external/mit/libX11/dist/src/CrPixmap.c
cvs rdiff -u -r1.1.1.9 -r1.1.1.9.2.1 \
xsrc/external/mit/libX11/dist/src/ImUtil.c \
xsrc/external/mit/libX11/dist/src/PutImage.c
cvs rdiff -u -r1.1.1.14.2.3 -r1.1.1.14.2.4 \
xsrc/external/mit/libX11/dist/src/OpenDis.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.4.1 \
xsrc/external/mit/libX11/dist/src/xkb/XKBGetMap.c
cvs rdiff -u -r1.1.1.7.2.1 -r1.1.1.7.2.2 \
xsrc/external/mit/libXpm/dist/ChangeLog \
xsrc/external/mit/libXpm/dist/Makefile.in \
xsrc/external/mit/libXpm/dist/aclocal.m4 \
xsrc/external/mit/libXpm/dist/configure \
xsrc/external/mit/libXpm/dist/configure.ac \
xsrc/external/mit/libXpm/dist/ltmain.sh
cvs rdiff -u -r1.1.1.2.2.1 -r1.1.1.2.2.2 \
xsrc/external/mit/libXpm/dist/compile
cvs rdiff -u -r1.1.1.5.2.1 -r1.1.1.5.2.2 \
xsrc/external/mit/libXpm/dist/config.guess \
xsrc/external/mit/libXpm/dist/missing
cvs rdiff -u -r1.1.1.4.2.1 -r1.1.1.4.2.2 \
xsrc/external/mit/libXpm/dist/config.h.in \
xsrc/external/mit/libXpm/dist/depcomp \
xsrc/external/mit/libXpm/dist/install-sh
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXpm/dist/config.sub
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \
xsrc/external/mit/libXpm/dist/tap-driver.sh \
xsrc/external/mit/libXpm/dist/test-driver
cvs rdiff -u -r1.1.1.7.2.1 -r1.1.1.7.2.2 \
xsrc/external/mit/libXpm/dist/cxpm/Makefile.in
cvs rdiff -u -r1.1.1.5.2.1 -r1.1.1.5.2.2 \
xsrc/external/mit/libXpm/dist/doc/Makefile.in
cvs rdiff -u -r1.1.1.5.2.1 -r1.1.1.5.2.2 \
xsrc/external/mit/libXpm/dist/include/Makefile.in
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.12.1 \
xsrc/external/mit/libXpm/dist/include/X11/xpm.h
cvs rdiff -u -r1.1.1.2.2.1 -r1.1.1.2.2.2 \
xsrc/external/mit/libXpm/dist/m4/libtool.m4
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \
xsrc/external/mit/libXpm/dist/m4/ltoptions.m4 \
xsrc/external/mit/libXpm/dist/m4/ltsugar.m4 \
xsrc/external/mit/libXpm/dist/m4/ltversion.m4 \
xsrc/external/mit/libXpm/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.1.1.4.2.1 -r1.1.1.4.2.2 \
xsrc/external/mit/libXpm/dist/man/Makefile.in
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.2.1 \
xsrc/external/mit/libXpm/dist/src/CrDatFrI.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.20.1 \
xsrc/external/mit/libXpm/dist/src/CrPFrBuf.c \
xsrc/external/mit/libXpm/dist/src/CrPFrDat.c \
xsrc/external/mit/libXpm/dist/src/CrPFrI.c
cvs rdiff -u -r1.1.1.7.2.1 -r1.1.1.7.2.2 \
xsrc/external/mit/libXpm/dist/src/Makefile.in
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.2.1 \
xsrc/external/mit/libXpm/dist/src/RdFToBuf.c
cvs rdiff -u -r1.1.1.4.12.1 -r1.1.1.4.12.2 \
xsrc/external/mit/libXpm/dist/src/RdFToI.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.12.1 \
xsrc/external/mit/libXpm/dist/src/RdFToP.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.6.1 \
xsrc/external/mit/libXpm/dist/src/WrFFrBuf.c
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXpm/dist/src/WrFFrI.c \
xsrc/external/mit/libXpm/dist/src/parse.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 xsrc/external/mit/libXpm/dist/src/XpmI.h
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 xsrc/external/mit/libXpm/dist/src/create.c
cvs rdiff -u -r1.1.1.4.14.1 -r1.1.1.4.14.2 \
xsrc/external/mit/libXpm/dist/src/data.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.14.1 xsrc/external/mit/libXpm/dist/src/rgb.c
cvs rdiff -u -r1.1.1.7.2.1 -r1.1.1.7.2.2 \
xsrc/external/mit/libXpm/dist/sxpm/Makefile.in
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \
xsrc/external/mit/libXpm/dist/test/Makefile.am \
xsrc/external/mit/libXpm/dist/test/Makefile.in \
xsrc/external/mit/libXpm/dist/test/TestAllFiles.h \
xsrc/external/mit/libXpm/dist/test/XpmCreate.c \
xsrc/external/mit/libXpm/dist/test/XpmMisc.c \
xsrc/external/mit/libXpm/dist/test/XpmRead.c \
xsrc/external/mit/libXpm/dist/test/XpmWrite.c
cvs rdiff -u -r0 -r1.1.1.2.2.2 xsrc/external/mit/libXpm/dist/test/rgb.c
cvs rdiff -u -r0 -r1.1.1.1.2.2 xsrc/external/mit/libXpm/dist/test/rgb.txt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
