CVS commit: pkgsrc/x11/xkbcomp

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Dec  3 07:38:29 UTC 2025

Modified Files:
        pkgsrc/x11/xkbcomp: Makefile distinfo

Log Message:
xkbcomp: update to 1.5.0.

This releases contains the fixes for the issues reported in today's security
advisory: https://lists.x.org/archives/xorg-announce/2025-December/003644.html

* CVE-2018-15863
* CVE-2018-15861
* CVE-2018-15859
* CVE-2018-15853

Note that the year is not a typo, these CVEs have been reported previously for
libxkbcommon but the same code exists in xkbcomp and required the same fixes.

As a new feature in this version: xkbcomp now supports the meson build system
in addition to autotools. autotools support may be removed in a future version.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/xkbcomp/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/xkbcomp/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xkbcomp/Makefile
diff -u pkgsrc/x11/xkbcomp/Makefile:1.26 pkgsrc/x11/xkbcomp/Makefile:1.27
--- pkgsrc/x11/xkbcomp/Makefile:1.26    Fri Feb  9 21:01:40 2024
+++ pkgsrc/x11/xkbcomp/Makefile Wed Dec  3 07:38:29 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2024/02/09 21:01:40 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2025/12/03 07:38:29 wiz Exp $
 
-DISTNAME=              xkbcomp-1.4.7
+DISTNAME=              xkbcomp-1.5.0
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_XORG:=app/}
 EXTRACT_SUFX=          .tar.xz
@@ -9,18 +9,17 @@ MAINTAINER=           pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              https://xorg.freedesktop.org/
 COMMENT=               XKBD keymap compiler
 
-GNU_CONFIGURE=         yes
-USE_TOOLS+=            pkg-config
+USE_TOOLS+=            bison pkg-config
 
 PKGCONFIG_OVERRIDE=    xkbcomp.pc.in
 
-CONFIGURE_ENV+=                APP_MAN_SUFFIX=1
-
+# XXX: still needed?
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 CFLAGS+=               -Wno-error=string-compare
 .endif
 
+.include "../../devel/meson/build.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"

Index: pkgsrc/x11/xkbcomp/distinfo
diff -u pkgsrc/x11/xkbcomp/distinfo:1.20 pkgsrc/x11/xkbcomp/distinfo:1.21
--- pkgsrc/x11/xkbcomp/distinfo:1.20    Fri Feb  9 21:01:40 2024
+++ pkgsrc/x11/xkbcomp/distinfo Wed Dec  3 07:38:29 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2024/02/09 21:01:40 wiz Exp $
+$NetBSD: distinfo,v 1.21 2025/12/03 07:38:29 wiz Exp $
 
-BLAKE2s (xkbcomp-1.4.7.tar.xz) = 2e0413aa06542549b4e715e57c72a02d868db6c46d63564987475ff4c998fab5
-SHA512 (xkbcomp-1.4.7.tar.xz) = 6f468dce9d2499ab1022f4288d46f66af149dac0a161fb5b9dc0c262bc70c2c3d254db2c6fb5df1e2793c822e2d55c6da5fd037ce523a555b7c3de23e35c49ef
-Size (xkbcomp-1.4.7.tar.xz) = 239324 bytes
+BLAKE2s (xkbcomp-1.5.0.tar.xz) = e84f0f3980b7b01b966f48c4c1e61c42f11e6e5de757a156e7287d3da696192a
+SHA512 (xkbcomp-1.5.0.tar.xz) = d8ef4906261251e2600b3650660fbe88ed99a44694f1e59b433e0811f1ab5234c4f2f0b3647fa5372fb0f46b56eac60c0219a762bf1af0ab06226b63e4a6b081
+Size (xkbcomp-1.5.0.tar.xz) = 247996 bytes