rpms/ecryptfs-utils/F-11 ecryptfs-utils-75-workaround503261.patch, NONE, 1.1 ecryptfs-utils.spec, 1.47, 1.48
Michal Hlavinka
mhlavink at fedoraproject.org
Tue Jun 23 08:38:00 UTC 2009
- Previous message: rpms/sane-backends/F-10 sane-backends.spec,1.118,1.119
- Next message: rpms/libpuzzle/devel import.log, NONE, 1.1 libpuzzle.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mhlavink
Update of /cvs/extras/rpms/ecryptfs-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3170
Modified Files:
ecryptfs-utils.spec
Added Files:
ecryptfs-utils-75-workaround503261.patch
Log Message:
workaround for 503261
ecryptfs-utils-75-workaround503261.patch:
--- 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: ecryptfs-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/ecryptfs-utils.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- ecryptfs-utils.spec 4 Jun 2009 08:52:27 -0000 1.47
+++ ecryptfs-utils.spec 23 Jun 2009 08:37:27 -0000 1.48
@@ -3,7 +3,7 @@
Name: ecryptfs-utils
Version: 75
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The eCryptfs mount helper and support libraries
Group: System Environment/Base
License: GPLv2+
@@ -34,6 +34,9 @@ Patch7: ecryptfs-utils-75-pamcheck.patch
#sent upstream, rhbz#495143
Patch8: ecryptfs-utils-75-fnekonfail.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
@@ -76,6 +79,7 @@ the interface supplied by the ecryptfs-u
%patch6 -p0 -b .nocryptdisks
%patch7 -p0 -b .pamcheck
%patch8 -p0 -b .fnekonfail
+%patch9 -p1 -b .rhbz503261
%build
export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror"
@@ -193,6 +197,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitearch}/ecryptfs-utils/_libecryptfs.so
%changelog
+* Tue Jun 23 2009 Michal Hlavinka <mhlavink at redhat.com> 75-4
+- add temporary workaround for #503261
+
* Thu Jun 04 2009 Michal Hlavinka <mhlavink at redhat.com> 75-3
- add fnek sig to keyring if fnek support check fails
- Previous message: rpms/sane-backends/F-10 sane-backends.spec,1.118,1.119
- Next message: rpms/libpuzzle/devel import.log, NONE, 1.1 libpuzzle.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list