remove vulnerable versions, re bug 487688

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 9 insertions, 230 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index c7f7c8337da1..8fabdaba8f7a 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.132 2013/12/17 13:00:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.133 2013/12/17 17:26:12 axs Exp $
+
+  17 Dec 2013; Ian Stakenvicius <axs@gentoo.org> -slim-1.3.5-r2.ebuild,
+  -slim-1.3.5-r3.ebuild:
+  remove vulnerable versions, re bug 487688
 
   17 Dec 2013; Raúl Porcel <armin76@gentoo.org> slim-1.3.5-r3.ebuild,
   slim-1.3.5-r4.ebuild, slim-1.3.6-r3.ebuild:
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 2a5f06402db3..ab6b145d1c8b 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -18,16 +18,14 @@ AUX slim-1.3.6-systemd-session.patch 820 SHA256 1cb2b5f322ae975cd5a5a9ccca45854c
 AUX slim.logrotate 102 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2 WHIRLPOOL 9e940bd1d88613e46ac4a333afa0f02cd16c583a1b34f509c4409321f7d5c5e14ec86e38e9743a6176187a72e403683127fbaf293abbef678e23873c428613c1
 DIST slim-1.3.5.tar.gz 226413 SHA256 818d209f51e2fa8d5b94ef75ce90a7415be48b45e796d66f8083a9532b655629 SHA512 09757dc115488efd883eeced70ddb7d13afca0738e9cc531b2a66065e55eef52a3f67f5352365f7b9762b75132be4eb18bcbb12d47b3f79bb9ec0e0e2f62d85e WHIRLPOOL 61742167f8c732719411c58d8358a065800db828dae4fe94aad3690ba3f70bd9c57476ea21d09298a96c6236cd5308e83398ba36b43f46aa729363eccb4367c3
 DIST slim-1.3.6.tar.gz 232547 SHA256 21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c WHIRLPOOL 473fa2f3752ec0c1bd2410ff3110649ce792c2e904928694b5fb8a43de619945276282e4a9de86198b9f38cdd74d1f9dc9cbcc754cc97989002b368ef26a8429
-EBUILD slim-1.3.5-r2.ebuild 3322 SHA256 43e81db9d02fa480e42a8f9c8a4d1c318b8402200b448e06e9f49ce76468d560 SHA512 74f5f5d5f7e37ef85dfd53baf9f23a28024a58ba89985b0d5c841a8329bcb66453b03c0ae1f7f767304bd56d98f3b471735ac837f51d18fd38eeee532b5ebfd6 WHIRLPOOL 1428cfba3bfa62ce70461b45ce470d96ca8dbc1e9980c84e285553e54c987fd31aa5af0d007ffc283ccfb9032392d92ccc52efea88bbff785dd23a5adcbd72dc
-EBUILD slim-1.3.5-r3.ebuild 3382 SHA256 8808eeaed20d77ff260ec8799588aebddf38ef99eec348edc36ac49238084cbb SHA512 a9b1381aae52e806567ea941e69bab9b0ff505d1fc736756896dcc1ea1729d231c9be8e0ad4a2b38be0771989ba429b50b0b12c2c69fb930f9988dcca9db1fd6 WHIRLPOOL 3b87e15003981549e43ef389799e337d399dba41f1f879e80a3718631e19bbb6e166e6da7b8a1fbdc5bb7854f4fa4a573fc77bc19c5b45b4a77d2310cb35020f
 EBUILD slim-1.3.5-r4.ebuild 3430 SHA256 3cb71044bd2e3137fbaad2d1436c16de047d2bb81fa0f31bce8e3f0beb5cc745 SHA512 fc0b9ea5723f39ffa2b000cfe598a1cbc99ceb519b92ad15810ecf00937ab3d34f2a432993284f83d0efcdae9aebfa0cb5d107c24e0b131ac179cb2537ec1e3f WHIRLPOOL d5d994d48cdc26d3c1d71998a1875b7c735a79d618eca495d43391da667a7f2437e337b44d4c7af3c6321a62fefe63c0dcb48c4d27bfa5d1a76764f248a97f2e
 EBUILD slim-1.3.6-r3.ebuild 3704 SHA256 5c5a2e72155afdd92f11afbc322d9985a8144d9e95868a77224a6a882d10543f SHA512 b71f5098ede006ae46c06329ba1cdcd41f4f063f5604dee467a767edc69bc486dc4be7d041724a7d1659ce8132ceaebf494589fa05a3957bf175b96d3bc5e869 WHIRLPOOL fe8999ae35671d8d8fb393cb3d8e7be5184076851a95d10bc25aaa30759dcb80f930c6d33d0b5b4152d0c64df4d72bdeaf5167e0db17ee3c47720a78c1cada02
