cryptsetup: bump to version 2.0.0

PATCH New Baruch Siach 3 participants 5 messages Dec 22, 2017

lore

Share & tools

lore

Baruch Siach

author

2017-12-22 12:03 UTC #0 lore raw

PATCH 1/2 cryptsetup: bump to version 2.0.0

Add the now mandatory json-c depencecy. Propagate to reverse dependencies.

Drop the no longer needed patch.

Add license files hashes.

Cc Martin Hicks <[email protected]>

Signed-off-by Baruch Siach <[email protected]>

---
 package/cryptsetup/0001-mkdir.patch | 18 ------------------
 package/cryptsetup/Config.in        |  2 ++
 package/cryptsetup/cryptsetup.hash  |  6 ++++--
 package/cryptsetup/cryptsetup.mk    |  6 +++---
 package/luksmeta/Config.in          |  1 +
 5 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 package/cryptsetup/0001-mkdir.patch

package/cryptsetup/0001-mkdir.patch deleted +0 ~~-18~~

deleted file mode 100644
index d4d70521ad67..000000000000
@@ -1,18 +0,0 @@
-$(mkdir_p) is obsolete for newer automake, use $(MKDIR_P) instead.
-Upstream should really gettextize with a newer version before packing up.
-
-[base on a similar patch from Gustavo Zacarias for Linux-PAM-1.1.7]
-Signed-off-by: Axel Lin <[email protected]>
-
-diff -Nura cryptsetup-1.6.3.ori/po/Makefile.in.in cryptsetup-1.6.3/po/Makefile.in.in
---- cryptsetup-1.6.3.ori/po/Makefile.in.in	2013-12-30 11:53:22.731942516 +0800
-+++ cryptsetup-1.6.3/po/Makefile.in.in	2014-01-09 09:46:13.594071188 +0800
-@@ -31,7 +31,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- mkinstalldirs = $(SHELL) @install_sh@ -d
--mkdir_p = @mkdir_p@
-+mkdir_p = @MKDIR_P@
- 
- GMSGFMT_ = @GMSGFMT@
- GMSGFMT_no = @GMSGFMT@

package/cryptsetup/Config.in +2 -0

index d24f7b0af6c7..dcf56f1e405d 100644
@@ -3,10 +3,12 @@ config BR2_PACKAGE_CRYPTSETUP
 	depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2
 	depends on BR2_USE_MMU # lvm2
 	depends on !BR2_STATIC_LIBS # lvm2
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_LVM2
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	select BR2_PACKAGE_JSON_C
 	help
 	  This tool helps manipulate dm-crypt and luks partitions for
 	  on-disk encryption.

package/cryptsetup/cryptsetup.hash +4 -2

index 6d0fb58945ad..c54b0dc60711 100644
@@ -1,2 +1,4 @@
-# From https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/sha256sums.asc
-sha256 2b30cd1d0dd606a53ac77b406e1d37798d4b0762fa89de6ea546201906a251bd  cryptsetup-1.7.5.tar.xz
+# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/sha256sums.asc
+sha256 adc623b9e3e3ab5c14145b8baf21b741e513ee5bf90d2b4d85a745c2f05da199  cryptsetup-2.0.0.tar.xz
+sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33  COPYING
+sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5  COPYING.LGPL

package/cryptsetup/cryptsetup.mk +3 -3

index 6b0fa318aadd..1abee0bc2f9b 100644
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-CRYPTSETUP_VERSION_MAJOR = 1.7
-CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).5
+CRYPTSETUP_VERSION_MAJOR = 2.0
+CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0
 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 \
+CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c \
 	$(TARGET_NLS_DEPENDENCIES)
 CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library)
 CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL

package/luksmeta/Config.in +1 -0

