summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-01-20 18:25:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-21 12:52:53 +0000
commit4f16bee889014ff5c4253ceb6ef766b017bdfb9b (patch)
tree9e49e23e994b18d8da14e7fc4df6811218471654
parent5b0a057493987d9d416993d2fc2d7f77e3498748 (diff)
downloadpoky-contrib-4f16bee889014ff5c4253ceb6ef766b017bdfb9b.tar.gz
poky-contrib-4f16bee889014ff5c4253ceb6ef766b017bdfb9b.tar.bz2
poky-contrib-4f16bee889014ff5c4253ceb6ef766b017bdfb9b.zip
libsecret: upgrade 0.19.1 -> 0.20.0
Add a backported patch to fix musl builds. (From OE-Core rev: d28f0d41949143cf130e7f73aa8421711dd13914) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch144
-rw-r--r--meta/recipes-gnome/libsecret/libsecret_0.20.0.bb (renamed from meta/recipes-gnome/libsecret/libsecret_0.19.1.bb)5
2 files changed, 147 insertions, 2 deletions
diff --git a/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch b/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch
new file mode 100644
index 0000000000..269c12b010
--- /dev/null
+++ b/meta/recipes-gnome/libsecret/libsecret/0001-secret-file-collection-Rename-internal-functions-to-.patch
@@ -0,0 +1,144 @@
+From 59bcb169c4777bb3b1a50fee2ae20e4e8574b749 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <dueno@src.gnome.org>
+Date: Tue, 14 Jan 2020 10:09:29 +0100
+Subject: [PATCH] secret-file-collection: Rename internal functions to avoid
+ conflicts
+
+As encrypt() is a standard POSIX function, its declaration had
+conflict with our own. Let's be more verbose about naming of the
+internal crypto functions.
+
+Fixes #35.
+
+Upstream-Status: Backport [https://github.com/GNOME/libsecret/commit/cf21ad50b62f7c8e4b22ef374f0a73290a99bdb8]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ libsecret/secret-file-collection.c | 38 +++++++++++++++---------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/libsecret/secret-file-collection.c b/libsecret/secret-file-collection.c
+index 79863ea..8ffb542 100644
+--- a/libsecret/secret-file-collection.c
++++ b/libsecret/secret-file-collection.c
+@@ -68,7 +68,7 @@ enum {
+ };
+
+ static gboolean
+-derive (SecretFileCollection *self)
++do_derive_key (SecretFileCollection *self)
+ {
+ const gchar *password;
+ gsize n_password;
+@@ -93,9 +93,9 @@ derive (SecretFileCollection *self)
+ }
+
+ static gboolean
+-calculate_mac (SecretFileCollection *self,
+- const guint8 *value, gsize n_value,
+- guint8 *buffer)
++do_calculate_mac (SecretFileCollection *self,
++ const guint8 *value, gsize n_value,
++ guint8 *buffer)
+ {
+ gcry_mac_hd_t hd;
+ gcry_error_t gcry;
+@@ -130,9 +130,9 @@ calculate_mac (SecretFileCollection *self,
+ }
+
+ static gboolean
+-decrypt (SecretFileCollection *self,
+- guint8 *data,
+- gsize n_data)
++do_decrypt (SecretFileCollection *self,
++ guint8 *data,
++ gsize n_data)
+ {
+ gcry_cipher_hd_t hd;
+ gcry_error_t gcry;
+@@ -164,9 +164,9 @@ decrypt (SecretFileCollection *self,
+ }
+
+ static gboolean
+-encrypt (SecretFileCollection *self,
+- guint8 *data,
+- gsize n_data)
++do_encrypt (SecretFileCollection *self,
++ guint8 *data,
++ gsize n_data)
+ {
+ gcry_cipher_hd_t hd;
+ gcry_error_t gcry;
+@@ -311,7 +311,7 @@ on_load_contents (GObject *source_object,
+ self->modified = g_date_time_new_now_utc ();
+ self->usage_count = 0;
+
+- if (!derive (self)) {
++ if (!do_derive_key (self)) {
+ g_task_return_new_error (task,
+ SECRET_ERROR,
+ SECRET_ERROR_PROTOCOL,
+@@ -375,7 +375,7 @@ on_load_contents (GObject *source_object,
+ g_assert (n_data == salt_size);
+
+ self->salt = g_bytes_new (data, n_data);
+- if (!derive (self)) {
++ if (!do_derive_key (self)) {
+ g_task_return_new_error (task,
+ SECRET_ERROR,
+ SECRET_ERROR_PROTOCOL,
+@@ -442,7 +442,7 @@ hash_attributes (SecretFileCollection *self,
+ GVariant *variant;
+
+ value = g_hash_table_lookup (attributes, l->data);
+- if (!calculate_mac (self, (guint8 *)value, strlen (value), buffer)) {
++ if (!do_calculate_mac (self, (guint8 *)value, strlen (value), buffer)) {
+ g_list_free (keys);
+ return NULL;
+ }
+@@ -485,7 +485,7 @@ hashed_attributes_match (SecretFileCollection *self,
+ return FALSE;
+ }
+
+- if (!calculate_mac (self, value, strlen ((char *)value), buffer)) {
++ if (!do_calculate_mac (self, value, strlen ((char *)value), buffer)) {
+ g_variant_unref (hashed_attribute);
+ return FALSE;
+ }
+@@ -584,7 +584,7 @@ secret_file_collection_replace (SecretFileCollection *self,
+ g_variant_store (serialized_item, data);
+ g_variant_unref (serialized_item);
+ memset (data + n_data, n_padded - n_data, n_padded - n_data);
+- if (!encrypt (self, data, n_padded)) {
++ if (!do_encrypt (self, data, n_padded)) {
+ egg_secure_free (data);
+ g_set_error (error,
+ SECRET_ERROR,
+@@ -593,8 +593,8 @@ secret_file_collection_replace (SecretFileCollection *self,
+ return FALSE;
+ }
+
+- if (!calculate_mac (self, data, n_padded + IV_SIZE,
+- data + n_padded + IV_SIZE)) {
++ if (!do_calculate_mac (self, data, n_padded + IV_SIZE,
++ data + n_padded + IV_SIZE)) {
+ egg_secure_free (data);
+ g_set_error (error,
+ SECRET_ERROR,
+@@ -681,7 +681,7 @@ _secret_file_item_decrypt (GVariant *encrypted,
+ }
+ n_padded -= IV_SIZE + MAC_SIZE;
+
+- if (!calculate_mac (collection, data, n_padded + IV_SIZE, mac)) {
++ if (!do_calculate_mac (collection, data, n_padded + IV_SIZE, mac)) {
+ egg_secure_free (data);
+ g_set_error (error,
+ SECRET_ERROR,
+@@ -699,7 +699,7 @@ _secret_file_item_decrypt (GVariant *encrypted,
+ return FALSE;
+ }
+
+- if (!decrypt (collection, data, n_padded)) {
++ if (!do_decrypt (collection, data, n_padded)) {
+ egg_secure_free (data);
+ g_set_error (error,
+ SECRET_ERROR,
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.19.1.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb
index 3da2a4acac..aa3dfab581 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.19.1.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.20.0.bb
@@ -13,8 +13,9 @@ DEPENDS += "glib-2.0 libgcrypt gettext-native"
PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
-SRC_URI[archive.md5sum] = "ea673119c00570d6434f8fd3636f1eb8"
-SRC_URI[archive.sha256sum] = "8583e10179456ae2c83075d95455f156dc08db6278b32bf4bd61819335a30e3a"
+SRC_URI += " file://0001-secret-file-collection-Rename-internal-functions-to-.patch"
+SRC_URI[archive.md5sum] = "335750caeed47f50496b3b0e6a1875ff"
+SRC_URI[archive.sha256sum] = "f1187370b453106af878e30c284a121ba0c513da8bb4170b329d66e250bdae43"
# http://errors.yoctoproject.org/Errors/Details/20228/
ARM_INSTRUCTION_SET_armv4 = "arm"