[Glibc-bsd-commits] r1716 - in trunk: freebsd-utils/debian freebsd-utils/debian/patches glibc-2.3-head/sysdeps/kfreebsd glibc-ports/kfreebsd

[Petr Salinger]

Author: ps-guest
Date: 2006-11-10 19:19:34 +0100 (Fri, 10 Nov 2006)
New Revision: 1716

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/patches/012_net-tools.diff
   trunk/glibc-2.3-head/sysdeps/kfreebsd/if_index.c
   trunk/glibc-ports/kfreebsd/if_index.c
Log:
* another attempt at net-tools
	route needs fixed argument for getopt
	ifconfig needs fixed glibc
  


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-11-09 15:09:00 UTC (rev 1715)
+++ trunk/freebsd-utils/debian/changelog	2006-11-10 18:19:34 UTC (rev 1716)
@@ -1,3 +1,12 @@
+freebsd-utils (6.1-4) UNRELEASED; urgency=low
+
+  [ Petr Salinger ]
+  * another attempt at net-tools
+	route needs fixed argument for getopt
+	ifconfig needs fixed glibc
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu,  9 Nov 2006 14:17:31 +0100
+
 freebsd-utils (6.1-3) unreleased; urgency=low
 
   * Finally disable net-tools again, ifconfig and route build, seem 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-11-09 15:09:00 UTC (rev 1715)
+++ trunk/freebsd-utils/debian/control	2006-11-10 18:19:34 UTC (rev 1716)
@@ -3,12 +3,13 @@
 Priority: important
 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), freebsd6-buildutils, libkvm-dev (>= 6.1), libbsd-dev (>= 0.0-1.2), libc0.1-dev (>= 2.3.6-8), flex | flex-old, kfreebsd-kernel-headers (>= 0.20), 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.2), libc0.1-dev (>= 2.3.6-9), flex | flex-old, kfreebsd-kernel-headers (>= 0.20), libfreebsd-dev (>= 0.0-5), libipx-dev, libkiconv-dev, libgeom-dev
 # libkvm-dev: dmesg
+# libgeom-dev : ccdconfig
 # libfreebsd (>= 0.0-5): ifconfig
 # libipx-dev: ifconfig
 # libkiconv-dev: mount_*
-# libc0.1-dev (>= 2.3.6-8): ifconfig
+# libc0.1-dev (>= 2.3.6-9): ifconfig
 Standards-Version: 3.7.2
 
 Package: freebsd-utils
@@ -45,15 +46,15 @@
  Original FreeBSD command to set keyboard layout and the FreeBSD possible
  keyboards.
 
-#Package: net-tools
-#Section: net
-#Priority: important
-#Architecture: kfreebsd-i386 kfreebsd-amd64
-#Depends: ${shlibs:Depends}
-#Replaces: freebsd-utils (<< 5.4), freebsd-hackedutils (<= 5.2.1-30)
-#Description: FreeBSD networking tools
-# This package contains the FreeBSD tools needed to manage networking on
-# GNU/kFreeBSD.
+Package: net-tools
+Section: net
+Priority: important
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${shlibs:Depends}
+Replaces: freebsd-utils (<< 5.4), freebsd-hackedutils (<= 5.2.1-31)
+Description: FreeBSD networking tools
+ This package contains the FreeBSD tools needed to manage networking on
+ GNU/kFreeBSD.
 
 # FIXME:
 # - add kdump

Modified: trunk/freebsd-utils/debian/patches/012_net-tools.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/012_net-tools.diff	2006-11-09 15:09:00 UTC (rev 1715)
+++ trunk/freebsd-utils/debian/patches/012_net-tools.diff	2006-11-10 18:19:34 UTC (rev 1716)
@@ -130,3 +130,12 @@
  
  struct keytab {
  	char	*kt_cp;
+@@ -140,7 +140,7 @@
+        for (i = 1; i < argc; i++)
+          fprintf(stderr,"#%s#", argv[i]);
+          
+-	while ((ch = getopt(argc, argv, "nqdtv")) != -1)
++	while ((ch = getopt(argc, argv, "+nqdtv")) != -1)
+ 		switch(ch) {
+ 		case 'n':
+ 			nflag = 1;

Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/if_index.c
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/if_index.c	2006-11-09 15:09:00 UTC (rev 1715)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/if_index.c	2006-11-10 18:19:34 UTC (rev 1716)
@@ -64,7 +64,7 @@
       switch (msg->ifm_type)
 	{
 	case RTM_IFINFO:
-	  if (msg->ifm_flags & IFF_UP)
+	  if (msg->ifm_addrs & RTA_IFP)
 	    {
 	      unsigned int index;
 	      struct sockaddr_dl *sdl;

Modified: trunk/glibc-ports/kfreebsd/if_index.c
===================================================================
--- trunk/glibc-ports/kfreebsd/if_index.c	2006-11-09 15:09:00 UTC (rev 1715)
+++ trunk/glibc-ports/kfreebsd/if_index.c	2006-11-10 18:19:34 UTC (rev 1716)
@@ -64,7 +64,7 @@
       switch (msg->ifm_type)
 	{
 	case RTM_IFINFO:
-	  if (msg->ifm_flags & IFF_UP)
+	  if (msg->ifm_addrs & RTA_IFP)
 	    {
 	      unsigned int index;
 	      struct sockaddr_dl *sdl;