debian/changelog | 7 +++++++
debian/patches/bsd-array-bounds.diff | 25 +++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 33 insertions(+)
New commits:
commit d725d89553373e0a5dea8724bf0994d465041e2a
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Apr 21 12:36:30 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 004fbf4..bc1f843 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-mouse (1:1.7.2-2) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.7.2-2) unstable; urgency=low
* Add patch from Robert Millan to work around a gcc bug resulting in FTBFS
with -Werror=array-bounds (closes: #665390)
- -- Julien Cristau <jcris...@debian.org> Sat, 21 Apr 2012 12:29:55 +0200
+ -- Julien Cristau <jcris...@debian.org> Sat, 21 Apr 2012 12:31:32 +0200
xserver-xorg-input-mouse (1:1.7.2-1) unstable; urgency=low
commit c921f5d3cf0e73194a491aa7604cb238019d06f9
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Apr 21 12:31:15 2012 +0200
Fix FTBFS on kfreebsd-amd64
Add patch from Robert Millan to work around a gcc bug resulting in FTBFS
with -Werror=array-bounds (closes: #665390)
diff --git a/debian/changelog b/debian/changelog
index 031fb7b..004fbf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-mouse (1:1.7.2-2) UNRELEASED; urgency=low
+
+ * Add patch from Robert Millan to work around a gcc bug resulting in FTBFS
+ with -Werror=array-bounds (closes: #665390)
+
+ -- Julien Cristau <jcris...@debian.org> Sat, 21 Apr 2012 12:29:55 +0200
+
xserver-xorg-input-mouse (1:1.7.2-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/bsd-array-bounds.diff
b/debian/patches/bsd-array-bounds.diff
new file mode 100644
index 0000000..8db8d2e
--- /dev/null
+++ b/debian/patches/bsd-array-bounds.diff
@@ -0,0 +1,25 @@
+From: Robert Millan <r...@debian.org>
+Subject: Work around gcc bug resulting in build failure
+
+../../src/bsd_mouse.c: In function 'CheckProtocol':
+../../src/bsd_mouse.c:142:30: error: array subscript is above array bounds
[-Werror=array-bounds]
+
+Debian bug#665390.
+
+Index: xserver-xorg-input-mouse/src/bsd_mouse.c
+===================================================================
+--- xserver-xorg-input-mouse.orig/src/bsd_mouse.c
++++ xserver-xorg-input-mouse/src/bsd_mouse.c
+@@ -139,10 +139,10 @@ CheckProtocol(const char *protocol)
+ {
+ int i;
+
+- for (i = 0; internalNames[i]; i++)
++ for (i = 0; i < (sizeof(internalNames) / sizeof(internalNames[0])); i++)
+ if (xf86NameCmp(protocol, internalNames[i]) == 0)
+ return TRUE;
+- for (i = 0; miscNames[i]; i++)
++ for (i = 0; i < (sizeof(miscNames) / sizeof(miscNames[0])); i++)
+ if (xf86NameCmp(protocol, miscNames[i]) == 0)
+ return TRUE;
+ return FALSE;
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..9f8f801 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+bsd-array-bounds.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1slxio-0001ps...@vasks.debian.org
