diff -Nur modutils-2.3.6/ChangeLog modutils-2.3.7/ChangeLog
--- modutils-2.3.6/ChangeLog	Mon Oct 18 16:33:17 1999
+++ modutils-2.3.7/ChangeLog	Fri Nov 26 00:45:07 1999
@@ -1,3 +1,24 @@
+1999-11-21  Keith Owens  <kaos@ocs.com.au>
+
+	modutils 2.3.7
+
+	* Reinstate kernel 2.0 support in rmmod.
+	* Include mips in target cpu list.  Debian #48875.
+	* Standard support for cross compilation, suggested by Peter
+	  Loje Hansen.  Implemented by kaos using a different method
+	  to make it compatible with the Linux kernel.
+	* insmod_ksymoops_clean checks if /proc/ksyms exists.  Debian #49013.
+	* snap_shot remove test for symlink.  Debian #49059.
+	* Correct RPM spec file.  Niels Kristian Bech Jensen.
+	* Add --enable-kerneld configure option.  Niels Kristian Bech Jensen.
+	* --enable-combined-sparc support (default on sparc and sparc64), which
+	  compiles executables handling both 32bit and 64bit SPARC modules.
+	  Jakub Jelinek.
+	* Fixes a few issues with SPARC 64bit support by a 32bit binary.  Jakub
+	  Jelinek.
+	* Cross compile support with thanks to Peter Loje Hansen.
+	* Add --disable-insmod-static.
+
 1999-10-18  Keith Owens  <kaos@ocs.com.au>
 
 	modutils 2.3.6
diff -Nur modutils-2.3.6/INSTALL modutils-2.3.7/INSTALL
--- modutils-2.3.6/INSTALL	Thu Jan  1 10:00:00 1970
+++ modutils-2.3.7/INSTALL	Thu Nov 25 23:47:48 1999
@@ -0,0 +1,139 @@
+INSTALLATION
+============
+
+First of all, remember to remove the old man pages in section 1!
+They are (usually) stored in the /usr/man/man1 directory.
+The new man pages for the utilities are now located in section 8:
+
+	depmod.8	genksyms.8	insmod.8	kerneld.8
+	ksyms.8		lsmod.8		modinfo.8	modprobe.8
+	rmmod.8
+
+The next step is to run the configure script by entering the command:
+
+	./configure
+
+The build process uses the configure script to figure out a few things
+about your system before actually compiling anything. Configure takes
+several command line options which can modify the installation
+paths. Try './configure --help' for more information. (Minor note:
+--exec-prefix defaults to / not /usr if not specified.)
+
+
+Cross compilation and unusual compilation requirements
+------------------------------------------------------
+
+You can compile modutils on one system to run on another.  The Makefiles
+generated by configure contain several variables which can be tweaked for
+unusual compilation environments, including cross compilation.  Do not edit the
+generated Makefiles, set the variables the environment before invoking
+configure.  The default is to compile for the current system type using standard
+utilities and flags.  If you change any of these values after running configure,
+you should erase config.cache before running configure again.
+
+CC              C compiler for target system, default "gcc".
+CFLAGS          C flags for target system, default "-O2 -Wall".
+HOSTCC          C compiler for host system, default $(CC).  Some of the modutils
+                programs are run on the host system so they must be compiled
+                iwth the host compiler and flags.
+HOSTCFLAGS      C flags for host system, default $(CFLAGS).
+LDFLAGS         Linker flags for target system, default "".
+AR              ar program for target system, default "ar".
+RANLIB          ranlib program for target system, default "ranlib".
+INSTALL         install program for target system, default "install".
+PARSERCFLAGS    The parser programs generated by lex and yacc have spurious
+                warnings about uninitialized variables when the default -Wall is
+                used.  This option is included on the compilation of those
+                programs to suppress the warnings, default is
+                "-Wno-uninitialized".
+
+configure takes six modutils specific options, as well as the standard
+configure options.
+
+--enable-combined-rmmod         Create insmod and rmmod as one executable,
+                                default is yes.
+--enable-combined-modprobe      Create insmod and modprobe as one executable,
+                                default is yes.
+--enable-compat-2-0             Create utilities runnable on a Linux 2.0 system,
+                                default is yes.
+--enable-kerneld                The default is to compile kerneld, even though
+                                this utility has not been used since kernel
+                                2.1.91, the option exists for backwards
+                                compatibility.  Distributions can use
+                                --disable-kerneld to remove the crud.
+--enable-combined-sparc         Make all the utilities work on both sparc32 and
+                                sparc64 as one executable.  Default is yes for
+                                sparc, no for other architectures.
+--disable-insmod-static         The default is not to build insmod.static.  You
+                                probably only need this if you are building your
+                                own initrd boot system.
+
+To disable any of these, specify --disable-<option>.
+
+
+Example: To compile with all the default values for the current system.
+
+./configure
+make
+
+Example: To compile on the current system using gcc with a target of alpha using
+gcc_beta, ar, ranlib and test_install, without kernel 2.0 compatibility and
+installing into the /target/alpha hierarchy.
+
+HOSTCC=gcc CC=gcc_beta INSTALL=test_install \
+	./configure \
+		--target=alpha \
+		--disable-compat-2-0 \
+		--exec_prefix=/target/alpha \
+		--prefix=/target/alpha/usr
+make
+
+
+Compiling in a different directory
+----------------------------------
+
+modutils supports the VPATH option of make.  This lets you have the source in
+one directory and the generated files in another, you can even compile from read
+only media.
+
+mkdir /var/tmp/modutils
+cd /var/tmp/modutils
+/path/to/master/modutils/configure
+make
+
+
+Install
+-------
+
+The second step is to actually install the utilities. Do 'make install'
+in this directory to get the following tools:
+
+insmod/
+	insmod		install a loadable module
+	rmmod		remove module(s)
+	ksyms		show symbols
+	lsmod		show modules
+	modinfo		display information about module
+	modprobe	load (a stack of) modules, controlled by a "makefile"
+			and a configuration file.
+	insmod_ksymoops_clean	a shell script be run daily to clean out older
+			saved ksyms and lsmod data.  man insmod for details.
+
+genksyms/
+	genksyms	version generator for module symbols,
+			to be run automatically during kernel make
+			if CONFIG_MODVERSIONS was selected in "make config"
+
+depmod/
+	depmod		generate dependencies for modprobe.
+
+
+kerneld/
+	kerneld		A "user level kernel extension" that allows
+			the kernel to perform some tasks in user space.
+			Suitable tasks are e.g. loading of modules.
+
+
+Keith Owens <kaos@ocs.com.au>
+Richard Henderson <rth@cygnus.com>
+Björn Ekwall <bj0rn@blox.se>
diff -Nur modutils-2.3.6/Makefile.in modutils-2.3.7/Makefile.in
--- modutils-2.3.6/Makefile.in	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.7/Makefile.in	Mon Nov 22 01:08:04 1999
@@ -1,9 +1,9 @@
-# $Id: Makefile.in 1.1 Wed, 25 Aug 1999 16:26:49 +1000 keith $
+# $Id: Makefile.in 1.2 Mon, 22 Nov 1999 01:08:04 +1100 keith $
 
 srcdir = @srcdir@
 
 TARGETS = all install-bin clean distclean realclean dep depend
-SUBDIRS = util obj insmod genksyms depmod kerneld
+SUBDIRS = util obj insmod genksyms depmod @kerneld_SUBDIR@
 
 $(TARGETS)::
 	@for i in $(SUBDIRS); do $(MAKE) -C $$i $@ ; done
diff -Nur modutils-2.3.6/README modutils-2.3.7/README
--- modutils-2.3.6/README	Fri Oct  8 20:31:19 1999
+++ modutils-2.3.7/README	Sun Nov 21 19:27:16 1999
@@ -16,56 +16,5 @@
 to install this package, especially since the improvements in the kernel
 are definitely much better supported by this 2.2.2 release.
 
-
-INSTALLATION
-============
-
-First of all, remember to remove the old man pages in section 1!
-They are (usually) stored in the /usr/man/man1 directory.
-The new man pages for the utilities are now located in section 8:
-
-	depmod.8	genksyms.8	insmod.8	kerneld.8
-	ksyms.8		lsmod.8		modinfo.8	modprobe.8
-	rmmod.8
-
-The next step is to run the configure script by entering the command:
-
-	./configure
-
-The build process uses the configure script to figure out a few things
-about your system before actually compiling anything. Configyre takes
-several command line options which can modify the installation
-paths. Try './configure --help' for more information. (Minor note:
---exec-prefix defaults to / not /usr if not specified.)
-
-The second step is to actually compile and install the utilities. Do
-'make install' in this directory to get the following tools:
-
-insmod/
-	insmod		install a loadable module
-	rmmod		remove module(s)
-	ksyms		show symbols
-	lsmod		show modules
-	modinfo		display information about module
-	modprobe	load (a stack of) modules, controlled by a "makefile"
-			and a configuration file.
-	insmod_ksymoops_clean	a shell script be run daily to clean out older
-			saved ksyms and lsmod data.  man insmod for details.
-
-genksyms/
-	genksyms	version generator for module symbols,
-			to be run automatically during kernel make
-			if CONFIG_MODVERSIONS was selected in "make config"
-
-depmod/
-	depmod		generate dependencies for modprobe.
-
-
-kerneld/
-	kerneld		A "user level kernel extension" that allows
-			the kernel to perform some tasks in user space.
-			Suitable tasks are e.g. loading of modules.
-
-
 Richard Henderson <rth@cygnus.com>
 Björn Ekwall <bj0rn@blox.se>
diff -Nur modutils-2.3.6/configure modutils-2.3.7/configure
--- modutils-2.3.6/configure	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.7/configure	Thu Nov 25 23:47:48 1999
@@ -13,11 +13,17 @@
 # Any additions from configure.in:
 ac_default_prefix=/usr
 ac_help="$ac_help
