CVS commit: [pkgsrc-2022Q3] pkgsrc/lang

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: [pkgsrc-2022Q3] pkgsrc/lang
From: "Benny Siegert" <bsiegert%netbsd.org@localhost>
Date: Mon, 7 Nov 2022 17:37:06 +0000

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Nov  7 17:37:06 UTC 2022

Modified Files:
        pkgsrc/lang/php [pkgsrc-2022Q3]: phpversion.mk
        pkgsrc/lang/php56 [pkgsrc-2022Q3]: Makefile
        pkgsrc/lang/php74 [pkgsrc-2022Q3]: Makefile distinfo
        pkgsrc/lang/php80 [pkgsrc-2022Q3]: Makefile
        pkgsrc/lang/php81 [pkgsrc-2022Q3]: Makefile

Log Message:
Pullup ticket #6701 - requested by taca
lang/php74: security fix

Revisions pulled up:
- lang/php/phpversion.mk                                        1.380
- lang/php56/Makefile                                           1.30
- lang/php74/Makefile                                           1.17
- lang/php74/distinfo                                           1.39
- lang/php80/Makefile                                           1.10
- lang/php81/Makefile                                           1.8

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Sun Oct 30 10:50:01 UTC 2022

   Modified Files:
        pkgsrc/lang/php56: Makefile
        pkgsrc/lang/php74: Makefile
        pkgsrc/lang/php80: Makefile
        pkgsrc/lang/php81: Makefile

   Log Message:
   lang/php: post-install clean up

   Do not manually install executable files and manual.
   These are already done by php's Makefile from some time ago.

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Fri Nov  4 00:40:58 UTC 2022

   Modified Files:
        pkgsrc/lang/php: phpversion.mk
        pkgsrc/lang/php74: distinfo

   Log Message:
   lang/php74: update to 7.4.33

   7.4.33 (2022-11-03)

   - GD:
     . Fixed bug #81739: OOB read due to insufficient input validation in
       imageloadfont(). (CVE-2022-31630) (cmb)

   - Hash:
     . Fixed bug #81738: buffer overflow in hash_update() on long parameter.
       (CVE-2022-37454) (nicky at mouha dot be)


To generate a diff of this commit:
cvs rdiff -u -r1.374.2.5 -r1.374.2.6 pkgsrc/lang/php/phpversion.mk
cvs rdiff -u -r1.29 -r1.29.4.1 pkgsrc/lang/php56/Makefile
cvs rdiff -u -r1.16 -r1.16.4.1 pkgsrc/lang/php74/Makefile
cvs rdiff -u -r1.37.4.1 -r1.37.4.2 pkgsrc/lang/php74/distinfo
cvs rdiff -u -r1.9 -r1.9.4.1 pkgsrc/lang/php80/Makefile
cvs rdiff -u -r1.7 -r1.7.4.1 pkgsrc/lang/php81/Makefile

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

Modified files:

Index: pkgsrc/lang/php/phpversion.mk
diff -u pkgsrc/lang/php/phpversion.mk:1.374.2.5 pkgsrc/lang/php/phpversion.mk:1.374.2.6
--- pkgsrc/lang/php/phpversion.mk:1.374.2.5     Sat Nov  5 19:21:29 2022
+++ pkgsrc/lang/php/phpversion.mk       Mon Nov  7 17:37:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.374.2.5 2022/11/05 19:21:29 bsiegert Exp $
+# $NetBSD: phpversion.mk,v 1.374.2.6 2022/11/07 17:37:05 bsiegert Exp $
 #
 # This file selects a PHP version, based on the user's preferences and
 # the installed packages. It does not add a dependency on the PHP
@@ -88,7 +88,7 @@ PHPVERSION_MK=        defined
 
 # Define each PHP's version.
 PHP56_VERSION= 5.6.40
-PHP74_VERSION= 7.4.32
+PHP74_VERSION= 7.4.33
 PHP80_VERSION= 8.0.25
 PHP81_VERSION= 8.1.12
 

Index: pkgsrc/lang/php56/Makefile
diff -u pkgsrc/lang/php56/Makefile:1.29 pkgsrc/lang/php56/Makefile:1.29.4.1
--- pkgsrc/lang/php56/Makefile:1.29     Mon Apr 18 19:09:56 2022
+++ pkgsrc/lang/php56/Makefile  Mon Nov  7 17:37:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2022/04/18 19:09:56 adam Exp $
+# $NetBSD: Makefile,v 1.29.4.1 2022/11/07 17:37:05 bsiegert Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -49,10 +49,10 @@ CFLAGS+=    -DSQLITE_ENABLE_LOCKING_STYLE=0
 .endif
 
 post-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php
