CVS commit: [pkgsrc-2023Q2] pkgsrc/lang

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Aug 15 18:32:22 UTC 2023

Modified Files:
        pkgsrc/lang/php [pkgsrc-2023Q2]: phpversion.mk
        pkgsrc/lang/php80 [pkgsrc-2023Q2]: distinfo
        pkgsrc/lang/php80/patches [pkgsrc-2023Q2]: patch-configure

Log Message:
Pullup ticket #6785 - requested by taca
lang/php80: security fix (CVE-2023-3823, CVE-2024-3824)

Revisions pulled up:
- lang/php/phpversion.mk                                        1.406
- lang/php80/distinfo                                           1.31
- lang/php80/patches/patch-configure                            1.2

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Sun Aug  6 04:28:24 UTC 2023

   Modified Files:
        pkgsrc/lang/php: phpversion.mk
        pkgsrc/lang/php80: distinfo
        pkgsrc/lang/php80/patches: patch-configure

   Log Message:
   lang/php80: update to 8.0.30

   03 Aug 2023, PHP 8.0.30

   - Libxml:
     . Fixed bug GHSA-3qrf-m4j2-pcrr (Security issue with external entity loading
       in XML without enabling it). (CVE-2023-3823) (nielsdos, ilutov)

   - Phar:
     . Fixed bug GHSA-jqcx-ccgc-xwhv (Buffer mismanagement in phar_dir_read()).
       (CVE-2023-3824) (nielsdos)


To generate a diff of this commit:
cvs rdiff -u -r1.401 -r1.401.2.1 pkgsrc/lang/php/phpversion.mk
cvs rdiff -u -r1.30 -r1.30.2.1 pkgsrc/lang/php80/distinfo
cvs rdiff -u -r1.1 -r1.1.20.1 pkgsrc/lang/php80/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/lang/php/phpversion.mk
diff -u pkgsrc/lang/php/phpversion.mk:1.401 pkgsrc/lang/php/phpversion.mk:1.401.2.1
--- pkgsrc/lang/php/phpversion.mk:1.401 Tue Jun 13 14:43:49 2023
+++ pkgsrc/lang/php/phpversion.mk       Tue Aug 15 18:32:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.401 2023/06/13 14:43:49 taca Exp $
+# $NetBSD: phpversion.mk,v 1.401.2.1 2023/08/15 18:32:22 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
@@ -89,7 +89,7 @@ PHPVERSION_MK=        defined
 # Define each PHP's version.
 PHP56_VERSION= 5.6.40
 PHP74_VERSION= 7.4.33
-PHP80_VERSION= 8.0.29
+PHP80_VERSION= 8.0.30
 PHP81_VERSION= 8.1.20
 PHP82_VERSION= 8.2.7
 

Index: pkgsrc/lang/php80/distinfo
diff -u pkgsrc/lang/php80/distinfo:1.30 pkgsrc/lang/php80/distinfo:1.30.2.1
--- pkgsrc/lang/php80/distinfo:1.30     Thu Jun  8 13:19:57 2023
+++ pkgsrc/lang/php80/distinfo  Tue Aug 15 18:32:22 2023
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.30 2023/06/08 13:19:57 taca Exp $
+$NetBSD: distinfo,v 1.30.2.1 2023/08/15 18:32:22 bsiegert Exp $
 
-BLAKE2s (php-8.0.29.tar.xz) = 7ac7c572a97718f97081e9fa4230cbd9677c67d679ef1c37c2723f7ae6531ea1
-SHA512 (php-8.0.29.tar.xz) = 5f849753bbcc12e253160af072213bc1ede32e5051684129707d32fd6ce8e12867fcf7a5f6790b25071fdda0508dfffd3344e4bb850a747cb8f3c9aee970311d
-Size (php-8.0.29.tar.xz) = 10803592 bytes
+BLAKE2s (php-8.0.30.tar.xz) = f0f2a434121d5947543be269db9a6b1b33a04123663da0bf422d7efac00a3402
+SHA512 (php-8.0.30.tar.xz) = fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782
+Size (php-8.0.30.tar.xz) = 10821076 bytes
 SHA1 (patch-build_libtool.m4) = e58a2bcebe9e9d7dc7255354fd9fe57878e3f8a6
-SHA1 (patch-configure) = 6c3d2537eb4d1c2ed05e8e1e411701d316c67d8b
+SHA1 (patch-configure) = 89e68737df839f4d43852a69340bcdbf66cdb964
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_enchant_enchant.c) = 74e0ec62928c84998ea41863088203f2511911fd
 SHA1 (patch-ext_openssl_openssl.c) = 6d83ad075866c90e17a8085fc7b562f33aea8583

Index: pkgsrc/lang/php80/patches/patch-configure
diff -u pkgsrc/lang/php80/patches/patch-configure:1.1 pkgsrc/lang/php80/patches/patch-configure:1.1.20.1
--- pkgsrc/lang/php80/patches/patch-configure:1.1       Sun Mar  7 13:41:36 2021
+++ pkgsrc/lang/php80/patches/patch-configure   Tue Aug 15 18:32:22 2023
@@ -1,13 +1,13 @@
-$NetBSD: patch-configure,v 1.1 2021/03/07 13:41:36 taca Exp $
+$NetBSD: patch-configure,v 1.1.20.1 2023/08/15 18:32:22 bsiegert Exp $
 
 * Do not include "PKG_CONFIG*" in CONFIGURE_OPTIONS.
 * Don't automatically add libgcc on SunOS. Reported upstream as #75941.
 * Don't autodetect maintainer-zts.
 * The meta_ccld removal reported upstream as #75940.
 
---- configure.orig     2020-11-24 17:04:03.000000000 +0000
+--- configure.orig     2023-08-03 17:13:08.000000000 +0000
 +++ configure
-@@ -3697,6 +3697,10 @@ EOF
+@@ -4288,6 +4288,10 @@ EOF
     else
      break
     fi
@@ -18,7 +18,7 @@ $NetBSD: patch-configure,v 1.1 2021/03/0
     $as_echo "$CURRENT_ARG \\" >>config.nice
     CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG"
    done
-@@ -5847,9 +5851,6 @@ fi
+@@ -6358,9 +6362,6 @@ fi
  case $host_alias in
    *solaris*)
      CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
@@ -28,7 +28,7 @@ $NetBSD: patch-configure,v 1.1 2021/03/0
      ;;
    *dgux*)
      CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR"
-@@ -6883,27 +6884,6 @@ EOF
+@@ -7422,30 +7423,6 @@ EOF
      ;;
    esac
  
@@ -53,15 +53,18 @@ $NetBSD: patch-configure,v 1.1 2021/03/0
 -
 -    fi
 -  fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-printf "%s\n" "yes" >&6; }
+-
+   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
  
-@@ -74996,7 +74976,7 @@ $as_echo "#define HAVE_TIDYBUFFIO_H 1" >
+ else
+@@ -77733,7 +77710,7 @@ printf "%s\n" "#define HAVE_TIDYBUFFIO_H
    fi
  
    TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
 -  if test "$TIDY_LIB_NAME" == 'tidyp'; then
 +  if test "$TIDY_LIB_NAME" = 'tidyp'; then
  
- $as_echo "#define HAVE_TIDYP_H 1" >>confdefs.h
+ printf "%s\n" "#define HAVE_TIDYP_H 1" >>confdefs.h