head	1.1;
branch	1.1.1;
access;
symbols
	netbsd-11-0-RC5:1.1.1.1
	netbsd-11-0-RC4:1.1.1.1
	libXpm-3-5-19:1.1.1.1
	netbsd-11-0-RC3:1.1.1.1
	netbsd-11-0-RC2:1.1.1.1
	netbsd-11-0-RC1:1.1.1.1
	netbsd-11:1.1.1.1.0.4
	netbsd-11-base:1.1.1.1
	netbsd-10-1-RELEASE:1.1.1.1.2.2
	netbsd-10-0-RELEASE:1.1.1.1.2.2
	netbsd-10-0-RC6:1.1.1.1.2.2
	netbsd-10-0-RC5:1.1.1.1.2.2
	netbsd-10-0-RC4:1.1.1.1.2.2
	netbsd-10-0-RC3:1.1.1.1.2.2
	netbsd-10-0-RC2:1.1.1.1.2.2
	netbsd-10-0-RC1:1.1.1.1.2.2
	netbsd-10:1.1.1.1.0.2
	libXpm-3-5-17:1.1.1.1
	libXpm-3-5-16:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.1
date	2023.06.19.06.19.34;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;
commitid	KbKqHQO9QkvRqwtE;

1.1.1.1
date	2023.06.19.06.19.34;	author mrg;	state Exp;
branches
	1.1.1.1.2.1;
next	;
commitid	KbKqHQO9QkvRqwtE;

1.1.1.1.2.1
date	2023.06.19.06.19.34;	author martin;	state dead;
branches;
next	1.1.1.1.2.2;
commitid	WuUzih0yvrCZ1jHE;

1.1.1.1.2.2
date	2023.10.04.12.29.56;	author martin;	state Exp;
branches;
next	;
commitid	WuUzih0yvrCZ1jHE;


desc
@@


1.1
log
@Initial revision
@
text
@# Test data for rgb.c - changes here likely require changes to that code
255 255 255	white
  0   0   0	black
255   0   0	red
  0 255   0	green
  0   0 255	blue
  0  50  98	BerkeleyBlue
253 181  21	CaliforniaGold
@


1.1.1.1
log
@initial import of libXpm-3.5.16
@
text
@@


1.1.1.1.2.1
log
@file rgb.txt was added on branch netbsd-10 on 2023-10-04 12:29:56 +0000
@
text
@d1 8
@


1.1.1.1.2.2
log
@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
@
text
@a0 8
# Test data for rgb.c - changes here likely require changes to that code
255 255 255	white
  0   0   0	black
255   0   0	red
  0 255   0	green
  0   0 255	blue
  0  50  98	BerkeleyBlue
253 181  21	CaliforniaGold
@


