summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Baergen <joshuabaergen@gentoo.org>2006-11-05 00:20:01 +0000
committerJoshua Baergen <joshuabaergen@gentoo.org>2006-11-05 00:20:01 +0000
commit112fe3c20bb44c0d2e230c2a97a2db3bd0eeb295 (patch)
tree6935e48067ec060f4f6445b3860b4762453411a8 /x11-base
parentRemove inherit debug (diff)
downloadhistorical-112fe3c20bb44c0d2e230c2a97a2db3bd0eeb295.tar.gz
historical-112fe3c20bb44c0d2e230c2a97a2db3bd0eeb295.tar.bz2
historical-112fe3c20bb44c0d2e230c2a97a2db3bd0eeb295.zip
Add missing patch.
Package-Manager: portage-2.1.2_rc1-r3
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/Manifest12
-rw-r--r--x11-base/xorg-server/files/1.2.99.0-fix-sysconfdir-references.patch11
3 files changed, 24 insertions, 5 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index aca282cff9fe..8fc7c65d2946 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.194 2006/11/04 23:54:49 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.195 2006/11/05 00:20:01 joshuabaergen Exp $
+
+ 05 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+ +files/1.2.99.0-fix-sysconfdir-references.patch:
+ Add missing patch.
04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
xorg-server-1.2.99.0.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 18c319068d03..f77c80c317c4 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -54,6 +54,10 @@ AUX 1.1.1-sparc64-ati-lockups.patch 652 RMD160 7d642aa1c0153a4c48b8d2338b1afafdb
MD5 b20d4cd92f74e0722b9cf2e5f0704655 files/1.1.1-sparc64-ati-lockups.patch 652
RMD160 7d642aa1c0153a4c48b8d2338b1afafdbc130852 files/1.1.1-sparc64-ati-lockups.patch 652
SHA256 0db8886c157b253449057865c938b63aa8a4f11d746e5df4ed2a12b75d718c51 files/1.1.1-sparc64-ati-lockups.patch 652
+AUX 1.2.99.0-fix-sysconfdir-references.patch 421 RMD160 4af58784b1af8c02ebe395530da3e0a3f619c9a9 SHA1 3c836428f18aa6e42a8ab243c59c9693af57100e SHA256 216905a6ac45ae01cbec53c5a8a5ebd53e9c8f647e91d57d926f9109a73cef24
+MD5 cceefbe34d34bd2d776d95d63851ec51 files/1.2.99.0-fix-sysconfdir-references.patch 421
+RMD160 4af58784b1af8c02ebe395530da3e0a3f619c9a9 files/1.2.99.0-fix-sysconfdir-references.patch 421
+SHA256 216905a6ac45ae01cbec53c5a8a5ebd53e9c8f647e91d57d926f9109a73cef24 files/1.2.99.0-fix-sysconfdir-references.patch 421
AUX CVE-2006-1526-xrender-mitri.patch 819 RMD160 ab993ffd54ec143755f00a2cfc526253fdb7230b SHA1 fe760840ec4d6023f713f9b79b745c7822a37828 SHA256 1558fcaf5f1f6050c6a38023bc4effd8802320c2c6b3c146f19ceb8beb2d367b
MD5 c51e1f359e9008bd496173a013866343 files/CVE-2006-1526-xrender-mitri.patch 819
RMD160 ab993ffd54ec143755f00a2cfc526253fdb7230b files/CVE-2006-1526-xrender-mitri.patch 819
@@ -144,10 +148,10 @@ EBUILD xorg-server-1.2.99.0.ebuild 16896 RMD160 a8ae75b0da9cda05098ad5eb63264f4f
MD5 4356e12095e735444acdc5493d3b342e xorg-server-1.2.99.0.ebuild 16896
RMD160 a8ae75b0da9cda05098ad5eb63264f4f416e4f5f xorg-server-1.2.99.0.ebuild 16896
SHA256 8a1999f3fe8a936ae8f1e0e172237cc869d83fceb3c9c04359795c7e9c718efe xorg-server-1.2.99.0.ebuild 16896
-MISC ChangeLog 40066 RMD160 058f09e5541465ed2d08c5d46641f608124207d3 SHA1 df9ef8e6fcfb75d767adcc2fd306e8e9a77c108f SHA256 392715bdacd85bf90ea783ea62cb97d67522f14a998f02bc95b2586e042a72cd
-MD5 214ac219e3da3826b464ad4b69262698 ChangeLog 40066
-RMD160 058f09e5541465ed2d08c5d46641f608124207d3 ChangeLog 40066
-SHA256 392715bdacd85bf90ea783ea62cb97d67522f14a998f02bc95b2586e042a72cd ChangeLog 40066
+MISC ChangeLog 40196 RMD160 9ffdcf95a5cc78a36c2f7fe7540bc054d082444f SHA1 6e3c9cb616986f588c8ab31dc0cf47409d3256c3 SHA256 f09d8aefee7d184dea114436c4c6a3fb3fb45dc95f4b8d35956b2e391a2700fb
+MD5 ebdd9561fb059f65cb5542ea03fff929 ChangeLog 40196
+RMD160 9ffdcf95a5cc78a36c2f7fe7540bc054d082444f ChangeLog 40196
+SHA256 f09d8aefee7d184dea114436c4c6a3fb3fb45dc95f4b8d35956b2e391a2700fb ChangeLog 40196
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/1.2.99.0-fix-sysconfdir-references.patch b/x11-base/xorg-server/files/1.2.99.0-fix-sysconfdir-references.patch
new file mode 100644
index 000000000000..7d5b8ab2f25c
--- /dev/null
+++ b/x11-base/xorg-server/files/1.2.99.0-fix-sysconfdir-references.patch
@@ -0,0 +1,11 @@
+--- configure.ac.old 2006-11-04 15:27:24.000000000 -0700
++++ configure.ac 2006-11-04 15:28:32.000000000 -0700
+@@ -1342,7 +1342,7 @@
+
+ dnl these only go in xorg-config.h
+ XF86CONFIGFILE="xorg.conf"
+- CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
++ CONFIGFILE="$sysconfdir/X11/$XF86CONFIGFILE"
+ LOGPREFIX="$logdir/Xorg."
+ AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
+ AC_DEFINE(XORGSERVER, 1, [Building Xorg server])