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

[Petr Salinger]

Author: ps-guest
Date: 2006-11-10 23:12:14 +0100 (Fri, 10 Nov 2006)
New Revision: 1717

Added:
   trunk/freebsd-utils/debian/patches/014_kldconfig.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/module-init-tools.install
   trunk/freebsd-utils/debian/patches/012_net-tools.diff
   trunk/freebsd-utils/debian/rules
Log:
* enable kldconfig



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-11-10 18:19:34 UTC (rev 1716)
+++ trunk/freebsd-utils/debian/changelog	2006-11-10 22:12:14 UTC (rev 1717)
@@ -2,8 +2,9 @@
 
   [ Petr Salinger ]
   * another attempt at net-tools
-	route needs fixed argument for getopt
-	ifconfig needs fixed glibc
+        route needs fixed argument for getopt
+        ifconfig needs fixed glibc
+  * enable kldconfig
 
  -- Aurelien Jarno <aurel32 at debian.org>  Thu,  9 Nov 2006 14:17:31 +0100
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2006-11-10 18:19:34 UTC (rev 1716)
+++ trunk/freebsd-utils/debian/control	2006-11-10 22:12:14 UTC (rev 1717)
@@ -25,7 +25,7 @@
 Priority: important
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}
-Replaces: kldutils (<< 6.0-2.really.5.4-0.6), freebsd-utils (<= 5.2.1-16)
+Replaces: kldutils (<< 6.0-2.really.5.4-0.6), freebsd-utils (<= 5.2.1-16), freebsd-hackedutils (<= 5.2.1-31)
 Description: tools for managing kFreeBSD modules
  This package contains a set of programs for loading, inserting, and
  removing kernel modules for kFreeBSD.

Modified: trunk/freebsd-utils/debian/module-init-tools.install
===================================================================
--- trunk/freebsd-utils/debian/module-init-tools.install	2006-11-10 18:19:34 UTC (rev 1716)
+++ trunk/freebsd-utils/debian/module-init-tools.install	2006-11-10 22:12:14 UTC (rev 1717)
@@ -1,4 +1,5 @@
 build-tree/src/sbin/kldload/kldload		/sbin
 build-tree/src/sbin/kldunload/kldunload		/sbin
+build-tree/src/sbin/kldconfig/kldconfig		/sbin
 build-tree/src/sbin/kldstat/kldstat		/bin
 debian/modules					/etc

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

Added: trunk/freebsd-utils/debian/patches/014_kldconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/014_kldconfig.diff	2006-11-10 18:19:34 UTC (rev 1716)
+++ trunk/freebsd-utils/debian/patches/014_kldconfig.diff	2006-11-10 22:12:14 UTC (rev 1717)
@@ -0,0 +1,19 @@
+--- src/sbin/kldconfig/kldconfig.c	2006-11-10 23:51:38.000000000 +0100
++++ src/sbin/kldconfig/kldconfig.c	2006-11-10 23:50:44.000000000 +0100
+@@ -39,14 +39,8 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
+-#if defined(__FreeBSD_version)
+-#if __FreeBSD_version < 500000
+-#define NEED_SLASHTERM
+-#endif /* < 500000 */
+-#else  /* defined(__FreeBSD_version) */
+-/* just in case.. */
+-#define NEED_SLASHTERM
+-#endif /* defined(__FreeBSD_version) */
++#include <bsd/string.h>
++extern int sysctlnametomib(const char *name, int *mibp, size_t *sizep);
+ 
+ /* the default sysctl name */
+ #define PATHCTL	"kern.module_path"

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2006-11-10 18:19:34 UTC (rev 1716)
+++ trunk/freebsd-utils/debian/rules	2006-11-10 22:12:14 UTC (rev 1717)
@@ -23,11 +23,10 @@
 # FIXME: add mount_{xfs,nfs,nfs4},chflags
 
 build/module-init-tools:: apply-patches
-	set -e ; for i in sbin/kld{load,stat,unload} \
+	set -e ; for i in sbin/kld{load,stat,unload,config} \
 	; do \
 		$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
 	done
-# FIXME: add kldconfig
 
 build/net-tools:: apply-patches
 	set -e ; for i in sbin/{ifconfig,route} \