Bug#698064: Getting aranym 0.9.15-1 to wheezy
Hi Adam,
* Thorsten Glaser t...@mirbsd.de [2013-04-24 19:25] wrote:
Oh great, this one FTBFS on kfreebsd… again. Although that’s
not dependent on the delta between -3.1 and -5…
The -6 should address that. Debdiff attached. I am currently on business
trip, but Thorsten jumped in and made a needed cherrypick, so I've only
needed to compile it and upload it. Thanks again Thorsten.
Antonin
diff -Nru aranym-0.9.13/debian/changelog aranym-0.9.13/debian/changelog
--- aranym-0.9.13/debian/changelog 2012-05-06 23:50:52.0 +0200
+++ aranym-0.9.13/debian/changelog 2013-04-25 06:11:53.0 +0200
@@ -1,3 +1,23 @@
+aranym (0.9.13-6) testing-proposed-updates; urgency=low
+
+ [ Thorsten Glaser ]
+ * handle libusb dependency on kfreebsd (Closes: #690007)
+
+ -- Antonin Kral a.k...@sh.cvut.cz Wed, 24 Apr 2013 20:02:06 +
+
+aranym (0.9.13-5) testing-proposed-updates; urgency=low
+
+ * Reupload of -4 with merged previously forgotten NMU -3.1
+
+ -- Antonin Kral a.k...@sh.cvut.cz Wed, 24 Apr 2013 11:40:18 +0200
+
+aranym (0.9.13-4) testing-proposed-updates; urgency=low
+
+ * cherrypick patch for NatFeast problem (Closes: #698064)
+to get ARAnyM to wheezy
+
+ -- Antonin Kral a.k...@sh.cvut.cz Wed, 24 Apr 2013 08:56:45 +0200
+
aranym (0.9.13-3.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru aranym-0.9.13/debian/control aranym-0.9.13/debian/control
--- aranym-0.9.13/debian/control2012-05-06 23:44:18.0 +0200
+++ aranym-0.9.13/debian/control2013-04-25 06:11:53.0 +0200
@@ -4,7 +4,7 @@
Maintainer: Antonin Kral a.k...@sh.cvut.cz
Homepage: http://aranym.org/
Standards-Version: 3.9.3
-Build-Depends: debhelper (= 5), autotools-dev, bzip2, libsdl1.2-dev,
libsdl-image1.2-dev, libmpfr-dev, libusb-1.0-0-dev, imagemagick, zlib1g-dev
+Build-Depends: debhelper (= 5), autotools-dev, bzip2, libsdl1.2-dev,
libsdl-image1.2-dev, libmpfr-dev, libusb-1.0-0-dev [!kfreebsd-any],
imagemagick, zlib1g-dev
Package: aranym
Architecture: any
diff -Nru
aranym-0.9.13/debian/patches/0006-NatFeats-patch-to-address-Bug-698064.patch
aranym-0.9.13/debian/patches/0006-NatFeats-patch-to-address-Bug-698064.patch
---
aranym-0.9.13/debian/patches/0006-NatFeats-patch-to-address-Bug-698064.patch
1970-01-01 01:00:00.0 +0100
+++
aranym-0.9.13/debian/patches/0006-NatFeats-patch-to-address-Bug-698064.patch
2013-04-25 06:11:53.0 +0200
@@ -0,0 +1,151 @@
+From: Antonin Kral a.k...@bobek.cz
+Date: Wed, 24 Apr 2013 08:47:40 +0200
+Subject: NatFeats patch to address Bug#698064
+
+---
+ src/include/natfeats.h | 98
+ 1 file changed, 74 insertions(+), 24 deletions(-)
+
+diff --git a/src/include/natfeats.h b/src/include/natfeats.h
+index e5ff8ab..c6155b8 100644
+--- a/src/include/natfeats.h
b/src/include/natfeats.h
+@@ -1,3 +1,26 @@
++/*
++ * natfeats.h - common functions for all NatFeats
++ *
++ * Copyright (c) 2001-2013 Petr Stehlik of ARAnyM dev team (see AUTHORS)
++ *
++ * This file is part of the ARAnyM project which builds a new and powerful
++ * TOS/FreeMiNT compatible virtual machine running on almost any hardware.
++ *
++ * ARAnyM is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * ARAnyM is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with ARAnyM; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ */
++
+ #ifndef _NATFEATS_H
+ #define _NATFEATS_H
+
+@@ -14,6 +37,9 @@ extern uint32 nf_getparameter(int);
+ // should NatFeats work with physical (not MMU mapped) addresses
+ #define NATFEAT_PHYS_ADDR 1
+
++// should NatFeats use direct memcpy() to/from guest provided pointer (fast
but less safe)
++#define NATFEAT_LIBC_MEMCPY 1
++
+ #if NATFEAT_PHYS_ADDR
+ # define ReadNFInt8 ReadAtariInt8
+ # define ReadNFInt16 ReadAtariInt16
+@@ -30,53 +56,77 @@ extern uint32 nf_getparameter(int);
+ # define WriteNFInt32WriteInt32
+ #endif
+
+-static inline void Atari2Host_memcpy(void *dst, memptr src, size_t n)
++static inline void Atari2Host_memcpy(void *_dst, memptr src, size_t count)
+ {
+-#if NATFEAT_PHYS_ADDR
+- memcpy(dst, Atari2HostAddr(src), n);
++#if NATFEAT_LIBC_MEMCPY NATFEAT_PHYS_ADDR
++ memptr src_end = src + count - 1;
++ if (! ValidAtariAddr(src, false, 1))
++ BUS_ERROR(src);
++ if (! ValidAtariAddr(src_end, false, 1))
++ BUS_ERROR(src_end);
++
++ memcpy(_dst,
Bug#698064: Getting aranym 0.9.15-1 to wheezy
Hi, On 25.04.2013 08:21, Antonin Kral wrote: * Thorsten Glaser t...@mirbsd.de [2013-04-24 19:25] wrote: Oh great, this one FTBFS on kfreebsd… again. Although that’s not dependent on the delta between -3.1 and -5… The -6 should address that. Debdiff attached. I am currently on business trip, but Thorsten jumped in and made a needed cherrypick, so I've only needed to compile it and upload it. Thanks again Thorsten. Yep, I saw that earlier and updated my hint; thanks. Regards, Adam -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#698064: Getting aranym 0.9.15-1 to wheezy
On 23.04.2013 23:00, Adam D. Barratt wrote: On Thu, 2013-04-18 at 19:14 +0200, Antonin Kral wrote: first of all thanks a lot for your great work getting Debian release. I've recently uploaded new version of Aranym which fixed a severity grave problem in the previous version which is going to be included into wheezy - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698064 Could you please consider getting 0.9.15-1 instead? [...] What we could consider is a 0.9.13-3.1+deb7u1 upload via testing-proposed-updates, containing just the RC fix on top of the current wheezy package. In that case we'd like to see a debdiff to confirm first though. I see you've uploaded a 0.9.13-4 package, without providing a debdiff as requested. Unfortunately, it doesn't look suitable, as it's dropped all of the changes between -3 and -3.1 (which is the version in testing). This leads to an overall diff relative to the current testing package of changelog | 16 - control |2 patches/0004-NatFeats-patch-to-address-Bug-698064.patch | 151 patches/0004-fix-spelling.patch | 15 - patches/0005-fix-zlib-configure.patch | 28 -- patches/series |3 rules |6 watch |2 8 files changed, 160 insertions(+), 63 deletions(-) Please could you prepare a -5 package which fixes the reverted changes? The debdiff between -3.1 and -5 should then only contain your new patch and the associated series and changelog updates. Regards, Adam -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#698064: Getting aranym 0.9.15-1 to wheezy
Hi Adam,
* Adam D. Barratt a...@adam-barratt.org.uk [2013-04-24 11:25] wrote:
I see you've uploaded a 0.9.13-4 package, without providing a
debdiff as requested.
Please could you prepare a -5 package which fixes the reverted
changes? The debdiff between -3.1 and -5 should then only contain
your new patch and the associated series and changelog updates.
Oh, lord, I really need vacation. Sorry for that. -5 is on the way.
Debdiff attached.
Thank you,
Antonin
diff -Nru aranym-0.9.13/debian/changelog aranym-0.9.13/debian/changelog
--- aranym-0.9.13/debian/changelog 2012-05-06 23:50:52.0 +0200
+++ aranym-0.9.13/debian/changelog 2013-04-24 11:41:31.0 +0200
@@ -1,3 +1,16 @@
+aranym (0.9.13-5) testing-proposed-updates; urgency=low
+
+ * Reupload of -4 with merged previously forgotten NMU -3.1
+
+ -- Antonin Kral a.k...@sh.cvut.cz Wed, 24 Apr 2013 11:40:18 +0200
+
+aranym (0.9.13-4) testing-proposed-updates; urgency=low
+
+ * cherrypick patch for NatFeast problem (Closes: #698064)
+to get ARAnyM to wheezy
+
+ -- Antonin Kral a.k...@sh.cvut.cz Wed, 24 Apr 2013 08:56:45 +0200
+
aranym (0.9.13-3.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru
aranym-0.9.13/debian/patches/0006-NatFeats-patch-to-address-Bug-698064.patch
aranym-0.9.13/debian/patches/0006-NatFeats-patch-to-address-Bug-698064.patch
---
aranym-0.9.13/debian/patches/0006-NatFeats-patch-to-address-Bug-698064.patch
1970-01-01 01:00:00.0 +0100
+++
aranym-0.9.13/debian/patches/0006-NatFeats-patch-to-address-Bug-698064.patch
2013-04-24 11:41:31.0 +0200
@@ -0,0 +1,151 @@
+From: Antonin Kral a.k...@bobek.cz
+Date: Wed, 24 Apr 2013 08:47:40 +0200
+Subject: NatFeats patch to address Bug#698064
+
+---
+ src/include/natfeats.h | 98
+ 1 file changed, 74 insertions(+), 24 deletions(-)
+
+diff --git a/src/include/natfeats.h b/src/include/natfeats.h
+index e5ff8ab..c6155b8 100644
+--- a/src/include/natfeats.h
b/src/include/natfeats.h
+@@ -1,3 +1,26 @@
++/*
++ * natfeats.h - common functions for all NatFeats
++ *
++ * Copyright (c) 2001-2013 Petr Stehlik of ARAnyM dev team (see AUTHORS)
++ *
++ * This file is part of the ARAnyM project which builds a new and powerful
++ * TOS/FreeMiNT compatible virtual machine running on almost any hardware.
++ *
++ * ARAnyM is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * ARAnyM is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with ARAnyM; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ */
++
+ #ifndef _NATFEATS_H
+ #define _NATFEATS_H
+
+@@ -14,6 +37,9 @@ extern uint32 nf_getparameter(int);
+ // should NatFeats work with physical (not MMU mapped) addresses
+ #define NATFEAT_PHYS_ADDR 1
+
++// should NatFeats use direct memcpy() to/from guest provided pointer (fast
but less safe)
++#define NATFEAT_LIBC_MEMCPY 1
++
+ #if NATFEAT_PHYS_ADDR
+ # define ReadNFInt8 ReadAtariInt8
+ # define ReadNFInt16 ReadAtariInt16
+@@ -30,53 +56,77 @@ extern uint32 nf_getparameter(int);
+ # define WriteNFInt32WriteInt32
+ #endif
+
+-static inline void Atari2Host_memcpy(void *dst, memptr src, size_t n)
++static inline void Atari2Host_memcpy(void *_dst, memptr src, size_t count)
+ {
+-#if NATFEAT_PHYS_ADDR
+- memcpy(dst, Atari2HostAddr(src), n);
++#if NATFEAT_LIBC_MEMCPY NATFEAT_PHYS_ADDR
++ memptr src_end = src + count - 1;
++ if (! ValidAtariAddr(src, false, 1))
++ BUS_ERROR(src);
++ if (! ValidAtariAddr(src_end, false, 1))
++ BUS_ERROR(src_end);
++
++ memcpy(_dst, Atari2HostAddr(src), count);
+ #else
+- uint8 *dest = (uint8 *)dst;
+- while ( n-- )
+- *dest++ = (char)ReadInt8( (uint32)src++ );
++ uint8 *dst = (uint8 *)_dst;
++ while ( count-- )
++ *dst++ = (char)ReadNFInt8( src++ );
+ #endif
+ }
+
+-static inline void Host2Atari_memcpy(memptr dest, const void *src, size_t n)
++static inline void Host2Atari_memcpy(memptr dst, const void *_src, size_t
count)
+ {
+-#if NATFEAT_PHYS_ADDR
+- memcpy(Atari2HostAddr(dest), src, n);
++#if NATFEAT_LIBC_MEMCPY NATFEAT_PHYS_ADDR
++ memptr dst_end = dst + count - 1;
++ if (! ValidAtariAddr(dst, true, 1))
++ BUS_ERROR(dst);
++ if (! ValidAtariAddr(dst_end, true, 1))
++ BUS_ERROR(dst_end);
++
++ memcpy(Atari2HostAddr(dst), _src, count);
+ #else
+-
Bug#698064: Getting aranym 0.9.15-1 to wheezy
On 24.04.2013 10:51, Antonin Kral wrote: * Adam D. Barratt a...@adam-barratt.org.uk [2013-04-24 11:25] wrote: I see you've uploaded a 0.9.13-4 package, without providing a debdiff as requested. Please could you prepare a -5 package which fixes the reverted changes? The debdiff between -3.1 and -5 should then only contain your new patch and the associated series and changelog updates. Oh, lord, I really need vacation. Sorry for that. -5 is on the way. Debdiff attached. That looks better. :-) Thanks. Regards, Adam -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#698064: Getting aranym 0.9.15-1 to wheezy
On 24.04.2013 11:16, Adam D. Barratt wrote: On 24.04.2013 10:51, Antonin Kral wrote: * Adam D. Barratt a...@adam-barratt.org.uk [2013-04-24 11:25] wrote: I see you've uploaded a 0.9.13-4 package, without providing a debdiff as requested. Please could you prepare a -5 package which fixes the reverted changes? The debdiff between -3.1 and -5 should then only contain your new patch and the associated series and changelog updates. Oh, lord, I really need vacation. Sorry for that. -5 is on the way. Debdiff attached. That looks better. :-) Thanks. Except it then failed on kbsd-*. :-( It looks like #690007 applies to the wheezy version too. Regards, Adam -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#698064: Getting aranym 0.9.15-1 to wheezy
Adam D. Barratt dixit: Oh, lord, I really need vacation. Sorry for that. -5 is on the way. That looks better. :-) Thanks. Oh great, this one FTBFS on kfreebsd… again. Although that’s not dependent on the delta between -3.1 and -5… p.d.o shows the reason: [33]File [34]Packages /usr/include/libusb-1.0/libusb.h [35]libusb-1.0-0-dev [not kfreebsd-amd64, kfreebsd-i386] /usr/include/libusb.h[36]libusb2-dev [kfreebsd-amd64, kfreebsd-i386] Is this a known porting issue? The ARAnyM source seems to explicitly include libusb-1.0/libusb.h though. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690007#20 contains a patch that disabled usbhost support in unstable for kfreebsd, as a quick workaround, since even Christoph didn’t have a solution handy. I think it will almost apply as-is (modulo that s!./configure!bash configure! was done). This should suffice for the release. bye, //mirabilos -- “It is inappropriate to require that a time represented as seconds since the Epoch precisely represent the number of seconds between the referenced time and the Epoch.” -- IEEE Std 1003.1b-1993 (POSIX) Section B.2.2.2 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#698064: Getting aranym 0.9.15-1 to wheezy
Hello, first of all thanks a lot for your great work getting Debian release. I've recently uploaded new version of Aranym which fixed a severity grave problem in the previous version which is going to be included into wheezy - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698064 Could you please consider getting 0.9.15-1 instead? Thank you, Antonin -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#698064: Getting aranym 0.9.15-1 to wheezy
On Thu, 2013-04-18 at 19:14 +0200, Antonin Kral wrote: first of all thanks a lot for your great work getting Debian release. I've recently uploaded new version of Aranym which fixed a severity grave problem in the previous version which is going to be included into wheezy - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698064 Could you please consider getting 0.9.15-1 instead? Thanks for caring about getting this bug fixed in wheezy. At this point in time, no, I'm afraid we couldn't accept 0.9.15-1. The difference between 0.9.13 and 0.9.15 appears to be quite a bit more than just the fix for the RC bug. It's also picked up a dependency on a version of mpfr4 that isn't in wheezy, so couldn't migrate in any case. What we could consider is a 0.9.13-3.1+deb7u1 upload via testing-proposed-updates, containing just the RC fix on top of the current wheezy package. In that case we'd like to see a debdiff to confirm first though. Regards, Adam -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#698064: Getting aranym 0.9.15-1 to wheezy
Hi Adam, * Adam D. Barratt a...@adam-barratt.org.uk [2013-04-24 00:05] wrote: The difference between 0.9.13 and 0.9.15 appears to be quite a bit more than just the fix for the RC bug. It's also picked up a dependency on a version of mpfr4 that isn't in wheezy, so couldn't migrate in any case. mpfr4 version is not important from the Aranym perspective. Would you consider including 0.9.15 when compiled against the mpfr4 3.1.0-5? Regards, Antonin -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#698064: Getting aranym 0.9.15-1 to wheezy
Hi, On Wed, 2013-04-24 at 00:15 +0200, Antonin Kral wrote: * Adam D. Barratt a...@adam-barratt.org.uk [2013-04-24 00:05] wrote: The difference between 0.9.13 and 0.9.15 appears to be quite a bit more than just the fix for the RC bug. It's also picked up a dependency on a version of mpfr4 that isn't in wheezy, so couldn't migrate in any case. mpfr4 version is not important from the Aranym perspective. Would you consider including 0.9.15 when compiled against the mpfr4 3.1.0-5? That wouldn't help on the buildds - they'll build against the version that's in unstable. If we're going to fix this in wheezy before the release, then it'll need to go via testing-proposed-updates with a targetted fix for the RC bug. The alternatives are that we decide to fix it in wheezy after the release (which also won't be by using 0.9.15) or that we shouldn't include aranym in wheezy at all (which I imagine would be your least favoured option, but is a possibility). Regards, Adam -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#698064: Getting aranym 0.9.15-1 to wheezy
Adam D. Barratt dixit: What we could consider is a 0.9.13-3.1+deb7u1 upload via I think 0.9.13-4 would also work, as it’s larger than wheezy and smaller than sid. Thanks Antonin! Petr might be able to quickly point out what precise upstream commits/changes are the minimum needed to get this fixed. bye, //mirabilos -- ch you introduced a merge commit│mika % g rebase -i HEAD^^ mika sorry, no idea and rebasing just fscked │mika Segmentation ch should have cloned into a clean repo │ fault (core dumped) ch if I rebase that now, it's really ugh │mika:#grml wuahh -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#698064: Getting aranym 0.9.15-1 to wheezy
* Thorsten Glaser t...@mirbsd.de [2013-04-24 00:29] wrote: Adam D. Barratt dixit: What we could consider is a 0.9.13-3.1+deb7u1 upload via Petr might be able to quickly point out what precise upstream commits/changes are the minimum needed to get this fixed. Exactly, I've already dropped him an email. He is not online on jabber, so he is probably sleeping right now. I've asked him to comment here. Antonin -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
