[Glibc-bsd-commits] r1557 - in trunk/freebsd-utils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2006-05-04 15:47:28 +0000 (Thu, 04 May 2006)
New Revision: 1557

Added:
   trunk/freebsd-utils/debian/patches/013_mount_microshit.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/freebsd-utils.install
   trunk/freebsd-utils/debian/rules
Log:
Enable a few mount_* backends (thanks again to Andraz).

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-05-04 15:40:52 UTC (rev 1556)
+++ trunk/freebsd-utils/debian/changelog	2006-05-04 15:47:28 UTC (rev 1557)
@@ -6,8 +6,9 @@
 
   [ Robert Millan ]
   * Enable net-tools package (thanks Andraz for the patches).
+  * Enable a few mount_* backends (thanks again to Andraz).
 
- -- Robert Millan <rmh at aybabtu.com>  Thu,  4 May 2006 17:09:45 +0200
+ -- Robert Millan <rmh at aybabtu.com>  Thu,  4 May 2006 17:46:56 +0200
 
 freebsd-utils (6.0-2.really.5.4-0.6) unreleased; urgency=low
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-05-04 15:40:52 UTC (rev 1556)
+++ trunk/freebsd-utils/debian/control	2006-05-04 15:47:28 UTC (rev 1557)
@@ -3,15 +3,19 @@
 Priority: required
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils, libkvm-dev, libbsd-dev (>= 0.0-1.2+r1367), libc0.1-dev (>= 2.3.6-3+kbsd.r1365), flex | flex-old, kfreebsd-kernel-headers (>= 0.16), libfreebsd-dev (>= 0.0-5), libipx-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils, libkvm-dev, libbsd-dev (>= 0.0-1.2+r1367), libc0.1-dev (>= 2.3.6-7+kbsd.r1540), flex | flex-old, kfreebsd-kernel-headers (>= 0.16), libfreebsd-dev (>= 0.0-5), libipx-dev, libkiconv-dev
+# libkvm-dev: dmesg
 # libfreebsd (>= 0.0-5): ifconfig
 # libipx-dev: ifconfig
+# libkiconv-dev: mount_*
+# libc0.1-dev (>= 2.3.6-7+kbsd.r1540): ifconfig
 Standards-Version: 3.6.0
 
 Package: freebsd-utils
 Essential: yes
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}, libc0.1 (>= 2.3.6-3+kbsd.r1365), freebsd-hackedutils
+Replaces: freebsd-hackedutils (<= 5.2.1-29)
 Description: FreeBSD utilities needed for GNU/kFreeBSD.
  FreeBSD utilities needed for GNU/kFreeBSD.
 

Modified: trunk/freebsd-utils/debian/freebsd-utils.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.install	2006-05-04 15:40:52 UTC (rev 1556)
+++ trunk/freebsd-utils/debian/freebsd-utils.install	2006-05-04 15:47:28 UTC (rev 1557)
@@ -11,8 +11,13 @@
 build-tree/src/sbin/mdconfig/mdconfig			/sbin
 build-tree/src/sbin/mount_std/mount_std			/sbin
 build-tree/src/sbin/mount_autofs/mount_autofs		/sbin
+build-tree/src/sbin/mount_cd9660/mount_cd9660		/sbin
 build-tree/src/sbin/mount_ext2fs/mount_ext2fs		/sbin
 build-tree/src/sbin/mount_hpfs/mount_hpfs		/sbin
+build-tree/src/sbin/mount_msdosfs/mount_msdosfs		/sbin
+build-tree/src/sbin/mount_ntfs/mount_ntfs		/sbin
 build-tree/src/sbin/mount_nullfs/mount_nullfs		/sbin
 build-tree/src/sbin/mount_reiserfs/mount_reiserfs	/sbin
+build-tree/src/sbin/mount_udf/mount_udf			/sbin
+build-tree/src/sbin/mount_umapfs/mount_umapfs		/sbin
 build-tree/src/sbin/mount_unionfs/mount_unionfs		/sbin

Added: trunk/freebsd-utils/debian/patches/013_mount_microshit.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/013_mount_microshit.diff	2006-05-04 15:40:52 UTC (rev 1556)
+++ trunk/freebsd-utils/debian/patches/013_mount_microshit.diff	2006-05-04 15:47:28 UTC (rev 1557)
@@ -0,0 +1,31 @@
+diff -ur src.old/sbin/mount_msdosfs/mount_msdosfs.c src/sbin/mount_msdosfs/mount_msdosfs.c
+--- src.old/sbin/mount_msdosfs/mount_msdosfs.c	2006-05-04 17:14:14.000000000 +0200
++++ src/sbin/mount_msdosfs/mount_msdosfs.c	2006-05-04 17:17:32.000000000 +0200
+@@ -51,7 +51,7 @@
+ #include <pwd.h>
+ #include <stdio.h>
+ /* must be after stdio to declare fparseln */
+-#include <libutil.h>
++#include <sys/iconv.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sysexits.h>
+diff -ur src.old/sbin/mount_ntfs/mount_ntfs.c src/sbin/mount_ntfs/mount_ntfs.c
+--- src.old/sbin/mount_ntfs/mount_ntfs.c	2006-05-04 17:14:14.000000000 +0200
++++ src/sbin/mount_ntfs/mount_ntfs.c	2006-05-04 17:17:32.000000000 +0200
+@@ -38,6 +38,7 @@
+ #include <sys/mount.h>
+ #include <sys/stat.h>
+ #include <sys/module.h>
++#include <iconv.h>
+ #include <sys/iconv.h>
+ #include <sys/linker.h>
+ #include <fs/ntfs/ntfsmount.h>
+@@ -50,7 +51,6 @@
+ #include <string.h>
+ #include <sysexits.h>
+ #include <unistd.h>
+-#include <libutil.h>
+ 
+ #include "mntopts.h"
+ 

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2006-05-04 15:40:52 UTC (rev 1556)
+++ trunk/freebsd-utils/debian/rules	2006-05-04 15:47:28 UTC (rev 1557)
@@ -15,11 +15,11 @@
 
 build/freebsd-utils:: apply-patches
 	set -e ; for i in sbin/{dmesg,mdconfig,mount,mount_std,umount,swapon,sysctl} usr.sbin/rpc.umntall \
-		sbin/mount_{autofs,ext2fs,hpfs,nullfs,reiserfs,unionfs} \
+		sbin/mount_{autofs,cd9660,ext2fs,hpfs,msdosfs,ntfs,nullfs,reiserfs,udf,umapfs,unionfs} \
 	; do \
 		$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
 	done
-# FIXME: add mount_{xfs,cd9660,msdosfs,nfs,nfs4,ntfs,udf,umapfs}
+# FIXME: add mount_{xfs,nfs,nfs4}
 
 build/module-init-tools:: apply-patches
 	set -e ; for i in sbin/kld{load,stat,unload} \