Hello community,
here is the log from the commit of package xorg-x11-libSM for openSUSE:Factory
checked in at Thu Aug 13 17:14:57 CEST 2009.
--------
--- xorg-x11-libSM/xorg-x11-libSM.changes 2009-05-02 15:17:56.000000000 +0200
+++ xorg-x11-libSM/xorg-x11-libSM.changes 2009-08-08 12:33:32.000000000 +0200
@@ -1,0 +2,7 @@
+Sat Aug 8 12:31:35 CEST 2009 - sndirsch@suse.de
+
+- libSM 1.1.1
+ * new release of libSM with quite a bit of code churn but no real
+ new feature.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libSM-1.1.0.tar.bz2
New:
----
libSM-1.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libSM.spec ++++++
--- /var/tmp/diff_new_pack.KAmxx6/_old 2009-08-13 17:13:24.000000000 +0200
+++ /var/tmp/diff_new_pack.KAmxx6/_new 2009-08-13 17:13:24.000000000 +0200
@@ -19,11 +19,11 @@
Name: xorg-x11-libSM
-%define dirsuffix 1.1.0
+%define dirsuffix 1.1.1
BuildRequires: libuuid-devel pkgconfig xorg-x11-libICE-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 5
+Release: 6
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
++++++ libSM-1.1.0.tar.bz2 -> libSM-1.1.1.tar.bz2 ++++++
++++ 63282 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libSM-1.1.0/ChangeLog new/libSM-1.1.1/ChangeLog
--- old/libSM-1.1.0/ChangeLog 2008-07-02 19:58:34.000000000 +0200
+++ new/libSM-1.1.1/ChangeLog 2009-08-07 14:22:29.000000000 +0200
@@ -1,3 +1,78 @@
+commit 82bbf42a2ba0401a8346505b1292ddb7b58f4507
+Author: Rémi Cardona
+Date: Fri Aug 7 14:19:50 2009 +0200
+
+ libSM 1.1.1, update libtool version
+
+commit 45720a2e266748ac15bc0544b56e035383695588
+Author: Diego Elio 'Flameeyes' Pettenò
+Date: Sat May 16 01:01:39 2009 +0200
+
+ Use FreeBSD uuid functions when available.
+
+ If the system provide the uuid_create function assume building on FreeBSD
+ or another OS with a compatible uuid interface. If that's the case, ignore
+ libuuid and just use the system functions without extra deps.
+
+commit 0389dbec3b738fa7e1dbef2b5317124b95bdfb20
+Author: Julien Cristau
+Date: Mon Feb 16 01:27:24 2009 +0100
+
+ Typo fix
+
+ This makes us really error out if we want libuuid but can't find it.
+
+commit b75eae83221465bd0da4d21d0bab5af379dc31c1
+Author: Alan Coopersmith
+Date: Mon Feb 2 20:34:30 2009 -0800
+
+ Add README with pointers to mailing list, bugzilla & git repos
+
+ Signed-off-by: Alan Coopersmith
+
+commit 896aeb5dd128fc8e489106fa7aaa5cee1e589106
+Author: Paulo Cesar Pereira de Andrade
+Date: Wed Jan 28 18:48:47 2009 -0200
+
+ Janitor: ansification, make distcheck, compiler warnings.
+
+commit 1dcf5502137efe36d01b30169d4387438ad47be0
+Author: Paulo Cesar Pereira de Andrade
+Date: Sat Nov 29 04:55:58 2008 -0200
+
+ avoid gcc warnings for libSM
+
+ Patch from http://bugs.freedesktop.org/show_bug.cgi?id=17968 adapted
+ to current sources.
+ This corrects a potential (hypothetical) segmentation fault.
+
+commit 8bed01275a7c7caf8f777e4074a5ee1ba1c2b3e7
+Author: Caolan McNamara
+Date: Fri Oct 17 17:21:49 2008 -0400
+
+ Bug #17644: Fix valgrind warning in _SmcProcessMessage
+
+commit 8ce4f47adb343aed069862a05b5e315173b17823
+Author: Julien Cristau
+Date: Fri Jul 18 16:35:57 2008 +0200
+
+ If we don't have libuuid, build without it instead of failing
+
+ Only error out if configure was given --with-libuuid but we
+ don't find it.
+
+commit e3166eecfe7a04f0f622bd93e8a6a1faa672a029
+Author: Adam Jackson
+Date: Wed Jul 2 14:24:24 2008 -0400
+
+ Avoid memcpy(foo, NULL, n), that's just nonsense.
+
+commit 27ebe517cabaf038fa65edff0140317f9438adec
+Author: Adam Jackson
+Date: Wed Jul 2 14:00:54 2008 -0400
+
+ libSM 1.1.0
+
commit 2e8a41efb10ae462e5e43e13e479ca4da0fb0103
Author: Alan Coopersmith
Date: Wed Jun 25 09:55:14 2008 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libSM-1.1.0/Makefile.am new/libSM-1.1.1/Makefile.am
--- old/libSM-1.1.0/Makefile.am 2008-05-12 23:30:18.000000000 +0200
+++ new/libSM-1.1.1/Makefile.am 2009-08-07 11:38:31.000000000 +0200
@@ -3,14 +3,12 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = sm.pc
-EXTRA_DIST=sm.pc.in
-
-EXTRA_DIST += ChangeLog
+EXTRA_DIST = sm.pc.in ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libSM-1.1.0/README new/libSM-1.1.1/README
--- old/libSM-1.1.0/README 2008-05-12 23:30:18.000000000 +0200
+++ new/libSM-1.1.1/README 2009-08-07 11:38:31.000000000 +0200
@@ -0,0 +1,30 @@
+libSM - X Session Management Library
+
+Documentation for this API can be found in the SMlib document in the
+doc/xorg-docs module of the X distribution, also available online at:
+
+ http://xorg.freedesktop.org/releases/X11R7.0/doc/PDF/SMlib.pdf
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/lib/libSM
+
+ http://cgit.freedesktop.org/xorg/lib/libSM
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libSM-1.1.0/config.h.in new/libSM-1.1.1/config.h.in
--- old/libSM-1.1.0/config.h.in 2008-07-02 19:58:26.000000000 +0200
+++ new/libSM-1.1.1/config.h.in 2009-08-07 14:22:17.000000000 +0200
@@ -9,9 +9,15 @@
/* Define to 1 if you have the header file. */
#undef HAVE_INTTYPES_H
+/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
+#undef HAVE_LIBWS2_32
+
/* Define to 1 if you have the header file. */
#undef HAVE_MEMORY_H
+/* Define to 1 if the system has the type `socklen_t'. */
+#undef HAVE_SOCKLEN_T
+
/* Define to 1 if you have the header file. */
#undef HAVE_STDINT_H
@@ -33,12 +39,19 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to 1 if you have the `uuid_create' function. */
+#undef HAVE_UUID_CREATE
+
/* Support IPv6 for TCP connections */
#undef IPv6
/* Support os-specific local connections */
#undef LOCALCONN
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libSM-1.1.0/configure.ac new/libSM-1.1.1/configure.ac
--- old/libSM-1.1.0/configure.ac 2008-07-02 19:58:05.000000000 +0200
+++ new/libSM-1.1.1/configure.ac 2009-08-07 14:19:19.000000000 +0200
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libSM],
- 1.1.0,
+ 1.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libSM)
@@ -12,14 +12,19 @@
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
AM_CONFIG_HEADER([config.h])
# Checks for programs.
AC_PROG_LIBTOOL
AC_PROG_CC
+XORG_CWARNFLAGS
# Checks for pkg-config packages
PKG_CHECK_MODULES(SM, ice xproto)
+SM_CFLAGS="$CWARNFLAGS $SM_CFLAGS"
AC_SUBST(SM_CFLAGS)
AC_SUBST(SM_LIBS)
@@ -36,20 +41,20 @@
XTRANS_CONNECTION_FLAGS
AC_ARG_WITH(libuuid, AC_HELP_STRING([--with-libuuid], [Build with libuuid support for client IDs]))
-AM_CONDITIONAL(WITH_LIBUUID, test x"$with_libuuid" != xno)
-if test x"$with_libuuid" != xno; then
- PKG_CHECK_MODULES(LIBUUID, uuid)
-fi
-
-if test "x$GCC" = "xyes"; then
- GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations \
- -Wnested-externs -fno-strict-aliasing"
- CFLAGS="$GCC_WARNINGS $CFLAGS"
-fi
+AC_CHECK_FUNCS([uuid_create], [], [
+ if test x"$with_libuuid" != xno && test x"$have_system_uuid" != xyes; then
+ PKG_CHECK_MODULES(LIBUUID, uuid, [HAVE_LIBUUID=yes], [HAVE_LIBUUID=no])
+ fi
+ if test x"$with_libuuid" = xyes && test x"$HAVE_LIBUUID" = xno; then
+ AC_MSG_ERROR([requested libuuid support but uuid.pc not found])
+ fi
+])
+
+AM_CONDITIONAL(WITH_LIBUUID, test x"$HAVE_LIBUUID" = xyes)
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libSM-1.1.0/missing new/libSM-1.1.1/missing
--- old/libSM-1.1.0/missing 2008-07-02 19:58:27.000000000 +0200
+++ new/libSM-1.1.1/missing 2009-08-07 14:22:19.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libSM-1.1.0/src/Makefile.am new/libSM-1.1.1/src/Makefile.am
--- old/libSM-1.1.0/src/Makefile.am 2008-06-24 19:09:29.000000000 +0200
+++ new/libSM-1.1.1/src/Makefile.am 2009-08-07 14:19:15.000000000 +0200
@@ -6,7 +6,7 @@
AM_CFLAGS += $(LIBUUID_CFLAGS) -DHAVE_LIBUUID
endif
-libSM_la_LDFLAGS = -version-number 6:0:0 -no-undefined
+libSM_la_LDFLAGS = -version-number 6:0:1 -no-undefined
libSM_la_LIBADD = $(SM_LIBS) $(XTRANS_LIBS)
@@ -16,7 +16,6 @@
libSM_la_SOURCES = \
SMlibint.h \
- globals.h \
sm_auth.c \
sm_client.c \
sm_error.c \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libSM-1.1.0/src/SMlibint.h new/libSM-1.1.1/src/SMlibint.h
--- old/libSM-1.1.0/src/SMlibint.h 2008-05-12 23:30:18.000000000 +0200
+++ new/libSM-1.1.1/src/SMlibint.h 2009-08-07 11:38:31.000000000 +0200
@@ -207,10 +207,9 @@
#define STORE_ARRAY8(_pBuf, _len, _array8) \
{ \
STORE_CARD32 (_pBuf, _len); \
- memcpy (_pBuf, _array8, _len); \
- _pBuf += _len; \
- if (PAD64 (4 + _len)) \
- _pBuf += PAD64 (4 + _len); \
+ if (_len) \
+ memcpy (_pBuf, _array8, _len); \
+ _pBuf += _len + PAD64 (4 + _len); \
}
#define STORE_LISTOF_PROPERTY(_pBuf, _count, _props) \
@@ -243,9 +242,7 @@
_array8 = (char *) malloc (_len + 1); \
memcpy (_array8, _pBuf, _len); \
_array8[_len] = '\0'; \
- _pBuf += _len; \
- if (PAD64 (4 + _len)) \
- _pBuf += PAD64 (4 + _len); \
+ _pBuf += _len + PAD64 (4 + _len); \
}
#define EXTRACT_ARRAY8_AS_STRING(_pBuf, _swap, _string) \
@@ -255,9 +252,7 @@
_string = (char *) malloc (_len + 1); \
memcpy (_string, _pBuf, _len); \
_string[_len] = '\0'; \
- _pBuf += _len; \
- if (PAD64 (4 + _len)) \
- _pBuf += PAD64 (4 + _len); \
+ _pBuf += _len + PAD64 (4 + _len); \
}
#define EXTRACT_LISTOF_PROPERTY(_pBuf, _swap, _count, _props) \
@@ -289,9 +284,7 @@
{ \
CARD32 _len; \
EXTRACT_CARD32 (_pBuf, _swap, _len); \
- _pBuf += _len; \
- if (PAD64 (4 + _len)) \
- _pBuf += PAD64 (4 + _len); \
+ _pBuf += _len + PAD64 (4 + _len); \
}
#define SKIP_LISTOF_PROPERTY(_pBuf, _swap) \
@@ -495,6 +488,24 @@
/*
* Extern declarations
*/
+extern void
+_SmcProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
+ unsigned long length, Bool swap,
+ IceReplyWaitInfo *replyWait, Bool *replyReadyRet);
+
+extern void
+_SmsProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
+ unsigned long length, Bool swap);
+
+extern void
+_SmcDefaultErrorHandler(SmcConn smcConn, Bool swap, int offendingMinorOpcode,
+ unsigned long offendingSequence, int errorClass,
+ int severity, SmPointer values);
+
+extern void
+_SmsDefaultErrorHandler(SmsConn smsConn, Bool swap, int offendingMinorOpcode,
+ unsigned long offendingSequence, int errorClass,
+ int severity, SmPointer values);
extern int _SmcOpcode;
extern int _SmsOpcode;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libSM-1.1.0/src/globals.h new/libSM-1.1.1/src/globals.h
--- old/libSM-1.1.0/src/globals.h 2008-05-12 23:30:18.000000000 +0200
+++ new/libSM-1.1.1/src/globals.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-/* $Xorg: globals.h,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */
-
-/*
-
-Copyright 1993, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/SM/globals.h,v 1.4 2001/12/14 19:53:55 dawes Exp $ */
-
-/*
- * Author: Ralph Mor, X Consortium
- */
-
-extern void _SmcDefaultErrorHandler ();
-extern void _SmsDefaultErrorHandler ();
-
-int _SmcOpcode = 0;
-int _SmsOpcode = 0;
-
-#ifndef __UNIXOS2__
-SmsNewClientProc _SmsNewClientProc;
-SmPointer _SmsNewClientData;
-#else
-SmsNewClientProc _SmsNewClientProc = 0;
-SmPointer _SmsNewClientData = 0;
-#endif
-
-SmcErrorHandler _SmcErrorHandler = _SmcDefaultErrorHandler;
-SmsErrorHandler _SmsErrorHandler = _SmsDefaultErrorHandler;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libSM-1.1.0/src/sm_client.c new/libSM-1.1.1/src/sm_client.c
--- old/libSM-1.1.0/src/sm_client.c 2008-05-12 23:30:18.000000000 +0200
+++ new/libSM-1.1.1/src/sm_client.c 2009-08-07 11:38:31.000000000 +0200
@@ -1,6 +1,3 @@
-/* $XdotOrg: $ */
-/* $Xorg: sm_client.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */
-
/*
Copyright 1993, 1998 The Open Group
@@ -36,29 +33,32 @@
#endif
#include
#include "SMlibint.h"
-#include "globals.h"
-extern IcePoAuthStatus _IcePoMagicCookie1Proc ();
-extern void _SmcProcessMessage ();
-static void set_callbacks();
+int _SmcOpcode = 0;
+int _SmsOpcode = 0;
+
+#ifndef __UNIXOS2__
+SmsNewClientProc _SmsNewClientProc;
+SmPointer _SmsNewClientData;
+#else
+SmsNewClientProc _SmsNewClientProc = 0;
+SmPointer _SmsNewClientData = 0;
+#endif
+
+SmcErrorHandler _SmcErrorHandler = _SmcDefaultErrorHandler;
+SmsErrorHandler _SmsErrorHandler = _SmsDefaultErrorHandler;
+
+
+static void
+set_callbacks(SmcConn smcConn, unsigned long mask, SmcCallbacks *callbacks);
SmcConn
-SmcOpenConnection (networkIdsList, context,
- xsmpMajorRev, xsmpMinorRev, mask, callbacks,
- previousId, clientIdRet, errorLength, errorStringRet)
-
-char *networkIdsList;
-SmPointer context;
-int xsmpMajorRev;
-int xsmpMinorRev;
-unsigned long mask;
-SmcCallbacks *callbacks;
-char *previousId;
-char **clientIdRet;
-int errorLength;
-char *errorStringRet;
-
+SmcOpenConnection(char *networkIdsList, SmPointer context,
+ int xsmpMajorRev, int xsmpMinorRev,
+ unsigned long mask, SmcCallbacks *callbacks,
+ char *previousId, char **clientIdRet,
+ int errorLength, char *errorStringRet)
{
SmcConn smcConn;
IceConn iceConn;
@@ -200,7 +200,9 @@
* Now register the client
*/
- len = previousId ? strlen (previousId) : 0;
+ if (!previousId)
+ previousId = "";
+ len = strlen (previousId);
extra = ARRAY8_BYTES (len);
IceGetHeaderExtra (iceConn, _SmcOpcode, SM_RegisterClient,
@@ -266,7 +268,7 @@
SIZEOF (smRegisterClientMsg), WORD64COUNT (extra),
smRegisterClientMsg, pMsg, pData);
- STORE_ARRAY8 (pData, 0, NULL);
+ STORE_ARRAY8 (pData, 0, "");
IceFlush (iceConn);
@@ -284,12 +286,7 @@
SmcCloseStatus
-SmcCloseConnection (smcConn, count, reasonMsgs)
-
-SmcConn smcConn;
-int count;
-char **reasonMsgs;
-
+SmcCloseConnection(SmcConn smcConn, int count, char **reasonMsgs)
{
IceConn iceConn = smcConn->iceConn;
smCloseConnectionMsg *pMsg;
@@ -357,12 +354,7 @@
void
-SmcModifyCallbacks (smcConn, mask, callbacks)
-
-SmcConn smcConn;
-unsigned long mask;
-SmcCallbacks *callbacks;
-
+SmcModifyCallbacks(SmcConn smcConn, unsigned long mask, SmcCallbacks *callbacks)
{
set_callbacks (smcConn, mask, callbacks);
}
@@ -370,12 +362,7 @@
void
-SmcSetProperties (smcConn, numProps, props)
-
-SmcConn smcConn;
-int numProps;
-SmProp **props;
-
+SmcSetProperties(SmcConn smcConn, int numProps, SmProp **props)
{
IceConn iceConn = smcConn->iceConn;
smSetPropertiesMsg *pMsg;
@@ -390,6 +377,7 @@
pMsg->length += WORD64COUNT (bytes);
pBuf = pStart = IceAllocScratch (iceConn, bytes);
+ memset(pStart, 0, bytes);
STORE_LISTOF_PROPERTY (pBuf, numProps, props);
@@ -400,12 +388,7 @@
void
-SmcDeleteProperties (smcConn, numProps, propNames)
-
-SmcConn smcConn;
-int numProps;
-char **propNames;
-
+SmcDeleteProperties(SmcConn smcConn, int numProps, char **propNames)
{
IceConn iceConn = smcConn->iceConn;
smDeletePropertiesMsg *pMsg;
@@ -433,12 +416,8 @@
Status
-SmcGetProperties (smcConn, propReplyProc, clientData)
-
-SmcConn smcConn;
-SmcPropReplyProc propReplyProc;
-SmPointer clientData;
-
+SmcGetProperties(SmcConn smcConn, SmcPropReplyProc propReplyProc,
+ SmPointer clientData)
{
IceConn iceConn = smcConn->iceConn;
_SmcPropReplyWait *wait, *ptr;
@@ -471,13 +450,8 @@
Status
-SmcInteractRequest (smcConn, dialogType, interactProc, clientData)
-
-SmcConn smcConn;
-int dialogType;
-SmcInteractProc interactProc;
-SmPointer clientData;
-
+SmcInteractRequest(SmcConn smcConn, int dialogType,
+ SmcInteractProc interactProc, SmPointer clientData)
{
IceConn iceConn = smcConn->iceConn;
smInteractRequestMsg *pMsg;
@@ -515,11 +489,7 @@
void
-SmcInteractDone (smcConn, cancelShutdown)
-
-SmcConn smcConn;
-Bool cancelShutdown;
-
+SmcInteractDone(SmcConn smcConn, Bool cancelShutdown)
{
IceConn iceConn = smcConn->iceConn;
smInteractDoneMsg *pMsg;
@@ -535,16 +505,8 @@
void
-SmcRequestSaveYourself (smcConn, saveType, shutdown, interactStyle,
- fast, global)
-
-SmcConn smcConn;
-int saveType;
-Bool shutdown;
-int interactStyle;
-Bool fast;
-Bool global;
-
+SmcRequestSaveYourself(SmcConn smcConn, int saveType, Bool shutdown,
+ int interactStyle, Bool fast, Bool global)
{
IceConn iceConn = smcConn->iceConn;
smSaveYourselfRequestMsg *pMsg;
@@ -564,12 +526,9 @@
Status
-SmcRequestSaveYourselfPhase2 (smcConn, saveYourselfPhase2Proc, clientData)
-
-SmcConn smcConn;
-SmcSaveYourselfPhase2Proc saveYourselfPhase2Proc;
-SmPointer clientData;
-
+SmcRequestSaveYourselfPhase2(SmcConn smcConn,
+ SmcSaveYourselfPhase2Proc saveYourselfPhase2Proc,
+ SmPointer clientData)
{
IceConn iceConn = smcConn->iceConn;
_SmcPhase2Wait *wait;
@@ -599,11 +558,7 @@
void
-SmcSaveYourselfDone (smcConn, success)
-
-SmcConn smcConn;
-Bool success;
-
+SmcSaveYourselfDone(SmcConn smcConn, Bool success)
{
IceConn iceConn = smcConn->iceConn;
smSaveYourselfDoneMsg *pMsg;
@@ -619,12 +574,7 @@
static void
-set_callbacks (smcConn, mask, callbacks)
-
-SmcConn smcConn;
-unsigned long mask;
-SmcCallbacks *callbacks;
-
+set_callbacks(SmcConn smcConn, unsigned long mask, SmcCallbacks *callbacks)
{
if (mask & SmcSaveYourselfProcMask)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libSM-1.1.0/src/sm_error.c new/libSM-1.1.1/src/sm_error.c
--- old/libSM-1.1.0/src/sm_error.c 2008-05-12 23:30:18.000000000 +0200
+++ new/libSM-1.1.1/src/sm_error.c 2009-08-07 11:38:31.000000000 +0200
@@ -45,18 +45,9 @@
*/
void
-_SmcDefaultErrorHandler (smcConn, swap,
- offendingMinorOpcode, offendingSequence,
- errorClass, severity, values)
-
-SmcConn smcConn;
-Bool swap;
-int offendingMinorOpcode;
-unsigned long offendingSequence;
-int errorClass;
-int severity;
-SmPointer values;
-
+_SmcDefaultErrorHandler(SmcConn smcConn, Bool swap, int offendingMinorOpcode,
+ unsigned long offendingSequence, int errorClass,
+ int severity, SmPointer values)
{
char *pData = (char *) values;
const char *str;
@@ -177,18 +168,9 @@
*/
void
-_SmsDefaultErrorHandler (smsConn, swap,
- offendingMinorOpcode, offendingSequence,
- errorClass, severity, values)
-
-SmsConn smsConn;
-Bool swap;
-int offendingMinorOpcode;
-unsigned long offendingSequence;
-int errorClass;
-int severity;
-SmPointer values;
-
+_SmsDefaultErrorHandler(SmsConn smsConn, Bool swap, int offendingMinorOpcode,
+ unsigned long offendingSequence, int errorClass,
+ int severity, SmPointer values)
{
char *pData = (char *) values;
const char *str;
@@ -301,10 +283,7 @@
*/
SmcErrorHandler
-SmcSetErrorHandler (handler)
-
-SmcErrorHandler handler;
-
+SmcSetErrorHandler(SmcErrorHandler handler)
{
SmcErrorHandler oldHandler = _SmcErrorHandler;
@@ -325,10 +304,7 @@
*/
SmsErrorHandler
-SmsSetErrorHandler (handler)
-
-SmsErrorHandler handler;
-
+SmsSetErrorHandler(SmsErrorHandler handler)
{
SmsErrorHandler oldHandler = _SmsErrorHandler;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libSM-1.1.0/src/sm_genid.c new/libSM-1.1.1/src/sm_genid.c
--- old/libSM-1.1.0/src/sm_genid.c 2008-06-24 19:11:27.000000000 +0200
+++ new/libSM-1.1.1/src/sm_genid.c 2009-08-07 11:38:31.000000000 +0200
@@ -76,16 +76,36 @@
#define TCPCONN
#endif
-#if defined(HAVE_LIBUUID)
+#if defined(HAVE_UUID_CREATE)
+#include
+#elif defined(HAVE_LIBUUID)
#include
#endif
char *
-SmsGenerateClientID (smsConn)
- SmsConn smsConn;
+SmsGenerateClientID(SmsConn smsConn)
{
-#if defined(HAVE_LIBUUID)
+#if defined(HAVE_UUID_CREATE)
+ char *id;
+ char **temp;
+ uuid_t uuid;
+ uint32_t status;
+
+ uuid_create(&uuid, &status);
+
+ uuid_to_string(&uuid, &temp, &status);
+
+ if ((id = malloc (strlen (temp) + 2)) != NULL)
+ {
+ id[1] = '2';
+ strcpy (id+1, temp);
+ }
+
+ free(temp);
+
+ return id;
+#elif defined(HAVE_LIBUUID)
char *id;
char temp[256];
uuid_t uuid;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libSM-1.1.0/src/sm_manager.c new/libSM-1.1.1/src/sm_manager.c
--- old/libSM-1.1.0/src/sm_manager.c 2008-05-12 23:30:18.000000000 +0200
+++ new/libSM-1.1.1/src/sm_manager.c 2009-08-07 11:38:31.000000000 +0200
@@ -42,9 +42,6 @@
#undef shutdown
#endif
-extern IcePaAuthStatus _IcePaMagicCookie1Proc ();
-extern void _SmsProcessMessage ();
-
static Status
@@ -117,17 +114,9 @@
Status
-SmsInitialize (vendor, release, newClientProc, managerData,
- hostBasedAuthProc, errorLength, errorStringRet)
-
-char *vendor;
-char *release;
-SmsNewClientProc newClientProc;
-SmPointer managerData;
-IceHostBasedAuthProc hostBasedAuthProc;
-int errorLength;
-char *errorStringRet;
-
+SmsInitialize(char *vendor, char *release, SmsNewClientProc newClientProc,
+ SmPointer managerData, IceHostBasedAuthProc hostBasedAuthProc,
+ int errorLength, char *errorStringRet)
{
const char *auth_names[] = {"MIT-MAGIC-COOKIE-1"};
IcePaAuthProc auth_procs[] = {_IcePaMagicCookie1Proc};
@@ -186,10 +175,7 @@
char *
-SmsClientHostName (smsConn)
-
-SmsConn smsConn;
-
+SmsClientHostName(SmsConn smsConn)
{
return (IceGetPeerName (smsConn->iceConn));
}
@@ -197,11 +183,7 @@
Status
-SmsRegisterClientReply (smsConn, clientId)
-
-SmsConn smsConn;
-char *clientId;
-
+SmsRegisterClientReply(SmsConn smsConn, char *clientId)
{
IceConn iceConn = smsConn->iceConn;
int extra;
@@ -231,14 +213,8 @@
void
-SmsSaveYourself (smsConn, saveType, shutdown, interactStyle, fast)
-
-SmsConn smsConn;
-int saveType;
-Bool shutdown;
-int interactStyle;
-Bool fast;
-
+SmsSaveYourself(SmsConn smsConn, int saveType, Bool shutdown,
+ int interactStyle, Bool fast)
{
IceConn iceConn = smsConn->iceConn;
smSaveYourselfMsg *pMsg;
@@ -274,10 +250,7 @@
void
-SmsSaveYourselfPhase2 (smsConn)
-
-SmsConn smsConn;
-
+SmsSaveYourselfPhase2(SmsConn smsConn)
{
IceConn iceConn = smsConn->iceConn;
@@ -288,10 +261,7 @@
void
-SmsInteract (smsConn)
-
-SmsConn smsConn;
-
+SmsInteract(SmsConn smsConn)
{
IceConn iceConn = smsConn->iceConn;
@@ -304,10 +274,7 @@
void
-SmsDie (smsConn)
-
-SmsConn smsConn;
-
+SmsDie(SmsConn smsConn)
{
IceConn iceConn = smsConn->iceConn;
@@ -318,10 +285,7 @@
void
-SmsSaveComplete (smsConn)
-
-SmsConn smsConn;
-
+SmsSaveComplete(SmsConn smsConn)
{
IceConn iceConn = smsConn->iceConn;
@@ -332,10 +296,7 @@
void
-SmsShutdownCancelled (smsConn)
-
-SmsConn smsConn;
-
+SmsShutdownCancelled(SmsConn smsConn)
{
IceConn iceConn = smsConn->iceConn;
@@ -348,12 +309,7 @@
void
-SmsReturnProperties (smsConn, numProps, props)
-
-SmsConn smsConn;
-int numProps;
-SmProp **props;
-
+SmsReturnProperties(SmsConn smsConn, int numProps, SmProp **props)
{
IceConn iceConn = smsConn->iceConn;
int bytes;
@@ -378,10 +334,7 @@
void
-SmsCleanUp (smsConn)
-
-SmsConn smsConn;
-
+SmsCleanUp(SmsConn smsConn)
{
IceProtocolShutdown (smsConn->iceConn, _SmsOpcode);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libSM-1.1.0/src/sm_misc.c new/libSM-1.1.1/src/sm_misc.c
--- old/libSM-1.1.0/src/sm_misc.c 2008-05-12 23:30:18.000000000 +0200
+++ new/libSM-1.1.1/src/sm_misc.c 2009-08-07 11:38:31.000000000 +0200
@@ -42,10 +42,7 @@
*/
void
-SmFreeProperty (prop)
-
-SmProp *prop;
-
+SmFreeProperty(SmProp *prop)
{
if (prop)
{
@@ -73,11 +70,7 @@
*/
void
-SmFreeReasons (count, reasonMsgs)
-
-int count;
-char **reasonMsgs;
-
+SmFreeReasons(int count, char **reasonMsgs)
{
if (reasonMsgs)
{
@@ -97,30 +90,21 @@
*/
int
-SmcProtocolVersion (smcConn)
-
-SmcConn smcConn;
-
+SmcProtocolVersion(SmcConn smcConn)
{
return (smcConn->proto_major_version);
}
int
-SmcProtocolRevision (smcConn)
-
-SmcConn smcConn;
-
+SmcProtocolRevision(SmcConn smcConn)
{
return (smcConn->proto_minor_version);
}
char *
-SmcVendor (smcConn)
-
-SmcConn smcConn;
-
+SmcVendor(SmcConn smcConn)
{
char *string = (char *) malloc (strlen (smcConn->vendor) + 1);
@@ -131,10 +115,7 @@
char *
-SmcRelease (smcConn)
-
-SmcConn smcConn;
-
+SmcRelease(SmcConn smcConn)
{
char *string = (char *) malloc (strlen (smcConn->release) + 1);
@@ -145,10 +126,7 @@
char *
-SmcClientID (smcConn)
-
-SmcConn smcConn;
-
+SmcClientID(SmcConn smcConn)
{
char *clientId = (char *) malloc (strlen (smcConn->client_id) + 1);
@@ -159,10 +137,7 @@
IceConn
-SmcGetIceConnection (smcConn)
-
-SmcConn smcConn;
-
+SmcGetIceConnection(SmcConn smcConn)
{
return (smcConn->iceConn);
}
@@ -174,30 +149,21 @@
*/
int
-SmsProtocolVersion (smsConn)
-
-SmsConn smsConn;
-
+SmsProtocolVersion(SmsConn smsConn)
{
return (smsConn->proto_major_version);
}
int
-SmsProtocolRevision (smsConn)
-
-SmsConn smsConn;
-
+SmsProtocolRevision(SmsConn smsConn)
{
return (smsConn->proto_minor_version);
}
char *
-SmsClientID (smsConn)
-
-SmsConn smsConn;
-
+SmsClientID(SmsConn smsConn)
{
char *clientId = (char *) malloc (strlen (smsConn->client_id) + 1);
@@ -208,10 +174,7 @@
IceConn
-SmsGetIceConnection (smsConn)
-
-SmsConn smsConn;
-
+SmsGetIceConnection(SmsConn smsConn)
{
return (smsConn->iceConn);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libSM-1.1.0/src/sm_process.c new/libSM-1.1.1/src/sm_process.c
--- old/libSM-1.1.0/src/sm_process.c 2008-05-12 23:30:18.000000000 +0200
+++ new/libSM-1.1.1/src/sm_process.c 2009-08-07 11:38:31.000000000 +0200
@@ -68,17 +68,9 @@
void
-_SmcProcessMessage (iceConn, clientData, opcode,
- length, swap, replyWait, replyReadyRet)
-
-IceConn iceConn;
-IcePointer clientData;
-int opcode;
-unsigned long length;
-Bool swap;
-IceReplyWaitInfo *replyWait;
-Bool *replyReadyRet;
-
+_SmcProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
+ unsigned long length, Bool swap,
+ IceReplyWaitInfo *replyWait, Bool *replyReadyRet)
{
SmcConn smcConn = (SmcConn) clientData;
@@ -423,14 +415,8 @@
void
-_SmsProcessMessage (iceConn, clientData, opcode, length, swap)
-
-IceConn iceConn;
-IcePointer clientData;
-int opcode;
-unsigned long length;
-Bool swap;
-
+_SmsProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
+ unsigned long length, Bool swap)
{
SmsConn smsConn = (SmsConn) clientData;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
