rpms/ecryptfs-utils/F-10 .cvsignore, 1.22, 1.23 ecryptfs-utils-75-nocryptdisks.patch, 1.2, 1.3 ecryptfs-utils.spec, 1.37, 1.38 sources, 1.25, 1.26

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8551

Modified Files:
	.cvsignore ecryptfs-utils-75-nocryptdisks.patch 
	ecryptfs-utils.spec sources 
Log Message:
* Tue Sep 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 81-1
- updated to 81



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	18 Aug 2009 07:16:17 -0000	1.22
+++ .cvsignore	29 Sep 2009 11:46:00 -0000	1.23
@@ -1,2 +1,2 @@
 ecryptfs-mount-private.png
-ecryptfs-utils_79.orig.tar.gz
+ecryptfs-utils_81.orig.tar.gz

ecryptfs-utils-75-nocryptdisks.patch:
 ecryptfs-setup-swap |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Index: ecryptfs-utils-75-nocryptdisks.patch
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/ecryptfs-utils-75-nocryptdisks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ecryptfs-utils-75-nocryptdisks.patch	18 Aug 2009 07:16:18 -0000	1.2
+++ ecryptfs-utils-75-nocryptdisks.patch	29 Sep 2009 11:46:00 -0000	1.3
@@ -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"


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/ecryptfs-utils.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- ecryptfs-utils.spec	18 Aug 2009 07:16:18 -0000	1.37
+++ ecryptfs-utils.spec	29 Sep 2009 11:46:00 -0000	1.38
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: ecryptfs-utils
-Version: 79
+Version: 81
 Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
@@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue Sep 29 2009 Michal Hlavinka <mhlavink at redhat.com> - 81-1
+- updated to 81
+
 * Tue Aug 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 79-1
 - updated to 79
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	18 Aug 2009 07:16:18 -0000	1.25
+++ sources	29 Sep 2009 11:46:00 -0000	1.26
@@ -1,2 +1,2 @@
 e612ddb9ccb17f8fec79df26e626a8c6  ecryptfs-mount-private.png
-ecafae1b1fbaa17460a4f9468f450d8b  ecryptfs-utils_79.orig.tar.gz
+7a8cf5c1cc638bb21036c2088806fc9d  ecryptfs-utils_81.orig.tar.gz