rpms/ecryptfs-utils/F-10 ecryptfs-utils-75-workaround503261.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 ecryptfs-utils-75-werror.patch, 1.1, 1.2 ecryptfs-utils.spec, 1.35, 1.36 sources, 1.23, 1.24
Michal Hlavinka
mhlavink at fedoraproject.org
Tue Jul 21 07:34:47 UTC 2009
Author: mhlavink
Update of /cvs/extras/rpms/ecryptfs-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24850
Modified Files:
.cvsignore ecryptfs-utils-75-werror.patch ecryptfs-utils.spec
sources
Added Files:
ecryptfs-utils-75-workaround503261.patch
Log Message:
updated to 76
ecryptfs-utils-75-workaround503261.patch:
mount.ecryptfs.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
--- NEW FILE ecryptfs-utils-75-workaround503261.patch ---
diff -up ecryptfs-utils-75/src/utils/mount.ecryptfs.c.tempfix ecryptfs-utils-75/src/utils/mount.ecryptfs.c
--- ecryptfs-utils-75/src/utils/mount.ecryptfs.c.tempfix 2009-06-23 10:26:27.706393260 +0200
+++ ecryptfs-utils-75/src/utils/mount.ecryptfs.c 2009-06-23 10:29:17.735200580 +0200
@@ -545,6 +545,7 @@ int main(int argc, char **argv)
int sig_cache = 1;
int rc;
struct passwd *pw;
+ int mlocked = 0;
/* Nasty hack; On some systems, this need to run before we mlock.
* See:
@@ -556,11 +557,14 @@ int main(int argc, char **argv)
rc = -EIO;
goto out;
}
-
- rc = mlockall(MCL_FUTURE);
- if (rc) {
- fprintf(stderr, "Exiting. Unable to mlockall address space: %m\n");
- return -1;
+ /* TODO: do propper fix - mlock only really required code (and use safe_allock?) */
+ if (geteuid()==0) {
+ mlocked = 1;
+ rc = mlockall(MCL_FUTURE);
+ if (rc) {
+ fprintf(stderr, "Exiting. Unable to mlockall address space: %m\n");
+ return -1;
+ }
}
if (dump_args) {
int i;
@@ -660,6 +664,7 @@ int main(int argc, char **argv)
}
out:
- munlockall();
+ if (mlocked)
+ munlockall();
return rc;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore 21 Mar 2009 07:30:45 -0000 1.20
+++ .cvsignore 21 Jul 2009 07:34:46 -0000 1.21
@@ -1 +1,2 @@
-ecryptfs-utils_73.orig.tar.gz
+ecryptfs-utils_76.orig.tar.gz
+ecryptfs-mount-private.png
ecryptfs-utils-75-werror.patch:
libecryptfs/ecryptfs-stat.c | 2 +-
pam_ecryptfs/pam_ecryptfs.c | 31 ++-----------------------------
2 files changed, 3 insertions(+), 30 deletions(-)
Index: ecryptfs-utils-75-werror.patch
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/ecryptfs-utils-75-werror.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ecryptfs-utils-75-werror.patch 5 May 2009 14:01:36 -0000 1.1
+++ ecryptfs-utils-75-werror.patch 21 Jul 2009 07:34:46 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c
---- ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c.werror 2009-03-05 22:17:36.000000000 +0100
-+++ ecryptfs-utils-75/src/libecryptfs/ecryptfs-stat.c 2009-05-05 14:16:47.965159244 +0200
+diff -up ecryptfs-utils_76.orig/src/libecryptfs/ecryptfs-stat.c.werror ecryptfs-utils_76.orig/src/libecryptfs/ecryptfs-stat.c
+--- ecryptfs-utils_76.orig/src/libecryptfs/ecryptfs-stat.c.werror 2009-07-17 01:24:18.000000000 +0200
++++ ecryptfs-utils_76.orig/src/libecryptfs/ecryptfs-stat.c 2009-07-21 08:10:43.516946733 +0200
@@ -146,7 +146,7 @@ int ecryptfs_parse_stat(struct ecryptfs_
if (buf_size < (ECRYPTFS_FILE_SIZE_BYTES
+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES
@@ -10,28 +10,9 @@ diff -up ecryptfs-utils-75/src/libecrypt
"bytes; there are only [%zu] bytes\n", __FUNCTION__,
(ECRYPTFS_FILE_SIZE_BYTES
+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES
-diff -up ecryptfs-utils-75/src/libecryptfs/key_management.c.werror ecryptfs-utils-75/src/libecryptfs/key_management.c
---- ecryptfs-utils-75/src/libecryptfs/key_management.c.werror 2009-05-01 00:53:13.000000000 +0200
-+++ ecryptfs-utils-75/src/libecryptfs/key_management.c 2009-05-05 13:57:18.142095484 +0200
-@@ -18,6 +18,7 @@
- * 02111-1307, USA.
- */
-
-+#include "config.h"
- #include <errno.h>
- #ifdef ENABLE_NSS
- #include <nss.h>
-@@ -39,7 +40,6 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <pwd.h>
--#include "config.h"
- #include "../include/ecryptfs.h"
-
- #ifndef ENOKEY
-diff -up ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c
---- ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror 2009-04-30 23:40:12.000000000 +0200
-+++ ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c 2009-05-05 13:57:18.142095484 +0200
+diff -up ecryptfs-utils_76.orig/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils_76.orig/src/pam_ecryptfs/pam_ecryptfs.c
+--- ecryptfs-utils_76.orig/src/pam_ecryptfs/pam_ecryptfs.c.werror 2009-07-17 01:24:18.000000000 +0200
++++ ecryptfs-utils_76.orig/src/pam_ecryptfs/pam_ecryptfs.c 2009-07-21 08:10:07.068947047 +0200
@@ -42,31 +42,6 @@
#define PRIVATE_DIR "Private"
@@ -78,7 +59,7 @@ diff -up ecryptfs-utils-75/src/pam_ecryp
/* User has not recorded their passphrase */
unlink("/var/lib/update-notifier/user.d/ecryptfs-record-passphrase");
- symlink("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", "/var/lib/update-notifier/user.d/ecryptfs-record-passphrase");
-+ rc = symlink("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", "/var/lib/update-notifier/user.d/ecryptfs-record-passphrase");
++ rc=symlink("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", "/var/lib/update-notifier/user.d/ecryptfs-record-passphrase");
fd = open("/var/lib/update-notifier/dpkg-run-stamp", O_WRONLY|O_CREAT|O_NONBLOCK, 0666);
close(fd);
}
@@ -91,14 +72,3 @@ diff -up ecryptfs-utils-75/src/pam_ecryp
goto out;
}
saved_uid = geteuid();
-diff -up ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c
---- ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror 2009-05-01 01:04:38.000000000 +0200
-+++ ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c 2009-05-05 13:57:18.142095484 +0200
-@@ -42,7 +42,6 @@ int main(int argc, char *argv[])
- char *wrapping_passphrase;
- char salt[ECRYPTFS_SALT_SIZE];
- char salt_hex[ECRYPTFS_SALT_SIZE_HEX];
-- struct passwd *pwd;
- int rc = 0;
-
- if (argc == 1) {
Index: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/ecryptfs-utils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- ecryptfs-utils.spec 21 May 2009 10:03:32 -0000 1.35
+++ ecryptfs-utils.spec 21 Jul 2009 07:34:47 -0000 1.36
@@ -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: 75
+Version: 76
Release: 1%{?dist}
Summary: The eCryptfs mount helper and support libraries
Group: System Environment/Base
@@ -18,16 +18,16 @@ Patch2: ecryptfs-utils-74-build.patch
#required for ecryptfs-utils <= 75
Patch4: ecryptfs-utils-75-werror.patch
-#taken from upstream, required for ecryptfs-utils <= 75, rhbz#500820
-Patch5: ecryptfs-utils-75-blkid.patch
-
#rhbz#500829
Patch6: ecryptfs-utils-75-nocryptdisks.patch
+#temporary workaround for rhbz#503261
+Patch9: ecryptfs-utils-75-workaround503261.patch
+
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
+BuildRequires: trousers-devel nss-devel desktop-file-utils autoconf automake libtool
%description
eCryptfs is a stacked cryptographic filesystem that ships in Linux
@@ -58,13 +58,14 @@ applications written in the Python progr
the interface supplied by the ecryptfs-utils library.
%prep
-%setup -q
+%setup -q -n %{name}_%{version}.orig
%patch2 -p1 -b .build
%patch4 -p1 -b .werror
-%patch5 -p0 -b .blkid
%patch6 -p0 -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
@@ -177,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitearch}/ecryptfs-utils/_libecryptfs.so
%changelog
+* Tue Jul 21 2009 Michal Hlavinka <mhlavink at redhat.com> 76-1
+- updated to 76
+
* Thu May 21 2009 Michal Hlavinka <mhlavink at redhat.com> 75-2
- removed executable permission from ecryptfs-dot-private (#500817)
- require cryptsetup-luks for encrypted swap (#500824)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-10/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources 21 May 2009 10:03:32 -0000 1.23
+++ sources 21 Jul 2009 07:34:47 -0000 1.24
@@ -1,2 +1,2 @@
-2c4e8be38d1ea8cadd9f870f15430f07 ecryptfs-utils_75.orig.tar.gz
+0e6a58a0730838dc832ecd8bd9e0c463 ecryptfs-utils_76.orig.tar.gz
e612ddb9ccb17f8fec79df26e626a8c6 ecryptfs-mount-private.png
More information about the fedora-extras-commits
mailing list