Version bump; closes bug #43421. Old version removed due to memory leaks.

5 files changed, 13 insertions, 39 deletions

diff --git a/sys-fs/ntfsprogs/ChangeLog b/sys-fs/ntfsprogs/ChangeLog
index 404d27ae7e3a..dff7861b9ee5 100644
--- a/sys-fs/ntfsprogs/ChangeLog
+++ b/sys-fs/ntfsprogs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/ntfsprogs
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.5 2004/02/01 13:20:39 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.6 2004/03/06 20:38:56 plasmaroo Exp $
+
+*ntfsprogs-1.8.5 (06 Mar 2004)
+
+  06 Mar 2004; <plasmaroo@gentoo.org> ntfsprogs-1.8.0.ebuild,
+  ntfsprogs-1.8.5.ebuild: Version bump; bug #43421. Old version
+  removed as it had leaks in the directory lookup and handling code.
 
   01 Feb 2004; <plasmaroo@gentoo.org> ntfsprogs-1.8.0.ebuild,
   files/ntfsprogs-1.8.0-2.6-headers.patch:
diff --git a/sys-fs/ntfsprogs/files/digest-ntfsprogs-1.8.0 b/sys-fs/ntfsprogs/files/digest-ntfsprogs-1.8.0
deleted file mode 100644
index 7495b8364ca4..000000000000
--- a/sys-fs/ntfsprogs/files/digest-ntfsprogs-1.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0f12ead3b47842b96c7c774a0e2f0ed3 ntfsprogs-1.8.0.tar.gz 503160
diff --git a/sys-fs/ntfsprogs/files/digest-ntfsprogs-1.8.5 b/sys-fs/ntfsprogs/files/digest-ntfsprogs-1.8.5
new file mode 100644
index 000000000000..f548f37c5155
--- /dev/null
+++ b/sys-fs/ntfsprogs/files/digest-ntfsprogs-1.8.5
@@ -0,0 +1 @@
+MD5 26fd774e519ea4a8a7f0c54344f15fea ntfsprogs-1.8.5.tar.gz 616859
diff --git a/sys-fs/ntfsprogs/files/ntfsprogs-1.8.0-2.6-headers.patch b/sys-fs/ntfsprogs/files/ntfsprogs-1.8.0-2.6-headers.patch
deleted file mode 100644
index 7aa1cd2efa28..000000000000
--- a/sys-fs/ntfsprogs/files/ntfsprogs-1.8.0-2.6-headers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- ntfsprogs-1.8.0/ntfsprogs/mkntfs.c.old	2003-11-19 10:31:26.000000000 +0000
-+++ ntfsprogs-1.8.0/ntfsprogs/mkntfs.c	2004-02-01 12:57:46.000000000 +0000
-@@ -78,10 +78,22 @@
- #	define MAJOR(dev)	((dev) >> 8)
- #	define MINOR(dev)	((dev) & 0xff)
- #endif
-+
-+#ifndef SCSI_DISK_MAJOR
-+#ifdef SCSI_DISK8_MAJOR
-+#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
-+	((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR) || \
-+	((M) >= SCSI_DISK8_MAJOR && (M) <= SCSI_DISK15_MAJOR))
-+#else
-+#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
-+	((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR))
-+#endif
-+#endif
-+
- #ifndef SCSI_BLK_MAJOR
--#	define SCSI_BLK_MAJOR(m)	((m) == SCSI_DISK_MAJOR || \
--					 (m) == SCSI_CDROM_MAJOR)
-+#define SCSI_BLK_MAJOR(M)  (SCSI_DISK_MAJOR(M) || (M) == SCSI_CDROM_MAJOR)
- #endif
-+
- #include <limits.h>
- 
- #if defined(linux) && defined(_IO) && !defined(BLKSSZGET)
diff --git a/sys-fs/ntfsprogs/ntfsprogs-1.8.0.ebuild b/sys-fs/ntfsprogs/ntfsprogs-1.8.5.ebuild
index 1f3d4a3fc9ac..2a2dfddbe9cb 100644
--- a/sys-fs/ntfsprogs/ntfsprogs-1.8.0.ebuild
+++ b/sys-fs/ntfsprogs/ntfsprogs-1.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-1.8.0.ebuild,v 1.2 2004/02/01 13:20:39 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-1.8.5.ebuild,v 1.1 2004/03/06 20:38:57 plasmaroo Exp $
 
 DESCRIPTION="User tools for NTFS filesystems -- includes: ntsresize, mkntfs,
 ntfsfix, ntfsdefrag"
@@ -16,9 +16,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 
 src_compile() {
-	epatch ${FILESDIR}/${P}-2.6-headers.patch
-	sed -i 's:head -1:head -n 1:g' configure getgccver
-
+	sed -i 's:head -1:head -n 1:g' getgccver
 	econf `use_enable gnome gnome-vfs` || die "Configure failed"
 
 	# I've added only this Makefile tweak, and we don't need
@@ -30,13 +28,10 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die "Install failed"
-
-	# lot's of docs (a good thing :)
 	dodoc AUTHORS COPYING CREDITS ChangeLog NEWS README TODO.* \
 		doc/attribute_definitions doc/*.txt doc/tunable_settings
 
-	# a normal user cannot run ntfsfix
-	cd ${D}
-	mv usr/bin/ntfsfix usr/sbin
-	rmdir usr/bin
+	# A normal user cannot run ntfsfix; move it over to the right place
+	mv ${D}/usr/bin/ntfsfix ${D}/usr/sbin
+	rmdir ${D}/usr/bin
 }