Date: Fri, 6 Nov 2020 11:37:21 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554288 - head/net/pecl-smbclient/files Message-ID: <202011061137.0A6BbLBN008898@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Fri Nov 6 11:37:21 2020 New Revision: 554288 URL: https://svnweb.freebsd.org/changeset/ports/554288 Log: Fix build with PHP 8.0 PR: 250529 Submitted by: fluffy Obtained from: https://github.com/eduardok/libsmbclient-php/commit/a8eab234dd19e32a73740bdd5689e36324b8be5d Added: head/net/pecl-smbclient/files/ head/net/pecl-smbclient/files/patch-php_smbclient.h (contents, props changed) head/net/pecl-smbclient/files/patch-smb_streams.c (contents, props changed) Added: head/net/pecl-smbclient/files/patch-php_smbclient.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pecl-smbclient/files/patch-php_smbclient.h Fri Nov 6 11:37:21 2020 (r554288) @@ -0,0 +1,19 @@ +Obtained from: https://github.com/eduardok/libsmbclient-php/commit/a8eab234dd19e32a73740bdd5689e36324b8be5d + +--- php_smbclient.h.orig 2018-12-24 15:25:25 UTC ++++ php_smbclient.h +@@ -128,6 +128,14 @@ PHP_FUNCTION(smbclient_fstatvfs); + #endif + #endif + ++#if PHP_MAJOR_VERSION >= 8 ++#define TSRMLS_D void ++#define TSRMLS_DC ++#define TSRMLS_C ++#define TSRMLS_CC ++#define TSRMLS_FETCH() ++#endif ++ + extern php_stream_wrapper php_stream_smb_wrapper; + php_smbclient_state * php_smbclient_state_new (php_stream_context *context, int init TSRMLS_DC); + void php_smbclient_state_free (php_smbclient_state *state TSRMLS_DC); Added: head/net/pecl-smbclient/files/patch-smb_streams.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pecl-smbclient/files/patch-smb_streams.c Fri Nov 6 11:37:21 2020 (r554288) @@ -0,0 +1,63 @@ +Obtained from: https://github.com/eduardok/libsmbclient-php/commit/a8eab234dd19e32a73740bdd5689e36324b8be5d + +--- smb_streams.c.orig 2018-12-24 15:25:25 UTC ++++ smb_streams.c +@@ -190,7 +190,11 @@ static int php_smb_ops_flush(php_stream *stream TSRMLS + return 0; + } + ++#if PHP_VERSION_ID < 70400 + static size_t php_smb_ops_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) ++#else ++static ssize_t php_smb_ops_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) ++#endif + { + ssize_t n = 0; + STREAM_DATA_FROM_STREAM(); +@@ -208,12 +212,20 @@ static size_t php_smb_ops_read(php_stream *stream, cha + if (n == 0 || n < (ssize_t)count) { + stream->eof = 1; + } ++#if PHP_VERSION_ID < 70400 + return (n < 1 ? 0 : (size_t)n); ++#else ++ return n; ++#endif + } + ++#if PHP_VERSION_ID < 70400 + static size_t php_smb_ops_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC) ++#else ++static ssize_t php_smb_ops_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC) ++#endif + { +- size_t len = 0; ++ ssize_t len = 0; + STREAM_DATA_FROM_STREAM(); + + if (!self || !self->handle) { +@@ -225,7 +237,12 @@ static size_t php_smb_ops_write(php_stream *stream, co + if (self->smbc_write) { + len = self->smbc_write(self->state->ctx, self->handle, buf, count); + } ++ ++#if PHP_VERSION_ID < 70400 ++ return (len < 0 ? 0 : (size_t)len); ++#else + return len; ++#endif + } + + static int php_smb_ops_stat(php_stream *stream, php_stream_statbuf *ssb TSRMLS_DC) /* {{{ */ +@@ -500,7 +517,11 @@ static int php_smbdir_ops_close(php_stream *stream, in + return EOF; + } + ++#if PHP_VERSION_ID < 70400 + static size_t php_smbdir_ops_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) ++#else ++static ssize_t php_smbdir_ops_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) ++#endif + { + struct smbc_dirent *dirent; + php_stream_dirent *ent = (php_stream_dirent*)buf;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011061137.0A6BbLBN008898>