backported security fix for bug 487688

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

4 files changed, 137 insertions, 5 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 38ed17e74e67..c9567405da4e 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.119 2013/10/17 18:39:31 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.120 2013/10/22 14:56:20 axs Exp $
+
+*slim-1.3.5-r4 (22 Oct 2013)
+
+  22 Oct 2013; Ian Stakenvicius <axs@gentoo.org>
+  +files/slim-1.3.5-glibc217-crypt.patch, +slim-1.3.5-r4.ebuild:
+  backported security fix for bug 487688
 
 *slim-1.3.6-r1 (17 Oct 2013)
 
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index b658b187d2b7..004fcc2d7074 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -5,6 +5,7 @@ AUX Xsession-r3 4045 SHA256 5eaa3c03278443f27a8477397dd0bcaa5f95e7d0cf99448f028b
 AUX slim-1.3.4-config.diff 2757 SHA256 03a8091b01f97f388c986ddbd5fba4d8634d4c97805678919de6304e89b6dbab SHA512 f1001fe897a33e22440edc83a9bc3ff77dc4854224d232812352ccaf622c3563957d9ed838071e8438c756878197eeaa98656a23218b9fe2970d54dbd24314b0 WHIRLPOOL 0cd9f83239cb9d7e70e53be439c67f39a024f3e8e4a7676098e611061d75a7b69a3a63072d6ca8c2ab33df536f51c020769886138c343118109793a5463e2da7
 AUX slim-1.3.5-arm.patch 289 SHA256 95c7be21f8a176ce649e2dd804b8c2fa019e5e206a2532233f8b76bdbf201fba SHA512 1d3a3a387433c8bfc9bff6ac3779e70e0e0ca5f65e6120dd83fb51d59dfa47facc6d31c6e955b737e41ebf760416015f7f12dc749e710957cbef274aa5d1d308 WHIRLPOOL 54cb1cff534d30c157460a729a054cb4089b39dbf950b7d78462f6cc8f1dcc1770b6943fe0e24198ad0313cd2c359e0684d35e99155e3945fc19e14638986437
 AUX slim-1.3.5-disable-ck-for-systemd.patch 3303 SHA256 e309716a177bcff758f2e5b807a99380d503ae08a819048cacd01f1010a40791 SHA512 64205963f8f56f012dd16c2aea18e2e4f4e155093d44222a512b242061b334b7faa9c3abdd1acc011213f0fed9007cf232da8c61e6cedc30c710b149fa841f04 WHIRLPOOL cc3e45fe35e5b178213f261f22e3f54e4175e501a6bd7b3a042206d14713d9f038238f531d1dd872abe15a8d118d5ccd0edec83028e49ad8df3ba1d77c55812c
+AUX slim-1.3.5-glibc217-crypt.patch 349 SHA256 53e864060fa5ebfaca63e973d435ff599b6afbadfb1b2fc2c39e927b6a4f4fec SHA512 3a8e70a0b08591f569db97c81beed9f34afeba07db2f8bc6c74adb4a6fc60c847d0d07aa17d17fe47cd80da1dffbc832af86d950392ae751fd1a851793c1f037 WHIRLPOOL c9a5be406f63b068e1a3db046647f51181866a904af7c2f3fd3e32ed582704b6466afb24ce370731c17fd677763fdf95d4b8c9cf842a88b08d07a1f5fd6425b4
 AUX slim-1.3.5-honour-cflags.patch 445 SHA256 fdac5dfd24d853af0dc0dc49857890455fdb682097db60f9826ccb8584522e13 SHA512 82e16d6ffa7291b00b6078e960b35352658deff7833bb05d00c80202588856b06678e5d7a09e1166152920dd2dfb3eefb4ea5f084976bc346bbf09489832acbd WHIRLPOOL 84b773c1b0b41d1d6b55f55669b8db4d6f40c4886d99ca6983f28845c2b8db80c807c54929f79da1d4139126bb1c95a159f98189fdb5332a9f0750571ad15dd3
 AUX slim-1.3.5-systemd-service.patch 430 SHA256 3dceb91b4d5f6cc086116530e4c261b6984d73e39dfdf132f4201b1ab0c68a98 SHA512 0a83cdf71c9aa521598ffdfda79deb7750e71585d9b7f54f956ec4219039ceb249de2a4f1a7af312a0e3535a24829cf24edddbd1340b30f02d23d817ffb2a223 WHIRLPOOL c19683aa5aedb2758ce406b5ba561ee69f7b4a8565733399ece6169dedd19991d071e6912a4d006dbc9dc07976185fedd82dd6340c112c1238407dc83e335497
 AUX slim-1.3.6-honour-cflags.patch 499 SHA256 7a19c872c2f3a290a74df246cdd3f08126f7ce46e63fb5074a326b81adb805bf SHA512 bbc99d396d30e034100e468d8d5a69cee3bc26eb6029793bdb95f29bd6364f680baec13e12e9ca7dcf01d84de3d8d45712462de36f6f729c7f8c232865a71a7a WHIRLPOOL 96941218006cd2d91efca231f9f2917431a1aa4e0afd31137809a90efb4e69122addf5257aff76b2b345606fa44b8593d9b3bb9d01125a83f751ea6f5945dc48
@@ -15,13 +16,14 @@ DIST slim-1.3.5.tar.gz 226413 SHA256 818d209f51e2fa8d5b94ef75ce90a7415be48b45e79
 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 3379 SHA256 e63629fb37234a10d89afc0272ef9f300c4349ad4282a7bd436b40459a5c9e22 SHA512 96958594f9062f5a5bac5ea590a29eefcd20dfd168fa96b7ff87bf1023a25ef0aa118b1d9b2010d3a0bb9f1cf756ab4a45e3891c94377170a349f8349ce66cc9 WHIRLPOOL 521d3111771ce1287e7bc9d70b2ec285ff8eca69c75f3a0bfca69b01a84607d88f48b0195100494aff2e6a36f5d04cdfdeb0e70320b64d765a6efc5f8a28d5b3
+EBUILD slim-1.3.5-r4.ebuild 3432 SHA256 47d3ea57cfcbfdedc622e9d4f8a1e12080e390146a673be9b267015efc508287 SHA512 057a5baebbb6433f23806ade655070e8c4c91dbe2ead237729c8f80acd6f95874622b14250cf3a113b24520be976cda4da87939aa99b9162b18b25e86a22e9d8 WHIRLPOOL 18e1a37263b77d9fe03259bf4ec03a44f6521d40abdb54bcbb53c94d2f0f128cb8015552dbedb201e5553d670d81bff1d76885606dccfb53b20ac83d9290f725
 EBUILD slim-1.3.6-r1.ebuild 3515 SHA256 4df027512c5b8a64fbc4b6fe94a1f0df57915950d5c5404deca5e00f8d738a1b SHA512 801080204c97949ee9f88f610af01f1c69a7c0c906f4eecbcdd3ae5ef81b6dee0c492901e2ce6db663c626baa407b30fe129e269eb41511cd4dd796c5b871d9f WHIRLPOOL 6ccfa46be68e9b2af3639f102a8f1f1ccb67574c3886e25b52429abd4a1e2cb3dd43ae28615ad2c9f7dc35e3d629e08276fbc953904cc309e56901f678445e4f
-MISC ChangeLog 19357 SHA256 4f4e5fd0af0532763c4faee7405656b3ef5afa13e94d76f56788d225d47fb659 SHA512 580a6af606c3bd78060aa663f8d6a1007fdd8a947f9d7497085740029fa33d3d7a7cf14ff2f7d9c385024fac52adf2758d56a7045743742e3228ac54169b6b0c WHIRLPOOL 0e65b5a57dd136686e2ab665d681f54e7fcb284f43e27f429bdcfb6f7a4fc5fb04381f5ff0c8d08368dc8174c9a80de086d0af5b522605eeaf1879c6e07a2bde
+MISC ChangeLog 19543 SHA256 90681b809c849579111474de1fbc87f1424128ec7c3b5eb2bbcc8c5cde9056c9 SHA512 cb961add3faabf18a9ec1b5dc0cc0e80d4cd95e10bb0e08be0c4307c66f5565d0075cbb61f8b45fc5fd0ae8f5e3b31497e2136b48525a5d8b100a527aee81180 WHIRLPOOL f99febe794afe5818fd3e2a676f39e69bf2fcda2c6f14f9813de0041eb69e7fcab9652ffb27a4aa8647b5fd9060a8c884449fc898bff1c82541d9cddb6a07990
 MISC metadata.xml 317 SHA256 5b7154fd1fce1e40461b40b06533854dc7605d8b5eb19f68eeb9d84527c579c4 SHA512 6b5a9244c1b0fc0abec27900a10673fc431a0559d8cddd917d4117965e4ae569c153bc47ba3342ca4d8b114b949bcf10205a3d07645eb2a2834f300152028687 WHIRLPOOL 886788720a8dd6ca0fefa991e6e5f1640fa5913594be0acb6abcf92bb8e2d684a793721bdbb60a243f39cee097704b00620ae77c75a1f7d55672e875a34dedfc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlJgLuoACgkQ2ugaI38ACPCGEAEApRUuMJ3t5d5rauUIB7/psJOG
-uTPNaoLT237GWUDVZfMA/3wdyIvf/i3/xlsCsXUck4mvnMZvNeXA6nFdtf0jSQjK
-=bZbh
+iF4EAREIAAYFAlJmkggACgkQ2ugaI38ACPCMlwEAhRhjq5urEYAiG1K24nFqwHBm
+cFA9+YanzeVaWAsGx0QA/AgKIlX4BMaEOUZihukU8V0LxvKTDXuHjqd3NVDaiUGK
+=8DFe
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/slim/files/slim-1.3.5-glibc217-crypt.patch b/x11-misc/slim/files/slim-1.3.5-glibc217-crypt.patch
new file mode 100644
index 000000000000..71807f0588e4
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.5-glibc217-crypt.patch
@@ -0,0 +1,11 @@
+--- app.cpp	2013-10-22 10:45:54.041120246 -0400
++++ app.cpp.new	2013-10-22 10:46:58.864122061 -0400
+@@ -486,7 +486,7 @@
+ 		return true;
+ 
+ 	encrypted = crypt(LoginPanel->GetPasswd().c_str(), correct);
+-	return ((strcmp(encrypted, correct) == 0) ? true : false);
++	return ((encrypted && strcmp(encrypted, correct) == 0) ? true : false);
+ }
+ #endif
+ 
diff --git a/x11-misc/slim/slim-1.3.5-r4.ebuild b/x11-misc/slim/slim-1.3.5-r4.ebuild
new file mode 100644
index 000000000000..f5c567ea8161
--- /dev/null
+++ b/x11-misc/slim/slim-1.3.5-r4.ebuild
@@ -0,0 +1,113 @@
+# 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-r4.ebuild,v 1.1 2013/10/22 14:56:20 axs 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
+	epatch "${FILESDIR}"/${P}-glibc217-crypt.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
+}