diff options
-rw-r--r-- | kde-base/kdm/ChangeLog | 8 | ||||
-rw-r--r-- | kde-base/kdm/files/digest-kdm-3.5.7-r2 | 6 | ||||
-rw-r--r-- | kde-base/kdm/files/kdm-3.5.7-login.diff | 63 | ||||
-rw-r--r-- | kde-base/kdm/kdm-3.5.7-r2.ebuild | 73 |
4 files changed, 149 insertions, 1 deletions
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog index 46915a5b55dc..8c01e3c4e4f1 100644 --- a/kde-base/kdm/ChangeLog +++ b/kde-base/kdm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdm # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.100 2007/08/20 12:32:19 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.101 2007/09/12 23:22:40 philantrop Exp $ + +*kdm-3.5.7-r2 (12 Sep 2007) + + 12 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> + +files/kdm-3.5.7-login.diff, +kdm-3.5.7-r2.ebuild: + Added an upstream patch to correct a potential login issue. *kdm-3.5.7-r1 (20 Aug 2007) diff --git a/kde-base/kdm/files/digest-kdm-3.5.7-r2 b/kde-base/kdm/files/digest-kdm-3.5.7-r2 new file mode 100644 index 000000000000..bf24efd3a1d8 --- /dev/null +++ b/kde-base/kdm/files/digest-kdm-3.5.7-r2 @@ -0,0 +1,6 @@ +MD5 805dd677fdd09a260cac73b39c3171e3 kdebase-3.5-patchset-04.tar.bz2 8502 +RMD160 419e527c8c2b00ca49eb395793374b3459989897 kdebase-3.5-patchset-04.tar.bz2 8502 +SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961 kdebase-3.5-patchset-04.tar.bz2 8502 +MD5 b421e01b3ee712549ee967f58ed24de0 kdebase-3.5.7.tar.bz2 24395088 +RMD160 f43070b5428c3099c0abceed56041e5b4ff3c656 kdebase-3.5.7.tar.bz2 24395088 +SHA256 3c6d739abefc55b6cb64e1cf37b79f5993b666a5b40492471754794416b5c28d kdebase-3.5.7.tar.bz2 24395088 diff --git a/kde-base/kdm/files/kdm-3.5.7-login.diff b/kde-base/kdm/files/kdm-3.5.7-login.diff new file mode 100644 index 000000000000..40b6abb8ec0e --- /dev/null +++ b/kde-base/kdm/files/kdm-3.5.7-login.diff @@ -0,0 +1,63 @@ +--- kdm/backend/session.c ++++ kdm/bakcend/session.c +@@ -121,8 +121,9 @@ + static void + DoAutoLogon( void ) + { +- StrDup( &curuser, td->autoUser ); +- StrDup( &curpass, td->autoPass ); ++ ReStr( &curuser, td->autoUser ); ++ ReStr( &curpass, td->autoPass ); ++ ReStr( &curtype, "classic" ); + cursource = PWSRC_AUTOLOGIN; + } + +@@ -141,7 +142,9 @@ + td->hstent->npass = 0; + newdmrc = td->hstent->nargs; + td->hstent->nargs = 0; ++ ReStr( &curtype, "classic" ); + cursource = (td->hstent->rLogin == 1) ? PWSRC_RELOGIN : PWSRC_MANUAL; ++ return 1; + } else if (*td->autoUser && !td->autoDelay && (tdiff > 0 || td->autoAgain)) + { + unsigned int lmask; +@@ -153,11 +156,9 @@ + if (lmask & ShiftMask) + return 0; + DoAutoLogon(); +- } else { +- cursource = PWSRC_MANUAL; +- return 0; ++ return 1; + } +- return 1; ++ return 0; + } + + +@@ -369,6 +370,7 @@ + if (curtype) free( curtype ); + curtype = GRecvStr(); + Debug( " type %\"s\n", curtype ); ++ cursource = PWSRC_MANUAL; + if (Verify( conv_interact, rootok )) { + Debug( " -> return success\n" ); + GSendInt( V_OK ); +@@ -378,7 +380,6 @@ + case G_AutoLogin: + Debug( "G_AutoLogin\n" ); + DoAutoLogon(); +- StrDup( &curtype, "classic" ); + if (Verify( conv_auto, FALSE )) { + Debug( " -> return success\n" ); + GSendInt( V_OK ); +@@ -565,7 +566,7 @@ + tdiff = td->autoAgain ? + 1 : time( 0 ) - td->hstent->lastExit - td->openDelay; + if (AutoLogon( tdiff )) { +- if (!StrDup( &curtype, "classic" ) || !Verify( conv_auto, FALSE )) ++ if (!Verify( conv_auto, FALSE )) + goto gcont; + if (greeter) + GSendInt( V_OK ); diff --git a/kde-base/kdm/kdm-3.5.7-r2.ebuild b/kde-base/kdm/kdm-3.5.7-r2.ebuild new file mode 100644 index 000000000000..f2ba2369e4a5 --- /dev/null +++ b/kde-base/kdm/kdm-3.5.7-r2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.7-r2.ebuild,v 1.1 2007/09/12 23:22:40 philantrop Exp $ + +KMNAME=kdebase +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta eutils + +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-3.5-patchset-04.tar.bz2" + +DESCRIPTION="KDE login manager, similar to xdm and gdm" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="elibc_glibc kdehiddenvisibility pam" + +KMEXTRA="kdmlib/" +# kioslave/thumbnail/configure.in.in is to have HAVE_LIBART. Can be dropped on +# 3.5_beta1. +KMEXTRACTONLY="libkonq/konq_defaults.h" +# kioslave/thumbnail/configure.in.in" +KMCOMPILEONLY="kcontrol/background" +DEPEND="pam? ( kde-base/kdebase-pam ) + $(deprange $PV $MAXKDEVER kde-base/kcontrol)" + # Requires the desktop background settings and kdm kcontrol modules +RDEPEND="${DEPEND} + kde-base/kdepasswd + x11-apps/xinit + x11-apps/xmessage" +PDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdesktop)" + +PATCHES="${FILESDIR}/${P}-bsd-shutdown.patch + ${FILESDIR}/${P}-login.diff" + +src_compile() { + local myconf="--with-x-binaries-dir=/usr/bin $(use_with pam)" + + if ! use pam && use elibc_glibc; then + myconf="${myconf} --with-shadow" + fi + + export USER_LDFLAGS="${LDFLAGS}" + + kde-meta_src_compile myconf configure + kde_remove_flag kdm/kfrontend -fomit-frame-pointer + kde-meta_src_compile make +} + +src_install() { + kde-meta_src_install + cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install + + # Customize the kdmrc configuration + sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ + ${D}/${KDEDIR}/share/config/kdm/kdmrc || die +} + +pkg_postinst() { + kde_pkg_postinst + + # set the default kdm face icon if it's not already set by the system admin + # because this is user-overrideable in that way, it's not in src_install + if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then + mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" + cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \ + "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" + fi + if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then + mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" + cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \ + "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" + fi +} |