Module Name: src Committed By: martin Date: Mon Jan 23 13:43:07 UTC 2023
Modified Files: src/external/mit/xorg/bin/cxpm [netbsd-9]: Makefile src/external/mit/xorg/bin/sxpm [netbsd-9]: Makefile src/external/mit/xorg/lib/libXpm [netbsd-9]: Makefile Added Files: src/external/mit/xorg/lib/libXpm [netbsd-9]: xpm.mk Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.30.1 src/external/mit/xorg/bin/cxpm/Makefile cvs rdiff -u -r1.2 -r1.2.30.1 src/external/mit/xorg/bin/sxpm/Makefile cvs rdiff -u -r1.2 -r1.2.66.1 src/external/mit/xorg/lib/libXpm/Makefile cvs rdiff -u -r0 -r1.2.4.2 src/external/mit/xorg/lib/libXpm/xpm.mk 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/cxpm/Makefile diff -u src/external/mit/xorg/bin/cxpm/Makefile:1.2 src/external/mit/xorg/bin/cxpm/Makefile:1.2.30.1 --- src/external/mit/xorg/bin/cxpm/Makefile:1.2 Fri May 31 01:41:08 2013 +++ src/external/mit/xorg/bin/cxpm/Makefile Mon Jan 23 13:43:07 2023 @@ -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 @@ DPADD+= ${LIBXPM} ${LIBXT} ${LIBSM} ${LI .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> Index: src/external/mit/xorg/bin/sxpm/Makefile diff -u src/external/mit/xorg/bin/sxpm/Makefile:1.2 src/external/mit/xorg/bin/sxpm/Makefile:1.2.30.1 --- src/external/mit/xorg/bin/sxpm/Makefile:1.2 Fri May 31 01:41:56 2013 +++ src/external/mit/xorg/bin/sxpm/Makefile Mon Jan 23 13:43:07 2023 @@ -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 @@ DPADD+= ${LIBXPM} ${LIBXT} ${LIBSM} ${LI .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> Index: src/external/mit/xorg/lib/libXpm/Makefile diff -u src/external/mit/xorg/lib/libXpm/Makefile:1.2 src/external/mit/xorg/lib/libXpm/Makefile:1.2.66.1 --- src/external/mit/xorg/lib/libXpm/Makefile:1.2 Sat Sep 13 04:32:30 2008 +++ src/external/mit/xorg/lib/libXpm/Makefile Mon Jan 23 13:43:07 2023 @@ -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 @@ SRCS= Attrib.c CrBufFrI.c CrBufFrP.c CrD 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> Added files: Index: src/external/mit/xorg/lib/libXpm/xpm.mk diff -u /dev/null src/external/mit/xorg/lib/libXpm/xpm.mk:1.2.4.2 --- /dev/null Mon Jan 23 13:43:07 2023 +++ src/external/mit/xorg/lib/libXpm/xpm.mk Mon Jan 23 13:43:07 2023 @@ -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