rpms/kdebase/F-8 kdebase-3.5.8-consolekit-kdm.patch, 1.1, 1.2 kdebase.spec, 1.275, 1.276

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Nov 28 22:40:38 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19788

Modified Files:
	kdebase-3.5.8-consolekit-kdm.patch kdebase.spec 
Log Message:
* Wed Nov 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-9
- adapt mandriva's consolekit patch to fix xdmcp issues (#243560)


kdebase-3.5.8-consolekit-kdm.patch:

Index: kdebase-3.5.8-consolekit-kdm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/kdebase-3.5.8-consolekit-kdm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.8-consolekit-kdm.patch	13 Oct 2007 18:19:58 -0000	1.1
+++ kdebase-3.5.8-consolekit-kdm.patch	28 Nov 2007 22:40:34 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up kdebase-3.5.8/kdm/configure.in.in.consolekit kdebase-3.5.8/kdm/configure.in.in
 --- kdebase-3.5.8/kdm/configure.in.in.consolekit	2006-01-19 11:03:15.000000000 -0600
-+++ kdebase-3.5.8/kdm/configure.in.in	2007-10-13 12:29:13.000000000 -0500
++++ kdebase-3.5.8/kdm/configure.in.in	2007-11-28 14:08:22.000000000 -0600
 @@ -240,4 +240,51 @@ if test "x$with_kdm_xconsole" = xyes; th
      AC_DEFINE(WITH_KDM_XCONSOLE, 1, [Build kdm with built-in xconsole])
  fi
@@ -54,8 +54,8 @@
 +
  dnl AC_OUTPUT(kdm/kfrontend/sessions/kde.desktop)
 diff -up /dev/null kdebase-3.5.8/kdm/backend/consolekit.h
---- /dev/null	2007-10-02 10:07:00.902689260 -0500
-+++ kdebase-3.5.8/kdm/backend/consolekit.h	2007-10-13 12:29:13.000000000 -0500
+--- /dev/null	2007-11-13 08:47:25.891060497 -0600
++++ kdebase-3.5.8/kdm/backend/consolekit.h	2007-11-28 14:08:22.000000000 -0600
 @@ -0,0 +1,36 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
 + *
@@ -95,7 +95,7 @@
 +#endif /* __CONSOLE_KIT_H */
 diff -up kdebase-3.5.8/kdm/backend/session.c.consolekit kdebase-3.5.8/kdm/backend/session.c
 --- kdebase-3.5.8/kdm/backend/session.c.consolekit	2007-10-08 04:51:33.000000000 -0500
-+++ kdebase-3.5.8/kdm/backend/session.c	2007-10-13 12:31:25.000000000 -0500
++++ kdebase-3.5.8/kdm/backend/session.c	2007-11-28 14:13:05.000000000 -0600
 @@ -45,6 +45,10 @@ from the copyright holder.
  #include <ctype.h>
  #include <signal.h>
@@ -107,17 +107,17 @@
  struct display *td;
  const char *td_setup = "auto";
  
-@@ -527,6 +531,10 @@ ManageSession( struct display *d )
+@@ -526,6 +530,10 @@ ManageSession( struct display *d )
+ 	int ex, cmd;
  	volatile int clientPid = 0;
  	volatile Time_t tdiff = 0;
- 
 +#ifdef WITH_CONSOLE_KIT
 +	char *ck_session_cookie;
 +#endif
 +
+ 
  	td = d;
  	Debug( "ManageSession %s\n", d->name );