+  --enable-combined-sparc   Make all the utilities work on both sparc32 and sparc64 as one executable (default on sparc)"
+ac_help="$ac_help
   --enable-combined-rmmod   Create insmod and rmmod as one executable (default)"
 ac_help="$ac_help
   --enable-combined-modprobe   Create insmod and modprobe as one executable (default)"
 ac_help="$ac_help
   --enable-compat-2-0   Create utilities runnable on a Linux 2.0 system (default)"
+ac_help="$ac_help
+  --enable-kerneld   Create kerneld binary (default)"
+ac_help="$ac_help
+  --disable-insmod-static   Do not create insmod.static binary (default)"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -527,51 +533,19 @@
 
 
 
-# Check whether --enable-combined-rmmod or --disable-combined-rmmod was given.
-if test "${enable_combined_rmmod+set}" = set; then
-  enableval="$enable_combined_rmmod"
-  if test "$enableval" = "yes"; then
-  COMBINE_rmmod=rmmod
-  else
-  COMBINE_rmmod=""
-fi
-else
-  COMBINE_rmmod=rmmod
-fi
-
-
-
-# Check whether --enable-combined-modprobe or --disable-combined-modprobe was given.
-if test "${enable_combined_modprobe+set}" = set; then
-  enableval="$enable_combined_modprobe"
-  if test "$enableval" = "yes"; then
-  COMBINE_modprobe=modprobe
-  else
-  COMBINE_modprobe=""
-fi
-else
-  COMBINE_modprobe=modprobe
+# Canonical system must use HOSTCC and flags, not CC.  ALso
+# AC_CANONICAL_SYSTEM gives incorrect results if CC is explictly set to
+# a null string so unset null fields.
+CC_save="$CC"
+CFLAGS_save="$CFLAGS"
+CC="$HOSTCC"
+CFLAGS="$HOSTCFLAGS"
+if test -z "$CC"; then
+  unset CC
 fi
-
-
-
-# Check whether --enable-compat-2-0 or --disable-compat-2-0 was given.
-if test "${enable_compat_2_0+set}" = set; then
-  enableval="$enable_compat_2_0"
-  if test "$enableval" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define COMPAT_2_0 1
-EOF
-
+if test -z "$CFLAGS"; then
+  unset CFLAGS
 fi
-else
-  cat >> confdefs.h <<\EOF
-#define COMPAT_2_0 1
-EOF
-
-fi
-
-
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -619,7 +593,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:623: checking host system type" >&5
+echo "configure:597: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -640,7 +614,7 @@
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:644: checking target system type" >&5
+echo "configure:618: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -658,7 +632,7 @@
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:662: checking build system type" >&5
+echo "configure:636: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -680,19 +654,123 @@
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
 
+CC="$CC_save"
+CFLAGS="$CFLAGS_save"
+if test -z "$CC"; then
+  unset CC
+fi
+if test -z "$CFLAGS"; then
+  unset CFLAGS
+fi
+
 case "$target_cpu" in
   alpha*)  ARCH=alpha ;;
   i?86)    ARCH=i386  ;;
   arm*)    ARCH=arm   ;;
+  mips*)   ARCH=mips  ;;
   powerpc) ARCH=ppc   ;;
   *)       ARCH=$target_cpu ;;
 esac
 
+COMBINE_sparc=yes
+# Check whether --enable-combined-sparc or --disable-combined-sparc was given.
+if test "${enable_combined_sparc+set}" = set; then
+  enableval="$enable_combined_sparc"
+  if test "$enableval" = "yes"; then
+  COMBINE_sparc=yes
+  else
+  COMBINE_sparc=no
+fi
+fi
+
+case "$ARCH" in
+  sparc64) if test "$COMBINE_sparc" = "yes"; then ARCH="sparc"; fi ;;
+  sparc*) ;;
+  *) COMBINE_sparc=no ;;
+esac
+
+
+# Check whether --enable-combined-rmmod or --disable-combined-rmmod was given.
+if test "${enable_combined_rmmod+set}" = set; then
+  enableval="$enable_combined_rmmod"
+  if test "$enableval" = "yes"; then
+  COMBINE_rmmod=rmmod
+  else
+  COMBINE_rmmod=""
+fi
+else
+  COMBINE_rmmod=rmmod
+fi
+
+
+
+# Check whether --enable-combined-modprobe or --disable-combined-modprobe was given.
+if test "${enable_combined_modprobe+set}" = set; then
+  enableval="$enable_combined_modprobe"
+  if test "$enableval" = "yes"; then
+  COMBINE_modprobe=modprobe
+  else
+  COMBINE_modprobe=""
+fi
+else
+  COMBINE_modprobe=modprobe
+fi
+
+
+
+# Check whether --enable-compat-2-0 or --disable-compat-2-0 was given.
+if test "${enable_compat_2_0+set}" = set; then
+  enableval="$enable_compat_2_0"
+  if test "$enableval" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define COMPAT_2_0 1
+EOF
+
+fi
+else
+  cat >> confdefs.h <<\EOF
+#define COMPAT_2_0 1
+EOF
+
+fi
+
+
+# Check whether --enable-kerneld or --disable-kerneld was given.
+if test "${enable_kerneld+set}" = set; then
+  enableval="$enable_kerneld"
+  if test "$enableval" = "yes"; then
+  kerneld_SUBDIR=kerneld
+  kerneld_Makefile=kerneld/Makefile
+fi
+else
+  kerneld_SUBDIR=kerneld; kerneld_Makefile=kerneld/Makefile
+fi
+
+
+
+# Check whether --enable-insmod-static or --disable-insmod-static was given.
+if test "${enable_insmod_static+set}" = set; then
+  enableval="$enable_insmod_static"
+  if test "$enableval" = "yes"; then
+  insmod_static=insmod.static
+fi
+else
+  insmod_static=
+fi
+
+
+
+
+
+# If the user did not specify CFLAGS, use suitable values for modutils
+if test "$CFLAGS" = ""; then
+  CFLAGS="-O2 -Wall"
+fi
 
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:696: checking for $ac_word" >&5
+echo "configure:774: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -721,7 +799,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:725: checking for $ac_word" >&5
+echo "configure:803: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -769,7 +847,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:773: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:851: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -779,11 +857,11 @@
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 783 "configure"
+#line 861 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -803,12 +881,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:807: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:885: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:812: checking whether we are using GNU C" >&5
+echo "configure:890: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -817,7 +895,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -832,7 +910,7 @@
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:836: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:914: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -859,70 +937,10 @@
   test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
 
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:874: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall installbsd scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    # OSF/1 installbsd also uses dspmsg, but is usable.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:926: checking for $ac_word" >&5
+echo "configure:944: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -949,7 +967,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:953: checking whether ln -s works" >&5
+echo "configure:971: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -970,13 +988,48 @@
 fi
 
 
+# AC_PROG_INSTALL is unsuitable for cross compilation.  It generates a
+# hard coded pathname for INSTALL.  Even if we set our own value for
+# INSTALL, acgeneral insists on preceding a relative INSTALL with
+# "../".  Easiest solution is to use another variable inside autoconf
+# and not use AC_PROG_INSTALL.
+#
+if test -z "$INSTALL"; then
+  INSTALL_LOCAL=install
+else
+  INSTALL_LOCAL="$INSTALL"
+fi
+
+# If the user did not specify HOSTCC, use CC
+if test -z "$HOSTCC"; then
+  HOSTCC=$CC
+fi
+
+# If the user did not specify HOSTCFLAGS, use CFLAGS
+if test -z "$HOSTCFLAGS"; then
+  HOSTCFLAGS=$CFLAGS
+fi
+
+# If the user did not specify AR, use ar
+if test -z "$AR"; then
+  AR=ar
+fi
+
+# If the user did not specify PARSECFLAGS, use -Wno-uninitialized.
+# Yacc and Lex generated programs raise comments about uninitialized
+# variables when -Wall is used so turn this warning off for the parse
+# programs.
+if test "$PARSERCFLAGS" = ""; then
+  PARSERCFLAGS=-Wno-uninitialized
+fi
+
 echo $ac_n "checking for wordexp""... $ac_c" 1>&6
-echo "configure:975: checking for wordexp" >&5
+echo "configure:1028: checking for wordexp" >&5
 if eval "test \"`echo '$''{'ac_cv_func_wordexp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 980 "configure"
+#line 1033 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char wordexp(); below.  */
@@ -999,7 +1052,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_wordexp=yes"
 else
@@ -1020,12 +1073,12 @@
 fi
 
 echo $ac_n "checking for glob""... $ac_c" 1>&6
-echo "configure:1024: checking for glob" >&5
+echo "configure:1077: checking for glob" >&5
 if eval "test \"`echo '$''{'ac_cv_func_glob'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1029 "configure"
+#line 1082 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char glob(); below.  */
@@ -1048,7 +1101,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_glob=yes"
 else
@@ -1071,15 +1124,20 @@
 
 
 
+
+
+
+
+
 if test "$ARCH" = "alpha"; then
   echo $ac_n "checking for broken alpha assembler""... $ac_c" 1>&6
-echo "configure:1077: checking for broken alpha assembler" >&5
+echo "configure:1135: checking for broken alpha assembler" >&5
   cat > conftest.c <<EOF
-#line 1079 "configure"
+#line 1137 "configure"
 static int x, y;
 int main() { return y; }
 EOF