-MISC ChangeLog 21403 SHA256 10def89cd12495ad79385acde047c261eca2578c0c37f4ebc2d429172ce7d033 SHA512 c7b76b7364f3460dd48665c302a609c650f878dafacfb019b74278a3579625c99b82d3cb2c70947d69573df7d74774b9cf89c2e42ac58c1c2c63c130809bf542 WHIRLPOOL 9dd2c51589ff172ab7f8e0912382dbe95df9635ca85c4983845dc15abd4b829efa69b5c6d424cb74b81f9e11bf82505786f301948ce1cecbdae9caa3c26c1fbd
+MISC ChangeLog 21541 SHA256 50bd59787afa7d86901081e76afde79e6c3ee47b73fb61a8ae458e27e49a35b1 SHA512 c489f6ad819187c8e563d611e85cafd53006a7e89202e1437473b20d5bbeb81c2058cf103ae7330b56ae84a4cb329b1d1d7259096c14733d0036332b76a56bb0 WHIRLPOOL 5c303a9d44b235e4962579155365da261db27c335b3843a4c871442eb46b35312a1fe30eece8bc91f08aa82d62081948f0ded841ccab594b09d6856b66bd4abd
 MISC metadata.xml 317 SHA256 5b7154fd1fce1e40461b40b06533854dc7605d8b5eb19f68eeb9d84527c579c4 SHA512 6b5a9244c1b0fc0abec27900a10673fc431a0559d8cddd917d4117965e4ae569c153bc47ba3342ca4d8b114b949bcf10205a3d07645eb2a2834f300152028687 WHIRLPOOL 886788720a8dd6ca0fefa991e6e5f1640fa5913594be0acb6abcf92bb8e2d684a793721bdbb60a243f39cee097704b00620ae77c75a1f7d55672e875a34dedfc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKwSwQACgkQuQc30/atMkCqSQCaAz+LWMXNWHhJbkqH57h9axoq
