diff --git a/.gitignore b/.gitignore index 96003b4..566c484 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ libXi-1.4.0.tar.bz2 /libXi-1.6.99.1.tar.bz2 /libXi-1.7.tar.bz2 /libXi-1.7.1.tar.bz2 +/libXi-20130524.tar.bz2 diff --git a/0001-Copy-the-sequence-number-into-the-target-event-too-6.patch b/0001-Copy-the-sequence-number-into-the-target-event-too-6.patch deleted file mode 100644 index aa41fc7..0000000 --- a/0001-Copy-the-sequence-number-into-the-target-event-too-6.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 4ee15c55da848c9f3334e9750f28be81bfd6a312 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 17 May 2013 09:07:44 +1000 -Subject: [PATCH libXi] Copy the sequence number into the target event too - (#64687) - -X.Org Bug 64687 - -Signed-off-by: Peter Hutterer ---- - src/XExtInt.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/XExtInt.c b/src/XExtInt.c -index 507573b..2139c6a 100644 ---- a/src/XExtInt.c -+++ b/src/XExtInt.c -@@ -1521,6 +1522,7 @@ wireToDeviceEvent(xXIDeviceEvent *in, XGenericEventCookie* cookie) - out = next_block(&ptr_lib, sizeof(XIDeviceEvent)); - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1793,6 +1795,7 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie) - cookie->data = out = malloc(sizeof(XIDeviceChangedEvent) + len); - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1825,6 +1828,7 @@ wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XGenericEventCookie *cookie) - out->info = (XIHierarchyInfo*)&out[1]; - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1865,6 +1869,7 @@ wireToRawEvent(XExtDisplayInfo *info, xXIRawEvent *in, XGenericEventCookie *cook - - out = next_block(&ptr, sizeof(XIRawEvent)); - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1915,6 +1920,7 @@ wireToEnterLeave(xXIEnterEvent *in, XGenericEventCookie *cookie) - out->buttons.mask = (unsigned char*)&out[1]; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1957,6 +1963,7 @@ wireToPropertyEvent(xXIPropertyEvent *in, XGenericEventCookie *cookie) - cookie->data = out; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1977,6 +1984,7 @@ wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in, - cookie->data = out; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -2004,6 +2012,7 @@ wireToBarrierEvent(xXIBarrierEvent *in, XGenericEventCookie *cookie) - - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); --- -1.8.1.4 - diff --git a/commitid b/commitid index 6ebb904..0090725 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -ae0187c8708d2378373889827117911086581fdd +661c45ca17c434dbd342a46fd3fb813852ae0ca9 diff --git a/libXi.spec b/libXi.spec index 0fb1d66..552954e 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,11 +1,11 @@ %global tarball libXi -#global gitdate 20111222 -#global gitversion ae0187c87 +%global gitdate 20130524 +%global gitversion 661c45ca1 Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.7.1 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -17,8 +17,6 @@ Source1: make-git-snapshot.sh Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 %endif -Patch01: 0001-Copy-the-sequence-number-into-the-target-event-too-6.patch - BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel @@ -45,7 +43,6 @@ X.Org X11 libXi development package %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} -%patch01 -p1 # Disable static library creation by default. %define with_static 0 @@ -92,6 +89,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri May 24 2013 Peter Hutterer 1.7.1-4.20130524git661c45ca1 +- Udpate to git snapshot to fix CVEs listed below +- CVE-2013-1984 +- CVE-2013-1995 +- CVE-2013-1998 + * Tue May 21 2013 Peter Hutterer 1.7.1-3 - fix sequence number copy - the cookie already had (a potentially different) sequence number copied (#965347) diff --git a/sources b/sources index d6adad4..fdbc6b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24d71afed1b86c60d4eb361628d7f47b libXi-1.7.1.tar.bz2 +d2e9cfd547e8389aebe78dee2b7151c8 libXi-20130524.tar.bz2