-       ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1
-       ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php
+#      ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php
+#      ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \
+#              ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1
+#      ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php
        cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
                ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php

Index: pkgsrc/lang/php74/Makefile
diff -u pkgsrc/lang/php74/Makefile:1.16 pkgsrc/lang/php74/Makefile:1.16.4.1
--- pkgsrc/lang/php74/Makefile:1.16     Thu Jun  9 15:00:38 2022
+++ pkgsrc/lang/php74/Makefile  Mon Nov  7 17:37:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2022/06/09 15:00:38 taca Exp $
+# $NetBSD: Makefile,v 1.16.4.1 2022/11/07 17:37:05 bsiegert Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -66,10 +66,6 @@ CFLAGS+=     -DSQLITE_ENABLE_LOCKING_STYLE=0
 .endif
 
 post-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php
-       ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1
-       ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php
        cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
                ${DESTDIR}${EGDIR}
 

Index: pkgsrc/lang/php74/distinfo
diff -u pkgsrc/lang/php74/distinfo:1.37.4.1 pkgsrc/lang/php74/distinfo:1.37.4.2
--- pkgsrc/lang/php74/distinfo:1.37.4.1 Mon Oct  3 14:17:25 2022
+++ pkgsrc/lang/php74/distinfo  Mon Nov  7 17:37:05 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.37.4.1 2022/10/03 14:17:25 bsiegert Exp $
+$NetBSD: distinfo,v 1.37.4.2 2022/11/07 17:37:05 bsiegert Exp $
 
-BLAKE2s (php-7.4.32.tar.xz) = 78e09942454d9690cff9c67bbb2c81943fed839bc8cc8ec37c9ebf3c4da01c32
-SHA512 (php-7.4.32.tar.xz) = 052fbb6120b9943927685f736574871bc2b0c60d4ef18b54ec3f3d92398842286189fd426647c3c91eec38b11ce607090c4cd339040c92bda852574b96c36f67
-Size (php-7.4.32.tar.xz) = 10419092 bytes
+BLAKE2s (php-7.4.33.tar.xz) = 11ec78e0a566d33168e9867e60796f25b8edc4efa03868929251a6297021e79d
+SHA512 (php-7.4.33.tar.xz) = 499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d
+Size (php-7.4.33.tar.xz) = 10420144 bytes
 SHA1 (patch-build_libtool.m4) = 3656eb516fb14defd4b0964fe21e117c630be856
 SHA1 (patch-configure) = 5e9c9c06f6d819d5ba2832d648f41363f40f3108
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640

Index: pkgsrc/lang/php80/Makefile
diff -u pkgsrc/lang/php80/Makefile:1.9 pkgsrc/lang/php80/Makefile:1.9.4.1
--- pkgsrc/lang/php80/Makefile:1.9      Fri Jun 10 00:00:07 2022
+++ pkgsrc/lang/php80/Makefile  Mon Nov  7 17:37:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/06/10 00:00:07 taca Exp $
+# $NetBSD: Makefile,v 1.9.4.1 2022/11/07 17:37:06 bsiegert Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -66,10 +66,6 @@ CFLAGS+=     -DSQLITE_ENABLE_LOCKING_STYLE=0
 .endif
 
 post-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php
-       ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1
-       ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php
        cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
                ${DESTDIR}${EGDIR}
 

Index: pkgsrc/lang/php81/Makefile
diff -u pkgsrc/lang/php81/Makefile:1.7 pkgsrc/lang/php81/Makefile:1.7.4.1
--- pkgsrc/lang/php81/Makefile:1.7      Thu Jun  9 15:10:50 2022
+++ pkgsrc/lang/php81/Makefile  Mon Nov  7 17:37:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/06/09 15:10:50 taca Exp $
+# $NetBSD: Makefile,v 1.7.4.1 2022/11/07 17:37:06 bsiegert Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -66,10 +66,6 @@ CFLAGS+=     -DSQLITE_ENABLE_LOCKING_STYLE=0
 .endif
 
 post-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php
-       ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1
-       ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php
        cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
                ${DESTDIR}${EGDIR}

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/devel/patchelf
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/devel/patchelf
Indexes:

Home | Main Index | Thread Index | Old Index