diff --git a/databases/php80-pdo_pgsql/Makefile b/databases/php80-pdo_pgsql/Makefile index 498e7cf41073..6d64dd6a473a 100644 --- a/databases/php80-pdo_pgsql/Makefile +++ b/databases/php80-pdo_pgsql/Makefile @@ -1,11 +1,9 @@ CATEGORIES= databases -PORTREVISION= 1 - MASTERDIR= ${.CURDIR}/../../lang/php80 PKGNAMESUFFIX= -pdo_pgsql TEST_TARGET= test .include "${MASTERDIR}/Makefile" diff --git a/databases/php80-pdo_pgsql/files/patch-pgsql__statement.c b/databases/php80-pdo_pgsql/files/patch-pgsql__statement.c deleted file mode 100644 index 44a5391cd2a4..000000000000 --- a/databases/php80-pdo_pgsql/files/patch-pgsql__statement.c +++ /dev/null @@ -1,42 +0,0 @@ ---- pgsql_statement.c.orig 2021-05-05 08:26:44 UTC -+++ pgsql_statement.c -@@ -52,21 +52,6 @@ - #define VARCHARLABEL "varchar" - #define VARCHAROID 1043 - --#define PG_INT32_MIN (-0x7FFFFFFF-1) --#define PG_INT32_MAX (0x7FFFFFFF) -- --#if defined(_MSC_VER) --# define strtoll(s, f, b) _atoi64(s) --#elif !defined(HAVE_STRTOLL) --# if defined(HAVE_ATOLL) --# define strtoll(s, f, b) atoll(s) --# else --# define strtoll(s, f, b) strtol(s, f, b) --# endif --#endif -- -- -- - static int pgsql_stmt_dtor(pdo_stmt_t *stmt) - { - pdo_pgsql_stmt *S = (pdo_pgsql_stmt*)stmt->driver_data; -@@ -401,16 +386,7 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, str - S->param_formats[param->paramno] = 0; - } - -- if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_INT) { -- /* we need to check if the number requires bigints */ -- long long val = strtoll(Z_STRVAL_P(parameter), NULL, 10); -- -- if (val > PG_INT32_MAX || val < PG_INT32_MIN) { -- S->param_types[param->paramno] = INT8OID; -- } else { -- S->param_types[param->paramno] = INT4OID; -- } -- } else if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_LOB) { -+ if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_LOB) { - S->param_types[param->paramno] = 0; - S->param_formats[param->paramno] = 1; - } else { diff --git a/databases/php80-pdo_pgsql/files/patch-tests_bug__80892.phpt b/databases/php80-pdo_pgsql/files/patch-tests_bug__80892.phpt deleted file mode 100644 index 75fd17a53b94..000000000000 --- a/databases/php80-pdo_pgsql/files/patch-tests_bug__80892.phpt +++ /dev/null @@ -1,80 +0,0 @@ ---- tests/bug_80892.phpt.orig 2021-05-05 08:30:53 UTC -+++ tests/bug_80892.phpt -@@ -1,77 +0,0 @@ ----TEST-- --Bug #80892 PDO::PARAM_INT is treated the same as PDO::PARAM_STR ----SKIPIF-- -- ----FILE-- --setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); --$db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC); -- --$db->exec("CREATE OR REPLACE FUNCTION bug80892 (x bigint) RETURNS varchar AS $$ SELECT 'bigint' $$ LANGUAGE sql"); --$db->exec("CREATE OR REPLACE FUNCTION bug80892 (x int) RETURNS varchar AS $$ SELECT 'int' $$ LANGUAGE sql"); --$db->exec("CREATE OR REPLACE FUNCTION bug80892 (x text) RETURNS varchar AS $$ SELECT 'text' $$ LANGUAGE sql"); -- --// Sanity check --var_dump($db->query("SELECT bug80892(2147483648)")->fetchColumn()); --var_dump($db->query("SELECT bug80892(1)")->fetchColumn()); --var_dump($db->query("SELECT bug80892('1')")->fetchColumn()); -- --// No binding --$stmt = $db->prepare("SELECT bug80892(?)"); --$stmt->execute([1]); --var_dump($stmt->fetchColumn()); -- --// Bind int value as string --$stmt = $db->prepare("SELECT bug80892(?)"); --$stmt->bindValue(1, 1, PDO::PARAM_STR); --$stmt->execute(); --var_dump($stmt->fetchColumn()); -- --// Bind int value as int --$stmt = $db->prepare("SELECT bug80892(?)"); --$stmt->bindValue(1, 1, PDO::PARAM_INT); --$stmt->execute(); --var_dump($stmt->fetchColumn()); -- --// Bind string value as int --$stmt = $db->prepare("SELECT bug80892(?)"); --$stmt->bindValue(1, '1', PDO::PARAM_INT); --$stmt->execute(); --var_dump($stmt->fetchColumn()); -- --// Bind bigint string value as int --$stmt = $db->prepare("SELECT bug80892(?)"); --$stmt->bindValue(1, '2147483648', PDO::PARAM_INT); --$stmt->execute(); --var_dump($stmt->fetchColumn()); -- --// Bind negative bigint (string on 32bit) as int --$stmt = $db->prepare("SELECT bug80892(?)"); --$stmt->bindValue(1, PHP_INT_SIZE == 4 ? '-33333333333' : -33333333333, PDO::PARAM_INT); --$stmt->execute(); --var_dump($stmt->fetchColumn()); -- --$db->exec("DROP FUNCTION bug80892 (bigint)"); --$db->exec("DROP FUNCTION bug80892 (int)"); --$db->exec("DROP FUNCTION bug80892 (text)"); -- --?> ----EXPECT-- --string(6) "bigint" --string(3) "int" --string(4) "text" --string(4) "text" --string(4) "text" --string(3) "int" --string(3) "int" --string(6) "bigint" --string(6) "bigint" diff --git a/devel/php80-intl/Makefile b/devel/php80-intl/Makefile index 402bf4649be6..ac523eb118cd 100644 --- a/devel/php80-intl/Makefile +++ b/devel/php80-intl/Makefile @@ -1,15 +1,14 @@ -PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php80 PKGNAMESUFFIX= -intl USES= compiler:c++11-lib USE_CXXSTD= gnu++11 CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 TEST_TARGET= test .include "${MASTERDIR}/Makefile" diff --git a/lang/php80/Makefile b/lang/php80/Makefile index d7f51cf27f02..1e4c627208c8 100644 --- a/lang/php80/Makefile +++ b/lang/php80/Makefile @@ -1,210 +1,210 @@ PORTNAME= php80 -DISTVERSION= 8.0.5 +DISTVERSION= 8.0.6 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${DISTVERSION} MAINTAINER= tz@FreeBSD.org COMMENT= PHP Scripting Language LICENSE= PHP301 USES+= compiler:c11 tar:xz cpe gnome pkgconfig CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ libargon2.so:security/libargon2 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-layout=GNU \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ --with-libxml \ --with-password-argon2=${LOCALBASE} \ --program-prefix="" CPPFLAGS= -I${LOCALBASE}/include USES+= autoreconf:build USE_GNOME= libxml2 # PR230207 Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-z,notext OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQLND MYSQL80 LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE OPTIONS_EXCLUDE_DragonFly= DTRACE # ld(1) fails to link probes: Relocations in generic ELF (EM: 0) OPTIONS_EXCLUDE_aarch64= DTRACE # dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE # Bug 197128: No ASM code for MIPS/MIPS64, disable FPM OPTIONS_EXCLUDE_mips= DTRACE FPM OPTIONS_EXCLUDE_mips64= DTRACE FPM OPTIONS_EXCLUDE_powerpc= DTRACE OPTIONS_EXCLUDE_powerpc64= ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}} OPTIONS_EXCLUDE_powerpc64_11= DTRACE OPTIONS_EXCLUDE_powerpc64_12= DTRACE OPTIONS_EXCLUDE_sparc64= DTRACE OPTIONS_SUB= yes CLI_DESC= Build CLI version CGI_DESC= Build CGI version FPM_DESC= Build FPM version EMBED_DESC= Build embedded library PHPDBG_DESC= Interactive PHP debugger MYSQLND_DESC= Build with MySQL Native Driver MYSQL80_DESC= Build with MySQL caching password mechanism LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build MYSQL80_CONFIGURE_ON= --with-openssl MYSQL80_CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \ PHP_OPENSSL=no MYSQL80_LDFLAGS= -L${OPENSSLLIB} -lcrypto -lssl MYSQL80_USES= ssl CONFLICTS= php72-* php73-* php74-* DESTDIRNAME= INSTALL_ROOT .include .if ${PORT_OPTIONS:MMYSQLND} CONFIGURE_ARGS+=--enable-mysqlnd .endif .if ${PORT_OPTIONS:MCLI} PHP_SAPI+= cli .else CONFIGURE_ARGS+=--disable-cli .endif .if ${PORT_OPTIONS:MCGI} PHP_SAPI+= cgi .else CONFIGURE_ARGS+=--disable-cgi .endif .if ${PORT_OPTIONS:MFPM} PHP_SAPI+= fpm USE_RC_SUBR+= php-fpm CONFIGURE_ARGS+=--enable-fpm \ --with-fpm-user=${WWWOWN} \ --with-fpm-group=${WWWGRP} .endif .if defined(PKGNAMEPREFIX) USES+= apache:2.2+ .include "${PORTSDIR}/Mk/Uses/apache.mk" .if ${PORT_OPTIONS:MAP2FILTER} CONFIGURE_ARGS+=--with-apxs2filter=${APXS} .else CONFIGURE_ARGS+=--with-apxs2=${APXS} .endif PLIST= ${PKGDIR}/pkg-plist.mod PKGMESSAGE= ${PKGDIR}/pkg-message.mod MODULENAME= libphp SHORTMODNAME= php WARNING= "!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!" .endif .if ${PORT_OPTIONS:MEMBED} PHP_SAPI+= embed CONFIGURE_ARGS+=--enable-embed .endif .if ${PORT_OPTIONS:MPHPDBG} PHP_SAPI+= phpdbg CONFIGURE_ARGS+=--enable-phpdbg .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-phpdbg-debug .endif .endif .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED} PLIST_SUB+= SAPI_INC="" .else PLIST_SUB+= SAPI_INC="@comment " .endif CONFIGURE_ENV+= ac_cv_decimal_fp_supported="no" \ lt_cv_path_SED="sed" .if ${PORT_OPTIONS:MLINKTHR} LIBS+= -lpthread .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug .endif .if ${PORT_OPTIONS:MZTS} CONFIGURE_ARGS+=--enable-zts CONFIGURE_ENV+= pthreads_working="yes" .endif .if ${PORT_OPTIONS:MDTRACE} CONFIGURE_ARGS+=--enable-dtrace PLIST_SUB+= DTRACE="" .else PLIST_SUB+= DTRACE="@comment " .endif .if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+=--disable-ipv6 .endif .if ${PORT_OPTIONS:MMYSQL80} WARNING= "PHP is now built with MySQL 8.0 support which has caching password mechanism. \ This implies php80-openssl module. Hence php80-openssl can no longer be \ installed alongside with php80. If you require php80-openssl module please \ rebuild php80 with MYSQL80 OPTION disabled. Otherwise remove php80-openssl \ DEPENDENCY from ports." .endif post-patch: @${TOUCH} ${WRKSRC}/ext/php_config.h @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* .if ${PORT_OPTIONS:MFPM} @${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \ ${WRKSRC}/sapi/fpm/php-fpm.conf.in .endif pre-configure: @(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force) .if !defined(PKGNAMEPREFIX) post-build: @${ECHO_CMD} "PHP_VER=80" > ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf @${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf @${SH} ${WRKSRC}/scripts/php-config --extension-dir | ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf post-build-MYSQL80-off: @${ECHO_CMD} "PHP_EXT_INC=hash json pcre spl" >> ${WRKDIR}/php.conf post-build-MYSQL80-on: @${ECHO_CMD} "PHP_EXT_INC=hash json openssl pcre spl" >> ${WRKDIR}/php.conf test: build @(cd ${WRKSRC} && ${MAKE} test) post-install: ${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc .else do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \ ${STAGEDIR}${PREFIX}/${APACHEMODDIR} .endif .else .include "${MASTERDIR}/Makefile.ext" .endif .include diff --git a/lang/php80/distinfo b/lang/php80/distinfo index 036e72a17c2e..88282d6fad96 100644 --- a/lang/php80/distinfo +++ b/lang/php80/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619898019 -SHA256 (php-8.0.5.tar.xz) = 5dd358b35ecd5890a4f09fb68035a72fe6b45d3ead6999ea95981a107fd1f2ab -SIZE (php-8.0.5.tar.xz) = 10666412 +TIMESTAMP = 1620427272 +SHA256 (php-8.0.6.tar.xz) = e9871d3b6c391fe9e89f86f6334852dcc10eeaaa8d5565beb8436e7f0cf30e20 +SIZE (php-8.0.6.tar.xz) = 10764932