From 7180fed2f6a7872213359c0077dbb5a09885a157 Mon Sep 17 00:00:00 2001 From: Joshua Baergen Date: Sat, 17 Sep 2005 06:15:12 +0000 Subject: [PATCH] =?utf8?q?Fixed=20previous=20security=20update=20as=20it?= =?utf8?q?=20did=20not=20match=20upstream's=20patch.=20=20Much=20thanks=20?= =?utf8?q?to=20Alexander=20Br=C3=BCning=20for=20providing=20and=20testing?= =?utf8?q?=20the=20new=20patch.=20=20Closes=20bug=20#105859.=20Package-Man?= =?utf8?q?ager:=20portage-2.0.52-r1?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- x11-base/xorg-x11/ChangeLog | 10 +++++++++- x11-base/xorg-x11/Manifest | 6 +++--- ...gest-xorg-x11-6.8.2-r3 => digest-xorg-x11-6.8.2-r4} | 2 +- ...rg-x11-6.8.2-r3.ebuild => xorg-x11-6.8.2-r4.ebuild} | 6 +++--- 4 files changed, 16 insertions(+), 8 deletions(-) rename x11-base/xorg-x11/files/{digest-xorg-x11-6.8.2-r3 => digest-xorg-x11-6.8.2-r4} (83%) rename x11-base/xorg-x11/{xorg-x11-6.8.2-r3.ebuild => xorg-x11-6.8.2-r4.ebuild} (99%) diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 3a1338be7cdd..035a5e92b777 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.454 2005/09/13 03:26:11 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.455 2005/09/17 06:15:12 joshuabaergen Exp $ + +*xorg-x11-6.8.2-r4 (17 Sep 2005) + + 17 Sep 2005; Joshua Baergen + -xorg-x11-6.8.2-r3.ebuild, +xorg-x11-6.8.2-r4.ebuild: + Fixed previous security update as it did not match upstream's patch. Much + thanks to Alexander Brüning for providing and testing the new patch. Closes + bug #105859. 13 Sep 2005; Joshua Baergen xorg-x11-6.8.99.15-r1.ebuild: diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index c693d52b91e3..174d696cf773 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,6 +1,6 @@ -MD5 1820618c8138d75894a118658fbca370 ChangeLog 104583 +MD5 66e65a6312c7d998005552fe2a214bba ChangeLog 104903 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 -MD5 c57c2dbc2daf64639cf2c768c3381b1e xorg-x11-6.8.2-r3.ebuild 54891 +MD5 504238298f279ddfc60610c13a235218 xorg-x11-6.8.2-r4.ebuild 54903 MD5 b5ab951ac84587fdcaf7d95f41679910 xorg-x11-6.8.99.15-r1.ebuild 54045 -MD5 7b900d6084eb8bb29978faa90a5ba6f7 files/digest-xorg-x11-6.8.2-r3 506 +MD5 84ed1084819731e2acef3610f0b6b30a files/digest-xorg-x11-6.8.2-r4 506 MD5 bf301d933e0753dfcd5c6a93dd613b57 files/digest-xorg-x11-6.8.99.15-r1 518 diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r3 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r4 similarity index 83% rename from x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r3 rename to x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r4 index 11a9b465da76..242584b5e373 100644 --- a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r3 +++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r4 @@ -3,5 +3,5 @@ MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892 MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173 MD5 3558cdcca5bdd1d17d468408c794aea6 xorg-x11-6.8.2-files-0.8.tar.bz2 9920 -MD5 ff733f2f8e5bcb52ca183a91cea4e9a3 xorg-x11-6.8.2-patches-0.1.10.1.tar.bz2 166124 +MD5 564db71503016fea940277c36eebe744 xorg-x11-6.8.2-patches-0.1.10.2.tar.bz2 166360 MD5 8131cd7ea1e4566e6e05c438a93fcfe1 X11R6.8.2-src.tar.bz2 44371402 diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r3.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild similarity index 99% rename from x11-base/xorg-x11/xorg-x11-6.8.2-r3.ebuild rename to x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild index e6f9e92f2139..ebef6e96f9c4 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.2-r3.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r3.ebuild,v 1.1 2005/09/12 14:15:49 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild,v 1.1 2005/09/17 06:15:12 joshuabaergen Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -38,7 +38,7 @@ IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server # IUSE_INPUT_DEVICES="synaptics wacom" FILES_VER="0.8" -PATCH_VER="0.1.10.1" +PATCH_VER="0.1.10.2" XCUR_VER="0.3.1" XFSFT_ENC_VER="0.1" @@ -47,7 +47,7 @@ S=${WORKDIR}/xc HOMEPAGE="http://xorg.freedesktop.org/" # Misc patches we may need to fetch .. -X_PATCHES="http://dev.gentoo.org/~seemant/distfiles/${P}-patches-${PATCH_VER}.tar.bz2 +X_PATCHES="http://dev.gentoo.org/~joshuabaergen/distfiles/${P}-patches-${PATCH_VER}.tar.bz2 mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2" GENTOO_FILES="http://dev.gentoo.org/~seemant/distfiles/${P}-files-${FILES_VER}.tar.bz2 -- 2.26.2