-VBEAoI0DtVfPUZqxy/TzZpAnILzRT/px
-=tt4G
+iF4EAREIAAYFAlKwiTcACgkQ2ugaI38ACPD3ZwD/XCa+VqwRvhL2eM1lEed5zZbV
+Tt6JV/uI66km6rqeTY8BAK5xTKQQIqu3CabTuohjHr+3tahfhDYadh+RCx0jeWWp
+=BBiU
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/slim/slim-1.3.5-r2.ebuild b/x11-misc/slim/slim-1.3.5-r2.ebuild
deleted file mode 100644
index c4f0c60023bc..000000000000
--- a/x11-misc/slim/slim-1.3.5-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.5-r2.ebuild,v 1.7 2013/08/03 06:54:07 ago Exp $
-
-EAPI=5
-
-CMAKE_MIN_VERSION="2.8.8"
-inherit cmake-utils pam eutils systemd versionator
-
-DESCRIPTION="Simple Login Manager"
-HOMEPAGE="http://slim.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="branding pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
-
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXft
-	media-libs/libpng:0=
-	virtual/jpeg
-	x11-apps/sessreg
-	consolekit? ( sys-auth/consolekit
-		sys-apps/dbus )
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
-
-src_prepare() {
-	# Our Gentoo-specific config changes
-	epatch "${FILESDIR}"/${PN}-1.3.4-config.diff
-	epatch "${FILESDIR}"/${P}-arm.patch
-	epatch "${FILESDIR}"/${P}-systemd-service.patch
-	epatch "${FILESDIR}"/${P}-honour-cflags.patch
-
-	if use elibc_FreeBSD; then
-		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
-			|| die
-	fi
-
-	if use branding; then
-		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use pam USE_PAM)
-		$(cmake-utils_use consolekit USE_CONSOLEKIT)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use pam ; then
-		pamd_mimic system-local-login slim auth account session
-	fi
-
-	insinto /usr/share/slim
-	newins "${FILESDIR}/Xsession-r3" Xsession
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/slim.logrotate" slim
-
-	dodoc xinitrc.sample ChangeLog README TODO THEMES
-}
-
-pkg_postinst() {
-	# note, $REPLACING_VERSIONS will always contain 0 or 1 PV's for slim
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "The configuration file is located at /etc/slim.conf."
-		elog
-		elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
-		elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
-	fi
-	if ! version_is_at_least "1.3.2-r7" "${REPLACING_VERSIONS:-1.0}" ; then
-		elog
-		elog "By default, ${PN} is set up to do proper X session selection, including ~/.xsession"
-		elog "support, as well as selection between sessions available in"
-		elog "/etc/X11/Sessions/ at login by pressing [F1]."
-		elog
-		elog "The XSESSION environment variable is still supported as a default"
-		elog "if no session has been specified by the user."
-		elog
-		elog "If you want to use .xinitrc in the user's home directory for session"
-		elog "management instead, see README and xinitrc.sample in"
-		elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
-		elog "accordingly."
-		elog
-		ewarn "Please note that slim supports consolekit directly.  Please do not use any "
-		ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)"
-		ewarn "and enable USE=\"consolekit\" instead."
-		ewarn
-	fi
-	if ! use pam; then
-		elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
-		elog "the console when restarting your window manager. If this is not desired, then"
-		elog "please remerge ${PN} with USE=\"pam\""
-		elog
-	fi
-}
diff --git a/x11-misc/slim/slim-1.3.5-r3.ebuild b/x11-misc/slim/slim-1.3.5-r3.ebuild
deleted file mode 100644
index 3351f9810e55..000000000000
--- a/x11-misc/slim/slim-1.3.5-r3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.5-r3.ebuild,v 1.7 2013/12/17 13:00:49 armin76 Exp $
-
-EAPI=5
-
-CMAKE_MIN_VERSION="2.8.8"
-inherit cmake-utils pam eutils systemd versionator
-
-DESCRIPTION="Simple Login Manager"
-HOMEPAGE="http://slim.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="branding pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
-
-RDEPEND="x11-libs/libXmu
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXft
-	media-libs/libpng:0=
-	virtual/jpeg
-	x11-apps/sessreg
-	consolekit? ( sys-auth/consolekit
-		sys-apps/dbus )
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
-
-src_prepare() {
-	# Our Gentoo-specific config changes
-	epatch "${FILESDIR}"/${PN}-1.3.4-config.diff
-	epatch "${FILESDIR}"/${P}-arm.patch
-	epatch "${FILESDIR}"/${P}-systemd-service.patch
-	epatch "${FILESDIR}"/${P}-honour-cflags.patch
-	epatch "${FILESDIR}"/${P}-disable-ck-for-systemd.patch
-
-	if use elibc_FreeBSD; then
-		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
-			|| die
-	fi
-
-	if use branding; then
-		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use pam USE_PAM)
-		$(cmake-utils_use consolekit USE_CONSOLEKIT)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use pam ; then
-		pamd_mimic system-local-login slim auth account session
-	fi
-
-	insinto /usr/share/slim
-	newins "${FILESDIR}/Xsession-r3" Xsession
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/slim.logrotate" slim
-
-	dodoc xinitrc.sample ChangeLog README TODO THEMES
-}
-
-pkg_postinst() {
-	# note, $REPLACING_VERSIONS will always contain 0 or 1 PV's for slim
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "The configuration file is located at /etc/slim.conf."
-		elog
-		elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
-		elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
-	fi
-	if ! version_is_at_least "1.3.2-r7" "${REPLACING_VERSIONS:-1.0}" ; then
-		elog
-		elog "By default, ${PN} is set up to do proper X session selection, including ~/.xsession"
-		elog "support, as well as selection between sessions available in"
-		elog "/etc/X11/Sessions/ at login by pressing [F1]."
-		elog
-		elog "The XSESSION environment variable is still supported as a default"
-		elog "if no session has been specified by the user."
-		elog
-		elog "If you want to use .xinitrc in the user's home directory for session"
-		elog "management instead, see README and xinitrc.sample in"
-		elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
-		elog "accordingly."
-		elog
-		ewarn "Please note that slim supports consolekit directly.  Please do not use any "
-		ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)"
-		ewarn "and enable USE=\"consolekit\" instead."
-		ewarn
-	fi
-	if ! use pam; then
-		elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
-		elog "the console when restarting your window manager. If this is not desired, then"
-		elog "please remerge ${PN} with USE=\"pam\""
-		elog
-	fi
-}