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)

6 files changed, 14 insertions, 26 deletions

diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index ce33f43c0a3..c963d6555ba 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -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
 
diff --git a/lang/php56/Makefile b/lang/php56/Makefile
index f9fcb32bcee..45c0aa9725e 100644
--- a/lang/php56/Makefile
+++ b/lang/php56/Makefile
@@ -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 -DSQLITE_WITHOUT_ZONEMALLOC
 .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
diff --git a/lang/php74/Makefile b/lang/php74/Makefile
index 4f9aab00aa2..1606c43ad9e 100644
--- a/lang/php74/Makefile
+++ b/lang/php74/Makefile
@@ -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 -DSQLITE_WITHOUT_ZONEMALLOC
 .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}
 
diff --git a/lang/php74/distinfo b/lang/php74/distinfo
index a8a297cd301..2e81de265e6 100644
--- a/lang/php74/distinfo
+++ b/lang/php74/distinfo
@@ -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
diff --git a/lang/php80/Makefile b/lang/php80/Makefile
index 8ab2bd21ced..c130b7a6d94 100644
--- a/lang/php80/Makefile
+++ b/lang/php80/Makefile
@@ -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 -DSQLITE_WITHOUT_ZONEMALLOC
 .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}
 
diff --git a/lang/php81/Makefile b/lang/php81/Makefile
index 3b24e5251df..9fa613ac432 100644
--- a/lang/php81/Makefile
+++ b/lang/php81/Makefile
@@ -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 -DSQLITE_WITHOUT_ZONEMALLOC
 .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}