Browse Source

package/{avro-c, python-avro}: bump to version 1.12.0

Drop patch which is now upstream.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
James Hilliard 10 months ago
parent
commit
74a2dbb890

+ 0 - 59
package/avro-c/0001-AVRO-3957-Fix-typos-in-docs-and-examples-2795.patch

@@ -1,59 +0,0 @@
-From 52f051dbeefad0b7e73187becad6c33747b047d3 Mon Sep 17 00:00:00 2001
-From: Sahil Kang <sahil.kang@asilaycomputing.com>
-Date: Mon, 11 Mar 2024 03:01:21 -0700
-Subject: [PATCH] AVRO-3957: [C] Fix typos in docs and examples (#2795)
-
-* AVRO-3957: [C] Fix misformatted type in docs
-
-Signed-off-by: Sahil Kang <sahil.kang@asilaycomputing.com>
-Signed-off-by: Sahil Kang <sahilkang@google.com>
-
-* AVRO-3957: [C] Fix type in quickstop example
-
-This removes the following warning:
-
-  avro/lang/c/examples/quickstop.c:123:40: warning: incompatible pointer types passing 'int32_t **' (aka 'int **') to parameter of type
-        'const char **' [-Wincompatible-pointer-types]
-                          avro_value_get_string(&first_value, &p, &size);
-
-Signed-off-by: Sahil Kang <sahil.kang@asilaycomputing.com>
-Signed-off-by: Sahil Kang <sahilkang@google.com>
-
----------
-
-Signed-off-by: Sahil Kang <sahil.kang@asilaycomputing.com>
-Signed-off-by: Sahil Kang <sahilkang@google.com>
-
-Upstream: https://github.com/apache/avro/commit/52f051dbeefad0b7e73187becad6c33747b047d3
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- lang/c/docs/index.txt       | 2 +-
- lang/c/examples/quickstop.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/docs/index.txt b/docs/index.txt
-index a439a052631..df16f9d9678 100644
---- a/docs/index.txt
-+++ b/docs/index.txt
-@@ -178,7 +178,7 @@ different versions of the Avro library.  That means that it's really
- only safe to use these hash values internally within the context of a
- single execution of a single application.
- 
--The +reset+ method “clears out” an +avro_value_t instance, making sure
-+The +reset+ method “clears out” an +avro_value_t+ instance, making sure
- that it's ready to accept the contents of a new value.  For scalars,
- this is usually a no-op, since the new value will just overwrite the old
- one.  For arrays and maps, this removes any existing elements from the
-diff --git a/examples/quickstop.c b/examples/quickstop.c
-index ff9e9700590..b26dad10c04 100644
---- a/examples/quickstop.c
-+++ b/examples/quickstop.c
-@@ -107,7 +107,7 @@ int print_person(avro_file_reader_t db, avro_schema_t reader_schema)
- 	if (rval == 0) {
- 		int64_t id;
- 		int32_t age;
--		int32_t *p;
-+		const char *p;
- 		size_t size;
- 		avro_value_t id_value;
- 		avro_value_t first_value;

+ 2 - 2
package/avro-c/avro-c.hash

@@ -1,5 +1,5 @@
-# From https://downloads.apache.org/avro/avro-1.11.3/c/avro-c-1.11.3.tar.gz.sha512
-sha512  56ce8c6f0b06b779679a6e7a2b738ec94277920e9b3d7c6f1062a0b47db80b90dccf89df9d977ec1f120211f7c2f33845e18df4961818e5c5cc93aaec18e1302  avro-c-1.11.3.tar.gz
+# From https://downloads.apache.org/avro/avro-1.12.0/c/avro-c-1.12.0.tar.gz.sha512
+sha512  71f0a8b63e212a12d38c05ef0c8e17822af7eb38698e07550a15f49d3f976f015f31cd804784df76c16e6cf7129c0d1a5028cb78032ad0259b4d151dcf022099  avro-c-1.12.0.tar.gz
 
 # License files
 sha256  d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a  LICENSE

+ 1 - 1
package/avro-c/avro-c.mk

@@ -5,7 +5,7 @@
 ################################################################################
 
 # When updating the version, please also update python-avro
-AVRO_C_VERSION = 1.11.3
+AVRO_C_VERSION = 1.12.0
 AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c
 AVRO_C_LICENSE = Apache-2.0
 AVRO_C_LICENSE_FILES = LICENSE

+ 4 - 4
package/python-avro/python-avro.hash

@@ -1,5 +1,5 @@
-# From https://downloads.apache.org/avro/avro-1.11.3/py/avro-1.11.3.tar.gz.sha512
-sha512  c2066b4dd8b55b0534fb5bb8fc5a81abcef76ab46458b666c98732811f632c34062c1a0cefaf370aa0843c1cad5bd822f9a6ef0ad88cda5177519a3d3c73072d  avro-1.11.3.tar.gz
-
-# License files
+# md5, sha256 from https://pypi.org/pypi/avro/json
+md5  03dbb66d68ad18a332a4f4bce0700ca9  avro-1.12.0.tar.gz
+sha256  cad9c53b23ceed699c7af6bddced42e2c572fd6b408c257a7d4fc4e8cf2e2d6b  avro-1.12.0.tar.gz
+# Locally computed sha256 checksums
 sha256  c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747  avro/LICENSE

+ 2 - 3
package/python-avro/python-avro.mk

@@ -5,10 +5,9 @@
 ################################################################################
 
 # When updating the version, please also update avro-c
-PYTHON_AVRO_VERSION = 1.11.3
-PYTHON_AVRO_SITE = \
-	https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py
+PYTHON_AVRO_VERSION = 1.12.0
 PYTHON_AVRO_SOURCE = avro-$(PYTHON_AVRO_VERSION).tar.gz
+PYTHON_AVRO_SITE = https://files.pythonhosted.org/packages/e6/73/48668732bbc8ae1e79b237f84e761204c8dd266c5e16e7601000aba471d3
 PYTHON_AVRO_LICENSE = Apache-2.0
 PYTHON_AVRO_LICENSE_FILES = avro/LICENSE
 PYTHON_AVRO_SETUP_TYPE = setuptools