diff options
author | taca <taca@pkgsrc.org> | 2021-01-03 15:18:58 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2021-01-03 15:18:58 +0000 |
commit | c57c18bc8d627307ee4ff3b43ae6cf0c23485a2e (patch) | |
tree | 21d3ad02c2a68b0eb0278470023efbea7d721296 /lang | |
parent | 0b04877f2ba5b0d0d49f3f3fa3856b1833d6081d (diff) | |
download | pkgsrc-c57c18bc8d627307ee4ff3b43ae6cf0c23485a2e.tar.gz |
lang/php72: remove php72
Remove php72 package which is EOL on 1st December 2020.
Diffstat (limited to 'lang')
27 files changed, 0 insertions, 1162 deletions
diff --git a/lang/php72/DESCR b/lang/php72/DESCR deleted file mode 100644 index 38f7454d90e..00000000000 --- a/lang/php72/DESCR +++ /dev/null @@ -1,23 +0,0 @@ -PHP is a widely-used open source general-purpose scripting language -that is especially suited for web development and can be embedded -into HTML. It is modular, and object-oriented. Much of its syntax -is borrowed from C, Java and Perl with a couple of unique PHP-specific -features thrown in. The language is designed to allow web developers -to write dynamically generated pages quickly. - -This package provides PHP version 7.2.x. - -PHP 7.2.x builds upon 7.1.x, adding new features: - -* Argument type declarations -* Object return type declarations -* Parameter Type Widening -* Trailing commas in list syntax -* HashContext as Object -* Argon2 in password hash -* Libsodium as part of PHP Core -* Deprecated: __autoload, $php_errormsg, create_function(), - mbstring.func_overload, parse_str() without second argument, - gmp_random(), each(), assert(), $errcontext -* uniqid() patch to avoid usleep() integrated, 10000x improvement on NetBSD, - about 10x on Linux diff --git a/lang/php72/MESSAGE b/lang/php72/MESSAGE deleted file mode 100644 index f4914137315..00000000000 --- a/lang/php72/MESSAGE +++ /dev/null @@ -1,11 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1 2017/11/15 08:56:12 jdolecek Exp $ - -To process PHP scripts, you will need a PHP-enabled HTTP server. You may -either configure the HTTP server to use the PHP CGI binary located in - - ${CGIDIR}/php - -or you may install a PHP module for your HTTP server, e.g. www/ap-php. - -=========================================================================== diff --git a/lang/php72/Makefile b/lang/php72/Makefile deleted file mode 100644 index f2b873fdd68..00000000000 --- a/lang/php72/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# $NetBSD: Makefile,v 1.30 2020/11/20 15:51:24 otis Exp $ - -# -# We can't omit PKGNAME here to handle PKG_OPTIONS. -# -PKGNAME= php-${PHP_VERSION:S/RC/rc/} -PKGREVISION= 2 - -COMMENT= PHP Hypertext Preprocessor version 7.2 -LICENSE= php - -TEST_TARGET= test - -USE_TOOLS+= gmake lex pkg-config -LIBTOOL_OVERRIDE= # empty -PHP_CHECK_INSTALLED= No - -PHP_VERSIONS_ACCEPTED= 72 - -.include "Makefile.php" - -CGIDIR= ${PREFIX}/libexec/cgi-bin -EGDIR= ${PREFIX}/share/examples/php -MESSAGE_SUBST+= CGIDIR=${CGIDIR} - -CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} -MAKE_ENV+= INSTALL_ROOT=${DESTDIR} - -CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini -PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" - -REPLACE_PHP= ext/phar/phar/phar.php run-tests.php - -SUBST_CLASSES+= path -SUBST_MESSAGE.path= Fixing common paths. -SUBST_STAGE.path= pre-configure -SUBST_FILES.path= php.ini-development php.ini-production -SUBST_FILES.path+= sapi/cgi/Makefile.frag -SUBST_VARS.path= CGIDIR PREFIX - -INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php - -# Make sure modules can link correctly -.if ${OPSYS} == "Darwin" -INSTALL_UNSTRIPPED= yes -.endif - -# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2) -# and lacks the zone memory allocator -.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) -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} - ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php - -.include "../../lang/php/replace.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/lang/php72/Makefile.common b/lang/php72/Makefile.common deleted file mode 100644 index 68e8e47a1e0..00000000000 --- a/lang/php72/Makefile.common +++ /dev/null @@ -1,28 +0,0 @@ -# $NetBSD: Makefile.common,v 1.3 2020/05/16 20:42:37 rillig Exp $ -# used by lang/php72/Makefile.php -# used by lang/php/ext.mk -# used by meta-pkgs/php72-extensions/Makefile - -PHP_VERSION_REQD= 72 - -.include "../../lang/php/common.mk" - -CATEGORIES+= www -MAINTAINER?= pkgsrc-users@NetBSD.org - -# needed due to (broken?) configure checks in php-xmlrpc and php5-dom -CONFIGURE_ENV+= PHP_LIBXML_SHARED="1" - -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -# configure test gets confused by wrappers dropping -R /usr/lib -CONFIGURE_ARGS+= php_cv_cc_dashr=no -.endif - -# not every extension actually depend on PCRE, and those which do -# don't use internal pcre structures, so default to build-time -# dependency only -BUILDLINK_DEPMETHOD.pcre?= build -CONFIGURE_ARGS+= --with-pcre-dir=${BUILDLINK_PREFIX.pcre} -GNU_CONFIGURE_STRICT= no -.include "../../devel/pcre/buildlink3.mk" diff --git a/lang/php72/Makefile.php b/lang/php72/Makefile.php deleted file mode 100644 index 3f68098b316..00000000000 --- a/lang/php72/Makefile.php +++ /dev/null @@ -1,58 +0,0 @@ -# $NetBSD: Makefile.php,v 1.17 2021/01/02 10:04:10 taca Exp $ -# used by lang/php72/Makefile -# used by www/ap-php/Makefile -# used by www/php-fpm/Makefile - -# segfaults when buidling with many compilers -# https://bugs.php.net/bug.php?id=74527 -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86236 -.if ${MACHINE_ARCH} == "i386" -CONFIGURE_ARGS+= --disable-gcc-global-regs -.endif - -# the binary actually needs full dep on PCRE -BUILDLINK_DEPMETHOD.pcre= full - -USE_LIBTOOL= YES -USE_LANGUAGES= c c++ -GNU_CONFIGURE= YES -BUILD_DEFS+= VARBASE -PLIST_VARS+= dtrace - -.include "../../lang/php72/Makefile.common" - -DISTINFO_FILE= ${.CURDIR}/../../lang/php72/distinfo -PATCHDIR= ${.CURDIR}/../../lang/php72/patches - -CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}" - -.include "../../mk/bsd.prefs.mk" - -CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --localstatedir=${VARBASE} - -CONFIGURE_ARGS+= --without-mysqli -CONFIGURE_ARGS+= --without-iconv -CONFIGURE_ARGS+= --without-pear -CONFIGURE_ARGS+= --without-sqlite3 -#CONFIGURE_ARGS+= --without-intl - -CONFIGURE_ARGS+= --disable-posix -CONFIGURE_ARGS+= --disable-opcache -CONFIGURE_ARGS+= --disable-pdo -CONFIGURE_ARGS+= --disable-json - -CONFIGURE_ARGS+= --enable-cgi -CONFIGURE_ARGS+= --enable-mysqlnd -CONFIGURE_ARGS+= --enable-xml -CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} -.include "../../textproc/libxml2/buildlink3.mk" - -CONFIGURE_ARGS+= --with-pcre-regex=${BUILDLINK_PREFIX.pcre} - -.include "options.mk" - -DL_AUTO_VARS= yes -.include "../../mk/dlopen.buildlink3.mk" diff --git a/lang/php72/PLIST b/lang/php72/PLIST deleted file mode 100644 index ad36f612638..00000000000 --- a/lang/php72/PLIST +++ /dev/null @@ -1,281 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2020/11/20 15:51:25 otis Exp $ -bin/phar -bin/phar.phar -bin/php -bin/php-config -bin/phpdbg -bin/phpize -include/php/TSRM/TSRM.h -include/php/TSRM/readdir.h -include/php/TSRM/tsrm_config.h -include/php/TSRM/tsrm_config.w32.h -include/php/TSRM/tsrm_config_common.h -include/php/TSRM/tsrm_strtok_r.h -include/php/TSRM/tsrm_win32.h -include/php/Zend/zend.h -include/php/Zend/zend_API.h -include/php/Zend/zend_alloc.h -include/php/Zend/zend_alloc_sizes.h -include/php/Zend/zend_arena.h -include/php/Zend/zend_ast.h -include/php/Zend/zend_bitset.h -include/php/Zend/zend_build.h -include/php/Zend/zend_builtin_functions.h -include/php/Zend/zend_closures.h -include/php/Zend/zend_compile.h -include/php/Zend/zend_config.h -include/php/Zend/zend_config.nw.h -include/php/Zend/zend_config.w32.h -include/php/Zend/zend_constants.h -include/php/Zend/zend_dtrace.h -${PLIST.dtrace}include/php/Zend/zend_dtrace_gen.h -include/php/Zend/zend_errors.h -include/php/Zend/zend_exceptions.h -include/php/Zend/zend_execute.h -include/php/Zend/zend_extensions.h -include/php/Zend/zend_float.h -include/php/Zend/zend_gc.h -include/php/Zend/zend_generators.h -include/php/Zend/zend_globals.h -include/php/Zend/zend_globals_macros.h -include/php/Zend/zend_hash.h -include/php/Zend/zend_highlight.h -include/php/Zend/zend_inheritance.h -include/php/Zend/zend_ini.h -include/php/Zend/zend_ini_parser.h -include/php/Zend/zend_ini_scanner.h -include/php/Zend/zend_ini_scanner_defs.h -include/php/Zend/zend_interfaces.h -include/php/Zend/zend_istdiostream.h -include/php/Zend/zend_iterators.h -include/php/Zend/zend_language_parser.h -include/php/Zend/zend_language_scanner.h -include/php/Zend/zend_language_scanner_defs.h -include/php/Zend/zend_list.h -include/php/Zend/zend_llist.h -include/php/Zend/zend_long.h -include/php/Zend/zend_modules.h -include/php/Zend/zend_multibyte.h -include/php/Zend/zend_multiply.h -include/php/Zend/zend_object_handlers.h -include/php/Zend/zend_objects.h -include/php/Zend/zend_objects_API.h -include/php/Zend/zend_operators.h -include/php/Zend/zend_portability.h -include/php/Zend/zend_ptr_stack.h -include/php/Zend/zend_range_check.h -include/php/Zend/zend_signal.h -include/php/Zend/zend_smart_str.h -include/php/Zend/zend_smart_str_public.h -include/php/Zend/zend_smart_string.h -include/php/Zend/zend_smart_string_public.h -include/php/Zend/zend_sort.h -include/php/Zend/zend_stack.h -include/php/Zend/zend_stream.h -include/php/Zend/zend_string.h -include/php/Zend/zend_strtod.h -include/php/Zend/zend_strtod_int.h -include/php/Zend/zend_ts_hash.h -include/php/Zend/zend_type_info.h -include/php/Zend/zend_types.h -include/php/Zend/zend_variables.h -include/php/Zend/zend_virtual_cwd.h -include/php/Zend/zend_vm.h -include/php/Zend/zend_vm_def.h -include/php/Zend/zend_vm_execute.h -include/php/Zend/zend_vm_opcodes.h -include/php/ext/date/lib/timelib.h -include/php/ext/date/lib/timelib_config.h -include/php/ext/date/php_date.h -include/php/ext/dom/xml_common.h -include/php/ext/filter/php_filter.h -include/php/ext/hash/php_hash.h -include/php/ext/hash/php_hash_adler32.h -include/php/ext/hash/php_hash_crc32.h -include/php/ext/hash/php_hash_fnv.h -include/php/ext/hash/php_hash_gost.h -include/php/ext/hash/php_hash_haval.h -include/php/ext/hash/php_hash_joaat.h -include/php/ext/hash/php_hash_md.h -include/php/ext/hash/php_hash_ripemd.h -include/php/ext/hash/php_hash_sha.h -include/php/ext/hash/php_hash_sha3.h -include/php/ext/hash/php_hash_snefru.h -include/php/ext/hash/php_hash_tiger.h -include/php/ext/hash/php_hash_whirlpool.h -include/php/ext/libxml/php_libxml.h -include/php/ext/mysqlnd/config-win.h -include/php/ext/mysqlnd/mysql_float_to_double.h -include/php/ext/mysqlnd/mysqlnd.h -include/php/ext/mysqlnd/mysqlnd_alloc.h -include/php/ext/mysqlnd/mysqlnd_auth.h -include/php/ext/mysqlnd/mysqlnd_block_alloc.h -include/php/ext/mysqlnd/mysqlnd_charset.h -include/php/ext/mysqlnd/mysqlnd_commands.h -include/php/ext/mysqlnd/mysqlnd_connection.h -include/php/ext/mysqlnd/mysqlnd_debug.h -include/php/ext/mysqlnd/mysqlnd_enum_n_def.h -include/php/ext/mysqlnd/mysqlnd_ext_plugin.h -include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h -include/php/ext/mysqlnd/mysqlnd_plugin.h -include/php/ext/mysqlnd/mysqlnd_portability.h -include/php/ext/mysqlnd/mysqlnd_priv.h -include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h -include/php/ext/mysqlnd/mysqlnd_ps.h -include/php/ext/mysqlnd/mysqlnd_read_buffer.h -include/php/ext/mysqlnd/mysqlnd_result.h -include/php/ext/mysqlnd/mysqlnd_result_meta.h -include/php/ext/mysqlnd/mysqlnd_reverse_api.h -include/php/ext/mysqlnd/mysqlnd_statistics.h -include/php/ext/mysqlnd/mysqlnd_structs.h -include/php/ext/mysqlnd/mysqlnd_vio.h -include/php/ext/mysqlnd/mysqlnd_wireprotocol.h -include/php/ext/mysqlnd/php_mysqlnd.h -include/php/ext/pcre/php_pcre.h -include/php/ext/phar/php_phar.h -include/php/ext/session/mod_files.h -include/php/ext/session/mod_user.h -include/php/ext/session/php_session.h -include/php/ext/simplexml/php_simplexml.h -include/php/ext/simplexml/php_simplexml_exports.h -include/php/ext/spl/php_spl.h -include/php/ext/spl/spl_array.h -include/php/ext/spl/spl_directory.h -include/php/ext/spl/spl_dllist.h -include/php/ext/spl/spl_engine.h -include/php/ext/spl/spl_exceptions.h -include/php/ext/spl/spl_fixedarray.h -include/php/ext/spl/spl_functions.h -include/php/ext/spl/spl_heap.h -include/php/ext/spl/spl_iterators.h -include/php/ext/spl/spl_observer.h -include/php/ext/standard/base64.h -include/php/ext/standard/basic_functions.h -include/php/ext/standard/crc32.h -include/php/ext/standard/credits.h -include/php/ext/standard/credits_ext.h -include/php/ext/standard/credits_sapi.h -include/php/ext/standard/crypt_blowfish.h -include/php/ext/standard/crypt_freesec.h -include/php/ext/standard/css.h -include/php/ext/standard/cyr_convert.h -include/php/ext/standard/datetime.h -include/php/ext/standard/dl.h -include/php/ext/standard/exec.h -include/php/ext/standard/file.h -include/php/ext/standard/flock_compat.h -include/php/ext/standard/fsock.h -include/php/ext/standard/head.h -include/php/ext/standard/html.h -include/php/ext/standard/html_tables.h -include/php/ext/standard/info.h -include/php/ext/standard/md5.h -include/php/ext/standard/microtime.h -include/php/ext/standard/pack.h -include/php/ext/standard/pageinfo.h -include/php/ext/standard/php_array.h -include/php/ext/standard/php_assert.h -include/php/ext/standard/php_browscap.h -include/php/ext/standard/php_crypt.h -include/php/ext/standard/php_crypt_r.h -include/php/ext/standard/php_dir.h -include/php/ext/standard/php_dns.h -include/php/ext/standard/php_ext_syslog.h -include/php/ext/standard/php_filestat.h -include/php/ext/standard/php_fopen_wrappers.h -include/php/ext/standard/php_ftok.h -include/php/ext/standard/php_http.h -include/php/ext/standard/php_image.h -include/php/ext/standard/php_incomplete_class.h -include/php/ext/standard/php_iptc.h -include/php/ext/standard/php_lcg.h -include/php/ext/standard/php_link.h -include/php/ext/standard/php_mail.h -include/php/ext/standard/php_math.h -include/php/ext/standard/php_metaphone.h -include/php/ext/standard/php_mt_rand.h -include/php/ext/standard/php_password.h -include/php/ext/standard/php_rand.h -include/php/ext/standard/php_random.h -include/php/ext/standard/php_smart_string.h -include/php/ext/standard/php_smart_string_public.h -include/php/ext/standard/php_standard.h -include/php/ext/standard/php_string.h -include/php/ext/standard/php_type.h -include/php/ext/standard/php_uuencode.h -include/php/ext/standard/php_var.h -include/php/ext/standard/php_versioning.h -include/php/ext/standard/proc_open.h -include/php/ext/standard/quot_print.h -include/php/ext/standard/scanf.h -include/php/ext/standard/sha1.h -include/php/ext/standard/streamsfuncs.h -include/php/ext/standard/uniqid.h -include/php/ext/standard/url.h -include/php/ext/standard/url_scanner_ex.h -include/php/ext/standard/winver.h -include/php/ext/xml/expat_compat.h -include/php/ext/xml/php_xml.h -include/php/main/SAPI.h -include/php/main/build-defs.h -include/php/main/fastcgi.h -include/php/main/fopen_wrappers.h -include/php/main/http_status_codes.h -include/php/main/php.h -include/php/main/php_compat.h -include/php/main/php_config.h -include/php/main/php_content_types.h -include/php/main/php_getopt.h -include/php/main/php_globals.h -include/php/main/php_ini.h -include/php/main/php_main.h -include/php/main/php_memory_streams.h -include/php/main/php_network.h -include/php/main/php_open_temporary_file.h -include/php/main/php_output.h -include/php/main/php_reentrancy.h -include/php/main/php_scandir.h -include/php/main/php_stdint.h -include/php/main/php_streams.h -include/php/main/php_syslog.h -include/php/main/php_ticks.h -include/php/main/php_variables.h -include/php/main/php_version.h -include/php/main/rfc1867.h -include/php/main/snprintf.h -include/php/main/spprintf.h -include/php/main/streams/php_stream_context.h -include/php/main/streams/php_stream_filter_api.h -include/php/main/streams/php_stream_glob_wrapper.h -include/php/main/streams/php_stream_mmap.h -include/php/main/streams/php_stream_plain_wrapper.h -include/php/main/streams/php_stream_transport.h -include/php/main/streams/php_stream_userspace.h -include/php/main/streams/php_streams_int.h -include/php/sapi/cli/cli.h -${PLIST.embed}include/php/sapi/embed/php_embed.h -${PLIST.embed}lib/libphp7.so -lib/php/build/Makefile.global -lib/php/build/acinclude.m4 -lib/php/build/ax_check_compile_flag.m4 -lib/php/build/config.guess -lib/php/build/config.sub -lib/php/build/libtool.m4 -lib/php/build/ltmain.sh -lib/php/build/mkdep.awk -lib/php/build/phpize.m4 -lib/php/build/run-tests.php -lib/php/build/scan_makefile_in.awk -lib/php/build/shtool -libexec/cgi-bin/php -man/man1/phar.1 -man/man1/phar.phar.1 -man/man1/php-cgi.1 -man/man1/php-config.1 -man/man1/php.1 -man/man1/phpdbg.1 -man/man1/phpize.1 -share/examples/php/php.ini-development -share/examples/php/php.ini-production -share/php/php.gif -@pkgdir ${PHPEXTDIR} diff --git a/lang/php72/buildlink3.mk b/lang/php72/buildlink3.mk deleted file mode 100644 index 3d37f9eaf8e..00000000000 --- a/lang/php72/buildlink3.mk +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.5 2020/11/05 09:06:58 ryoon Exp $ - -BUILDLINK_TREE+= php - -.if !defined(PHP_BUILDLINK3_MK) -PHP_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.php+= php>=7.1.99<7.2.99 -BUILDLINK_ABI_DEPENDS.php+= php>=7.2.34nb1 -BUILDLINK_PKGSRCDIR.php?= ../../lang/php72 - -.include "../../textproc/libxml2/buildlink3.mk" -.endif # PHP_BUILDLINK3_MK - -BUILDLINK_TREE+= -php diff --git a/lang/php72/distinfo b/lang/php72/distinfo deleted file mode 100644 index c8defbac2dd..00000000000 --- a/lang/php72/distinfo +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: distinfo,v 1.60 2020/11/12 10:59:05 markd Exp $ - -SHA1 (php-7.2.34.tar.xz) = 3dfe7bbed49e53f6ff76ca0b8c9162f78b1cc679 -RMD160 (php-7.2.34.tar.xz) = 52a993c201241e2dce521bad225f07330505b2cc -SHA512 (php-7.2.34.tar.xz) = 7ecc3de3b5db41ec4ff6a5ce6c7e77dc330753c6f3fd87db4d07d6bb763a0b047e83afeef2251b4c6a5d2ff53fd9f3d7e99d091ef2e2c6ab8f18db7447d8a97d -Size (php-7.2.34.tar.xz) = 12309432 bytes -SHA1 (patch-configure) = 6e66a79e691a84aa7ae461f8dec1752443ad6b61 -SHA1 (patch-disable-filter-url) = e9e92d686ddd1d1a1ece10fe4feee4e368fe510c -SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335 -SHA1 (patch-ext_intl_breakiterator_codepointiterator__internal.cpp) = c6702b071a1881ed35a1c1adc0e07ce53335e2e7 -SHA1 (patch-ext_intl_collator_collator__sort.c) = 7fdb751cabb24eb4097cfb5cf23ba217a9893530 -SHA1 (patch-ext_intl_dateformat_dateformat__attr.c) = 08a26ec534b67ed029426e4aa3bd26cb6761aead -SHA1 (patch-ext_intl_normalizer_normalizer__normalize.c) = 91aec32bd34ca94e9c3c544a57b2800986ac506b -SHA1 (patch-ext_intl_timezone_timezone__class.cpp) = da8e7a227c04f366aa9aab08c5042826baa965fe -SHA1 (patch-ext_intl_timezone_timezone__methods.cpp) = 48dc73ca68df2454549bb81de6da6753bbb097bc -SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd -SHA1 (patch-ext_recode_recode.c) = 639bf762302c7a30c88d3f3fa862494e0f847bdb -SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627 -SHA1 (patch-php.ini-development) = 3b21def5e80441c9f8a97a0723a325245bd62c44 -SHA1 (patch-php.ini-production) = 58261628364ade763e7e67f2b6226412a386afb7 -SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8 -SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3 -SHA1 (patch-sapi_fpm_fpm_events_port.c) = b82b7caffffde1343190fae430a68eb411b5cf8a -SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0 diff --git a/lang/php72/options.mk b/lang/php72/options.mk deleted file mode 100644 index 2cff4f3c886..00000000000 --- a/lang/php72/options.mk +++ /dev/null @@ -1,74 +0,0 @@ -# $NetBSD: options.mk,v 1.1 2021/01/02 10:04:10 taca Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} -PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline argon2 php-embed -PKG_SUPPORTED_OPTIONS+= disable-filter-url -PKG_SUGGESTED_OPTIONS+= inet6 ssl readline - -.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" -PKG_SUPPORTED_OPTIONS+= dtrace -.endif - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Minet6) -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif - -.if !empty(PKG_OPTIONS:Mssl) -. include "../../security/openssl/buildlink3.mk" -. if ${OPSYS} == "SunOS" -CONFIGURE_ARGS+= --with-openssl=yes -LIBS.SunOS+= -lcrypto -. else -CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} -. endif -.else -CONFIGURE_ARGS+= --without-openssl -.endif - -.if !empty(PKG_OPTIONS:Mmaintainer-zts) -CONFIGURE_ARGS+= --enable-maintainer-zts -.endif - -.if !empty(PKG_OPTIONS:Mreadline) -.include "../../devel/readline/buildlink3.mk" -CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} -.else -CONFIGURE_ARGS+= --without-readline -.endif - -.if !empty(PKG_OPTIONS:Mdtrace) -PLIST.dtrace= yes -CONFIGURE_ARGS+= --enable-dtrace - -# See https://bugs.php.net/bug.php?id=61268 -INSTALL_MAKE_FLAGS+= -r -.endif - -.if !empty(PKG_OPTIONS:Margon2) -CONFIGURE_ARGS+= --with-password-argon2=${BUILDLINK_PREFIX.argon2} -.include "../../security/argon2/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mdisable-filter-url) -CFLAGS+= -DDISABLE_FILTER_URL -.endif - -PLIST_VARS+= embed - -.if !empty(PKGNAME:Mphp-[7-9]*) -.if !empty(PKG_OPTIONS:Mphp-embed) -CONFIGURE_ARGS+= --enable-embed -INSTALLATION_DIRS+= include/php/sapi/embed -PLIST.embed= yes - -.PHONY: post-install-embed -post-install: post-install-embed -post-install-embed: - ${INSTALL_DATA} ${WRKSRC}/sapi/embed/php_embed.h ${DESTDIR}${PREFIX}/include/php/sapi/embed/ - ${INSTALL_LIB} ${WRKSRC}/libs/libphp7.so ${DESTDIR}${PREFIX}/lib/ -.endif -.endif diff --git a/lang/php72/patches/patch-configure b/lang/php72/patches/patch-configure deleted file mode 100644 index b90b5a3a7cf..00000000000 --- a/lang/php72/patches/patch-configure +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-configure,v 1.11 2019/03/11 13:43:22 jperkin Exp $ - -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 2019-02-05 15:43:47.000000000 +0000 -+++ configure -@@ -5463,9 +5463,6 @@ fi - case $host_alias in - *solaris*) - CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS" -- if test "${enable_libgcc+set}" != "set" && test "$GCC" = "yes"; then -- enable_libgcc=yes -- fi - ;; - *dgux*) - CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR" -@@ -7008,27 +7005,6 @@ EOF - ;; - esac - -- if test "$APACHE_VERSION" -lt 2004001; then -- APXS_MPM=`$APXS -q MPM_NAME` -- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then -- -- enable_maintainer_zts=yes -- if test "$pthreads_working" != "yes"; then -- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 -- fi -- -- fi -- else -- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` -- if test -n "$APACHE_THREADED_MPM"; then -- -- enable_maintainer_zts=yes -- if test "$pthreads_working" != "yes"; then -- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5 -- fi -- -- fi -- fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - -@@ -97130,12 +97106,7 @@ old_CC=$CC - if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then - CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" - INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" -- cat >meta_ccld<<EOF --#! /bin/sh --exec $CC $ac_cv_pthreads_cflags \$@ --EOF -- CC="$abs_builddir/meta_ccld" -- chmod +x meta_ccld -+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags" - fi - - if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then diff --git a/lang/php72/patches/patch-disable-filter-url b/lang/php72/patches/patch-disable-filter-url deleted file mode 100644 index 5e960ac911e..00000000000 --- a/lang/php72/patches/patch-disable-filter-url +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-disable-filter-url,v 1.1 2018/07/18 07:33:12 manu Exp $ - -Add build-time disable option for dangerous php://filter URL - -php://filter URL is a feature documented here: -http://php.net/manual/en/wrappers.php.php - -Unfortunately, it allows remote control of include() behavior -beyond what many developpers expected, enabling easy dump of -PHP source files. The administrator may want to disable the -feature for security sake, and this patch makes that possible. - ---- ./ext/standard/php_fopen_wrapper.c.orig -+++ ./ext/standard/php_fopen_wrapper.c -@@ -345,8 +345,9 @@ - "Error duping file descriptor " ZEND_LONG_FMT "; possibly it doesn't exist: " - "[%d]: %s", fildes_ori, errno, strerror(errno)); - return NULL; - } -+#ifndef DISABLE_FILTER_URL - } else if (!strncasecmp(path, "filter/", 7)) { - /* Save time/memory when chain isn't specified */ - if (strchr(mode, 'r') || strchr(mode, '+')) { - mode_rw |= PHP_STREAM_FILTER_READ; -@@ -382,8 +383,9 @@ - } - efree(pathdup); - - return stream; -+#endif /* !DISABLE_FILTER_URL */ - } else { - /* invalid php://thingy */ - php_error_docref(NULL, E_WARNING, "Invalid php:// URL specified"); - return NULL; diff --git a/lang/php72/patches/patch-ext_gd_config.m4 b/lang/php72/patches/patch-ext_gd_config.m4 deleted file mode 100644 index a8551525f7a..00000000000 --- a/lang/php72/patches/patch-ext_gd_config.m4 +++ /dev/null @@ -1,97 +0,0 @@ -$NetBSD: patch-ext_gd_config.m4,v 1.2 2018/11/14 21:26:54 markd Exp $ - -Allow pkg-config rather than freetype-config - ---- ext/gd/config.m4.orig 2018-10-09 15:09:51.000000000 +0000 -+++ ext/gd/config.m4 -@@ -43,18 +43,7 @@ dnl Checks for the configure options - dnl - - AC_DEFUN([PHP_GD_ZLIB],[ -- if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then -- if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then -- PHP_ZLIB_DIR="$PHP_ZLIB_DIR" -- PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib" -- elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then -- PHP_ZLIB_DIR="$PHP_ZLIB_DIR" -- PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" -- else -- AC_MSG_ERROR([Can't find zlib headers under "$PHP_ZLIB_DIR"]) -- fi -- else -- for i in /usr/local /usr; do -+ for i in "$PHP_ZLIB_DIR" /usr/local /usr; do - if test -f "$i/include/zlib/zlib.h"; then - PHP_ZLIB_DIR="$i" - PHP_ZLIB_INCDIR="$i/include/zlib" -@@ -63,7 +52,6 @@ AC_DEFUN([PHP_GD_ZLIB],[ - PHP_ZLIB_INCDIR="$i/include" - fi - done -- fi - ]) - - AC_DEFUN([PHP_GD_WEBP],[ -@@ -140,13 +128,13 @@ AC_DEFUN([PHP_GD_PNG],[ - AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=<DIR>]) - fi - -- PHP_CHECK_LIBRARY(png,png_write_image, -+ PHP_CHECK_LIBRARY(png16,png_write_image, - [ - PHP_ADD_INCLUDE($GD_PNG_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(png16, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) - ],[ -- AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.]) -+ AC_MSG_ERROR([Problem with libpng16.(a|so) or libz.(a|so). Please check config.log for more information.]) - ],[ - -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR - ]) -@@ -186,6 +174,9 @@ AC_DEFUN([PHP_GD_XPM],[ - AC_DEFUN([PHP_GD_FREETYPE2],[ - if test "$PHP_FREETYPE_DIR" != "no"; then - -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ -+ AC_MSG_CHECKING([for freetype]) - for i in $PHP_FREETYPE_DIR /usr/local /usr; do - if test -f "$i/bin/freetype-config"; then - FREETYPE2_DIR=$i -@@ -194,13 +185,20 @@ AC_DEFUN([PHP_GD_FREETYPE2],[ - fi - done - -- if test -z "$FREETYPE2_DIR"; then -+ if test -n "$FREETYPE2_CONFIG"; then -+ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` -+ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` -+ AC_MSG_RESULT([found in $FREETYPE2_DIR]) -+ elif test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists freetype2; then -+ FREETYPE2_DIR=pkg-config -+ FREETYPE2_CFLAGS=`$PKG_CONFIG freetype2 --cflags` -+ FREETYPE2_LIBS=`$PKG_CONFIG freetype2 --libs` -+ AC_MSG_RESULT([found by pkg-config]) -+ else -+ AC_MSG_RESULT([not found]) - AC_MSG_ERROR([freetype-config not found.]) - fi - -- FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` -- FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` -- - PHP_EVAL_INCLINE($FREETYPE2_CFLAGS) - PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD) - AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) -@@ -220,7 +218,9 @@ AC_DEFUN([PHP_GD_CHECK_VERSION],[ - PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) - PHP_CHECK_LIBRARY(gd, gdImageCreateFromWebp, [AC_DEFINE(HAVE_GD_WEBP, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) - PHP_CHECK_LIBRARY(gd, gdImageCreateFromJpeg, [AC_DEFINE(HAVE_GD_JPG, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) -- PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm, [AC_DEFINE(HAVE_GD_XPM, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) -+ if test "$PHP_XPM_DIR" != "no"; then -+ PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm, [AC_DEFINE(HAVE_GD_XPM, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) -+ fi - PHP_CHECK_LIBRARY(gd, gdImageCreateFromBmp, [AC_DEFINE(HAVE_GD_BMP, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) - PHP_CHECK_LIBRARY(gd, gdImageStringFT, [AC_DEFINE(HAVE_GD_FREETYPE, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) - PHP_CHECK_LIBRARY(gd, gdVersionString, [AC_DEFINE(HAVE_GD_LIBVERSION, 1, [ ])], [], [ $GD_SHARED_LIBADD ]) diff --git a/lang/php72/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp b/lang/php72/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp deleted file mode 100644 index 97c225237ee..00000000000 --- a/lang/php72/patches/patch-ext_intl_breakiterator_codepointiterator__internal.cpp +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-ext_intl_breakiterator_codepointiterator__internal.cpp,v 1.1 2020/11/11 20:01:34 markd Exp $ - -Use stdbool true/false macros. - ---- ext/intl/breakiterator/codepointiterator_internal.cpp.orig 2020-10-27 15:01:59.000000000 +0000 -+++ ext/intl/breakiterator/codepointiterator_internal.cpp -@@ -58,7 +58,7 @@ CodePointBreakIterator& CodePointBreakIt - return *this; - } - -- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); -+ this->fText = utext_clone(this->fText, that.fText, false, true, &uec); - - //don't bother copying the character iterator, getText() is deprecated - clearCurrentCharIter(); -@@ -78,17 +78,17 @@ CodePointBreakIterator::~CodePointBreakI - UBool CodePointBreakIterator::operator==(const BreakIterator& that) const - { - if (typeid(*this) != typeid(that)) { -- return FALSE; -+ return false; - } - - const CodePointBreakIterator& that2 = - static_cast<const CodePointBreakIterator&>(that); - - if (!utext_equals(this->fText, that2.fText)) { -- return FALSE; -+ return false; - } - -- return TRUE; -+ return true; - } - - CodePointBreakIterator* CodePointBreakIterator::clone(void) const -@@ -109,7 +109,7 @@ CharacterIterator& CodePointBreakIterato - - UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const - { -- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); -+ return utext_clone(fillIn, this->fText, false, true, &status); - } - - void CodePointBreakIterator::setText(const UnicodeString &text) -@@ -128,7 +128,7 @@ void CodePointBreakIterator::setText(UTe - return; - } - -- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); -+ this->fText = utext_clone(this->fText, text, false, true, &status); - - clearCurrentCharIter(); - } -@@ -280,7 +280,7 @@ CodePointBreakIterator &CodePointBreakIt - } - - int64_t pos = utext_getNativeIndex(this->fText); -- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); -+ this->fText = utext_clone(this->fText, input, false, true, &status); - if (U_FAILURE(status)) { - return *this; - } diff --git a/lang/php72/patches/patch-ext_intl_collator_collator__sort.c b/lang/php72/patches/patch-ext_intl_collator_collator__sort.c deleted file mode 100644 index af59662a143..00000000000 --- a/lang/php72/patches/patch-ext_intl_collator_collator__sort.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ext_intl_collator_collator__sort.c,v 1.1 2020/11/11 20:01:34 markd Exp $ - -Use stdbool true/false macros. - ---- ext/intl/collator/collator_sort.c.orig 2020-10-27 15:01:59.000000000 +0000 -+++ ext/intl/collator/collator_sort.c -@@ -346,7 +346,7 @@ static void collator_sort_internal( int - */ - PHP_FUNCTION( collator_sort ) - { -- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); -+ collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU ); - } - /* }}} */ - -@@ -540,7 +540,7 @@ PHP_FUNCTION( collator_sort_with_sort_ke - */ - PHP_FUNCTION( collator_asort ) - { -- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); -+ collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU ); - } - /* }}} */ - diff --git a/lang/php72/patches/patch-ext_intl_dateformat_dateformat__attr.c b/lang/php72/patches/patch-ext_intl_dateformat_dateformat__attr.c deleted file mode 100644 index e18c0595765..00000000000 --- a/lang/php72/patches/patch-ext_intl_dateformat_dateformat__attr.c +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ext_intl_dateformat_dateformat__attr.c,v 1.1 2020/11/11 20:01:34 markd Exp $ - -Use stdbool true/false macros. - ---- ext/intl/dateformat/dateformat_attr.c.orig 2020-10-27 15:01:59.000000000 +0000 -+++ ext/intl/dateformat/dateformat_attr.c -@@ -88,7 +88,7 @@ PHP_FUNCTION( datefmt_get_pattern ) - UChar value_buf[64]; - uint32_t length = USIZE( value_buf ); - UChar* value = value_buf; -- zend_bool is_pattern_localized =FALSE; -+ zend_bool is_pattern_localized =false; - - DATE_FORMAT_METHOD_INIT_VARS; - -@@ -131,7 +131,7 @@ PHP_FUNCTION( datefmt_set_pattern ) - size_t value_len = 0; - int32_t slength = 0; - UChar* svalue = NULL; -- zend_bool is_pattern_localized =FALSE; -+ zend_bool is_pattern_localized =false; - - - DATE_FORMAT_METHOD_INIT_VARS; -@@ -227,7 +227,7 @@ PHP_FUNCTION( datefmt_is_lenient ) - */ - PHP_FUNCTION( datefmt_set_lenient ) - { -- zend_bool isLenient = FALSE; -+ zend_bool isLenient = false; - - DATE_FORMAT_METHOD_INIT_VARS; - diff --git a/lang/php72/patches/patch-ext_intl_normalizer_normalizer__normalize.c b/lang/php72/patches/patch-ext_intl_normalizer_normalizer__normalize.c deleted file mode 100644 index 31c3f18b377..00000000000 --- a/lang/php72/patches/patch-ext_intl_normalizer_normalizer__normalize.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ext_intl_normalizer_normalizer__normalize.c,v 1.2 2020/11/12 10:59:05 markd Exp $ - -Use stdbool true/false macros. - ---- ext/intl/normalizer/normalizer_normalize.c.orig 2020-09-30 05:15:54.000000000 +0000 -+++ ext/intl/normalizer/normalizer_normalize.c -@@ -178,7 +178,7 @@ PHP_FUNCTION( normalizer_is_normalized ) - int uinput_len = 0; - UErrorCode status = U_ZERO_ERROR; - -- UBool uret = FALSE; -+ UBool uret = false; - - intl_error_reset( NULL ); - diff --git a/lang/php72/patches/patch-ext_intl_timezone_timezone__class.cpp b/lang/php72/patches/patch-ext_intl_timezone_timezone__class.cpp deleted file mode 100644 index 1bcc30d7ecb..00000000000 --- a/lang/php72/patches/patch-ext_intl_timezone_timezone__class.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ext_intl_timezone_timezone__class.cpp,v 1.1 2020/11/11 20:01:34 markd Exp $ - -Use stdbool true/false macros. - ---- ext/intl/timezone/timezone_class.cpp.orig 2020-10-27 15:01:59.000000000 +0000 -+++ ext/intl/timezone/timezone_class.cpp -@@ -325,7 +325,7 @@ static HashTable *TimeZone_get_debug_inf - - int32_t rawOffset, dstOffset; - UDate now = Calendar::getNow(); -- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec); -+ tz->getOffset(now, false, rawOffset, dstOffset, uec); - if (U_FAILURE(uec)) { - return debug_info; - } diff --git a/lang/php72/patches/patch-ext_intl_timezone_timezone__methods.cpp b/lang/php72/patches/patch-ext_intl_timezone_timezone__methods.cpp deleted file mode 100644 index 70f24965726..00000000000 --- a/lang/php72/patches/patch-ext_intl_timezone_timezone__methods.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ext_intl_timezone_timezone__methods.cpp,v 1.1 2020/11/11 20:01:34 markd Exp $ - -Use stdbool true/false macros. - ---- ext/intl/timezone/timezone_methods.cpp.orig 2020-10-27 15:01:59.000000000 +0000 -+++ ext/intl/timezone/timezone_methods.cpp -@@ -95,7 +95,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_ti - RETURN_NULL(); - } - -- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL, -+ tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL, - "intltz_from_date_time_zone"); - if (tz == NULL) { - RETURN_NULL(); diff --git a/lang/php72/patches/patch-ext_phar_Makefile.frag b/lang/php72/patches/patch-ext_phar_Makefile.frag deleted file mode 100644 index 5dceb018a9f..00000000000 --- a/lang/php72/patches/patch-ext_phar_Makefile.frag +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ext_phar_Makefile.frag,v 1.2 2019/12/16 15:58:18 taca Exp $ - -Set shbang for phar correctly. - ---- ext/phar/Makefile.frag.orig 2015-06-23 17:33:33.000000000 +0000 -+++ ext/phar/Makefile.frag -@@ -18,7 +18,7 @@ PHP_PHARCMD_EXECUTABLE = ` \ - else \ - $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ - fi;` --PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` -+PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` - - $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc - -@test -d $(builddir)/phar || mkdir $(builddir)/phar diff --git a/lang/php72/patches/patch-ext_recode_recode.c b/lang/php72/patches/patch-ext_recode_recode.c deleted file mode 100644 index b16e149c399..00000000000 --- a/lang/php72/patches/patch-ext_recode_recode.c +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ext_recode_recode.c,v 1.2 2017/12/03 12:48:56 jdolecek Exp $ - -program_name is expected variable, is required by recode 3.5 and -recode 3.6 to actually work. - -The config.m4 test for it is broken at least for some platforms - -it only tests if program without it compiles, but on Solaris and -MacOS/Darwin at least it only fails when run. - -Reported upstream as #75617 - ---- ext/recode/recode.c.orig 2016-07-24 13:07:47.000000000 +0000 -+++ ext/recode/recode.c -@@ -29,11 +29,8 @@ - - #if HAVE_LIBRECODE - --/* For recode 3.5 */ --#if HAVE_BROKEN_RECODE --extern char *program_name; --char *program_name = "php"; --#endif -+extern const char *program_name; -+const char *program_name = "php"; - - #ifdef HAVE_STDBOOL_H - # include <stdbool.h> diff --git a/lang/php72/patches/patch-ext_xsl_php__xsl.h b/lang/php72/patches/patch-ext_xsl_php__xsl.h deleted file mode 100644 index 12f99c36b37..00000000000 --- a/lang/php72/patches/patch-ext_xsl_php__xsl.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ext_xsl_php__xsl.h,v 1.1 2017/11/15 08:56:12 jdolecek Exp $ - -The dom header is now supplied by the main php bl3. - ---- ext/xsl/php_xsl.h.orig 2017-03-14 13:17:46.000000000 +0000 -+++ ext/xsl/php_xsl.h -@@ -41,7 +41,7 @@ extern zend_module_entry xsl_module_entr - #include <libexslt/exsltconfig.h> - #endif - --#include "../dom/xml_common.h" -+#include "dom/xml_common.h" - #include "xsl_fe.h" - - #include <libxslt/extensions.h> diff --git a/lang/php72/patches/patch-php.ini-development b/lang/php72/patches/patch-php.ini-development deleted file mode 100644 index 0815b82a2dd..00000000000 --- a/lang/php72/patches/patch-php.ini-development +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-php.ini-development,v 1.2 2019/12/16 15:58:18 taca Exp $ - -Set proper default configuration values. - ---- php.ini-development.orig 2015-06-23 17:33:33.000000000 +0000 -+++ php.ini-development -@@ -697,7 +697,7 @@ default_charset = "UTF-8" - ;;;;;;;;;;;;;;;;;;;;;;;;; - - ; UNIX: "/path1:/path2" --;include_path = ".:/php/includes" -+include_path = ".:@PREFIX@/lib/php" - ; - ; Windows: "\path1;\path2" - ;include_path = ".;c:\php\includes" -@@ -718,8 +718,8 @@ doc_root = - ; http://php.net/user-dir - user_dir = - --; Directory in which the loadable extensions (modules) reside. --; http://php.net/extension-dir -+; Directory in which the loadable extensions (modules) reside. If not -+; defined, then use the extension directory specified at compile-time. - ; extension_dir = "./" - ; On windows: - ; extension_dir = "ext" -@@ -792,7 +792,7 @@ file_uploads = On - ; Temporary directory for HTTP uploaded files (will use system default if not - ; specified). - ; http://php.net/upload-tmp-dir --;upload_tmp_dir = -+upload_tmp_dir = /tmp - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize diff --git a/lang/php72/patches/patch-php.ini-production b/lang/php72/patches/patch-php.ini-production deleted file mode 100644 index e2cafddc877..00000000000 --- a/lang/php72/patches/patch-php.ini-production +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-php.ini-production,v 1.2 2019/12/16 15:58:18 taca Exp $ - -Set proper default configuration values. - ---- php.ini-production.orig 2015-06-23 17:33:33.000000000 +0000 -+++ php.ini-production -@@ -697,7 +697,7 @@ default_charset = "UTF-8" - ;;;;;;;;;;;;;;;;;;;;;;;;; - - ; UNIX: "/path1:/path2" --;include_path = ".:/php/includes" -+include_path = ".:@PREFIX@/lib/php" - ; - ; Windows: "\path1;\path2" - ;include_path = ".;c:\php\includes" -@@ -718,8 +718,8 @@ doc_root = - ; http://php.net/user-dir - user_dir = - --; Directory in which the loadable extensions (modules) reside. --; http://php.net/extension-dir -+; Directory in which the loadable extensions (modules) reside. If not -+; defined, then use the extension directory specified at compile-time. - ; extension_dir = "./" - ; On windows: - ; extension_dir = "ext" -@@ -792,7 +792,7 @@ file_uploads = On - ; Temporary directory for HTTP uploaded files (will use system default if not - ; specified). - ; http://php.net/upload-tmp-dir --;upload_tmp_dir = -+upload_tmp_dir = /tmp - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize diff --git a/lang/php72/patches/patch-sapi_cgi_Makefile.frag b/lang/php72/patches/patch-sapi_cgi_Makefile.frag deleted file mode 100644 index fe7c1a2f306..00000000000 --- a/lang/php72/patches/patch-sapi_cgi_Makefile.frag +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.2 2019/12/16 15:58:18 taca Exp $ - -Install to CGI directory. - ---- sapi/cgi/Makefile.frag.orig 2015-06-23 17:33:33.000000000 +0000 -+++ sapi/cgi/Makefile.frag -@@ -4,9 +4,9 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(P - $(BUILD_CGI) - - install-cgi: $(SAPI_CGI_PATH) -- @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" -+ @echo "Installing PHP CGI binary: $(INSTALL_ROOT)@CGIDIR@/" - @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) -- @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) -+ @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)@CGIDIR@/$(program_prefix)php$(program_suffix)$(EXEEXT) - @echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/" - @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 - @$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1 diff --git a/lang/php72/patches/patch-sapi_cli_Makefile.frag b/lang/php72/patches/patch-sapi_cli_Makefile.frag deleted file mode 100644 index b2f92cc92a6..00000000000 --- a/lang/php72/patches/patch-sapi_cli_Makefile.frag +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-sapi_cli_Makefile.frag,v 1.1 2017/11/15 08:56:12 jdolecek Exp $ - -Needed on NetBSD with PaX MPROTEXT, otherwise core dump with: -#1 0x00000000004d0d87 in _pcre_jit_exec () -#2 0x00000000004a53f1 in php_pcre_exec () -https://bugs.php.net/bug.php?id=72281 - ---- sapi/cli/Makefile.frag.orig 2016-04-28 18:12:27.000000000 +0000 -+++ sapi/cli/Makefile.frag -@@ -2,6 +2,9 @@ cli: $(SAPI_CLI_PATH) - - $(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS) - $(BUILD_CLI) -+ @if test -x /usr/sbin/paxctl; then \ -+ /usr/sbin/paxctl +m $(SAPI_CLI_PATH); \ -+ fi - - install-cli: $(SAPI_CLI_PATH) - @echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/" diff --git a/lang/php72/patches/patch-sapi_fpm_fpm_events_port.c b/lang/php72/patches/patch-sapi_fpm_fpm_events_port.c deleted file mode 100644 index c0c175436cf..00000000000 --- a/lang/php72/patches/patch-sapi_fpm_fpm_events_port.c +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-sapi_fpm_fpm_events_port.c,v 1.2 2018/02/04 15:38:41 jdolecek Exp $ - -Similar to upstream bug #65800. We should resubmit this patch and -get that bugfix intergrated, by changing port_associate() call to -use the wrapper fpm_event_port_add(). - ---- sapi/fpm/fpm/events/port.c.orig 2015-06-23 17:33:33.000000000 +0000 -+++ sapi/fpm/fpm/events/port.c -@@ -124,6 +124,7 @@ static int fpm_event_port_wait(struct fp - t.tv_nsec = (timeout % 1000) * 1000 * 1000; - - /* wait for inconming event or timeout. We want at least one event or timeout */ -+again: - nget = 1; - ret = port_getn(pfd, events, nevents, &nget, &t); - if (ret < 0) { -@@ -133,17 +134,31 @@ static int fpm_event_port_wait(struct fp - zlog(ZLOG_WARNING, "poll() returns %d", errno); - return -1; - } -+ -+ if (errno == EINTR) -+ goto again; -+ -+ return 0; - } - - for (i = 0; i < nget; i++) { -+ struct fpm_event_s *ev; - - /* do we have a ptr to the event ? */ - if (!events[i].portev_user) { - continue; - } - -+ ev = (struct fpm_event_s *)events[i].portev_user; -+ -+ if (port_associate(pfd, PORT_SOURCE_FD, -+ ev->fd, POLLIN, (void *)ev) < 0) { -+ zlog(ZLOG_ERROR, "port: unable to add the event"); -+ return -1; -+ } -+ - /* fire the event */ -- fpm_event_fire((struct fpm_event_s *)events[i].portev_user); -+ fpm_event_fire(ev); - - /* sanity check */ - if (fpm_globals.parent_pid != getpid()) { diff --git a/lang/php72/patches/patch-sapi_fpm_php-fpm.conf.in b/lang/php72/patches/patch-sapi_fpm_php-fpm.conf.in deleted file mode 100644 index 48f7f4d6bd7..00000000000 --- a/lang/php72/patches/patch-sapi_fpm_php-fpm.conf.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-sapi_fpm_php-fpm.conf.in,v 1.2 2019/12/16 15:58:18 taca Exp $ - -Set proper default configuration values. - ---- sapi/fpm/php-fpm.conf.in.orig 2015-06-23 17:33:33.000000000 +0000 -+++ sapi/fpm/php-fpm.conf.in -@@ -14,7 +14,7 @@ - ; Pid file - ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ - ; Default Value: none --;pid = run/php-fpm.pid -+pid = run/php-fpm.pid - - ; Error log file - ; If it's set to "syslog", log is sent to syslogd instead of being written |