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

Petr Salinger ps-guest at costa.debian.org
Fri Aug 25 13:41:18 UTC 2006 

Author: ps-guest
Date: 2006-08-25 13:41:17 +0000 (Fri, 25 Aug 2006)
New Revision: 1648

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff
   trunk/freebsd-utils/debian/patches/007_rpc_auth.diff
   trunk/freebsd-utils/debian/patches/012_net-tools.diff
   trunk/freebsd-utils/fetch
Log:
* freebsd-utils based on FreeBSD 6.1



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-08-25 13:39:32 UTC (rev 1647)
+++ trunk/freebsd-utils/debian/changelog	2006-08-25 13:41:17 UTC (rev 1648)
@@ -1,3 +1,10 @@
+freebsd-utils (6.1-0.1) UNRELEASED; urgency=low
+
+  [ Petr Salinger ]
+  * based on FreeBSD 6.1
+
+ -- Robert Millan <rmh at aybabtu.com>  Fri, 25 Aug 2006 09:46:47 +0200
+
 freebsd-utils (6.0-2.really.5.4-0.7) UNRELEASED; urgency=low
 
   [ Petr Salinger ]

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-08-25 13:39:32 UTC (rev 1647)
+++ trunk/freebsd-utils/debian/control	2006-08-25 13:41:17 UTC (rev 1648)
@@ -3,7 +3,7 @@
 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-7+kbsd.r1540), flex | flex-old, kfreebsd-kernel-headers (>= 0.16), libfreebsd-dev (>= 0.0-5), libipx-dev, libkiconv-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd6-buildutils, libkvm-dev (>= 6.1), libbsd-dev (>= 0.0-1.3), libc0.1-dev (>= 2.3.6-7+kbsd.r1540), flex | flex-old, kfreebsd-kernel-headers (>= 0.20), libfreebsd-dev (>= 0.0-5), libipx-dev, libkiconv-dev
 # libkvm-dev: dmesg
 # libfreebsd (>= 0.0-5): ifconfig
 # libipx-dev: ifconfig

Modified: trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff	2006-08-25 13:39:32 UTC (rev 1647)
+++ trunk/freebsd-utils/debian/patches/002_mount_noforce_fstab.diff	2006-08-25 13:41:17 UTC (rev 1648)
@@ -63,8 +63,8 @@
 @@ -577,6 +574,6 @@
  
  	(void)fprintf(stderr, "%s\n%s\n",
- 	    "usage: umount [-fv] special | node",
--	    "       umount -a | -A [ -F fstab] [-fv] [-h host] [-t type]");
+ 	    "usage: umount [-fv] special | node | fsid",
+-	    "       umount -a | -A [-F fstab] [-fv] [-h host] [-t type]");
 +	    "       umount -a | -A [-fv] [-h host] [-t type]");
  	exit(1);
  }

