Add patch from upstream to fix UTF8 support #100633 by Petteri Räty.

(Portage version: 2.0.51.22-r2)

4 files changed, 89 insertions, 1 deletions

diff --git a/sys-fs/ntfsprogs/ChangeLog b/sys-fs/ntfsprogs/ChangeLog
index 0b397a549b9d..e73f8e97f878 100644
--- a/sys-fs/ntfsprogs/ChangeLog
+++ b/sys-fs/ntfsprogs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/ntfsprogs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.16 2005/07/22 00:14:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.17 2005/07/29 00:24:28 vapier Exp $
+
+*ntfsprogs-1.11.1-r1 (29 Jul 2005)
+
+  29 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/ntfsprogs-1.11.1-utf8.patch, +ntfsprogs-1.11.1-r1.ebuild:
+  Add patch from upstream to fix UTF8 support #100633 by Petteri Räty.
 
 *ntfsprogs-1.11.1 (22 Jul 2005)
 
diff --git a/sys-fs/ntfsprogs/files/digest-ntfsprogs-1.11.1-r1 b/sys-fs/ntfsprogs/files/digest-ntfsprogs-1.11.1-r1
new file mode 100644
index 000000000000..2e6e75aaf0f9
--- /dev/null
+++ b/sys-fs/ntfsprogs/files/digest-ntfsprogs-1.11.1-r1
@@ -0,0 +1 @@
+MD5 ac28bef6d3c12bf5e90092042f6a5222 ntfsprogs-1.11.1.tar.gz 776314
diff --git a/sys-fs/ntfsprogs/files/ntfsprogs-1.11.1-utf8.patch b/sys-fs/ntfsprogs/files/ntfsprogs-1.11.1-utf8.patch
new file mode 100644
index 000000000000..32a797ed65ad
--- /dev/null
+++ b/sys-fs/ntfsprogs/files/ntfsprogs-1.11.1-utf8.patch
@@ -0,0 +1,39 @@
+http://bugs.gentoo.org/100633
+
+===================================================================
+RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unistr.c,v
+retrieving revision 1.20
+retrieving revision 1.21
+diff -u -r1.20 -r1.21
+--- linux-ntfs/ntfsprogs/libntfs/unistr.c	2005/07/06 22:47:18	1.20
++++ linux-ntfs/ntfsprogs/libntfs/unistr.c	2005/07/28 21:20:23	1.21
+@@ -467,7 +467,7 @@
+ 	ntfschar *ucs;
+ 	const char *s;
+ 	wchar_t wc;
+-	int i, o, cnt, ins_len, ucs_len;
++	int i, o, cnt, ins_len, ucs_len, ins_size;
+ #ifdef HAVE_MBSINIT
+ 	mbstate_t mbstate;
+ #endif
+@@ -482,6 +482,8 @@
+ 		errno = ENAMETOOLONG;
+ 		return -1;
+ 	}
++	/* Determine the size of the multi-byte string in bytes. */
++	ins_size = strlen(ins);
+ 	/* Determine the length of the multi-byte string. */
+ 	s = ins;
+ #if defined(HAVE_MBSINIT)
+@@ -543,9 +545,9 @@
+ 		}
+ 		/* Convert the multibyte character to a wide character. */
+ #ifdef HAVE_MBSINIT
+-		cnt = mbrtowc(&wc, ins + i, ins_len - i, &mbstate);
++		cnt = mbrtowc(&wc, ins + i, ins_size - i, &mbstate);
+ #else
+-		cnt = mbtowc(&wc, ins + i, ins_len - i);
++		cnt = mbtowc(&wc, ins + i, ins_size - i);
+ #endif
+ 		if (!cnt)
+ 			break;
diff --git a/sys-fs/ntfsprogs/ntfsprogs-1.11.1-r1.ebuild b/sys-fs/ntfsprogs/ntfsprogs-1.11.1-r1.ebuild
new file mode 100644
index 000000000000..87133b6303e6
--- /dev/null
+++ b/sys-fs/ntfsprogs/ntfsprogs-1.11.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-1.11.1-r1.ebuild,v 1.1 2005/07/29 00:24:28 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="User tools for NTFS filesystems"
+HOMEPAGE="http://linux-ntfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/linux-ntfs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnome fuse debug"
+
+DEPEND="fuse? ( >=sys-fs/fuse-2.3.0 )
+	gnome? (
+		>=dev-libs/glib-2.0
+		>=gnome-base/gnome-vfs-2.0
+	)"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-utf8.patch
+}
+
+src_compile() {
+	sed -i -e 's:-ggdb3::' configure
+	econf \
+		$(use_enable gnome gnome-vfs) \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-module) \
+		|| die "Configure failed"
+	emake || die "Make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install failed"
+	dodoc AUTHORS CREDITS ChangeLog NEWS README TODO.* \
+		doc/attribute_definitions doc/*.txt doc/tunable_settings
+}