libsm: Changes to 'upstream-unstable'
.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 <ajax@redhat.com>
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 <alan.coopersmith@sun.com>
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 <dcbw@redhat.com>
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 <uuid/uuid.h>
+#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 <cloos@jhcloos.com>
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..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,109 +0,0 @@
-2006-06-26 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * src/sm_genid.c:
- From Patch #6046 <https://bugs.freedesktop.org/attachment.cgi?id=6046>
- freeaddrinfo() in error handling return (Peter Breitenlohner)
-
-2006-04-26 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Bump to 1.0.1
-
-2006-03-16 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * 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
- enough. (Noticed while evaluating Coverity ids 196 & 201.)
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * sm.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for RC1 release.
-
-2005-07-13 keith Packard <keithp@keithp.com>
-
- * configure.ac:
- * src/Makefile.am:
- Eliminate xtrans CFLAGS from .pc file as xtrans
- is not part of the public API.
-
-2005-07-08 Keith Packard <keithp@keithp.com>
-
- * .cvsignore:
- * src/.cvsignore:
- Add .cvsignore files
-
-2005-01-29 Daniel Stone <daniel@freedesktop.org>
-
- * sm_manager.c:
- Sync back with X.Org HEAD (change usage of _IceTransGetPeerNetworkId to
- IceGetPeerName; AIX build fixes). Use IceGetPeerName instead of
- _IceGetPeerName, since it is now in the ICE public API.
-
-2005-01-19 Daniel Stone <daniel@freedesktop.org>
-
- * configure.ac:
- Remove AC_CONFIG_AUX_DIR.
-
-2004-05-10 Eric Anholt <anholt@FreeBSD.org>
-
- * configure.ac:
- libSM doesn't require libX11, remove linking.
- Don't include warning CFLAGS in .pc file.
- Bump to version 6.0.4.
-
-2004-04-12 Daniel Stone <daniel@freedesktop.org>
-
- * sm_genid.c:
- Fix getaddrinfo()-related info (merge from X11R6.7).
-
- * Tag release 6.0.3 for xlibs 1.0.1.
-
-2004-02-03 Jim Gettys <jg@freedesktop.org>
-
- * AUTHORS (Author):
-
-2004-01-17 Daniel Stone <daniel@fooishbar.org>
- * Tag release 6.0.2 for first fd.o clientside lib release.
-
-2004-01-15 Harold L Hunt II <huntharo@msu.edu>
- * Makefile.am: Pass -no-undefined to libtool via LDFLAGS.
-
-2003-10-28 Keith Packard <keithp@keithp.com>
-
- * Makefile.am:
- * SMlibint.h:
- * configure.ac:
- * globals.h:
- * sm_client.c: (set_callbacks):
- * sm_error.c: (_SmcDefaultErrorHandler), (_SmsDefaultErrorHandler):
- * sm_manager.c: (_SmsProtocolSetupProc):
- * sm_process.c: (_SmcProcessMessage), (_SmsProcessMessage):
- Prototypes.
- Use new ICEtrans.h header to get defines for ICE xtrans functions.
- Add GCC warnings.
- Make $(srcdir) != "." work (needed -I${top_srcdir}/include)
diff --git a/Makefile.am b/Makefile.am
index 713eddf..aa2fb39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,3 +4,13 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = sm.pc
EXTRA_DIST=sm.pc.in
+
+EXTRA_DIST += 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)
+
+dist-hook: ChangeLog
commit 9b7029aba10356badeef134af2de7e26e6ae2ab9
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:53:30 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index 4ff4fed..7cfac9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ mkinstalldirs
sm.pc
stamp-h1
*.o
+*~
Reply to: