diff -u ntfs-3g-1.2531/debian/changelog ntfs-3g-1.2531/debian/changelog --- ntfs-3g-1.2531/debian/changelog +++ ntfs-3g-1.2531/debian/changelog @@ -1,3 +1,29 @@ +ntfs-3g (1:1.2531-1.1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes (LP: #298141): + - Add udeb shlibs entries for libntfs-3g31-udeb. + - Create libntfs3g31-udeb and ntfs-3g-udeb. + - Copy ntfs-3g into the initramfs. If ntfs-3g is used to mount the root + filesystem (either directly or via a loopback mount), load the fuse + module beforehand, and save ntfs-3g's PID (indirectly) in + /var/run/sendsigs.omit. + - Move ntfs-3g to /bin. + - Move libntfs-3g.so.* to /lib. Adjust libntfs-3g.so symlink to match. + - Add /sbin/mount.ntfs symlink to /bin/ntfs-3g. + - Add a symlink for the mount.ntfs manual page too. + - Pass basenames rather than full paths to pidof; create + /dev/.initramfs/varrun if necessary. + - Always add ntfs and ntfs-3g to sendsigs.omit. + - Build against the external fuse libraries and add dependency on + fuse-utils. + - Ensure ntfs-3g flushed dirty write data back to device + added ntfs-3f mount option "syncio" which opens the underlying + filesystem used by fuse with O_SYNC to ensure dirty write data is + written back to ntfs immediately. This allows us to remove the + vm.dirty sysctl hacks from wubi. + + -- Chris Coulson Fri, 14 Nov 2008 18:18:03 +0000 + ntfs-3g (1:1.2531-1.1) unstable; urgency=low * Non-maintainer upload. @@ -17,6 +43,39 @@ -- Adam Cécile (Le_Vert) Mon, 23 Jun 2008 22:18:49 +0200 +ntfs-3g (1:1.2506-1ubuntu2) intrepid; urgency=low + + * Ensure ntfs-3g flushed dirty write data back to device + added ntfs-3f mount option "syncio" which opens the underlying + filesystem used by fuse with O_SYNC to ensure dirty write data is + written back to ntfs immediately. This allows us to remove the + vm.dirty sysctl hacks from wubi. (LP: #204133) + + -- Colin King Wed, 09 Jul 2008 14:34:56 +0100 + +ntfs-3g (1:1.2506-1ubuntu1) intrepid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Add udeb shlibs entries for libntfs-3g28-udeb. + - Bump debhelper build-dependency to 5.0.22 for dh_makeshlibs + --add-udeb. + - Create libntfs3g28-udeb and ntfs-3g-udeb. + - Copy ntfs-3g into the initramfs. If ntfs-3g is used to mount the root + filesystem (either directly or via a loopback mount), load the fuse + module beforehand, and save ntfs-3g's PID (indirectly) in + /var/run/sendsigs.omit. + - Move ntfs-3g to /bin. + - Move libntfs-3g.so.* to /lib. Adjust libntfs-3g.so symlink to match. + - Add /sbin/mount.ntfs symlink to /bin/ntfs-3g. + - Add a symlink for the mount.ntfs manual page too. + - Pass basenames rather than full paths to pidof; create + /dev/.initramfs/varrun if necessary (LP #150831). + - Always add ntfs and ntfs-3g to sendsigs.omit (LP #181669). + - Build against the external fuse libraries and add dependency on + fuse-utils. + + -- Martin Pitt Mon, 02 Jun 2008 15:55:57 +0200 + ntfs-3g (1:1.2506-1) unstable; urgency=HIGH * Urgency set to HIGH because it fixes a critical issue. @@ -261,0 +321 @@ + diff -u ntfs-3g-1.2531/debian/libntfs-3g31.install ntfs-3g-1.2531/debian/libntfs-3g31.install --- ntfs-3g-1.2531/debian/libntfs-3g31.install +++ ntfs-3g-1.2531/debian/libntfs-3g31.install @@ -1 +1 @@ -usr/lib/lib*.so.* +lib/lib*.so.* diff -u ntfs-3g-1.2531/debian/libntfs-3g-dev.install ntfs-3g-1.2531/debian/libntfs-3g-dev.install --- ntfs-3g-1.2531/debian/libntfs-3g-dev.install +++ ntfs-3g-1.2531/debian/libntfs-3g-dev.install @@ -2,2 +2,2 @@ -usr/lib/pkgconfig -usr/lib/lib*.so +lib/pkgconfig usr/lib +lib/lib*.so usr/lib diff -u ntfs-3g-1.2531/debian/ntfs-3g.install ntfs-3g-1.2531/debian/ntfs-3g.install --- ntfs-3g-1.2531/debian/ntfs-3g.install +++ ntfs-3g-1.2531/debian/ntfs-3g.install @@ -1,3 +1,3 @@ sbin/ -usr/bin/ +bin/ usr/share/ diff -u ntfs-3g-1.2531/debian/rules ntfs-3g-1.2531/debian/rules --- ntfs-3g-1.2531/debian/rules +++ ntfs-3g-1.2531/debian/rules @@ -29,9 +29,10 @@ ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ - --exec-prefix=/usr \ + --exec-prefix=/ \ --mandir=\$${prefix}/share/man \ --disable-ldconfig \ + --with-fuse=external \ CFLAGS="$(CFLAGS)" \ LDFLAGS="-Wl,-z,defs" @@ -56,12 +57,17 @@ dh_installdirs mkdir -p $(CURDIR)/debian/tmp/sbin $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + $(RM) $(CURDIR)/debian/tmp/lib/lib*.so + for i in $(CURDIR)/debian/tmp/lib/lib*.so.*.*.*; do \ + base=$${i##*/}; \ + ln -s /lib/$${base} $(CURDIR)/debian/tmp/lib/$${base%.*.*.*}; \ + done # Install hal fdi file install -D -m 644 debian/20-ntfs-3g-policy.fdi \ debian/tmp/usr/share/hal/fdi/policy/10osvendor/20-ntfs-3g-policy.fdi # Remove RPATH from binary - chrpath --delete debian/tmp/usr/bin/ntfs-3g - chrpath --delete debian/tmp/usr/bin/ntfs-3g.probe + chrpath --delete debian/tmp/bin/ntfs-3g + chrpath --delete debian/tmp/bin/ntfs-3g.probe binary-indep: build install @@ -76,13 +82,19 @@ for PKG in $(PKG_LIST); do \ rm -r debian/$$PKG/usr/share/doc/ || exit 1; \ done + install -D -m0755 debian/ntfs-3g.initramfs-hook \ + debian/ntfs-3g/usr/share/initramfs-tools/hooks/ntfs_3g + install -D -m0755 debian/ntfs-3g.initramfs-premount \ + debian/ntfs-3g/usr/share/initramfs-tools/scripts/local-premount/ntfs_3g + install -D -m0755 debian/ntfs-3g.initramfs-bottom \ + debian/ntfs-3g/usr/share/initramfs-tools/scripts/local-bottom/ntfs_3g dh_link dh_strip dh_compress dh_fixperms - dh_makeshlibs + dh_makeshlibs --add-udeb=libntfs-3g28-udeb dh_installdeb - dh_shlibdeps + dh_shlibdeps -Llibntfs-3g28 -ldebian/libntfs-3g28/lib dh_gencontrol dh_md5sums dh_builddeb diff -u ntfs-3g-1.2531/debian/ntfs-3g.links ntfs-3g-1.2531/debian/ntfs-3g.links --- ntfs-3g-1.2531/debian/ntfs-3g.links +++ ntfs-3g-1.2531/debian/ntfs-3g.links @@ -1,0 +2,2 @@ +/bin/ntfs-3g /sbin/mount.ntfs +/usr/share/man/man8/ntfs-3g.8.gz /usr/share/man/man8/mount.ntfs.8.gz diff -u ntfs-3g-1.2531/debian/control ntfs-3g-1.2531/debian/control --- ntfs-3g-1.2531/debian/control +++ ntfs-3g-1.2531/debian/control @@ -1,13 +1,15 @@ Source: ntfs-3g Section: otherosfs Priority: optional -Maintainer: Adam Cécile (Le_Vert) -Build-Depends: debhelper (>= 5), autotools-dev, pkg-config, chrpath +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Adam Cécile (Le_Vert) +Build-Depends: debhelper (>= 5), autotools-dev, pkg-config, chrpath, libfuse-dev (>= 2.7.0-1ubuntu5) Homepage: http://www.ntfs-3g.org/ Standards-Version: 3.8.0 Package: ntfs-3g Architecture: any +Pre-Depends: fuse-utils Depends: ${shlibs:Depends} Description: read-write NTFS driver for FUSE The ntfs-3g driver is an open source, GPL licensed, third generation Linux @@ -71,0 +74,14 @@ + +Package: ntfs-3g-udeb +Section: debian-installer +Architecture: any +XC-Package-Type: udeb +Depends: fuse-utils-udeb, ${shlibs:Depends} +Description: read-write NTFS driver for FUSE + +Package: libntfs-3g31-udeb +Section: debian-installer +Architecture: any +XC-Package-Type: udeb +Depends: ${shlibs:Depends} +Description: ntfs-3g filesystem in userspace (FUSE) library only in patch2: unchanged: --- ntfs-3g-1.2531.orig/include/ntfs-3g/volume.h +++ ntfs-3g-1.2531/include/ntfs-3g/volume.h @@ -58,6 +58,10 @@ #define MS_IGNORE_HIBERFILE 0x20000000 +#ifndef MS_SYNCHRONOUS +#define MS_SYNCHRONOUS 0x00000010 +#endif + /* Forward declaration */ typedef struct _ntfs_volume ntfs_volume; only in patch2: unchanged: --- ntfs-3g-1.2531.orig/src/ntfs-3g.c +++ ntfs-3g-1.2531/src/ntfs-3g.c @@ -131,6 +131,7 @@ BOOL no_detach; BOOL blkdev; BOOL mounted; + BOOL syncio; struct fuse_chan *fc; } ntfs_fuse_context_t; @@ -160,7 +161,8 @@ "Usage: %s [-o option[,...]]\n" "\n" "Options: ro (read-only mount), force, remove_hiberfile, locale=,\n" -" uid=, gid=, umask=, fmask=, dmask=, streams_interface=.\n" +" uid=, gid=, umask=, fmask=, dmask=, streams_interface=,\n" +" syncio.\n" " Please see the details in the manual.\n" "\n" "Example: ntfs-3g /dev/sda1 /mnt/win -o force\n" @@ -1662,6 +1664,8 @@ flags |= MS_FORCE; if (ctx->hiberfile) flags |= MS_IGNORE_HIBERFILE; + if (ctx->syncio) + flags |= MS_SYNCHRONOUS; ctx->vol = ntfs_mount(device, flags); if (!ctx->vol) { @@ -1884,6 +1888,9 @@ } else if (!strcmp(opt, "blksize")) { ntfs_log_info("WARNING: blksize option is ignored " "because ntfs-3g must calculate it.\n"); + } else if (!strcmp(opt, "syncio")) { + ntfs_log_info("Mounting with synchronous I/O\n"); + ctx->syncio = TRUE; } else { /* Probably FUSE option. */ if (strappend(&ret, opt)) goto err_exit; only in patch2: unchanged: --- ntfs-3g-1.2531.orig/libntfs-3g/volume.c +++ ntfs-3g-1.2531/libntfs-3g/volume.c @@ -445,7 +445,11 @@ NVolSetReadOnly(vol); /* ...->open needs bracketing to compile with glibc 2.7 */ - if ((dev->d_ops->open)(dev, NVolReadOnly(vol) ? O_RDONLY: O_RDWR)) { + if ((dev->d_ops->open)(dev, +#if defined (MS_SYNCHRONOUS) && defined(O_SYNC) + (flags & MS_SYNCHRONOUS ? O_SYNC : 0) | +#endif + (NVolReadOnly(vol) ? O_RDONLY: O_RDWR) )) { ntfs_log_perror("Error opening '%s'", dev->d_name); goto error_exit; } only in patch2: unchanged: --- ntfs-3g-1.2531.orig/debian/ntfs-3g-udeb.install +++ ntfs-3g-1.2531/debian/ntfs-3g-udeb.install @@ -0,0 +1,2 @@ +bin/ntfs-3g +sbin/ only in patch2: unchanged: --- ntfs-3g-1.2531.orig/debian/ntfs-3g.initramfs-premount +++ ntfs-3g-1.2531/debian/ntfs-3g.initramfs-premount @@ -0,0 +1,14 @@ +#! /bin/sh + +case $1 in +prereqs) + exit 0 + ;; +esac + +if [ "$ROOTFSTYPE" = ntfs ] || [ "$ROOTFSTYPE" = ntfs-3g ] || \ + [ "$LOOPFSTYPE" = ntfs ] || [ "$LOOPFSTYPE" = ntfs-3g ]; then + modprobe fuse +fi + +exit 0 only in patch2: unchanged: --- ntfs-3g-1.2531.orig/debian/ntfs-3g-udeb.links +++ ntfs-3g-1.2531/debian/ntfs-3g-udeb.links @@ -0,0 +1 @@ +/bin/ntfs-3g /sbin/mount.ntfs only in patch2: unchanged: --- ntfs-3g-1.2531.orig/debian/ntfs-3g.initramfs-hook +++ ntfs-3g-1.2531/debian/ntfs-3g.initramfs-hook @@ -0,0 +1,22 @@ +#! /bin/sh -e + +PREREQ="fuse_utils" + +prereqs () { + echo "$PREREQ" +} + +case $1 in +prereqs) + prereqs + exit 0 + ;; +esac + +. /usr/share/initramfs-tools/hook-functions + +copy_exec /bin/ntfs-3g /bin +ln -s /bin/ntfs-3g "$DESTDIR/sbin/mount.ntfs-3g" +ln -s /bin/ntfs-3g "$DESTDIR/sbin/mount.ntfs" + +exit 0 only in patch2: unchanged: --- ntfs-3g-1.2531.orig/debian/ntfs-3g.postinst +++ ntfs-3g-1.2531/debian/ntfs-3g.postinst @@ -0,0 +1,7 @@ +#!/bin/sh + +if type update-initramfs >/dev/null 2>&1; then + update-initramfs -u +fi + +#DEBHELPER# only in patch2: unchanged: --- ntfs-3g-1.2531.orig/debian/ntfs-3g.initramfs-bottom +++ ntfs-3g-1.2531/debian/ntfs-3g.initramfs-bottom @@ -0,0 +1,13 @@ +#! /bin/sh + +case $1 in +prereqs) + exit 0 + ;; +esac + +mkdir -p /dev/.initramfs/varrun +pidof mount.ntfs >> /dev/.initramfs/varrun/sendsigs.omit +pidof mount.ntfs-3g >> /dev/.initramfs/varrun/sendsigs.omit + +exit 0 only in patch2: unchanged: --- ntfs-3g-1.2531.orig/debian/libntfs-3g31-udeb.install +++ ntfs-3g-1.2531/debian/libntfs-3g31-udeb.install @@ -0,0 +1 @@ +lib/lib*.so.*