diff --git a/xdm-consolekit.diff b/xdm-consolekit.diff index ccdf54b..db8226c 100644 --- a/xdm-consolekit.diff +++ b/xdm-consolekit.diff @@ -1,40 +1,15 @@ --- - configure.ac | 14 ++++++++ dm.h | 3 + resource.c | 13 +++++++ session.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ xdm.man.cpp | 6 +++ + configure.ac | 14 ++++++++ 5 files changed, 135 insertions(+), 1 deletion(-) -Index: xdm-1.1.10/configure.ac -=================================================================== ---- xdm-1.1.10.orig/configure.ac -+++ xdm-1.1.10/configure.ac -@@ -434,6 +434,20 @@ fi - - AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes) - -+# ConsoleKit support -+AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]), -+ [USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes]) -+if test x"$USE_CONSOLEKIT" != xno; then -+ PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector, -+ [USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no]) -+ if test x"$USE_CONSOLEKIT" = xyes; then -+ AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit]) -+ XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS" -+ XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS" -+ fi -+fi -+dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes) -+ - # - # XDM - # Index: xdm-1.1.10/session.c =================================================================== --- xdm-1.1.10.orig/session.c -+++ xdm-1.1.10/session.c ++++ xdm-1.1.10/xdm/session.c @@ -67,6 +67,11 @@ extern int key_setnet(struct key_netstar # endif #endif /* USE_PAM */ @@ -168,7 +143,7 @@ Index: xdm-1.1.10/session.c Index: xdm-1.1.10/dm.h =================================================================== --- xdm-1.1.10.orig/dm.h -+++ xdm-1.1.10/dm.h ++++ xdm-1.1.10/include/dm.h @@ -323,6 +323,9 @@ extern char *randomFile; extern char *prngdSocket; extern int prngdPort; @@ -182,7 +157,7 @@ Index: xdm-1.1.10/dm.h Index: xdm-1.1.10/resource.c =================================================================== --- xdm-1.1.10.orig/resource.c -+++ xdm-1.1.10/resource.c ++++ xdm-1.1.10/xdm/resource.c @@ -65,6 +65,9 @@ char *randomDevice; char *prngdSocket; int prngdPort; @@ -220,7 +195,7 @@ Index: xdm-1.1.10/resource.c Index: xdm-1.1.10/xdm.man.cpp =================================================================== --- xdm-1.1.10.orig/xdm.man.cpp -+++ xdm-1.1.10/xdm.man.cpp ++++ xdm-1.1.10/man/xdm.man @@ -48,6 +48,8 @@ xdm \- X Display Manager with support fo ] [ .B \-session @@ -241,3 +216,26 @@ Index: xdm-1.1.10/xdm.man.cpp .SH RESOURCES At many stages the actions of .I xdm +--- xdm-1.1.11/configure.ac.orig 2014-07-18 16:22:30.057882318 +0200 ++++ xdm-1.1.11/configure.ac 2014-07-18 16:26:55.415254913 +0200 +@@ -391,6 +391,20 @@ + XDMGREET_CFLAGS="$XDMGREET_CFLAGS $XDM_TOOLKIT_CFLAGS $DMCP_CFLAGS $XLIB_CFLAGS $GREETER_CFLAGS $AUTH_CFLAGS" + XDMGREET_LIBS="$XDMGREET_LIBS $XDM_TOOLKIT_LIBS $DMCP_LIBS $GREETER_LIBS" + ++# ConsoleKit support ++AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]), ++ [USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes]) ++if test x"$USE_CONSOLEKIT" != xno; then ++ PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector, ++ [USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no]) ++ if test x"$USE_CONSOLEKIT" = xyes; then ++ AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit]) ++ XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS" ++ XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS" ++ fi ++fi ++dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes) ++ + # + # XDM + # diff --git a/xdm.changes b/xdm.changes index 6ed6787..6a45dcd 100644 --- a/xdm.changes +++ b/xdm.changes @@ -2,7 +2,7 @@ Tue Jul 15 14:32:21 UTC 2014 - sndirsch@suse.com - udpate to release 1.1.11 -- refreshed xdm-tolerant-hostname-changes.diff +- refreshed xdm-tolerant-hostname-changes.diff, xdm-consolekit.diff - supersedes the following patches: U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch, U_xdm_Fix-missing-linking-dependency-on-ldl.patch,