diff --git a/ecryptfs-setup-swap-SuSE.patch b/ecryptfs-setup-swap-SuSE.patch index e1cd4a3..1b0c596 100644 --- a/ecryptfs-setup-swap-SuSE.patch +++ b/ecryptfs-setup-swap-SuSE.patch @@ -1,7 +1,7 @@ -Index: ecryptfs-utils-106/src/utils/ecryptfs-setup-swap +Index: ecryptfs-utils-108/src/utils/ecryptfs-setup-swap =================================================================== ---- ecryptfs-utils-106.orig/src/utils/ecryptfs-setup-swap -+++ ecryptfs-utils-106/src/utils/ecryptfs-setup-swap +--- ecryptfs-utils-108.orig/src/utils/ecryptfs-setup-swap ++++ ecryptfs-utils-108/src/utils/ecryptfs-setup-swap @@ -37,23 +37,20 @@ warn() { usage() { echo @@ -28,17 +28,17 @@ Index: ecryptfs-utils-106/src/utils/ecryptfs-setup-swap *) usage ;; -@@ -149,7 +146,8 @@ i=0 - for swap in $swaps; do - info `gettext "Setting up swap:"` "[$swap]" +@@ -151,7 +148,8 @@ for swap in $swaps; do uuid=$(blkid -o value -s UUID $swap) -- for target in "UUID=$uuid" $swap; do -+ suse_swap=$(grep swap /etc/fstab |cut -d' ' -f1) -+ for target in "UUID=$uuid" $swap $suse_swap; do + # /etc/fstab might use a symlink like /dev/mapper/ubuntu--vg-swap_1 + links=$(for d in $(udevadm info --query=symlink -n $swap); do echo /dev/$d; done) +- for target in "UUID=$uuid" $swap $links; do ++ suse_swap=$(grep swap /etc/fstab |cut -d' ' -f1) ++ for target in "UUID=$uuid" $swap $links $suse_swap; do if [ -n "$target" ] && grep -qs "^$target\s\+" /etc/fstab; then sed -i "s:^$target\s\+:\#$target :" /etc/fstab warn "Commented out your unencrypted swap from /etc/fstab" -@@ -181,3 +179,4 @@ if [ "$NO_RELOAD" != 1 ]; then +@@ -201,3 +199,4 @@ if [ "$NO_RELOAD" != 1 ]; then fi info `gettext "Successfully encrypted swap!"` diff --git a/ecryptfs-utils.changes b/ecryptfs-utils.changes index bf14979..9c8a1ba 100644 --- a/ecryptfs-utils.changes +++ b/ecryptfs-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Oct 17 08:13:38 UTC 2015 - mpluskal@suse.com + +- Update to 108 + * This release does not have a changelog. + ------------------------------------------------------------------- Fri Oct 2 19:55:18 UTC 2015 - mpluskal@suse.com diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index 6666ce2..7cc6522 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -18,7 +18,7 @@ %define lname libecryptfs1 Name: ecryptfs-utils -Version: 106 +Version: 108 Release: 0 Summary: Userspace Utilities for ecryptfs License: GPL-2.0+ diff --git a/ecryptfs-utils_106.orig.tar.gz b/ecryptfs-utils_106.orig.tar.gz deleted file mode 100644 index a392a23..0000000 --- a/ecryptfs-utils_106.orig.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:173e0add31e898789076103723894964ce474233988ef8d3309021bad8a7b6b4 -size 659376 diff --git a/ecryptfs-utils_108.orig.tar.gz b/ecryptfs-utils_108.orig.tar.gz new file mode 100644 index 0000000..122dae8 --- /dev/null +++ b/ecryptfs-utils_108.orig.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52838b1ad41113ba88a4318b19af10cf307100c6b3f62c608998d40312fbd7dd +size 659465