[Glibc-bsd-commits] r1553 - in trunk/freebsd-utils: . debian debian/patches scripts/sbin

Robert Millan rmh at costa.debian.org
Thu May 4 15:11:12 UTC 2006 

Author: rmh
Date: 2006-05-04 15:11:11 +0000 (Thu, 04 May 2006)
New Revision: 1553

Added:
   trunk/freebsd-utils/debian/net-tools.install
   trunk/freebsd-utils/debian/patches/012_net-tools.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/rules
   trunk/freebsd-utils/fetch
   trunk/freebsd-utils/scripts/sbin/route
Log:
* Enable net-tools package (thanks Andraz for the patches).
(remove fdisk/bsdlabel from source as well).

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-05-04 14:32:15 UTC (rev 1552)
+++ trunk/freebsd-utils/debian/changelog	2006-05-04 15:11:11 UTC (rev 1553)
@@ -4,8 +4,11 @@
   * Use versioned Conflicts, it allows to install both module-init-tools
     and dummy kldutils.
 
- -- Robert Millan <rmh at aybabtu.com>  Thu,  4 May 2006 16:30:43 +0200
+  [ Robert Millan ]
+  * Enable net-tools package (thanks Andraz for the patches).
 
+ -- Robert Millan <rmh at aybabtu.com>  Thu,  4 May 2006 17:09:45 +0200
+
 freebsd-utils (6.0-2.really.5.4-0.6) unreleased; urgency=low
 
   * Add dummy kldutils package to facilitate upgrade (since, in some

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-05-04 14:32:15 UTC (rev 1552)
+++ trunk/freebsd-utils/debian/control	2006-05-04 15:11:11 UTC (rev 1553)
@@ -3,7 +3,9 @@
 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-4)
+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
+# libfreebsd (>= 0.0-5): ifconfig
+# libipx-dev: ifconfig
 Standards-Version: 3.6.0
 
 Package: freebsd-utils
@@ -35,21 +37,21 @@
  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-29)
+Description: FreeBSD networking tools
+ This package contains the FreeBSD tools needed to manage networking on
+ GNU/kFreeBSD.
+
 # FIXME:
-# - enable net-tools
 # - add ktrace (ktrace, kdump)
 # - add jail
 # - add ppp (ppp, pppctl, pppd)
 # - add ccdconfig (ccdconfig + /etc/ccdconfig.conf)
 # - add pf (pfctl + authpf + /etc stuff + init.d script)
 # - add ipfw (???)
-
-#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-26)
-#Description: FreeBSD networking tools
-# This package contains the FreeBSD tools needed to manage networking on
-# GNU/kFreeBSD.
+# - add devfs

Added: trunk/freebsd-utils/debian/net-tools.install
===================================================================
--- trunk/freebsd-utils/debian/net-tools.install	2006-05-04 14:32:15 UTC (rev 1552)
+++ trunk/freebsd-utils/debian/net-tools.install	2006-05-04 15:11:11 UTC (rev 1553)
@@ -0,0 +1,3 @@
+build-tree/src/sbin/ifconfig/ifconfig		/bin
+build-tree/src/sbin/route/route			/lib/freebsd
+scripts/sbin/route				/sbin

