Commit Graph

82 Commits (dba29ee6e70708f3ca2cb7bd93ececf62c20520f)

Author SHA1 Message Date
Erik Larsson 277c8c8cdf ntfsprogs/Makefile.am: Fix for conflicting usage of EXTRA_PROGRAMS.
After the '--enable-extras' patch, EXTRA_PROGRAMS and bin_PROGRAMS were both defined when ENABLE_EXTRAS was enabled.
This created a conflict, where at least automake 1.10 attempted to emit targets for the binaries twice, resulting in failure when running 'autogen.sh'.

Conflict was resolved by defining the names of the binaries in a non-reserved variable EXTRA_PROGRAM_NAMES, which is then included either in EXTRA_PROGRAMS or bin_PROGRAMS but never in both.
2011-07-06 19:11:49 +02:00
Jean-Pierre André 683d0a0a4f Defined an option --enable-extras for extra ntfsprogs tools (from Fedora) 2011-07-05 12:17:11 +02:00
Erik Larsson bcdc76f12d Merge remote branch 'linux-ntfs/libntfs-3g_port-v2_0_0' into PERMISSION_HANDLING_BRANCH
Conflicts:
	.cvsignore
	AUTHORS
	CREDITS
	ChangeLog
	NEWS
	README
	TODO.libntfs
	autogen.sh
	configure.ac
	include/ntfs/Makefile.am
	libntfs-3g/misc.c
	libntfs/Makefile.am
	libntfs/gnome-vfs-method.c
	libntfs/gnome-vfs-module.c
	ntfsprogs.spec.in
	ntfsprogs/.cvsignore
	ntfsprogs/mkntfs.c
	ntfsprogs/ntfscat.8.in
	ntfsprogs/ntfsclone.c
	ntfsprogs/ntfscp.8.in
	ntfsprogs/ntfsinfo.c
	ntfsprogs/ntfsprogs.8.in
	ntfsprogs/ntfsresize.c
	ntfsprogs/ntfsrm.c
	ntfsprogs/ntfsundelete.h
	ntfsprogs/upcase.c
	ntfsprogs/utils.c
	test/Makefile.am
2010-12-17 09:04:01 +01:00
Erik Larsson dedaf225e3 Cleaned out a seemingly unused declaration from Makefile.am in ntfsprogs. 2010-12-16 17:35:14 +01:00
Erik Larsson 7287c05ff4 Made ntfsprogs compilation conditional and turned off by default. It is enabled with '--enable-ntfsprogs'. 2010-12-16 17:35:06 +01:00
Erik Larsson f3a30779dd Moved list.h into ntfsprogs and got rid of include/ntfs completely. 2010-12-16 17:34:47 +01:00
Erik Larsson daa1f3edcd Bugfixes for 'make extra'. 2010-12-16 10:08:34 +01:00
Erik Larsson 3efdd4cf0b Merge remote branch 'linux-ntfs/libntfs-3g_port' into ntfsprogs_merge.redo
Conflicts:
        configure.ac
