From 0b92565405ccf174208ee5c83110c749db7f2ffc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ch=C3=AD-Thanh=20Christopher=20Nguy=E1=BB=85n?= Date: Sat, 22 Oct 2011 20:37:41 +0000 Subject: [PATCH] Drop vulnerable versions, bug #387069. Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64 --- x11-base/xorg-server/ChangeLog | 9 +- x11-base/xorg-server/Manifest | 33 +-- .../xorg-server/xorg-server-1.10.2.ebuild | 246 ---------------- .../xorg-server/xorg-server-1.10.3.ebuild | 246 ---------------- .../xorg-server/xorg-server-1.10.4.ebuild | 246 ---------------- .../xorg-server/xorg-server-1.11.0.ebuild | 231 --------------- .../xorg-server/xorg-server-1.11.1.ebuild | 240 ---------------- x11-base/xorg-server/xorg-server-1.9.4.ebuild | 268 ------------------ x11-base/xorg-server/xorg-server-1.9.5.ebuild | 268 ------------------ 9 files changed, 9 insertions(+), 1778 deletions(-) delete mode 100644 x11-base/xorg-server/xorg-server-1.10.2.ebuild delete mode 100644 x11-base/xorg-server/xorg-server-1.10.3.ebuild delete mode 100644 x11-base/xorg-server/xorg-server-1.10.4.ebuild delete mode 100644 x11-base/xorg-server/xorg-server-1.11.0.ebuild delete mode 100644 x11-base/xorg-server/xorg-server-1.11.1.ebuild delete mode 100644 x11-base/xorg-server/xorg-server-1.9.4.ebuild delete mode 100644 x11-base/xorg-server/xorg-server-1.9.5.ebuild diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index ba40596c635a..c349d7968fd2 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.621 2011/10/22 16:57:28 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.622 2011/10/22 20:37:41 chithanh Exp $ + + 22 Oct 2011; Chí-Thanh Christopher Nguyễn + -xorg-server-1.9.4.ebuild, -xorg-server-1.9.5.ebuild, + -xorg-server-1.10.2.ebuild, -xorg-server-1.10.3.ebuild, + -xorg-server-1.10.4.ebuild, -xorg-server-1.11.0.ebuild, + -xorg-server-1.11.1.ebuild: + Drop vulnerable versions, bug #387069. 22 Oct 2011; Kacper Kowalik xorg-server-1.9.5-r1.ebuild, xorg-server-1.10.4-r1.ebuild: diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 53c1f2e87603..a1495cca8ce9 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce @@ -10,39 +7,11 @@ AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200 AUX xorg-server-glapi_c.patch 2215 RMD160 2df0b6ef296744b0c6951f4ba76bfeeb09196d62 SHA1 5bb85cef608bd75eca7a091fb581c0243cb36598 SHA256 5f59b883d49f53d2f6f71cbbf5e4ef74bdf545238afd61fa3011e0eb311cfb3b AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c -DIST xorg-server-1.10.2.tar.bz2 5334473 RMD160 3d1ad6b236772ebe0400a69a03b9093bb210fd4b SHA1 fd831b3c6297d1a68830c602d767752d87b9ca54 SHA256 65264f6640568b9db8d738aec1ddd036c3ae21b7ba05b98d006759d11a72792c -DIST xorg-server-1.10.3.tar.bz2 5338354 RMD160 dfa59ac6d3f3f7fd059e6f92cead352845e08228 SHA1 1699be5c0edeca553cfa3ee6caa228483465136b SHA256 05ec05fbc8ec336127071db38cfb61c618e43b720edbd8d51d171c0cd359e290 DIST xorg-server-1.10.4.tar.bz2 5386174 RMD160 13eeaf7497e63ecddba46010c075d27121e18aae SHA1 857d6377025c77851a3cc5f8ec2ce84164a2fdc6 SHA256 fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5 -DIST xorg-server-1.11.0.tar.bz2 4984739 RMD160 add8c6cccb8dffbea2ca85685fc194feb2ee6331 SHA1 5fa0c0a190fbe1030a14e435de2d5a3259ca70be SHA256 9feb62c2972644fadaf94eda02c1d0009ec7089abd47086e5d9dcb4625338453 DIST xorg-server-1.11.1.tar.bz2 4933664 RMD160 a26efea8fae4f52d0eae22a18b392f5eab836aa7 SHA1 ed0358b61294f1283aad42cf1e609752ceeffafd SHA256 c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6 -DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458 DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737aabb70 SHA1 03be24d6906f3ed3237057a5a7df2b02723c9749 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc -EBUILD xorg-server-1.10.2.ebuild 7073 RMD160 2dc7bae93b5de516d6f1013128ab95ea8b6cd972 SHA1 ba0dc6c50f50aa62005b4b3446f380a4145d4767 SHA256 e56e846af8a90a1b9325ddb230780853bf5f7c0c8fb720a41741beb29e497fca -EBUILD xorg-server-1.10.3.ebuild 7087 RMD160 6222f30b612fd3185db9c2eb3f70bb078ff3a763 SHA1 ac59a753a5eb923a0f1924bb4a258f90c8f0eee0 SHA256 f0e36155145ab64714d2cfb298ff5d837aa4b8221a7f6ef9c9a54c2e7edb5736 EBUILD xorg-server-1.10.4-r1.ebuild 7127 RMD160 8175211bb28ac4559c8f229c947ffbf0a716e886 SHA1 dec56fcce06846cd3eeb1836a0bc0d4f90810380 SHA256 f3e3e1e78106b8f9f2333d74e5e531b9c6a2daaf8ee8634644f8088d5b7f5957 -EBUILD xorg-server-1.10.4.ebuild 7075 RMD160 ca1a373aabdc336ef1bef3c6b49d505f05b846cf SHA1 87c4bee857a03dfeb66cb95a46f344d598adc532 SHA256 2e781d163d9dbe5b7d56056d4833b18ae1d3fc6e12e73b8e0dc9b72e33308d4f -EBUILD xorg-server-1.11.0.ebuild 6632 RMD160 d37c7f4ba256b9aecb53e4bb8d5119b1945b09b0 SHA1 0ca898245a9a5fdd97f532ae7f0bc1549aaef626 SHA256 bbce960ba4d19c0777f68764a369d522205eb4a46d53591ef846116c863697b6 EBUILD xorg-server-1.11.1-r1.ebuild 6769 RMD160 fe1d31a37742ecd6d354d8318492cbef3f5eb5f2 SHA1 5dd87a9d1717435bbd2252a043078372dfbf6ccb SHA256 52b4276ee9615abc44b7fe93fc43a7daf13f7a916ca75b4e0020273f9d725de3 -EBUILD xorg-server-1.11.1.ebuild 6721 RMD160 6b1147edaa487c2d3a0bced95635927e7db3037e SHA1 ac6bef24e3ab6ad1e0b93e3a419833a62ca5b98e SHA256 567364f8fe23fe8b2127594498bc7a03851a70bbcf4763060df36b2de9b74cd4 -EBUILD xorg-server-1.9.4.ebuild 7795 RMD160 2a13a293b5d7964272260034f6af5ff6fbd75f16 SHA1 c115e24b6de40381e7a1bb47ac06fdcc1cf5b1fb SHA256 af0e0e9deb3267a0d77d6f6a92c2870eb68a8681e4c8d80c1c3ee12fe9d1282c EBUILD xorg-server-1.9.5-r1.ebuild 7850 RMD160 e2c14bf529edbafa9452855ca893a45e510d8625 SHA1 c52c0d51c61452fb83ea92cf20978cc2374ab23e SHA256 270f6563b0cf3b96b86e94a5d428ebf1b20be22bfe2a33b76a4463c79c6120c3 -EBUILD xorg-server-1.9.5.ebuild 7797 RMD160 983d476a4940317cd80814152d28906d0b0697c0 SHA1 0a7c4e083d9f3c21d50415af94b65402152bd2bf SHA256 77d599c5bab11366ea7eea08dc7d13c23e920892b67deea9b9a9204f870fd333 -MISC ChangeLog 131836 RMD160 e3d457dfd56e1ccfbfb6f9263597d8a39be23ab7 SHA1 ea45efd2b1b72f4ae71275a70dcec5fefd31da45 SHA256 cf947324a9bde6412b106b48f9205768979270d92bdb717e8a3faea7a20e0d01 +MISC ChangeLog 132147 RMD160 867f025f702ea52496746aeb641ce01c1be78b81 SHA1 2e44e7a35db9c2e9aa1dc9621bd4718bce921007 SHA256 1f7e280b72a2caf4fb22c72863000c18ec780c7c5034e560bcdf2bddd8d75a81 MISC metadata.xml 537 RMD160 36f5ed1e9869e06c50c882193aad04d9553fbab9 SHA1 505782abd459abe3ba35969cc190675e00c65408 SHA256 38cd6ed34cf5447cbc3e0a9c4a9e24d5af12e2a12b80b106821bb19e69d2281f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) - -iQIcBAEBCAAGBQJOovYFAAoJEF0huFKJUZL5MN0P/1Smiy4aqRlSkmQsDx9hPMJw -I1WhtCMg/HCD+wdBri8VUWE2KBS+FoAUq11/YS8CEA0SZ15h4mCOaPLEj8bC63CR -uvgthV2HJpaumMB4fTUx1wMt7sXduL5m9mFrHoodW9o66+HmALqTyRGvmwQUYjtC -mG3QKzt+F7IUlM52DhVNSoDIHHN1JPcp1aQT0Wqc0xLQNIRwYWNCv8mJvRwPGmu3 -mdLpeTlU1SOq1mDgp1gRVK9N5ousaDr2wGg9od/nRi4Mgepm+djxxs8CoQuEjRf9 -cEMQKTQwWILDjmNw/WzjhBUaV/n7xuCCEJtub/4A/pvFrr/hsc8aqe+af81J9gts -d+jYx0UEkJY0qXXYrtmA7n194ldsHy7+UVVDxwVy3dx6Nk3NoVxFxxKcRxYUjwUc -CHO62+ARd2D6i5I1lFXlNk3oHeTeSrvWwSAPG60cAm3mAlCuxDlAsn9+v+LWcLuK -NLMFaeguHKDVIY2sDE6GhuzbyysVo7vCRBEHBNAsvr92pGb0/dzD5zNzx+wX/eGc -36rO8LNwIQrY3D6NEHFgG07GQWv4PZUjNSLLYkQUKrIQCRSnjIdq5f/zi4ruARoU -ULacjGTJ4KpUqJjX+jxgXhp8fxhNFgvJL2bVMsFkESnGduh7V/k6nn8AP2V2SIh4 -fJr/CWyWNNbaANDxbltm -=R0W8 ------END PGP SIGNATURE----- diff --git a/x11-base/xorg-server/xorg-server-1.10.2.ebuild b/x11-base/xorg-server/xorg-server-1.10.2.ebuild deleted file mode 100644 index c25b24e961c7..000000000000 --- a/x11-base/xorg-server/xorg-server-1.10.2.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.2.ebuild,v 1.10 2011/08/20 15:41:42 jer Exp $ - -EAPI=4 - -XORG_DOC=doc -inherit xorg-2 multilib versionator -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" - -DESCRIPTION="X.Org X servers" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" - -IUSE_SERVERS="dmx kdrive xnest xorg xvfb" -IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev" - -RDEPEND=">=app-admin/eselect-opengl-1.0.8 - dev-libs/openssl - media-libs/freetype - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - x11-apps/xkbcomp - >=x11-libs/libpciaccess-0.10.3 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXfont-1.4.2 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/pixman-0.21.8 - >=x11-libs/xtrans-1.2.2 - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-1.4 - dmx? ( - x11-libs/libXt - >=x11-libs/libdmx-1.0.99.1 - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXext-1.0.99.4 - >=x11-libs/libXfixes-4.0.3 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - >=x11-libs/libXres-1.0.3 - >=x11-libs/libXtst-1.0.99.2 - ) - kdrive? ( - >=x11-libs/libXext-1.0.5 - x11-libs/libXv - ) - !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-7.8_rc[nptl=] - ) - tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) - udev? ( >=sys-fs/udev-150 ) - >=x11-apps/xinit-1.3" - -# dmx+doc DEPEND is a hack, a proper solution needs to be implemented in the -# xorg-2.eclass for next release -DEPEND="${RDEPEND} - sys-devel/flex - >=x11-proto/bigreqsproto-1.1.0 - >=x11-proto/compositeproto-0.4 - >=x11-proto/damageproto-1.1 - >=x11-proto/fixesproto-4.1 - >=x11-proto/fontsproto-2.0.2 - >=x11-proto/glproto-1.4.11 - >=x11-proto/inputproto-1.9.99.902 - >=x11-proto/kbproto-1.0.3 - >=x11-proto/randrproto-1.2.99.3 - >=x11-proto/recordproto-1.13.99.1 - >=x11-proto/renderproto-0.11 - >=x11-proto/resourceproto-1.0.2 - >=x11-proto/scrnsaverproto-1.1 - >=x11-proto/trapproto-3.4.3 - >=x11-proto/videoproto-2.2.2 - >=x11-proto/xcmiscproto-1.2.0 - >=x11-proto/xextproto-7.1.99 - >=x11-proto/xf86dgaproto-2.0.99.1 - >=x11-proto/xf86rushproto-1.1.2 - >=x11-proto/xf86vidmodeproto-2.2.99.1 - >=x11-proto/xineramaproto-1.1.3 - >=x11-proto/xproto-7.0.17 - dmx? ( - >=x11-proto/dmxproto-2.2.99.1 - doc? ( - || ( - www-client/links - www-client/lynx - www-client/w3m - ) - ) - ) - !minimal? ( - >=x11-proto/xf86driproto-2.1.0 - >=x11-proto/dri2proto-2.3 - >=x11-libs/libdrm-2.4.20 - )" - -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - )" - -#UPSTREAMED_PATCHES=( -# "${WORKDIR}/patches/" -#) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-disable-acpi.patch - "${FILESDIR}"/${PN}-1.9-nouveau-default.patch -) - -pkg_pretend() { - # older gcc is not supported - [[ $(gcc-major-version) -lt 4 ]] && \ - die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." -} - -pkg_setup() { - xorg-2_pkg_setup - - # localstatedir is used for the log location; we need to override the default - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - # --enable-install-setuid needed because sparcs default off - # NOTE: fop is used for doc generating ; and i have no idea if gentoo - # package it somewhere - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable kdrive kdrive-kbd) - $(use_enable kdrive kdrive-mouse) - $(use_enable kdrive kdrive-evdev) - $(use_enable tslib) - $(use_enable tslib xcalibrate) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal install-libxf86config) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal glx) - $(use_enable xnest) - $(use_enable xorg) - $(use_enable xvfb) - $(use_enable nptl glx-tls) - $(use_enable udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) - --sysconfdir=/etc/X11 - --localstatedir=/var - --enable-install-setuid - --with-fontrootdir=/usr/share/fonts - --with-xkb-output=/var/lib/xkb - --disable-config-hal - --without-dtrace - --without-fop - --with-os-vendor=Gentoo - ) - - # Xorg-server requires includes from OS mesa which are not visible for - # users of binary drivers. - mkdir -p "${T}/mesa-symlinks/GL" - for i in gl glx glxmd glxproto glxtokens; do - ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die - done - for i in glext glxext; do - ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die - done - append-cppflags "-I${T}/mesa-symlinks" -} - -src_install() { - xorg-2_src_install - - dynamic_libgl_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example - fi - - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup - newinitd "${FILESDIR}"/xdm.initd-3 xdm - newconfd "${FILESDIR}"/xdm.confd-3 xdm - - # install the @x11-module-rebuild set for Portage - insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/xorg-sets.conf xorg.conf -} - -pkg_postinst() { - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set xorg-x11 --use-old - - if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then - elog "You should consider reading upgrade guide for this release:" - elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml" - echo - ewarn "You must rebuild all drivers if upgrading from