From nobody Fri Jan 28 23:28:19 2022 X-Original-To: dev-commits-ports-main@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 AB8361995C88; Fri, 28 Jan 2022 23:28:29 +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 4Jlttg6bHFz4tjd; Fri, 28 Jan 2022 23:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643412508; 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=t4e+PRT1WbNR1g5e+UA0z0xS7oWEq6Ixntq5MpX9Qa0=; b=RbfgpmN2+nC0BUE/IfK62nfE9kSuFsxlgh4VYbATxzDMBQzkKZvJmwvgMNGbhUqP5+ZE2U baguyaiv5C2IUlT9xzIizqNA8Fsl09th4Coa4yUeNE5KQl7qMCFRxlAF7J6DJuPuBsfWmp VG2EgY1AXdJ6srnQHdZvnVlPUCLHLP6A0elU5ezfHtEMWkJ46fcFbevZ1kCSz9NbiStVWp QqOiH2IPnQle+9tbe4Ooud/I5fGYhY+JaRQ5RgNdP1tATVQXTsqPTFduh0dAGaNb2FR+Ih 0a2LSXJB2D2I+pCkC9TDbHS7BJRNmN2WOudFaso+9p7n4nFJjJ5ABAfcydpe/A== 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 D0E2D3027; Fri, 28 Jan 2022 23:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20SNSJpi094596; Fri, 28 Jan 2022 23:28:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20SNSJrT094595; Fri, 28 Jan 2022 23:28:19 GMT (envelope-from git) Date: Fri, 28 Jan 2022 23:28:19 GMT Message-Id: <202201282328.20SNSJrT094595@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: c5e0b8b2123e - main - security/pecl-pkcs11: Fix build with PHP 8.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5e0b8b2123e07c969f1807d45e850af7985ac87 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643412508; 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=t4e+PRT1WbNR1g5e+UA0z0xS7oWEq6Ixntq5MpX9Qa0=; b=HGhrQiVc/0ZDkkEeJ/5gFVyAkXGaeBrOQIjVP1BXkTCgFdclt3tWw2L1ywOfhRY3PchGTt FSI5BnHo0F9mEIbBdXVFyng/md3zs+IV//iieT+tFIhnQnOUN4hw9qZuXG26oTNBh211J6 oFmQyLyDuXJiGJwu/U9QOgh/6mRSe0lFM3nC47iluAuV/aMaYpM33CJY7Ai1u1bvH4nQmy UZ4T6Vc2owhAjEIy+TAT9MgO8zgYW4jfctpWQcVKWB2hkqd54gE7vQ0kt1LWhDZeWnTXrg uQNMxkDfjZ6L7FZomH3vwAdmqtVZ412CM6kqac5u1n/MucCnSaui7kmh4R9drA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643412508; a=rsa-sha256; cv=none; b=b1LnWezQ7QPyutJJ/mNKIKhJwjCZrvwWAqAWKicnJJUsfL06G42WAudSw6pGVBKMbW5lzK 7e0R+2Ud2OBOAan99LE5bfoCyag3b1xrBR//h6fe6Gr0fjG8+u5e5RoD429Q7WsyWYHzyx BkZ2ppVEw9vfPi7O00t+0LykUO0AgUDib8CdSAnv3OYGe1HTSpy70NPFlKP+v3Kmun8xue ALMt1D6pIBsJP4Y85dvmTYKW/GVn5K072TuKt6iiYEh7t9hpRY6k7kAfsGjkZxsX1fewhg bs0X4oAE3E351BgpuojHovONnPgUr+G86eYm6PBoGgMOBRSbtUOR6eJ8KO9ntw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5e0b8b2123e07c969f1807d45e850af7985ac87 commit c5e0b8b2123e07c969f1807d45e850af7985ac87 Author: Po-Chuan Hsieh AuthorDate: 2022-01-28 23:19:14 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-01-28 23:26:43 +0000 security/pecl-pkcs11: Fix build with PHP 8.1 Obtained from: https://github.com/gamringer/php-pkcs11/commit/0df4a939a65137ef9002077cad4e6dab8c58c6cc --- security/pecl-pkcs11/Makefile | 2 -- security/pecl-pkcs11/files/patch-php81 | 46 ++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/security/pecl-pkcs11/Makefile b/security/pecl-pkcs11/Makefile index fd82b25a97d7..936b9386da86 100644 --- a/security/pecl-pkcs11/Makefile +++ b/security/pecl-pkcs11/Makefile @@ -12,6 +12,4 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= localbase php:pecl -IGNORE_WITH_PHP=81 - .include diff --git a/security/pecl-pkcs11/files/patch-php81 b/security/pecl-pkcs11/files/patch-php81 new file mode 100644 index 000000000000..c09ad9077ecd --- /dev/null +++ b/security/pecl-pkcs11/files/patch-php81 @@ -0,0 +1,46 @@ +Obtained from: https://github.com/gamringer/php-pkcs11/commit/0df4a939a65137ef9002077cad4e6dab8c58c6cc + +--- pkcs11int.h.orig 2021-03-23 21:45:06 UTC ++++ pkcs11int.h +@@ -192,6 +192,19 @@ DECLARE_MAGIC_FUNCS(pkcs11_digestcontext, + DECLARE_MAGIC_FUNCS(pkcs11_encryptioncontext, EncryptionContext) + DECLARE_MAGIC_FUNCS(pkcs11_decryptioncontext, DecryptionContext) + ++#if PHP_VERSION_ID < 80100 ++ ++#define PKCS11_ACC_NOT_SERIALIZABLE(ce) \ ++ ce->serialize = zend_class_serialize_deny; \ ++ ce->unserialize = zend_class_unserialize_deny; ++ ++#else ++ ++#define PKCS11_ACC_NOT_SERIALIZABLE(ce) \ ++ ce->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE; ++ ++#endif ++ + #define DEFINE_MAGIC_FUNCS(tt, lowername, classname) \ + static zend_object *tt##_ctor(zend_class_entry *ce) { \ + tt##_object *objval = zend_object_alloc(sizeof(tt##_object), ce); \ +@@ -216,8 +229,7 @@ void register_##tt() { + tt##_handlers.clone_obj = NULL; \ + tt##_handlers.free_obj = tt##_dtor; \ + ce_Pkcs11_##classname = zend_register_internal_class(&ce); \ +- ce_Pkcs11_##classname->serialize = zend_class_serialize_deny; \ +- ce_Pkcs11_##classname->unserialize = zend_class_unserialize_deny; \ ++ PKCS11_ACC_NOT_SERIALIZABLE(ce_Pkcs11_##classname); \ + } + + +--- pkcs11key.c.orig 2021-03-23 21:45:06 UTC ++++ pkcs11key.c +@@ -612,6 +612,5 @@ void register_pkcs11_key() { + pkcs11_key_handlers.offset = XtOffsetOf(pkcs11_key_object, std); + pkcs11_key_handlers.clone_obj = NULL; + ce_Pkcs11_Key = zend_register_internal_class_ex(&ce, ce_Pkcs11_P11Object); +- ce_Pkcs11_Key->serialize = zend_class_serialize_deny; +- ce_Pkcs11_Key->unserialize = zend_class_unserialize_deny; +-} +\ No newline at end of file ++ PKCS11_ACC_NOT_SERIALIZABLE(ce_Pkcs11_Key); ++}