Bug#703960: unblock: nvclock/0.8b4+cvs20100914-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package nvclock
Hi,
a bug has been found in a patch I added in -3 and that probably renders
nvclock useless due to the unconditional "return 0;"
Unfortunately I don't have any hardware that is actually still
supported by nvclock so I didn't catch this earlier.
The severity of #703454 should probably be RC if this bug makes nvclock
completely useless.
Andreas
unblock nvclock/0.8b4+cvs20100914-4
diffstat for nvclock-0.8b4+cvs20100914 nvclock-0.8b4+cvs20100914
changelog | 8 ++++++++
control | 3 +--
copyright | 2 +-
patches/fix-segfault.diff | 5 +++--
4 files changed, 13 insertions(+), 5 deletions(-)
diff -Nru nvclock-0.8b4+cvs20100914/debian/changelog nvclock-0.8b4+cvs20100914/debian/changelog
--- nvclock-0.8b4+cvs20100914/debian/changelog 2012-08-16 17:45:56.000000000 +0200
+++ nvclock-0.8b4+cvs20100914/debian/changelog 2013-03-20 13:32:51.000000000 +0100
@@ -1,3 +1,11 @@
+nvclock (0.8b4+cvs20100914-4) unstable; urgency=low
+
+ * fix-segfaults.diff: Fix missing braces. Thanks to Евгений Сыромятников for
+ noticing this and the patch. (Closes: #703454)
+ * Update my email address and drop DMUA.
+
+ -- Andreas Beckmann <anbe@debian.org> Wed, 20 Mar 2013 13:32:51 +0100
+
nvclock (0.8b4+cvs20100914-3) unstable; urgency=low
* Build binary packages for armhf, since it should have similar hardware
diff -Nru nvclock-0.8b4+cvs20100914/debian/control nvclock-0.8b4+cvs20100914/debian/control
--- nvclock-0.8b4+cvs20100914/debian/control 2012-08-15 11:25:36.000000000 +0200
+++ nvclock-0.8b4+cvs20100914/debian/control 2013-01-25 23:05:04.000000000 +0100
@@ -3,8 +3,7 @@
Priority: extra
Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel@lists.alioth.debian.org>
Uploaders: Russ Allbery <rra@debian.org>,
- Andreas Beckmann <debian@abeckmann.de>,
-DM-Upload-Allowed: yes
+ Andreas Beckmann <anbe@debian.org>,
Build-Depends:
debhelper (>= 8),
autoconf,
diff -Nru nvclock-0.8b4+cvs20100914/debian/copyright nvclock-0.8b4+cvs20100914/debian/copyright
--- nvclock-0.8b4+cvs20100914/debian/copyright 2012-02-16 12:39:05.000000000 +0100
+++ nvclock-0.8b4+cvs20100914/debian/copyright 2013-01-25 23:05:04.000000000 +0100
@@ -107,7 +107,7 @@
Copyright: © 2001 Wouter de Vries <sax@debian.org>
© 2002 Aurelien Jarno <aurel32@debian.org>
© 2002-2009 Randall Donald <rdonald@debian.org>
- © 2010-2012 Andreas Beckmann <debian@abeckmann.de>
+ © 2010-2013 Andreas Beckmann <anbe@debian.org>
License: GPL-2+
License: GPL-2+
diff -Nru nvclock-0.8b4+cvs20100914/debian/patches/fix-segfault.diff nvclock-0.8b4+cvs20100914/debian/patches/fix-segfault.diff
--- nvclock-0.8b4+cvs20100914/debian/patches/fix-segfault.diff 2012-08-16 17:39:28.000000000 +0200
+++ nvclock-0.8b4+cvs20100914/debian/patches/fix-segfault.diff 2013-03-20 06:00:53.000000000 +0100
@@ -28,13 +28,14 @@
--- a/src/backend/backend.c
+++ b/src/backend/backend.c
-@@ -41,6 +41,9 @@
+@@ -41,6 +41,10 @@
nv_card->PFB = map_dev_mem(fd, nv_card->reg_address + 0x100000, 0x1000);
/* normally pmc is till 0x2000 but extended it for nv40 */
nv_card->PMC = map_dev_mem(fd, nv_card->reg_address + 0x000000, 0x2ffff);
-+ if (!nv_card->PMC)
++ if (!nv_card->PMC) {
+ set_error_str("failed to mmap PMC");
+ return 0;
++ }
nv_card->PCIO = map_dev_mem(fd, nv_card->reg_address + 0x601000, 0x2000);
nv_card->PDISPLAY = map_dev_mem(fd, nv_card->reg_address + NV_PDISPLAY_OFFSET, NV_PDISPLAY_SIZE);
nv_card->PRAMDAC = map_dev_mem(fd, nv_card->reg_address + 0x680000, 0x2000);
Reply to: