debian/changelog | 27 ++++++++++++++++++--
debian/compat | 2 -
debian/control | 28 +--------------------
debian/patches/0001-Documentation-Ids.patch | 37 ++++++++++++++++++++++++++++
debian/patches/series | 2 -
debian/rules | 9 +-----
src/XIQueryDevice.c | 7 +++--
7 files changed, 73 insertions(+), 39 deletions(-)
New commits:
commit 1abe245b66090c7c890f5101aadb67240c3f32b4
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Dec 6 00:50:31 2016 +0100
Release to unstable
diff --git a/debian/changelog b/debian/changelog
index 827c9d7..e78ebc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxi (2:1.7.8-1) UNRELEASED; urgency=medium
+libxi (2:1.7.8-1) unstable; urgency=medium
[ Andreas Boll ]
* New upstream release.
@@ -20,7 +20,7 @@ libxi (2:1.7.8-1) UNRELEASED; urgency=medium
* debhelper passes --disable-silent-rules to configure for us.
* Drop explicit build target. dh $@ can handle it.
- -- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:19:05 +0200
+ -- Emilio Pozuelo Monfort <po...@debian.org> Tue, 06 Dec 2016 00:50:24 +0100
libxi (2:1.7.6-1.1) unstable; urgency=medium
commit 9836408e0aa0bad4a32bc2771de8f1b3f821bc7f
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Dec 6 00:42:11 2016 +0100
Drop explicit build target
diff --git a/debian/changelog b/debian/changelog
index 30594f1..827c9d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ libxi (2:1.7.8-1) UNRELEASED; urgency=medium
+ debhelper now enables --parallel by default.
* Switch to -dbgsym packages.
* debhelper passes --disable-silent-rules to configure for us.
+ * Drop explicit build target. dh $@ can handle it.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:19:05 +0200
diff --git a/debian/rules b/debian/rules
index 85ed8b0..a7fbdd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,10 +10,6 @@
# set this to the name of the main shlib's binary package
PACKAGE = libxi6
-.PHONY: build
-build:
- dh build --with quilt --builddirectory=build/
-
%:
dh $@ --with quilt --builddirectory=build/
commit a0146499b4f70fb22d5b4eaadb82c86d2ce0b8c6
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Mon Dec 5 20:21:12 2016 +0100
Let debhelper pass --disable-silent-rules to configure for us
diff --git a/debian/changelog b/debian/changelog
index 95fa17e..30594f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ libxi (2:1.7.8-1) UNRELEASED; urgency=medium
+ debhelper now calls dh-autoreconf automatically.
+ debhelper now enables --parallel by default.
* Switch to -dbgsym packages.
+ * debhelper passes --disable-silent-rules to configure for us.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:19:05 +0200
diff --git a/debian/rules b/debian/rules
index 008bbb4..85ed8b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,6 @@ build:
override_dh_auto_configure:
dh_auto_configure -- \
- --disable-silent-rules \
--with-xmlto \
--without-fop
commit 00a98433381270713d069c304dc08e2f349e93e4
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Mon Dec 5 20:17:17 2016 +0100
Switch to -dbgsym packages
diff --git a/debian/changelog b/debian/changelog
index 209adae..95fa17e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ libxi (2:1.7.8-1) UNRELEASED; urgency=medium
* Bump debhelper compat to 10.
+ debhelper now calls dh-autoreconf automatically.
+ debhelper now enables --parallel by default.
+ * Switch to -dbgsym packages.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:19:05 +0200
diff --git a/debian/control b/debian/control
index 5e91938..5f0e264 100644
--- a/debian/control
+++ b/debian/control
@@ -53,28 +53,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
Description: X11 Input extension library
This is a udeb, or a microdeb, for the debian-installer.
-Package: libxi6-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxi6 (= ${binary:Version})
-Multi-Arch: same
-Description: X11 Input extension library (debug package)
- libXi provides an X Window System client interface to the XINPUT
- extension to the X protocol.
- .
- The Input extension allows setup and configuration of multiple input devices,
- and hotplugging of input devices (to be added and removed on the fly).
- .
- This package contains the debug versions of the library found in libxi6.
- Non-developers likely have little use for this package.
- .
- More information about X.Org can be found at:
- <URL:https://www.X.org>
- .
- This module can be found at
- git://anongit.freedesktop.org/git/xorg/lib/libXi
-
Package: libxi-dev
Section: libdevel
Architecture: any
diff --git a/debian/rules b/debian/rules
index 20e0b58..008bbb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ override_dh_install:
dh_install --fail-missing --exclude=libXi.la --exclude .db --exclude
.xml
override_dh_strip:
- dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
+ dh_strip -p$(PACKAGE) --dbgsym-migration="$(PACKAGE)-dbg (<<
2:1.7.8-1~)"
dh_strip -N$(PACKAGE)
override_dh_makeshlibs:
commit 2f66c8ef6a18d2f550acc898ab85b44b4a0fae09
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Mon Dec 5 20:14:09 2016 +0100
debhelper now enables --parallel by default
diff --git a/debian/changelog b/debian/changelog
index 99357e3..209adae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ libxi (2:1.7.8-1) UNRELEASED; urgency=medium
before writing to it.
* Bump debhelper compat to 10.
+ debhelper now calls dh-autoreconf automatically.
+ + debhelper now enables --parallel by default.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:19:05 +0200
diff --git a/debian/rules b/debian/rules
index d0ecd30..20e0b58 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,10 +12,10 @@ PACKAGE = libxi6
.PHONY: build
build:
- dh build --with quilt --builddirectory=build/ --parallel
+ dh build --with quilt --builddirectory=build/
%:
- dh $@ --with quilt --builddirectory=build/ --parallel
+ dh $@ --with quilt --builddirectory=build/
override_dh_auto_configure:
dh_auto_configure -- \
commit 8e57e63c535c72ea42c27d5d6c22676f6356556a
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Mon Dec 5 20:13:31 2016 +0100
debhelper now calls dh-autoreconf automatically
diff --git a/debian/changelog b/debian/changelog
index 389d8e3..99357e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ libxi (2:1.7.8-1) UNRELEASED; urgency=medium
* Cherry-pick upstream commit 4c5c8d62, check a buffer was allocated
before writing to it.
* Bump debhelper compat to 10.
+ + debhelper now calls dh-autoreconf automatically.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:19:05 +0200
diff --git a/debian/control b/debian/control
index 9b856a5..5e91938 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
debhelper (>= 10),
- dh-autoreconf,
quilt,
x11proto-core-dev (>= 7.0.13),
x11proto-xext-dev (>= 7.0.3),
@@ -17,8 +16,6 @@ Build-Depends:
pkg-config,
quilt,
xutils-dev (>= 1:7.6+2),
- automake,
- libtool,
# specs
xmlto,
xorg-sgml-doctools (>= 1:1.8),
diff --git a/debian/rules b/debian/rules
index ab458bf..d0ecd30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,10 +12,10 @@ PACKAGE = libxi6
.PHONY: build
build:
- dh build --with quilt,autoreconf --builddirectory=build/ --parallel
+ dh build --with quilt --builddirectory=build/ --parallel
%:
- dh $@ --with quilt,autoreconf --builddirectory=build/ --parallel
+ dh $@ --with quilt --builddirectory=build/ --parallel
override_dh_auto_configure:
dh_auto_configure -- \
commit b6943a7396ee06c17b89c294a88efd1221df3bcb
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Mon Dec 5 20:12:00 2016 +0100
Bump debhelper compat to 10
diff --git a/debian/changelog b/debian/changelog
index a48b05b..389d8e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ libxi (2:1.7.8-1) UNRELEASED; urgency=medium
security fix.
* Cherry-pick upstream commit 4c5c8d62, check a buffer was allocated
before writing to it.
+ * Bump debhelper compat to 10.
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:19:05 +0200
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 888fc1b..9b856a5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 10),
dh-autoreconf,
quilt,
x11proto-core-dev (>= 7.0.13),
commit afeb05a8259f946a2890475b6b2f27e1a786220f
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Mon Dec 5 20:07:12 2016 +0100
Acknowledge NMU
diff --git a/debian/changelog b/debian/changelog
index 98f2a63..a48b05b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libxi (2:1.7.8-1) UNRELEASED; urgency=medium
* Bump Standards-Version to 3.9.8, no changes needed.
[ Emilio Pozuelo Monfort ]
+ * Acknowledge 2:1.7.6-1.1 NMU.
* Cherry-pick upstream commit 7ac03c6c to plug a memory leak in the
security fix.
* Cherry-pick upstream commit 4c5c8d62, check a buffer was allocated
@@ -15,6 +16,15 @@ libxi (2:1.7.8-1) UNRELEASED; urgency=medium
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:19:05 +0200
+libxi (2:1.7.6-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Mark libxi-dev as Multi-Arch: same. Closes: #689068.
+ * Explicitly specify documentation's anchor ids instead of generating
+ non-reproducible ones during the build (Francois Gouget).
+
+ -- Matthias Klose <d...@debian.org> Thu, 03 Nov 2016 14:52:54 +0100
+
libxi (2:1.7.6-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index f8ef4dc..888fc1b 100644
--- a/debian/control
+++ b/debian/control
@@ -81,6 +81,7 @@ Description: X11 Input extension library (debug package)
Package: libxi-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends:
${shlibs:Depends},
${misc:Depends},
diff --git a/debian/patches/0001-Documentation-Ids.patch
b/debian/patches/0001-Documentation-Ids.patch
new file mode 100644
index 0000000..a5a8788
--- /dev/null
+++ b/debian/patches/0001-Documentation-Ids.patch
@@ -0,0 +1,37 @@
+
+Add explicit ids to the documentation chapters and sections so they are
+identical no matter which architecture (or day or asciidoc version) the
+packages are built on. This is necessary for multi-arch compatibility.
+
+Author: Francois Gouget <fgou...@codeweavers.com>
+
+diff -u libXi-1.7.4.orig/specs/inputlib.xml libXi-1.7.4/specs/inputlib.xml
+--- libXi-1.7.4.orig/specs/inputlib.xml 2011-12-20 01:28:44.000000000
+0100
++++ libXi-1.7.4/specs/inputlib.xml 2015-02-10 16:22:13.817236191 +0100
+@@ -26,7 +26,7 @@
+ <holder>Ardent Computer</holder>
+ </copyright>
+
+-<legalnotice>
++<legalnotice id="Legal_Notice">
+ <para>
+ Permission to use, copy, modify, and distribute this documentation for any
purpose and without
+ fee is hereby granted, provided that the above copyright notice and this
permission notice appear
+@@ -36,7 +36,7 @@
+ </para>
+ </legalnotice>
+
+-<legalnotice>
++<legalnotice id="Multi_Licensing">
+ <para role="multiLicensing">
+ Copyright © 1989, 1990, 1991, 1992 X Consortium
+ </para>
+diff -u libXi-1.7.4.orig/specs/library.xml libXi-1.7.4/specs/library.xml
+--- libXi-1.7.4.orig/specs/library.xml 2011-12-20 01:28:44.000000000 +0100
++++ libXi-1.7.4/specs/library.xml 2015-02-10 16:17:31.518591542 +0100
+@@ -1,4 +1,4 @@
+-<chapter><title>Input Extension</title>
++<chapter id='Input_Extension'><title>Input Extension</title>
+ <sect1 id='Overview'>
+ <title>Overview</title>
+ <!-- .XS -->
diff --git a/debian/patches/series b/debian/patches/series
index a82d1b4..b182507 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-#placeholder
+0001-Documentation-Ids.patch
commit 6d0431c395d3a22b68e3635813f49e38e929a018
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Sat Dec 3 19:59:18 2016 +0100
Cherry-pick fixes
diff --git a/debian/changelog b/debian/changelog
index 507a79d..98f2a63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
libxi (2:1.7.8-1) UNRELEASED; urgency=medium
+ [ Andreas Boll ]
* New upstream release.
- Fixes CVE-2016-7945 and CVE-2016-7946 (Closes: #840440).
* Update d/upstream/signing-key.asc with Matthieu Herrb's key.
* Update a bunch of URLs in packaging to https.
* Bump Standards-Version to 3.9.8, no changes needed.
+ [ Emilio Pozuelo Monfort ]
+ * Cherry-pick upstream commit 7ac03c6c to plug a memory leak in the
+ security fix.
+ * Cherry-pick upstream commit 4c5c8d62, check a buffer was allocated
+ before writing to it.
+
-- Andreas Boll <andreas.boll....@gmail.com> Fri, 07 Oct 2016 13:19:05 +0200
libxi (2:1.7.6-1) unstable; urgency=medium
commit b3ef71692255ca3da978825518270c5fe845e049
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Oct 25 21:31:19 2016 +0200
Check that allocating a buffer succeeded
Since we are going to write into the buffer, we should make sure the
allocation didn't fail.
Reported-by: Julien Cristau <jcris...@debian.org>
Signed-off-by: Emilio Pozuelo Monfort <po...@debian.org>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/XIQueryDevice.c b/src/XIQueryDevice.c
index e3b0c9f..a877d78 100644
--- a/src/XIQueryDevice.c
+++ b/src/XIQueryDevice.c
@@ -66,17 +66,18 @@ XIQueryDevice(Display *dpy, int deviceid, int
*ndevices_return)
{
*ndevices_return = reply.num_devices;
info = Xmalloc((reply.num_devices + 1) * sizeof(XIDeviceInfo));
+ buf = Xmalloc(reply.length * 4);
}
else
{
*ndevices_return = 0;
info = NULL;
+ buf = NULL;
}
- if (!info)
+ if (!info || !buf)
goto error;
- buf = Xmalloc(reply.length * 4);
_XRead(dpy, buf, reply.length * 4);
ptr = buf;
end = buf + reply.length * 4;
@@ -135,9 +136,9 @@ error_loop:
Xfree(info[i].name);
Xfree(info[i].classes);
}
+error:
Xfree(info);
Xfree(buf);
-error:
UnlockDisplay(dpy);
error_unlocked:
SyncHandle();
commit 00138863a8c0ddb36eeba114f2cc1d2fbb136cac
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Tue Oct 25 21:31:18 2016 +0200
Plug a memory leak
Introduced in commit 19a9cd6.
Reported-by: Julien Cristau <jcris...@debian.org>
Signed-off-by: Emilio Pozuelo Monfort <po...@debian.org>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/XIQueryDevice.c b/src/XIQueryDevice.c
index a457cd6..e3b0c9f 100644
--- a/src/XIQueryDevice.c
+++ b/src/XIQueryDevice.c
@@ -135,6 +135,8 @@ error_loop:
Xfree(info[i].name);
Xfree(info[i].classes);
}
+ Xfree(info);
+ Xfree(buf);
error:
UnlockDisplay(dpy);
error_unlocked:
