Hello community,
here is the log from the commit of package xdm for openSUSE:Factory checked in
at 2014-07-21 10:35:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdm (Old)
and /work/SRC/openSUSE:Factory/.xdm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2014-06-01 18:54:58.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-07-21
10:35:34.000000000 +0200
@@ -1,0 +2,10 @@
+Tue Jul 15 14:32:21 UTC 2014 - sndir...@suse.com
+
+- udpate to release 1.1.11
+- 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,
+ U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
+
+-------------------------------------------------------------------
Old:
----
U_xdm_Fix-missing-linking-dependency-on-ldl.patch
U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
xdm-1.1.10.tar.bz2
New:
----
xdm-1.1.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdm.spec ++++++
--- /var/tmp/diff_new_pack.KUcrTd/_old 2014-07-21 10:35:34.000000000 +0200
+++ /var/tmp/diff_new_pack.KUcrTd/_new 2014-07-21 10:35:34.000000000 +0200
@@ -31,7 +31,7 @@
%endif
Name: xdm
-Version: 1.1.10
+Version: 1.1.11
Release: 0
Summary: X Display Manager
License: MIT
@@ -46,9 +46,6 @@
Patch0: xdm-consolekit.diff
%endif
Patch1: xdm-tolerant-hostname-changes.diff
-Patch2:
U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
-Patch3:
U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
-Patch4: U_xdm_Fix-missing-linking-dependency-on-ldl.patch
%if 0%{?suse_version} >= 01140 && 0%{?suse_version} < 1320
# Needed to create the man page symlink to init.d
BuildRequires: aaa_base-extras
@@ -100,14 +97,13 @@
%if !%with_systemd
%patch0 -p1
%endif
+pushd xdm
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-# needed for patch0, patch2, patch3, patch4
-autoreconf -fi
+popd
%build
+# needed for patch0
+autoreconf -fi
%configure \
--disable-static \
--with-pam \
@@ -220,7 +216,6 @@
%ghost %{_localstatedir}/log/xdm.errors
%{_bindir}/chooser
%{_bindir}/xdm
-%{_bindir}/xdmshell
%{_sbindir}/rcxdm
%if 0%{?suse_version} >= 1320
%{_sbindir}/rcdisplay-manager
++++++ xdm-1.1.10.tar.bz2 -> xdm-1.1.11.tar.bz2 ++++++
++++ 90700 lines of diff (skipped)
++++++ xdm-consolekit.diff ++++++
--- /var/tmp/diff_new_pack.KUcrTd/_old 2014-07-21 10:35:35.000000000 +0200
+++ /var/tmp/diff_new_pack.KUcrTd/_new 2014-07-21 10:35:35.000000000 +0200
@@ -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/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/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/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 @@
.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
+ #
++++++ xdm-tolerant-hostname-changes.diff ++++++
--- /var/tmp/diff_new_pack.KUcrTd/_old 2014-07-21 10:35:35.000000000 +0200
+++ /var/tmp/diff_new_pack.KUcrTd/_new 2014-07-21 10:35:35.000000000 +0200
@@ -1,8 +1,6 @@
-Index: xdm-1.1.10/auth.c
-===================================================================
---- xdm-1.1.10.orig/auth.c
-+++ xdm-1.1.10/auth.c
-@@ -769,7 +769,7 @@ writeAddr (
+--- xdm/auth.c.orig 2011-09-25 09:35:47.000000000 +0200
++++ xdm/auth.c 2014-07-18 14:55:03.244300844 +0200
+@@ -767,7 +767,7 @@ writeAddr (
}
static void
@@ -11,17 +9,17 @@
{
char displayname[100];
int len = _XGetHostname (displayname, sizeof(displayname));
-@@ -805,6 +805,9 @@ DefineLocal (FILE *file, Xauth *auth)
+@@ -803,6 +803,9 @@ DefineLocal (FILE *file, Xauth *auth)
#endif
writeAddr (FamilyLocal, len, displayname, file, auth);
+
-+ if (pLocalAddress && displayname)
++ if (pLocalAddress)
+ *pLocalAddress = strdup(displayname);
}
- #ifdef HAS_GETIFADDRS
-@@ -1238,7 +1241,7 @@ setAuthNumber (Xauth *auth, char *name)
+ #ifdef HAVE_GETIFADDRS
+@@ -1236,7 +1239,7 @@ setAuthNumber (Xauth *auth, char *name)
}
static void
@@ -30,7 +28,7 @@
{
int fd;
-@@ -1265,13 +1268,13 @@ writeLocalAuth (FILE *file, Xauth *auth,
+@@ -1263,13 +1266,13 @@ writeLocalAuth (FILE *file, Xauth *auth,
DefineSelf (fd, file, auth);
close (fd);
#endif
@@ -46,7 +44,7 @@
{
int family = FamilyLocal;
char *addr;
-@@ -1290,7 +1293,7 @@ writeRemoteAuth (FILE *file, Xauth *auth
+@@ -1288,7 +1291,7 @@ writeRemoteAuth (FILE *file, Xauth *auth
}
else
{
@@ -55,41 +53,41 @@
}
}
-@@ -1314,6 +1317,7 @@ SetUserAuthorization (struct display *d,
- #ifdef HAS_MKSTEMP
+@@ -1312,6 +1315,7 @@ SetUserAuthorization (struct display *d,
+ #ifdef HAVE_MKSTEMP
int fd;
#endif
+ char *localAddress = NULL;
Debug ("SetUserAuthorization\n");
auths = d->authorizations;
-@@ -1406,10 +1410,10 @@ SetUserAuthorization (struct display *d,
+@@ -1404,10 +1408,10 @@ SetUserAuthorization (struct display *d,
{
magicCookie = i;
- if (d->displayType.location == Local)
-- writeLocalAuth (new, auths[i], d->name);
-+ writeLocalAuth (new, auths[i], d->name,&localAddress);
+ if (d->displayType.location == Local)
+- writeLocalAuth (new, auths[i], d->name);
++ writeLocalAuth (new, auths[i], d->name, &localAddress);
#ifdef XDMCP
- else
-- writeRemoteAuth (new, auths[i], d->peer, d->peerlen,
d->name);
-+ writeRemoteAuth (new, auths[i], d->peer, d->peerlen,
d->name, &localAddress);
+ else
+- writeRemoteAuth (new, auths[i], d->peer, d->peerlen,
d->name);
++ writeRemoteAuth (new, auths[i], d->peer, d->peerlen,
d->name, &localAddress);
#endif
break;
}
-@@ -1427,10 +1431,10 @@ SetUserAuthorization (struct display *d,
+@@ -1425,10 +1429,10 @@ SetUserAuthorization (struct display *d,
!strncmp (auths[i]->name, "MIT-KERBEROS-5", 14))
auths[i]->data_length = 0;
- if (d->displayType.location == Local)
-- writeLocalAuth (new, auths[i], d->name);
-+ writeLocalAuth (new, auths[i], d->name, &localAddress);
+ if (d->displayType.location == Local)
+- writeLocalAuth (new, auths[i], d->name);
++ writeLocalAuth (new, auths[i], d->name, &localAddress);
#ifdef XDMCP
- else
-- writeRemoteAuth (new, auths[i], d->peer, d->peerlen,
d->name);
-+ writeRemoteAuth (new, auths[i], d->peer, d->peerlen,
d->name, &localAddress);
+ else
+- writeRemoteAuth (new, auths[i], d->peer, d->peerlen,
d->name);
++ writeRemoteAuth (new, auths[i], d->peer, d->peerlen,
d->name, &localAddress);
#endif
auths[i]->data_length = data_len;
}
-@@ -1475,6 +1479,12 @@ SetUserAuthorization (struct display *d,
+@@ -1473,6 +1477,12 @@ SetUserAuthorization (struct display *d,
verify->systemEnviron = setEnv (verify->systemEnviron,
"XAUTHORITY", envname);
}
@@ -102,16 +100,16 @@
XauUnlockAuth (name);
if (envname)
chown (envname, verify->uid, verify->gid);
-@@ -1513,10 +1523,10 @@ RemoveUserAuthorization (struct display
+@@ -1511,10 +1521,10 @@ RemoveUserAuthorization (struct display
for (i = 0; i < d->authNum; i++)
{
if (d->displayType.location == Local)
-- writeLocalAuth (new, auths[i], d->name);
-+ writeLocalAuth (new, auths[i], d->name, NULL);
+- writeLocalAuth (new, auths[i], d->name);
++ writeLocalAuth (new, auths[i], d->name, NULL);
#ifdef XDMCP
else
-- writeRemoteAuth (new, auths[i], d->peer, d->peerlen, d->name);
-+ writeRemoteAuth (new, auths[i], d->peer, d->peerlen,
d->name,NULL);
+- writeRemoteAuth (new, auths[i], d->peer, d->peerlen, d->name);
++ writeRemoteAuth (new, auths[i], d->peer, d->peerlen, d->name,
NULL);
#endif
}
doWrite = 1;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