-  if { (eval echo configure:1083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:1141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     ac_broken_gas=no
     if objdump -r conftest.o | grep 'LITERAL.*y.*4$' > /dev/null; then
       cat >> confdefs.h <<\EOF
@@ -1214,10 +1272,9 @@
 done
 
 ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "Makefile depmod/Makefile genksyms/Makefile
-	  insmod/Makefile kerneld/Makefile obj/Makefile util/Makefile
+	  insmod/Makefile $kerneld_Makefile obj/Makefile util/Makefile
 	  man/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -1248,8 +1305,6 @@
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@COMBINE_rmmod@%$COMBINE_rmmod%g
-s%@COMBINE_modprobe@%$COMBINE_modprobe%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
@@ -1265,14 +1320,22 @@
 s%@build_cpu@%$build_cpu%g
 s%@build_vendor@%$build_vendor%g
 s%@build_os@%$build_os%g
+s%@COMBINE_sparc@%$COMBINE_sparc%g
+s%@COMBINE_rmmod@%$COMBINE_rmmod%g
+s%@COMBINE_modprobe@%$COMBINE_modprobe%g
+s%@kerneld_SUBDIR@%$kerneld_SUBDIR%g
+s%@insmod_static@%$insmod_static%g
 s%@ARCH@%$ARCH%g
 s%@CC@%$CC%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@RANLIB@%$RANLIB%g
 s%@LN_S@%$LN_S%g
 s%@HAVE_WORDEXP@%$HAVE_WORDEXP%g
 s%@HAVE_GLOB@%$HAVE_GLOB%g
+s%@HOSTCC@%$HOSTCC%g
+s%@HOSTCFLAGS@%$HOSTCFLAGS%g
+s%@AR@%$AR%g
+s%@INSTALL_LOCAL@%$INSTALL_LOCAL%g
+s%@PARSERCFLAGS@%$PARSERCFLAGS%g
 
 CEOF
 EOF
@@ -1315,7 +1378,7 @@
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile depmod/Makefile genksyms/Makefile
-	  insmod/Makefile kerneld/Makefile obj/Makefile util/Makefile
+	  insmod/Makefile $kerneld_Makefile obj/Makefile util/Makefile
 	  man/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
@@ -1351,10 +1414,6 @@
     top_srcdir="$ac_dots$ac_given_srcdir" ;;
   esac
 
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
 
   echo creating "$ac_file"
   rm -f "$ac_file"
@@ -1370,7 +1429,6 @@
 s%@configure_input@%$configure_input%g
 s%@srcdir@%$srcdir%g
 s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
 " $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
 fi; done
 rm -f conftest.s*
diff -Nur modutils-2.3.6/configure.in modutils-2.3.7/configure.in
--- modutils-2.3.6/configure.in	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.7/configure.in	Thu Nov 25 23:47:48 1999
@@ -1,8 +1,55 @@
-dnl $Id: configure.in 1.1 Wed, 25 Aug 1999 16:26:49 +1000 keith $
+dnl $Id: configure.in 1.7 Thu, 25 Nov 1999 23:47:48 +1100 keith $
 
 AC_INIT(insmod/insmod.c)
 AC_PREFIX_DEFAULT(/usr)
 
+# Canonical system must use HOSTCC and flags, not CC.  ALso
+# AC_CANONICAL_SYSTEM gives incorrect results if CC is explictly set to
+# a null string so unset null fields.
+CC_save="$CC"
+CFLAGS_save="$CFLAGS"
+CC="$HOSTCC"
+CFLAGS="$HOSTCFLAGS"
+if test -z "$CC"; then
+  unset CC
+fi
+if test -z "$CFLAGS"; then
+  unset CFLAGS
+fi
+AC_CANONICAL_SYSTEM
+CC="$CC_save"
+CFLAGS="$CFLAGS_save"
+if test -z "$CC"; then
+  unset CC
+fi
+if test -z "$CFLAGS"; then
+  unset CFLAGS
+fi
+
+case "$target_cpu" in
+  alpha*)  ARCH=alpha ;;
+  i?86)    ARCH=i386  ;;
+  arm*)    ARCH=arm   ;;
+  mips*)   ARCH=mips  ;;
+  powerpc) ARCH=ppc   ;;
+  *)       ARCH=$target_cpu ;;
+esac
+
+COMBINE_sparc=yes
+AC_ARG_ENABLE(combined-sparc,
+[  --enable-combined-sparc   Make all the utilities work on both sparc32 and sparc64 as one executable (default on sparc)],
+[if test "$enableval" = "yes"; then
+  COMBINE_sparc=yes
+  else
+  COMBINE_sparc=no
+fi])
+case "$ARCH" in
+  sparc64) if test "$COMBINE_sparc" = "yes"; then ARCH="sparc"; fi ;;
+  sparc*) ;;
+  *) COMBINE_sparc=no ;;
+esac
+AC_SUBST(COMBINE_sparc)
+
 AC_ARG_ENABLE(combined-rmmod,
 [  --enable-combined-rmmod   Create insmod and rmmod as one executable (default)],
 [if test "$enableval" = "yes"; then
@@ -27,25 +74,76 @@
   AC_DEFINE(COMPAT_2_0)
 fi],[AC_DEFINE(COMPAT_2_0)])
 
-AC_CANONICAL_SYSTEM
-case "$target_cpu" in
-  alpha*)  ARCH=alpha ;;
-  i?86)    ARCH=i386  ;;
-  arm*)    ARCH=arm   ;;
-  powerpc) ARCH=ppc   ;;
-  *)       ARCH=$target_cpu ;;
-esac
+AC_ARG_ENABLE(kerneld,
+[  --enable-kerneld   Create kerneld binary (default)],
+[if test "$enableval" = "yes"; then
+  kerneld_SUBDIR=kerneld
+  kerneld_Makefile=kerneld/Makefile
+fi],[kerneld_SUBDIR=kerneld; kerneld_Makefile=kerneld/Makefile])
+AC_SUBST(kerneld_SUBDIR)
+
+AC_ARG_ENABLE(insmod-static,
+[  --disable-insmod-static   Do not create insmod.static binary (default)],
+[if test "$enableval" = "yes"; then
+  insmod_static=insmod.static
+fi],[insmod_static=])
+AC_SUBST(insmod_static)
+
 AC_SUBST(ARCH)
 
+# If the user did not specify CFLAGS, use suitable values for modutils
+if test "$CFLAGS" = ""; then
+  CFLAGS="-O2 -Wall"
+fi
+
 AC_PROG_CC
-AC_PROG_INSTALL
 AC_PROG_RANLIB
 AC_PROG_LN_S
 
+# AC_PROG_INSTALL is unsuitable for cross compilation.  It generates a
+# hard coded pathname for INSTALL.  Even if we set our own value for
+# INSTALL, acgeneral insists on preceding a relative INSTALL with
+# "../".  Easiest solution is to use another variable inside autoconf
+# and not use AC_PROG_INSTALL.
+#
+if test -z "$INSTALL"; then
+  INSTALL_LOCAL=install
+else
+  INSTALL_LOCAL="$INSTALL"
+fi
+
+# If the user did not specify HOSTCC, use CC
+if test -z "$HOSTCC"; then
+  HOSTCC=$CC
+fi
+
+# If the user did not specify HOSTCFLAGS, use CFLAGS
+if test -z "$HOSTCFLAGS"; then
+  HOSTCFLAGS=$CFLAGS
+fi
+
+# If the user did not specify AR, use ar
+if test -z "$AR"; then
+  AR=ar
+fi
+
+# If the user did not specify PARSECFLAGS, use -Wno-uninitialized.
+# Yacc and Lex generated programs raise comments about uninitialized
+# variables when -Wall is used so turn this warning off for the parse
+# programs.
+if test "$PARSERCFLAGS" = ""; then
+  PARSERCFLAGS=-Wno-uninitialized
+fi
+
 AC_CHECK_FUNC(wordexp, HAVE_WORDEXP="-DHAVE_WORDEXP=1", HAVE_WORDEXP="")
 AC_CHECK_FUNC(glob, HAVE_GLOB="-DHAVE_GLOB=1", HAVE_GLOB="")
 AC_SUBST(HAVE_WORDEXP)
 AC_SUBST(HAVE_GLOB)
+AC_SUBST(HOSTCC)
+AC_SUBST(HOSTCFLAGS)
+AC_SUBST(AR)
+AC_SUBST(INSTALL_LOCAL)
+AC_SUBST(PARSERCFLAGS)
 
 if test "$ARCH" = "alpha"; then
   AC_MSG_CHECKING(for broken alpha assembler)
@@ -76,5 +174,5 @@
 fi
 
 AC_OUTPUT(Makefile depmod/Makefile genksyms/Makefile
-	  insmod/Makefile kerneld/Makefile obj/Makefile util/Makefile
+	  insmod/Makefile $kerneld_Makefile obj/Makefile util/Makefile
 	  man/Makefile)
diff -Nur modutils-2.3.6/depmod/Makefile.in modutils-2.3.7/depmod/Makefile.in
--- modutils-2.3.6/depmod/Makefile.in	Sun Oct 17 18:47:36 1999
+++ modutils-2.3.7/depmod/Makefile.in	Wed Nov 24 13:16:37 1999
@@ -1,4 +1,4 @@
-# $Id: Makefile.in 1.3 Sun, 17 Oct 1999 18:47:36 +1000 keith $
+# $Id: Makefile.in 1.6 Wed, 24 Nov 1999 13:16:37 +1100 keith $
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -7,22 +7,34 @@
 sbindir=@sbindir@
 mandir=@mandir@
 
-ARCH = @ARCH@
-CC = @CC@
-CFLAGS = @CFLAGS@ -Wall
-LDFLAGS = @LDFLAGS@
-INSTALL = @INSTALL@
+ARCH		= @ARCH@
+CC		= @CC@
+CFLAGS		= @CFLAGS@
+LDFLAGS		= @LDFLAGS@
+HOSTCC		= @HOSTCC@
+HOSTCFLAGS	= @HOSTCFLAGS@
+AR		= @AR@
+RANLIB		= @RANLIB@
+INSTALL		= @INSTALL_LOCAL@
 
