[patch] kdelibs-3.5.6-libutempter.patch

kdelibs-3.5.6-libutempter.patch (text/plain), 4.05 KB, created by Martin von Gagern on 2007-02-17 10:21:26 UTC

Change libkdecore from kdelibs-3.5.6 to use libutempter instead of binary.
This patch uses the new interface from libutempter and thus breaks
compatibility to the old RedHat implementation utempter.

libutempter: http://altlinux.org/index.php?module=sisyphus&package=libutempter
             ftp://ftp.altlinux.org/pub/people/ldv/utempter/
KDE Bug:     http://bugs.kde.org/show_bug.cgi?id=140308
Gentoo Bug:  http://bugs.gentoo.org/show_bug.cgi?id=135818

2007-02-17 Martin von Gagern <[e-mail]>

diff -ur kdelibs-3.5.6/kdecore/kpty.cpp kdelibs/kdecore/kpty.cpp
--- kdelibs-3.5.6/kdecore/kpty.cpp	2006-05-22 20:14:21.000000000 +0200
+++ kdelibs/kdecore/kpty.cpp	2007-02-04 12:44:30.000000000 +0100
@@ -80,6 +80,10 @@
 # include <utmp.h>
 #endif
 
+#ifdef HAVE_UTEMPTER
+# include <utempter.h>
+#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))
diff -ur kdelibs-3.5.6/kdecore/Makefile.am kdelibs/kdecore/Makefile.am
--- kdelibs-3.5.6/kdecore/Makefile.am	2006-10-01 19:33:38.000000000 +0200
+++ kdelibs/kdecore/Makefile.am	2007-02-04 12:41:53.000000000 +0100
@@ -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 -ur kdelibs-3.5.6/kdecore/Makefile.in kdelibs/kdecore/Makefile.in
--- kdelibs-3.5.6/kdecore/Makefile.in	2007-01-24 09:54:07.000000000 +0100
+++ kdelibs/kdecore/Makefile.in	2007-02-04 12:41:53.000000000 +0100
@@ -789,7 +789,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 \