Skip to contentSkip to conversation

package/cryptsetup: bump to version 2.3.3

PATCH New Fabrice Fontaine 2 participants 2 messages Jun 21, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/cryptsetup: bump to version 2.3.3

- Update indentation in hash file (two spaces)
- Send patch upstream

---
 package/cryptsetup/0001-Remove-json_object-typedef.patch | 2 ++
 package/cryptsetup/cryptsetup.hash                       | 8 ++++----
 package/cryptsetup/cryptsetup.mk                         | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)
package/cryptsetup/0001-Remove-json_object-typedef.patch +2 -0
index fa865314a7..bbfd1aa075 100644
@@ -12,6 +12,8 @@ In file included from lib/luks2/luks2_internal.h:32,
 lib/luks2/luks2.h:86: error: redefinition of typedef 'json_object'
 
 Signed-off-by: Baruch Siach <[email protected]>
+[Upstream status:
+https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/91]
 ---
  lib/luks2/luks2.h | 1 -
  lib/setup.c       | 1 +
package/cryptsetup/cryptsetup.hash +4 -4
index 175ecf33cf..c47d701baa 100644
@@ -1,4 +1,4 @@
-# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.2/sha256sums.asc
-sha256 2af0ec9551ab9c870074cae9d3f68d82cab004f4095fa89db0e4413713424a46  cryptsetup-2.2.2.tar.xz
-sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33  COPYING
-sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5  COPYING.LGPL
+# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/sha256sums.asc
+sha256  3bca4ffe39e2f94cef50f6ea65acb873a6dbce5db34fc6bcefe38b6d095e82df  cryptsetup-2.3.3.tar.xz
+sha256  45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33  COPYING
+sha256  8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5  COPYING.LGPL
package/cryptsetup/cryptsetup.mk +2 -2
index 197f5f25b2..587ef0a810 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CRYPTSETUP_VERSION_MAJOR = 2.2
-CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2
+CRYPTSETUP_VERSION_MAJOR = 2.3
+CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3
 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz
 CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)
 CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c libargon2 \
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/1 package/cryptsetup: bump to version 2.3.3

Fabrice, All,

On 2020-06-21 20:56 +0200, Fabrice Fontaine spake thusly:

Quoted 4 lines

- Update indentation in hash file (two spaces)
- Send patch upstream

Applied to master, along with dropwatch, keepalived, and dash. Thanks!

Regards,
Yann E. MORIN.

Quoted 54 lines
---
 package/cryptsetup/0001-Remove-json_object-typedef.patch | 2 ++
 package/cryptsetup/cryptsetup.hash                       | 8 ++++----
 package/cryptsetup/cryptsetup.mk                         | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)
package/cryptsetup/0001-Remove-json_object-typedef.patch +2 -0
index fa865314a7..bbfd1aa075 100644
@@ -12,6 +12,8 @@ In file included from lib/luks2/luks2_internal.h:32,
 lib/luks2/luks2.h:86: error: redefinition of typedef 'json_object'
 
 Signed-off-by: Baruch Siach <[email protected]>
+[Upstream status:
+https://gitlab.com/cryptsetup/cryptsetup/-/merge_requests/91]
 ---
  lib/luks2/luks2.h | 1 -
  lib/setup.c       | 1 +
package/cryptsetup/cryptsetup.hash +4 -4
index 175ecf33cf..c47d701baa 100644
@@ -1,4 +1,4 @@
-# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.2/sha256sums.asc
-sha256 2af0ec9551ab9c870074cae9d3f68d82cab004f4095fa89db0e4413713424a46  cryptsetup-2.2.2.tar.xz
-sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33  COPYING
-sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5  COPYING.LGPL
+# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/sha256sums.asc
+sha256  3bca4ffe39e2f94cef50f6ea65acb873a6dbce5db34fc6bcefe38b6d095e82df  cryptsetup-2.3.3.tar.xz
+sha256  45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33  COPYING
+sha256  8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5  COPYING.LGPL
package/cryptsetup/cryptsetup.mk +2 -2
index 197f5f25b2..587ef0a810 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CRYPTSETUP_VERSION_MAJOR = 2.2
-CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).2
+CRYPTSETUP_VERSION_MAJOR = 2.3
+CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3
 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz
 CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)
 CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c libargon2 \
Signature · 6 lines
2.26.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'