diff -Nru aranym-1.0.2/debian/changelog aranym-1.0.2/debian/changelog --- aranym-1.0.2/debian/changelog 2014-10-20 09:32:27.000000000 +0000 +++ aranym-1.0.2/debian/changelog 2018-01-24 22:39:45.000000000 +0000 @@ -1,3 +1,19 @@ +aranym (1.0.2-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix build failure with glibc-2.26 on ARM32. + * Bump standards and debhelper versions. + + -- Matthias Klose Wed, 24 Jan 2018 23:39:45 +0100 + +aranym (1.0.2-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add patch to fix kernel soft-lock up during SCSI driver + initialization when running Linux (Closes: #865928) + + -- John Paul Adrian Glaubitz Sun, 03 Sep 2017 15:53:18 +0200 + aranym (1.0.2-2) unstable; urgency=medium * [1ac234e] Update autoconf configs (Closes: #727321) diff -Nru aranym-1.0.2/debian/compat aranym-1.0.2/debian/compat --- aranym-1.0.2/debian/compat 2014-10-20 09:32:27.000000000 +0000 +++ aranym-1.0.2/debian/compat 2018-01-24 22:39:45.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru aranym-1.0.2/debian/control aranym-1.0.2/debian/control --- aranym-1.0.2/debian/control 2014-10-20 09:32:27.000000000 +0000 +++ aranym-1.0.2/debian/control 2018-01-24 22:39:45.000000000 +0000 @@ -1,10 +1,10 @@ Source: aranym Section: otherosfs -Priority: extra +Priority: optional Maintainer: Antonin Kral Homepage: http://aranym.org/ -Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.16.1~), autotools-dev, bzip2, libsdl1.2-dev, libsdl-image1.2-dev, libmpfr-dev, libusb-1.0-0-dev [!hurd-i386], imagemagick, quilt +Standards-Version: 4.1.3 +Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), autotools-dev, bzip2, libsdl1.2-dev, libsdl-image1.2-dev, libmpfr-dev, libusb-1.0-0-dev [!hurd-i386], imagemagick, quilt Package: aranym Architecture: any diff -Nru aranym-1.0.2/debian/patches/0001-emulate-NCR5380-MODE-register.patch aranym-1.0.2/debian/patches/0001-emulate-NCR5380-MODE-register.patch --- aranym-1.0.2/debian/patches/0001-emulate-NCR5380-MODE-register.patch 1970-01-01 00:00:00.000000000 +0000 +++ aranym-1.0.2/debian/patches/0001-emulate-NCR5380-MODE-register.patch 2017-09-03 13:52:56.000000000 +0000 @@ -0,0 +1,47 @@ +Description: Emulate NCR5380 MODE register + Fixes a kernel soft-lockup with newer Linux kernels + running inside Aranym when initializing SCSI drivers. +Author: Andreas Schwab +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=865928 +Origin: upstream, https://github.com/aranym/aranym/commit/7af1cbfc5257d2c524ffe009790045d687c69fa5 +Bug: +Forwarded: not-needed +Last-Update: 2017-09-03 + +--- aranym-1.0.2.orig/src/include/ncr5380.h ++++ aranym-1.0.2/src/include/ncr5380.h +@@ -33,6 +33,7 @@ class NCR5380 { + uae_u8 hd_count; + + uae_u8 hd_initiator; ++ uae_u8 hd_mode; + + public: + NCR5380(void); +--- aranym-1.0.2.orig/src/ncr5380.cpp ++++ aranym-1.0.2/src/ncr5380.cpp +@@ -120,7 +120,7 @@ NCR5380::~NCR5380(void) + + void NCR5380::reset(void) + { +- hd_count = hd_status = hd_initiator = 0; ++ hd_count = hd_status = hd_initiator = hd_mode = 0; + + D(bug("ncr5380: reset")); + } +@@ -140,6 +140,7 @@ uae_u8 NCR5380::ReadData(uae_u16 control + data = hd_initiator = ICR_ARBITRATION_PROGRESS; + break; + case MODE_REG: ++ data = hd_mode; + break; + case TARGET_COMMAND_REG: + break; +@@ -172,6 +173,7 @@ void NCR5380::WriteData(uae_u16 control, + hd_initiator = data; + break; + case MODE_REG: ++ hd_mode = data; + break; + case TARGET_COMMAND_REG: + break; diff -Nru aranym-1.0.2/debian/patches/glibc-2.26.diff aranym-1.0.2/debian/patches/glibc-2.26.diff --- aranym-1.0.2/debian/patches/glibc-2.26.diff 1970-01-01 00:00:00.000000000 +0000 +++ aranym-1.0.2/debian/patches/glibc-2.26.diff 2018-01-24 22:39:42.000000000 +0000 @@ -0,0 +1,13 @@ +Index: b/src/Unix/linux/sigsegv_linux_arm.cpp +=================================================================== +--- a/src/Unix/linux/sigsegv_linux_arm.cpp ++++ b/src/Unix/linux/sigsegv_linux_arm.cpp +@@ -209,7 +209,7 @@ buserr: + } + + static void segfault_vec(int /*sig*/, siginfo_t *sip, void *uc) { +- mcontext_t *context = &(((struct ucontext *)uc)->uc_mcontext); ++ mcontext_t *context = &(((ucontext_t *)uc)->uc_mcontext); + unsigned long *regs = &context->arm_r0; + uintptr addr = (uintptr)sip->si_addr; + addr -= FMEMORY; diff -Nru aranym-1.0.2/debian/patches/series aranym-1.0.2/debian/patches/series --- aranym-1.0.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ aranym-1.0.2/debian/patches/series 2018-01-24 22:39:02.000000000 +0000 @@ -0,0 +1,2 @@ +0001-emulate-NCR5380-MODE-register.patch +glibc-2.26.diff