-DEFS = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@
-DEFS += -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH) $(EXTRA_DEFS)
+DEFSNOARCH = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@ $(EXTRA_DEFS)
+DEFS = $(DEFSNOARCH) -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH)
+OBJS = depmod.o
+
+ifeq (@COMBINE_sparc@,yes)
+DEFSNOARCH += -DCOMBINE_sparc
+OBJS += depmod_64.o
+
+%_64.o: %.c
+	$(CC) $(CFLAGS) $(DEFSNOARCH) -DELF_MACHINE_H='"elf_sparc64.h"' \
+	-DARCH_sparc64 -c -o $@ $<
+endif
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(DEFS) -c -o $@ $<
 
 ######################################################################
 
-OBJS = depmod.o
-
 all: .depend depmod
 
 depmod: $(OBJS) ../util/libutil.a ../obj/libobj.a
@@ -41,7 +53,7 @@
 install install-bin: all
 	$(INSTALL) depmod $(sbindir)
 
-dep depend .depend: $(OBJS:.o=.c)
+dep depend .depend: depmod.c
 	$(CC) -M $(CFLAGS) $(DEFS) $^ > .depend
 
 ifeq (.depend,$(wildcard .depend))
diff -Nur modutils-2.3.6/depmod/depmod.c modutils-2.3.7/depmod/depmod.c
--- modutils-2.3.6/depmod/depmod.c	Tue Oct 12 20:53:21 1999
+++ modutils-2.3.7/depmod/depmod.c	Mon Nov 22 01:38:27 1999
@@ -29,7 +29,7 @@
      Add -r flag: Keith Owens <kaos@ocs.com.au> October 1999.
    */
 
-#ident "$Id: depmod.c 1.3 Tue, 12 Oct 1999 20:53:21 +1000 keith $"
+#ident "$Id: depmod.c 1.4 Mon, 22 Nov 1999 01:38:27 +1100 keith $"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -45,6 +45,7 @@
 #include <syslog.h>
 #include <elf.h>
 #include ELF_MACHINE_H
+#include <sys/utsname.h>
 
 #include "module.h"
 #include "version.h"
@@ -53,6 +54,14 @@
 #include "config.h"
 #include "modstat.h"
 
+#if defined(COMBINE_sparc)
+#if defined(ARCH_sparc)
+#define main depmod32_main
+#elif defined(ARCH_sparc64)
+#define main depmod64_main
+#endif
+#endif
+
 #define ALLOC_MODULE	5000	/* Number of modules we can handle... */
 #define ALLOC_SYM	10000	/* Number of symbols allocated per chunk */
 
@@ -699,3 +708,21 @@
 
 	return ret;
 }
+
+#if defined(COMBINE_sparc) && defined(ARCH_sparc)
+
+#undef main
+
+extern int depmod64_main(int argc, char **argv);
+
+int
+main(int argc, char **argv)
+{
+	struct utsname u;
+  
+	if (!uname (&u) && !strcmp (u.machine, "sparc64"))
+		return depmod64_main(argc, argv);
+	else
+		return depmod32_main(argc, argv);
+}
+#endif
diff -Nur modutils-2.3.6/genksyms/Makefile.in modutils-2.3.7/genksyms/Makefile.in
--- modutils-2.3.6/genksyms/Makefile.in	Sun Oct 17 18:47:36 1999
+++ modutils-2.3.7/genksyms/Makefile.in	Wed Nov 24 13:16:37 1999
@@ -1,4 +1,4 @@
-# $Id: Makefile.in 1.4 Sun, 17 Oct 1999 18:47:36 +1000 keith $
+# $Id: Makefile.in 1.6 Wed, 24 Nov 1999 13:16:37 +1100 keith $
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -7,11 +7,17 @@
 sbindir=@sbindir@
 mandir=@mandir@
 
-ARCH = @ARCH@
-CC = @CC@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-INSTALL = @INSTALL@
+ARCH		= @ARCH@
+CC		= @CC@
+CFLAGS		= @CFLAGS@
+LDFLAGS		= @LDFLAGS@
+HOSTCC		= @HOSTCC@
+HOSTCFLAGS	= @HOSTCFLAGS@
+AR		= @AR@
+RANLIB		= @RANLIB@
+INSTALL		= @INSTALL_LOCAL@
+
+PARSERCFLAGS	= @PARSERCFLAGS@
 
 DEFS = -I. -I$(srcdir) -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@ $(EXTRA_DEFS)
 
@@ -25,15 +31,21 @@
 genksyms: genksyms.o parse.o lex.o ../util/libutil.a
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
+parse.o: parse.c
+	$(CC) $(CFLAGS) $(PARSERCFLAGS) $(DEFS) -c -o $@ $<
+
 parse.c parse.h: parse.y
 	@echo "expect 6 shift/reduce conflicts and 5 reduce/reduce conflicts."
 	bison -o parse.c -dtv $^
 
+lex.o: lex.c
+	$(CC) $(CFLAGS) $(PARSERCFLAGS) $(DEFS) -c -o $@ $<
+
 lex.c: lex.l parse.h
 	flex -o$@ -d $^
 
 crc32.tab: makecrc32.c
-	$(CC) $(CFLAGS) -o makecrc32 $^
+	$(HOSTCC) $(HOSTCFLAGS) -o makecrc32 $^
 	./makecrc32 > $@.tmp
 	mv $@.tmp $@
 
diff -Nur modutils-2.3.6/genksyms/keywords.c modutils-2.3.7/genksyms/keywords.c
--- modutils-2.3.6/genksyms/keywords.c	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.7/genksyms/keywords.c	Sun Nov 21 19:27:16 1999
@@ -2,7 +2,7 @@
 /* Command-line: gperf -a -C -g -H is_reserved_hash -k 1,3,$ -N is_reserved_word -p -t keywords.gperf  */
 
 
-#ident "$Id: keywords.c 1.1 Wed, 25 Aug 1999 16:26:49 +1000 keith $"
+#ident "$Id: keywords.c 1.2 Sun, 21 Nov 1999 19:27:16 +1100 keith $"
 struct resword { const char *name; int token; };
 
 #define MIN_WORD_LENGTH 3
@@ -36,7 +36,7 @@
      15, 20,  5, 65, 10,  0,  0, 25,  5, 65,
      65, 65, 65, 65, 65, 65, 65, 65,
   };
-  return len + hash_table[str[2]] + hash_table[str[0]] + hash_table[str[len - 1]];
+  return len + hash_table[(int)str[2]] + hash_table[(int)str[0]] + hash_table[(int)str[len - 1]];
 }
 
 #ifdef __GNUC__
diff -Nur modutils-2.3.6/include/modstat.h modutils-2.3.7/include/modstat.h
--- modutils-2.3.6/include/modstat.h	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.7/include/modstat.h	Mon Nov 22 01:38:27 1999
@@ -1,6 +1,8 @@
 /*
  * For kernel module status and information
  *
+ * Add module_name_list and l_module_name_list.
+ *   Keith Owens <kaos@ocs.com.au> November 1999.
  * Björn Ekwall <bj0rn@blox.se> February 1999.
  *
  * This file is part of the Linux modutils.
@@ -28,7 +30,7 @@
 
 struct module_stat {
 	char *name;
-	ElfW(Addr) addr;
+	unsigned long addr;
 	unsigned long modstruct; /* COMPAT_2_0! *//* depends on architecture? */
 	unsigned long size;
 	unsigned long flags;
@@ -42,6 +44,8 @@
 
 extern struct module_stat *module_stat;
 extern size_t n_module_stat;
+extern char *module_name_list;
+extern size_t l_module_name_list;
 extern struct module_symbol *ksyms;
 extern size_t nksyms;
 extern int k_new_syscalls;
diff -Nur modutils-2.3.6/include/module.h modutils-2.3.7/include/module.h
--- modutils-2.3.6/include/module.h	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.7/include/module.h	Fri Nov 26 00:00:09 1999
@@ -23,7 +23,7 @@
 #ifndef MODUTILS_MODULE_H
 #define MODUTILS_MODULE_H 1
 
-#ident "$Id: module.h 1.1 Wed, 25 Aug 1999 16:26:49 +1000 keith $"
+#ident "$Id: module.h 1.2 Fri, 26 Nov 1999 00:00:09 +1100 keith $"
 
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
@@ -172,6 +172,7 @@
 #define NEW_MOD_AUTOCLEAN	4
 #define NEW_MOD_VISITED		8
 #define NEW_MOD_USED_ONCE	16
