Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Adam Duskett <aduskett@gmail.com>
To: buildroot@buildroot.org
Cc: "Hervé Codina" <herve.codina@bootlin.com>,
	"Bernd Kuhls" <bernd@kuhls.net>,
	"Adam Duskett" <aduskett@gmail.comm>
Subject: [Buildroot] [PATCH 04/10] package/php-gnupg: bump version to 1.5.1
Date: Tue,  5 Sep 2023 12:06:04 -0600	[thread overview]
Message-ID: <20230905180610.1610778-4-aduskett@gmail.com> (raw)
In-Reply-To: <20230905180610.1610778-1-aduskett@gmail.com>

From: Adam Duskett <aduskett@gmail.comm>

Drop upstream patch

Signed-off-by: Adam Duskett <aduskett@gmail.comm>
---
 ...0001-Remove-inlining-_phpc_res_close.patch | 33 -------------------
 package/php-gnupg/php-gnupg.hash              |  2 +-
 package/php-gnupg/php-gnupg.mk                |  2 +-
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch

diff --git a/package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch b/package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch
deleted file mode 100644
index 9b94cb7e4f..0000000000
--- a/package/php-gnupg/0001-Remove-inlining-_phpc_res_close.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 887b0899d7e7423baec691255c2d8b56bb348ecd Mon Sep 17 00:00:00 2001
-From: Jakub Zelenka <bukka@php.net>
-Date: Sun, 14 Mar 2021 18:52:21 +0000
-Subject: [PATCH] Remove inlining _phpc_res_close
-
-[Retrieved from:
-https://github.com/bukka/phpc/commit/887b0899d7e7423baec691255c2d8b56bb348ecd]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- phpc.h | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/phpc/phpc.h b/phpc/phpc.h
-index dc5887e..9206105 100644
---- a/phpc/phpc.h
-+++ b/phpc/phpc.h
-@@ -945,16 +945,8 @@ typedef zend_resource * phpc_res_value_t;
- 	zend_fetch_resource2(Z_RES_P(_pz_res), _res_type_name, _res_type_1, _res_type_2)
- #define PHPC_RES_DELETE(_pz_res) \
- 	zend_list_delete(Z_RES_P(_pz_res))
--#if PHP_MAJOR_VERSION < 8
- #define PHPC_RES_CLOSE(_pz_res) \
- 	zend_list_close(Z_RES_P(_pz_res))
--#else
--inline int _phpc_res_close(zval *zres) {
--	zend_list_close(Z_RES_P(zres));
--	return SUCCESS;
--}
--#define PHPC_RES_CLOSE _phpc_res_close
--#endif
- 
- /* resource to zval */
- #define PHPC_RES_PZVAL(_res, _pzv) \
diff --git a/package/php-gnupg/php-gnupg.hash b/package/php-gnupg/php-gnupg.hash
index 99ffe87f46..084de7750a 100644
--- a/package/php-gnupg/php-gnupg.hash
+++ b/package/php-gnupg/php-gnupg.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  d4f5f79aa483908f3df08e5b343ea3593c6d725b9ed2103e30242627659e0a64  gnupg-1.5.0.tgz
+sha256  a9906f465ab2343cb2f3127ee209c72760238745c34878d9bbc1576486219252  gnupg-1.5.1.tgz
 sha256  da1136d4d9326317cbd320dadddf7e9b4b4edffd973eb083cb7b9754fb6a15d9  LICENSE
diff --git a/package/php-gnupg/php-gnupg.mk b/package/php-gnupg/php-gnupg.mk
index a89f0978af..89054f5f7c 100644
--- a/package/php-gnupg/php-gnupg.mk
+++ b/package/php-gnupg/php-gnupg.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_GNUPG_VERSION = 1.5.0
+PHP_GNUPG_VERSION = 1.5.1
 PHP_GNUPG_SOURCE = gnupg-$(PHP_GNUPG_VERSION).tgz
 PHP_GNUPG_SITE = https://pecl.php.net/get
 # phpize does the autoconf magic
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  parent reply	other threads:[~2023-09-05 18:06 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-05 18:06 [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 02/10] package/php-amqp: bump version to 2.0.0 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 03/10] package/php-apcu: bump version to 5.1.22 Adam Duskett
2023-09-05 18:06 ` Adam Duskett [this message]
2023-09-05 18:06 ` [Buildroot] [PATCH 05/10] package/php-memcached: bump version to 3.2.0 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 06/10] package/php-pam: bump version to 2.2.4 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 07/10] package/php-pecl-dbus: bump version to b147624d480c3353e6c700e9a2d0c6f14d853941 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 08/10] package/php-ssh2: bump version to 1.4 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 09/10] package/php-xdebug: bump version to 3.2.2 Adam Duskett
2023-09-05 18:06 ` [Buildroot] [PATCH 10/10] package/php-yaml: bump version to 2.2.3 Adam Duskett
2023-09-08 20:02 ` [Buildroot] [PATCH 01/10] package/php: bump version to 8.2.10 Thomas Petazzoni via buildroot
2023-09-14 18:59 ` Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230905180610.1610778-4-aduskett@gmail.com \
    --to=aduskett@gmail.com \
    --cc=aduskett@gmail.comm \
    --cc=bernd@kuhls.net \
    --cc=buildroot@buildroot.org \
    --cc=herve.codina@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox