-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: update cryptsetup to 2.6.1 #1
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TAG Bot TAG: 2%2.6.1-5 |
diff --git a/debian/control b/debian/control
index 6ca8516..1adef77 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Maintainer: Debian Cryptsetup Team <[email protected]
Uploaders: Jonas Meurer <[email protected]>,
Guilhem Moulin <[email protected]>
Rules-Requires-Root: no
-Build-Depends: autoconf,
+Build-Depends: asciidoctor <!nodoc>,
+ autoconf,
automake (>= 1:1.12),
autopoint,
debhelper-compat (= 13),
@@ -30,7 +31,7 @@ Build-Depends: autoconf,
uuid-dev,
xsltproc <!nodoc>,
xxd <!nocheck>
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
Homepage: https://gitlab.com/cryptsetup/cryptsetup
Vcs-Browser: https://salsa.debian.org/cryptsetup-team/cryptsetup
Vcs-Git: https://salsa.debian.org/cryptsetup-team/cryptsetup.git -b debian/latest
@@ -40,12 +41,10 @@ Architecture: linux-any
Multi-Arch: foreign
Depends: cryptsetup-bin (>= 2:1.6.0),
dmsetup,
+ cryptsetup-initramfs,
${misc:Depends},
- ${shlibs:Depends},
- cryptsetup-initramfs
+ ${shlibs:Depends}
Suggests: dosfstools, keyutils, liblocale-gettext-perl
-Replaces: cryptsetup-run (<< 2:2.1.0-6)
-Breaks: cryptsetup-run (<< 2:2.1.0-6)
Description: disk encryption support - startup scripts
Cryptsetup provides an interface for configuring encryption on block
devices (such as /home or swap partitions), using the Linux kernel
@@ -71,8 +70,26 @@ Description: disk encryption support - command line tools
device mapper target dm-crypt. It features integrated Linux Unified Key
Setup (LUKS) support.
.
- This package provides cryptsetup, cryptsetup-reencrypt, integritysetup
- and veritysetup.
+ This package provides the cryptsetup, integritysetup and veritysetup
+ utilities.
+
+Package: cryptsetup-ssh
+Architecture: linux-any
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: cryptsetup-bin (>= ${source:Version})
+Breaks: cryptsetup (<< 2:2.5.0~rc1-3), cryptsetup-bin (<< 2:2.5.0~rc1-3)
+Replaces: cryptsetup (<< 2:2.5.0~rc1-3), cryptsetup-bin (<< 2:2.5.0~rc1-3)
+Description: disk encryption support - experimental SSH token handler
+ Cryptsetup provides an interface for configuring encryption on block
+ devices (such as /home or swap partitions), using the Linux kernel
+ device mapper target dm-crypt. It features integrated Linux Unified Key
+ Setup (LUKS) support.
+ .
+ This package provides the cryptsetup-ssh(8) utility and an SSH token plugin
+ which can be used to unlock LUKS2 devices using a remote keyfile hosted on a
+ system accessible through SSH. This is currently an *experimental* feature
+ and mostly serves as a demonstration of the plugin interface API.
Package: cryptsetup-initramfs
Architecture: all
@@ -83,6 +100,7 @@ Depends: busybox | busybox-static,
Recommends: console-setup, kbd
Breaks: cryptsetup (<< 2:2.0.3-1)
Replaces: cryptsetup (<< 2:2.0.3-1)
+Conflicts: lvm2 (<< 2.03.15-1)
Description: disk encryption support - initramfs integration
Cryptsetup provides an interface for configuring encryption on block
devices (such as /home or swap partitions), using the Linux kernel
@@ -113,16 +131,6 @@ Description: disk encryption support - suspend mode integration
and requires systemd. Moreover, this is an early implementation and may not
be as mature as the other cryptsetup-* packages yet.
-Package: cryptsetup-run
-Section: oldlibs
-Architecture: all
-Multi-Arch: foreign
-Depends: cryptsetup (>= 2:2.1.0-6), ${misc:Depends}
-Description: transitional dummy package for cryptsetup
- This is a transitional dummy package to get upgrading systems to install the
- cryptsetup package. It can safely be removed once no other package depends on
- it.
-
Package: libcryptsetup12
Section: libs
Architecture: linux-any
@@ -140,7 +148,16 @@ Package: libcryptsetup-dev
Section: libdevel
Architecture: linux-any
Multi-Arch: same
-Depends: libcryptsetup12 (= ${binary:Version}), ${misc:Depends}
+# XXX [#1025065] ideal we would have "Depends: libcryptsetup12
+# (= ${binary:Version}), ${misc:Depends}, ${pkgconf:Depends}"
+Depends: libargon2-dev,
+ libblkid-dev,
+ libcryptsetup12 (= ${binary:Version}),
+ libdevmapper-dev,
+ libjson-c-dev,
+ libssl-dev,
+ uuid-dev,
+ ${misc:Depends}
Description: disk encryption support - development files
Cryptsetup provides an interface for configuring encryption on block
devices (such as /home or swap partitions), using the Linux kernel
@@ -152,6 +169,7 @@ Description: disk encryption support - development files
Package: cryptsetup-udeb
Section: debian-installer
Package-Type: udeb
+Build-Profiles: <!noudeb>
Architecture: linux-any
Depends: dmsetup-udeb, ${misc:Depends}, ${shlibs:Depends}
Description: disk encryption support - commandline tools (udeb)
@@ -165,6 +183,7 @@ Description: disk encryption support - commandline tools (udeb)
Package: libcryptsetup12-udeb
Section: debian-installer
Package-Type: udeb
+Build-Profiles: <!noudeb>
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: disk encryption support - shared library (udeb) |
/approve |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Zeno-sole The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.