+#define NEW_MOD_INITIALIZING	64
 
 int sys_init_module(const char *name, const struct module *);
 int query_module(const char *name, int which, void *buf, size_t bufsize,
diff -Nur modutils-2.3.6/include/obj.h modutils-2.3.7/include/obj.h
--- modutils-2.3.6/include/obj.h	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.7/include/obj.h	Mon Nov 22 01:38:27 1999
@@ -24,7 +24,7 @@
 #ifndef MODUTILS_OBJ_H
 #define MODUTILS_OBJ_H 1
 
-#ident "$Id: obj.h 1.1 Wed, 25 Aug 1999 16:26:49 +1000 keith $"
+#ident "$Id: obj.h 1.2 Mon, 22 Nov 1999 01:38:27 +1100 keith $"
 
 /* The relocatable object is manipulated using elfin types.  */
 
@@ -42,7 +42,17 @@
 # endif
 #endif
 
-/* For some reason this is missing from libc5.  */
+#if defined(__sparc__) && !defined(__sparc_v9__)
+# if ELFCLASSM == ELFCLASS32
+#  define ObjW(x)  obj32_ ## x
+# else
+#  define ObjW(x)  obj64_ ## x
+# endif
+#else
+#define ObjW(x)    obj_ ## x
+#endif
+
+/* For some reason this is missing from lib5.  */
 #ifndef ELF32_ST_INFO
 # define ELF32_ST_INFO(bind, type)       (((bind) << 4) + ((type) & 0xf))
 #endif
@@ -51,8 +61,8 @@
 # define ELF64_ST_INFO(bind, type)       (((bind) << 4) + ((type) & 0xf))
 #endif
 
-struct obj_string_patch;
-struct obj_symbol_patch;
+struct obj_string_patch_struct;
+struct obj_symbol_patch_struct;
 
 struct obj_section
 {
@@ -88,8 +98,8 @@
   struct obj_section **sections;
   struct obj_section *load_order;
   struct obj_section **load_order_search_start;
-  struct obj_string_patch *string_patches;
-  struct obj_symbol_patch *symbol_patches;
+  struct obj_string_patch_struct *string_patches;
+  struct obj_symbol_patch_struct *symbol_patches;
   int (*symbol_cmp)(const char *, const char *);
   unsigned long (*symbol_hash)(const char *);
   unsigned long local_symtab_size;
@@ -105,17 +115,17 @@
   obj_reloc_unhandled
 };
 
-struct obj_string_patch
+struct obj_string_patch_struct
 {
-  struct obj_string_patch *next;
+  struct obj_string_patch_struct *next;
   int reloc_secidx;
   ElfW(Addr) reloc_offset;
   ElfW(Addr) string_offset;
 };
 
-struct obj_symbol_patch
+struct obj_symbol_patch_struct
 {
-  struct obj_symbol_patch *next;
+  struct obj_symbol_patch_struct *next;
   int reloc_secidx;
   ElfW(Addr) reloc_offset;
   struct obj_symbol *sym;
@@ -123,6 +133,35 @@
 
 
 /* Generic object manipulation routines.  */
+
+#define obj_elf_hash			ObjW(elf_hash)
+#define obj_elf_hash_n			ObjW(elf_hash_n)
+#define obj_add_symbol			ObjW(add_symbol)
+#define obj_find_symbol			ObjW(find_symbol)
+#define obj_symbol_final_value		ObjW(symbol_final_value)
+#define obj_set_symbol_compare		ObjW(set_symbol_compare)
+#define obj_find_section		ObjW(find_section)
+#define obj_insert_section_load_order	ObjW(insert_section_load_order)
+#define obj_create_alloced_section	ObjW(create_alloced_section)
+#define obj_create_alloced_section_first \
+					ObjW(create_alloced_section_first)
+#define obj_extend_section		ObjW(extend_section)
+#define obj_string_patch		ObjW(string_patch)
+#define obj_symbol_patch		ObjW(symbol_patch)
+#define obj_check_undefineds 		ObjW(check_undefineds)
+#define obj_allocate_commons		ObjW(allocate_commons)
+#define obj_load_size			ObjW(load_size)
+#define obj_relocate			ObjW(relocate)
+#define obj_load			ObjW(load)
+#define obj_free			ObjW(free)
+#define obj_create_image		ObjW(create_image)
+#define arch_new_file			ObjW(arch_new_file)
+#define arch_new_section		ObjW(arch_new_section)
+#define arch_new_symbol			ObjW(arch_new_symbol)
+#define arch_apply_relocation		ObjW(arch_apply_relocation)
+#define arch_create_got			ObjW(arch_create_got)
+#define arch_init_module		ObjW(arch_init_module)
+#define arch_load_proc_section		ObjW(arch_load_proc_section)
 
 unsigned long obj_elf_hash(const char *);
 
diff -Nur modutils-2.3.6/include/version.h modutils-2.3.7/include/version.h
--- modutils-2.3.6/include/version.h	Mon Oct 18 12:38:40 1999
+++ modutils-2.3.7/include/version.h	Mon Oct 18 17:56:33 1999
@@ -1 +1 @@
-#define MODUTILS_VERSION "2.3.6"
+#define MODUTILS_VERSION "2.3.7"
diff -Nur modutils-2.3.6/insmod/Makefile.in modutils-2.3.7/insmod/Makefile.in
--- modutils-2.3.6/insmod/Makefile.in	Sun Oct 17 18:47:36 1999
+++ modutils-2.3.7/insmod/Makefile.in	Thu Nov 25 23:47:48 1999
@@ -1,4 +1,4 @@
-# $Id: Makefile.in 1.8 Sun, 17 Oct 1999 18:47:36 +1000 keith $
+# $Id: Makefile.in 1.12 Thu, 25 Nov 1999 23:47:48 +1100 keith $
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -7,28 +7,49 @@
 sbindir=@sbindir@
 mandir=@mandir@
 
-ARCH = @ARCH@
-CC = @CC@
-CFLAGS = @CFLAGS@ -Wall
-LDFLAGS = @LDFLAGS@
-INSTALL = @INSTALL@
+ARCH		= @ARCH@
+CC		= @CC@
+CFLAGS		= @CFLAGS@
+LDFLAGS		= @LDFLAGS@
+HOSTCC		= @HOSTCC@
+HOSTCFLAGS	= @HOSTCFLAGS@
+AR		= @AR@
+RANLIB		= @RANLIB@
+INSTALL		= @INSTALL_LOCAL@
 
-DEFS = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@
-DEFS += -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH) $(EXTRA_DEFS)
+DEFSNOARCH = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@ $(EXTRA_DEFS)
+DEFS = $(DEFSNOARCH) -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH)
 
-TARGETS = insmod modprobe rmmod lsmod ksyms modinfo
+TARGETS = insmod modprobe rmmod lsmod ksyms modinfo @insmod_static@
 
 # COMB is the list of utilities to combine with insmod into one executable
 COMB = @COMBINE_rmmod@ @COMBINE_modprobe@
 COMBDEFS = $(addprefix -DCOMBINE_, $(COMB))
 COMBOBJS = $(addsuffix .o, $(COMB))
 
+INSMODOBJS = insmod.o
+MODINFOOBJS = modinfo.o
+
+ifeq (@COMBINE_sparc@,yes)
+INSMODOBJS += insmod_64.o
+MODINFOOBJS += modinfo_64.o
+DEFSNOARCH += -DCOMBINE_sparc
+endif
+
+INSMODOBJS += $(COMBOBJS)
+
 #=====================================================================
 
 # Rule for building "to-be-combined" modutils object files
 %.o: %.c
 	$(CC) $(CFLAGS) $(DEFS) $(COMBDEFS) -c -o $@ $<
 
+ifeq (@COMBINE_sparc@,yes)
+%_64.o: %.c
+	$(CC) $(CFLAGS) $(DEFSNOARCH) -DELF_MACHINE_H='"elf_sparc64.h"' \
+	-DARCH_sparc64 $(COMBDEFS) -c -o $@ $<
+endif
+
 # Rule for building "normal" modutils executables (non-combined)
 %: %.c ../util/libutil.a
 	$(CC) $(CFLAGS) $(DEFS) -o $@ $< ../util/libutil.a $(LDFLAGS)
@@ -37,17 +58,17 @@
 
 all: .depend $(TARGETS)
 
-insmod: insmod.o $(COMBOBJS) ../obj/libobj.a ../util/libutil.a
+insmod: $(INSMODOBJS) ../obj/libobj.a ../util/libutil.a
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
-insmod.static: insmod.o $(COMBOBJS) ../obj/libobj.a ../util/libutil.a
+insmod.static: $(INSMODOBJS) ../obj/libobj.a ../util/libutil.a
 	$(CC) -static $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
 $(COMB): insmod
 	ln -sf $^ $@
 
-modinfo: modinfo.c ../obj/libobj.a ../util/libutil.a
-	$(CC) $(CFLAGS) $(DEFS) -o $@ $^ $(LDFLAGS)
+modinfo: $(MODINFOOBJS) ../obj/libobj.a ../util/libutil.a
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
 install install-bin: all
 	@set -x;\
@@ -65,7 +86,7 @@
 distclean: realclean
 	rm -f Makefile
 
-dep depend .depend: $(addsuffix .c, $(TARGETS))
+dep depend .depend: $(addsuffix .c, $(filter-out insmod.static, $(TARGETS)))
 	$(CC) -M $(CFLAGS) $(DEFS) $^ > .depend
 
 ifeq (.depend,$(wildcard .depend))
diff -Nur modutils-2.3.6/insmod/insmod.c modutils-2.3.7/insmod/insmod.c
--- modutils-2.3.6/insmod/insmod.c	Tue Oct 12 20:53:21 1999
+++ modutils-2.3.7/insmod/insmod.c	Mon Nov 22 01:38:27 1999
@@ -37,7 +37,7 @@
      Add -r flag: Keith Owens <kaos@ocs.com.au> October 1999.
    */
 
-#ident "$Id: insmod.c 1.5 Tue, 12 Oct 1999 20:53:21 +1000 keith $"
+#ident "$Id: insmod.c 1.6 Mon, 22 Nov 1999 01:38:27 +1100 keith $"
 
 #include <sys/types.h>
 #include <stdlib.h>
@@ -51,6 +51,7 @@
 #include <getopt.h>
 #include <sys/stat.h>
 #include <sys/file.h>
+#include <sys/utsname.h>
 
 #include "module.h"
 #include "obj.h"
@@ -60,7 +61,13 @@
 #include "modstat.h"
 #include "config.h"
 
-#if defined(COMBINE_rmmod) || defined(COMBINE_modprobe) || defined(COMBINE_ksyms) || defined(COMBINE_lsmod)
+#if defined(COMBINE_sparc)
+#if defined(ARCH_sparc)
+#define main insmod32_main
+#elif defined(ARCH_sparc64)
+#define main insmod64_main
+#endif
+#elif defined(COMBINE_rmmod) || defined(COMBINE_modprobe) || defined(COMBINE_ksyms) || defined(COMBINE_lsmod)
 #define main insmod_main
 #endif
 
@@ -68,12 +75,12 @@
 
 /*======================================================================*/
 
