rpms/ecryptfs-utils/F-10 .cvsignore, 1.21, 1.22 ecryptfs-utils-75-nocryptdisks.patch, 1.1, 1.2 ecryptfs-utils.spec, 1.36, 1.37 sources, 1.24, 1.25

[Michal Hlavinka]

Author: mhlavink

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

Modified Files:
	.cvsignore ecryptfs-utils-75-nocryptdisks.patch 
	ecryptfs-utils.spec sources 
Log Message:
updated to 79



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	21 Jul 2009 07:34:46 -0000	1.21
+++ .cvsignore	18 Aug 2009 07:16:17 -0000	1.22
@@ -1,2 +1,2 @@
-ecryptfs-utils_76.orig.tar.gz
 ecryptfs-mount-private.png
+ecryptfs-utils_79.orig.tar.gz

ecryptfs-utils-75-nocryptdisks.patch:
 ecryptfs-setup-swap |   10 +---------
 1 file changed, 1 insertion(+), 9 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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ecryptfs-utils-75-nocryptdisks.patch	21 May 2009 10:03:32 -0000	1.1
+++ ecryptfs-utils-75-nocryptdisks.patch	18 Aug 2009 07:16:18 -0000	1.2
@@ -1,9 +1,9 @@
-=== modified file 'src/utils/ecryptfs-setup-swap'
---- src/utils/ecryptfs-setup-swap	2009-03-20 21:44:01 +0000
-+++ src/utils/ecryptfs-setup-swap	2009-05-19 14:50:01 +0000
-@@ -158,13 +158,5 @@
- # Add fstab entry
- echo "/dev/mapper/cryptswap none swap sw 0 0" >> /etc/fstab
+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
+ 	echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab
+ done
  
 -# Turn swap off
 -swapoff -a
@@ -14,7 +14,5 @@
 -# Turn the swap on
 -swapon -a
 -
- info "Successfully setup encrypted swap!"
+ info `gettext "Successfully setup encrypted swap!"`
 +info "This will take effect after reboot"
-\ No newline at end of file
-


Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/ecryptfs-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ecryptfs-utils.spec	21 Jul 2009 07:34:47 -0000	1.36
+++ ecryptfs-utils.spec	18 Aug 2009 07:16:18 -0000	1.37
@@ -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: 76
+Version: 79
 Release: 1%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
@@ -27,7 +27,7 @@ Patch9: ecryptfs-utils-75-workaround5032
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: keyutils, cryptsetup-luks, e2fsprogs
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
-BuildRequires: trousers-devel nss-devel desktop-file-utils autoconf automake libtool
+BuildRequires: trousers-devel nss-devel desktop-file-utils
 
 %description
 eCryptfs is a stacked cryptographic filesystem that ships in Linux
@@ -58,14 +58,13 @@ applications written in the Python progr
 the interface supplied by the ecryptfs-utils library.
 
 %prep
-%setup -q -n %{name}_%{version}.orig
+%setup -q
 %patch2 -p1 -b .build
 %patch4 -p1 -b .werror
-%patch6 -p0 -b .nocryptdisks
+%patch6 -p1 -b .nocryptdisks
 %patch9 -p1 -b .rhbz503261
 
 %build
-autoreconf -fiv
 export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror"
 %configure --disable-rpath --enable-tspi --enable-nss --enable-static
 make clean
@@ -99,9 +98,6 @@ touch -r src/desktop/ecryptfs-setup-priv
      $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.desktop
 rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/ecryptfs-record-passphrase
 
-#ecryptfs-dot-private should be only sourced, not executed (#500817)
-chmod -x $RPM_BUILD_ROOT%{_bindir}/ecryptfs-dot-private
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -132,7 +128,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ecryptfs-umount-private
 %{_bindir}/ecryptfs-stat
 %{_bindir}/ecryptfsd
-%{_bindir}/ecryptfs-dot-private
 %{_libdir}/ecryptfs
 %{_libdir}/libecryptfs.so.0
 %{_libdir}/libecryptfs.so.0.0.0
@@ -149,6 +144,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ecryptfs-rewrap-passphrase.1.gz
 %{_mandir}/man1/ecryptfs-rewrite-file.1.gz
 %{_mandir}/man1/ecryptfs-setup-private.1.gz
+%{_mandir}/man1/ecryptfs-setup-swap.1.gz
+%{_mandir}/man1/ecryptfs-stat.1.gz
 %{_mandir}/man1/ecryptfs-umount-private.1.gz
 %{_mandir}/man1/ecryptfs-unwrap-passphrase.1.gz
 %{_mandir}/man1/ecryptfs-wrap-passphrase.1.gz
@@ -159,6 +156,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/ecryptfsd.8.gz
 %{_mandir}/man8/mount.ecryptfs.8.gz
 %{_mandir}/man8/pam_ecryptfs.8.gz
+%{_mandir}/man8/umount.ecryptfs.8.gz
 
 %files devel
 %defattr(-,root,root,-)
@@ -178,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/ecryptfs-utils/_libecryptfs.so
 
 %changelog
+* Tue Aug 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 79-1
+- updated to 79
+
 * Tue Jul 21 2009 Michal Hlavinka <mhlavink at redhat.com> 76-1
 - updated to 76
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	21 Jul 2009 07:34:47 -0000	1.24
+++ sources	18 Aug 2009 07:16:18 -0000	1.25
@@ -1,2 +1,2 @@
-0e6a58a0730838dc832ecd8bd9e0c463  ecryptfs-utils_76.orig.tar.gz
 e612ddb9ccb17f8fec79df26e626a8c6  ecryptfs-mount-private.png
+ecafae1b1fbaa17460a4f9468f450d8b  ecryptfs-utils_79.orig.tar.gz