From nobody Sat May 11 23:24:02 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VcMJf57DKz5JXKP; Sat, 11 May 2024 23:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VcMJf4gp8z4ncw; Sat, 11 May 2024 23:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715469842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3o4VUW0EbS0JDlT5+TfocNlxY1NHVC0cPMrUTFS9oAk=; b=mP3si5hEH+SHcp3M03ZVMu7P8PlOuwnbCKe8V7UYKuBIzO5KoMteJBsagbWJQoEx7WmtGu qwUku5+z2Bo2lqYtEcQsPDRvLzPfXVtKzHk2EmQaSp9G3l50h0+Rwg871uvtXe49OToo4x ucyy/D5LmDGA5y13bve6SrF2GcYFCUadqWN16rumA08/Kzzmp7+JaQHsBflLjliROzXUJi 5+GbQJx79SQ//cv6jwJ+oaRMfmHRtKXgONqiiXALFVjLixzoPk3MX7kZPcIapDnirDzpn9 KFlW9zU6nxsTt+krrFzx5xhuGlaIeC+Z14gzIWAlBwweQsqXiUfDHMPYNemq4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715469842; a=rsa-sha256; cv=none; b=P73tSwko8XTxcb1FfKr8r0/Q5NLXeiryXuPeRUkfUXBUla5ipcRpkjHmeT7ivaeLMyjxZI GO/8wCeMGud7BRI39PURKVY+87lXx1kW0dj2QFRBbdaCo26n6C+3nyTJcusE6BHUcUgukZ EgKLCHP1en4fznJk+jlYlpkm0Z6lwasnUOphbcU7+BC+6bQ494Pl5Q7l/1tCMmPOjXKHaf gb3MbVqjhiAks7NIETd01p5vMndAQnLmp52e54qL7LMu++XCuWPfjm/+c7BTYEqxoRyeSa aykxrXAPqQpFW7Oq6Z2WvrjGjEnYUJ7tjTt7npAgUgKKkvVW+zLg/ya89u55NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715469842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3o4VUW0EbS0JDlT5+TfocNlxY1NHVC0cPMrUTFS9oAk=; b=dT3MXviwBXOO3bH/jBMzla81+1yLBuZeYzDsP+AKjjO2+Ijgfo97qR0MZ8MfybHK2fytfx WLluBTeATZtI20gvnOScZojFTvjcuaSukC+9ijozIJMiyaDsbBmfQT0eINfC5HLgIRWCvd PS+omAALLv2D4MnHS3KrplwXAzlVbH4G/qU1Q2oFxXHRtxlXxgRn4a2enEFY6ey0lNr2TO Ugzv4nUOpn6dWl9rJcADNS9MLYTTkW8xXWfwC7YykJKlb9IEFpf93bjl7QuwNTHrdUWxrF 0bgYjPluHA76uI7bJSguR7+b+0DAfwgPNVqcr4hX0YgKiETlqjlL9F8NvET0WQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VcMJf4H1qzg1n; Sat, 11 May 2024 23:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44BNO2xM032654; Sat, 11 May 2024 23:24:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44BNO2oL032651; Sat, 11 May 2024 23:24:02 GMT (envelope-from git) Date: Sat, 11 May 2024 23:24:02 GMT Message-Id: <202405112324.44BNO2oL032651@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: e792b33abed9 - main - lang/php82: Update version 8.2.18=>8.2.19 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e792b33abed93888717b7b7f8ba42a6396578a8a Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=e792b33abed93888717b7b7f8ba42a6396578a8a commit e792b33abed93888717b7b7f8ba42a6396578a8a Author: Muhammad Moinur Rahman AuthorDate: 2024-05-11 20:02:44 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-05-11 23:06:47 +0000 lang/php82: Update version 8.2.18=>8.2.19 Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_2 --- devel/php82-intl/Makefile | 1 - devel/php82-intl/files/patch-config.m4 | 22 ------------ lang/php82/Makefile | 30 +++++----------- lang/php82/distinfo | 6 ++-- sysutils/php82-posix/files/patch-posix.c | 62 -------------------------------- 5 files changed, 12 insertions(+), 109 deletions(-) diff --git a/devel/php82-intl/Makefile b/devel/php82-intl/Makefile index ee29a2235e91..ed4b8c995619 100644 --- a/devel/php82-intl/Makefile +++ b/devel/php82-intl/Makefile @@ -1,4 +1,3 @@ -PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php82 diff --git a/devel/php82-intl/files/patch-config.m4 b/devel/php82-intl/files/patch-config.m4 deleted file mode 100644 index e78dbf7844e7..000000000000 --- a/devel/php82-intl/files/patch-config.m4 +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/php/php-src/commit/037855fcd3f2 - ---- config.m4.orig 2024-04-09 18:46:23 UTC -+++ config.m4 -@@ -80,7 +80,16 @@ if test "$PHP_INTL" != "no"; then - breakiterator/codepointiterator_methods.cpp" - - PHP_REQUIRE_CXX() -- PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) -+ -+ AC_MSG_CHECKING([if intl requires -std=gnu++17]) -+ AS_IF([test "$PKG_CONFIG icu-uc --atleast-version=74"],[ -+ AC_MSG_RESULT([yes]) -+ PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX) -+ ],[ -+ AC_MSG_RESULT([no]) -+ PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) -+ ]) -+ - PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS" - case $host_alias in - *cygwin*) PHP_INTL_CXX_FLAGS="$PHP_INTL_CXX_FLAGS -D_POSIX_C_SOURCE=200809L" diff --git a/lang/php82/Makefile b/lang/php82/Makefile index 0d5321f6a083..cc489dda671e 100644 --- a/lang/php82/Makefile +++ b/lang/php82/Makefile @@ -1,5 +1,5 @@ PORTNAME= php82 -DISTVERSION= 8.2.18 +DISTVERSION= 8.2.19 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions @@ -36,7 +36,7 @@ USE_GNOME= libxml2 LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl # PR230207 Allow relocations against read-only segments (override lld default) -LDFLAGS_i386= -Wl,-z,notext +LDFLAGS_i386+= -Wl,-z,notext OPTIONS_DEFINE+=CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \ MYSQLND PCRE PHPDBG ZTS @@ -150,19 +150,19 @@ post-install: ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc post-install-CGI-on: - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/php-cgi + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/php-cgi post-install-CLI-on: - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/php + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/php post-install-EMBED-on: - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/libphp.so + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libphp.so post-install-FPM-on: - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/sbin/php-fpm + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/php-fpm post-install-PHPDBG-on: - ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/phpdbg + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/phpdbg .else do-install: @@ -254,7 +254,7 @@ USE_GNOME= libxml2 .endif .if ${PHP_MODNAME} == "enchant" -LIB_DEPENDS+= libenchant-2.so:textproc/enchant2 +LIB_DEPENDS+= libenchant-2.so:textproc/enchant2 CONFIGURE_ARGS+=--with-enchant=${LOCALBASE} USES+= pkgconfig .endif @@ -385,7 +385,7 @@ CONFIGURE_ARGS+= --enable-odbc --with-unixODBC=${LOCALBASE} .if ${PHP_MODNAME} == "opcache" # This is needed by Zend extensions, keep before everything. PHP_MOD_PRIO= 10 -CONFIGURE_ARGS+= --enable-opcache +CONFIGURE_ARGS+= --enable-opcache .endif .if ${PHP_MODNAME} == "pcntl" @@ -561,18 +561,6 @@ USE_GNOME= libxml2 USE_PHP= dom:build .endif -.if ${PHP_MODNAME} == "xmlrpc" -CONFIGURE_ARGS+= --with-iconv-dir=${LOCALBASE} \ - --with-xmlrpc - -USES+= iconv:translit -USE_GNOME= libxml2 - -PHP_HEADER_DIRS= libxmlrpc - -USE_PHP= xml:build -.endif - .if ${PHP_MODNAME} == "xmlwriter" CONFIGURE_ARGS+= --enable-xmlwriter diff --git a/lang/php82/distinfo b/lang/php82/distinfo index 6600f3d313f6..bac297569965 100644 --- a/lang/php82/distinfo +++ b/lang/php82/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712934471 -SHA256 (php-8.2.18.tar.xz) = 44b306fc021e56441f691da6c3108788bd9e450f293b3bc70fcd64b08dd41a50 -SIZE (php-8.2.18.tar.xz) = 12089400 +TIMESTAMP = 1715457677 +SHA256 (php-8.2.19.tar.xz) = aecd63f3ebea6768997f5c4fccd98acbf897762ed5fc25300e846197a9485c13 +SIZE (php-8.2.19.tar.xz) = 12094184 diff --git a/sysutils/php82-posix/files/patch-posix.c b/sysutils/php82-posix/files/patch-posix.c deleted file mode 100644 index 8d54d8ebd935..000000000000 --- a/sysutils/php82-posix/files/patch-posix.c +++ /dev/null @@ -1,62 +0,0 @@ ---- posix.c.orig 2024-01-17 22:35:53 UTC -+++ posix.c -@@ -465,7 +465,11 @@ PHP_FUNCTION(posix_ttyname) - #if defined(ZTS) && defined(HAVE_TTYNAME_R) && defined(_SC_TTY_NAME_MAX) - buflen = sysconf(_SC_TTY_NAME_MAX); - if (buflen < 1) { -+#if defined(__FreeBSD__) && defined(_SC_PAGESIZE) -+ buflen = sysconf(_SC_PAGESIZE); -+#else - RETURN_FALSE; -+#endif - } - p = emalloc(buflen); - -@@ -728,7 +732,11 @@ PHP_FUNCTION(posix_getgrnam) - #if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX) - buflen = sysconf(_SC_GETGR_R_SIZE_MAX); - if (buflen < 1) { -+#if defined(__FreeBSD__) && defined(_SC_PAGESIZE) -+ buflen = sysconf(_SC_PAGESIZE); -+#else - RETURN_FALSE; -+#endif - } - buf = emalloc(buflen); - try_again: -@@ -784,7 +792,11 @@ PHP_FUNCTION(posix_getgrgid) - - grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX); - if (grbuflen < 1) { -+#if defined(__FreeBSD__) && defined(_SC_PAGESIZE) -+ grbuflen = sysconf(_SC_PAGESIZE); -+#else - RETURN_FALSE; -+#endif - } - - grbuf = emalloc(grbuflen); -@@ -858,7 +870,11 @@ PHP_FUNCTION(posix_getpwnam) - #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R) - buflen = sysconf(_SC_GETPW_R_SIZE_MAX); - if (buflen < 1) { -+#if defined(__FreeBSD__) && defined(_SC_PAGESIZE) -+ buflen = sysconf(_SC_PAGESIZE); -+#else - RETURN_FALSE; -+#endif - } - buf = emalloc(buflen); - pw = &pwbuf; -@@ -913,7 +929,11 @@ PHP_FUNCTION(posix_getpwuid) - #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R) - pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); - if (pwbuflen < 1) { -+#if defined(__FreeBSD__) && defined(_SC_PAGESIZE) -+ pwbuflen = sysconf(_SC_PAGESIZE); -+#else - RETURN_FALSE; -+#endif - } - pwbuf = emalloc(pwbuflen); -