install slimlock suid, bug 500204; remove old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

7 files changed, 54 insertions, 120 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 5efe50c7ba84..ac5cb24ca119 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,15 @@
 # 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.135 2013/12/22 13:23:30 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.136 2014/02/03 18:19:16 axs Exp $
+
+*slim-1.3.6-r4 (03 Feb 2014)
+
+  03 Feb 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +files/slim-1.3.6-fix-slimlock-nopam-v2.patch, +slim-1.3.6-r4.ebuild,
+  -files/slim-1.3.4-config.diff, -files/slim-1.3.5-glibc217-crypt.patch,
+  -files/slim-1.3.5-honour-cflags.patch,
+  -files/slim-1.3.5-systemd-service.patch, -slim-1.3.5-r4.ebuild:
+  install slimlock suid, bug 500204; remove old
 
   22 Dec 2013; Agostino Sarubbo <ago@gentoo.org> slim-1.3.6-r3.ebuild:
   Stable for ppc64, wrt bug #491492
diff --git a/x11-misc/slim/files/slim-1.3.4-config.diff b/x11-misc/slim/files/slim-1.3.4-config.diff
deleted file mode 100644
index cfc6aa2a1770..000000000000
--- a/x11-misc/slim/files/slim-1.3.4-config.diff
+++ /dev/null
@@ -1,74 +0,0 @@
---- slim.conf.orig	2010-08-25 11:52:23.000000000 -0400
-+++ slim.conf	2010-08-25 11:58:58.000000000 -0400
-@@ -2,7 +2,7 @@
- # Note: -xauth $authfile is automatically appended
- default_path        /bin:/usr/bin:/usr/local/bin
- default_xserver     /usr/bin/X
--#xserver_arguments   -dpi 75
-+xserver_arguments   -nolisten tcp -br -deferglyphs 16 vt07
- 
- # Commands for halt, login, etc.
- halt_cmd            /sbin/shutdown -h now
-@@ -18,7 +18,7 @@
- 
- 
- # Activate numlock when slim starts. Valid values: on|off
--# numlock             on
-+numlock             on
- 
- # Hide the mouse cursor (note: does not work with some WMs).
- # Valid values: true|false
-@@ -33,7 +33,8 @@
- # to adjust the command according to your preferred shell,
- # i.e. for freebsd use:
- # login_cmd           exec /bin/sh - ~/.xinitrc %session
--login_cmd           exec /bin/bash -login ~/.xinitrc %session
-+# login_cmd           exec /bin/bash -login ~/.xinitrc %session
-+login_cmd           exec /bin/bash -login /usr/share/slim/Xsession %session
- 
- # Commands executed when starting and exiting a session.
- # They can be used for registering a X11 session with
-@@ -41,20 +42,27 @@
- #
- # sessionstart_cmd	some command
- # sessionstop_cmd	some command
-+sessionstart_cmd	/usr/bin/sessreg -a -l :0.0 %user
-+sessionstop_cmd     /usr/bin/sessreg -d -l :0.0 %user
- 
- # Start in daemon mode. Valid values: yes | no
- # Note that this can be overriden by the command line
- # options "-d" and "-nodaemon"
--# daemon	yes
-+daemon	yes
- 
--# Available sessions (first one is the default).
--# The current chosen session name is replaced in the login_cmd
-+# Available sessions:
-+# The current chosen session name replaces %session in the login_cmd
- # above, so your login command can handle different sessions.
-+# If no session is chosen (via F1), %session will be an empty string.
- # see the xinitrc.sample file shipped with slim sources
--sessions            xfce4,icewm-session,wmaker,blackbox
-+#sessions            xfce4,icewm-session,wmaker,blackbox
-+# Alternatively, read available sessions from a directory:
-+sessiondir           /etc/X11/Sessions
- 
--# Executed when pressing F11 (requires imagemagick)
-+# Executed when pressing F11 (requires media-gfx/imagemagick for import)
-+# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info.
- screenshot_cmd      import -window root /slim.png
-+#screenshot_cmd      scrot /root/slim.png
- 
- # welcome message. Available variables: %host, %domain
- welcome_msg         Welcome to %host
-@@ -83,8 +88,8 @@
- # randomly choose from
- current_theme       default
- 
--# Lock file
--lockfile            /var/run/slim.lock
-+# Lock file, /etc/init.d/xdm expects slim.pid
-+lockfile            /var/run/slim.pid
- 
- # Log file
- logfile             /var/log/slim.log
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
deleted file mode 100644
index 71807f0588e4..000000000000
--- a/x11-misc/slim/files/slim-1.3.5-glibc217-crypt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/slim-1.3.5-honour-cflags.patch b/x11-misc/slim/files/slim-1.3.5-honour-cflags.patch
deleted file mode 100644
index e628c30bf596..000000000000
--- a/x11-misc/slim/files/slim-1.3.5-honour-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- CMakeLists.txt	2013-02-08 08:28:40.000000000 -0500
-+++ CMakeLists.txt.new	2013-02-08 08:29:48.000000000 -0500
-@@ -41,10 +41,6 @@
- set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"")
- set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"")
- 
--# Flags
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2" )
--set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -Wall -g -O2" )
--
- # source 
- set(slim_srcs
- 	main.cpp
diff --git a/x11-misc/slim/files/slim-1.3.5-systemd-service.patch b/x11-misc/slim/files/slim-1.3.5-systemd-service.patch
deleted file mode 100644
index 35e023834025..000000000000
--- a/x11-misc/slim/files/slim-1.3.5-systemd-service.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- slim-1.3.5-old/CMakeLists.txt	2012-12-31 08:03:42.000000000 -0500
-+++ slim-1.3.5/CMakeLists.txt	2013-02-06 09:05:06.000000000 -0500
-@@ -171,6 +171,6 @@
- # configure
- install(FILES slim.conf DESTINATION ${SYSCONFDIR})
- # systemd service file
--install(FILES slim.service DESTINATION usr/lib/systemd/system)
-+install(FILES slim.service DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/systemd/system)
- # themes directory
- subdirs(themes)
diff --git a/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch b/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch
new file mode 100644
index 000000000000..d5fc4db4838d
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt	2013-10-27 21:24:21.193802669 -0400
++++ b/CMakeLists.txt	2013-10-27 21:26:54.127806951 -0400
+@@ -220,7 +220,6 @@
+ ####### install
+ # slim
+ install(TARGETS slim RUNTIME DESTINATION bin)
+-install(TARGETS slimlock RUNTIME DESTINATION bin)
+ 
+ if (BUILD_SHARED_LIBS)
+ 	set_target_properties(libslim PROPERTIES
+@@ -235,8 +234,14 @@
+ 
+ # man file
+ install(FILES slim.1 DESTINATION ${MANDIR}/man1/)
+-install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
+ # configure
+ install(FILES slim.conf DESTINATION ${SYSCONFDIR})
++
++#slimlock
++if(BUILD_SLIMLOCK)
++install(TARGETS slimlock RUNTIME DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)
++install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
++endif(BUILD_SLIMLOCK)
++
+ # themes directory
+ subdirs(themes)
diff --git a/x11-misc/slim/slim-1.3.5-r4.ebuild b/x11-misc/slim/slim-1.3.6-r4.ebuild
index 17da8ab6e521..f95dc2e3ead5 100644
--- a/x11-misc/slim/slim-1.3.5-r4.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.7 2013/12/17 13:00:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.6-r4.ebuild,v 1.1 2014/02/03 18:19:16 axs Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="branding pam consolekit"
 REQUIRED_USE="consolekit? ( pam )"
 
@@ -22,11 +22,12 @@ RDEPEND="x11-libs/libXmu
 	x11-libs/libXpm
 	x11-libs/libXft
 	media-libs/libpng:0=
-	virtual/jpeg
+	virtual/jpeg:=
 	x11-apps/sessreg
 	consolekit? ( sys-auth/consolekit
 		sys-apps/dbus )
-	pam? ( virtual/pam )"
+	pam? (	virtual/pam
+		!x11-misc/slimlock )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-proto/xproto"
@@ -34,12 +35,15 @@ 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}-config.diff
+	epatch "${FILESDIR}"/${PN}-1.3.5-arm.patch
 	epatch "${FILESDIR}"/${P}-honour-cflags.patch
-	epatch "${FILESDIR}"/${P}-disable-ck-for-systemd.patch
-	epatch "${FILESDIR}"/${P}-glibc217-crypt.patch
+	epatch "${FILESDIR}"/${P}-libslim-cmake-fixes.patch
+	epatch "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch
+	epatch "${FILESDIR}"/${P}-strip-systemd-unit-install.patch
+	epatch "${FILESDIR}"/${P}-systemd-session.patch
+	epatch "${FILESDIR}"/${P}-session-chooser.patch
+	epatch "${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch
 
 	if use elibc_FreeBSD; then
 		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
@@ -65,8 +69,11 @@ src_install() {
 
 	if use pam ; then
 		pamd_mimic system-local-login slim auth account session
+		pamd_mimic system-local-login slimlock auth
 	fi
 
+	systemd_dounit slim.service
+
 	insinto /usr/share/slim
 	newins "${FILESDIR}/Xsession-r3" Xsession