libsm: Changes to 'upstream-unstable'

2012-04-10 Thread Julien Cristau 
 COPYING|3 
 configure.ac   |   60 --
 doc/.gitignore |3 
 doc/Makefile.am|   63 --
 doc/SMlib.xml  |  736 ++---
 doc/xsmp.xml   | 1229 -
 docbook.am |  105 
 include/X11/SM/SMlib.h |6 
 sm.pc.in   |4 
 src/Makefile.am|5 
 src/SMlibint.h |   10 
 src/sm_client.c|   32 -
 src/sm_error.c |8 
 src/sm_genid.c |  154 ++
 src/sm_manager.c   |   14 
 src/sm_misc.c  |   32 -
 src/sm_process.c   |   14 
 17 files changed, 1358 insertions(+), 1120 deletions(-)

New commits:
commit b3d1f4896cab54717acd691b62b7fa3122a5fd8c
Author: Alan Coopersmith 
Date:   Fri Mar 2 20:53:41 2012 -0800

libSM 1.2.1

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index 2e1168e..6d578e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 
 # Initialize Autoconf
 AC_PREREQ(2.60)
-AC_INIT([libSM], [1.2.0],
+AC_INIT([libSM], [1.2.1],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libSM])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])

commit 6475d9eff0bfbb6446eff205fd52c5ba82c5819c
Author: Matt Dew 
Date:   Wed Jan 11 20:33:41 2012 -0700

informaltable cleanup

On certain tables, add top and bottom borders to table
header and a bottom border to the table. This matches
what those tables in the old pdfs looked like.

the  prevents tables from
splitting across pages. Useful for tiny tables.

Converting the colwidth to a floating point,
IE, 1* -> 1.0* cleans up these build errors:
WARNING: table-layout="fixed" and column-width unspecified
=> falling back to proportional-column-width(1)

Signed-off-by: Matt Dew 

diff --git a/doc/SMlib.xml b/doc/SMlib.xml
index 6d2a234..43579f9 100644
--- a/doc/SMlib.xml
+++ b/doc/SMlib.xml
@@ -349,26 +349,23 @@ is NULL, the value of
 the SESSION_MANAGER environment variable will be used.
 Each network ID has the following format:
 
-
-  
-
-
-
+
+  
+  
+
+
 
   
-
-tcp/:
-or
+
tcp/:
+or
   
   
-
-decnet/::
-or
+
decnet/::
+or
   
   
-
-local/:
-
+
local/:
+
   
 
   
@@ -2888,86 +2885,86 @@ A type of SmLISTofARRAY8 indicates that 
there is a list of array of
 bytes.
   
 
-
-  
-
-
-
-
+
+  
+
+
+
+
 
-  
-Name
-Type
-POSIX Type
-Required
+  
+Name
+Type
+POSIX Type
+Required
   
 
 
   
-SmCloneCommand
-OS-specific
-SmLISTofARRAY8
-Yes
+SmCloneCommand
+OS-specific
+SmLISTofARRAY8
+Yes
   
   
-SmCurrentDirectory
-OS-specific
-SmARRAY8
-No
+SmCurrentDirectory
+OS-specific
+SmARRAY8
+No
   
   
-SmDiscardCommand
-OS-specific
-SmLISTofARRAY8
-No*
+SmDiscardCommand
+OS-specific
+SmLISTofARRAY8
+No*
   
   
-SmEnvironment
-OS-specific
-SmLISTofARRAY8
-No
+SmEnvironment
+OS-specific
+SmLISTofARRAY8
+No
   
   
-SmProcessID
-OS-specific
-SmARRAY8
-No
+SmProcessID
+OS-specific
+SmARRAY8
+No
   
   
-SmProgram
-OS-specific
-SmARRAY8
-Yes
+SmProgram
+OS-specific
+SmARRAY8
+Yes
   
   
-SmRestartCommand
-OS-specific
-SmLISTofARRAY8
-Yes
+SmRestartCommand
+OS-specific
+SmLISTofARRAY8
+Yes
   
   
-SmResignCommand
-OS-specific
-SmLISTofARRAY8
-No
+SmResignCommand
+OS-specific
+SmLISTofARRAY8
+No
   
   
-SmRestartStyleHint
-SmCARD8
-SmCARD8
-No
+SmRestartStyleHint
+SmCARD8
+SmCARD8
+No
   
   
-SmShutdownCommand
-OS-specific
-SmLISTofARRAY8
-No
+SmShutdownCommand
+OS-specific
+SmLISTofARRAY8
+No
   
   
-SmUserID
-SmARRAY8
-SmARRAY8
-Yes
+SmUserID
+SmARRAY8
+SmARRAY8
+Yes
   
 
   
@@ -3052,32 +3049,33 @@ style of restarting the client prefers.  If this style 
is not specified,
 SmRestartIfRunning is assumed.
 The possible values are as follows:
 
-
-  
-

libsm: Changes to 'upstream-unstable'

2010-11-07 Thread Cyril Brulebois 
 .gitignore   |   73 -
 COPYING  |   21 
 INSTALL  |  229 ---
 Makefile.am  |   12 
 README   |5 
 configure.ac |   27 
 doc/.gitignore   |6 
 doc/Makefile.am  |   64 
 doc/SMlib.xml| 3230 +++
 doc/xsmp.xml | 2274 +
 include/X11/SM/SM.h  |2 
 include/X11/SM/SMlib.h   |2 
 include/X11/SM/SMproto.h |2 
 src/Makefile.am  |2 
 src/SMlibint.h   |3 
 src/sm_auth.c|3 
 src/sm_error.c   |3 
 src/sm_genid.c   |   27 
 src/sm_manager.c |3 
 src/sm_misc.c|2 
 src/sm_process.c |3 
 21 files changed, 5704 insertions(+), 289 deletions(-)

New commits:
commit d2327760a52fdbcd3759211578e3663e00e4a31e
Author: Alan Coopersmith 
Date:   Wed Oct 27 22:26:41 2010 -0700