- 	if ((ex = Setjmp( abortSession ))) {
 @@ -622,7 +630,12 @@ ManageSession( struct display *d )
  	if (td_setup)
  		SetupDisplay( td_setup );
@@ -148,7 +148,7 @@
  	 * a server crash is noticed - so we sleep a bit and wait
 diff -up kdebase-3.5.8/kdm/backend/dm.h.consolekit kdebase-3.5.8/kdm/backend/dm.h
 --- kdebase-3.5.8/kdm/backend/dm.h.consolekit	2005-09-10 03:26:12.000000000 -0500
-+++ kdebase-3.5.8/kdm/backend/dm.h	2007-10-13 12:29:13.000000000 -0500
++++ kdebase-3.5.8/kdm/backend/dm.h	2007-11-28 14:08:22.000000000 -0600
 @@ -37,6 +37,8 @@ from the copyright holder.
  #ifndef _DM_H_
  #define _DM_H_ 1
@@ -170,10 +170,23 @@
  void SessionExit( int status ) ATTR_NORETURN;
  int ReadDmrc( void );
  extern char **userEnviron, **systemEnviron;
+diff -up kdebase-3.5.8/kdm/backend/xdmcp.c.consolekit kdebase-3.5.8/kdm/backend/xdmcp.c
+--- kdebase-3.5.8/kdm/backend/xdmcp.c.consolekit	2006-07-22 03:15:55.000000000 -0500
++++ kdebase-3.5.8/kdm/backend/xdmcp.c	2007-11-28 14:08:22.000000000 -0600
+@@ -924,6 +924,9 @@ manage( struct sockaddr *from, int froml
+ 			}
+ 			d->clientAddr = clientAddress;
+ 			d->connectionType = connectionType;
++			d->remoteHost = NetworkAddressToHostname (pdpy->connectionType,
++			                             &pdpy->connectionAddress);
++
+ 			XdmcpDisposeARRAY8( &clientPort );
+ 			if (pdpy->fileAuthorization) {
+ 				d->authorizations = (Xauth **)Malloc( sizeof(Xauth *) );
 diff -up /dev/null kdebase-3.5.8/kdm/backend/consolekit.c
---- /dev/null	2007-10-02 10:07:00.902689260 -0500
-+++ kdebase-3.5.8/kdm/backend/consolekit.c	2007-10-13 12:29:13.000000000 -0500
-@@ -0,0 +1,552 @@
+--- /dev/null	2007-11-13 08:47:25.891060497 -0600
++++ kdebase-3.5.8/kdm/backend/consolekit.c	2007-11-28 14:08:22.000000000 -0600
+@@ -0,0 +1,557 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
 + *
 + * Copyright (C) 2006-2007 William Jon McCann <mccann at jhu.edu>
@@ -586,6 +599,11 @@
 +
 +	cookie = NULL;
 +
++	if (pwent == NULL) {
++		Debug ("ConsoleKit: NULL user passed as parameter");
++		return NULL;
++	}
++
 +	Debug ("ConsoleKit: Opening session for %s", pwent->pw_name);
 +
 +	dbus_error_init (&error);
@@ -728,7 +746,7 @@
 +}
 diff -up kdebase-3.5.8/kdm/backend/Imakefile.consolekit kdebase-3.5.8/kdm/backend/Imakefile
 --- kdebase-3.5.8/kdm/backend/Imakefile.consolekit	2005-09-10 03:26:12.000000000 -0500
-+++ kdebase-3.5.8/kdm/backend/Imakefile	2007-10-13 12:29:13.000000000 -0500
++++ kdebase-3.5.8/kdm/backend/Imakefile	2007-11-28 14:08:22.000000000 -0600
 @@ -155,13 +155,13 @@ PROCTITLE_DEFINES = -DHAS_SETPROCTITLE
  		 netaddr.c reset.c resource.c protodpy.c policy.c \
  		 session.c socket.c streams.c util.c xdmcp.c \
@@ -747,7 +765,7 @@
           SRCS1 = $(COMMSRCS) client.c
 diff -up kdebase-3.5.8/kdm/backend/Makefile.am.consolekit kdebase-3.5.8/kdm/backend/Makefile.am
 --- kdebase-3.5.8/kdm/backend/Makefile.am.consolekit	2007-10-08 04:51:33.000000000 -0500
-+++ kdebase-3.5.8/kdm/backend/Makefile.am	2007-10-13 12:30:24.000000000 -0500
++++ kdebase-3.5.8/kdm/backend/Makefile.am	2007-11-28 14:14:42.000000000 -0600
 @@ -1,9 +1,9 @@
  # forcibly remove thread-related defines & flags
  AUTOMAKE_OPTIONS = foreign
@@ -770,7 +788,7 @@
      dm.c \
 diff -up kdebase-3.5.8/kdm/backend/client.c.consolekit kdebase-3.5.8/kdm/backend/client.c
 --- kdebase-3.5.8/kdm/backend/client.c.consolekit	2007-10-08 04:51:33.000000000 -0500
-+++ kdebase-3.5.8/kdm/backend/client.c	2007-10-13 12:29:13.000000000 -0500
++++ kdebase-3.5.8/kdm/backend/client.c	2007-11-28 14:08:22.000000000 -0600
 @@ -82,6 +82,10 @@ extern int loginsuccess( const char *Use
  # include <shadow.h>
  #endif


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/kdebase.spec,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- kdebase.spec	31 Oct 2007 06:16:14 -0000	1.275
+++ kdebase.spec	28 Nov 2007 22:40:34 -0000	1.276
@@ -18,7 +18,7 @@
 Name:    kdebase
 Epoch:   6
 Version: 3.5.8
-Release: 6%{?dist}
+Release: 9%{?dist}
 
 # programs: GPLv2, libs: LGPLv2
 License: GPLv2
@@ -75,8 +75,10 @@
 # upstream patches
 # alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
 Patch200: kdebase-3.5.7-kde#83974.patch
+%if 0%{?fedora} > 7
 # http://bugs.kde.org/show_bug.cgi?id=149045
 Patch201: kdebase-3.5.8-gdm-socket.patch
+%endif
 
 # security fixes
 
@@ -176,8 +178,10 @@
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
 BuildRequires: libusb-devel
+%if 0%{?fedora} < 9 
 BuildRequires: lm_sensors-devel
 %endif
+%endif
 BuildRequires: OpenEXR-devel
 
 
@@ -282,6 +286,9 @@
 # set some default enviroments
 unset QTDIR && . /etc/profile.d/qt.sh
 
+# HACK for rhel4
+#PATH=$PATH:/usr/X11R6/bin; export PATH
+
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -682,6 +689,12 @@
 
 
 %changelog
+* Wed Nov 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-9
+- adapt mandriva's consolekit patch to fix xdmcp issues (#243560)
+
+* Sat Nov 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-8
+- disable lm_sensors f9+ for now (new lm_sensors api-incompat)
+
 * Wed Oct 31 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.8-6
 - apply GDM socket path patch only on F8+
 




More information about the fedora-extras-commits mailing list