From nobody Sun May 22 05:15:04 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 B08E81AE8E9F; Sun, 22 May 2022 05:15:05 +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 4L5TDS5KF5z3PWs; Sun, 22 May 2022 05:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653196504; 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=sChEDCe1S9r6mQEn45F2N3NO5i8pr8E9D/iP7ffjzNI=; b=MQySkH6Fw9L7yhznfjvy2acTm7j/v7n+lNKPaaj7Sul1lVcm3R3t3PvWS0gYqBYCiBKy48 gngpeHQd1b3VveUetrcJlAqfLAslrSRme2p7Y/NVXt/g0NoOtJmXxcvl/0NV0QPFnzUGPb SARSR/Sp/ml/DMmAOdu5RVd5YFo3wa8N73baIwYgkYurkImlQAc6hA+okNPBzlBd8g5SuW ac+KsKfNQhmQg2nphTpR5pnmgDKzMrUzwt6FyVAruF7htX44dGX2OPY+fQpQ8x7iHAeMEs hPu06wLe3wFMWzHOyVMeLUs1mLZL+w5nGPZGQsCha5yoRTihvyQAC1ecXsATgQ== 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 47AC0154AB; Sun, 22 May 2022 05:15:04 +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 24M5F47H061530; Sun, 22 May 2022 05:15:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24M5F4LG061529; Sun, 22 May 2022 05:15:04 GMT (envelope-from git) Date: Sun, 22 May 2022 05:15:04 GMT Message-Id: <202205220515.24M5F4LG061529@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: 513af5aa3b91 - main - security/pecl-pkcs11: Update to 1.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: 513af5aa3b91b52e7a092d1f35e89c456c9247a5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653196504; 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=sChEDCe1S9r6mQEn45F2N3NO5i8pr8E9D/iP7ffjzNI=; b=r+6EMSY9ZwsUKFhDkPticRFsinxkHjwKd9FH4m9gDm99YB1+00ocTgj2Ro7eWsfKbYY5Xs JPugOMkQYWvcFfWvmDa1IoAgYfmgpKz6zamMG8Ix9NauKUeSw3hk81CCK4YbJ927nkdznQ 1JPssh35xlDLMomvChu7SWw90ZylSw3NiP5ZWfHlg9jL7RxrltOagtiniuzx0xxiZ6gSRr JyotKUDoPWjTiYJ5b3pajJq3AjXWF4vS88Cf9O8gvP07RG14smZ06yxvZpKQIAaHj1x89i 2F3YolHNl1/Nn2m4VFEZM/lo4I7/s/vcqNMxicX7o5IkdrYZtKPavl4HsCKfeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653196504; a=rsa-sha256; cv=none; b=wOF+a47IUZrtZLu9ZZnCloDIBJ3h+pbSETz3+28iWbXDZnLy7a26f/5+EIgFjS8I245dnj 4gMS/S5FQYsDgW/xAiKjMzA7IltcTi1n8pX5qRcpiIrZcP1wpL1XZWAoWqzbIX4z/Eu5MV z4akco6dQzDckyJB/hrnuSACYlV1HmFpFOE9frgNh19NPhP8BNpJgjHXh1kwOMFbpWVY7j E+82WPD/nbYwdlnE3dXHsaN8c3KFd1Ut8vqhBOk/SAGwsbL+xXPzcsOxAMllSH/q0sQ9J0 LaJe7OLXqruvUHC+tT+esEBou4WYOknR/7XvsOKphY7tjiAsHXuK/fTc36XOZQ== 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=513af5aa3b91b52e7a092d1f35e89c456c9247a5 commit 513af5aa3b91b52e7a092d1f35e89c456c9247a5 Author: Po-Chuan Hsieh AuthorDate: 2022-05-22 04:22:48 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-05-22 04:22:48 +0000 security/pecl-pkcs11: Update to 1.1 Changes: https://pecl.php.net/package-changelog.php?package=pkcs11 --- security/pecl-pkcs11/Makefile | 2 +- security/pecl-pkcs11/distinfo | 6 ++--- security/pecl-pkcs11/files/patch-php81 | 46 ---------------------------------- 3 files changed, 4 insertions(+), 50 deletions(-) diff --git a/security/pecl-pkcs11/Makefile b/security/pecl-pkcs11/Makefile index 936b9386da86..3915264108e6 100644 --- a/security/pecl-pkcs11/Makefile +++ b/security/pecl-pkcs11/Makefile @@ -1,7 +1,7 @@ # Created by: Po-Chuan Hsieh PORTNAME= pkcs11 -PORTVERSION= 1.0 +PORTVERSION= 1.1 CATEGORIES= security MAINTAINER= sunpoet@FreeBSD.org diff --git a/security/pecl-pkcs11/distinfo b/security/pecl-pkcs11/distinfo index f06ce41fdc55..fd6f89d3e556 100644 --- a/security/pecl-pkcs11/distinfo +++ b/security/pecl-pkcs11/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618319918 -SHA256 (PECL/pkcs11-1.0.tgz) = 05f38651ea22812d1a46d1e8a696c51d09101bfb8817f5d08a055ff81220e2d6 -SIZE (PECL/pkcs11-1.0.tgz) = 70015 +TIMESTAMP = 1653151070 +SHA256 (PECL/pkcs11-1.1.tgz) = ca66462c1f93566c86f4d70f2341b72f8e440c5eeb0fe6d1455c3d03b4805e1d +SIZE (PECL/pkcs11-1.1.tgz) = 72705 diff --git a/security/pecl-pkcs11/files/patch-php81 b/security/pecl-pkcs11/files/patch-php81 deleted file mode 100644 index c09ad9077ecd..000000000000 --- a/security/pecl-pkcs11/files/patch-php81 +++ /dev/null @@ -1,46 +0,0 @@ -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); -+}