-int flag_force_load = 0;
-int flag_silent_poll = 0;
-int flag_verbose = 0;
-int flag_export = 1;
-int flag_load_map = 0;
-int flag_ksymoops = 1;
+static int flag_force_load = 0;
+static int flag_silent_poll = 0;
+static int flag_verbose = 0;
+static int flag_export = 1;
+static int flag_load_map = 0;
+static int flag_ksymoops = 1;
 
 static int n_ext_modules_used;
 static int m_has_modinfo;
@@ -267,9 +274,9 @@
 
 		lprintf("%-16s%08lx  %0*lx  2**%d",
 			sec->name,
-			(tgt_long)sec->header.sh_size,
+			(long)sec->header.sh_size,
 			(int) (2 * sizeof(void *)),
-			(tgt_long)sec->header.sh_addr,
+			(long)sec->header.sh_addr,
 			a);
 	}
 
@@ -629,9 +636,9 @@
 				8+			/* length in dec */
 				1;			/* nul */
 			name = xmalloc(l);
-			snprintf(name, l, "%s%s_S%s_L%d",
+			snprintf(name, l, "%s%s_S%s_L%ld",
 				 symprefix, m_name, sec->name,
-				 sec->header.sh_size);
+				 (long)sec->header.sh_size);
 			sym = obj_add_symbol(f, name, -1, ELFW(ST_INFO) (STB_GLOBAL, STT_NOTYPE),
 					     sec->idx, sec->header.sh_addr, 0);
 			if (use_ksymtab)
@@ -1390,6 +1397,28 @@
 	return exit_status;
 }
 
+#if defined(COMBINE_sparc) && defined(ARCH_sparc)
+extern int insmod64_main(int argc, char **argv);
+
+#undef main
+
+#if defined(COMBINE_rmmod) || defined(COMBINE_modprobe) || defined(COMBINE_ksyms) || defined(COMBINE_lsmod)
+#define main insmod_main
+#endif
+
+int main(int argc, char **argv)
+{
+	struct utsname u;
+	  
+	if (!uname (&u) && !strcmp (u.machine, "sparc64"))
+		return insmod64_main(argc, argv);
+	else
+		return insmod32_main(argc, argv);
+}
+
+#endif
+
+#if !defined(COMBINE_sparc) || !defined(ARCH_sparc64)
 #if defined(COMBINE_rmmod) || defined(COMBINE_modprobe) || defined(COMBINE_ksyms) || defined(COMBINE_lsmod)
 
 #undef main
@@ -1413,7 +1442,7 @@
 
 	p = p ? p + 1 : argv[0];
 
-	if (strcmp(p, "insmod") == 0)
+	if (strcmp(p, "insmod") == 0 || strcmp(p, "insmod.static") == 0)
 		return insmod_main(argc, argv);
 #ifdef COMBINE_modprobe
 	else if (strcmp(p, "modprobe") == 0)
@@ -1452,3 +1481,4 @@
 }
 
 #endif /* Combined executables */
+#endif
diff -Nur modutils-2.3.6/insmod/insmod_ksymoops_clean modutils-2.3.7/insmod/insmod_ksymoops_clean
--- modutils-2.3.6/insmod/insmod_ksymoops_clean	Tue Oct 12 20:54:30 1999
+++ modutils-2.3.7/insmod/insmod_ksymoops_clean	Mon Nov 22 00:45:52 1999
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Delete saved ksyms and modules not accessed in 2 days
-if [ -d /var/log/ksymoops ]
+if [ -d /var/log/ksymoops -a -r /proc/ksyms ]
 then
 	set -e
 	# Make sure there is always at least one version
diff -Nur modutils-2.3.6/insmod/lsmod.c modutils-2.3.7/insmod/lsmod.c
--- modutils-2.3.6/insmod/lsmod.c	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.7/insmod/lsmod.c	Fri Nov 26 00:00:09 1999
@@ -21,7 +21,7 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ident "$Id: lsmod.c 1.1 Wed, 25 Aug 1999 16:26:49 +1000 keith $"
+#ident "$Id: lsmod.c 1.2 Fri, 26 Nov 1999 00:00:09 +1100 keith $"
 
 #include <stdio.h>
 #include <unistd.h>
@@ -74,6 +74,8 @@
 
 		if (m->flags & NEW_MOD_DELETED)
 			fputs(" (deleted)", stdout);
+		else if (m->flags & NEW_MOD_INITIALIZING)
+			fputs(" (initializing)", stdout);
 		else if (!(m->flags & NEW_MOD_RUNNING))
 			fputs(" (uninitialized)", stdout);
 		else {
diff -Nur modutils-2.3.6/insmod/modinfo.c modutils-2.3.7/insmod/modinfo.c
--- modutils-2.3.6/insmod/modinfo.c	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.7/insmod/modinfo.c	Mon Nov 22 01:38:27 1999
@@ -27,7 +27,7 @@
  * unified module path handling: Bjorn Ekwall <bj0rn@blox.se> February 1999
  */
 
-#ident "$Id: modinfo.c 1.1 Wed, 25 Aug 1999 16:26:49 +1000 keith $"
+#ident "$Id: modinfo.c 1.2 Mon, 22 Nov 1999 01:38:27 +1100 keith $"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -37,6 +37,7 @@
 #include <unistd.h>
 #include <sys/param.h>
 #include <sys/stat.h>
+#include <sys/utsname.h>
 
 #include "module.h"
 #include "obj.h"
@@ -44,6 +45,14 @@
 #include "version.h"
 #include "config.h"
 
+#if defined(COMBINE_sparc)
+#if defined(ARCH_sparc)
+#define main modinfo32_main
+#elif defined(ARCH_sparc64)
+#define main modinfo64_main
+#endif
+#endif
+
 static char *get_modinfo_value(struct obj_file *f, const char *key)
 {
 	struct obj_section *sec;
@@ -363,3 +372,21 @@
 
 	return 0;
 }
+
+#if defined(COMBINE_sparc) && defined(ARCH_sparc)
+
+#undef main
+
+extern int modinfo64_main(int argc, char **argv);
+
+int
+main(int argc, char **argv)
+{
+	struct utsname u;
+  
+	if (!uname (&u) && !strcmp (u.machine, "sparc64"))
+		return modinfo64_main(argc, argv);
+	else
+		return modinfo32_main(argc, argv);
+}
+#endif
diff -Nur modutils-2.3.6/insmod/rmmod.c modutils-2.3.7/insmod/rmmod.c
--- modutils-2.3.6/insmod/rmmod.c	Wed Aug 25 17:22:12 1999
+++ modutils-2.3.7/insmod/rmmod.c	Sun Nov 21 15:19:53 1999
@@ -24,9 +24,10 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ident "$Id: rmmod.c 1.2 Wed, 25 Aug 1999 17:22:12 +1000 keith $"
+#ident "$Id: rmmod.c 1.5 Sun, 21 Nov 1999 15:19:53 +1100 keith $"
 
 #include <errno.h>
+#include <malloc.h>
 #include <unistd.h>
 
 #include "module.h"
@@ -49,9 +50,8 @@
 	int j;
 	int ret = 0;
 	int recursive = 0;
-	size_t number;
-	size_t bufsize;
-	char *module_names;
+	size_t n_module_names;
+	char *module_names = NULL;
 
 	error_file = "rmmod";
 
@@ -60,14 +60,10 @@
 	 * gives no indication that any modules were deleted so we have to
 	 * do it the hard way.
 	 */
-	module_names = xmalloc(bufsize = 256);
-	while (query_module(NULL, QM_MODULES, module_names, bufsize, &number)) {
-		if (errno != ENOSPC) {
-			error("QM_MODULES: %m\n");
-			return 0;
-		}
-		module_names = xrealloc(module_names, bufsize = number);
-	}
+	get_kernel_info(0); 
+	module_names = xmalloc(l_module_name_list);
+	memcpy(module_names, module_name_list, l_module_name_list);
+	n_module_names = n_module_stat;
 
 	while ((i = getopt(argc, argv, "arsV")) != EOF)
 		switch (i) {
@@ -75,10 +71,12 @@
 			/* Remove all unused modules and stacks.  */
 			if (delete_module(NULL)) {
 				perror("rmmod");
-				snap_shot(module_names, number);
+				snap_shot(module_names, n_module_names);
+				free(module_names);
 				return 1;
 			}
-			snap_shot(module_names, number);
+			snap_shot(module_names, n_module_names);
+			free(module_names);
 			return 0;
 
 		case 'r':
@@ -111,7 +109,8 @@
 				perror(argv[1]);
 			}
 		}
-		snap_shot(module_names, number);
+		snap_shot(module_names, n_module_names);
+		free(module_names);
 		return ret ? 1 : 0;
 	}
 
@@ -175,6 +174,7 @@
 		}
 	}
 
-	snap_shot(module_names, number);
+	snap_shot(module_names, n_module_names);
+	free(module_names);
 	return ret;
 }
diff -Nur modutils-2.3.6/kerneld/Makefile.in modutils-2.3.7/kerneld/Makefile.in
--- modutils-2.3.6/kerneld/Makefile.in	Sun Oct 17 18:47:36 1999
+++ modutils-2.3.7/kerneld/Makefile.in	Wed Nov 24 13:16:37 1999
@@ -1,4 +1,4 @@
-# $Id: Makefile.in 1.4 Sun, 17 Oct 1999 18:47:36 +1000 keith $
+# $Id: Makefile.in 1.6 Wed, 24 Nov 1999 13:16:37 +1100 keith $
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -7,11 +7,15 @@
 sbindir=@sbindir@
 mandir=@mandir@
 
