Created by James Westby and last modified
Get this branch:
bzr branch lp://staging/ubuntu/maverick-proposed/ecryptfs-utils
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches
Review team:
Ubuntu Development Team

Recent revisions

67. By Dustin Kirkland 

* src/libecryptfs/key_management.c: LP: #725862
  - fix nasty bug affecting users who do *not* encrypt filenames;
    the first login works, but on logout, only one key gets
    cleaned out; subsequent logins do not insert the necessary key
    due to an early "goto out"

66. By Dustin Kirkland 

* Cherry pick upstream bzr commit r520
* src/utils/mount.ecryptfs_private.c:
  - fix bug LP: #313812, clear used keys on unmount
  - add ecryptfs_unlink_sigs to the mount opts, so that unmounts from
    umount.ecryptfs behave similarly
  - use ecryptfs_remove_auth_tok_from_keyring() on the sig and sig_fnek

65. By Dustin Kirkland 

src/desktop/ecryptfs-record-passphrase: fix typo, LP: #524139

64. By Dustin Kirkland 

debian/rules, debian/control: disable the gpg key module,
as it's not yet functional; does more harm than good to build it;
should not be in 10.04 LTS; clean up build-deps; also, not using
opencryptoki either; unbreak the build for 32-bit Lucid

63. By Dustin Kirkland 

[ David Planella ]
* Makefile.am, configure.ac, debian/control, debian/po/POTFILES.sh,
  debian/po/ecryptfs-utils.pot, debian/po/fr.po, debian/rules,
  po/POTFILES.in, src/desktop/Makefile.am,
  - internationalization work for LP: #358283
* po/LINGUAS, po/ca.po: Catalan translation

[ Yan Li <email address hidden> ]
* src/pam_ecryptfs/pam_ecryptfs.c, src/utils/Makefile.am,
  src/utils/ecryptfs-migrate-home: add a script and pam hooks to
  support automatic migration to encrypted home directory

[ Dustin Kirkland ]
* src/utils/ecryptfs-migrate-home: clean up for merge
  - use $() rather than ``
  - drop set -u
  - use = and !=, and quote vars, rather than testing with -ne, -eq,
    for better shell portability
  - improve usage statement and error text
  - check if already encrypted
  - handle migration of multiple users on boot
  - fix all whitespace, use tabs for indents
  - use quotes around variables, rather than ${} (stylistic preference)
  - major simplification for immediate release
    + remove boot and user modes; only support administrator mode for
      security reasons and to avoid race conditions
    + other modes can be re-added, if necessary, and if security
      concerns can be addressed
  - ensure running as root
  - drop VERBOSE option, always print useful info messages
  - call the user $USER_NAME rather than $USER_ID since id implies
    number, and here we're deailing with names
  - no decimals on awk calculation
  - mktemp on the target user, not root
  - check that there is enough disk space available to do the migration
  - ensure the user's homedir group is correct
  - add critical instructions, user *must* login after the migration and
    before the reboot, as their wrapped passphrase will be cleared on
    reboot (possible we should use an init script to move these to
    /var/tmp on reboot)
  - ensure permissions are set correctly
  - improve text at the end of the migration, organize into notes
* ecryptfs-utils.ecryptfs-utils-restore.upstart,
  ecryptfs-utils.ecryptfs-utils-save.upstart, rules:
  - try to protect migrating users who don't login before the next reboot
* debian/ecryptfs-utils.install: install the locale messages
* src/desktop/ecryptfs-record-passphrase: improve dialog text
* src/desktop/ecryptfs-record-passphrase: revert the _ bit, as it's not quite
  working yet, will need to talk to David to fix
* Mark LP: #471725 as fixed

62. By Dustin Kirkland 

debian/rules: fix FTBFS, CFLAGS needed for libgcrypt11-dev linking

61. By Dustin Kirkland 

Merging upstream release

60. By Dustin Kirkland 

* src/utils/ecryptfs-setup-private, debian/control: LP: #456565
  - fix typo, s/getext/gettext
  - depend on gettext-base

59. By Dustin Kirkland 

src/utils/ecryptfs-setup-private: fix bug where setup-private
incorrectly assumed that the home/private dir ownerships should
be owned by USER:USER; instead, default to USER:GROUP, where
GROUP is the USER's primary group by default, cherry-pick upstream
r463, LP: #445301

58. By Dustin Kirkland 

[ Michael Terry ]
* src/utils/ecryptfs-setup=swap: clean up some error message reporting,
  LP: #430891, #430890

[ Dustin Kirkland ]
* doc/manpage/ecryptfs.7: note the 64-char passphrase limit, LP: #386504
* src/utils/ecryptfs-setup-private: minor documentation change

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.