[arch-commits] Commit in cryptsetup/trunk (PKGBUILD json-c-0.14.patch)
Date: Thursday, April 30, 2020 @ 15:24:25
Author: eworm
Revision: 381984
upgpkg: cryptsetup 2.3.2-1
new upstream release
Modified:
cryptsetup/trunk/PKGBUILD
Deleted:
cryptsetup/trunk/json-c-0.14.patch
---+
PKGBUILD | 17 -
json-c-0.14.patch | 681
2 files changed, 5 insertions(+), 693 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-04-30 14:53:24 UTC (rev 381983)
+++ PKGBUILD2020-04-30 15:24:25 UTC (rev 381984)
@@ -2,8 +2,8 @@
# Contributor: Thomas Bächler
pkgname=cryptsetup
-pkgver=2.3.1
-pkgrel=3
+pkgver=2.3.2
+pkgrel=1
pkgdesc='Userspace setup tool for transparent encryption of block devices
using dm-crypt'
arch=(x86_64)
license=('GPL')
@@ -15,20 +15,13 @@
source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/${pkgname}-${pkgver}.tar."{xz,sign}
'hooks-encrypt'
'install-encrypt'
-'install-sd-encrypt'
-'json-c-0.14.patch')
-sha256sums=('92aba4d559a2cf7043faed92e0f22c5addea36bd63f8c039ba5a8f3a159fe7d2'
+'install-sd-encrypt')
+sha256sums=('a89e13dff0798fd0280e801d5f0cc8cfdb2aa5b1929bec1b7322e13d3eca95fb'
'SKIP'
'416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2'
'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57'
-'31d816b3650a57512a5f9b52c1995fa65a161faa8b37975d07c9a1b8e1a119db'
-'e166c55d0fd4361749d6c449d6d04837957661ab58ebd5ef9a735de61640cc3b')
+'31d816b3650a57512a5f9b52c1995fa65a161faa8b37975d07c9a1b8e1a119db')
-prepare() {
- cd "${srcdir}"/$pkgname-${pkgver}
- patch -Np1 -i ../json-c-0.14.patch
-}
-
build() {
cd "${srcdir}"/$pkgname-${pkgver}
Deleted: json-c-0.14.patch
===
--- json-c-0.14.patch 2020-04-30 14:53:24 UTC (rev 381983)
+++ json-c-0.14.patch 2020-04-30 15:24:25 UTC (rev 381984)
@@ -1,681 +0,0 @@
-From 604abec333a0efb44fd8bc610aa0b1151dd0f612 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?=
-Date: Mon, 13 Apr 2020 11:48:17 +0200
-Subject: [PATCH] Add support for upcoming json-c 0.14.0.
-
- * TRUE/FALSE are not defined anymore. 1 and 0 are used instead.
- * json_object_get_uint64() and json_object_new_uint64() are part
-of the upstream API now.
- lib/luks2/luks2_internal.h | 4 +++-
- lib/luks2/luks2_json_metadata.c | 38 +
- 2 files changed, 23 insertions(+), 19 deletions(-)
-
-diff --git a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h
-index b9fec6b5..939101d6 100644
a/lib/luks2/luks2_internal.h
-+++ b/lib/luks2/luks2_internal.h
-@@ -58,9 +58,11 @@ json_object *LUKS2_get_segments_jobj(struct luks2_hdr *hdr);
- void hexprint_base64(struct crypt_device *cd, json_object *jobj,
-const char *sep, const char *line_sep);
-
-+#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99))
- uint64_t json_object_get_uint64(json_object *jobj);
--uint32_t json_object_get_uint32(json_object *jobj);
- json_object *json_object_new_uint64(uint64_t value);
-+#endif
-+uint32_t json_object_get_uint32(json_object *jobj);
-
- int json_object_object_add_by_uint(json_object *jobj, unsigned key,
json_object *jobj_val);
- void json_object_object_del_by_uint(json_object *jobj, unsigned key);
-diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c
-index 781280c2..712c2bbd 100644
a/lib/luks2/luks2_json_metadata.c
-+++ b/lib/luks2/luks2_json_metadata.c
-@@ -234,13 +234,14 @@ static json_bool json_str_to_uint64(json_object *jobj,
uint64_t *value)
- tmp = strtoull(json_object_get_string(jobj), , 10);
- if (*endptr || errno) {
- *value = 0;
-- return FALSE;
-+ return 0;
- }
-
- *value = tmp;
-- return TRUE;
-+ return 1;
- }
-
-+#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99))
- uint64_t json_object_get_uint64(json_object *jobj)
- {
- uint64_t r;
-@@ -262,6 +263,7 @@ json_object *json_object_new_uint64(uint64_t value)
- jobj = json_object_new_string(num);
- return jobj;
- }
-+#endif
-
- /*
- * Validate helpers
-@@ -273,9 +275,9 @@ static json_bool numbered(struct crypt_device *cd, const
char *name, const char
- for (i = 0; key[i]; i++)
- if (!isdigit(key[i])) {
- log_dbg(cd, "%s \"%s\" is not in numbered form.", name,
key);
-- return FALSE;
-+ return 0;
- }
-- return TRUE;
-+ return 1;
- }
-
- json_object *json_contains(struct crypt_device *cd, json_object *jobj, const
char *name,
-@@ -300,7 +302,7 @@ json_bool validate_json_uint32(json_object *jobj)
- errno = 0;
- tmp = json_object_get_int64(jobj);
-
-- return
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD json-c-0.14.patch)
Date: Thursday, April 30, 2020 @ 13:01:56
Author: eworm
Revision: 381970
upgpkg: cryptsetup 2.3.1-3
fix build with json 0.14 (FS#66477,
https://gitlab.com/cryptsetup/cryptsetup/-/issues/556)
Modified:
cryptsetup/trunk/PKGBUILD
cryptsetup/trunk/json-c-0.14.patch
---+
PKGBUILD |4
json-c-0.14.patch | 507
2 files changed, 509 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-04-30 12:23:10 UTC (rev 381969)
+++ PKGBUILD2020-04-30 13:01:56 UTC (rev 381970)
@@ -3,7 +3,7 @@
pkgname=cryptsetup
pkgver=2.3.1
-pkgrel=2
+pkgrel=3
pkgdesc='Userspace setup tool for transparent encryption of block devices
using dm-crypt'
arch=(x86_64)
license=('GPL')
@@ -22,7 +22,7 @@
'416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2'
'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57'
'31d816b3650a57512a5f9b52c1995fa65a161faa8b37975d07c9a1b8e1a119db'
-'bbf6abba86d4c76307734e95593a5ba3647e1d80d51e521f7e542c92a3d89408')
+'e166c55d0fd4361749d6c449d6d04837957661ab58ebd5ef9a735de61640cc3b')
prepare() {
cd "${srcdir}"/$pkgname-${pkgver}
Modified: json-c-0.14.patch
===
--- json-c-0.14.patch 2020-04-30 12:23:10 UTC (rev 381969)
+++ json-c-0.14.patch 2020-04-30 13:01:56 UTC (rev 381970)
@@ -172,3 +172,510 @@
}
static int LUKS2_keyslot_validate(struct crypt_device *cd, json_object
*hdr_jobj, json_object *hdr_keyslot, const char *key)
+From e6a356974330e3ae21579a5737976e9a2aad1b51 Mon Sep 17 00:00:00 2001
+From: Ondrej Kozina
+Date: Tue, 14 Apr 2020 17:24:54 +0200
+Subject: [PATCH] Avoid name clash with newer json-c library.
+
+This is partial revert of previous commit and also
+fixes wrong decision to name our internal helpers with
+json_object prefix.
+---
+ lib/luks2/luks2_internal.h | 8 +++-
+ lib/luks2/luks2_json_format.c | 6 +++---
+ lib/luks2/luks2_json_metadata.c | 18 --
+ lib/luks2/luks2_keyslot.c | 8
+ lib/luks2/luks2_keyslot_luks2.c | 16
+ lib/luks2/luks2_keyslot_reenc.c | 20 ++--
+ lib/luks2/luks2_luks1_convert.c | 22 +++---
+ lib/luks2/luks2_reencrypt.c | 16
+ lib/luks2/luks2_segment.c | 12 ++--
+ 9 files changed, 61 insertions(+), 65 deletions(-)
+
+diff --git a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h
+index 939101d6..a5bcb1f2 100644
+--- a/lib/luks2/luks2_internal.h
b/lib/luks2/luks2_internal.h
+@@ -58,11 +58,9 @@ json_object *LUKS2_get_segments_jobj(struct luks2_hdr *hdr);
+ void hexprint_base64(struct crypt_device *cd, json_object *jobj,
+const char *sep, const char *line_sep);
+
+-#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99))
+-uint64_t json_object_get_uint64(json_object *jobj);
+-json_object *json_object_new_uint64(uint64_t value);
+-#endif
+-uint32_t json_object_get_uint32(json_object *jobj);
++uint64_t crypt_jobj_get_uint64(json_object *jobj);
++uint32_t crypt_jobj_get_uint32(json_object *jobj);
++json_object *crypt_jobj_new_uint64(uint64_t value);
+
+ int json_object_object_add_by_uint(json_object *jobj, unsigned key,
json_object *jobj_val);
+ void json_object_object_del_by_uint(json_object *jobj, unsigned key);
+diff --git a/lib/luks2/luks2_json_format.c b/lib/luks2/luks2_json_format.c
+index 0fde2ffd..1416766e 100644
+--- a/lib/luks2/luks2_json_format.c
b/lib/luks2/luks2_json_format.c
+@@ -325,8 +325,8 @@ int LUKS2_generate_hdr(
+
+ json_object_object_add_by_uint(jobj_segments, 0, jobj_segment);
+
+- json_object_object_add(jobj_config, "json_size",
json_object_new_uint64(metadata_size - LUKS2_HDR_BIN_LEN));
+- json_object_object_add(jobj_config, "keyslots_size",
json_object_new_uint64(keyslots_size));
++ json_object_object_add(jobj_config, "json_size",
crypt_jobj_new_uint64(metadata_size - LUKS2_HDR_BIN_LEN));
++ json_object_object_add(jobj_config, "keyslots_size",
crypt_jobj_new_uint64(keyslots_size));
+
+ JSON_DBG(cd, hdr->jobj, "Header JSON:");
+ return 0;
+@@ -400,6 +400,6 @@ int LUKS2_set_keyslots_size(struct crypt_device *cd,
+ if (!json_object_object_get_ex(hdr->jobj, "config", _config))
+ return 1;
+
+- json_object_object_add(jobj_config, "keyslots_size",
json_object_new_uint64(keyslots_size));
++ json_object_object_add(jobj_config, "keyslots_size",
crypt_jobj_new_uint64(keyslots_size));
+ return 0;
+ }
+diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c
+index 712c2bbd..68da9c2d 100644
+--- a/lib/luks2/luks2_json_metadata.c
b/lib/luks2/luks2_json_metadata.c
+@@ -219,7 +219,7 @@ int LUKS2_get_default_segment(struct
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD json-c-0.14.patch)
Date: Saturday, April 25, 2020 @ 14:17:23
Author: foutrelis
Revision: 381556
upgpkg: cryptsetup 2.3.1-2: json-c 0.14 rebuild
Added:
cryptsetup/trunk/json-c-0.14.patch
Modified:
cryptsetup/trunk/PKGBUILD
---+
PKGBUILD | 13 ++-
json-c-0.14.patch | 174
2 files changed, 184 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-04-25 13:20:13 UTC (rev 381555)
+++ PKGBUILD2020-04-25 14:17:23 UTC (rev 381556)
@@ -3,7 +3,7 @@
pkgname=cryptsetup
pkgver=2.3.1
-pkgrel=1
+pkgrel=2
pkgdesc='Userspace setup tool for transparent encryption of block devices
using dm-crypt'
arch=(x86_64)
license=('GPL')
@@ -15,13 +15,20 @@
source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/${pkgname}-${pkgver}.tar."{xz,sign}
'hooks-encrypt'
'install-encrypt'
-'install-sd-encrypt')
+'install-sd-encrypt'
+'json-c-0.14.patch')
sha256sums=('92aba4d559a2cf7043faed92e0f22c5addea36bd63f8c039ba5a8f3a159fe7d2'
'SKIP'
'416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2'
'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57'
-'31d816b3650a57512a5f9b52c1995fa65a161faa8b37975d07c9a1b8e1a119db')
+'31d816b3650a57512a5f9b52c1995fa65a161faa8b37975d07c9a1b8e1a119db'
+'bbf6abba86d4c76307734e95593a5ba3647e1d80d51e521f7e542c92a3d89408')
+prepare() {
+ cd "${srcdir}"/$pkgname-${pkgver}
+ patch -Np1 -i ../json-c-0.14.patch
+}
+
build() {
cd "${srcdir}"/$pkgname-${pkgver}
Added: json-c-0.14.patch
===
--- json-c-0.14.patch (rev 0)
+++ json-c-0.14.patch 2020-04-25 14:17:23 UTC (rev 381556)
@@ -0,0 +1,174 @@
+From 604abec333a0efb44fd8bc610aa0b1151dd0f612 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?=
+Date: Mon, 13 Apr 2020 11:48:17 +0200
+Subject: [PATCH] Add support for upcoming json-c 0.14.0.
+
+ * TRUE/FALSE are not defined anymore. 1 and 0 are used instead.
+ * json_object_get_uint64() and json_object_new_uint64() are part
+of the upstream API now.
+---
+ lib/luks2/luks2_internal.h | 4 +++-
+ lib/luks2/luks2_json_metadata.c | 38 +
+ 2 files changed, 23 insertions(+), 19 deletions(-)
+
+diff --git a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h
+index b9fec6b5..939101d6 100644
+--- a/lib/luks2/luks2_internal.h
b/lib/luks2/luks2_internal.h
+@@ -58,9 +58,11 @@ json_object *LUKS2_get_segments_jobj(struct luks2_hdr *hdr);
+ void hexprint_base64(struct crypt_device *cd, json_object *jobj,
+const char *sep, const char *line_sep);
+
++#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99))
+ uint64_t json_object_get_uint64(json_object *jobj);
+-uint32_t json_object_get_uint32(json_object *jobj);
+ json_object *json_object_new_uint64(uint64_t value);
++#endif
++uint32_t json_object_get_uint32(json_object *jobj);
+
+ int json_object_object_add_by_uint(json_object *jobj, unsigned key,
json_object *jobj_val);
+ void json_object_object_del_by_uint(json_object *jobj, unsigned key);
+diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c
+index 781280c2..712c2bbd 100644
+--- a/lib/luks2/luks2_json_metadata.c
b/lib/luks2/luks2_json_metadata.c
+@@ -234,13 +234,14 @@ static json_bool json_str_to_uint64(json_object *jobj,
uint64_t *value)
+ tmp = strtoull(json_object_get_string(jobj), , 10);
+ if (*endptr || errno) {
+ *value = 0;
+- return FALSE;
++ return 0;
+ }
+
+ *value = tmp;
+- return TRUE;
++ return 1;
+ }
+
++#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99))
+ uint64_t json_object_get_uint64(json_object *jobj)
+ {
+ uint64_t r;
+@@ -262,6 +263,7 @@ json_object *json_object_new_uint64(uint64_t value)
+ jobj = json_object_new_string(num);
+ return jobj;
+ }
++#endif
+
+ /*
+ * Validate helpers
+@@ -273,9 +275,9 @@ static json_bool numbered(struct crypt_device *cd, const
char *name, const char
+ for (i = 0; key[i]; i++)
+ if (!isdigit(key[i])) {
+ log_dbg(cd, "%s \"%s\" is not in numbered form.", name,
key);
+- return FALSE;
++ return 0;
+ }
+- return TRUE;
++ return 1;
+ }
+
+ json_object *json_contains(struct crypt_device *cd, json_object *jobj, const
char *name,
+@@ -300,7 +302,7 @@ json_bool validate_json_uint32(json_object *jobj)
+ errno = 0;
+ tmp = json_object_get_int64(jobj);
+
+- return (errno || tmp < 0 || tmp > UINT32_MAX) ? FALSE : TRUE;
++ return (errno || tmp < 0 || tmp > UINT32_MAX) ? 0 : 1;
+ }
+
+