2010-12-16 10:04:22 +01:00
Erik Larsson 16dbcbec0c Restored 'local' includes for all the ntfsprogs instead of using system includes (e.g. #include "yada.h" instead of #include <ntfs-3g/yada.h>). 2010-12-16 09:59:42 +01:00
Erik Larsson 639bd5475c Fixed ntfsprogs/Makefile.am to link against internally built libntfs-3g. 2010-12-15 17:19:20 +01:00
Erik Larsson 9c0c2bf633 ntfsprogs/Makefile.am: Added libgcrypt's CFLAGS and LIBS when building ntfsdecrypt. 2010-12-03 07:50:47 +01:00
Erik Larsson d52190c3cb Fixed reference to deprecated utility 'libgnutls-config' in ntfsprogs' Makefile.am. 2010-12-02 22:37:16 +01:00
Erik Larsson 713fbb390e Merge commit 'v2_0_0' into libntfs-3g_port-v2_0_0
Conflicts:
	configure.ac
	include/ntfs/Makefile.am
	include/ntfs/attrib.h
	include/ntfs/bitmap.h
	include/ntfs/collate.h
	include/ntfs/debug.h
	include/ntfs/dir.h
	include/ntfs/endians.h
	include/ntfs/index.h
	include/ntfs/inode.h
	include/ntfs/layout.h
	include/ntfs/logfile.h
	include/ntfs/logging.h
	include/ntfs/mft.h
	include/ntfs/ntfstime.h
	include/ntfs/runlist.h
	include/ntfs/support.h
	include/ntfs/types.h
	include/ntfs/unistr.h
	include/ntfs/volume.h
	libntfs/Makefile.am
	libntfs/attrib.c
	libntfs/attrlist.c
	libntfs/bitmap.c
	libntfs/bootsect.c
	libntfs/collate.c
	libntfs/compress.c
	libntfs/debug.c
	libntfs/device.c
	libntfs/device_io.c
	libntfs/dir.c
	libntfs/index.c
	libntfs/inode.c
	libntfs/lcnalloc.c
	libntfs/logfile.c
	libntfs/logging.c
	libntfs/mft.c
	libntfs/mst.c
	libntfs/runlist.c
	libntfs/security.c
	libntfs/unistr.c
	libntfs/unix_io.c
	libntfs/volume.c
	libntfs/win32_io.c
	ntfsprogs/Makefile.am
	ntfsprogs/mkntfs.c
	ntfsprogs/ntfscat.c
	ntfsprogs/ntfsclone.c
	ntfsprogs/ntfscmp.c
	ntfsprogs/ntfscp.c
	ntfsprogs/ntfsinfo.c
	ntfsprogs/ntfsmount.8.in
	ntfsprogs/ntfsmount.c
	ntfsprogs/ntfsundelete.c
	ntfsprogs/upcase.c
2010-12-02 22:31:21 +01:00
Erik Larsson ce6a516a56 Removed the 'rich' functionality including the ntfsrm tool.
This change should be reverted once the 'rich' stuff is ported to libntfs-3g, but right now it seems like too much work.
2010-12-02 17:10:57 +01:00
Erik Larsson bcc00717b0 The legacy FUSE module (ntfsmount) goes away. (ntfs-3g takes care of that part.) 2010-12-02 16:37:57 +01:00
Erik Larsson e20dad4854 Keeping include/ directory for now (and away goes the 'list.h' symlink). 2010-12-02 16:37:23 +01:00
Erik Larsson 16ba09b70f Introduced a pkg-config check for libntfs-3g at configure time, using the CFLAGS and LDFLAGS specified in the .pc file. 2010-12-02 16:35:12 +01:00
Erik Larsson 237b937a65 Updated build configuration of ntfsprogs to use libntfs-3g's includes and libraries. 2010-12-02 15:57:43 +01:00
Yura Pakhuchiy a81520731c Install mount.fuse.ntfs symlink (to match mount with subtype=ntfs option) 2007-09-23 00:50:45 +03:00
Yura Pakhuchiy ad0c5f59c9 Transparently integrate reading of encrypted files into library
This adds crypto.[ch], several exported functions that you are not interested
to use and dependency on >=libconfig-1.0.1 to read list of PFX files with keys.
See libntfs/config for example configuration file.
2007-08-22 16:55:57 +03:00
aia21 f6adc3fc78 - mkntfs: Create more Vista like volumes. We now match the security
descriptor attributes (but not yet the security descriptors stored in
  $Secure).  (Anton)
- libntfs: Rewrite ntfs_upcase_table_build() to generate a Vista
  compatible upcase table ($UpCase).  (Anton)
- mkntfs: Remove own generation of upcase table, i.e. delete
  ntfsprogs/upcase.[ch] and use ntfs_upcase_table_build() supplied by
  libntfs.  (Anton)
2006-12-19 16:31:52 +00:00
aia21 1a4fb3431c - mkntfs: Generate a random DCE compliant UUID for the created volume
and include --with-uuid[=PFX] and --without-uuid options.  (Anton)
- configure.ac: Set language to C.  (Anton)
- mkntfs: Always set default cluster size to 4096 bytes regardless of
  volume size.  This is what Windows Vista does and it makes perfect
  sense from a performance point of view.  (Anton)
2006-12-13 00:11:50 +00:00
yura c616e29663 ntfsck by Yuval to extra dist with minor changes from me 2006-12-11 03:06:35 +00:00
yura 33ffbb2af7 rename --enable-fuse-module to more clear --enable-ntfsmount and cleanup autotools scripts a bit 2006-12-03 14:19:29 +00:00
yura 45e3b4acd0 upgrade to FUSE 2.6 API 2006-11-06 12:51:44 +00:00
yura 28a2b1f2b0 prepare to Szaka's code merge: remove not working Rich's index code 2006-07-17 11:49:52 +00:00
szaka 0213e2e596 Build and install ntfscmp by default 2006-04-11 22:47:22 +00:00
szaka adb27b68cc Add ntfscmp manual 2006-04-11 21:50:39 +00:00
cha0smaster 63f5ddb8c2 ntfsmount:
Support FUSE versions from 2.3.0 to 2.5.1 under Linux and 2.5.X under FreeBSD.
Warning tested only under FUSE-2.4.1. Will test under FUSE-2.5.1 at home.
2006-02-01 17:37:34 +00:00
flatcap f4e427e91a implement logging in libntfs
fix whitespace
fix build problems
tidy source code
and more...
2005-10-21 18:05:13 +00:00
flatcap 2a8d602d9f ntfsrm has been split up and merged into libntfs.
currently it's #ifdef'd out.
tree.c - code for handling directory trees
rich.c - a few helpers without a home (this file will go away soon)
Note: ntfsrm isn't in the build any more (you need to ./configure --enable-rich; make extras).  When rm is less intrusive, again, I'll put it back in the build.
2005-10-16 23:33:03 +00:00
antona cc57c76cd5 Move mount.ntfs-fuse and mkfs.ntfs to be symlinks instead of
hardlinks and move both to /sbin rather than prefix/sbin.  Note we
still obey $destdir so building packages works as well as installing
into alternate chroot / other system still works.
2005-10-07 23:01:23 +00:00
antona 4c3687fc64 Fix hardcoded location for hardlink on uninstall. (Anton, Szaka) 2005-10-07 15:52:29 +00:00
cha0smaster 8854585270 oops, fix previous fix 2005-10-07 15:15:13 +00:00
cha0smaster 093431f2f7 revert 1.49, mount.ntfs-fuse should be in /sbin, not /usr/sbin or /usr/local/sbin 2005-10-07 15:13:10 +00:00
antona 0377e979d0 Various fixes before release. 2005-10-07 15:02:15 +00:00
szaka ae276bbfe1 Fix 'make install' and 'make uninstall' if FUSE isn't enabled 2005-10-05 20:11:23 +00:00
cha0smaster cc9bc93221 * change interface: ntfsmount device mnt_point -o opts
* hardlink ntfsmount to /sbin/mount.ntfs-fuse, thus volume can be mounted via fstab without any helpers
* update man page for ntfsmount
2005-10-03 21:07:24 +00:00
szaka 605726b340 ntfscmp: new util for development, debugging, testing, etc. 2005-08-25 20:42:54 +00:00
szaka a9e02e7687 Hard link mkfs.ntfs and mkfs.ntfs.8 with mkntfs and mkntfs.8 2005-08-15 20:48:48 +00:00
antona 640573bf12 Finish next stage in ntfsdecrypt evolution. It is now almost finished in that
it fully works to decrypt any ntfs enecrypted file both from Linux and Windows.
All you need to supply is your private key in form of a .prx file as exported
for example by the cypher command in XP SP2 or otherwise as exported by the
management console's certificate manager plugin.
2005-08-05 23:41:52 +00:00
antona 8d86fdefec Fix make extra directly after ./configure. Thanks to Yuval for the bug report. 2005-08-04 13:12:41 +00:00
antona d658b8f019 Fix typo in ChangeLog (thanks Szaka!).
Do more detection in configure.ac and in particular check for getopt_long,
windows.h, wincrypt.h, and gcrypt.h and most importantly (for now) give command
line option to enable crypto stuff and autodetect if libgcrypt is present.
And only build ntfsdecrypt (still make extra only) only if both --enable-crypto
was specified AND libgcrypt was found.
2005-08-04 10:36:35 +00:00
antona 304f060a76 Add all Makefile.in to maintainer-clean target. 2005-07-29 15:51:49 +00:00
antona 1a029f788e Remove Openssl linking in for decrypt.c from Makefile.am and update build
system.
2005-07-28 16:24:27 +00:00
antona 93194b37a0 Add a function to ntfsprogs/decrypt.c that expands an on-disk desx key from 128
bits to the needed 192 bits so it can be used for {en,de}cryption.
Note I couldn't face using the completely insane libgcrypt api so I used
openssl's libcrypto instead...  Anyone feel free to swap once we have it
working.
2005-07-21 12:12:37 +00:00
antona 4ed406e68e Add new utility (make extra) - ntfsdecrypt. (Yuval) 2005-07-16 06:53:40 +00:00
cha0smaster 0b75b12544 ntfsmount:
* use mount function from utils.[ch]
* remove fsname option (need to support if volume already mounted)
* add force option to support mount from utils
* update manual page
* fix tiny memleak
2005-07-15 15:53:22 +00:00
cha0smaster 48af715f60 * Add check to auto scripts for FUSE to be >= 2.3.0.
* Move ntfsmount back to standard programs set.
2005-07-10 12:38:46 +00:00
antona b942e2c03a Move ntfsmount to extra programs as it doesn't even approximate being
compilable!  (At least on my machine which has fuse 2.2.1.)
And I need a working snapshot for Timur.
2005-07-09 21:32:17 +00:00