[src/netbsd-9]: src/external/mit/xorg Apply patch, requested by mrg in ticket...

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

details:   https://anonhg.NetBSD.org/src/rev/58bc8bea3d62
branches:  netbsd-9
changeset: 373195:58bc8bea3d62
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jan 23 13:43:07 2023 +0000

description:
Apply patch, requested by mrg in ticket #1577:

Adjust for upstream patches for the followign CVEs:

   CVE-2022-46285, CVE-2022-44617, CVE-2022-4883, CVE-2020-14363,
   CVE-2022-46340, CVE-2022-46341, CVE-2022-46342 CVE-2022-46343,
   CVE-2022-46344, CVE-2022-46283, CVE-2021-4008, CVE-2021-4009,
   CVE-2021-4010, CVE-2021-4011

diffstat:

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

diffs (78 lines):

diff -r b489b19e2aca -r 58bc8bea3d62 external/mit/xorg/bin/cxpm/Makefile
--- a/external/mit/xorg/bin/cxpm/Makefile       Mon Jan 23 13:17:27 2023 +0000
+++ b/external/mit/xorg/bin/cxpm/Makefile       Mon Jan 23 13:43:07 2023 +0000
@@ -1,11 +1,10 @@
-#      $NetBSD: Makefile,v 1.2 2013/05/31 01:41:08 mrg Exp $
+#      $NetBSD: Makefile,v 1.2.30.1 2023/01/23 13:43:07 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 b489b19e2aca -r 58bc8bea3d62 external/mit/xorg/bin/sxpm/Makefile
--- a/external/mit/xorg/bin/sxpm/Makefile       Mon Jan 23 13:17:27 2023 +0000
+++ b/external/mit/xorg/bin/sxpm/Makefile       Mon Jan 23 13:43:07 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2013/05/31 01:41:56 mrg Exp $
+#      $NetBSD: Makefile,v 1.2.30.1 2023/01/23 13:43:07 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 b489b19e2aca -r 58bc8bea3d62 external/mit/xorg/lib/libXpm/Makefile
--- a/external/mit/xorg/lib/libXpm/Makefile     Mon Jan 23 13:17:27 2023 +0000
+++ b/external/mit/xorg/lib/libXpm/Makefile     Mon Jan 23 13:43:07 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2008/09/13 04:32:30 cube Exp $
+#      $NetBSD: Makefile,v 1.2.66.1 2023/01/23 13:43:07 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -15,14 +15,13 @@
 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"
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r b489b19e2aca -r 58bc8bea3d62 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:43:07 2023 +0000
@@ -0,0 +1,7 @@
+#      $NetBSD: xpm.mk,v 1.2.4.2 2023/01/23 13:43:07 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