diff -Nur modutils-2.4.2/ChangeLog modutils-2.4.3/ChangeLog --- modutils-2.4.2/ChangeLog Tue Jan 23 05:13:16 2001 +++ modutils-2.4.3/ChangeLog Mon Feb 26 15:16:48 2001 @@ -1,3 +1,13 @@ +2001-02-26 Keith Owens + + modutils 2.4.3 + + * putenv() strings must be copied first. + * Not everybody has Elf64_Xword. + * Add stdlib.h to some files for glibc 2.2. + * Redhat modutils-2.4.0-alias.patch. + * Out by one error in alloca. Spotted by Yann Droneaud. + 2001-01-23 Keith Owens modutils 2.4.2 diff -Nur modutils-2.4.2/include/obj.h modutils-2.4.3/include/obj.h --- modutils-2.4.2/include/obj.h Fri Jan 5 12:45:19 2001 +++ modutils-2.4.3/include/obj.h Mon Feb 26 11:59:14 2001 @@ -24,7 +24,7 @@ #ifndef MODUTILS_OBJ_H #define MODUTILS_OBJ_H 1 -#ident "$Id: obj.h 1.1 Fri, 05 Jan 2001 12:45:19 +1100 kaos $" +#ident "$Id: obj.h 1.2 Mon, 26 Feb 2001 11:59:14 +1100 kaos $" /* The relocatable object is manipulated using elfin types. */ @@ -264,7 +264,7 @@ void *ptr; }; union obj_ptr_8 { - Elf64_Xword addr; + uint64_t addr; /* Should be Elf64_Xword but not all users have this yet */ void *ptr; }; diff -Nur modutils-2.4.2/include/version.h modutils-2.4.3/include/version.h --- modutils-2.4.2/include/version.h Fri Jan 12 21:28:45 2001 +++ modutils-2.4.3/include/version.h Wed Jan 31 09:08:07 2001 @@ -1 +1 @@ -#define MODUTILS_VERSION "2.4.2" +#define MODUTILS_VERSION "2.4.3" diff -Nur modutils-2.4.2/insmod/modprobe.c modutils-2.4.3/insmod/modprobe.c --- modutils-2.4.2/insmod/modprobe.c Fri Jan 19 17:26:33 2001 +++ modutils-2.4.3/insmod/modprobe.c Mon Feb 26 12:07:17 2001 @@ -1503,7 +1503,7 @@ {"help", 0, 0, 'h'}, {0, 0, 0, 0} }; - int i, l = 0; + int i, l = 1; char *command; for (i = 0; i < argc; ++i) diff -Nur modutils-2.4.2/modutils.spec modutils-2.4.3/modutils.spec --- modutils-2.4.2/modutils.spec Fri Jan 12 21:28:45 2001 +++ modutils-2.4.3/modutils.spec Wed Jan 31 09:08:07 2001 @@ -1,6 +1,6 @@ Summary: Module utilities Name: modutils -Version: 2.4.2 +Version: 2.4.3 Release: 1 Copyright: GPL Group: Utilities/System diff -Nur modutils-2.4.2/obj/obj_common.c modutils-2.4.3/obj/obj_common.c --- modutils-2.4.2/obj/obj_common.c Fri Jan 5 12:45:19 2001 +++ modutils-2.4.3/obj/obj_common.c Mon Feb 26 15:21:03 2001 @@ -19,8 +19,9 @@ 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_common.c 1.1 Fri, 05 Jan 2001 12:45:19 +1100 kaos $" +#ident "$Id: obj_common.c 1.2 Mon, 26 Feb 2001 15:21:03 +1100 kaos $" +#include #include #include #include diff -Nur modutils-2.4.2/util/alias.h modutils-2.4.3/util/alias.h --- modutils-2.4.2/util/alias.h Fri Jan 5 12:45:19 2001 +++ modutils-2.4.3/util/alias.h Mon Feb 26 12:04:57 2001 @@ -77,6 +77,7 @@ "block-major-44 ftl", /* from David Woodhouse */ "block-major-56 ide-probe-mod", "block-major-57 ide-probe-mod", + "block-major-58 lvm-mod" "block-major-88 ide-probe-mod", "block-major-89 ide-probe-mod", "block-major-90 ide-probe-mod", @@ -128,6 +129,8 @@ "char-major-90 mtdchar", /* from David Woodhouse */ "char-major-99 ppdev", "char-major-107 3dfx", /* from Tigran Aivazian */ + "char-major-108 ppp_generic", + "char-major-109 lvm-mod" "char-major-161 ircomm-tty", "dos msdos", @@ -149,7 +152,7 @@ /* PF_BRIDGE 7 Multiprotocol bridge */ /* PF_AAL5 8 Reserved for Werner's ATM */ /* PF_X25 9 Reserved for X.25 project */ - /* PF_INET6 10 IP version 6 */ + "net-pf-10 off", /* PF_INET6 10 IP version 6 */ /* next two from Thanks! */ "net-pf-17 af_packet", @@ -162,13 +165,20 @@ "cipcb1 cipcb", "cipcb2 cipcb", "cipcb3 cipcb", +#if defined(__s390__) || defined(__s390x__) + "ctc0 ctc", + "ctc1 ctc", + "ctc2 ctc", +#endif "ppp0 ppp", "ppp1 ppp", "scsi_hostadapter off", /* if not in config file */ "slip0 slip", "slip1 slip", "tty-ldisc-1 slip", - "tty-ldisc-3 ppp", + "tty-ldisc-3 ppp_async", + "tty-ldisc-11 irtty", + "tty-ldisc-14 ppp_synctty", "ppp-compress-21 bsd_comp", "ppp-compress-24 ppp_deflate", "ppp-compress-26 ppp_deflate", @@ -178,8 +188,6 @@ #else "parport_lowlevel parport_ax", #endif - - "tty-ldisc-11 irtty", "usbdevfs usbcore", diff -Nur modutils-2.4.2/util/config.c modutils-2.4.3/util/config.c --- modutils-2.4.2/util/config.c Fri Jan 5 12:45:19 2001 +++ modutils-2.4.3/util/config.c Wed Jan 31 09:09:21 2001 @@ -1073,7 +1073,7 @@ arg2 = next_word(arg); meta_expand(arg2, &g, NULL, version, ME_ALL); snprintf(env, sizeof(env), "%s=%s", arg, (g.pathc ? g.pathv[0] : "")); - putenv(env); + putenv(xstrdup(env)); one_err = 0; } diff -Nur modutils-2.4.2/util/xmalloc.c modutils-2.4.3/util/xmalloc.c --- modutils-2.4.2/util/xmalloc.c Fri Jan 5 12:45:19 2001 +++ modutils-2.4.3/util/xmalloc.c Mon Feb 26 15:16:48 2001 @@ -18,7 +18,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: xmalloc.c 1.1 Fri, 05 Jan 2001 12:45:19 +1100 kaos $" +#ident "$Id: xmalloc.c 1.3 Mon, 26 Feb 2001 15:16:48 +1100 kaos $" #include #include "util.h" diff -Nur modutils-2.4.2/util/xrealloc.c modutils-2.4.3/util/xrealloc.c --- modutils-2.4.2/util/xrealloc.c Fri Jan 5 12:45:19 2001 +++ modutils-2.4.3/util/xrealloc.c Mon Feb 26 15:16:48 2001 @@ -18,7 +18,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: xrealloc.c 1.1 Fri, 05 Jan 2001 12:45:19 +1100 kaos $" +#ident "$Id: xrealloc.c 1.3 Mon, 26 Feb 2001 15:16:48 +1100 kaos $" #include #include "util.h" diff -Nur modutils-2.4.2/util/xstrdup.c modutils-2.4.3/util/xstrdup.c --- modutils-2.4.2/util/xstrdup.c Fri Jan 5 12:45:19 2001 +++ modutils-2.4.3/util/xstrdup.c Mon Feb 26 15:16:48 2001 @@ -18,9 +18,10 @@ 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: xstrdup.c 1.1 Fri, 05 Jan 2001 12:45:19 +1100 kaos $" +#ident "$Id: xstrdup.c 1.3 Mon, 26 Feb 2001 15:16:48 +1100 kaos $" #include +#include #include #include "util.h"