index 62e1f3e42f5b..dec132ddd3e0 100644
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LUKSMETA
 	depends on BR2_USE_MMU # cryptsetup -> lvm2
 	depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2
 	depends on !BR2_TOOLCHAIN_USES_MUSL # cryptsetup -> lvm2
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c
 	select BR2_PACKAGE_CRYPTSETUP
 	help
 	  LUKSMeta is a simple library and utility for storing

Signature · 1 line

2.15.1

Baruch Siach

author

2017-12-22 12:03 UTC #1 lore raw

PATCH 2/2 luksmeta: enabled build with musl

cryptsetup is available under musl since commit f71507d41bcb00 (lvm2:
make basic package available under musl). Enable luksmeta as well.

Cc Peter Korsgaard <[email protected]>

Signed-off-by Baruch Siach <[email protected]>

---
 package/luksmeta/Config.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

package/luksmeta/Config.in +2 -4

index dec132ddd3e0..9fa94f80716a 100644
@@ -3,7 +3,6 @@ config BR2_PACKAGE_LUKSMETA
 	depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup -> lvm2
 	depends on BR2_USE_MMU # cryptsetup -> lvm2
 	depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2
-	depends on !BR2_TOOLCHAIN_USES_MUSL # cryptsetup -> lvm2
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c
 	select BR2_PACKAGE_CRYPTSETUP
 	help

@@ -12,7 +11,6 @@ config BR2_PACKAGE_LUKSMETA
 
 	  https://github.com/latchset/luksmeta
 
-comment "luksmeta needs a glibc or uClibc toolchain w/ threads, dynamic library"
+comment "luksmeta needs a toolchain w/ threads, dynamic library"
 	depends on BR2_USE_MMU
-	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
-		|| BR2_TOOLCHAIN_USES_MUSL
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

Signature · 1 line

2.15.1

Peter Korsgaard

2017-12-22 14:34 UTC #2 lore raw

PATCH 2/2 luksmeta: enabled build with musl

Quoted 7 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Baruch" == Baruch Siach <[email protected]> writes:
cryptsetup is available under musl since commit f71507d41bcb00 (lvm2:
make basic package available under musl). Enable luksmeta as well.
Cc Peter Korsgaard <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Thomas Petazzoni

2017-12-22 13:38 UTC #3 lore raw

PATCH 1/2 cryptsetup: bump to version 2.0.0

In reply to Baruch Siach

Hello,

Quoted 1 line · Baruch Siach

Add the now mandatory json-c depencecy. Propagate to reverse

dependency

package/cryptsetup/Config.in config BR2_PACKAGE_CRYPTSETUP · line 6

Quoted 9 lines

package/cryptsetup/Config.in +1 -0

index d24f7b0af6c7..dcf56f1e405d 100644
@@ -3,10 +3,12 @@ config BR2_PACKAGE_CRYPTSETUP
 	depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2
 	depends on BR2_USE_MMU # lvm2
 	depends on !BR2_STATIC_LIBS # lvm2
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c

You forgot to propagate to the Config.in comment.

package/luksmeta/Config.in config BR2_PACKAGE_LUKSMETA · line 7

Quoted 9 lines

package/luksmeta/Config.in +1 -0

index 62e1f3e42f5b..dec132ddd3e0 100644
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LUKSMETA
 	depends on BR2_USE_MMU # cryptsetup -> lvm2
 	depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2
 	depends on !BR2_TOOLCHAIN_USES_MUSL # cryptsetup -> lvm2
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c

Ditto.

Best regards,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Peter Korsgaard

2017-12-22 14:40 UTC #4 lore raw

PATCH 1/2 cryptsetup: bump to version 2.0.0

In reply to Baruch Siach

Quoted 11 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Baruch" == Baruch Siach <[email protected]> writes:
Add the now mandatory json-c depencecy. Propagate to reverse dependencies.
Drop the no longer needed patch.
Add license files hashes.
Cc Martin Hicks <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

Committed after propagating the _HAS_SYNC_4 dependency to the comments, thanks.

Signature · 1 line

Bye, Peter Korsgaard