Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/x11-base
diff options
context:
space:
mode:
authorJoshua Baergen <joshuabaergen@gentoo.org>2006-07-01 16:36:17 +0000
committerJoshua Baergen <joshuabaergen@gentoo.org>2006-07-01 16:36:17 +0000
commit701609ed0f96baf7e6cc7729bbd2d9fac3b68ea0 (patch)
tree6c4529d9f8190471d0fe6a2c99bc417910c2fbf3 /x11-base
parentKeyworded ~amd64 (diff)
downloadhistorical-701609ed0f96baf7e6cc7729bbd2d9fac3b68ea0.tar.gz
historical-701609ed0f96baf7e6cc7729bbd2d9fac3b68ea0.tar.bz2
historical-701609ed0f96baf7e6cc7729bbd2d9fac3b68ea0.zip
Fix the setuid patches. (Thanks to Rudo Thomas for the catch in bug #138688)
Package-Manager: portage-2.1.1_pre1-r5
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/Manifest24
-rw-r--r--x11-base/xorg-server/files/x11r7.0-setuid.diff2
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff2
4 files changed, 19 insertions, 15 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 7310f5ea25f6..9a4187fea3aa 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.139 2006/07/01 01:08:57 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.140 2006/07/01 16:36:17 joshuabaergen Exp $
+
+ 01 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+ files/x11r7.0-setuid.diff, files/xorg-server-1.1.0-setuid.diff:
+ Fix the setuid patches. (Thanks to Rudo Thomas for the catch in bug #138688)
01 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>;
xorg-server-1.1.0-r1.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 50759bc27336..c9b75cdb431e 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -26,10 +26,10 @@ AUX CVE-2006-1526-xrender-mitri.patch 819 RMD160 ab993ffd54ec143755f00a2cfc52625
MD5 c51e1f359e9008bd496173a013866343 files/CVE-2006-1526-xrender-mitri.patch 819
RMD160 ab993ffd54ec143755f00a2cfc526253fdb7230b files/CVE-2006-1526-xrender-mitri.patch 819
SHA256 1558fcaf5f1f6050c6a38023bc4effd8802320c2c6b3c146f19ceb8beb2d367b files/CVE-2006-1526-xrender-mitri.patch 819
-AUX x11r7.0-setuid.diff 3512 RMD160 00dcecbdcd8323086cb5441111b86e425342bd01 SHA1 15a880590b59332f9de7fa1e66af703c0fecf409 SHA256 aac1cdff3fea210b683326f9360f1e8c91a821a032cc84fc388d41e01f206538
-MD5 888430c6afc2919a12bf2fc05cb3a4cc files/x11r7.0-setuid.diff 3512
-RMD160 00dcecbdcd8323086cb5441111b86e425342bd01 files/x11r7.0-setuid.diff 3512
-SHA256 aac1cdff3fea210b683326f9360f1e8c91a821a032cc84fc388d41e01f206538 files/x11r7.0-setuid.diff 3512
+AUX x11r7.0-setuid.diff 3513 RMD160 a6b7b95e54b748ad2d1892395927a9c681e940ea SHA1 1f46fd5e5938682885c44025a0883a5181859cdc SHA256 8305e689358d5a92c1fae74f520a044677d468d6a617afddc5013af7b37c5db6
+MD5 0411ec21c16bdabd945159476b1c796a files/x11r7.0-setuid.diff 3513
+RMD160 a6b7b95e54b748ad2d1892395927a9c681e940ea files/x11r7.0-setuid.diff 3513
+SHA256 8305e689358d5a92c1fae74f520a044677d468d6a617afddc5013af7b37c5db6 files/x11r7.0-setuid.diff 3513
AUX xorg-server-1.0.2-64bit-fix-for-glx.patch 414 RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 SHA1 3464a0f714810d36da11424103550e604f93b22f SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4
MD5 900d8194df467de2c86276d446522062 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
@@ -58,10 +58,10 @@ AUX xorg-server-1.0.2-xprint-init.patch 417 RMD160 e29f58581c421724adf09f1df3e99
MD5 5106c724275e86950e5f4c88913198a1 files/xorg-server-1.0.2-xprint-init.patch 417
RMD160 e29f58581c421724adf09f1df3e991092f89a017 files/xorg-server-1.0.2-xprint-init.patch 417
SHA256 89c8e2253b374b2152908dd4514a19ff302b753d6a7c8be272999ad192edc905 files/xorg-server-1.0.2-xprint-init.patch 417
-AUX xorg-server-1.1.0-setuid.diff 3372 RMD160 e9db8b3e9317c75b22b565b57ba00dc2d50fc664 SHA1 e72b50c6434d429abaf0c13d9e78e1d467579fe9 SHA256 f27195e2d8a23d47132d51ae46a4d2fa497b06dec4f15bf0a7164130541aff7e
-MD5 bd7f9871a9142197b8f45ad09969c6c5 files/xorg-server-1.1.0-setuid.diff 3372
-RMD160 e9db8b3e9317c75b22b565b57ba00dc2d50fc664 files/xorg-server-1.1.0-setuid.diff 3372
-SHA256 f27195e2d8a23d47132d51ae46a4d2fa497b06dec4f15bf0a7164130541aff7e files/xorg-server-1.1.0-setuid.diff 3372
+AUX xorg-server-1.1.0-setuid.diff 3373 RMD160 5d9c1e6696ed5eaa9de9425633c0bfee493e6973 SHA1 256aa1ef94425f461c97a6e42b282aaf401fcd14 SHA256 af678fea5e624eb20a232b3db1a0f168085b780d8e627739fd8d088f033c2fd9
+MD5 d806558d64462780cbd1512ab6dc4dd7 files/xorg-server-1.1.0-setuid.diff 3373
+RMD160 5d9c1e6696ed5eaa9de9425633c0bfee493e6973 files/xorg-server-1.1.0-setuid.diff 3373
+SHA256 af678fea5e624eb20a232b3db1a0f168085b780d8e627739fd8d088f033c2fd9 files/xorg-server-1.1.0-setuid.diff 3373
AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29e11f813bb1353b4cc815708e97bfbb96b SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13
MD5 9bf4e36931c99f405aa6766ff5614e51 files/xprint.init 598
RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e files/xprint.init 598
@@ -83,10 +83,10 @@ EBUILD xorg-server-1.1.0-r1.ebuild 23910 RMD160 e99791f4276740589d2218bd3b47af71
MD5 8c8cf9b04f44070f8e22008313ffa95f xorg-server-1.1.0-r1.ebuild 23910
RMD160 e99791f4276740589d2218bd3b47af7177767015 xorg-server-1.1.0-r1.ebuild 23910
SHA256 736982e748a0fe2424aba24225e12ee9354c0d96b653c0a17eb2bf00504b674e xorg-server-1.1.0-r1.ebuild 23910
-MISC ChangeLog 29519 RMD160 66131dddfa49f18e212fa7f8bccc09eecf98c16a SHA1 b344ffea064dd44be6b2fb213287c37c395053af SHA256 f6b2c1535614cd0fb3ee323df2808bec2b357a5b9c739dfa20cb71c19d0a6d35
-MD5 66a946fb8ced658253b1a095a71a9c5b ChangeLog 29519
-RMD160 66131dddfa49f18e212fa7f8bccc09eecf98c16a ChangeLog 29519
-SHA256 f6b2c1535614cd0fb3ee323df2808bec2b357a5b9c739dfa20cb71c19d0a6d35 ChangeLog 29519
+MISC ChangeLog 29727 RMD160 6e3ebb5c3381b953fbea1083f2e3db59ddff257f SHA1 7ef75e2af98c2133b3cf5a7b0f19045f37fe79b3 SHA256 3e7848700abf91e1c37b083ea192779cee2e16f787ed1355fc7b43313eb8e2a5
+MD5 a45475b98133fda6988f3ce7c67c97a6 ChangeLog 29727
+RMD160 6e3ebb5c3381b953fbea1083f2e3db59ddff257f ChangeLog 29727
+SHA256 3e7848700abf91e1c37b083ea192779cee2e16f787ed1355fc7b43313eb8e2a5 ChangeLog 29727
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
diff --git a/x11-base/xorg-server/files/x11r7.0-setuid.diff b/x11-base/xorg-server/files/x11r7.0-setuid.diff
index 20a6786ce6c3..4d813539d030 100644
--- a/x11-base/xorg-server/files/x11r7.0-setuid.diff
+++ b/x11-base/xorg-server/files/x11r7.0-setuid.diff
@@ -49,7 +49,7 @@ diff -u -u -r1.3 write.c
return 0;
case 0: /* child */
- setuid(getuid());
-+ if (setuid(getuid() == -1)
++ if (setuid(getuid()) == -1)
+ FatalError("xf86writeConfigFile(): "
+ "setuid failed(%s)\n",
+ strerror(errno));
diff --git a/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff b/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff
index a419c59d925e..96d2d0a3225a 100644
--- a/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff
+++ b/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff
@@ -49,7 +49,7 @@ diff -u -u -r1.3 write.c
return 0;
case 0: /* child */
- setuid(getuid());
-+ if (setuid(getuid() == -1)
++ if (setuid(getuid()) == -1)
+ FatalError("xf86writeConfigFile(): "
+ "setuid failed(%s)\n",
+ strerror(errno));