~ubuntu-branches/ubuntu/wily/ecryptfs-utils/wily

« back to all changes in this revision

Viewing changes to src/utils/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Nobuto MURATA, Colin King, Nobuto MURATA, Tyler Hicks, Dustin Kirkland, Colin King and Dustin Kirkland
  • Date: 2013-02-21 01:56:33 UTC
  • mfrom: (1.1.20)
  • Revision ID: package-import@ubuntu.com-20130221015633-2bdu5khbdcowlxm5
Tags: 104-0ubuntu1
[ Colin King ]
* src/libecryptfs/ecryptfs-stat.c, tests/kernel/extend-file-
  random/test.c, tests/kernel/inode-race-stat/test.c,
  tests/kernel/trunc-file/test.c:
  - Fixed some 32 bit build warnings
* src/libecryptfs/decision_graph.c, src/libecryptfs/key_management.c,
  src/libecryptfs/main.c, src/libecryptfs/module_mgr.c, src/utils/io.c,
  src/utils/mount.ecryptfs_private.c, tests/kernel/inotify/test.c,
  tests/kernel/trunc-file/test.c, tests/userspace/wrap-unwrap/test.c:
  - Fixed a pile of minor bugs (memory leaks, unclosed file descriptors,
    etc.) mostly in error paths
* src/key_mod/ecryptfs_key_mod_passphrase.c, src/libecryptfs/main.c,
  src/pam_ecryptfs/pam_ecryptfs.c:
  - more Coverity fixes, memory leak, error checking, etc.

[ Nobuto MURATA ]
* fix an empty update-notifier window (LP: #1107650)
  - changes made in Rev.758 was incomplete

[ Tyler Hicks ]
* doc/manpage/ecryptfs.7:
  - adjust man page text to avoid confusion about whether the interactive
    mount helper takes a capital 'N' for the answer to y/n questions
    (LP: #1130460)
* src/utils/ecryptfs_rewrap_passphrase.c:
  - Handle errors when interactively reading the new wrapping passphrase
    and the confirmation from stdin. Fixes a segfault (invalid memory read)
    in ecryptfs-rewrap-passphrase if there was an error while reading either
    of these passphrases.
* configure.ac:
  - Set AM_CPPFLAGS to always include config.h as the first include file.
    Some .c files correctly included config.h before anything else. The
    majority of .c files got this wrong by including it after other header
    files, including it multiple times, or not including it at all.
    Including it in the AM_CPPFLAGS should solve these problems and keep
    future mistakes from happening in new source files.
  - Enable large file support (LFS) through the use of the AC_SYS_LARGEFILE
    autoconf macro. ecryptfs-utils has been well tested with LFS enabled
    because ecryptfs-utils is being built with
    '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' in Debian-based distros.
    This is mainly needed for some of the in-tree regression tests but
    ecryptfs-utils, in general, should be built with LFS enabled.
* debian/rules:
  - Don't append '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' to the CFLAGS
    now that the upstream build enables LFS
* tests/userspace/lfs.sh, tests/userspace/lfs/test.c:
  - Add a test to verify that LFS is enabled. This test is run under the
    make check target.
* tests/kernel/enospc/test.c:
  - Fix test failures on 32 bit architectures due to large file sizes
    overflowing data types

[ Dustin Kirkland ]
* src/utils/ecryptfs-setup-swap: LP: #1172014
  - write crypttab entry using UUID
* src/utils/ecryptfs-recover-private: LP: #1028532
  - error out, if we fail to mount the private data correctly

[ Colin King and Dustin Kirkland ]
* configure.ac, src/daemon/main.c, src/libecryptfs/cmd_ln_parser.c,
  src/libecryptfs/decision_graph.c, src/utils/mount.ecryptfs.c,
  tests/kernel/trunc-file/test.c:
  - remove some dead code, fix some minor issues raised by Coverity

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
2
2
 
3
 
EXTRA_DIST=ecryptfsrc ecryptfs-rewrite-file ecryptfs-setup-private ecryptfs-setup-swap ecryptfs-mount-private ecryptfs-umount-private
 
3
EXTRA_DIST=ecryptfsrc ecryptfs-rewrite-file ecryptfs-setup-private ecryptfs-setup-swap ecryptfs-mount-private ecryptfs-umount-private ecryptfs-migrate-home ecryptfs-recover-private ecryptfs-find ecryptfs-verify
4
4
 
5
5
rootsbin_PROGRAMS=mount.ecryptfs \
6
6
                  umount.ecryptfs \
15
15
              ecryptfs-setup-swap \
16
16
              ecryptfs-mount-private \
17
17
              ecryptfs-umount-private \
18
 
              ecryptfs-rewrite-file
 
18
              ecryptfs-rewrite-file \
 
19
              ecryptfs-recover-private \
 
20
              ecryptfs-migrate-home \
 
21
              ecryptfs-find \
 
22
              ecryptfs-verify
 
23
bin2dir = $(bindir)
19
24
 
20
25
noinst_PROGRAMS=test
21
26
 
27
32
bin_PROGRAMS+=ecryptfs-generate-tpm-key
28
33
endif
29
34
 
30
 
INCLUDES = -I$(top_srcdir)/src/include
 
35
AM_CPPFLAGS += -I$(top_srcdir)/src/include
31
36
 
32
37
mount_ecryptfs_SOURCES = mount.ecryptfs.c io.c io.h gen_key.c plaintext_decision_graph.c
33
38
mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) $(LIBGCRYPT_CFLAGS)
54
59
ecryptfs_generate_tpm_key_LDADD = $(TSPI_LIBS)
55
60
 
56
61
mount_ecryptfs_private_SOURCES = mount.ecryptfs_private.c
57
 
mount_ecryptfs_private_LDADD = $(KEYUTILS_LIBS)
 
62
mount_ecryptfs_private_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS)
58
63
 
59
64
ecryptfs_stat_SOURCES = ecryptfs-stat.c
60
65
ecryptfs_stat_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la