-ARCH = @ARCH@
-CC = @CC@
-CFLAGS = @CFLAGS@ -Wall
-LDFLAGS = @LDFLAGS@
-INSTALL = @INSTALL@
+ARCH		= @ARCH@
+CC		= @CC@
+CFLAGS		= @CFLAGS@
+LDFLAGS		= @LDFLAGS@
+HOSTCC		= @HOSTCC@
+HOSTCFLAGS	= @HOSTCFLAGS@
+AR		= @AR@
+RANLIB		= @RANLIB@
+INSTALL		= @INSTALL_LOCAL@
 
 DEFS = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@
 DEFS += $(DEBUG) $(NO_GDBM) $(EXTRA_DEFS)
diff -Nur modutils-2.3.6/man/Makefile.in modutils-2.3.7/man/Makefile.in
--- modutils-2.3.6/man/Makefile.in	Fri Oct  8 20:23:53 1999
+++ modutils-2.3.7/man/Makefile.in	Wed Nov 24 13:16:37 1999
@@ -1,4 +1,4 @@
-# $Id: Makefile.in 1.2 Fri, 08 Oct 1999 20:23:53 +1000 keith $
+# $Id: Makefile.in 1.4 Wed, 24 Nov 1999 13:16:37 +1100 keith $
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -7,7 +7,15 @@
 sbindir=@sbindir@
 mandir=@mandir@
 
-INSTALL = @INSTALL@
+ARCH		= @ARCH@
+CC		= @CC@
+CFLAGS		= @CFLAGS@
+LDFLAGS		= @LDFLAGS@
+HOSTCC		= @HOSTCC@
+HOSTCFLAGS	= @HOSTCFLAGS@
+AR		= @AR@
+RANLIB		= @RANLIB@
+INSTALL		= @INSTALL_LOCAL@
 
 ######################################################################
 
diff -Nur modutils-2.3.6/modutils.spec modutils-2.3.7/modutils.spec
--- modutils-2.3.6/modutils.spec	Tue Oct 12 20:53:21 1999
+++ modutils-2.3.7/modutils.spec	Thu Nov 25 23:47:48 1999
@@ -1,13 +1,12 @@
-Summary: Module utilities and kerneld
+Summary: Module utilities
 Name: modutils
-Version: 2.3.5
+Version: 2.3.7
 Release: 1
 Copyright: GPL
 Group: Utilities/System
-Source: modutils-2.3.5.tar.gz
-Source1: kerneld.init
+Source: modutils-%{version}.tar.gz
 ExclusiveOS: Linux
-BuildRoot: /tmp/modutils
+BuildRoot: /var/tmp/modutils-root
 
 %description
 The Linux kernel allows new kernel pieces to be loaded and old ones to
@@ -16,49 +15,42 @@
 other things. This package includes program to load and unload programs
 both automatically and manually.
 
-This set does not include 'request-route' script (still present in
-sources).
+This set does not include 'request-route' script nor kerneld (still
+present in sources).  It is compiled without support for 2.0 kernels,
+if you want modutils to run on old kernels, change --disable-compat-2-0
+to --enable in the spec file.  It includes insmod.static for mkinitrd.
 
 %prep
+%setup
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --disable-kerneld --disable-compat-2-0 --enable-insmod-static
 make dep all
-# make -C insmod insmod.static
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT/{usr/man/man{2,5,8},sbin}
+mkdir -p $RPM_BUILD_ROOT/{usr/man/man{1,2,5,8},sbin}
 make install prefix=$RPM_BUILD_ROOT/usr exec_prefix=$RPM_BUILD_ROOT
-(cd kerneld; 
-make install-scripts prefix=$RPM_BUILD_ROOT/usr exec_prefix=$RPM_BUILD_ROOT
-)
+# kerneld is not compiled by default, it is obsolete for kernel >= 2.1.91.
+# (cd kerneld; 
+# make install-scripts prefix=$RPM_BUILD_ROOT/usr exec_prefix=$RPM_BUILD_ROOT
+# )
 # security hole, works poorly anyway
 rm -f $RPM_BUILD_ROOT/sbin/request-route
-# for f in depmod genksyms insmod insmod.static kerneld ksyms lsmod modinfo ;
-for f in depmod genksyms insmod kerneld ksyms lsmod modinfo ; \
+# Add kerneld to the list below if required
+for f in depmod genksyms insmod insmod.static ksyms lsmod modinfo ; \
 do strip $RPM_BUILD_ROOT/sbin/$f || : ; done
-install -m 755 $RPM_SOURCE_DIR/kerneld.init $RPM_BUILD_ROOT/etc/rc.d/init.d/kerneld
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/chkconfig --add kerneld
-
-%postun
-if [ $1 = 0 ]; then
-    /sbin/chkconfig --del kerneld
-fi
-
 %files
 %defattr(-,root,root)
 %attr(755,root,root)/sbin/depmod
 %attr(755,root,root)/sbin/genksyms
 %attr(755,root,root)/sbin/insmod
-#%attr(755,root,root)/sbin/insmod.static
-%attr(755,root,root)/sbin/kerneld
+%attr(755,root,root)/sbin/insmod.static
+#%attr(755,root,root)/sbin/kerneld
 %attr(755,root,root)/sbin/ksyms
 %attr(755,root,root)/sbin/lsmod
 %attr(755,root,root)/sbin/modinfo
@@ -66,7 +58,7 @@
 %attr(755,root,root)/sbin/rmmod
 %attr(755,root,root)/sbin/insmod_ksymoops_clean
 %attr(755,root,root)/sbin/kernelversion
-# %attr(755,root,root)/sbin/rmmod.static
+%attr(644,root,root)/usr/man/man1/kernelversion.1
 %attr(644,root,root)/usr/man/man2/create_module.2
 %attr(644,root,root)/usr/man/man2/delete_module.2
 %attr(644,root,root)/usr/man/man2/get_kernel_syms.2
@@ -76,12 +68,10 @@
 %attr(644,root,root)/usr/man/man8/depmod.8
 %attr(644,root,root)/usr/man/man8/genksyms.8
 %attr(644,root,root)/usr/man/man8/insmod.8
-%attr(644,root,root)/usr/man/man8/kerneld.8
+#%attr(644,root,root)/usr/man/man8/kerneld.8
 %attr(644,root,root)/usr/man/man8/ksyms.8
 %attr(644,root,root)/usr/man/man8/lsmod.8
 %attr(644,root,root)/usr/man/man8/modinfo.8
 %attr(644,root,root)/usr/man/man8/modprobe.8
 %attr(644,root,root)/usr/man/man8/rmmod.8
-%attr(755,root,root) %config /etc/rc.d/init.d/kerneld
 %attr(-,root,root) %doc COPYING README CREDITS TODO ChangeLog NEWS
-
diff -Nur modutils-2.3.6/obj/Makefile.in modutils-2.3.7/obj/Makefile.in
--- modutils-2.3.6/obj/Makefile.in	Sun Oct 17 18:47:36 1999
+++ modutils-2.3.7/obj/Makefile.in	Wed Nov 24 13:16:37 1999
@@ -1,4 +1,4 @@
-# $Id: Makefile.in 1.3 Sun, 17 Oct 1999 18:47:36 +1000 keith $
+# $Id: Makefile.in 1.6 Wed, 24 Nov 1999 13:16:37 +1100 keith $
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -7,13 +7,18 @@
 sbindir=@sbindir@
 mandir=@mandir@
 
-ARCH = @ARCH@
-CC = @CC@
-CFLAGS = @CFLAGS@ -Wall
-RANLIB = @RANLIB@
+ARCH		= @ARCH@
+CC		= @CC@
+CFLAGS		= @CFLAGS@
+LDFLAGS		= @LDFLAGS@
+HOSTCC		= @HOSTCC@
+HOSTCFLAGS	= @HOSTCFLAGS@
+AR		= @AR@
+RANLIB		= @RANLIB@
+INSTALL		= @INSTALL_LOCAL@
 
-DEFS = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@
-DEFS += -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH) $(EXTRA_DEFS)
+DEFSNOARCH = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@ $(EXTRA_DEFS)
+DEFS = $(DEFSNOARCH) -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH)
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(DEFS) -c -o $@ $<
@@ -22,10 +27,21 @@
 
 all: .depend libobj.a
 
-LIBOBJ_OBJS = obj_common.o obj_load.o obj_reloc.o obj_$(ARCH).o
+LIBOBJ_OBJS := obj_common.o obj_load.o obj_reloc.o obj_$(ARCH).o
+LIBOBJ_SRCS := $(LIBOBJ_OBJS:.o=.c)
+
+ifeq (@COMBINE_sparc@,yes)
+
+LIBOBJ_OBJS += obj_common_64.o obj_load_64.o obj_reloc_64.o obj_sparc64_64.o
+
+%_64.o: %.c
+	$(CC) $(CFLAGS) $(DEFSNOARCH) -DELF_MACHINE_H='"elf_sparc64.h"' \
+	-DARCH_sparc64 -c -o $@ $<
+
+endif
 
 libobj.a: $(LIBOBJ_OBJS)
-	ar rv $@ $?
+	$(AR) rv $@ $?
 	$(RANLIB) $@
 
 clean:
@@ -39,7 +55,7 @@
 
 install-bin: all
 
-dep depend .depend: $(LIBOBJ_OBJS:.o=.c)
+dep depend .depend: $(LIBOBJ_SRCS)
 	$(CC) -M $(CFLAGS) $(DEFS) $^ > .depend
 
 ifeq (.depend,$(wildcard .depend))
diff -Nur modutils-2.3.6/obj/obj_reloc.c modutils-2.3.7/obj/obj_reloc.c
--- modutils-2.3.6/obj/obj_reloc.c	Mon Oct 11 11:54:34 1999
+++ modutils-2.3.7/obj/obj_reloc.c	Mon Nov 22 01:38:27 1999
@@ -19,7 +19,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ident "$Id: obj_reloc.c 1.3 Mon, 11 Oct 1999 11:54:34 +1000 keith $"
+#ident "$Id: obj_reloc.c 1.4 Mon, 22 Nov 1999 01:38:27 +1100 keith $"
 
 #include <string.h>
 #include <assert.h>
