summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-07-24 06:29:22 +0000
committerMike Frysinger <vapier@gentoo.org>2010-07-24 06:29:22 +0000
commit6472f3d8f72c9776caafd3f433873e3241682905 (patch)
tree6744b9c91e12e07d97a0c574db17765203df03a8 /sys-fs/ntfsprogs
parentold (diff)
downloadhistorical-6472f3d8f72c9776caafd3f433873e3241682905.tar.gz
historical-6472f3d8f72c9776caafd3f433873e3241682905.tar.bz2
historical-6472f3d8f72c9776caafd3f433873e3241682905.zip
Add fix from upstream for running utils on an ntfs mount #329445 by Victor Gaydov.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/ntfsprogs')
-rw-r--r--sys-fs/ntfsprogs/ChangeLog11
-rw-r--r--sys-fs/ntfsprogs/Manifest15
-rw-r--r--sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-erange.patch33
-rw-r--r--sys-fs/ntfsprogs/ntfsprogs-2.0.0-r2.ebuild63
4 files changed, 118 insertions, 4 deletions
diff --git a/sys-fs/ntfsprogs/ChangeLog b/sys-fs/ntfsprogs/ChangeLog
index b9cdd3feee9c..d7e087f9aba2 100644
--- a/sys-fs/ntfsprogs/ChangeLog
+++ b/sys-fs/ntfsprogs/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-fs/ntfsprogs
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.70 2009/10/18 11:35:26 volkmar Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.71 2010/07/24 06:29:22 vapier Exp $
+
+*ntfsprogs-2.0.0-r2 (24 Jul 2010)
+
+ 24 Jul 2010; Mike Frysinger <vapier@gentoo.org>
+ +ntfsprogs-2.0.0-r2.ebuild, +files/ntfsprogs-2.0.0-erange.patch:
+ Add fix from upstream for running utils on an ntfs mount #329445 by Victor
+ Gaydov.
18 Oct 2009; Mounir Lamouri <volkmar@gentoo.org>
ntfsprogs-2.0.0-r1.ebuild:
diff --git a/sys-fs/ntfsprogs/Manifest b/sys-fs/ntfsprogs/Manifest
index e5970b950e10..a30cf131edab 100644
--- a/sys-fs/ntfsprogs/Manifest
+++ b/sys-fs/ntfsprogs/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX ntfsprogs-1.13.1-gnutls-2.8.patch 331 RMD160 e9bff5bf95c40e887595ede347275a7ffcb25989 SHA1 3bb14f141357a5b2da3344748085950069a9a379 SHA256 8af8785b5a0af32d2a315dc838efeac31d8cfda0b1c8faef671eff9897715ca4
AUX ntfsprogs-1.13.1-resize-vista.patch 413 RMD160 bd96a2f1d331dd321aa4f032c675c84ac68abc07 SHA1 fdcad09924db0504cab62ee11287d57b44027474 SHA256 23c74d400f46dd8d77e63d2d9ca96a3fd579a910ad7cd130f277b842c2b18e3f
+AUX ntfsprogs-2.0.0-erange.patch 1033 RMD160 7f1d106deb07855b385e37e5a12ab0940159236c SHA1 29d3455b059ddd87513fff38ed08fd8f8de76d0f SHA256 ef0258c4a245eb9ec6e99d52e931f6b2e63dcf45b648cd5f9076c312188f718a
AUX ntfsprogs-2.0.0-extras.patch 1188 RMD160 31c9dca960018cdf4586939fad094e318c30f8e4 SHA1 87c06d2f2d86d53a09a013697222138c7675163c SHA256 77ccf07e969d56ffd3ab328dc55dc5f5d64e94e79c13aedbecd64c210364fb26
AUX ntfsprogs-2.0.0-gnutls-2.8.patch 2061 RMD160 5104ee53970544ca0857ba1ae045727256eb0ac2 SHA1 1e669b0beaa5db6e1c7f3ab9e687b8f324251275 SHA256 5eb7bfe9088c29344741e6bcaefd349fb7a95d54f15252651efc611866a2828c
DIST ntfsprogs-1.13.1.tar.gz 870260 RMD160 4fea1dd03f7c4d2b7cfb05ca101aee902e1ed9d2 SHA1 a4e50f6fc10fcc1e1f562ad64bcbf9a0d46ca72a SHA256 d89f90e6b565d6fc0ebaf190799ea40fc1e25329dd120dff0c85db65f9af42b6
DIST ntfsprogs-2.0.0.tar.gz 903949 RMD160 8c1cae5091c4eb56a6e3fcd021ad172d39777f6c SHA1 c433189eb0955beb7360c6a475cc97083c5cd020 SHA256 143f7380d3627b92cea6f0929d22fc2c28b6bdd09a0e428cf638ae5c5b7c31f0
EBUILD ntfsprogs-1.13.1-r1.ebuild 1521 RMD160 7948192110e8db652789e11749b7df2f82c08ab6 SHA1 ca25a31bf43aededf12f1a97f60bb69fd88571d0 SHA256 7e2d4d321d8f12aab3064a403ec19df7bda5ffcd7f80e00360760b4b5eec2510
EBUILD ntfsprogs-2.0.0-r1.ebuild 1705 RMD160 47882e8d3c8d32350943e29133e8531c49b2c4bc SHA1 bc4f98607e9a55b2a3d4b8cb5d94a6920464b08f SHA256 38905e611424cb4b873abf6b4898fc33849f720dba8781a0b0402c60ee052c60
-EBUILD ntfsprogs-2.0.0.ebuild 1258 RMD160 e300b0cae307165d70b51956d4b1c27523678240 SHA1 3df05d9b7de68f437599a3be26237e41a3c9a03d SHA256 79063d1e4374c1df589552d83e51d604b264df0dca19d35ac6c36e0a74e83881
-MISC ChangeLog 10329 RMD160 a907c2e8c7df576429da949db460b4bbd3282154 SHA1 e5ecfa051acbb8995ae8b88a0b891cef0233e3bc SHA256 526f64e627b4e37b25eff5c44a3032572d1f76376b58b42c55501dc5c78b1140
+EBUILD ntfsprogs-2.0.0-r2.ebuild 1756 RMD160 ea550b8dffb276a5ace021d22d95749727eddb4a SHA1 5565778513eb65d0a07bd9aca90a92fe373560c9 SHA256 74d561870025d1885215b122341319999bdae21bb9e591d10c542d33b16f590f
+MISC ChangeLog 10568 RMD160 99c5b5cad408d59e21563df75aee1f5d3910ec8b SHA1 b5796635bf82d0668122b6b98102de11ac45ee6d SHA256 5b46c80d4dffcb547231b743aff15f0357813d3eee0e617d45a2793045c3180d
MISC metadata.xml 223 RMD160 9f10fdaf4d9785ae7201c6e1f412b1e58e844d65 SHA1 8d3ae39172303e1fec9f1cc12d5d685f124eb42a SHA256 f1b190e5666562a1e3ac232a0fa507dc68bfad520521814c75db2fcecdef6861
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkxKiDgACgkQTwhj9JtAlp7O+QEAwZCWan61Cz3ozv7xvMIwR7FA
+wuUzXV6OLxY1v4rVOOcA/2kLwv6Uzac/ZwLQVpsJ0lwpkZLqd7bEIqd/rv3sSbpm
+=wpzW
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-erange.patch b/sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-erange.patch
new file mode 100644
index 000000000000..457c86b32539
--- /dev/null
+++ b/sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-erange.patch
@@ -0,0 +1,33 @@
+http://thread.gmane.org/gmane.linux.file-systems.ntfs.devel/3678
+https://bugs.gentoo.org/329445
+
+diff --git a/libntfs/attrib.c b/libntfs/attrib.c
+index a1fe954..c628d9d 100644
+--- a/libntfs/attrib.c
++++ b/libntfs/attrib.c
+@@ -550,8 +550,10 @@ int ntfs_attr_map_runlist_range(ntfs_attr *na, VCN from_vcn, VCN to_vcn)
+ (long long)from_vcn, (long long)to_vcn);
+
+ /* Map extent with @from_vcn. */
+- if (ntfs_attr_map_runlist(na, from_vcn))
+- goto err_out;
++ if (ntfs_attr_map_runlist(na, from_vcn)) {
++ if (errno != ERANGE)
++ goto err_out;
++ }
+
+ for (rl = na->rl; rl->vcn <= to_vcn;) {
+ /* Skip not interesting to us runs. */
+@@ -4924,8 +4926,10 @@ static int ntfs_non_resident_attr_expand(ntfs_attr *na, const s64 newsize,
+ /* Map required part of runlist. */
+ if (ntfs_attr_map_runlist(na, na->allocated_size >>
+ vol->cluster_size_bits)) {
+- ntfs_log_error("Failed to map runlist.\n");
+- return -1;
++ if (errno != ERANGE) {
++ ntfs_log_error("Failed to map runlist.\n");
++ return -1;
++ }
+ }
+
+ /*
diff --git a/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r2.ebuild b/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..9a3a6fc89e1a
--- /dev/null
+++ b/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r2.ebuild,v 1.1 2010/07/24 06:29:22 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="User tools for NTFS filesystems"
+HOMEPAGE="http://www.linux-ntfs.org/"
+SRC_URI="mirror://sourceforge/linux-ntfs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug fuse gnome minimal"
+
+RDEPEND="dev-libs/libconfig
+ fuse? ( >=sys-fs/fuse-2.7.0 )
+ crypt? ( >=dev-libs/libgcrypt-1.2.0 >=net-libs/gnutls-1.2.8 )
+ gnome? (
+ >=dev-libs/glib-2.0
+ >=gnome-base/gnome-vfs-2.0
+ )"
+DEPEND="${RDEPEND}
+ !=sys-fs/ntfs3g-0.1_beta20070714
+ dev-util/pkgconfig"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ #epatch "${FILESDIR}"/${P}-extras.patch #218601
+ epatch "${FILESDIR}"/${P}-gnutls-2.8.patch
+ epatch "${FILESDIR}"/${P}-erange.patch #329445
+ use minimal || sed -i 's:^EXTRA_PROGRAMS =:bin_PROGRAMS +=:' ntfsprogs/Makefile.in #218601
+ sed -i \
+ -e '/CFLAGS/s:-ggdb3\>::' \
+ -e '/CFLAGS/s:-O0\>::' \
+ configure || die
+}
+
+src_compile() {
+ econf \
+ $(use_enable crypt crypto) \
+ $(use_enable debug) \
+ $(use_enable fuse ntfsmount) \
+ $(use_enable gnome gnome-vfs) \
+ || die "Configure failed"
+ emake || die "Make failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "Install failed"
+ mv "${D}"/sbin/mkfs.ntfs "${D}"/usr/sbin/ || die
+ if ! use minimal ; then
+ mv "${D}"/usr/bin/ntfsck "${D}"/sbin/ || die
+ dosym ntfsck /sbin/fsck.ntfs
+ fi
+ if use fuse ; then
+ mv "${D}"/sbin/mount.{fuse.ntfs,ntfs-fuse} "${D}"/usr/bin/ || die
+ fi
+
+ dodoc AUTHORS CREDITS ChangeLog NEWS README TODO.* \
+ doc/attribute_definitions doc/*.txt doc/tunable_settings
+}