[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.8.4-2-7-gf84bbf1
Pino Toscano
pino at alioth.debian.org
Thu Jun 28 12:00:25 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdebase-workspace.git;a=commitdiff;h=f84bbf1
The following commit has been merged in the master branch:
commit f84bbf1e834bf105d525b8709a121428d09c9d53
Author: Pino Toscano <pino at debian.org>
Date: Thu Jun 28 13:59:55 2012 +0200
fix XDMCP login in kdm
backport upstream commit da6e2b49fd2a30aca167ae37ef3e3fd1c7d3bc58
---
debian/changelog | 3 +
debian/patches/series | 1 +
...tralize-interaction-notification-handling.patch | 142 ++++++++++++++++++++
3 files changed, 146 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c8d51ba..50527ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ kde-workspace (4:4.8.4-3) UNRELEASED; urgency=low
patch upstream_make-sure-scripts-are-executed-sorted.patch.
* Improve the description of libkwinglutils1. (Closes: #678416)
* Rewrite the description of liblsofui4. (Closes: #592553)
+ * Backport upstream commit da6e2b49fd2a30aca167ae37ef3e3fd1c7d3bc58 to fix
+ XDMCP login in kdm; patch
+ upstream_centralize-interaction-notification-handling.patch.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 11 Jun 2012 13:03:28 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 162de01..3f54d79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ new_beams_custom_plots.diff
relax_kdelibs_dependency.diff
hurd.diff
upstream_make-sure-scripts-are-executed-sorted.patch
+upstream_centralize-interaction-notification-handling.patch
diff --git a/debian/patches/upstream_centralize-interaction-notification-handling.patch b/debian/patches/upstream_centralize-interaction-notification-handling.patch
new file mode 100644
index 0000000..bac0bd8
--- /dev/null
+++ b/debian/patches/upstream_centralize-interaction-notification-handling.patch
@@ -0,0 +1,142 @@
+From da6e2b49fd2a30aca167ae37ef3e3fd1c7d3bc58 Mon Sep 17 00:00:00 2001
+From: Oswald Buddenhagen <ossi at kde.org>
+Date: Sun, 10 Jun 2012 10:57:19 +0200
+Subject: [PATCH] centralize interaction notification handling
+
+that way we don't have to handle it all over the place (which we didn't,
+which made the chooser dysfunctional).
+
+BUG: 281862
+
+(cherry picked from commit a4ef19c9491e7c5b3ff5a7e18915b6b14f71fe3f)
+---
+ kdm/backend/choose.c | 6 +++---
+ kdm/backend/dm.h | 4 ++--
+ kdm/backend/session.c | 20 ++++++++++----------
+ 3 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/kdm/backend/choose.c b/kdm/backend/choose.c
+index 66af82c..cea7af1 100644
+--- a/kdm/backend/choose.c
++++ b/kdm/backend/choose.c
+@@ -849,7 +849,7 @@ directChooseHost(const char *name)
+ #define PING_TRIES 3
+
+ int
+-doChoose()
++doChoose(time_t *startTime)
+ {
+ HostName **hp, *h;
+ char *host, **hostp;
+@@ -860,7 +860,7 @@ doChoose()
+
+ openGreeter();
+ gSendInt(G_Choose);
+- switch (cmd = ctrlGreeterWait(True)) {
++ switch (cmd = ctrlGreeterWait(True, startTime)) {
+ case G_Ready:
+ break;
+ default: /* error */
+@@ -943,7 +943,7 @@ doChoose()
+ #endif
+ if (select(n + 1, &rfds, 0, 0, to) > 0) {
+ if (FD_ISSET(grtproc.pipe.fd.r, &rfds))
+- switch (cmd = ctrlGreeterWait(False)) {
++ switch (cmd = ctrlGreeterWait(False, startTime)) {
+ case -1:
+ break;
+ case G_Ch_Refresh:
+diff --git a/kdm/backend/dm.h b/kdm/backend/dm.h
+index 90aa4d5..13e7b45 100644
+--- a/kdm/backend/dm.h
++++ b/kdm/backend/dm.h
+@@ -473,7 +473,7 @@ extern GTalk mstrtalk, grttalk;
+ extern GProc grtproc;
+ void openGreeter(void);
+ int closeGreeter(int force);
+-int ctrlGreeterWait(int wreply);
++int ctrlGreeterWait(int wreply, time_t *startTime);
+ void prepareErrorGreet(void);
+ void finishGreet(void);
+ char *conv_interact(int what, const char *prompt);
+@@ -670,7 +670,7 @@ ARRAY8Ptr indirectChoice(ARRAY8Ptr clientAddress, ARRAY8Ptr clientPort, CARD16 c
+ int checkIndirectChoice(ARRAY8Ptr clientAddress, ARRAY8Ptr clientPort, CARD16 connectionType);
+ void registerIndirectChoice(ARRAY8Ptr clientAddress, ARRAY8Ptr clientPort, CARD16 connectionType,
+ ARRAY8Ptr choice);
+-int doChoose(void);
++int doChoose(time_t *startTime);
+
+ /* socket.c or streams.c */
+ void updateListenSockets(void);
+diff --git a/kdm/backend/session.c b/kdm/backend/session.c
+index 85ab1d7..0e7901c 100644
+--- a/kdm/backend/session.c
++++ b/kdm/backend/session.c
+@@ -233,7 +233,7 @@ GTalk grttalk;
+ GTalk mstrtalk;
+
+ int
+-ctrlGreeterWait(int wreply)
++ctrlGreeterWait(int wreply, time_t *startTime)
+ {
+ int i, cmd, type, rootok;
+ char *name, *pass;
+@@ -247,6 +247,10 @@ ctrlGreeterWait(int wreply)
+ case G_Ready:
+ debug("G_Ready
");
+ return 0;
++ case G_Interact:
++ if (startTime)
++ *startTime = 0;
++ break;
+ case G_GetCfg:
+ /*debug("G_GetCfg
");*/
+ type = gRecvInt();
+@@ -437,7 +441,7 @@ openGreeter()
+ greeterUID, td->greeterAuthFile, &td->gpipe))
+ sessionExit(EX_UNMANAGE_DPY);
+ freeStrArr(env);
+- if ((cmd = ctrlGreeterWait(True))) {
++ if ((cmd = ctrlGreeterWait(True, 0))) {
+ logError("Received unknown or unexpected command %d from greeter
", cmd);
+ closeGreeter(True);
+ sessionExit(EX_UNMANAGE_DPY);
+@@ -569,7 +573,7 @@ manageSession(void)
+
+ #ifdef XDMCP
+ if (td->useChooser)
+- doChoose();
++ doChoose(0);
+ /* NOTREACHED */
+ #endif
+
+@@ -595,15 +599,11 @@ manageSession(void)
+ (tdiff > 0 || td->autoAgain)) ?
+ G_GreetTimed : G_Greet);
+ gcont:
+- cmd = ctrlGreeterWait(True);
+- if (cmd == G_Interact) {
+- startt = 0;
+- goto gcont;
+- }
++ cmd = ctrlGreeterWait(True, &startt);
+ #ifdef XDMCP
+ while (cmd == G_DChoose) {
+ choose:
+- cmd = doChoose();
++ cmd = doChoose(&startt);
+ }
+ if (cmd == G_DGreet)
+ continue;
+@@ -672,7 +672,7 @@ manageSession(void)
+ resetXProperties();
+ openGreeter();
+ gSendInt(G_ConfShutdown);
+- if ((cmd = ctrlGreeterWait(True)) != G_Ready) {
++ if ((cmd = ctrlGreeterWait(True, 0)) != G_Ready) {
+ logError("Received unknown command %d from greeter
", cmd);
+ closeGreeter(True);
+ }
+--
+1.7.10
+
--
KDE Base Workspace module packaging
More information about the pkg-kde-commits
mailing list