Hello community,
here is the log from the commit of package xorg-x11-libSM
checked in at Sat Jul 5 01:55:18 CEST 2008.
--------
--- xorg-x11-libSM/xorg-x11-libSM.changes 2008-04-10 13:00:57.000000000 +0200
+++ xorg-x11-libSM/xorg-x11-libSM.changes 2008-07-04 04:54:32.125143000 +0200
@@ -1,0 +2,6 @@
+Fri Jul 4 04:53:37 CEST 2008 - sndirsch@suse.de
+
+- libSM 1.1.0
+ * bfo #14949: Don't use gethostbyname() for client IDs.
+
+-------------------------------------------------------------------
Old:
----
libSM-1.0.3.tar.bz2
New:
----
libSM-1.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libSM.spec ++++++
--- /var/tmp/diff_new_pack.x16135/_old 2008-07-05 01:53:11.000000000 +0200
+++ /var/tmp/diff_new_pack.x16135/_new 2008-07-05 01:53:11.000000000 +0200
@@ -12,11 +12,11 @@
Name: xorg-x11-libSM
-%define dirsuffix 1.0.3
-BuildRequires: pkgconfig xorg-x11-libICE-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
+%define dirsuffix 1.1.0
+BuildRequires: libuuid-devel pkgconfig xorg-x11-libICE-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 32
+Release: 44
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -44,7 +44,7 @@
Summary: Include Files and Libraries mandatory for Development.
Group: System/Libraries
Provides: xorg-x11-devel:/usr/X11R6/%{_lib}/libSM.so
-Requires: xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libICE-devel %{name} = %{version}
+Requires: xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libICE-devel %{name} = %{version} libuuid-devel
PreReq: coreutils
%description devel
@@ -99,6 +99,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Jul 04 2008 sndirsch@suse.de
+- libSM 1.1.0
+ * bfo #14949: Don't use gethostbyname() for client IDs.
* Thu Apr 10 2008 ro@suse.de
- added baselibs.conf file to build xxbit packages
for multilib support
++++++ libSM-1.0.3.tar.bz2 -> libSM-1.1.0.tar.bz2 ++++++
++++ 6665 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.0.3/ChangeLog new/libSM-1.1.0/ChangeLog
--- old/libSM-1.0.3/ChangeLog 2007-05-13 10:48:38.000000000 +0200
+++ new/libSM-1.1.0/ChangeLog 2008-07-02 19:58:34.000000000 +0200
@@ -1,109 +1,332 @@
-2006-06-26 Alan Coopersmith
+commit 2e8a41efb10ae462e5e43e13e479ca4da0fb0103
+Author: Alan Coopersmith
+Date: Wed Jun 25 09:55:14 2008 -0700
- * src/sm_genid.c:
- From Patch #6046 https://bugs.freedesktop.org/attachment.cgi?id=6046
- freeaddrinfo() in error handling return (Peter Breitenlohner)
+ Fix --without-libuuid to not call PKG_CHECK_MODULES for libuuid
-2006-04-26 Adam Jackson
+commit 6702e2a15992f4cb85dfa7ac8214125eb0a2bb2d
+Author: Dan Williams
+Date: Tue Jun 24 13:11:42 2008 -0400
- * configure.ac:
- Bump to 1.0.1
+ 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.
-2006-03-16 Alan Coopersmith
+commit 2a827d26cfb10dc6b1203b77c0cc91dc838d97a3
+Author: James Cloos
+Date: Thu Dec 6 16:38:16 2007 -0500
- * 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.)
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 9b7029aba10356badeef134af2de7e26e6ae2ab9
+Author: James Cloos
+Date: Mon Sep 3 05:53:30 2007 -0400
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Add *~ to .gitignore to skip patch/emacs droppings
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 837384e09dae2beda6ac3b8e1d10698dc0d23db4
+Author: Tilman Sauerbeck
+Date: Sun May 13 14:21:39 2007 +0200
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Bumped version to 1.0.3.
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6c50f3639d74edd757dc72dbe6a29cb8aa3b87a3
+Author: Tilman Sauerbeck
+Date: Sun May 13 11:47:47 2007 +0200
- * sm.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
+ Another tiny char* vs const char* fix.
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 9bfa1101ac5dbb8d2de1d0431d7e7b281428168f
+Author: Tilman Sauerbeck
+Date: Sun May 13 11:46:16 2007 +0200
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Revert "Don't reinvent the wheel and just use strdup()."
+
+ This reverts commit 57ea148fdbf047a012b361acdc7954e70679dad3.
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 24ac7974ef77d7832a8b3ddd300083c41a03cb79
+Author: Tilman Sauerbeck
+Date: Sun May 13 01:44:12 2007 +0200
- * configure.ac:
- Update package version number for RC1 release.
+ Added object files to .gitignore.
-2005-07-13 keith Packard
+commit 48d23e452780f327439a859fa941b1598eb249c8
+Author: Tilman Sauerbeck
+Date: Sun May 13 01:43:49 2007 +0200
- * configure.ac:
- * src/Makefile.am:
- Eliminate xtrans CFLAGS from .pc file as xtrans
- is not part of the public API.
+ Removed some global writable variables.
-2005-07-08 Keith Packard
+commit 57ea148fdbf047a012b361acdc7954e70679dad3
+Author: Tilman Sauerbeck
+Date: Sun May 13 00:49:58 2007 +0200
- * .cvsignore:
- * src/.cvsignore:
- Add .cvsignore files
+ Don't reinvent the wheel and just use strdup().
-2005-01-29 Daniel Stone
+commit 8ba3325ed15154a933c064831abf8f412a5154a7
+Author: Tilman Sauerbeck
+Date: Sun May 13 00:44:50 2007 +0200
- * 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.
+ Fixed some const vs non-const mix ups.
-2005-01-19 Daniel Stone
+commit 2ded69bb857ae453d90534203e5857ac3a31a1c3
+Author: Tilman Sauerbeck
+Date: Sun May 13 00:16:36 2007 +0200
- * configure.ac:
- Remove AC_CONFIG_AUX_DIR.
+ Sanitized hex string conversion in SmsGenerateClientID().
+
+ This reduces the size of the DSO by almost 4K and gets rid of 255
+ relocations on load.
-2004-05-10 Eric Anholt
+commit 34b3d538061cd648d90eb2bc7284000d980c8d3e
+Author: Adam Jackson
+Date: Fri Oct 13 15:55:08 2006 -0400
- * configure.ac:
- libSM doesn't require libX11, remove linking.
- Don't include warning CFLAGS in .pc file.
- Bump to version 6.0.4.
+ Bump to 1.0.2
-2004-04-12 Daniel Stone
+commit 2116811afe339a9b806f04debf2b6241fd00456f
+Author: Alan Coopersmith
+Date: Thu Jul 13 14:58:45 2006 -0700
- * sm_genid.c:
- Fix getaddrinfo()-related info (merge from X11R6.7).
+ renamed: .cvsignore -> .gitignore
- * Tag release 6.0.3 for xlibs 1.0.1.
+commit ff57e5d728c2f409b8852ee58d622c2c3323e2a8
+Author: Alan Coopersmith
+Date: Mon Jun 26 17:30:22 2006 +0000
-2004-02-03 Jim Gettys
+ From Patch #6046 https://bugs.freedesktop.org/attachment.cgi?id=6046
+ freeaddrinfo() in error handling return (Peter Breitenlohner)
- * AUTHORS (Author):
-
-2004-01-17 Daniel Stone
- * Tag release 6.0.2 for first fd.o clientside lib release.
+commit d03116c682567dac793d52e65a1f0698ae6848f6
+Author: Adam Jackson
+Date: Thu Apr 27 00:01:01 2006 +0000
-2004-01-15 Harold L Hunt II
- * Makefile.am: Pass -no-undefined to libtool via LDFLAGS.
+ Bump to 1.0.1
-2003-10-28 Keith Packard
+commit c46e8ae80540713ec24fd6d1eea68744937ef158
+Author: Alan Coopersmith
+Date: Fri Mar 17 03:05:32 2006 +0000
- * 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)
+ 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
+Date: Thu Dec 15 00:24:27 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 2f62b1a35756301469de62b8830733ebeec2e908
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:42 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 69c50fbc49f7589aa6afcf1be00be22a78ec3daa
+Author: Kevin E Martin
+Date: Sat Nov 19 07:15:39 2005 +0000
+
+ 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
+Date: Wed Nov 9 21:19:12 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 922e2dc3116a88cc1e49d5e2486fe1ca21f888c7
+Author: Kean Johnson
+Date: Tue Nov 8 06:33:25 2005 +0000
+
+ See ChangeLog entry 2005-11-07 for details.
+
+commit df1260d8710f497e766ac52162585345f2d7669f
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:08 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 601c38a8b0bbe92db6374e00e485435316dce1cb
+Author: Alan Coopersmith
+Date: Mon Aug 15 18:31:16 2005 +0000
+
+ Add XTRANS_CONNECTION_FLAGS to set TCP & IPv6 flags needed by libSM
+
+commit 0a00119745bef1bd67b53124a6a41b76454c5503
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:50 2005 +0000
+
+ 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
+Date: Sat Jul 16 06:24:02 2005 +0000
+
+ Set soversion to 6.0.0 using -version-number.
+
+commit 9c370ec68d2606468296efc1f0a093c036e8d7ff
+Author: Keith Packard
+Date: Wed Jul 13 07:28:02 2005 +0000
+
+ Eliminate xtrans CFLAGS from .pc file as xtrans is not part of the public
+ API.
+
+commit 7b45eec97e390d8c8124b0a95b83ff7614903979
+Author: Keith Packard
+Date: Sat Jul 9 05:59:54 2005 +0000
+
+ Add .cvsignore files
+
+commit 0a4f43e5170110519bd34d01f1f20a72ea615485
+Author: Alexander Gottwald
+Date: Thu Jun 9 15:52:02 2005 +0000
+
+ Replace with
+ Copy Xtrans.h to exports/include/X11/Xtrans only
+
+commit 8abfaa0bb923231da3dd2c0e245f8feec41a621f
+Author: Adam Jackson
+Date: Thu May 19 00:22:32 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit a2e7e1bb26e8a87b822acbeeff114beec4705fb0
+Author: Adam Jackson
+Date: Thu May 19 00:10:07 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit 0b4b811191a1e74356b7ff78a09107e29a7ef695
+Author: Søren Sandmann Pedersen
+Date: Tue May 17 21:25:16 2005 +0000
+
+ - Conditionally include config.h in xc/lib/SM
+ - Add libSM to symlink.sh
+ - Add SM build system
+
+commit 5004ef0b757c1cd7e4ceaa1759914f938d5ea295
+Author: Adam Jackson
+Date: Sun Apr 3 18:24:25 2005 +0000
+
+ Bug #1447: Fix a use-after-free case in libSM. (Mark McLoughlin)
+
+commit c9f8774f04b398ac963b23ce1d5a12e703977064
+Author: Daniel Stone
+Date: Fri Jan 28 19:15:39 2005 +0000
+
+ Move _IceGetPeerName into the ICE public API as IceGetPeerName; bump ICE
+ soversion to 6.4 accordingly. Change SM's use to the public version.
+ The old version will be retained for compatibility.
+
+commit 52435fb9fdaecfdc9b11d54e74388520dacc4b0b
+Author: Egbert Eich
+Date: Mon Oct 18 14:21:44 2004 +0000
+
+ Made handling of DevelDrivers for x86-64 more conformant to other
+ platforms.
+ Compress all font encodings (Stefan Dirsch).
+ Fixed warnings.
+ Turn on forwarding XNSpotLocation event to XIM server in OffTheSpot and
+ Root mode (bugzilla #1580, James Su).
+ Added another compose key combination for the Euro symbol (Stefan Dirsch).
+ Added support for UTF-8 in ja_JP, ko_KR and zh_TW locales (Mike Fabian).
+ Changed default encoding for ru from KOI8-R to ISO8859-5 (Mike Fabian).
+ This is the encoding that is also used by glibc. We may break other
+ libcs - lets see who complains.
+ Added explanation for DESTDIR to install to a different directory than /.
+ Added some early bailouts to atiprobe if PCI structure pointer is NULL to
+ prevent sig11.
+ XV support doesn't depend on 2D acceleration any more. This patch removes
+ this limitation from the NSC driver. This is a patch that I have
+ committed to XFree86 a while ago but never ported over to X.Org.
+ Matthieu Herrb contributed some build fixes.
+ Fixing SetDPMSTimers() so that DPMS*Time == 0 disables the appropriate
+ timer. This takes advantage of the fact that TimerSet() with a timeout
+ argument 0 behaves like TimerCanel().
+ Use /dev/xconsole (named pipe) or devpts for system logger (Werner Fink).
+ Create missing links for backward compatibility to XFree86 (Stefan Dirsch).
+ Changed comment to mention xorg.
+ Changed cursor for the 'kill' action from XC_draped_box to XC_Pirate. If
+ you don't like it we can change it back (original author unkown).
+ Added 'pic' to the man page rendering command pipeline (Werner Fink).
+ Added missing return value (Stefan Dirsch, Roland Mainz)
+
+commit 76d276193a610e4decf2f39b88e9ccf886d4c492
+Author: Kevin E Martin
+Date: Wed Aug 18 18:41:40 2004 +0000
+
+ Fix AIX build problems (Bugs #1020, 1102, 1103, Dan McNichol).
+ Remove old config files (Bug #1123, Jim Gettys).
+ Remove old log message (Bug #1123, Jim Gettys).
+
+commit 61bafb140eda240e69e3df28f47567af71ad1296
+Author: Egbert Eich
+Date: Mon May 24 19:06:58 2004 +0000
+
+ Fix build glitches when building modules independently using Imake.
+
+commit f161cb4a8a567d3ec93677689b6c5440b3027ab6
+Author: Egbert Eich
+Date: Fri Apr 23 18:43:23 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 19fe7606b46b0bbce96837c0ade7018e601fd73e
+Author: Egbert Eich
+Date: Sun Mar 14 08:31:52 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 0a04145c6f313d9a9d670716e2529d2dd0341598
+Author: Egbert Eich
+Date: Wed Mar 3 12:11:10 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 26ea9c0731055cc478337431353afb8a0a3122ae
+Author: Egbert Eich
+Date: Thu Feb 26 13:35:18 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit aa72cf15a99e09fc3e41184e01cbcceced4ef592
+Author: Egbert Eich
+Date: Thu Feb 26 09:22:34 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit ea5d51824610a0b5205871a158b055d58879fc0c
+Author: Egbert Eich
+Date: Thu Jan 29 08:08:04 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit a968ef24dfc9ddd1322f91acb4a6a1898fc15490
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:28:07 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 8e18f1cdc21fe0e125620a912e946ec1031fa2c5
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:46 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit abe0fd5d586b52a851a423a79b95070da418eb10
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:36 2003 +0000
+
+ R6.6 is the Xorg base-line
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.0.3/configure.ac new/libSM-1.1.0/configure.ac
--- old/libSM-1.0.3/configure.ac 2007-05-13 14:21:21.000000000 +0200
+++ new/libSM-1.1.0/configure.ac 2008-07-02 19:58:05.000000000 +0200
@@ -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)
@@ -35,6 +35,13 @@
# 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_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 \
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.0.3/Makefile.am new/libSM-1.1.0/Makefile.am
--- old/libSM-1.0.3/Makefile.am 2007-05-13 10:48:38.000000000 +0200
+++ new/libSM-1.1.0/Makefile.am 2008-05-12 23:30:18.000000000 +0200
@@ -4,3 +4,13 @@
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
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.0.3/src/Makefile.am new/libSM-1.1.0/src/Makefile.am
--- old/libSM-1.0.3/src/Makefile.am 2007-05-13 10:48:38.000000000 +0200
+++ new/libSM-1.1.0/src/Makefile.am 2008-06-24 19:09:29.000000000 +0200
@@ -2,10 +2,18 @@
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 -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.0.3/src/sm_genid.c new/libSM-1.1.0/src/sm_genid.c
--- old/libSM-1.0.3/src/sm_genid.c 2007-05-13 10:48:38.000000000 +0200
+++ new/libSM-1.1.0/src/sm_genid.c 2008-06-24 19:11:27.000000000 +0200
@@ -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 @@
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 @@
#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 @@
#else
return (NULL);
#endif
+#endif
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org