From 1a4de548e1968cdf54edccd7b27ba064f4e904b4 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: May 24 2011 07:05:07 +0000 Subject: updated tp v. 87 --- diff --git a/.gitignore b/.gitignore index d13ef7b..5f8bf70 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ ecryptfs-mount-private.png /ecryptfs-utils_84.orig.tar.gz /ecryptfs-utils_85.orig.tar.gz /ecryptfs-utils_86.orig.tar.gz +/ecryptfs-utils_87.orig.tar.gz diff --git a/ecryptfs-utils-86-manpage.patch b/ecryptfs-utils-86-manpage.patch index e431c2f..be7e243 100644 --- a/ecryptfs-utils-86-manpage.patch +++ b/ecryptfs-utils-86-manpage.patch @@ -1,6 +1,7 @@ ---- ecryptfs-utils-86/doc/manpage/ecryptfs.7.manfix 2011-01-06 17:48:39.000000000 +0000 -+++ ecryptfs-utils-86/doc/manpage/ecryptfs.7 2011-01-10 15:06:17.000000000 +0000 -@@ -1,6 +1,6 @@ +diff -up ecryptfs-utils-87/doc/manpage/ecryptfs.7.manfix ecryptfs-utils-87/doc/manpage/ecryptfs.7 +--- ecryptfs-utils-87/doc/manpage/ecryptfs.7.manfix 2011-03-09 14:30:32.000000000 +0100 ++++ ecryptfs-utils-87/doc/manpage/ecryptfs.7 2011-05-24 08:56:38.288877849 +0200 +@@ -1,6 +1,6 @@ .TH ecryptfs 7 2009-03-24 ecryptfs-utils "eCryptfs" .SH NAME -eCryptfs \- an enterprise-class cryptographic filesystem for linux @@ -8,16 +9,16 @@ .SH SYNOPSIS .BI "mount -t ecryptfs [SRC DIR] [DST DIR] -o [OPTIONS]" -@@ -67,7 +67,7 @@ - The actual password is password. Since the password is visible to utilities (like ps under Unix) this form should only be used where security is not important. +@@ -67,7 +67,7 @@ Parameters that apply to individual key + The actual password is passphrase. Since the password is visible to utilities (like ps under Unix) this form should only be used where security is not important. .TP .B passphrase_passwd_file=(filename) -The password should be specified in a file with passwd=(passphrase). It is highly reccomended that the file be stored on a secure medium such as a personal usb key. -+The password should be specified in a file with passwd=(passphrase). It is highly recommended that the file be stored on a secure medium such as a personal USB key. ++The password should be specified in a file with passwd=(passphrase). It is highly reccomended that the file be stored on a secure medium such as a personal USB key. .TP .B passphrase_passwd_fd=(file descriptor) The password is specified through the specified file descriptor. -@@ -79,7 +79,7 @@ +@@ -79,7 +79,7 @@ The salt should be specified as a 16 dig The filename should be the filename of a file containing an RSA SSL key. .TP .B openssl_passwd_file=(filename) @@ -26,9 +27,10 @@ .TP .B openssl_passwd_fd=(file descriptor) The password is specified through the specified file descriptor. ---- ecryptfs-utils-86/doc/manpage/ecryptfs-rewrite-file.1.manfix 2011-01-11 11:59:53.000000000 +0000 -+++ ecryptfs-utils-86/doc/manpage/ecryptfs-rewrite-file.1 2011-02-04 15:25:35.000000000 +0000 -@@ -14,7 +14,7 @@ +diff -up ecryptfs-utils-87/doc/manpage/ecryptfs-rewrite-file.1.manfix ecryptfs-utils-87/doc/manpage/ecryptfs-rewrite-file.1 +--- ecryptfs-utils-87/doc/manpage/ecryptfs-rewrite-file.1.manfix 2011-03-09 14:30:32.000000000 +0100 ++++ ecryptfs-utils-87/doc/manpage/ecryptfs-rewrite-file.1 2011-05-24 08:55:41.279482521 +0200 +@@ -14,7 +14,7 @@ This script may be combined with \fBfind ecryptfs-umount-private sync diff --git a/ecryptfs-utils-86-selinux.patch b/ecryptfs-utils-86-selinux.patch deleted file mode 100644 index c411a0a..0000000 --- a/ecryptfs-utils-86-selinux.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/utils/ecryptfs-setup-private 2011-03-02 12:22:05.000000000 +0100 -+++ b/src/utils/ecryptfs-setup-private 2011-03-02 12:22:47.000000000 +0100 -@@ -399,9 +399,11 @@ - temp=`mktemp` - echo "$sig" > "$temp" || error "$(gettext 'Could not create signature file')" "[$HOME/.ecryptfs/$PRIVATE_DIR.sig]" - mv "$temp" "$HOME/.ecryptfs/$PRIVATE_DIR.sig" -+restorecon "$HOME/.ecryptfs/$PRIVATE_DIR.sig" > /dev/null 2>&1 - temp=`mktemp` - echo "$MOUNTPOINT" > "$temp" || error "$(gettext 'Could not create mountpoint file')" "[$HOME/.ecryptfs/$PRIVATE_DIR.mnt]" - mv "$temp" "$HOME/.ecryptfs/$PRIVATE_DIR.mnt" -+restorecon "$HOME/.ecryptfs/$PRIVATE_DIR.mnt" > /dev/null 2>&1 - - echo - echo "$(gettext 'Done configuring.')" diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index 44b033d..893cf35 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -4,8 +4,8 @@ %global _sbindir /sbin Name: ecryptfs-utils -Version: 86 -Release: 3%{?dist} +Version: 87 +Release: 1%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ @@ -29,10 +29,6 @@ Patch5: ecryptfs-utils-84-fixsigness.patch # also fixes this issue: char c; while((c = fgetc(fh)) != EOF) Patch6: ecryptfs-utils-84-fgetc.patch -# selinux specific, rhbz#681495 -# fix selinux context for ~/Private cfg files -Patch7: ecryptfs-utils-86-selinux.patch - # fix man pages Patch8: ecryptfs-utils-86-manpage.patch @@ -81,7 +77,6 @@ the interface supplied by the ecryptfs-utils library. %patch4 -p1 -b .splitnss %patch5 -p1 -b .fixsigness %patch6 -p1 -b .fgetc -%patch7 -p1 -b .selinux %patch8 -p1 -b .manfix %patch999 -p1 -b .werror @@ -211,6 +206,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Tue May 24 2011 Michal Hlavinka - 87-1 +- updated tp v. 87 + * Fri Mar 11 2011 Michal Hlavinka - 86-3 - fix man pages diff --git a/sources b/sources index f4d61d0..8f77056 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ e612ddb9ccb17f8fec79df26e626a8c6 ecryptfs-mount-private.png -0df44811d9adf2c3dfd5a775e86f6452 ecryptfs-utils_86.orig.tar.gz +b3e4ec1c70b3c57bd289b327363c39f6 ecryptfs-utils_87.orig.tar.gz