diff -Nur modutils-2.3.14/ChangeLog modutils-2.3.15/ChangeLog --- modutils-2.3.14/ChangeLog Mon Aug 7 01:07:12 2000 +++ modutils-2.3.15/ChangeLog Wed Aug 16 15:00:04 2000 @@ -1,3 +1,27 @@ +2000-08-16 Keith Owens + + modutils 2.3.15 + + * Fix spelling and typos in man pages. + * Add maintainer entry. + * spec file changes, newer rpm automatically gzips man pages. + Horst von Brand. + * Do not install kdstat and kerneld manual pages unless kerneld is + compiled. Noticed by Debian. + * config.c needs explicit include of on older libc.c. + Noticed by everybody :(. + * Ensure that sbindir exists before install binaries. Noticed by + Wolfgang Weisselberg. + * Sparc 32/64 fixes, Horst von Brand, Jakub Jelinek. + * Set the default value of use-syscall based on a config check for the + presence of query_module() in libc. Requested by Richard Gooch. + * Add a config option for the default value of root-check. insmod -r is + now a toggle. Requested by Richard Gooch. + * Replace install -d with mkdir -p. install -d has an undocumented + feature, it silently changes directory permissions to 755 even if the + directory already exists! + * MIPS ELF patch by Maciej W. Rozycki. + 2000-08-07 Keith Owens modutils 2.3.14 diff -Nur modutils-2.3.14/INSTALL modutils-2.3.15/INSTALL --- modutils-2.3.14/INSTALL Mon Jul 10 23:07:33 2000 +++ modutils-2.3.15/INSTALL Wed Aug 16 14:45:31 2000 @@ -46,6 +46,8 @@ used. This option is included on the compilation of those programs to suppress the warnings, default is "-Wno-uninitialized". +MKDIR The command to create a directory, including all its parents. + Default is "mkdir -p". configure takes ten modutils specific options, as well as the standard configure options. @@ -171,6 +173,6 @@ kernel 2.0. -Keith Owens -Richard Henderson -Björn Ekwall +Keith Owens (current maintainer) +Richard Henderson (previous maintainer) +Björn Ekwall (previous maintainer) diff -Nur modutils-2.3.14/Makefile.common.in modutils-2.3.15/Makefile.common.in --- modutils-2.3.14/Makefile.common.in Sun Jul 9 21:35:18 2000 +++ modutils-2.3.15/Makefile.common.in Wed Aug 16 14:45:31 2000 @@ -15,6 +15,7 @@ INSTALL = @INSTALL_LOCAL@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ +MKDIR = @MKDIR@ PARSERCFLAGS = @PARSERCFLAGS@ RANLIB = @RANLIB@ STRIP = @STRIP@ diff -Nur modutils-2.3.14/Makefile.in modutils-2.3.15/Makefile.in --- modutils-2.3.14/Makefile.in Sun Jul 9 05:30:18 2000 +++ modutils-2.3.15/Makefile.in Sun Aug 13 06:45:56 2000 @@ -1,4 +1,4 @@ -# $Id: Makefile.in 1.6 Sun, 09 Jul 2000 05:30:18 -0700 kaos $ +# $Id: Makefile.in 1.7 Sun, 13 Aug 2000 06:45:56 -0700 kaos $ VPATH = @srcdir@ srcdir = @srcdir@ @@ -6,12 +6,18 @@ TARGETS = all install-bin clean distclean realclean dep depend SUBDIRS = util obj insmod genksyms depmod @kerneld_SUBDIR@ +ifneq (@kerneld_SUBDIR@,) + SUBDIRS += man_kerneld +endif $(TARGETS):: @for i in $(SUBDIRS); do $(MAKE) -C $$i $@ ; done distclean realclean install-man:: $(MAKE) -C man $@ +ifneq (@kerneld_SUBDIR@,) + $(MAKE) -C man_kerneld $@ +endif install: install-bin install-man diff -Nur modutils-2.3.14/README modutils-2.3.15/README --- modutils-2.3.14/README Mon Jul 24 23:31:08 2000 +++ modutils-2.3.15/README Sun Aug 13 06:45:56 2000 @@ -19,6 +19,6 @@ If you are planning on using devfs, you need to upgrade to at least modutils 2.3.12. -Keith Owens -Richard Henderson -Björn Ekwall +Keith Owens (current maintainer) +Richard Henderson (previous maintainer) +Björn Ekwall (previous maintainer) diff -Nur modutils-2.3.14/configure modutils-2.3.15/configure --- modutils-2.3.14/configure Mon Jul 10 22:34:54 2000 +++ modutils-2.3.15/configure Wed Aug 16 14:45:31 2000 @@ -14,45 +14,49 @@ ac_default_prefix=/usr ac_help="$ac_help --enable-combined Create insmod and rmmod/modprobe/lsmod/ksyms/kallsyms - as one executable. Default is one combined - module, if you --disable-combined you can still - combine individual modules into insmod with - --enable-combined-X." + as one executable. Default is one combined + module, if you --disable-combined you can still + combine individual modules into insmod with + --enable-combined-X." ac_help="$ac_help --enable-combined-rmmod Create insmod and rmmod as one executable - (default)" + (default)" ac_help="$ac_help --enable-combined-modprobe Create insmod and modprobe as one executable - (default)" + (default)" ac_help="$ac_help --enable-combined-lsmod Create insmod and lsmod as one executable - (default)" + (default)" ac_help="$ac_help --enable-combined-ksyms Create insmod and ksyms as one executable - (default)" + (default)" ac_help="$ac_help --enable-combined-kallsyms Create insmod and kallsyms as one executable - (default)" + (default)" ac_help="$ac_help --disable-compat-2-0 Do not create utilities that can run on a Linux - 2.0 system (default)" + 2.0 system (default)" ac_help="$ac_help --disable-kerneld Do not create kerneld binary (default)" ac_help="$ac_help --disable-insmod-static Do not create insmod.static binary (default)" ac_help="$ac_help --enable-common-sparc Make all the utilities work on both sparc32 and - sparc64 as one executable (default on sparc is - yes, default on other architectures is no)" + sparc64 as one executable (default on sparc is + yes, default on other architectures is no)" ac_help="$ac_help --enable-strip Strip binaries during install. Default is no - on IA64 (ski does not like stripped binaries), - yes on other architectures" + on IA64 (ski does not like stripped binaries), + yes on other architectures" ac_help="$ac_help --disable-zlib Do not handle gzipped objects (default)" ac_help="$ac_help - --disable-use-syscall Do not use _syscall(), use libc functions instead - (default)" + --disable-use-syscall Do not use _syscall(), use libc functions instead. + Default is disable the use of syscall but only if + libc supports query_module." +ac_help="$ac_help + --enable-root-check Check that modules are owned by root before + loading (default)" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -625,7 +629,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:629: checking host system type" >&5 +echo "configure:633: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -646,7 +650,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:650: checking target system type" >&5 +echo "configure:654: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -664,7 +668,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:668: checking build system type" >&5 +echo "configure:672: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -796,7 +800,7 @@ enableval="$enable_kerneld" if test "$enableval" = "yes"; then kerneld_SUBDIR=kerneld - kerneld_Makefile=kerneld/Makefile + kerneld_Makefiles="kerneld/Makefile man_kerneld/Makefile" fi fi @@ -867,20 +871,88 @@ fi +# Default for use-syscall depends on the presence of query_module in libc. +echo $ac_n "checking for query_module in -lc""... $ac_c" 1>&6 +echo "configure:877: checking for query_module in -lc" >&5 +ac_lib_var=`echo c'_'query_module | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lc $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + default_syscall=n +else + echo "$ac_t""no" 1>&6 +default_syscall=y +fi + # Check whether --enable-use-syscall or --disable-use-syscall was given. if test "${enable_use_syscall+set}" = set; then enableval="$enable_use_syscall" if test "$enableval" = "yes"; then + USE_SYSCALL="y" +else + USE_SYSCALL="n" +fi +else + USE_SYSCALL="$default_syscall" +fi + +if test "$USE_SYSCALL" = "y"; then cat >> confdefs.h <<\EOF #define CONFIG_USE_SYSCALL 1 EOF - USE_SYSCALL="y" fi + + +# Check whether --enable-root-check or --disable-root-check was given. +if test "${enable_root_check+set}" = set; then + enableval="$enable_root_check" + if test "$enableval" = "yes"; then + cat >> confdefs.h <<\EOF +#define CONFIG_ROOT_CHECK_OFF 0 +EOF + else - USE_SYSCALL="n" + cat >> confdefs.h <<\EOF +#define CONFIG_ROOT_CHECK_OFF 1 +EOF + fi +else + cat >> confdefs.h <<\EOF +#define CONFIG_ROOT_CHECK_OFF 0 +EOF +fi # If the user did not specify CFLAGS, use suitable values for modutils @@ -891,7 +963,7 @@ # 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:895: checking for $ac_word" >&5 +echo "configure:967: 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 @@ -921,7 +993,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:925: checking for $ac_word" >&5 +echo "configure:997: 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 @@ -972,7 +1044,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:976: checking for $ac_word" >&5 +echo "configure:1048: 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 @@ -1004,7 +1076,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1008: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1080: 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. @@ -1015,12 +1087,12 @@ cat > conftest.$ac_ext << EOF -#line 1019 "configure" +#line 1091 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 @@ -1046,12 +1118,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:1050: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1122: 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:1055: checking whether we are using GNU C" >&5 +echo "configure:1127: 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 @@ -1060,7 +1132,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1064: \"$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:1136: \"$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 @@ -1079,7 +1151,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1083: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1155: 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 @@ -1113,7 +1185,7 @@ # 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:1117: checking for $ac_word" >&5 +echo "configure:1189: 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 @@ -1141,7 +1213,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1145: checking whether ln -s works" >&5 +echo "configure:1217: 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 @@ -1202,13 +1274,19 @@ fi +# If the user did not specify MKDIR, use mkdir -p. +if test "$MKDIR" = ""; then + MKDIR="mkdir -p" +fi + + echo $ac_n "checking for wordexp""... $ac_c" 1>&6 -echo "configure:1207: checking for wordexp" >&5 +echo "configure:1285: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_wordexp=yes" else @@ -1254,12 +1332,12 @@ echo $ac_n "checking for glob""... $ac_c" 1>&6 -echo "configure:1258: checking for glob" >&5 +echo "configure:1336: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_glob=yes" else @@ -1306,13 +1384,13 @@ if test "$ARCH" = "alpha"; then echo $ac_n "checking for broken alpha assembler""... $ac_c" 1>&6 -echo "configure:1310: checking for broken alpha assembler" >&5 +echo "configure:1388: checking for broken alpha assembler" >&5 cat > conftest.c <&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1394: \"$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 @@ -1449,7 +1527,7 @@ ac_given_srcdir=$srcdir trap 'rm -fr `echo "Makefile Makefile.common depmod/Makefile genksyms/Makefile - insmod/Makefile $kerneld_Makefile obj/Makefile util/Makefile + insmod/Makefile $kerneld_Makefiles obj/Makefile util/Makefile man/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF diff -Nur modutils-2.3.14/configure.in modutils-2.3.15/configure.in --- modutils-2.3.14/configure.in Mon Jul 10 22:34:54 2000 +++ modutils-2.3.15/configure.in Wed Aug 16 14:45:31 2000 @@ -1,4 +1,4 @@ -dnl $Id: configure.in 1.11.1.8 Mon, 10 Jul 2000 22:34:54 -0700 kaos $ +dnl $Id: configure.in 1.11.1.10 Wed, 16 Aug 2000 14:45:31 -0700 kaos $ AC_INIT(insmod/insmod.c) AC_PREFIX_DEFAULT(/usr) @@ -41,10 +41,10 @@ done AC_ARG_ENABLE(combined, [ --enable-combined Create insmod and rmmod/modprobe/lsmod/ksyms/kallsyms - as one executable. Default is one combined - module, if you --disable-combined you can still - combine individual modules into insmod with - --enable-combined-X.], + as one executable. Default is one combined + module, if you --disable-combined you can still + combine individual modules into insmod with + --enable-combined-X.], [if test "$enableval" = "no"; then for i in rmmod modprobe lsmod ksyms kallsyms do eval COMBINE_$i="" @@ -53,7 +53,7 @@ AC_ARG_ENABLE(combined-rmmod, [ --enable-combined-rmmod Create insmod and rmmod as one executable - (default)], + (default)], [if test "$enableval" = "yes"; then COMBINE_rmmod=rmmod else @@ -63,7 +63,7 @@ AC_ARG_ENABLE(combined-modprobe, [ --enable-combined-modprobe Create insmod and modprobe as one executable - (default)], + (default)], [if test "$enableval" = "yes"; then COMBINE_modprobe=modprobe else @@ -73,7 +73,7 @@ AC_ARG_ENABLE(combined-lsmod, [ --enable-combined-lsmod Create insmod and lsmod as one executable - (default)], + (default)], [if test "$enableval" = "yes"; then COMBINE_lsmod=lsmod else @@ -83,7 +83,7 @@ AC_ARG_ENABLE(combined-ksyms, [ --enable-combined-ksyms Create insmod and ksyms as one executable - (default)], + (default)], [if test "$enableval" = "yes"; then COMBINE_ksyms=ksyms else @@ -93,7 +93,7 @@ AC_ARG_ENABLE(combined-kallsyms, [ --enable-combined-kallsyms Create insmod and kallsyms as one executable - (default)], + (default)], [if test "$enableval" = "yes"; then COMBINE_kallsyms=kallsyms else @@ -103,7 +103,7 @@ AC_ARG_ENABLE(compat-2-0, [ --disable-compat-2-0 Do not create utilities that can run on a Linux - 2.0 system (default)], + 2.0 system (default)], [if test "$enableval" = "yes"; then AC_DEFINE(COMPAT_2_0) fi]) @@ -112,7 +112,7 @@ [ --disable-kerneld Do not create kerneld binary (default)], [if test "$enableval" = "yes"; then kerneld_SUBDIR=kerneld - kerneld_Makefile=kerneld/Makefile + kerneld_Makefiles="kerneld/Makefile man_kerneld/Makefile" fi]) AC_SUBST(kerneld_SUBDIR) @@ -128,8 +128,8 @@ COMMON_sparc=yes AC_ARG_ENABLE(common-sparc, [ --enable-common-sparc Make all the utilities work on both sparc32 and - sparc64 as one executable (default on sparc is - yes, default on other architectures is no)], + sparc64 as one executable (default on sparc is + yes, default on other architectures is no)], [if test "$enableval" = "yes"; then COMMON_sparc=yes else @@ -150,8 +150,8 @@ esac AC_ARG_ENABLE(strip, [ --enable-strip Strip binaries during install. Default is no - on IA64 (ski does not like stripped binaries), - yes on other architectures], + on IA64 (ski does not like stripped binaries), + yes on other architectures], [if test "$enableval" = "yes"; then STRIP=-s else @@ -166,15 +166,31 @@ LIBS="$LIBS -lz" fi]) +# Default for use-syscall depends on the presence of query_module in libc. +AC_CHECK_LIB(c, query_module, [default_syscall=n], [default_syscall=y]) AC_ARG_ENABLE(use-syscall, -[ --disable-use-syscall Do not use _syscall(), use libc functions instead - (default)], +[ --disable-use-syscall Do not use _syscall(), use libc functions instead. + Default is disable the use of syscall but only if + libc supports query_module.], [if test "$enableval" = "yes"; then - AC_DEFINE(CONFIG_USE_SYSCALL) USE_SYSCALL="y" -fi],[USE_SYSCALL="n"]) +else + USE_SYSCALL="n" +fi],[USE_SYSCALL="$default_syscall"]) +if test "$USE_SYSCALL" = "y"; then + AC_DEFINE(CONFIG_USE_SYSCALL) +fi AC_SUBST(USE_SYSCALL) +AC_ARG_ENABLE(root-check, +[ --enable-root-check Check that modules are owned by root before + loading (default)], +[if test "$enableval" = "yes"; then + AC_DEFINE(CONFIG_ROOT_CHECK_OFF, 0) +else + AC_DEFINE(CONFIG_ROOT_CHECK_OFF, 1) +fi],[AC_DEFINE(CONFIG_ROOT_CHECK_OFF, 0)]) + # If the user did not specify CFLAGS, use suitable values for modutils if test "$CFLAGS" = ""; then CFLAGS="-O2 -Wall" @@ -224,6 +240,12 @@ fi AC_SUBST(PARSERCFLAGS) +# If the user did not specify MKDIR, use mkdir -p. +if test "$MKDIR" = ""; then + MKDIR="mkdir -p" +fi +AC_SUBST(MKDIR) + AC_CHECK_FUNC(wordexp, HAVE_WORDEXP="-DHAVE_WORDEXP=1", HAVE_WORDEXP="") AC_SUBST(HAVE_WORDEXP) @@ -259,5 +281,5 @@ fi AC_OUTPUT(Makefile Makefile.common depmod/Makefile genksyms/Makefile - insmod/Makefile $kerneld_Makefile obj/Makefile util/Makefile + insmod/Makefile $kerneld_Makefiles obj/Makefile util/Makefile man/Makefile) diff -Nur modutils-2.3.14/depmod/Makefile.in modutils-2.3.15/depmod/Makefile.in --- modutils-2.3.14/depmod/Makefile.in Sat Jul 8 22:44:35 2000 +++ modutils-2.3.15/depmod/Makefile.in Wed Aug 16 14:45:31 2000 @@ -1,4 +1,4 @@ -# $Id: Makefile.in 1.12 Sat, 08 Jul 2000 22:44:35 -0700 kaos $ +# $Id: Makefile.in 1.14 Wed, 16 Aug 2000 14:45:31 -0700 kaos $ VPATH = @srcdir@ srcdir = @srcdir@ @@ -41,6 +41,7 @@ rm -f Makefile install install-bin: all + $(MKDIR) $(sbindir) $(INSTALL) $(STRIP) depmod $(sbindir) dep depend .depend: depmod.c diff -Nur modutils-2.3.14/depmod/depmod.c modutils-2.3.15/depmod/depmod.c --- modutils-2.3.14/depmod/depmod.c Mon Aug 7 01:09:03 2000 +++ modutils-2.3.15/depmod/depmod.c Sun Aug 13 06:45:56 2000 @@ -37,7 +37,7 @@ Keith Owens April 2000. */ -#ident "$Id: depmod.c 1.18 Mon, 07 Aug 2000 01:09:03 -0700 kaos $" +#ident "$Id: depmod.c 1.19 Sun, 13 Aug 2000 06:45:56 -0700 kaos $" #include #include @@ -116,7 +116,9 @@ static int quiet; /* Don't print errors */ static int showerror; /* Shows undefined symbols */ +#if !defined(COMMON_3264) || defined(ONLY_64) int flag_verbose = 0; +#endif extern int depmod_main(int argc, char **argv); extern int depmod_main_32(int argc, char **argv); diff -Nur modutils-2.3.14/genksyms/Makefile.in modutils-2.3.15/genksyms/Makefile.in --- modutils-2.3.14/genksyms/Makefile.in Sat Jul 8 22:44:35 2000 +++ modutils-2.3.15/genksyms/Makefile.in Wed Aug 16 14:45:31 2000 @@ -1,4 +1,4 @@ -# $Id: Makefile.in 1.10 Sat, 08 Jul 2000 22:44:35 -0700 kaos $ +# $Id: Makefile.in 1.12 Wed, 16 Aug 2000 14:45:31 -0700 kaos $ VPATH = @srcdir@ srcdir = @srcdir@ @@ -50,6 +50,7 @@ rm -f Makefile install install-bin: all + $(MKDIR) $(sbindir) $(INSTALL) $(STRIP) genksyms $(sbindir) # auto-generated dependancies are almost redundant once we add all the diff -Nur modutils-2.3.14/include/elf_mips.h modutils-2.3.15/include/elf_mips.h --- modutils-2.3.14/include/elf_mips.h Tue Aug 24 23:26:49 1999 +++ modutils-2.3.15/include/elf_mips.h Wed Aug 16 15:00:04 2000 @@ -1,5 +1,5 @@ /* Machine-specific elf macros for MIPS. */ -#ident "$Id: elf_mips.h 1.1 Tue, 24 Aug 1999 23:26:49 -0700 keith $" +#ident "$Id: elf_mips.h 1.2 Wed, 16 Aug 2000 15:00:04 -0700 kaos $" #define ELFCLASSM ELFCLASS32 #ifdef __MIPSEB__ @@ -9,7 +9,16 @@ #define ELFDATAM ELFDATA2LSB #endif -#define MATCH_MACHINE(x) (x == EM_MIPS || x == EM_MIPS_RS4_BE) +/* Account for ELF spec changes. */ +#ifndef EM_MIPS_RS3_LE +#ifdef EM_MIPS_RS4_BE +#define EM_MIPS_RS3_LE EM_MIPS_RS4_BE +#else +#define EM_MIPS_RS3_LE 10 +#endif +#endif /* !EM_MIPS_RS3_LE */ + +#define MATCH_MACHINE(x) (x == EM_MIPS || x == EM_MIPS_RS3_LE) #define SHT_RELM SHT_REL #define Elf32_RelM Elf32_Rel diff -Nur modutils-2.3.14/include/version.h modutils-2.3.15/include/version.h --- modutils-2.3.14/include/version.h Tue Aug 1 17:39:12 2000 +++ modutils-2.3.15/include/version.h Fri Aug 11 05:35:17 2000 @@ -1 +1 @@ -#define MODUTILS_VERSION "2.3.14" +#define MODUTILS_VERSION "2.3.15" diff -Nur modutils-2.3.14/insmod/Makefile.in modutils-2.3.15/insmod/Makefile.in --- modutils-2.3.14/insmod/Makefile.in Mon Jul 10 23:48:06 2000 +++ modutils-2.3.15/insmod/Makefile.in Wed Aug 16 14:45:31 2000 @@ -1,4 +1,4 @@ -# $Id: Makefile.in 1.21 Mon, 10 Jul 2000 23:48:06 -0700 kaos $ +# $Id: Makefile.in 1.23 Wed, 16 Aug 2000 14:45:31 -0700 kaos $ VPATH = @srcdir@ srcdir = @srcdir@ @@ -72,8 +72,10 @@ install install-bin: all @set -x;\ for i in $(TARGETS_REAL); do \ + $(MKDIR) $(sbindir); \ $(INSTALL) $(STRIP) $$i $(sbindir); done; for i in $(srcdir)/insmod_ksymoops_clean $(srcdir)/kernelversion; do \ + $(MKDIR) $(sbindir); \ $(INSTALL) $$i $(sbindir); done; for i in $(COMB); do \ ln -sf insmod $(sbindir)/$$i; \ diff -Nur modutils-2.3.14/insmod/insmod.c modutils-2.3.15/insmod/insmod.c --- modutils-2.3.14/insmod/insmod.c Mon Aug 7 01:07:12 2000 +++ modutils-2.3.15/insmod/insmod.c Sun Aug 13 06:45:56 2000 @@ -48,7 +48,7 @@ Keith Owens April 2000. */ -#ident "$Id: insmod.c 1.24 Mon, 07 Aug 2000 01:07:12 -0700 kaos $" +#ident "$Id: insmod.c 1.25 Sun, 13 Aug 2000 06:45:56 -0700 kaos $" #include #include @@ -1315,7 +1315,7 @@ flag_ksymoops = 1; break; case 'r': /* allow root to load non-root modules */ - root_check_off = 1; + root_check_off = !root_check_off; break; case 'P': /* use prefix on crc */ set_ncv_prefix(optarg); diff -Nur modutils-2.3.14/insmod/modinfo.c modutils-2.3.15/insmod/modinfo.c --- modutils-2.3.14/insmod/modinfo.c Sat Jul 8 21:19:11 2000 +++ modutils-2.3.15/insmod/modinfo.c Sun Aug 13 06:45:56 2000 @@ -31,7 +31,7 @@ * Keith Owens December 1999. */ -#ident "$Id: modinfo.c 1.10 Sat, 08 Jul 2000 21:19:11 -0700 kaos $" +#ident "$Id: modinfo.c 1.11 Sun, 13 Aug 2000 06:45:56 -0700 kaos $" #include #include @@ -50,8 +50,8 @@ #include "config.h" extern int show_module_info(const char *filename, const char *fmtstr, int do_parameters); -extern int show_module_info_32(char *filename, char *fmtstr, int do_parameters); -extern int show_module_info_64(char *filename, char *fmtstr, int do_parameters); +extern int show_module_info_32(const char *filename, const char *fmtstr, int do_parameters); +extern int show_module_info_64(const char *filename, const char *fmtstr, int do_parameters); #if defined(COMMON_3264) && defined(ONLY_32) #define SHOW_MODULE_INFO show_module_info_32 /* 32 bit version */ @@ -377,7 +377,7 @@ /* For common 3264 code, add an overall show_module_info, in the 64 bit version. */ #if defined(COMMON_3264) && defined(ONLY_64) -int show_module_info(char *filename, char *fmtstr, int do_parameters) +int show_module_info(const char *filename, const char *fmtstr, int do_parameters) { if (arch64()) return show_module_info_64(filename, fmtstr, do_parameters); diff -Nur modutils-2.3.14/kerneld/Makefile.in modutils-2.3.15/kerneld/Makefile.in --- modutils-2.3.14/kerneld/Makefile.in Sat Jul 8 22:44:35 2000 +++ modutils-2.3.15/kerneld/Makefile.in Wed Aug 16 14:45:31 2000 @@ -1,4 +1,4 @@ -# $Id: Makefile.in 1.9 Sat, 08 Jul 2000 22:44:35 -0700 kaos $ +# $Id: Makefile.in 1.11 Wed, 16 Aug 2000 14:45:31 -0700 kaos $ VPATH = @srcdir@ srcdir = @srcdir@ @@ -42,10 +42,12 @@ install install-bin: all for i in $(PROGS); do \ + $(MKDIR) $(sbindir); \ $(INSTALL) $(STRIP) $$i $(sbindir); \ done install-scripts: + $(MKDIR) $(sbindir) $(INSTALL) request-route.sh $(sbindir)/request-route UTILS= kdstat @@ -62,6 +64,7 @@ install-utils: utils for i in $(UTILS); do \ + $(MKDIR) $(sbindir); \ $(INSTALL) $$i $(sbindir); \ done diff -Nur modutils-2.3.14/man/Makefile.in modutils-2.3.15/man/Makefile.in --- modutils-2.3.14/man/Makefile.in Sat Jul 8 22:44:35 2000 +++ modutils-2.3.15/man/Makefile.in Wed Aug 16 14:45:31 2000 @@ -1,4 +1,4 @@ -# $Id: Makefile.in 1.8 Sat, 08 Jul 2000 22:44:35 -0700 kaos $ +# $Id: Makefile.in 1.9 Wed, 16 Aug 2000 14:45:31 -0700 kaos $ VPATH = @srcdir@ srcdir = @srcdir@ @@ -17,7 +17,7 @@ rm -f $(mandir)/man5/conf.modules.5 for i in $(srcdir)/*.[1-8] ; do \ ext=`echo $$i | sed 's/.*\.//'`; \ - $(INSTALL) -m 755 -d $(mandir)/man$$ext/; \ + $(MKDIR) $(mandir)/man$$ext/; \ $(INSTALL) -m 444 $$i $(mandir)/man$$ext/; \ done diff -Nur modutils-2.3.14/man/create_module.2 modutils-2.3.15/man/create_module.2 --- modutils-2.3.14/man/create_module.2 Thu Apr 13 01:17:59 2000 +++ modutils-2.3.15/man/create_module.2 Fri Aug 11 05:35:17 2000 @@ -1,7 +1,7 @@ .\" Copyright (C) 1996 Free Software Foundation, Inc. -.\" This file is distributed accroding to the GNU General Public License. +.\" This file is distributed according to the GNU General Public License. .\" See the file COPYING in the top level source directory for details. -.\" $Id: create_module.2 1.2 Thu, 13 Apr 2000 01:17:59 -0700 kaos $ +.\" $Id: create_module.2 1.3 Fri, 11 Aug 2000 05:35:17 -0700 kaos $ .\" .TH CREATE_MODULE 2 "26 Dec 1996" Linux "Linux Module Support" .SH NAME diff -Nur modutils-2.3.14/man/delete_module.2 modutils-2.3.15/man/delete_module.2 --- modutils-2.3.14/man/delete_module.2 Thu Apr 13 01:17:59 2000 +++ modutils-2.3.15/man/delete_module.2 Fri Aug 11 05:35:17 2000 @@ -1,7 +1,7 @@ .\" Copyright (C) 1996 Free Software Foundation, Inc. -.\" This file is distributed accroding to the GNU General Public License. +.\" This file is distributed according to the GNU General Public License. .\" See the file COPYING in the top level source directory for details. -.\" $Id: delete_module.2 1.2 Thu, 13 Apr 2000 01:17:59 -0700 kaos $ +.\" $Id: delete_module.2 1.3 Fri, 11 Aug 2000 05:35:17 -0700 kaos $ .\" .TH DELETE_MODULE 2 "26 Dec 1996" Linux "Linux Module Support" .SH NAME diff -Nur modutils-2.3.14/man/depmod.8 modutils-2.3.15/man/depmod.8 --- modutils-2.3.14/man/depmod.8 Wed Apr 19 21:31:49 2000 +++ modutils-2.3.15/man/depmod.8 Fri Aug 11 05:35:17 2000 @@ -2,7 +2,7 @@ .\" Copyright (c) 1995, 1999 Bjorn Ekwall (bj0rn@blox.se) .\" This program is distributed according to the Gnu General Public License. .\" See the file COPYING in the base distribution directory -.\" $Id: depmod.8 1.6 Wed, 19 Apr 2000 21:31:49 -0700 kaos $ +.\" $Id: depmod.8 1.7 Fri, 11 Aug 2000 05:35:17 -0700 kaos $ .\" .TH DEPMOD 8 "October 12, 1999" Linux "Linux Module Support" .SH NAME @@ -96,7 +96,7 @@ .B MODULECONF can also be used to select a different configuration file from the default /etc/modules.conf (or -/etc/conf.modules (depreciated)). +/etc/conf.modules (deprecated)). .TP .I "\-F kernelsyms" When building dependency files for a different kernel than the currently @@ -184,7 +184,7 @@ This is the default strategy, which can be overridden in /etc/modules.conf. .SH FILES .nf -/etc/modules.conf (alternatively but depreciated /etc/modules.conf) +/etc/modules.conf (alternatively but deprecated /etc/modules.conf) /lib/modules/*/modules.dep, /lib/modules/* .fi diff -Nur modutils-2.3.14/man/genksyms.8 modutils-2.3.15/man/genksyms.8 --- modutils-2.3.14/man/genksyms.8 Thu Apr 13 01:17:59 2000 +++ modutils-2.3.15/man/genksyms.8 Fri Aug 11 05:35:17 2000 @@ -2,7 +2,7 @@ .\" Copyright (c) 1997 Linux International .\" This program is distributed according to the Gnu General Public License. .\" See the file COPYING in the kernel source directory /linux -.\" $Id: genksyms.8 1.3 Thu, 13 Apr 2000 01:17:59 -0700 kaos $ +.\" $Id: genksyms.8 1.4 Fri, 11 Aug 2000 05:35:17 -0700 kaos $ .\" .TH GENKSYMS 8 "Sep 10, 1997" Linux "Linux Module Support" .SH NAME @@ -41,7 +41,7 @@ .PP The version information in the kernel normally looks like: .B symbol_R12345678, -where 12345678 is the hexadicimal representation of the CRC. +where 12345678 is the hexadecimal representation of the CRC. .SH OPTIONS .TP 8 .I \-w diff -Nur modutils-2.3.14/man/get_kernel_syms.2 modutils-2.3.15/man/get_kernel_syms.2 --- modutils-2.3.14/man/get_kernel_syms.2 Thu Apr 13 01:17:59 2000 +++ modutils-2.3.15/man/get_kernel_syms.2 Fri Aug 11 05:35:17 2000 @@ -1,7 +1,7 @@ .\" Copyright (C) 1996 Free Software Foundation, Inc. -.\" This file is distributed accroding to the GNU General Public License. +.\" This file is distributed according to the GNU General Public License. .\" See the file COPYING in the top level source directory for details. -.\" $Id: get_kernel_syms.2 1.2 Thu, 13 Apr 2000 01:17:59 -0700 kaos $ +.\" $Id: get_kernel_syms.2 1.3 Fri, 11 Aug 2000 05:35:17 -0700 kaos $ .\" .TH GET_KERNEL_SYMS 2 "26 Dec 1996" Linux "Linux Module Support" .SH NAME @@ -47,5 +47,5 @@ .PP The length of exported symbol names is limited to 59. .PP -Because of these limitations, this system call is depreciated in +Because of these limitations, this system call is deprecated in favor of \fBquery_module\fP. diff -Nur modutils-2.3.14/man/init_module.2 modutils-2.3.15/man/init_module.2 --- modutils-2.3.14/man/init_module.2 Thu Apr 13 01:17:59 2000 +++ modutils-2.3.15/man/init_module.2 Fri Aug 11 05:35:17 2000 @@ -1,7 +1,7 @@ .\" Copyright (C) 1996 Free Software Foundation, Inc. -.\" This file is distributed accroding to the GNU General Public License. +.\" This file is distributed according to the GNU General Public License. .\" See the file COPYING in the top level source directory for details. -.\" $Id: init_module.2 1.2 Thu, 13 Apr 2000 01:17:59 -0700 kaos $ +.\" $Id: init_module.2 1.3 Fri, 11 Aug 2000 05:35:17 -0700 kaos $ .\" .TH INIT_MODULE 2 "26 Dec 1996" "Linux 2.1.17" "Linux Module Support" .SH NAME diff -Nur modutils-2.3.14/man/insmod.8 modutils-2.3.15/man/insmod.8 --- modutils-2.3.14/man/insmod.8 Wed Apr 19 21:31:49 2000 +++ modutils-2.3.15/man/insmod.8 Sun Aug 13 06:45:56 2000 @@ -1,7 +1,7 @@ .\" Copyright (c) 1996 Free Software Foundation, Inc. .\" This program is distributed according to the Gnu General Public License. .\" See the file COPYING in the kernel source directory. -.\" $Id: insmod.8 1.7 Wed, 19 Apr 2000 21:31:49 -0700 kaos $ +.\" $Id: insmod.8 1.9 Sun, 13 Aug 2000 06:45:56 -0700 kaos $ .\" .TH INSMOD 8 "October 12 1999" Linux "Linux Module Support" .SH NAME @@ -27,7 +27,7 @@ .br The environment variable MODULECONF can also be used to select a different configuration file from the default /etc/modules.conf (or -/etc/conf.modules (depreciated)). +/etc/conf.modules (deprecated)). This environment variable will override all the definitions above. .SS OPTIONS .TP @@ -68,13 +68,18 @@ .TP .I "" By default, modutils will reject attempts to use a module that is not -owned by root. Specifying -r will suppress the error and allow root to +owned by root. Specifying -r will toggle the check and allow root to load modules that are not owned by root. +.B Note: +the default value for root check can be changed when modutils is +configured. .TP .I "" .B Use of .I -r -.B is a major security exposure and is not recommended. +\fBto disable root checking or setting the default to "no root check" +at configuration time is a major security exposure and is not +recommended.\fR .TP .I \-s Output everything to \fBsyslog\fP(3) instead of the terminal. @@ -86,7 +91,7 @@ Do and do not export all of the module's external symbols, respectively. The default is for the symbols to be exported. This option is only effective if the module does not explicitly export its own controlled -symbol table, and thus is depreciated. +symbol table, and thus is deprecated. .TP .I "\-Y, -y" Do and do not add ksymoops symbols to ksyms. These symbols are used by @@ -168,7 +173,7 @@ copy, if you do not want it to occur, do not create /var/log/ksymoops. If that directory exists, it should be owned by root and be mode 644 or 600 and you should run this script every day or so. The script below -is installed as insmod_clean_ksymoops. +is installed as insmod_ksymoops_clean. .PP .ne 8 .nf diff -Nur modutils-2.3.14/man/kdstat.8 modutils-2.3.15/man/kdstat.8 --- modutils-2.3.14/man/kdstat.8 Tue Oct 12 04:06:08 1999 +++ modutils-2.3.15/man/kdstat.8 Wed Dec 31 16:00:00 1969 @@ -1,49 +0,0 @@ -.\" $Id: kdstat.8 1.2 Tue, 12 Oct 1999 04:06:08 -0700 keith $ -.TH KDSTAT 8 "Debian GNU/Linux" "DEBIAN" -.SH NAME -kdstat \- program to show and change internal kerneld state -.SH SYNOPSIS -.B kdstat -.br -.B kdstat -.I "[debug|nodebug]" -.br -.B kdstat -.I "[keep|nokeep]" -.br -.B kdstat -.I "flush" -.br -.B kdstat -.I delay=