ports/87241: Update of sysutils/ntfsprogs to version 1.12.1 [patch]

[Callum Gibson]

>Number:         87241
>Category:       ports
>Synopsis:       Update of sysutils/ntfsprogs to version 1.12.1 [patch]
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 11 07:10:13 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Callum Gibson
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
Me
>Environment:
System: FreeBSD merton 5.4-RELEASE FreeBSD 5.4-RELEASE #1: Thu Jul  7 13:03:14 EST 2005     root at merton:/usr/obj/usr/src/sys/MERTON2-SMP  i386


	
>Description:
	sysutils/ntfsprogs is based on 1.9.4 which is over a year old.
	Substantial improvements and bugfixes have been made in the
	interim.
>How-To-Repeat:
	Observe the version number in sysutils/ntfsprogs/Makefile
>Fix:

The following patch updates the port to ntfsprogs-1.12.1 - it has been
verified to compile cleanly on 5.4-RELEASE (i386), that's all! Needs
more testing as all I have done is update the existing port and diff
files. I don't currently have a machine with both NTFS and FreeBSD.

I had a brief look to make sure the patch was still relevant and it
doesn't seem to clash with any new functionality or changes in ntfsprogs.
The original port patches apply cleanly except for one place.

Patch follows...

diff -ruw sysutils/ntfsprogs/Makefile /usr/ports/sysutils/ntfsprogs/Makefile
--- sysutils/ntfsprogs/Makefile	Mon Oct 10 17:12:18 2005
+++ /usr/ports/sysutils/ntfsprogs/Makefile	Tue Oct 11 16:25:21 2005
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	ntfsprogs
-PORTVERSION=	1.9.4
-PORTREVISION=	2
+PORTVERSION=	1.12.1
+PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	linux-ntfs
diff -ruw sysutils/ntfsprogs/distinfo /usr/ports/sysutils/ntfsprogs/distinfo
--- sysutils/ntfsprogs/distinfo	Wed Apr 13 15:07:54 2005
+++ /usr/ports/sysutils/ntfsprogs/distinfo	Tue Oct 11 16:25:01 2005
@@ -1,2 +1,2 @@
-MD5 (ntfsprogs-1.9.4.tar.gz) = 6fb6465e75582fc70d50966a08dd3ec1
-SIZE (ntfsprogs-1.9.4.tar.gz) = 701154
+MD5 (ntfsprogs-1.12.1.tar.gz) = 607b86d45ab65cf9db2255669545006e
+SIZE (ntfsprogs-1.12.1.tar.gz) = 801124
diff -ruw sysutils/ntfsprogs/files/patch-512b_blocks /usr/ports/sysutils/ntfsprogs/files/patch-512b_blocks
--- sysutils/ntfsprogs/files/patch-512b_blocks	Wed Jul 27 21:30:19 2005
+++ /usr/ports/sysutils/ntfsprogs/files/patch-512b_blocks	Tue Oct 11 16:28:16 2005
@@ -68,16 +68,17 @@
  		return 0;
  	return -1;
  }
---- ntfsprogs/ntfsresize.c	Sat Sep  4 13:16:32 2004
-+++ ntfsprogs/ntfsresize.c	Tue Jul 12 01:15:30 2005
-@@ -1783,6 +1783,10 @@
+--- ntfsprogs/ntfsresize.c      Fri Oct  7 23:57:31 2005
++++ ntfsprogs/ntfsresize.c      Tue Oct 11 13:35:09 2005
+@@ -1971,6 +1971,11 @@
+		err_exit("Resident attribute in $Bitmap isn't supported!\n");
  
- 	nr_clusters = resize->new_volume_size;
- 	bm_bsize = nr_clusters_to_bitmap_byte_size(nr_clusters);
+	bm_bsize = nr_clusters_to_bitmap_byte_size(resize->new_volume_size);
 +	if(bm_bsize % 512 != 0) {
-+		Dprintf("adjusted bm_bsize: %lld->%lld\n", bm_bsize, (bm_bsize + 511) / 512 * 512);
++		s64 old_bm_bsize = bm_bsize;
 +		bm_bsize = (bm_bsize + 511) / 512 * 512;
++		Dprintf("adjusted bm_bsize: %lld->%lld\n", old_bm_bsize, bm_bsize);
 +	}
  	nr_bm_clusters = rounded_up_division(bm_bsize, vol->cluster_size);
  
- 	if (!(tmp = (u8 *)realloc(resize->lcn_bitmap.bm, bm_bsize)))
+	if (resize->shrink) {
diff -ruw sysutils/ntfsprogs/pkg-plist /usr/ports/sysutils/ntfsprogs/pkg-plist
--- sysutils/ntfsprogs/pkg-plist	Mon Oct 10 17:12:18 2005
+++ /usr/ports/sysutils/ntfsprogs/pkg-plist	Tue Oct 11 16:42:42 2005
@@ -32,7 +32,7 @@
 lib/libntfs.a
 lib/libntfs.la
 lib/libntfs.so
-lib/libntfs.so.6
+lib/libntfs.so.8
 sbin/mkntfs
 sbin/ntfsclone
 sbin/ntfslabel
>Release-Note:
>Audit-Trail:
>Unformatted: