Accepting request 306383 from security

- updated to 106
  - new passphrase wrapping method, including the salt to fix
    CVE-2014-9687 / bsc#920160
  - various bugfixes

OBS-URL: https://build.opensuse.org/request/show/306383
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ecryptfs-utils?expand=0&rev=44

ecryptfs-setup-swap-SuSE.patch

@@ -1,6 +1,8 @@
---- ecryptfs-utils-103/src/utils/ecryptfs-setup-swap	2013-08-05 10:44:55.618908888 -0400
-+++ ecryptfs-utils-103/src/utils/ecryptfs-setup-swap.mod	2013-08-05 10:54:16.966419219 -0400
-@@ -37,23 +37,20 @@
+Index: ecryptfs-utils-106/src/utils/ecryptfs-setup-swap
+===================================================================
+--- ecryptfs-utils-106.orig/src/utils/ecryptfs-setup-swap
++++ ecryptfs-utils-106/src/utils/ecryptfs-setup-swap
+@@ -37,23 +37,20 @@ warn() {
  usage() {
  	echo
  	echo `gettext "Usage:"`
@@ -26,26 +28,18 @@
  		*)
  			usage
  		;;
-@@ -149,7 +146,8 @@
+@@ -149,7 +146,8 @@ i=0
  for swap in $swaps; do
  	info `gettext "Setting up swap:"` "[$swap]"
  	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 $suse_swap $swap; do
- 		if [ -n "$target" ] && grep -qs "^$target " /etc/fstab; then
- 			sed -i "s:^$target :\#$target :" /etc/fstab
++	for target in "UUID=$uuid" $swap $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"
-@@ -166,7 +164,6 @@
- 	# Add fstab entry
- 	echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab
- done
--
- if [ "$NO_RELOAD" != 1 ]; then
- 	# Turn swap off
- 	swapoff -a
-@@ -179,3 +176,4 @@
+@@ -181,3 +179,4 @@ if [ "$NO_RELOAD" != 1 ]; then
  fi
  
- info `gettext "Successfully setup encrypted swap!"`
+ info `gettext "Successfully encrypted swap!"`
 +info "This will take effect after reboot"

ecryptfs-utils.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon May 11 14:39:00 UTC 2015 - meissner@suse.com
+
+- updated to 106
+  - new passphrase wrapping method, including the salt to fix
+    CVE-2014-9687 / bsc#920160
+  - various bugfixes
+
 -------------------------------------------------------------------
 Thu Sep  4 13:13:07 UTC 2014 - darin@darins.net
 

ecryptfs-utils.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ecryptfs-utils
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@ Url:            http://ecryptfs.org/
 Summary:        Userspace Utilities for ecryptfs
 License:        GPL-2.0+
 Group:          Productivity/Security
-Version:        104
+Version:        106
 Release:        0
 Source0:        http://launchpad.net/ecryptfs/trunk/%version/+download/ecryptfs-utils_%version.orig.tar.gz
 Source1:        baselibs.conf

ecryptfs-utils_104.orig.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4a200176542d46439c5297021f2c7fd7343b871c20c6f73f6e6c9fc4e5fd7438
-size 649268

ecryptfs-utils_106.orig.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:173e0add31e898789076103723894964ce474233988ef8d3309021bad8a7b6b4
+size 659376