diff --git a/.cvsignore b/.cvsignore index 66e8668..2b24131 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ ecryptfs-mount-private.png -ecryptfs-utils_78.orig.tar.gz +ecryptfs-utils_79.orig.tar.gz diff --git a/ecryptfs-utils-75-nocryptdisks.patch b/ecryptfs-utils-75-nocryptdisks.patch index abdc339..a7bd745 100644 --- a/ecryptfs-utils-75-nocryptdisks.patch +++ b/ecryptfs-utils-75-nocryptdisks.patch @@ -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 - diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index c8befa2..670efdf 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: 78 -Release: 2%{?dist} +Version: 79 +Release: 1%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ @@ -58,7 +58,7 @@ the interface supplied by the ecryptfs-utils library. %setup -q %patch2 -p1 -b .build %patch4 -p1 -b .werror -%patch6 -p0 -b .nocryptdisks +%patch6 -p1 -b .nocryptdisks %build export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror" @@ -143,6 +143,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 @@ -153,6 +155,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,-) @@ -172,6 +175,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Tue Aug 18 2009 Michal Hlavinka - 79-1 +- updated to 79 + * Wed Jul 29 2009 Michal Hlavinka - 78-2 - ecryptfs-dot-private is no longer used diff --git a/sources b/sources index 9e894ca..52925f9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ e612ddb9ccb17f8fec79df26e626a8c6 ecryptfs-mount-private.png -0ea4f56d7086412f89dc166ee97c2246 ecryptfs-utils_78.orig.tar.gz +ecafae1b1fbaa17460a4f9468f450d8b ecryptfs-utils_79.orig.tar.gz