git: 513af5aa3b91 - main - security/pecl-pkcs11: Update to 1.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 22 May 2022 05:15:04 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=513af5aa3b91b52e7a092d1f35e89c456c9247a5
commit 513af5aa3b91b52e7a092d1f35e89c456c9247a5
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-05-22 04:22:48 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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 <sunpoet@FreeBSD.org>
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);
-+}