[src/netbsd-10]: src/external/mit/xorg Sync to HEAD, requested by mrg in tick...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/06d5345f0742
branches:  netbsd-10
changeset: 373199:06d5345f0742
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jan 23 13:53:03 2023 +0000

description:
Sync to HEAD, requested by mrg in ticket #59:

        external/mit/xorg/bin/cxpm/Makefile             up to 1.3
        external/mit/xorg/bin/sxpm/Makefile             up to 1.3
        external/mit/xorg/lib/libXpm/xpm.mk             up to 1.2
        external/mit/xorg/lib/libXpm/Makefile           up to 1.4

Adjust for upstream fixes for CVE-2022-46285, CVE-2022-44617, and
CVE-2022-4883.

diffstat:

 external/mit/xorg/bin/cxpm/Makefile   |   5 ++-
 external/mit/xorg/bin/sxpm/Makefile   |   4 ++-
 external/mit/xorg/lib/libXpm/Makefile |  52 ++++++++++++++++++++++++++++++++--
 external/mit/xorg/lib/libXpm/xpm.mk   |   7 ++++
 4 files changed, 61 insertions(+), 7 deletions(-)

diffs (123 lines):

diff -r 8a603476874b -r 06d5345f0742 external/mit/xorg/bin/cxpm/Makefile
--- a/external/mit/xorg/bin/cxpm/Makefile       Mon Jan 23 13:18:32 2023 +0000
+++ b/external/mit/xorg/bin/cxpm/Makefile       Mon Jan 23 13:53:03 2023 +0000
@@ -1,11 +1,10 @@
-#      $NetBSD: Makefile,v 1.2 2013/05/31 01:41:08 mrg Exp $
+#      $NetBSD: Makefile,v 1.2.38.1 2023/01/23 13:53:03 martin Exp $
 
 .include <bsd.own.mk>
 
 PROG=  cxpm
 
 CPPFLAGS+=     -I${X11SRCDIR.Xpm}/src
-CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11
 
 LDADD+=        -lXpm -lXt -lSM -lICE -lXext -lX11
 DPADD+=        ${LIBXPM} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
@@ -13,5 +12,7 @@
 .PATH: ${X11SRCDIR.Xpm}/${PROG}
 .PATH: ${X11SRCDIR.Xpm}/man
 
+.include "${NETBSDSRCDIR}/external/mit/xorg/lib/libXpm/xpm.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 8a603476874b -r 06d5345f0742 external/mit/xorg/bin/sxpm/Makefile
--- a/external/mit/xorg/bin/sxpm/Makefile       Mon Jan 23 13:18:32 2023 +0000
+++ b/external/mit/xorg/bin/sxpm/Makefile       Mon Jan 23 13:53:03 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2013/05/31 01:41:56 mrg Exp $
+#      $NetBSD: Makefile,v 1.2.38.1 2023/01/23 13:53:03 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -13,5 +13,7 @@
 .PATH: ${X11SRCDIR.Xpm}/${PROG}
 .PATH: ${X11SRCDIR.Xpm}/man
 
+.include "${NETBSDSRCDIR}/external/mit/xorg/lib/libXpm/xpm.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 8a603476874b -r 06d5345f0742 external/mit/xorg/lib/libXpm/Makefile
--- a/external/mit/xorg/lib/libXpm/Makefile     Mon Jan 23 13:18:32 2023 +0000
+++ b/external/mit/xorg/lib/libXpm/Makefile     Mon Jan 23 13:53:03 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2021/11/16 09:25:52 nia Exp $
+#      $NetBSD: Makefile,v 1.3.2.1 2023/01/23 13:53:03 martin Exp $
 
 USE_FORT?=     yes # data-driven bugs?
 
@@ -17,14 +17,58 @@
 INCS=  xpm.h
 INCSDIR=${X11INCDIR}/X11
 
-CPPFLAGS+=-DHAS_SNPRINTF
-CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11
-
 LIBDPLIBS=\
        Xext    ${.CURDIR}/../libXext \
        X11     ${.CURDIR}/../libX11/dynamic
 
 PKGDIST=       ${LIB}
 
+.include "xpm.mk"
+
+.if 0 # not yet
+MAN=   \
+       XpmAttributesSize.3 \
+       XpmCreateBuffer.3 \
+       XpmCreateBufferFromImage.3 \
+       XpmCreateBufferFromPixmap.3 \
+       XpmCreateBufferFromXpmImage.3 \
+       XpmCreateData.3 \
+       XpmCreateDataFromImage.3 \
+       XpmCreateDataFromPixmap.3 \
+       XpmCreateDataFromXpmImage.3 \
+       XpmCreateImage.3 \
+       XpmCreateImageFromBuffer.3 \
+       XpmCreateImageFromData.3 \
+       XpmCreateImageFromXpmImage.3 \
+       XpmCreatePixmap.3 \
+       XpmCreatePixmapFromBuffer.3 \
+       XpmCreatePixmapFromData.3 \
+       XpmCreatePixmapFromXpmImage.3 \
+       XpmCreateXpmImage.3 \
+       XpmCreateXpmImageFromBuffer.3 \
+       XpmCreateXpmImageFromData.3 \
+       XpmCreateXpmImageFromImage.3 \
+       XpmCreateXpmImageFromPixmap.3 \
+       XpmFree.3 \
+       XpmFreeAttributes.3 \
+       XpmFreeExtensions.3 \
+       XpmFreeXpmImage.3 \
+       XpmFreeXpmInfo.3 \
+       XpmGetErrorString.3 \
+       XpmLibraryVersion.3 \
+       XpmMisc.3 \
+       XpmRead.3 \
+       XpmReadFileToBuffer.3 \
+       XpmReadFileToData.3 \
+       XpmReadFileToImage.3 \
+       XpmReadFileToPixmap.3 \
+       XpmReadFileToXpmImage.3 \
+       XpmWrite.3 \
+       XpmWriteFileFromBuffer.3 \
+       XpmWriteFileFromImage.3 \
+       XpmWriteFileFromPixmap.3 \
+       XpmWriteFileFromXpmImage.3
+.endif
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r 8a603476874b -r 06d5345f0742 external/mit/xorg/lib/libXpm/xpm.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libXpm/xpm.mk       Mon Jan 23 13:53:03 2023 +0000
@@ -0,0 +1,7 @@
+#      $NetBSD: xpm.mk,v 1.2.6.2 2023/01/23 13:53:03 martin Exp $
+
+CPPFLAGS+=     -DHAS_SNPRINTF
+CPPFLAGS+=     -DXPM_PATH_COMPRESS=\"/usr/bin/compress\"
+CPPFLAGS+=     -DXPM_PATH_GZIP=\"/usr/bin/gzip\"
+CPPFLAGS+=     -DXPM_PATH_UNCOMPRESS=\"/usr/bin/uncompress\"
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11