summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 08:38:45 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 08:38:45 +0000
commit435fbf74bfdf383db1238633326be558ef2d3ff2 (patch)
treea372c8e3c5f2fe60e812d5f6a73ce54872139ee2 /misc
parentReleasing progress-linux version 2:2.7.1-1~progress7.99u1. (diff)
downloadcryptsetup-435fbf74bfdf383db1238633326be558ef2d3ff2.tar.xz
cryptsetup-435fbf74bfdf383db1238633326be558ef2d3ff2.zip
Merging upstream version 2:2.7.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'misc')
-rw-r--r--misc/fedora/cryptsetup.spec2
-rwxr-xr-xmisc/luks-header-from-active19
2 files changed, 14 insertions, 7 deletions
diff --git a/misc/fedora/cryptsetup.spec b/misc/fedora/cryptsetup.spec
index 8d1a522..2aa7b59 100644
--- a/misc/fedora/cryptsetup.spec
+++ b/misc/fedora/cryptsetup.spec
@@ -2,7 +2,7 @@
Summary: Utility for setting up encrypted disks
Name: cryptsetup
-Version: 2.7.1
+Version: 2.7.2
Release: 1%{?dist}
License: GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception AND LGPL-2.1-or-later WITH cryptsetup-OpenSSL-exception
URL: https://gitlab.com/cryptsetup/cryptsetup
diff --git a/misc/luks-header-from-active b/misc/luks-header-from-active
index a94ad33..0a326b2 100755
--- a/misc/luks-header-from-active
+++ b/misc/luks-header-from-active
@@ -1,16 +1,23 @@
#!/bin/bash
# Try to get LUKS info and master key from active mapping and prepare parameters for cryptsetup.
+# WARNING: this script is no longer compatible with current cryptsetup & dm-crypt
#
# Copyright (C) 2010,2011,2012 Milan Broz <gmazyland@gmail.com>
#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions
-# of the GNU General Public License v.2.
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
umask 0077