From db66525f9126f1946f6628b98fc9ff86cf7a3972 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@fedoraproject.org>
Date: Sep 29 2009 08:28:40 +0000
Subject: - updated to 81


---

diff --git a/.cvsignore b/.cvsignore
index 2b24131..f2e28ac 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 ecryptfs-mount-private.png
-ecryptfs-utils_79.orig.tar.gz
+ecryptfs-utils_81.orig.tar.gz
diff --git a/ecryptfs-utils-75-nocryptdisks.patch b/ecryptfs-utils-75-nocryptdisks.patch
index a7bd745..763dc90 100644
--- a/ecryptfs-utils-75-nocryptdisks.patch
+++ b/ecryptfs-utils-75-nocryptdisks.patch
@@ -1,18 +1,42 @@
-diff -up ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-79/src/utils/ecryptfs-setup-swap
---- ecryptfs-utils-79/src/utils/ecryptfs-setup-swap.nocryptdisks	2009-08-17 15:50:12.000000000 +0200
-+++ ecryptfs-utils-79/src/utils/ecryptfs-setup-swap	2009-08-18 08:46:44.734619290 +0200
-@@ -158,13 +158,5 @@ for swap in $swaps; do
+diff -up ecryptfs-utils-81/src/utils/ecryptfs-setup-swap.nocryptdisks ecryptfs-utils-81/src/utils/ecryptfs-setup-swap
+--- ecryptfs-utils-81/src/utils/ecryptfs-setup-swap.nocryptdisks	2009-09-19 01:41:21.000000000 +0200
++++ ecryptfs-utils-81/src/utils/ecryptfs-setup-swap	2009-09-29 10:25:07.481996541 +0200
+@@ -37,23 +37,20 @@ warn() {
+ usage() {
+ 	echo
+ 	echo `gettext "Usage:"`
+-	echo "  $0 [-f|--force] [-n|--no-reload]"
++	echo "  $0 [-f|--force]"
+ 	echo
+ 	exit 1
+ }
+ 
+ # Handle command line options
+ FORCE=0
++NO_RELOAD=1
+ while [ ! -z "$1" ]; do
+ 	case "$1" in
+ 		-f|--force)
+ 			FORCE=1
+ 			shift 1
+ 		;;
+-		-n|--no-reload)
+-			NO_RELOAD=1
+-			shift 1
+-		;;
+ 		*)
+ 			usage
+ 		;;
+@@ -166,7 +163,6 @@ for swap in $swaps; do
+ 	# Add fstab entry
  	echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab
  done
- 
--# Turn swap off
--swapoff -a
--
--# Restart cryptdisks
--/etc/init.d/cryptdisks restart
--
--# Turn the swap on
--swapon -a
 -
+ if [ "$NO_RELOAD" != 1 ]; then
+ 	# Turn swap off
+ 	swapoff -a
+@@ -179,3 +175,4 @@ if [ "$NO_RELOAD" != 1 ]; then
+ fi
+ 
  info `gettext "Successfully setup encrypted swap!"`
 +info "This will take effect after reboot"
diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index 8432d8c..77311c8 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 79
-Release: 2%{?dist}
+Version: 81
+Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
@@ -175,6 +175,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue Sep 29 2009 Michal Hlavinka <mhlavink@redhat.com> - 81-1
+- updated to 81
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 79-2
 - rebuilt with new openssl
 
diff --git a/sources b/sources
index 52925f9..ea60aac 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 e612ddb9ccb17f8fec79df26e626a8c6  ecryptfs-mount-private.png
-ecafae1b1fbaa17460a4f9468f450d8b  ecryptfs-utils_79.orig.tar.gz
+7a8cf5c1cc638bb21036c2088806fc9d  ecryptfs-utils_81.orig.tar.gz