diff options
Diffstat (limited to 'x11-misc/slim')
| -rw-r--r-- | x11-misc/slim/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-misc/slim/files/252280-fix-default_user-focus_passwd.patch | 10 | ||||
| -rw-r--r-- | x11-misc/slim/files/slim-1.3.2-r3-config.diff | 74 | ||||
| -rw-r--r-- | x11-misc/slim/slim-1.3.2-r6.ebuild | 131 |
4 files changed, 223 insertions, 1 deletions
diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog index 9f642b917ff7..79067b14770f 100644 --- a/x11-misc/slim/ChangeLog +++ b/x11-misc/slim/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-misc/slim # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.69 2011/08/19 19:55:10 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.70 2011/09/07 17:38:56 darkside Exp $ + +*slim-1.3.2-r6 (07 Sep 2011) + + 07 Sep 2011; Jeremy Olexa <darkside@gentoo.org> + +files/252280-fix-default_user-focus_passwd.patch, +slim-1.3.2-r6.ebuild, + +files/slim-1.3.2-r3-config.diff: + revision bump to fix bug 252280 by Ian Stakenvicius *slim-1.3.2-r5 (19 Aug 2011) diff --git a/x11-misc/slim/files/252280-fix-default_user-focus_passwd.patch b/x11-misc/slim/files/252280-fix-default_user-focus_passwd.patch new file mode 100644 index 000000000000..6ffbafe08057 --- /dev/null +++ b/x11-misc/slim/files/252280-fix-default_user-focus_passwd.patch @@ -0,0 +1,10 @@ +--- /var/tmp/portage/x11-misc/slim-1.3.2-r5/work/slim-1.3.2/panel.cpp 2011-09-07 12:36:06.000000000 -0400 ++++ /tmp/panel.cpp 2011-09-07 12:35:19.000000000 -0400 +@@ -644,6 +644,7 @@ + + void Panel::SetName(const string& name){ + NameBuffer=name; ++ action = Login; + return; + }; + const string& Panel::GetName(void) const{ diff --git a/x11-misc/slim/files/slim-1.3.2-r3-config.diff b/x11-misc/slim/files/slim-1.3.2-r3-config.diff new file mode 100644 index 000000000000..3cdcee3f1837 --- /dev/null +++ b/x11-misc/slim/files/slim-1.3.2-r3-config.diff @@ -0,0 +1,74 @@ +--- 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 + + # 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,wmaker,blackbox ++#sessions xfce4,icewm,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/slim-1.3.2-r6.ebuild b/x11-misc/slim/slim-1.3.2-r6.ebuild new file mode 100644 index 000000000000..e30738efb391 --- /dev/null +++ b/x11-misc/slim/slim-1.3.2-r6.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r6.ebuild,v 1.1 2011/09/07 17:38:56 darkside Exp $ + +EAPI=2 + +inherit toolchain-funcs pam eutils + +DESCRIPTION="Simple Login Manager" +HOMEPAGE="http://slim.berlios.de" +SRC_URI="mirror://berlios/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="branding pam" + +RDEPEND="x11-libs/libXmu + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXft + >=media-libs/libpng-1.4 + virtual/jpeg + x11-apps/sessreg + pam? ( virtual/pam )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + x11-proto/xproto" +PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" + +src_prepare() { + # respect C[XX]FLAGS, fix crosscompile, + # fix linking order for --as-needed" + sed -i -e "s:^CXX=.*:CXX=$(tc-getCXX) ${CXXFLAGS}:" \ + -e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:" \ + -e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \ + -e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \ + -e "s:-I/usr/include/libpng12:$(pkg-config --cflags-only-I libpng):" \ + -e "s:-lpng12:$(pkg-config --libs-only-l libpng):" \ + -r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \ + Makefile || die "sed failed in Makefile" + # Our Gentoo-specific config changes + epatch "${FILESDIR}"/${PN}-1.3.2-r3-config.diff + + if use elibc_FreeBSD; then + sed -i -e "s/CUSTOM=-DHAVE_SHADOW/CUSTOM=-DNEEDS_BASENAME/" Makefile \ + || die "sed failed in Makefile" + epatch "${FILESDIR}"/${PN}-1.3.2-bsd-install.patch + fi + + if use branding; then + sed -i -e 's/ default/ slim-gentoo-simple/' slim.conf || die + fi + + # Gentoo bug 297655 + epatch "${FILESDIR}"/14509-fix-keyboard-in-tty-from-which-${PN}-is-lauched.patch + # Upstream bug #15287 + epatch "${FILESDIR}"/15287-fix-pam-authentication-with-pam_unix2.patch + # Gentoo Bug 261713 + epatch "${FILESDIR}"/261713-restart-xserver-if-killed.patch + # Gentoo bug 261359, upstream 15326 + epatch "${FILESDIR}"/261359-fix-SIGTERM-freeze.patch + # Gentoo bug 346037 + epatch "${FILESDIR}"/346037-stop_setting_host_for_pam_ck_connector_so.patch + # Gentoo bug 378505 + epatch "${FILESDIR}"/${P}-libpng15.patch + # Gentoo bug 252280 + epatch "${FILESDIR}"/252280-fix-default_user-focus_passwd.patch +} + +src_compile() { + if use pam ; then + emake USE_PAM=1 || die "emake failed." + else + emake || die "emake failed." + fi +} + +src_install() { + if use pam ; then + emake USE_PAM=1 DESTDIR="${D}" install || die "emake install failed." + pamd_mimic system-local-login slim auth account session + else + emake DESTDIR="${D}" install || die "emake install failed." + fi + + insinto /usr/share/slim + newins "${FILESDIR}/Xsession-r2" Xsession || die "newins failed" + + insinto /etc/logrotate.d + newins "${FILESDIR}/slim.logrotate" slim || die "newins failed" + + dodoc xinitrc.sample ChangeLog README TODO THEMES +} + +pkg_postinst() { + 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\"." + elog + elog "By default, ${PN} now does 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 the slim session start script now supports consolekit" + ewarn "directly, via xinitrc.d scripts. Please remove any existing work-arounds to" + ewarn "avoid multiple calls to ck-launch-session." + if has_version "<=sys-auth/pambase-20101024[consolekit]" ; then + ewarn + ewarn "You should also remove the 'nox11' flag from the pam_ck_connector.so module " + ewarn "in /etc/pam.d/system-login if you have not already done so." + ewarn "(this is safe, it will be default in the next version of pambase)" + fi + elog + 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" + elog "desired, then please remerge ${PN} with USE=pam" + elog + fi +} |