summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2008-01-17 21:31:41 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2008-01-17 21:31:41 +0000
commit1584d3fa42bb00c94c0299b95bc5eaadb6c512a4 (patch)
tree6ac934b065647d0f42740dada9ae5f5fd1abfbc3 /x11-base/xorg-server/files
parentFix UTF-8 (was broken by rev 1.1001). (diff)
downloadgentoo-2-1584d3fa42bb00c94c0299b95bc5eaadb6c512a4.tar.gz
gentoo-2-1584d3fa42bb00c94c0299b95bc5eaadb6c512a4.tar.bz2
gentoo-2-1584d3fa42bb00c94c0299b95bc5eaadb6c512a4.zip
Security cleanup. Still waiting on mips/sh/arm to stable 1.3.0.0-r3 before I can pull -r2.
(Portage version: 2.1.4)
Diffstat (limited to 'x11-base/xorg-server/files')
-rw-r--r--x11-base/xorg-server/files/1.2.0-client-leak.patch11
-rw-r--r--x11-base/xorg-server/files/1.2.0-server-damage-version.patch38
-rw-r--r--x11-base/xorg-server/files/1.2.0-server-randr-version.patch13
-rw-r--r--x11-base/xorg-server/files/digest-xorg-server-1.2.0-r36
-rw-r--r--x11-base/xorg-server/files/digest-xorg-server-1.3.0.06
-rw-r--r--x11-base/xorg-server/files/digest-xorg-server-1.3.0.0-r16
-rw-r--r--x11-base/xorg-server/files/digest-xorg-server-1.4-r26
-rw-r--r--x11-base/xorg-server/files/digest-xorg-server-1.4.0.906
-rw-r--r--x11-base/xorg-server/files/xorg-xserver-1.2.0-xcmisc.diff38
9 files changed, 0 insertions, 130 deletions
diff --git a/x11-base/xorg-server/files/1.2.0-client-leak.patch b/x11-base/xorg-server/files/1.2.0-client-leak.patch
deleted file mode 100644
index 02e52dbab90a..000000000000
--- a/x11-base/xorg-server/files/1.2.0-client-leak.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/os/connection.c
-+++ b/os/connection.c
-@@ -1066,6 +1066,8 @@ CloseDownConnection(ClientPtr client)
- XdmcpCloseDisplay(oc->fd);
- #endif
- CloseDownFileDescriptor(oc);
-+ FreeOsBuffers(oc);
-+ xfree(client->osPrivate);
- client->osPrivate = (pointer)NULL;
- if (auditTrailLevel > 1)
- AuditF("client %d disconnected\n", client->index);
diff --git a/x11-base/xorg-server/files/1.2.0-server-damage-version.patch b/x11-base/xorg-server/files/1.2.0-server-damage-version.patch
deleted file mode 100644
index e03ae0e305b4..000000000000
--- a/x11-base/xorg-server/files/1.2.0-server-damage-version.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/damageext/damageext.c
-+++ b/damageext/damageext.c
-@@ -35,6 +35,13 @@ int DamageClientPrivateIndex;
- RESTYPE DamageExtType;
- RESTYPE DamageExtWinType;
-
-+/* Version of the damage extension supported by the server, as opposed to the
-+ * DAMAGE_* defines from damageproto for what version the proto header
-+ * supports.
-+ */
-+#define SERVER_DAMAGE_MAJOR 1
-+#define SERVER_DAMAGE_MINOR 0
-+
- #define prScreen screenInfo.screens[0]
-
- static void
-@@ -143,16 +150,16 @@ ProcDamageQueryVersion(ClientPtr client)
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
-- if (stuff->majorVersion < DAMAGE_MAJOR) {
-+ if (stuff->majorVersion < SERVER_DAMAGE_MAJOR) {
- rep.majorVersion = stuff->majorVersion;
- rep.minorVersion = stuff->minorVersion;
- } else {
-- rep.majorVersion = DAMAGE_MAJOR;
-- if (stuff->majorVersion == DAMAGE_MAJOR &&
-- stuff->minorVersion < DAMAGE_MINOR)
-+ rep.majorVersion = SERVER_DAMAGE_MAJOR;
-+ if (stuff->majorVersion == SERVER_DAMAGE_MAJOR &&
-+ stuff->minorVersion < SERVER_DAMAGE_MINOR)
- rep.minorVersion = stuff->minorVersion;
- else
-- rep.minorVersion = DAMAGE_MINOR;
-+ rep.minorVersion = SERVER_DAMAGE_MINOR;
- }
- pDamageClient->major_version = rep.majorVersion;
- pDamageClient->minor_version = rep.minorVersion;
diff --git a/x11-base/xorg-server/files/1.2.0-server-randr-version.patch b/x11-base/xorg-server/files/1.2.0-server-randr-version.patch
deleted file mode 100644
index 05432b68e5cf..000000000000
--- a/x11-base/xorg-server/files/1.2.0-server-randr-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- randr/randr.c.old 2007-02-19 14:01:55.000000000 -0700
-+++ randr/randr.c 2007-02-19 14:02:12.000000000 -0700
-@@ -472,8 +472,8 @@
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
-- rep.majorVersion = RANDR_MAJOR;
-- rep.minorVersion = RANDR_MINOR;
-+ rep.majorVersion = 1;
-+ rep.minorVersion = 1;
- if (client->swapped) {
- swaps(&rep.sequenceNumber, n);
- swapl(&rep.length, n);
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.2.0-r3 b/x11-base/xorg-server/files/digest-xorg-server-1.2.0-r3
deleted file mode 100644
index a78fe15a7e98..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.2.0-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e4d894181f1859651658b3704633e10d MesaLib-6.5.2.tar.bz2 3295166
-RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 MesaLib-6.5.2.tar.bz2 3295166
-SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f MesaLib-6.5.2.tar.bz2 3295166
-MD5 ea291c89e68832d570d9d5e007218bd6 xorg-server-1.2.0.tar.bz2 6014596
-RMD160 0bbc5ccb5cbbe7627b4f09f17848b188e8be2a50 xorg-server-1.2.0.tar.bz2 6014596
-SHA256 e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 xorg-server-1.2.0.tar.bz2 6014596
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.3.0.0 b/x11-base/xorg-server/files/digest-xorg-server-1.3.0.0
deleted file mode 100644
index e7c3cc0974cc..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.3.0.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e4d894181f1859651658b3704633e10d MesaLib-6.5.2.tar.bz2 3295166
-RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 MesaLib-6.5.2.tar.bz2 3295166
-SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f MesaLib-6.5.2.tar.bz2 3295166
-MD5 a51a7d482e3c689394755bb17bda8526 xorg-server-1.3.0.0.tar.bz2 5968263
-RMD160 1a4fecd73aed0d5adabe84066c24ce69dc2c2dc1 xorg-server-1.3.0.0.tar.bz2 5968263
-SHA256 93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975 xorg-server-1.3.0.0.tar.bz2 5968263
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.3.0.0-r1 b/x11-base/xorg-server/files/digest-xorg-server-1.3.0.0-r1
deleted file mode 100644
index e7c3cc0974cc..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.3.0.0-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e4d894181f1859651658b3704633e10d MesaLib-6.5.2.tar.bz2 3295166
-RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 MesaLib-6.5.2.tar.bz2 3295166
-SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f MesaLib-6.5.2.tar.bz2 3295166
-MD5 a51a7d482e3c689394755bb17bda8526 xorg-server-1.3.0.0.tar.bz2 5968263
-RMD160 1a4fecd73aed0d5adabe84066c24ce69dc2c2dc1 xorg-server-1.3.0.0.tar.bz2 5968263
-SHA256 93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975 xorg-server-1.3.0.0.tar.bz2 5968263
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.4-r2 b/x11-base/xorg-server/files/digest-xorg-server-1.4-r2
deleted file mode 100644
index c06a742153f7..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.4-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c056abd763e899114bf745c9eedbf9ad MesaLib-7.0.1.tar.bz2 3343538
-RMD160 b44fd8ebffd17aa72c3b6cca1c2924e66787aa78 MesaLib-7.0.1.tar.bz2 3343538
-SHA256 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7 MesaLib-7.0.1.tar.bz2 3343538
-MD5 a06d9fe4f9f1d459ae02657f9ce64220 xorg-server-1.4.tar.bz2 6179392
-RMD160 74a274c880a9508be26b76acdb504a8e88b63a46 xorg-server-1.4.tar.bz2 6179392
-SHA256 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2 xorg-server-1.4.tar.bz2 6179392
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.4.0.90 b/x11-base/xorg-server/files/digest-xorg-server-1.4.0.90
deleted file mode 100644
index dba77fdbaad4..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.4.0.90
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 93e6ed7924ff069a4f883b4fce5349dc MesaLib-7.0.2.tar.bz2 3353217
-RMD160 3d471062b60889baef48a1a4596de6e32e1530cf MesaLib-7.0.2.tar.bz2 3353217
-SHA256 9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e MesaLib-7.0.2.tar.bz2 3353217
-MD5 bb16e969850dbb5d3805cb88d35656d0 xorg-server-1.4.0.90.tar.bz2 6315011
-RMD160 181b3c682710265df3c6ed30e164be9290f1f39e xorg-server-1.4.0.90.tar.bz2 6315011
-SHA256 b89f2d17be5ba71e3cc25379e18155c55ea36ba94ac1abae953214f13c020ffe xorg-server-1.4.0.90.tar.bz2 6315011
diff --git a/x11-base/xorg-server/files/xorg-xserver-1.2.0-xcmisc.diff b/x11-base/xorg-server/files/xorg-xserver-1.2.0-xcmisc.diff
deleted file mode 100644
index b67d2eef17d6..000000000000
--- a/x11-base/xorg-server/files/xorg-xserver-1.2.0-xcmisc.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
-index f26218e..8c7a86e 100644
---- a/Xext/xcmisc.c
-+++ b/Xext/xcmisc.c
-@@ -42,6 +42,12 @@ #include "swaprep.h"
- #include <X11/extensions/xcmiscstr.h>
- #include "modinit.h"
-
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#elif !defined(UINT32_MAX)
-+#define UINT32_MAX 0xffffffffU
-+#endif
-+
- #if 0
- static unsigned char XCMiscCode;
- #endif
-@@ -143,7 +149,10 @@ ProcXCMiscGetXIDList(client)
-
- REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
-
-- pids = (XID *)ALLOCATE_LOCAL(stuff->count * sizeof(XID));
-+ if (stuff->count > UINT32_MAX / sizeof(XID))
-+ return BadAlloc;
-+
-+ pids = (XID *)Xalloc(stuff->count * sizeof(XID));
- if (!pids)
- {
- return BadAlloc;
-@@ -164,7 +173,7 @@ ProcXCMiscGetXIDList(client)
- client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
- WriteSwappedDataToClient(client, count * sizeof(XID), pids);
- }
-- DEALLOCATE_LOCAL(pids);
-+ Xfree(pids);
- return(client->noClientException);
- }
-