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

Package-Manager: portage-2.0.51.22-r2

5 files changed, 96 insertions, 5 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/Manifest b/sys-fs/ntfsprogs/Manifest
index aa8255d9e718..652bfeb34e62 100644
--- a/sys-fs/ntfsprogs/Manifest
+++ b/sys-fs/ntfsprogs/Manifest
@@ -4,15 +4,18 @@ Hash: SHA1
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 5944e6f82859c3d0806d64411dc18a57 ntfsprogs-1.9.2.ebuild 1222
 MD5 440ac85f213a0a4a98af87ea8c4a9248 ntfsprogs-1.11.1.ebuild 947
+MD5 5a6c501e13dd306ce5a389609c0bbcb4 ntfsprogs-1.11.1-r1.ebuild 1046
 MD5 bd8bc861276132837b243cd96a55469c ntfsprogs-1.9.4.ebuild 836
-MD5 f9c736361e10c27d479c5eadd67bce6a ChangeLog 3298
+MD5 ff6b7478ca56f6abf94f683618ae182d ChangeLog 3523
 MD5 0311a9250d765babd3f1e464dac4948c files/digest-ntfsprogs-1.9.2 67
+MD5 549bbb2af346742bc5e0aec8d405f88c files/digest-ntfsprogs-1.11.1-r1 68
 MD5 549bbb2af346742bc5e0aec8d405f88c files/digest-ntfsprogs-1.11.1 68
 MD5 8a6a91c096a19c10b16770646bf44060 files/digest-ntfsprogs-1.9.4 67
+MD5 c617403d6c91f218ab38a9fe51e9c9f9 files/ntfsprogs-1.11.1-utf8.patch 1153
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC4DqNgIKl8Uu19MoRAjOqAJ9OXsvaPwuuPSuzTZLtIgZ9bUO/RQCfTPoL
-0qjDweHWvfbjEmjXxDXGiY4=
-=2zzh
+iD8DBQFC6XdLgIKl8Uu19MoRAhUpAJ9L9ziiP0avcmhPDutTQXSoPXhIowCcDfwt
+JWyVPNB7h1YT/nn+gUN+Epc=
+=g1jO
 -----END PGP SIGNATURE-----
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
+}