From ecef83ed3ced153c3599a31e85e3e87b0192c655 Mon Sep 17 00:00:00 2001 From: Dan Nichilson Date: Tue, 23 Jan 2007 19:00:33 +0000 Subject: [PATCH] Add patchlevel Xorg-7.1+ updates and remove unneeded patches git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6458 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- introduction/welcome/changelog.xml | 5 ++++ x/installing/luit.xml | 12 +++------- x/installing/x7app.xml | 37 ++++-------------------------- x/installing/x7lib.xml | 29 ++++------------------- x/installing/x7server.xml | 14 +++++------ 5 files changed, 25 insertions(+), 72 deletions(-) diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 81b5a27c2d..19272270ef 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -44,6 +44,11 @@ January 23rd, 2007 + + [dnicholson] - Patchlevel upgrades to the Xorg-7 + packages. Removed unneeded patches encompassed in these + updates. See #2225 for more details. + [dnicholson] - Changed the download location for the Xorg-7 wget lists and md5sums file. diff --git a/x/installing/luit.xml b/x/installing/luit.xml index 1de35944c2..731fa8ee35 100644 --- a/x/installing/luit.xml +++ b/x/installing/luit.xml @@ -6,8 +6,8 @@ - - + + @@ -71,15 +71,9 @@ - A patch is required to fix a race condition in - luit that was discovered shortly after - release. Download the patch from - . - Install luit with the following commands: -patch -Np1 -i ../luit-&luit-version;-race-1.patch && -./configure $XORG_CONFIG && +./configure $XORG_CONFIG && make This package does not come with a test suite. diff --git a/x/installing/x7app.xml b/x/installing/x7app.xml index 94f32e3fbd..da1dc0dbe7 100644 --- a/x/installing/x7app.xml +++ b/x/installing/x7app.xml @@ -56,22 +56,10 @@ - Additional Downloads - - Required patch: - - - Required patch: - - - Required patch: - Required patch: @@ -110,25 +98,10 @@ wget -B http://xorg.freedesktop.org/releases/individual/app/ \ Installation of Xorg Applications A security - vulnerability has been identified in the xdm, xf86dga, xinit - and xload packages. Before building these packages with the commands - shown below, be sure to apply the supplied patches. For xdm, this can be - accomplished with with the following command: - -patch -Np1 -i ../xdm-1.0.4-setuid-1.patch - - For xf86dga, the patch can be applied with the following - command: - -patch -Np1 -i ../xf86dga-1.0.1-setuid-1.patch - - For xinit, the patch can be applied with the following - command: - -patch -Np1 -i ../xinit-1.0.2-setuid-1.patch - - For xload, the patch can be applied with the following - command: + vulnerability has been identified in the xload package. + Before building this package with the commands + shown below, be sure to apply the supplied patches. The patch can be + applied with with the following command: patch -Np1 -i ../xload-1.0.1-setuid-1.patch diff --git a/x/installing/x7lib.xml b/x/installing/x7lib.xml index 2b63b89a66..47afd0ef4e 100644 --- a/x/installing/x7lib.xml +++ b/x/installing/x7lib.xml @@ -55,18 +55,10 @@ - Additional Downloads - - Required patch: - - - Required patch: - Required patch: @@ -107,21 +99,10 @@ wget -B http://xorg.freedesktop.org/releases/individual/lib/ \ Installation of Xorg Libraries Security - vulnerabilities have been identified in the libX11, xtrans - and libXfont packages. Before building these packages with the - commands shown below, be sure to apply the supplied patches. - For libX11, this can be accomplished with with the following - command: - -patch -Np1 -i ../libX11-1.0.1-setuid-1.patch - - For xtrans, the patch can be applied with the following - command: - -patch -Np1 -i ../xtrans-1.0.0-setuid-1.patch - - For libXfont, the patch can be applied with the following - command: + vulnerabilities have been identified in the libXfont package. + Before building this package with the commands shown below, be sure + to apply the supplied patches. This can be accomplished with with the + following command: patch -Np1 -i ../libXfont-1.1.0-cidfonts-1.patch diff --git a/x/installing/x7server.xml b/x/installing/x7server.xml index 2affdc33a6..6bff0fcce0 100644 --- a/x/installing/x7server.xml +++ b/x/installing/x7server.xml @@ -6,8 +6,8 @@ - - + + @@ -61,7 +61,7 @@ Required patch: + url="&patch-root;/xorg-server-&xorg-server-version;-security-1.patch"/> @@ -105,12 +105,12 @@ hw/xfree86/os-support/linux/lnx_agp.c End remove --> - Multiple security - vulnerabilities have been identified in the xorg-server - package. Apply a patch to fix these vulnerabilities with the following + A security + vulnerability have been identified in the xorg-server + package. Apply a patch to fix this vulnerabily with the following command: -patch -Np1 -i ../xorg-server-1.1.0-security-1.patch +patch -Np1 -i ../xorg-server-&xorg-server-version;-security-1.patch Install the server by running the following commands: