Module Name: src
Committed By: martin
Date: Mon Jan 23 13:53:03 UTC 2023
Modified Files:
src/external/mit/xorg/bin/cxpm [netbsd-10]: Makefile
src/external/mit/xorg/bin/sxpm [netbsd-10]: Makefile
src/external/mit/xorg/lib/libXpm [netbsd-10]: Makefile
Added Files:
src/external/mit/xorg/lib/libXpm [netbsd-10]: xpm.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.38.1 src/external/mit/xorg/bin/cxpm/Makefile
cvs rdiff -u -r1.2 -r1.2.38.1 src/external/mit/xorg/bin/sxpm/Makefile
cvs rdiff -u -r1.3 -r1.3.2.1 src/external/mit/xorg/lib/libXpm/Makefile
cvs rdiff -u -r0 -r1.2.6.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.38.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:53:03 2023
@@ -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 @@ 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.38.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:53:03 2023
@@ -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 @@ 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.3 src/external/mit/xorg/lib/libXpm/Makefile:1.3.2.1
--- src/external/mit/xorg/lib/libXpm/Makefile:1.3 Tue Nov 16 09:25:52 2021
+++ src/external/mit/xorg/lib/libXpm/Makefile Mon Jan 23 13:53:03 2023
@@ -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 @@ 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"
+
+.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>
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.6.2
--- /dev/null Mon Jan 23 13:53:03 2023
+++ src/external/mit/xorg/lib/libXpm/xpm.mk Mon Jan 23 13:53:03 2023
@@ -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
