summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2006-07-01 19:32:58 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2006-07-01 19:32:58 +0000
commit6751200daf8a1b104ad0a7629fae59d4afb731e8 (patch)
tree997343ea531eb88c99ca05b230f629402f6c9c7d /x11-base
parentqmail-dhparam.sh is not needed, because its functionality is in qmail-genrsac... (diff)
downloadhistorical-6751200daf8a1b104ad0a7629fae59d4afb731e8.tar.gz
historical-6751200daf8a1b104ad0a7629fae59d4afb731e8.tar.bz2
historical-6751200daf8a1b104ad0a7629fae59d4afb731e8.zip
(#138688) Missing close parenthesis on one of the getuid() calls (Rudo Thomas).
Package-Manager: portage-2.1.1_pre1-r5
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog6
-rw-r--r--x11-base/xorg-x11/Manifest24
-rw-r--r--x11-base/xorg-x11/files/x11r6.9.0-setuid.diff2
-rw-r--r--x11-base/xorg-x11/files/xorg-68x-setuid.patch2
4 files changed, 19 insertions, 15 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index bf01e75f2679..893dd1c9a53d 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.558 2006/07/01 06:41:31 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.559 2006/07/01 19:32:58 spyderous Exp $
+
+ 01 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>;
+ files/x11r6.9.0-setuid.diff, files/xorg-68x-setuid.patch:
+ (#138688) Missing close parenthesis on one of the getuid() calls (Rudo Thomas).
*xorg-x11-6.9.0-r3 (01 Jul 2006)
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 4b190619c455..5c175cb05853 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -6,14 +6,14 @@ AUX CVE-2006-1526-xrender-mitri.patch 833 RMD160 a7ac6f0b9925ffee95fcac0549e1e68
MD5 daeec68d1c01357b57daa15ff859ddc5 files/CVE-2006-1526-xrender-mitri.patch 833
RMD160 a7ac6f0b9925ffee95fcac0549e1e68f29b5e783 files/CVE-2006-1526-xrender-mitri.patch 833
SHA256 7a5f115be88411ed28d1098a79be021440c57fef3200cabfec48c943d3b0df01 files/CVE-2006-1526-xrender-mitri.patch 833
-AUX x11r6.9.0-setuid.diff 12758 RMD160 83e86fb3fefa788ee4188a4605856da15dd082ad SHA1 cc6ffaf963174014efa868f93d2fbaa516bc3d13 SHA256 125713ffd48531eb240f75c3b090f867f603e43b1c4392ae31a4fd60dc029ee6
-MD5 55734b47ee41ece8500e0e713a84be00 files/x11r6.9.0-setuid.diff 12758
-RMD160 83e86fb3fefa788ee4188a4605856da15dd082ad files/x11r6.9.0-setuid.diff 12758
-SHA256 125713ffd48531eb240f75c3b090f867f603e43b1c4392ae31a4fd60dc029ee6 files/x11r6.9.0-setuid.diff 12758
-AUX xorg-68x-setuid.patch 12868 RMD160 ab00ef8988e8821a5133f91c4ab05fbe1f4e9025 SHA1 d00815d19152da84de6677fcae04e6d96ee5db70 SHA256 bdb6194875b0a674f8e8b953380895f61f5ccbd2bfa25996c09fb27d2ea4f826
-MD5 0ce4435659d13cb75e409e92639f22eb files/xorg-68x-setuid.patch 12868
-RMD160 ab00ef8988e8821a5133f91c4ab05fbe1f4e9025 files/xorg-68x-setuid.patch 12868
-SHA256 bdb6194875b0a674f8e8b953380895f61f5ccbd2bfa25996c09fb27d2ea4f826 files/xorg-68x-setuid.patch 12868
+AUX x11r6.9.0-setuid.diff 12759 RMD160 42c9b60d770756e8f2003c8fd5771130bc4636b2 SHA1 918cf9d893f445d653b6872075503be23d7e9e72 SHA256 20ef7602113fef90b61c748801b1fb970496e53ec5ccfcb81e96fb005b092670
+MD5 ab62c18f015f3831228973e04b2aeac5 files/x11r6.9.0-setuid.diff 12759
+RMD160 42c9b60d770756e8f2003c8fd5771130bc4636b2 files/x11r6.9.0-setuid.diff 12759
+SHA256 20ef7602113fef90b61c748801b1fb970496e53ec5ccfcb81e96fb005b092670 files/x11r6.9.0-setuid.diff 12759
+AUX xorg-68x-setuid.patch 12869 RMD160 8d69e406fdff0b103103091a00ec683c9277728e SHA1 e3c0fcfd5f9c2f4867403f8855eaec4851066e05 SHA256 c259abd6261b03f5e7d6345e518c4eea6d0cb4099f4763dc971c202615b24558
+MD5 7e467c0981922e58eedae06f34465905 files/xorg-68x-setuid.patch 12869
+RMD160 8d69e406fdff0b103103091a00ec683c9277728e files/xorg-68x-setuid.patch 12869
+SHA256 c259abd6261b03f5e7d6345e518c4eea6d0cb4099f4763dc971c202615b24558 files/xorg-68x-setuid.patch 12869
DIST X11R6.8.2-src.tar.bz2 44371402 RMD160 80efdaf74a25e43c77aab1d83e817f03f344d105 SHA1 632e25a202bc41bb9b1c5dbc8bbb0d775c6593b0 SHA256 f02e3c85572dc9ad7cb77c2a638e3be24cc1b5bea9fdbb0b0299c9668475c534
DIST X11R6.9.0-src.tar.bz2 46220125 RMD160 5c830d43607c4550ad44936d77b5adc56f67dbf5 SHA1 45a5dd78398ab499b05ad6feadf05415ff382703 SHA256 6509e5bee489ab7c8d0c255c12f6ceb8f06be74b57b060b6e9a61497710a3f4c
DIST eurofonts-X11.tar.bz2 8811 RMD160 d3f54324dcfd961dc128a257917a90a5bc9560da SHA1 ca04f550186cc152db342759ac79ba2eef053ea8 SHA256 6028bda00ecf403f1723ca66d24ed3f609bf6d7eaef46e0facb04fb322aac3e3
@@ -44,10 +44,10 @@ EBUILD xorg-x11-7.1.ebuild 3981 RMD160 c8b2dabe153c34f99cd2f55a56f26d40e437f784
MD5 72be3f55ebcd72173517a9f1376e4e82 xorg-x11-7.1.ebuild 3981
RMD160 c8b2dabe153c34f99cd2f55a56f26d40e437f784 xorg-x11-7.1.ebuild 3981
SHA256 f207c94bde224cedfbe4b707394b9bf4556fd4359788ea996d272fd6408b1f15 xorg-x11-7.1.ebuild 3981
-MISC ChangeLog 121835 RMD160 8478afbd7683a7be392ce4f30574aaaec0a06758 SHA1 be151c0edc41c1edeab2534d6726aa659782dab6 SHA256 19efd421608405c4014ac5e63e467cbc8f795524dfa45205bc440dd47f89cf0f
-MD5 d5d00341dfae7fc2d2d1b40d38d0aa9f ChangeLog 121835
-RMD160 8478afbd7683a7be392ce4f30574aaaec0a06758 ChangeLog 121835
-SHA256 19efd421608405c4014ac5e63e467cbc8f795524dfa45205bc440dd47f89cf0f ChangeLog 121835
+MISC ChangeLog 122033 RMD160 11e99230d0003be9a17be5d5feb577ae3746cd05 SHA1 37c923f18a59edd5f6332fe12333686d48acb460 SHA256 f52d7db988326d969a210f3041f051a0c85ceb031f96d94b535c6b2231825443
+MD5 1126a1186f0e60237f9331743c5da854 ChangeLog 122033
+RMD160 11e99230d0003be9a17be5d5feb577ae3746cd05 ChangeLog 122033
+SHA256 f52d7db988326d969a210f3041f051a0c85ceb031f96d94b535c6b2231825443 ChangeLog 122033
MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0
MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
RMD160 a293db25b0a2b203eb1b788ee62601190618066e metadata.xml 230
diff --git a/x11-base/xorg-x11/files/x11r6.9.0-setuid.diff b/x11-base/xorg-x11/files/x11r6.9.0-setuid.diff
index eede645c394b..9bdb1fa740e6 100644
--- a/x11-base/xorg-x11/files/x11r6.9.0-setuid.diff
+++ b/x11-base/xorg-x11/files/x11r6.9.0-setuid.diff
@@ -136,7 +136,7 @@ diff -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-x11/files/xorg-68x-setuid.patch b/x11-base/xorg-x11/files/xorg-68x-setuid.patch
index 65106d6d75c2..09eaf45cfdf8 100644
--- a/x11-base/xorg-x11/files/xorg-68x-setuid.patch
+++ b/x11-base/xorg-x11/files/xorg-68x-setuid.patch
@@ -136,7 +136,7 @@ diff -u -r1.2 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));