Modified: trunk/freebsd-utils/debian/patches/007_rpc_auth.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/007_rpc_auth.diff	2006-08-25 13:39:32 UTC (rev 1647)
+++ trunk/freebsd-utils/debian/patches/007_rpc_auth.diff	2006-08-25 13:41:17 UTC (rev 1648)
@@ -11,12 +11,29 @@
  		clnt_stat = clnt_call(clp, RPCMNT_UMOUNT, (xdrproc_t)xdr_dir,
 --- src/usr.sbin/rpc.umntall/rpc.umntall.c~	2006-03-18 14:29:44.000000000 +0100
 +++ src/usr.sbin/rpc.umntall/rpc.umntall.c	2006-03-18 14:30:09.000000000 +0100
-@@ -206,7 +206,7 @@
+@@ -176,8 +176,7 @@
+ 
+ 	try.tv_sec = 3;
+ 	try.tv_usec = 0;
+-	clp = clnt_create_timed(hostname, RPCPROG_MNT, RPCMNT_VER1, "udp",
+-	    &try);
++	clp = clnt_create(hostname, RPCPROG_MNT, RPCMNT_VER1, "udp");
+ 	if (clp == NULL) {
  		warnx("%s: %s", hostname, clnt_spcreateerror("RPCPROG_MNT"));
  		return (0);
+@@ -204,15 +203,14 @@
+ 
+ 	try.tv_sec = 3;
+ 	try.tv_usec = 0;
+-	clp = clnt_create_timed(hostname, RPCPROG_MNT, RPCMNT_VER1, "udp",
+-	    &try);
++	clp = clnt_create(hostname, RPCPROG_MNT, RPCMNT_VER1, "udp");
+ 	if (clp  == NULL) {
+ 		warnx("%s: %s", hostname, clnt_spcreateerror("RPCPROG_MNT"));
+ 		return (0);
  	}
 -	clp->cl_auth = authsys_create_default();
 +	clp->cl_auth = authunix_create_default();
- 	try.tv_sec = 3;
- 	try.tv_usec = 0;
  	clnt_stat = clnt_call(clp, RPCMNT_UMOUNT, (xdrproc_t)xdr_dir, dirp,
+ 	    (xdrproc_t)xdr_void, (caddr_t)0, try);
+ 	if (clnt_stat != RPC_SUCCESS)

Modified: trunk/freebsd-utils/debian/patches/012_net-tools.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/012_net-tools.diff	2006-08-25 13:39:32 UTC (rev 1647)
+++ trunk/freebsd-utils/debian/patches/012_net-tools.diff	2006-08-25 13:41:17 UTC (rev 1648)
@@ -1,33 +1,36 @@
 diff -ur src.old/sbin/ifconfig/Makefile src/sbin/ifconfig/Makefile
 --- src.old/sbin/ifconfig/Makefile	2006-05-04 16:40:04.000000000 +0200
 +++ src/sbin/ifconfig/Makefile	2006-05-04 16:44:05.000000000 +0200
-@@ -18,18 +18,18 @@
- CFLAGS+=-DUSE_IEEE80211
+@@ -12,21 +12,21 @@
+ #     to the registration process so we don't depend on this aspect
+ #     of the toolchain.
+ #
+-SRCS+=	af_link.c		# LLC support
++#SRCS+=	af_link.c		# LLC support
+ SRCS+=	af_inet.c		# IPv4 support
+-SRCS+=	af_inet6.c		# IPv6 support
++#SRCS+=	af_inet6.c		# IPv6 support
+ SRCS+=	af_atalk.c		# AppleTalk support
  
- #comment out to exclude SIOC[GS]VH support
--SRCS+=	ifcarp.c
--CFLAGS+=-DUSE_CARP
-+#SRCS+=	ifcarp.c
-+#CFLAGS+=-DUSE_CARP
+ SRCS+=	ifclone.c		# clone device support
+-SRCS+=	ifmac.c			# MAC support
+-SRCS+=	ifmedia.c		# SIOC[GS]IFMEDIA support
++#SRCS+=	ifmac.c			# MAC support
++#SRCS+=	ifmedia.c		# SIOC[GS]IFMEDIA support
+ SRCS+=	ifvlan.c		# SIOC[GS]ETVLAN support
+-SRCS+=	ifieee80211.c		# SIOC[GS]IEEE80211 support
++#SRCS+=	ifieee80211.c		# SIOC[GS]IEEE80211 support
  
- #comment out to exclude MAC support
--SRCS+=	ifmac.c
--CFLAGS+=-DUSE_MAC
-+#SRCS+=	ifmac.c
-+#CFLAGS+=-DUSE_MAC
+-SRCS+=	ifcarp.c		# SIOC[GS]VH support
+-SRCS+=	ifpfsync.c		# pfsync(4) support
++#SRCS+=	ifcarp.c		# SIOC[GS]VH support
++#SRCS+=	ifpfsync.c		# pfsync(4) support
  
- #comment out to exclude PFSYNC support
--.if !defined(NO_PF)
--SRCS+=	ifpfsync.c
--CFLAGS+=-DUSE_PFSYNC
--.endif
-+#.if !defined(NO_PF)
-+#SRCS+=	ifpfsync.c
-+#CFLAGS+=-DUSE_PFSYNC
-+#.endif
+-SRCS+=	ifbridge.c		# bridge support
++#SRCS+=	ifbridge.c		# bridge support
  
- MAN=	ifconfig.8
- 
+ .if !defined(RELEASE_CRUNCH)
+ SRCS+=	af_ipx.c		# IPX support
 diff -ur src.old/sbin/ifconfig/ifcarp.c src/sbin/ifconfig/ifcarp.c
 --- src.old/sbin/ifconfig/ifcarp.c	2006-05-04 16:40:04.000000000 +0200
 +++ src/sbin/ifconfig/ifcarp.c	2006-05-04 16:44:05.000000000 +0200

Modified: trunk/freebsd-utils/fetch
===================================================================
--- trunk/freebsd-utils/fetch	2006-08-25 13:39:32 UTC (rev 1647)
+++ trunk/freebsd-utils/fetch	2006-08-25 13:41:17 UTC (rev 1648)
@@ -24,14 +24,14 @@
     src/usr.sbin/kbdcontrol src/share/syscons/keymaps \
     src/bin/chflags \
   ; do
-  cvs ${action} -r RELENG_5_4_0_RELEASE $i
+  cvs ${action} -r RELENG_6_1_0_RELEASE $i
   test -e $i
 done
 
 for i in \
     src/sbin/mount{,_autofs,_reiserfs} \
   ; do
-  cvs ${action} -r RELENG_6_0_0_RELEASE $i
+  cvs ${action} -r RELENG_6_1_0_RELEASE $i
   test -e $i
 done

More information about the Glibc-bsd-commits mailing list