tags 321503 patch thanks On Tue, Sep 06, 2005 at 08:00:28PM -0700, Steve Langasek wrote: > On Tue, Sep 06, 2005 at 09:47:02AM -0400, Joey Hess wrote: > > Steve Langasek wrote: > > > There are numerous bugs now that make it impossible to rebuild > > > busybox-cvs in either etch or sid. Does anyone really still need this > > > package, or can it be killed off now?
> > Well, busybox-cvs does not have bug #321503 ... Other than that, I am > > not attached to it. :-) > Bah, guess I'd better get a good backtrace then. :) Ok, and here's the patch which fixes busybox insmod on alpha (and fixes up the CONFIG_DEBUG value in debian/rules, so that debugging builds work a little better). -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
diff -u busybox-1.01/debian/changelog busybox-1.01/debian/changelog
--- busybox-1.01/debian/changelog
+++ busybox-1.01/debian/changelog
@@ -1,3 +1,11 @@
+busybox (1:1.01-1.1) unstable; urgency=low
+
+ * Fix bad casts that cause insmod (and probably depmod) to fail on
+ 64-bit architectures (closes: #321503).
+ * Use CONFIG_DEBUG=y in debian/rules, not CONFIG_DEBUG=true
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Tue, 6 Sep 2005 21:07:52 -0700
+
busybox (1:1.01-1) unstable; urgency=low
* New upstream version.
diff -u busybox-1.01/debian/rules busybox-1.01/debian/rules
--- busybox-1.01/debian/rules
+++ busybox-1.01/debian/rules
@@ -11,7 +11,7 @@
EXTRA_VERSION = Debian $(VERSION)
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CONFIG_DEBUG = true
+ CONFIG_DEBUG = y
endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
endif
diff -u busybox-1.01/modutils/obj/depmod.c busybox-1.01/modutils/obj/depmod.c
--- busybox-1.01/modutils/obj/depmod.c
+++ busybox-1.01/modutils/obj/depmod.c
@@ -642,7 +642,7 @@
for (ksym = ksyms; so_far < nksyms; ++so_far, ksym++) {
if (strncmp((char *)ksym->name, "GPLONLY_", 8) == 0)
- ksym->name = (int) ((char *)ksym->name) + 8;
+ ksym->name = (unsigned long) ((char
*)ksym->name) + 8;
assert(n_syms < MAX_MAP_SYM);
symtab[n_syms++] = addsym((char *)ksym->name, mod,
SYM_DEFINED, 0);
}
diff -u busybox-1.01/modutils/obj/insmod.c busybox-1.01/modutils/obj/insmod.c
--- busybox-1.01/modutils/obj/insmod.c
+++ busybox-1.01/modutils/obj/insmod.c
@@ -119,7 +119,7 @@
if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) {
gplonly_seen = 1;
if (gpl)
- s->name = (int)((char *)s->name) + 8;
+ s->name = (unsigned long)((char *)s->name) + 8;
else
continue;
}
signature.asc
Description: Digital signature
