lp:~rlaager/ecryptfs/fix-lp-1574174
- Get this branch:
- bzr branch lp:~rlaager/ecryptfs/fix-lp-1574174
Branch merges
- Tyler Hicks: Needs Fixing
-
Diff: 14 lines (+2/-2)1 file modifiedsrc/utils/ecryptfs-setup-private (+2/-2)
Related bugs
Related blueprints
Branch information
Recent revisions
- 881. By Richard Laager
-
Fix improper "already mounted" errors with ZFS
The obvious approach for using ZFS and ecryptfs together involves
creating a dataset like this:
zfs create -o mountpoint=/home/. ecryptfs/ USER rpool/home/USER As a result, /proc/mounts looks like this:
rpool/home/USER /home/.ecryptfs/ USER zfs rw,xattr 0 0 ecryptfs-
setup-private checked for existing mount points using a grep
which was effectively left-anchored. Unfortunately, this can match the
device column. A space at the beginning of the pattern corrects this.I applied the same fix to the CRYPTDIR for consistency and correctness,
though I do not believe it was a practical problem in the same way. - 878. By Dustin Kirkland
-
* src/utils/
ecryptfs- setup-private: LP: #1328689
- fix a long standing bug, where setting up an encrypted private,
encrypted home, or migrating to an encrypted home did not work
correctly over ssh sessions
- the root cause of the bug is some complexity in the handling of
user keyrings and session keyrings
- the long term solution would be to correctly use session keyrings
- the short term solution is to continue linking user and session
keyrings - 875. By Dustin Kirkland
-
* Remove unnecessary dependencies in the Debian packaging (LP: #1548975)
- debian/control: Remove opencryptoki from ecryptfs-utils
- debian/rules: Remove openCryptoki related logic since it was not being
- debian/control: Remove libtspi-dev from libecryptfs-dev Depends since
- debian/control: Remove libpkcs11-helper1- dev from libecryptfs-dev
Depends since --disable-pkcs11- helper is passed to the configure script
- debian/control: Remove libgpg-error-dev and libgpgme11-dev from
- debian/control: Remove libgcrypt11-dev from Build-Depends and
- debian/control: Remove libkeyutils-dev and libpam0g-dev from - 874. By Dustin Kirkland
-
* debian/control: Remove opencryptoki from ecryptfs-utils
Suggests and libopencryptoki-dev from libecryptfs-dev Depends as
openCryptoki is not a dependency of eCryptfs.
* debian/rules: Remove openCryptoki related logic since it was not being
used and is no longer needed
* debian/control: Remove libtspi-dev from libecryptfs-dev Depends since
--disable-tspi is passed to the configure script
* debian/control: Remove libpkcs11-helper1- dev from libecryptfs-dev Depends
since --disable-pkcs11- helper is passed to the configure script
* debian/control: Remove libgpg-error-dev and libgpgme11-dev from
libecryptfs-dev Depends since --disable-gpg is passed to the configure
script
* debian/control: Remove libgcrypt11-dev from Build-Depends and
libecryptfs-dev Depends since --enable-nss is passed to the configure
script to use NSS instead of Libgcrypt
* debian/control: Remove libkeyutils-dev and libpam0g-dev from
libecryptfs-dev Depends since these are build-time dependencies and not
run-time dependencies
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ecryptfs