libSM 1.2.0

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index fd6b045..54aabdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.60)
 AC_INIT([libSM],
-1.1.1,
+[1.2.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 libSM)
 

commit 784a330e337af16c1e385d0fbeee1e5369413656
Author: Alan Coopersmith 
Date:   Sun Oct 24 20:31:54 2010 -0700

SMlib.xml: Use  instead of  for lists of mask values

Signed-off-by: Alan Coopersmith 

diff --git a/doc/SMlib.xml b/doc/SMlib.xml
index a82f209..fd84f1a 100644
--- a/doc/SMlib.xml
+++ b/doc/SMlib.xml
@@ -444,12 +444,12 @@ backwards compatibility in future versions of the library.
 The following values may be ORed together to obtain a
 mask value:
 
-
-SmcSaveYourselfProcMask
-SmcDieProcMask
-SmcSaveCompleteProcMask
-SmcShutdownCancelledProcMask
-
+  
+   SmcSaveYourselfProcMask
+   SmcDieProcMask
+   SmcSaveCompleteProcMask
+   SmcShutdownCancelledProcMask
+  
 
 
 
@@ -843,12 +843,12 @@ use SmcModifyCallbacks
 When specifying a value for the mask argument,
 the following values may be ORed together:
 
-
-SmcSaveYourselfProcMask
-SmcDieProcMask
-SmcSaveCompleteProcMask
-SmcShutdownCancelledProcMask
-
+  
+   SmcSaveYourselfProcMask
+   SmcDieProcMask
+   SmcSaveCompleteProcMask
+   SmcShutdownCancelledProcMask
+  
 
   
 
@@ -1624,18 +1624,18 @@ of the library.
 
 The following values may be ORed together to obtain a mask value:
 
-
-SmsRegisterClientProcMask
-SmsInteractRequestProcMask
-SmsInteractDoneProcMask
-SmsSaveYourselfRequestProcMask
-SmsSaveYourselfP2RequestProcMask
-SmsSaveYourselfDoneProcMask
-SmsCloseConnectionProcMask
-SmsSetPropertiesProcMask
-SmsDeletePropertiesProcMask
-SmsGetPropertiesProcMask
-
+  
+   SmsRegisterClientProcMask
+   SmsInteractRequestProcMask
+   SmsInteractDoneProcMask
+   SmsSaveYourselfRequestProcMask
+   SmsSaveYourselfP2RequestProcMask
+   SmsSaveYourselfDoneProcMask
+   SmsCloseConnectionProcMask
+   SmsSetPropertiesProcMask
+   SmsDeletePropertiesProcMask
+   SmsGetPropertiesProcMask
+  
 
 
 

commit 12af18dd9a731a816e7b074bbecaa5549bfdba31
Author: Alan Coopersmith 
Date:   Sun Oct 24 19:57:32 2010 -0700

SMlib.xml: Tag function names, parameters, constant values, etc.

Includes correcting  tags on things that aren't functions
as some stylesheets may add () after  tagged items so we
shouldn't use them for constants, variables, filenames, etc.

Signed-off-by: Alan Coopersmith 

diff --git a/doc/SMlib.xml b/doc/SMlib.xml
index d49983c..a82f209 100644
--- a/doc/SMlib.xml
+++ b/doc/SMlib.xml
@@ -131,12 +131,12 @@ a client-ID that uniquely 
identifies them in
 the session.  The session manager maintains a list of properties for
 each client in the session.  These properties describe the client's
 environment and, most importantly, describe how the client can be
-restarted (via an SmRestartCommand. Clients are
+restarted (via an SmRestartCommand). Clients are
 expected to save their state in such a way as to allow multiple
 instantiations of themselves to be managed independently.  For
 example, clients may use their client-ID as part of a filename in
 which to store the state for a particular instantiation.  The
-client-ID should be saved as part of the SmRestartCommand
+client-ID should be saved as part of the SmRestartCommand
 so that the client will retain the same ID after it is restarted.
   
 
@@ -224,16 +224,17 @@ standard.
 
   
 Applications (both session managers and clients) should include the
-header file .  This
-header file defines all of the SMlib data structures and function
-prototypes.  SMlib.h includes the header file
-, which defines all of
-the SMlib constants.
+header file .
+This header file defines all of the SMlib data structures an

libsm: Changes to 'upstream-unstable'

2009-08-25 Thread Julien Cristau 
 .gitignore   |7 ++
 Makefile.am  |6 --
 README   |   30 
 configure.ac |   27 ++
 src/.gitignore   |6 --
 src/Makefile.am  |3 -
 src/SMlibint.h   |   37 +-
 src/globals.h|   49 ---
 src/sm_client.c  |  136 +--
 src/sm_error.c   |   40 +++-
 src/sm_genid.c   |   28 +--
 src/sm_manager.c |   75 +-
 src/sm_misc.c|   61 
 src/sm_process.c |   24 ++---
 14 files changed, 186 insertions(+), 343 deletions(-)

New commits:
commit 82bbf42a2ba0401a8346505b1292ddb7b58f4507
Author: Rémi Cardona 
Date:   Fri Aug 7 14:19:50 2009 +0200

libSM 1.1.1, update libtool version

diff --git a/configure.ac b/configure.ac
index cf36193..2d1f09a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 188ac4d..41d074b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ if WITH_LIBUUID
 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)
 

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.

diff --git a/configure.ac b/configure.ac
index 9730b70..cf36193 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,12 +42,15 @@ XTRANS_CONNECTION_FLAGS
 
 AC_ARG_WITH(libuuid, AC_HELP_STRING([--with-libuuid], [Build with libuuid 
support for client IDs]))
 
-if test x"$with_libuuid" != xno; 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
+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
diff --git a/src/sm_genid.c b/src/sm_genid.c
index 391a10e..f6adda3 100644
--- a/src/sm_genid.c
+++ b/src/sm_genid.c
@@ -76,7 +76,9 @@ in this Software without prior written authorization from The 
Open Group.
 #define TCPCONN
 #endif
 
-#if defined(HAVE_LIBUUID)
+#if defined(HAVE_UUID_CREATE)
+#include 
+#elif defined(HAVE_LIBUUID)
 #include 
 #endif
 
@@ -84,7 +86,26 @@ in this Software without prior written authorization from 
The Open Group.
 char *
 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;

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.

diff --git a/configure.ac b/configure.ac
index 1d67f62..9730b70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AC_ARG_WITH(libuuid, AC_HELP_STRING([--with-libuuid], [Build 
with libuuid suppor
 if test x"$with_libuuid" != xno; then
PKG_CHECK_MODULES(LIBUUID, uuid, [HAVE_LIBUUID=yes], [HAVE_LIBUUID=no])
 fi
-if test x"$with_libuuid" = xyes && test HAVE_LIBUUID = no; then
+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)

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 

diff --git a/README b/README
index e69de29..2094328 100644
--- a/README
+++ b/README
@@ -0,0 +1,30 @@
+libSM - X Session Management Library
+
+Documentation for this API can be found in the S

libsm: Changes to 'upstream-unstable'

2009-02-15 Thread Julien Cristau 
 .gitignore  |1 
 ChangeLog   |  109 
 Makefile.am |   10 +
 configure.ac|9 
 src/Makefile.am |8 
 src/sm_genid.c  |   23 ++-
 6 files changed, 48 insertions(+), 112 deletions(-)

New commits:
commit 27ebe517cabaf038fa65edff0140317f9438adec
Author: Adam Jackson 
Date:   Wed Jul 2 14:00:54 2008 -0400

libSM 1.1.0

diff --git a/configure.ac b/configure.ac
index 5ed139d..f534bd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([libSM],
-1.0.3,
+1.1.0,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 libSM)
 

commit 2e8a41efb10ae462e5e43e13e479ca4da0fb0103
Author: Alan Coopersmith 
Date:   Wed Jun 25 09:55:14 2008 -0700

Fix --without-libuuid to not call PKG_CHECK_MODULES for libuuid

diff --git a/configure.ac b/configure.ac
index db2f3b9..5ed139d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ 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_uuid" != xno; then
+if test x"$with_libuuid" != xno; then
PKG_CHECK_MODULES(LIBUUID, uuid)
 fi
 

commit 6702e2a15992f4cb85dfa7ac8214125eb0a2bb2d
Author: Dan Williams 
Date:   Tue Jun 24 13:11:42 2008 -0400

Bug #14949: Don't use gethostbyname() for client IDs.

gethostbyname() will hit the network, which leads to DNS timeouts, which
leads to fail.  Just use UUIDs.

diff --git a/configure.ac b/configure.ac
index 4a72c19..db2f3b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,13 @@ AC_HEADER_STDC
 # Needed to check for TCP & IPv6 support and set flags appropriately
 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_uuid" != 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 \
diff --git a/src/Makefile.am b/src/Makefile.am
index b44e623..dbfef37 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,10 +2,18 @@ lib_LTLIBRARIES=libSM.la
 
 AM_CFLAGS= -I${top_srcdir}/include $(SM_CFLAGS) $(XTRANS_CFLAGS)
 
+if WITH_LIBUUID
+AM_CFLAGS += $(LIBUUID_CFLAGS) -DHAVE_LIBUUID
+endif
+
 libSM_la_LDFLAGS = -version-number 6:0:0 -no-undefined
 
 libSM_la_LIBADD = $(SM_LIBS) $(XTRANS_LIBS)
 
+if WITH_LIBUUID
+libSM_la_LIBADD += $(LIBUUID_LIBS)
+endif
+
 libSM_la_SOURCES = \
SMlibint.h \
globals.h \
diff --git a/src/sm_genid.c b/src/sm_genid.c
index 1d1e0a3..6f90a48 100644
--- a/src/sm_genid.c
+++ b/src/sm_genid.c
@@ -1,4 +1,3 @@
-/* $Xorg: sm_genid.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */
 /*
 
 Copyright 1993, 1998  The Open Group
@@ -25,7 +24,6 @@ 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/sm_genid.c,v 3.17 2003/07/09 15:27:28 tsi Exp $ */
 
 /*
  * Author: Ralph Mor, X Consortium
@@ -78,11 +76,31 @@ in this Software without prior written authorization from 
The Open Group.
 #define TCPCONN
 #endif
 
+#if defined(HAVE_LIBUUID)
+#include 
+#endif
+
 
 char *
 SmsGenerateClientID (smsConn)
 SmsConn smsConn;
 {
+#if defined(HAVE_LIBUUID)
+char *id;
+char temp[256];
+uuid_t uuid;
+
+uuid_generate(uuid);
+
+temp[0] = '2';
+temp[1] = '\0';
+uuid_unparse_lower(uuid, &temp[1]);
+
+if ((id = malloc (strlen (temp) + 1)) != NULL)
+   strcpy (id, temp);
+
+return id;
+#else
 #if defined(TCPCONN) || defined(STREAMSCONN)
 static const char hex[] = "0123456789abcdef";
 char hostname[256];
@@ -187,4 +205,5 @@ SmsGenerateClientID (smsConn)
 #else
 return (NULL);
 #endif
+#endif
 }

commit 2a827d26cfb10dc6b1203b77c0cc91dc838d97a3
Author: James Cloos 
Date:   Thu Dec 6 16:38:16 2007 -0500

Replace static ChangeLog with dist-hook to generate from git log

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 9254bd5..000
--- a/ChangeLog
+++ /dev/null
@@ -1,109 +0,0 @@
-2006-06-26  Alan Coopersmith  
-
-   * src/sm_genid.c: 
-   From Patch #6046 
-   freeaddrinfo() in error handling return (Peter Breitenlohner)
-
-2006-04-26  Adam Jackson  
-
-   * configure.ac:
-   Bump to 1.0.1
-
-2006-03-16  Alan Coopersmith  
-
-   * src/sm_manager.c:
-   * src/sm_client.c:
-   Specs say SmsInitialize & SmcOpenConnection return NULL terminated
-   strings in errorStringRet, but were just calling strncpy and not
-   making sure strings were NULL terminated if errorLength wasn't long
-   e

libsm: Changes to 'upstream-unstable'

2007-05-14 Thread Julien Cristau 
 .gitignore   |1 
 configure.ac |2 -
 src/SMlibint.h   |9 
 src/globals.h|   19 -
 src/sm_client.c  |   18 +---
 src/sm_error.c   |4 +--
 src/sm_genid.c   |   61 ++-
 src/sm_manager.c |   18 +---
 8 files changed, 50 insertions(+), 82 deletions(-)

New commits:
commit 837384e09dae2beda6ac3b8e1d10698dc0d23db4
Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
Date:   Sun May 13 14:21:39 2007 +0200

Bumped version to 1.0.3.

diff --git a/configure.ac b/configure.ac
index b8fdfb4..4a72c19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([libSM],
-1.0.2,
+1.0.3,
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 libSM)
 

commit 6c50f3639d74edd757dc72dbe6a29cb8aa3b87a3
Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
Date:   Sun May 13 11:47:47 2007 +0200

Another tiny char* vs const char* fix.

diff --git a/src/sm_manager.c b/src/sm_manager.c
index c75764f..51ac548 100644
--- a/src/sm_manager.c
+++ b/src/sm_manager.c
@@ -76,7 +76,7 @@ _SmsProtocolSetupProc (IceConniceConn,
 
 if ((smsConn = (SmsConn) malloc (sizeof (struct _SmsConn))) == NULL)
 {
-   char *str = "Memory allocation failed";
+   const char *str = "Memory allocation failed";
 
if ((*failureReasonRet = (char *) malloc (strlen (str) + 1)) != NULL)
strcpy (*failureReasonRet, str);

commit 9bfa1101ac5dbb8d2de1d0431d7e7b281428168f
Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
Date:   Sun May 13 11:46:16 2007 +0200

Revert "Don't reinvent the wheel and just use strdup()."

This reverts commit 57ea148fdbf047a012b361acdc7954e70679dad3.

diff --git a/src/sm_manager.c b/src/sm_manager.c
index f2b4cd1..c75764f 100644
--- a/src/sm_manager.c
+++ b/src/sm_manager.c
@@ -76,7 +76,10 @@ _SmsProtocolSetupProc (IceConniceConn,
 
 if ((smsConn = (SmsConn) malloc (sizeof (struct _SmsConn))) == NULL)
 {
-   *failureReasonRet = strdup ("Memory allocation failed");
+   char *str = "Memory allocation failed";
+
+   if ((*failureReasonRet = (char *) malloc (strlen (str) + 1)) != NULL)
+   strcpy (*failureReasonRet, str);
 
return (0);
 }

commit 24ac7974ef77d7832a8b3ddd300083c41a03cb79
Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
Date:   Sun May 13 01:44:12 2007 +0200

Added object files to .gitignore.

diff --git a/.gitignore b/.gitignore
index 7996c60..4ff4fed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ missing
 mkinstalldirs
 sm.pc
 stamp-h1
+*.o

commit 48d23e452780f327439a859fa941b1598eb249c8
Author: Tilman Sauerbeck <[EMAIL PROTECTED]>
Date:   Sun May 13 01:43:49 2007 +0200

Removed some global writable variables.

diff --git a/src/SMlibint.h b/src/SMlibint.h
index e9fa9cd..dce55b2 100644
--- a/src/SMlibint.h
+++ b/src/SMlibint.h
@@ -499,15 +499,6 @@ struct _SmsConn {
 extern int _SmcOpcode;
 extern int _SmsOpcode;
 
-extern int _SmVersionCount;
-extern IcePoVersionRec _SmcVersions[];
-extern IcePaVersionRec _SmsVersions[];
-
-extern int _SmAuthCount;
-extern char*_SmAuthNames[];
-extern IcePoAuthProc   _SmcAuthProcs[];
-extern IcePaAuthProc   _SmsAuthProcs[];
-
 extern SmsNewClientProc_SmsNewClientProc;
 extern SmPointer   _SmsNewClientData;
 
diff --git a/src/globals.h b/src/globals.h
index 2f26a78..40b0ffc 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -34,28 +34,9 @@ in this Software without prior written authorization from 
The Open Group.
 extern void _SmcDefaultErrorHandler ();
 extern void _SmsDefaultErrorHandler ();
 
-extern IcePoAuthStatus _IcePoMagicCookie1Proc ();
-extern IcePaAuthStatus _IcePaMagicCookie1Proc ();
-
-extern void _SmcProcessMessage ();
-extern void _SmsProcessMessage ();
-
 int_SmcOpcode = 0;
 int_SmsOpcode = 0;
 
-int_SmVersionCount = 1;
-
-IcePoVersionRec_SmcVersions[] = {
-   {SmProtoMajor, SmProtoMinor, _SmcProcessMessage}};
-
-IcePaVersionRec _SmsVersions[] = {
-   {SmProtoMajor, SmProtoMinor, _SmsProcessMessage}};
-
-int_SmAuthCount = 1;
-char   *_SmAuthNames[] = {"MIT-MAGIC-COOKIE-1"};
-IcePoAuthProc  _SmcAuthProcs[] = {_IcePoMagicCookie1Proc};
-IcePaAuthProc  _SmsAuthProcs[] = {_IcePaMagicCookie1Proc};
-
 #ifndef __UNIXOS2__
 SmsNewClientProc _SmsNewClientProc;
 SmPointer_SmsNewClientData;
diff --git a/src/sm_client.c b/src/sm_client.c
index 047924b..03ffc0e 100644
--- a/src/sm_client.c
+++ b/src/sm_client.c
@@ -38,6 +38,8 @@ in this Software without prior written authorization from The 
Open Group.
 #include "SMlibint.h"
 #include "globals.h"
 
+extern IcePoAuthStatus _IcePoMagicCookie1Proc ();
+extern void _SmcProcessMessage ();
 static void set_callbacks();
 
 
@@ -73,6 +75,16 @@ char *errorStringRet;
 _SmcRegisterClientReplyreply;
 Bool

libsm: Changes to 'upstream-unstable'

2007-01-19 Thread David Nusinow 
New branch 'upstream-unstable' available with the following commits:
commit 34b3d538061cd648d90eb2bc7284000d980c8d3e
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Fri Oct 13 15:55:08 2006 -0400

Bump to 1.0.2

commit 2116811afe339a9b806f04debf2b6241fd00456f
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Thu Jul 13 14:58:45 2006 -0700

renamed: .cvsignore -> .gitignore

commit ff57e5d728c2f409b8852ee58d622c2c3323e2a8
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Mon Jun 26 17:30:22 2006 +

From Patch #6046 
freeaddrinfo() in error handling return (Peter Breitenlohner)

commit d03116c682567dac793d52e65a1f0698ae6848f6
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Thu Apr 27 00:01:01 2006 +

Bump to 1.0.1

commit c46e8ae80540713ec24fd6d1eea68744937ef158
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Fri Mar 17 03:05:32 2006 +

Specs say SmsInitialize & SmcOpenConnection return NULL terminated strings
in errorStringRet, but were just calling strncpy and not making sure
strings were NULL terminated if errorLength wasn't long enough.
(Noticed while evaluating Coverity ids 196 & 201.)

commit 6842e89f85b1fa30344e2bf3d28e51dbfd978370
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Thu Dec 15 00:24:27 2005 +

Update package version number for final X11R7 release candidate.

commit 2f62b1a35756301469de62b8830733ebeec2e908
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Sat Dec 3 05:49:42 2005 +

Update package version number for X11R7 RC3 release.

commit 69c50fbc49f7589aa6afcf1be00be22a78ec3daa
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Sat Nov 19 07:15:39 2005 +

Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work
with separate build roots.

commit dea915c93437443b6bd4933263df44e734e40320
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Wed Nov 9 21:19:12 2005 +

Update package version number for X11R7 RC2 release.

commit 922e2dc3116a88cc1e49d5e2486fe1ca21f888c7
Author: Kean Johnson <[EMAIL PROTECTED]>
Date:   Tue Nov 8 06:33:25 2005 +

See ChangeLog entry 2005-11-07 for details.

commit df1260d8710f497e766ac52162585345f2d7669f
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Wed Oct 19 02:48:08 2005 +

Update package version number for RC1 release.

commit 601c38a8b0bbe92db6374e00e485435316dce1cb
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Mon Aug 15 18:31:16 2005 +

Add XTRANS_CONNECTION_FLAGS to set TCP & IPv6 flags needed by libSM

commit 0a00119745bef1bd67b53124a6a41b76454c5503
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date:   Fri Jul 29 21:22:50 2005 +

Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version

commit c6f143cc14840ca029e651d84f6c9a68c003cf07
Author: Daniel Stone <[EMAIL PROTECTED]>
Date:   Sat Jul 16 06:24:02 2005 +

Set soversion to 6.0.0 using -version-number.

commit 9c370ec68d2606468296efc1f0a093c036e8d7ff
Author: Keith Packard <[EMAIL PROTECTED]>
Date:   Wed Jul 13 07:28:02 2005 +

Eliminate xtrans CFLAGS from .pc file as xtrans is not part of the public
API.

commit 7b45eec97e390d8c8124b0a95b83ff7614903979
Author: Keith Packard <[EMAIL PROTECTED]>
Date:   Sat Jul 9 05:59:54 2005 +

Add .cvsignore files

commit 0a4f43e5170110519bd34d01f1f20a72ea615485
Author: Alexander Gottwald <[EMAIL PROTECTED]>
Date:   Thu Jun 9 15:52:02 2005 +

Replace  with 
Copy Xtrans.h to exports/include/X11/Xtrans only

commit 8abfaa0bb923231da3dd2c0e245f8feec41a621f
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Thu May 19 00:22:32 2005 +

revert last change, didn't do right thing at all, sorry for the noise

commit a2e7e1bb26e8a87b822acbeeff114beec4705fb0
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Thu May 19 00:10:07 2005 +

Require automake 1.7 in AM_INIT_AUTOMAKE

commit 0b4b811191a1e74356b7ff78a09107e29a7ef695
Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
Date:   Tue May 17 21:25:16 2005 +

- Conditionally include config.h in xc/lib/SM
- Add libSM to symlink.sh
- Add SM build system

commit 5004ef0b757c1cd7e4ceaa1759914f938d5ea295
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Sun Apr 3 18:24:25 2005 +

Bug #1447: Fix a use-after-free case in libSM. (Mark McLoughlin)

commit c9f8774f04b398ac963b23ce1d5a12e703977064
Author: Daniel Stone <[EMAIL PROTECTED]>
Date:   Fri Jan 28 19:15:39 2005 +

Move