CVS commit: pkgsrc/x11/pixman

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Nov  3 08:51:26 UTC 2022

Modified Files:
        pkgsrc/x11/pixman: Makefile distinfo
        pkgsrc/x11/pixman/patches: patch-Makefile.in
Removed Files:
        pkgsrc/x11/pixman/patches: patch-configure

Log Message:
pixman: update to 0.42.2.

This version contains a fix for a heap overflow. A CVE has been
requested.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 pkgsrc/x11/pixman/Makefile
cvs rdiff -u -r1.74 -r1.75 pkgsrc/x11/pixman/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/pixman/patches/patch-Makefile.in
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/pixman/patches/patch-configure

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

Modified files:

Index: pkgsrc/x11/pixman/Makefile
diff -u pkgsrc/x11/pixman/Makefile:1.87 pkgsrc/x11/pixman/Makefile:1.88
--- pkgsrc/x11/pixman/Makefile:1.87     Wed Oct 26 08:44:33 2022
+++ pkgsrc/x11/pixman/Makefile  Thu Nov  3 08:51:25 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.87 2022/10/26 08:44:33 tnn Exp $
+# $NetBSD: Makefile,v 1.88 2022/11/03 08:51:25 wiz Exp $
 
-DISTNAME=      pixman-0.42.0
-PKGREVISION=   3
+DISTNAME=      pixman-0.42.2
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/x11/pixman/distinfo
diff -u pkgsrc/x11/pixman/distinfo:1.74 pkgsrc/x11/pixman/distinfo:1.75
--- pkgsrc/x11/pixman/distinfo:1.74     Sat Oct 22 13:13:39 2022
+++ pkgsrc/x11/pixman/distinfo  Thu Nov  3 08:51:25 2022
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.74 2022/10/22 13:13:39 taca Exp $
+$NetBSD: distinfo,v 1.75 2022/11/03 08:51:25 wiz Exp $
 
-BLAKE2s (pixman-0.42.0.tar.xz) = 9846ec6a902afa54328b18a9a58cbdf7ad066aa69cbbfddb145b1475c6ad8899
-SHA512 (pixman-0.42.0.tar.xz) = 43d43d1aef9b8a6167098ab68ce2cfd8c0429c4825d40a4fb468b5b51dc1a2035f8bd1b70413e4ecd77deb469b5d558f42171b423e348d5ddd8604c466ffc7d9
-Size (pixman-0.42.0.tar.xz) = 652780 bytes
-SHA1 (patch-Makefile.in) = 244969af69e43472d43d8cd1556abacf9ec679e0
-SHA1 (patch-configure) = 909bf50acfd69700b26bd55a47f93fd77b49226c
+BLAKE2s (pixman-0.42.2.tar.xz) = 787db2f251f18541df50cc8681dfdb4da97def41dac52233b79575a0b83836fa
+SHA512 (pixman-0.42.2.tar.xz) = 3476e2676e66756b1af61b1e532cd80c985c191fb7956eb01702b419726cce99e79163b7f287f74f66414680e7396d13c3fee525cd663f12b6ac4877070ff4e8
+Size (pixman-0.42.2.tar.xz) = 652984 bytes
+SHA1 (patch-Makefile.in) = 49a0aa317a84390c1966687312f8466bc8d17ca3
 SHA1 (patch-pixman_pixman-vmx.c) = 8ca3649a5dd0527ce078af1b91fb01611dde9b45

Index: pkgsrc/x11/pixman/patches/patch-Makefile.in
diff -u pkgsrc/x11/pixman/patches/patch-Makefile.in:1.3 pkgsrc/x11/pixman/patches/patch-Makefile.in:1.4
--- pkgsrc/x11/pixman/patches/patch-Makefile.in:1.3     Tue Oct 18 11:14:18 2022
+++ pkgsrc/x11/pixman/patches/patch-Makefile.in Thu Nov  3 08:51:25 2022
@@ -1,8 +1,6 @@
-$NetBSD: patch-Makefile.in,v 1.3 2022/10/18 11:14:18 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2022/11/03 08:51:25 wiz Exp $
 
 Skip building demos and test SUBDIRS
-Shell portability
-https://gitlab.freedesktop.org/pixman/pixman/-/issues/65
 
 --- Makefile.in.orig   2020-04-19 21:53:21.000000000 +0000
 +++ Makefile.in
@@ -15,12 +13,3 @@ https://gitlab.freedesktop.org/pixman/pi
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = pixman-1.pc
  GPGKEY = 3892336E
-@@ -964,7 +964,7 @@ release-remove-old:
-       $(RM) $(tar_gz) $(tar_xz) $(HASHFILES) $(gpg_file)
- 
- ensure-prev:
--      @if [[ "$(PREV)" == "" ]]; then                                                 \
-+      @if [ "$(PREV)" = "" ]; then                                                    \
-               echo ""                                                           &&    \
-               echo "You must set the PREV variable on the make command line to" &&    \
-               echo "the last version."                                          &&    \