Added: trunk/freebsd-utils/debian/patches/012_net-tools.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/012_net-tools.diff	2006-05-04 14:32:15 UTC (rev 1552)
+++ trunk/freebsd-utils/debian/patches/012_net-tools.diff	2006-05-04 15:11:11 UTC (rev 1553)
@@ -0,0 +1,95 @@
+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
+ 
+ #comment out to exclude SIOC[GS]VH support
+-SRCS+=	ifcarp.c
+-CFLAGS+=-DUSE_CARP
++#SRCS+=	ifcarp.c
++#CFLAGS+=-DUSE_CARP
+ 
+ #comment out to exclude MAC support
+-SRCS+=	ifmac.c
+-CFLAGS+=-DUSE_MAC
++#SRCS+=	ifmac.c
++#CFLAGS+=-DUSE_MAC
+ 
+ #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
+ 
+ MAN=	ifconfig.8
+ 
+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
+@@ -43,6 +43,7 @@
+ #include <ctype.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <bsd/string.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <err.h>
+diff -ur src.old/sbin/ifconfig/ifconfig.c src/sbin/ifconfig/ifconfig.c
+--- src.old/sbin/ifconfig/ifconfig.c	2006-05-04 16:40:04.000000000 +0200
++++ src/sbin/ifconfig/ifconfig.c	2006-05-04 16:44:05.000000000 +0200
+@@ -44,10 +44,14 @@
+ #include <sys/param.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
++#include <sys/types.h>
+ #include <sys/sysctl.h>
+-#include <sys/time.h>
++#include <bsd/bsd.h>
+ #include <sys/module.h>
+ #include <sys/linker.h>
++#include <sys/sockio.h>
++#include <bsd/string.h>
++#include <netinet/ether.h>
+ 
+ #include <net/ethernet.h>
+ #include <net/if.h>
+diff -ur src.old/sbin/ifconfig/ifieee80211.c src/sbin/ifconfig/ifieee80211.c
+--- src.old/sbin/ifconfig/ifieee80211.c	2006-05-04 16:40:04.000000000 +0200
++++ src/sbin/ifconfig/ifieee80211.c	2006-05-04 16:44:05.000000000 +0200
+@@ -84,6 +84,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+diff -ur src.old/sbin/route/route.c src/sbin/route/route.c
+--- src.old/sbin/route/route.c	2006-05-04 16:40:04.000000000 +0200
++++ src/sbin/route/route.c	2006-05-04 16:44:09.000000000 +0200
+@@ -47,6 +47,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/sysctl.h>
+ #include <sys/types.h>
++#include <bsd/bsd.h>
+ 
+ #include <net/if.h>
+ #include <net/route.h>
+@@ -63,10 +64,12 @@
+ #include <paths.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <sysexits.h>
+ #include <unistd.h>
+ #include <ifaddrs.h>
++#include <time.h>
+ 
+ struct keytab {
+ 	char	*kt_cp;

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2006-05-04 14:32:15 UTC (rev 1552)
+++ trunk/freebsd-utils/debian/rules	2006-05-04 15:11:11 UTC (rev 1553)
@@ -19,7 +19,7 @@
 	; do \
 		$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
 	done
-# FIXME: add mount_{xfs,cd9660,msdosfs,nfs,nfs4,ntfs,udf,umapfs},fdisk,bsdlabel
+# FIXME: add mount_{xfs,cd9660,msdosfs,nfs,nfs4,ntfs,udf,umapfs}
 
 build/module-init-tools:: apply-patches
 	set -e ; for i in sbin/kld{load,stat,unload} \
@@ -29,11 +29,11 @@
 # FIXME: add kldconfig
 
 build/net-tools:: apply-patches
-	set -e ; for i in sbin/{ifconfig,route,netstat} \
+	set -e ; for i in sbin/{ifconfig,route} \
 	; do \
 		$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
 	done
-# FIXME: enable in debian/control
+# FIXME: netstat
 
 clean::
 	rm -f debian/kbdcontrol.templates
@@ -52,7 +52,6 @@
 		-e "/^__FBSDID/d" \
 		-e "s/[ \t]*__\(dead2\|unused\|result\)[ \t]*//g" \
 		-e "s,<sys/queue\.h>,<bsd/queue.h>,g" \
-		-e "s,<sys/iconv\.h>,<iconv.h>,g" \
 		-e "s/^LDADD=/LDADD+=/g" \
 		-e "s/getline/bsd_&/g" \
 	; done)

Modified: trunk/freebsd-utils/fetch
===================================================================
--- trunk/freebsd-utils/fetch	2006-05-04 14:32:15 UTC (rev 1552)
+++ trunk/freebsd-utils/fetch	2006-05-04 15:11:11 UTC (rev 1553)
@@ -19,7 +19,7 @@
     src/sbin/mount_std src/sbin/umount src/usr.sbin/rpc.umntall \
     src/sbin/mount_{cd9660,ext2fs,hpfs,msdosfs,nfs,nfs4,ntfs,nullfs,udf,umapfs,unionfs} \
     src/usr.bin/{ktrace,kdump} src/usr.sbin/jail src/usr.sbin/ppp{,ctl,d} \
-    src/sbin/{fdisk,mdconfig,ccdconfig,bsdlabel,ipfw} \
+    src/sbin/{mdconfig,ccdconfig,ipfw} \
     src/{contrib/pf,sbin/pfctl,usr.sbin/authpf} \
     src/usr.sbin/kbdcontrol src/share/syscons/keymaps \
   ; do

Modified: trunk/freebsd-utils/scripts/sbin/route
===================================================================
--- trunk/freebsd-utils/scripts/sbin/route	2006-05-04 14:32:15 UTC (rev 1552)
+++ trunk/freebsd-utils/scripts/sbin/route	2006-05-04 15:11:11 UTC (rev 1553)
@@ -2,7 +2,7 @@
 set -e
 
 if [ $# = 0 ] ; then
-  route.real
+  /lib/freebsd/route
 fi
 
 args=""
@@ -29,4 +29,4 @@
   args="-q flush"
 fi
 
-exec -a route route.real ${cmd} ${args} > /dev/null
+exec -a route /lib/freebsd/route ${cmd} ${args} > /dev/null

More information about the Glibc-bsd-commits mailing list