@@ -34,7 +34,7 @@
 obj_string_patch(struct obj_file *f, int secidx, ElfW(Addr) offset,
 		 const char *string)
 {
-  struct obj_string_patch *p;
+  struct obj_string_patch_struct *p;
   struct obj_section *strsec;
   size_t len = strlen(string)+1;
   char *loc;
@@ -66,7 +66,7 @@
 obj_symbol_patch(struct obj_file *f, int secidx, ElfW(Addr) offset,
 		 struct obj_symbol *sym)
 {
-  struct obj_symbol_patch *p;
+  struct obj_symbol_patch_struct *p;
 
   p = xmalloc(sizeof(*p));
   p->next = f->symbol_patches;
@@ -366,7 +366,7 @@
 
   if (f->string_patches)
     {
-      struct obj_string_patch *p;
+      struct obj_string_patch_struct *p;
       struct obj_section *strsec;
       ElfW(Addr) strsec_base;
       strsec = obj_find_section(f, ".kstrtab");
@@ -382,7 +382,7 @@
 
   if (f->symbol_patches)
     {
-      struct obj_symbol_patch *p;
+      struct obj_symbol_patch_struct *p;
 
       for (p = f->symbol_patches; p; p = p->next)
 	{
diff -Nur modutils-2.3.6/util/Makefile.in modutils-2.3.7/util/Makefile.in
--- modutils-2.3.6/util/Makefile.in	Sun Oct 17 18:47:36 1999
+++ modutils-2.3.7/util/Makefile.in	Wed Nov 24 13:16:37 1999
@@ -1,4 +1,4 @@
-# $Id: Makefile.in 1.5 Sun, 17 Oct 1999 18:47:36 +1000 keith $
+# $Id: Makefile.in 1.7 Wed, 24 Nov 1999 13:16:37 +1100 keith $
 
 srcdir=@srcdir@
 VPATH=@srcdir@
@@ -7,10 +7,15 @@
 sbindir=@sbindir@
 mandir=@mandir@
 
-ARCH = @ARCH@
-CC = @CC@
-CFLAGS = @CFLAGS@ -Wall
-RANLIB = @RANLIB@
+ARCH		= @ARCH@
+CC		= @CC@
+CFLAGS		= @CFLAGS@
+LDFLAGS		= @LDFLAGS@
+HOSTCC		= @HOSTCC@
+HOSTCFLAGS	= @HOSTCFLAGS@
+AR		= @AR@
+RANLIB		= @RANLIB@
+INSTALL		= @INSTALL_LOCAL@
 
 DEFS = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@
 DEFS += -DELF_MACHINE_H='"elf_$(ARCH).h"' -DARCH_$(ARCH) $(EXTRA_DEFS)
@@ -30,7 +35,7 @@
 	$(CC) $(CFLAGS) $(DEFS) @HAVE_WORDEXP@ @HAVE_GLOB@ -c $<
 
 libutil.a: $(OBJS)
-	ar rv $@ $?
+	$(AR) rv $@ $?
 	$(RANLIB) $@
 
 clean:
diff -Nur modutils-2.3.6/util/modstat.c modutils-2.3.7/util/modstat.c
--- modutils-2.3.6/util/modstat.c	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.7/util/modstat.c	Sun Nov 21 15:19:53 1999
@@ -1,6 +1,8 @@
 /*
  * Get kernel symbol table(s) and other relevant module info.
  *
+ * Add module_name_list and l_module_name_list.
+ *   Keith Owens <kaos@ocs.com.au> November 1999.
  * Björn Ekwall <bj0rn@blox.se> in February 1999 (C)
  * Initial work contributed by Richard Henderson <rth@tamu.edu>
  *
@@ -35,11 +37,13 @@
 
 struct module_stat *module_stat;
 size_t n_module_stat;
+char *module_name_list;
+size_t l_module_name_list;
 struct module_symbol *ksyms;
 size_t nksyms;
 int k_new_syscalls;
 
-static void *scratch;
+static void *old_kernsym;
 
 /************************************************************************/
 static void drop(void)
@@ -61,14 +65,19 @@
 		module_stat = NULL;
 		n_module_stat = 0;
 	}
+	if (module_name_list) {
+		free(module_name_list);
+		module_name_list = NULL;
+		l_module_name_list = 0;
+	}
 	if (ksyms) {
 		free(ksyms);
 		ksyms = NULL;
 		nksyms = 0;
 	}
-	if (scratch) {
-		free(scratch);
-		scratch = NULL;
+	if (old_kernsym) {
+		free(old_kernsym);
+		old_kernsym = NULL;
 	}
 }
 
@@ -100,7 +109,8 @@
 		}
 		module_names = xrealloc(module_names, bufsize = ret);
 	}
-	scratch = module_names;
+	module_name_list = module_names;
+	l_module_name_list = bufsize;
 	n_module_stat = nmod = ret;
 	module_stat = modules = xmalloc(nmod * sizeof(struct module_stat));
 	memset(modules, 0, nmod * sizeof(struct module_stat));
@@ -242,13 +252,15 @@
 	int i;
 
 	drop();
+	module_name_list = xmalloc(1);
+	*module_name_list = '\0';
 
 	if ((nkernsym = get_kernel_syms(NULL)) < 0) {
 		error("get_kernel_syms: %m");
 		return 0;
 	}
 	kernsym = k = xmalloc(nkernsym * sizeof(struct old_kernel_sym));
-	scratch = kernsym;
+	old_kernsym = kernsym;
 	if (get_kernel_syms(kernsym) != nkernsym) {
 		error("inconsistency with get_kernel_syms -- is someone else "
 		      "playing with modules?");
@@ -259,8 +271,16 @@
 	/* Number of modules */
 	for (k = kernsym, nmod = 0, i = 0; i < nkernsym; ++i, ++k) {
 		if (k->name[0] == '#') {
-			if (k->name[1])
+			if (k->name[1]) {
 				++nmod;
+				i = strlen(k->name+1) + 1;
+				module_name_list =
+					xrealloc(module_name_list,
+					l_module_name_list + i);
+				strcpy(module_name_list+l_module_name_list,
+					k->name+1);
+				l_module_name_list += i;	/* NUL separated strings */
+			}
 			else
 				break;
 		}
diff -Nur modutils-2.3.6/util/snap_shot.c modutils-2.3.7/util/snap_shot.c
--- modutils-2.3.6/util/snap_shot.c	Wed Aug 25 18:01:54 1999
+++ modutils-2.3.7/util/snap_shot.c	Mon Nov 22 00:58:28 1999
@@ -20,7 +20,7 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
   */
 
-#ident "$Id: snap_shot.c 1.1 Wed, 25 Aug 1999 18:01:54 +1000 keith $"
+#ident "$Id: snap_shot.c 1.4 Mon, 22 Nov 1999 00:58:28 +1100 keith $"
 
 #include <errno.h>
 #include <stdio.h>
@@ -28,16 +28,18 @@
 #include <unistd.h>
 
 #include "module.h"
+#include "obj.h"
+#include "modstat.h"
 #include "util.h"
 
 /* If snap_dir exists, take a snap shot of ksyms and modules to snap_dir.
  * Prefix the files with the equivalent of
  * date +%Y%m%d%T%M%S | sed -e 's/://g'
  */
-void snap_shot(const char *module_names, int number)
+void snap_shot(const char *module_names, int n_module_names)
 {
 	static char snap_dir[] = "/var/log/ksymoops";
-	char wd[sizeof(snap_dir)+2], file[] = "ccyymmddhhmmss.modules", buffer[4096];
+	char file[] = "ccyymmddhhmmss.modules", buffer[4096];
 	static char *infile[] = { "/proc/ksyms", "/proc/modules" };
 	static char *suffix[] = {       "ksyms",       "modules" };
 	struct tm *local;
@@ -50,43 +52,33 @@
 		 * Otherwise auto cleanup takes a snap shot every time
 		 * and ends up with a large snap shot directory.
 		 */
-		size_t ret;
-		size_t bufsize;
 		char *new_module_names;
-		new_module_names = xmalloc(bufsize = 256);
-		while (query_module(NULL, QM_MODULES, new_module_names, bufsize, &ret)) {
-			if (errno != ENOSPC) {
-				error("QM_MODULES: %m\n");
-				return;
-			}
-			new_module_names = xrealloc(new_module_names, bufsize = ret);
-		}
-		if (number && ret == number) {
-			while (number) {
+		size_t n_new_module_names;
+		get_kernel_info(0);
+		new_module_names = module_name_list;
+		n_new_module_names = n_module_stat;
+		if (n_module_names && n_new_module_names == n_module_names) {
+			while (n_module_names) {
 				if (strcmp(module_names, new_module_names))
 					break;	/* difference detected */
 				i = strlen(module_names) + 1;
 				module_names += i;
 				new_module_names += i;
-				--number;
+				--n_module_names;
 			}
 		}
-		if (!number)
+		if (!n_module_names)
 			return;	/* no difference, no need for snap shot */
 	}
 
 	if (chdir(snap_dir))
 		return;
-	if (!getcwd(wd, sizeof(wd)) || strcmp(snap_dir, wd)) {
-		error("%s must be a real directory", snap_dir);
-		return;
-	}
 	t = time(NULL);
 	local = localtime(&t);
 	for (i = 0; i < sizeof(infile)/sizeof(infile[0]); ++i) {
 		snprintf(file, sizeof(file), "%04d%02d%02d%02d%02d%02d.%s",
 			local->tm_year+1900,
-			local->tm_mon,
+			local->tm_mon + 1,
 			local->tm_mday,
 			local->tm_hour,
 			local->tm_min,