Change libkdecore from kdelibs-3.5.3 to use libutempter instead of binary. The config files already check for -lutempter and function addToUtmp. They set the LIBUTEMPTER Makefile variable in the makefiles along with the HAVE_UTEMPTER preprocessor switch. libutempter: http://altlinux.org/index.php?module=sisyphus&package=libutempter KDE Bug: http://bugs.kde.org/show_bug.cgi?id=112840 Gentoo Bug: http://bugs.gentoo.org/show_bug.cgi?id=135818 2006-07-19 Martin von Gagern diff --exclude='*~' -ur kdelibs-3.5.3.orig/kdecore/Makefile.am kdelibs-3.5.3/kdecore/Makefile.am --- kdelibs-3.5.3.orig/kdecore/Makefile.am 2006-07-19 02:02:36.000000000 +0200 +++ kdelibs-3.5.3/kdecore/Makefile.am 2006-07-19 02:15:30.000000000 +0200 @@ -115,7 +115,7 @@ kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \ kqiodevicegzip_p.cpp ktimezones.cpp -libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined +libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \ diff --exclude='*~' -ur kdelibs-3.5.3.orig/kdecore/Makefile.in kdelibs-3.5.3/kdecore/Makefile.in --- kdelibs-3.5.3.orig/kdecore/Makefile.in 2006-07-19 02:02:36.000000000 +0200 +++ kdelibs-3.5.3/kdecore/Makefile.in 2006-07-19 02:15:17.000000000 +0200 @@ -781,7 +781,7 @@ #>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined #>+ 1 -libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) +libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \ diff --exclude='*~' -ur kdelibs-3.5.3.orig/kdecore/kpty.cpp kdelibs-3.5.3/kdecore/kpty.cpp --- kdelibs-3.5.3.orig/kdecore/kpty.cpp 2006-07-19 02:02:36.000000000 +0200 +++ kdelibs-3.5.3/kdecore/kpty.cpp 2006-07-19 02:19:52.000000000 +0200 @@ -80,6 +80,10 @@ # include #endif +#ifdef HAVE_UTEMPTER +# include +#endif + #ifdef HAVE_TERMIOS_H /* for HP-UX (some versions) the extern C is needed, and for other platforms it doesn't hurt */ @@ -138,21 +142,6 @@ // private functions // /////////////////////// -#ifdef HAVE_UTEMPTER -class KProcess_Utmp : public KProcess -{ -public: - int commSetupDoneC() - { - dup2(cmdFd, 0); - dup2(cmdFd, 1); - dup2(cmdFd, 3); - return 1; - } - int cmdFd; -}; -#endif - #define BASE_CHOWN "kgrantpty" @@ -399,12 +388,8 @@ void KPty::login(const char *user, const char *remotehost) { #ifdef HAVE_UTEMPTER - KProcess_Utmp utmp; - utmp.cmdFd = d->masterFd; - utmp << "/usr/sbin/utempter" << "-a" << d->ttyName << ""; - utmp.start(KProcess::Block); + addToUtmp (d->ttyName, remotehost, d->masterFd); Q_UNUSED(user); - Q_UNUSED(remotehost); #elif defined(USE_LOGIN) const char *str_ptr; struct utmp l_struct; @@ -442,10 +427,7 @@ void KPty::logout() { #ifdef HAVE_UTEMPTER - KProcess_Utmp utmp; - utmp.cmdFd = d->masterFd; - utmp << "/usr/sbin/utempter" << "-d" << d->ttyName; - utmp.start(KProcess::Block); + removeLineFromUtmp(d->ttyName, d->masterFd); #elif defined(USE_LOGIN) const char *str_ptr = d->ttyName.data(); if (!memcmp(str_ptr, "/dev/", 5))