diff -Nru cryptsetup-1.7.0/debian/changelog cryptsetup-1.7.0/debian/changelog
--- cryptsetup-1.7.0/debian/changelog 2016-01-10 09:45:43.000000000 -0800
+++ cryptsetup-1.7.0/debian/changelog 2016-08-19 23:22:28.000000000 -0700
@@ -1,3 +1,10 @@
+cryptsetup (2:1.7.0-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Make encrypted swap on debian great again. (Closes: #834871)
+
+ -- wayne <waynr+deb...@paunix.org> Fri, 19 Aug 2016 23:22:28 -0700
+
cryptsetup (2:1.7.0-2) unstable; urgency=medium
[ Guilhem Moulin ]
diff -Nru cryptsetup-1.7.0/debian/cryptdisks.functions
cryptsetup-1.7.0/debian/cryptdisks.functions
--- cryptsetup-1.7.0/debian/cryptdisks.functions 2016-01-10
09:42:52.000000000 -0800
+++ cryptsetup-1.7.0/debian/cryptdisks.functions 2016-08-19
23:08:29.000000000 -0700
@@ -483,6 +483,18 @@
done
}
+do_unswap () {
+ local swap_out
+
+ if [ "$MAKESWAP" != "yes" ] || [ ! -b "/dev/mapper/${dst}_unformatted"
]; then
+ return 0
+ fi
+
+ swapoff -a
+ do_close
+ return 0
+}
+
# Prepares swap partitions using random keys
do_swap () {
local swap_out
@@ -659,6 +671,20 @@
key=$3
opts=$4
+ # Make sure that all fields are present
+ if [ -z "$dst" ]; then
+ return 1
+ elif [ -z "$src" ] || [ -z "$key" ] || [ -z "$opts" ]; then
+ device_msg "$dst" "skipped, missing parameters"
+ return 1
+ fi
+
+ # Do the preparatory steps
+ if ! parse_opts "$opts"; then
+ device_msg "$dst" "invalid opts"
+ return 1
+ fi
+
if [ ! -b "/dev/mapper/$dst" ]; then
device_msg "$dst" "stopped"
return 0
diff -Nru cryptsetup-1.7.0/debian/patches/series
cryptsetup-1.7.0/debian/patches/series
--- cryptsetup-1.7.0/debian/patches/series 2011-10-26 12:16:41.000000000
-0700
+++ cryptsetup-1.7.0/debian/patches/series 2016-08-19 23:22:28.000000000
-0700
@@ -0,0 +1 @@
+fix-cryptsetup-swap-init.patch
diff -Nru cryptsetup-1.7.0/debian/scripts/po/luksformat.pot
cryptsetup-1.7.0/debian/scripts/po/luksformat.pot
--- cryptsetup-1.7.0/debian/scripts/po/luksformat.pot 2015-12-09
04:09:15.000000000 -0800
+++ cryptsetup-1.7.0/debian/scripts/po/luksformat.pot 2016-08-19
23:22:28.000000000 -0700
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: pkg-cryptsetup-de...@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2015-12-09 13:09+0100\n"
+"POT-Creation-Date: 2016-08-19 23:35-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
diff -Nru cryptsetup-1.7.0/debian/changelog cryptsetup-1.7.0/debian/changelog
--- cryptsetup-1.7.0/debian/changelog 2016-01-10 09:45:43.000000000 -0800
+++ cryptsetup-1.7.0/debian/changelog 2016-08-19 23:22:28.000000000 -0700
@@ -1,3 +1,10 @@
+cryptsetup (2:1.7.0-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Make encrypted swap on debian great again. (Closes: #834871)
+
+ -- wayne <waynr+deb...@paunix.org> Fri, 19 Aug 2016 23:22:28 -0700
+
cryptsetup (2:1.7.0-2) unstable; urgency=medium
[ Guilhem Moulin ]
diff -Nru cryptsetup-1.7.0/debian/cryptdisks.functions
cryptsetup-1.7.0/debian/cryptdisks.functions
--- cryptsetup-1.7.0/debian/cryptdisks.functions 2016-01-10
09:42:52.000000000 -0800
+++ cryptsetup-1.7.0/debian/cryptdisks.functions 2016-08-19
23:08:29.000000000 -0700
@@ -483,6 +483,18 @@
done
}
+do_unswap () {
+ local swap_out
+
+ if [ "$MAKESWAP" != "yes" ] || [ ! -b "/dev/mapper/${dst}_unformatted"
]; then
+ return 0
+ fi
+
+ swapoff -a
+ do_close
+ return 0
+}
+
# Prepares swap partitions using random keys
do_swap () {
local swap_out
@@ -659,6 +671,20 @@
key=$3
opts=$4
+ # Make sure that all fields are present
+ if [ -z "$dst" ]; then
+ return 1
+ elif [ -z "$src" ] || [ -z "$key" ] || [ -z "$opts" ]; then
+ device_msg "$dst" "skipped, missing parameters"
+ return 1
+ fi
+
+ # Do the preparatory steps
+ if ! parse_opts "$opts"; then
+ device_msg "$dst" "invalid opts"
+ return 1
+ fi
+
if [ ! -b "/dev/mapper/$dst" ]; then
device_msg "$dst" "stopped"
return 0
diff -Nru cryptsetup-1.7.0/debian/patches/series
cryptsetup-1.7.0/debian/patches/series
--- cryptsetup-1.7.0/debian/patches/series 2011-10-26 12:16:41.000000000
-0700
+++ cryptsetup-1.7.0/debian/patches/series 2016-08-19 23:22:28.000000000
-0700
@@ -0,0 +1 @@
+fix-cryptsetup-swap-init.patch
diff -Nru cryptsetup-1.7.0/debian/scripts/po/luksformat.pot
cryptsetup-1.7.0/debian/scripts/po/luksformat.pot
--- cryptsetup-1.7.0/debian/scripts/po/luksformat.pot 2015-12-09
04:09:15.000000000 -0800
+++ cryptsetup-1.7.0/debian/scripts/po/luksformat.pot 2016-08-19
23:22:28.000000000 -0700
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: pkg-cryptsetup-de...@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2015-12-09 13:09+0100\n"
+"POT-Creation-Date: 2016-08-19 23:35-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
