Source: ruby2.1 Version: 2.1.5-3 Severity: important Tags: patch Hi,
ruby2.1 has been building fine for a while, but recently FTBFSing. Please find the patch attached, for both inclusion and forwarding to upstream, which may or may not be needed, depends on whether Andreas Schwab already did so. -- System Information: Debian Release: 8.0 APT prefers unreleased APT policy: (500, 'unreleased'), (500, 'unstable') Architecture: m68k Kernel: Linux 3.16.0-4-m68k Locale: LANG=C, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/lksh Init: sysvinit (via /sbin/init)
diff -Nru ruby2.1-2.1.5/debian/changelog ruby2.1-2.1.5/debian/changelog --- ruby2.1-2.1.5/debian/changelog 2015-04-17 12:50:12.000000000 +0000 +++ ruby2.1-2.1.5/debian/changelog 2015-04-19 12:53:37.000000000 +0000 @@ -1,3 +1,9 @@ +ruby2.1 (2.1.5-3+m68k.1) unreleased; urgency=high + + * Apply m68k patch from Andreas Schwab, fixes FTBFS + + -- Thorsten Glaser <[email protected]> Sun, 19 Apr 2015 14:53:09 +0200 + ruby2.1 (2.1.5-3) unstable; urgency=high * Fix vulnerabiity with overly permissive matching of hostnames in OpenSSL diff -Nru ruby2.1-2.1.5/debian/patches/m68k-fix ruby2.1-2.1.5/debian/patches/m68k-fix --- ruby2.1-2.1.5/debian/patches/m68k-fix 1970-01-01 00:00:00.000000000 +0000 +++ ruby2.1-2.1.5/debian/patches/m68k-fix 2015-04-19 12:52:31.000000000 +0000 @@ -0,0 +1,37 @@ +From [email protected] Mon Oct 20 11:52:21 2014 +From: Andreas Schwab <[email protected]> +Message-ID: <[email protected]> +X-Spam-Status: No, hits=0.000000 required=0.900000 +To: Thorsten Glaser <[email protected]> +Cc: [email protected] +Date: Mon, 20 Oct 2014 13:41:01 +0200 +Subject: Re: ruby2.1 FTBFS + +Please try this patch. + +Andreas. + +--- a/gc.c ++++ b/gc.c +@@ -3497,8 +3497,8 @@ mark_current_machine_context(rb_objspace + rb_gc_mark_locations(th->machine.register_stack_start, th->machine.register_stack_end); + #endif + #if defined(__mc68000__) +- mark_locations_array(objspace, (VALUE*)((char*)STACK_END + 2), +- (STACK_START - STACK_END)); ++ rb_gc_mark_locations((VALUE*)((char*)stack_start + 2), ++ (VALUE*)((char*)stack_end - 2)); + #endif + } + +@@ -3513,6 +3513,10 @@ rb_gc_mark_machine_stack(rb_thread_t *th + #ifdef __ia64 + rb_gc_mark_locations(th->machine.register_stack_start, th->machine.register_stack_end); + #endif ++#if defined(__mc68000__) ++ rb_gc_mark_locations((VALUE*)((char*)stack_start + 2), ++ (VALUE*)((char*)stack_end - 2)); ++#endif + } + + void diff -Nru ruby2.1-2.1.5/debian/patches/series ruby2.1-2.1.5/debian/patches/series --- ruby2.1-2.1.5/debian/patches/series 2015-04-17 12:50:41.000000000 +0000 +++ ruby2.1-2.1.5/debian/patches/series 2015-04-19 12:52:31.000000000 +0000 @@ -1 +1,2 @@ debian-changes +m68k-fix
