libsm: Changes to 'debian-unstable'
.gitignore | 1
ChangeLog | 53 +++++++++++++++++++++++++
aclocal.m4 | 38 ++++++++++++++++--
config.guess | 32 +++++++++++----
config.h.in | 12 +++++
config.sub | 28 +++++++++----
configure | 116 +++++++++++++++++++++++++++++++++++++++----------------
configure.ac | 2
debian/changelog | 5 +-
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 +++++++-
15 files changed, 281 insertions(+), 135 deletions(-)
New commits:
commit d956df475c00c12ded9a588e83a26f8f6551c34d
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 14 16:41:46 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index ec12a22..c1866e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libsm (2:1.0.3-1) UNRELEASED; urgency=low
+libsm (2:1.0.3-1) unstable; urgency=low
[ Julien Cristau ]
* Move binary packages to the proper sections.
@@ -7,7 +7,7 @@ libsm (2:1.0.3-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* Bump the epoch so that this can be synced to Ubuntu in the future.
- -- Julien Cristau <jcristau@debian.org> Mon, 14 May 2007 16:30:54 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 14 May 2007 16:41:22 +0200
libsm (1:1.0.2-2) unstable; urgency=low
commit 5bb6b9fa11d937ea7bbf019a986c091e8ddc5233
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 14 16:31:15 2007 +0200
autoreconf and update ChangeLog for new upstream release.
diff --git a/ChangeLog b/ChangeLog
index 14e4159..5c2f357 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,56 @@
+commit 837384e09dae2beda6ac3b8e1d10698dc0d23db4
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun May 13 14:21:39 2007 +0200
+
+ Bumped version to 1.0.3.
+
+commit 6c50f3639d74edd757dc72dbe6a29cb8aa3b87a3
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun May 13 11:47:47 2007 +0200
+
+ Another tiny char* vs const char* fix.
+
+commit 9bfa1101ac5dbb8d2de1d0431d7e7b281428168f
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun May 13 11:46:16 2007 +0200
+
+ Revert "Don't reinvent the wheel and just use strdup()."
+
+ This reverts commit 57ea148fdbf047a012b361acdc7954e70679dad3.
+
+commit 24ac7974ef77d7832a8b3ddd300083c41a03cb79
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun May 13 01:44:12 2007 +0200
+
+ Added object files to .gitignore.
+
+commit 48d23e452780f327439a859fa941b1598eb249c8
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun May 13 01:43:49 2007 +0200
+
+ Removed some global writable variables.
+
+commit 57ea148fdbf047a012b361acdc7954e70679dad3
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun May 13 00:49:58 2007 +0200
+
+ Don't reinvent the wheel and just use strdup().
+
+commit 8ba3325ed15154a933c064831abf8f412a5154a7
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun May 13 00:44:50 2007 +0200
+
+ Fixed some const vs non-const mix ups.
+
+commit 2ded69bb857ae453d90534203e5857ac3a31a1c3
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun May 13 00:16:36 2007 +0200
+
+ Sanitized hex string conversion in SmsGenerateClientID().
+
+ This reduces the size of the DSO by almost 4K and gets rid of 255
+ relocations on load.
+
commit 34b3d538061cd648d90eb2bc7284000d980c8d3e
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Fri Oct 13 15:55:08 2006 -0400
diff --git a/aclocal.m4 b/aclocal.m4
index f18ffa3..d0989e7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6567,7 +6567,8 @@ dnl
# --------------------
# Adds --with/without-release-string and changes the PACKAGE and
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
@@ -6580,6 +6581,23 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+ [`echo $PACKAGE_VERSION | cut -d . -f 1`],
+ [Major version of this package])
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+ [$PVM],
+ [Minor version of this package])
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+ [$PVP],
+ [Patch version of this package])
])
dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $
@@ -6642,8 +6660,9 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
# -------------------------
# Standard checks for which Xtrans transports to use by the Xorg packages
# that use Xtrans functions
-AC_DEFUN([XTRANS_CONNECTION_FLAGS],
-[AC_REQUIRE([AC_TYPE_SIGNAL])
+AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_TYPE_SIGNAL])
AC_ARG_ENABLE(unix-transport,
AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]),
[UNIXCONN=$enableval], [UNIXCONN=yes])
@@ -6661,6 +6680,19 @@ AC_DEFUN([XTRANS_CONNECTION_FLAGS],
AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
XTRANS_TCP_FLAGS
fi
+ [case $host_os in
+ solaris*|sco*|sysv4*) localdef="yes" ;;
+ *) localdef="no" ;;
+ esac]
+ AC_ARG_ENABLE(local-transport,
+ AC_HELP_STRING([--enable-local-transport],[Enable os-specific local transport]),
+ [LOCALCONN=$enableval], [LOCALCONN=$localdef])
+ AC_MSG_CHECKING([if Xtrans should support os-specific local connections])
+ AC_MSG_RESULT($LOCALCONN)
+ if test "$LOCALCONN" = "yes"; then
+ AC_DEFINE(LOCALCONN,1,[Support os-specific local connections])
+ fi
+
]) # XTRANS_CONNECTION_FLAGS
diff --git a/config.guess b/config.guess
index 396482d..0f0fe71 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2007-03-06'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -780,7 +781,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -790,12 +791,15 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -950,6 +954,9 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa:Linux:*:*)
+ echo xtensa-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1215,15 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff --git a/config.h.in b/config.h.in
index 5da5d2f..e76df5d 100644
--- a/config.h.in
+++ b/config.h.in
@@ -36,6 +36,9 @@
/* Support IPv6 for TCP connections */
#undef IPv6
+/* Support os-specific local connections */
+#undef LOCALCONN
+
/* Name of package */
#undef PACKAGE
@@ -54,6 +57,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
diff --git a/config.sub b/config.sub
index 387c18d..5defff6 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2007-01-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -276,6 +276,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -323,7 +324,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -367,7 +368,7 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -909,6 +910,10 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -920,6 +925,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1214,7 +1222,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1366,6 +1374,9 @@ else
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
spu-*)
os=-elf
;;
@@ -1406,6 +1417,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
diff --git a/configure b/configure
index 1da2ac3..81ae8d7 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libSM 1.0.2.
+# Generated by GNU Autoconf 2.61 for libSM 1.0.3.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libSM'
PACKAGE_TARNAME='libSM'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='libSM 1.0.2'
+PACKAGE_VERSION='1.0.3'
+PACKAGE_STRING='libSM 1.0.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1402,7 +1402,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libSM 1.0.2 to adapt to many kinds of systems.
+\`configure' configures libSM 1.0.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1472,7 +1472,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libSM 1.0.2:";;
+ short | recursive ) echo "Configuration of libSM 1.0.3:";;
esac
cat <<\_ACEOF
@@ -1491,6 +1491,8 @@ Optional Features:
--enable-unix-transport Enable UNIX domain socket transport
--enable-tcp-transport Enable TCP socket transport
--enable-IPv6 Enable IPv6 support
+ --enable-local-transport
+ Enable os-specific local transport
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1587,7 +1589,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libSM configure 1.0.2
+libSM configure 1.0.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1601,7 +1603,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libSM $as_me 1.0.2, which was
+It was created by libSM $as_me 1.0.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2273,7 +2275,7 @@ fi
# Define the identity of the package.
PACKAGE='libSM'
- VERSION='1.0.2'
+ VERSION='1.0.3'
cat >>confdefs.h <<_ACEOF
@@ -4338,7 +4340,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4341 "configure"' > conftest.$ac_ext
+ echo '#line 4343 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7070,11 +7072,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7073: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7075: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7077: \$? = $ac_status" >&5
+ echo "$as_me:7079: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7338,11 +7340,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7341: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7343: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7345: \$? = $ac_status" >&5
+ echo "$as_me:7347: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7442,11 +7444,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7445: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7447: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7449: \$? = $ac_status" >&5
+ echo "$as_me:7451: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9739,7 +9741,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9742 "configure"
+#line 9744 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9839,7 +9841,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9842 "configure"
+#line 9844 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12175,11 +12177,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12178: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12180: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12182: \$? = $ac_status" >&5
+ echo "$as_me:12184: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12279,11 +12281,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12282: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12284: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12286: \$? = $ac_status" >&5
+ echo "$as_me:12288: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13840,11 +13842,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13843: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13845: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13847: \$? = $ac_status" >&5
+ echo "$as_me:13849: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13944,11 +13946,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13947: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13949: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13951: \$? = $ac_status" >&5
+ echo "$as_me:13953: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16131,11 +16133,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16134: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16136: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16138: \$? = $ac_status" >&5
+ echo "$as_me:16140: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16399,11 +16401,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16402: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16404: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16406: \$? = $ac_status" >&5
+ echo "$as_me:16408: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16503,11 +16505,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16506: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16508: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16510: \$? = $ac_status" >&5
+ echo "$as_me:16512: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20526,6 +20528,8 @@ _ACEOF
+
+
# Check whether --enable-unix-transport was given.
if test "${enable_unix_transport+set}" = set; then
enableval=$enable_unix_transport; UNIXCONN=$enableval
@@ -20950,6 +20954,29 @@ fi
fi
+ case $host_os in
+ solaris*|sco*|sysv4*) localdef="yes" ;;
+ *) localdef="no" ;;
+ esac
+ # Check whether --enable-local-transport was given.
+if test "${enable_local_transport+set}" = set; then
+ enableval=$enable_local_transport; LOCALCONN=$enableval
+else
+ LOCALCONN=$localdef
+fi
+
+ { echo "$as_me:$LINENO: checking if Xtrans should support os-specific local connections" >&5
+echo $ECHO_N "checking if Xtrans should support os-specific local connections... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: $LOCALCONN" >&5
+echo "${ECHO_T}$LOCALCONN" >&6; }
+ if test "$LOCALCONN" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define LOCALCONN 1
+_ACEOF
+
+ fi
+
if test "x$GCC" = "xyes"; then
@@ -20975,6 +21002,29 @@ fi
echo "$as_me: Building with package name set to $PACKAGE" >&6;}
fi
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
+_ACEOF
+
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
+
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
+
+
ac_config_files="$ac_config_files Makefile src/Makefile sm.pc"
@@ -21409,7 +21459,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libSM $as_me 1.0.2, which was
+This file was extended by libSM $as_me 1.0.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21462,7 +21512,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libSM config.status 1.0.2
+libSM config.status 1.0.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index 27a5509..ec12a22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-libsm (2:1.0.2-3) UNRELEASED; urgency=low
+libsm (2:1.0.3-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Move binary packages to the proper sections.
+ * New upstream release.
[ Timo Aaltonen ]
* Bump the epoch so that this can be synced to Ubuntu in the future.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 11:33:01 +0300
+ -- Julien Cristau <jcristau@debian.org> Mon, 14 May 2007 16:30:54 +0200
libsm (1:1.0.2-2) unstable; urgency=low
commit 837384e09dae2beda6ac3b8e1d10698dc0d23db4
Author: Tilman Sauerbeck <tilman@code-monkey.de>
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 <tilman@code-monkey.de>
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 (IceConn iceConn,
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 <tilman@code-monkey.de>
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 (IceConn iceConn,
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 <tilman@code-monkey.de>
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 <tilman@code-monkey.de>
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;
_SmcRegisterClientReply reply;
Bool gotReply, ioErrorOccured;
+ const char *auth_names[] = {"MIT-MAGIC-COOKIE-1"};
+ IcePoAuthProc auth_procs[] = {_IcePoMagicCookie1Proc};
+ int auth_count = 1;
+
+ IcePoVersionRec versions[] = {
+ {SmProtoMajor, SmProtoMinor, _SmcProcessMessage}
+ };
+ int version_count = 1;
+
+
*clientIdRet = NULL;
if (errorStringRet && errorLength > 0)
@@ -83,13 +95,13 @@ char *errorStringRet;
/*
* For now, there is only one version of XSMP, so we don't
* have to check {xsmpMajorRev, xsmpMinorRev}. In the future,
- * we will check against _SmcVersions and generate the list
+ * we will check against versions and generate the list
* of versions the application actually supports.
*/
if ((_SmcOpcode = IceRegisterForProtocolSetup ("XSMP",
- SmVendorString, SmReleaseString, _SmVersionCount, _SmcVersions,
- _SmAuthCount, _SmAuthNames, _SmcAuthProcs, NULL)) < 0)
+ SmVendorString, SmReleaseString, version_count, versions,
+ auth_count, auth_names, auth_procs, NULL)) < 0)
{
if (errorStringRet && errorLength > 0) {
strncpy (errorStringRet,
diff --git a/src/sm_manager.c b/src/sm_manager.c
index 57f53b5..f2b4cd1 100644
--- a/src/sm_manager.c
+++ b/src/sm_manager.c
@@ -42,6 +42,9 @@ in this Software without prior written authorization from The Open Group.
#undef shutdown
#endif
+extern IcePaAuthStatus _IcePaMagicCookie1Proc ();
+extern void _SmsProcessMessage ();
+
static Status
@@ -123,6 +126,15 @@ int errorLength;
char *errorStringRet;
{
+ const char *auth_names[] = {"MIT-MAGIC-COOKIE-1"};
+ IcePaAuthProc auth_procs[] = {_IcePaMagicCookie1Proc};
+ int auth_count = 1;
+
+ IcePaVersionRec versions[] = {
+ {SmProtoMajor, SmProtoMinor, _SmsProcessMessage}
+ };
+ int version_count = 1;
+
if (errorStringRet && errorLength > 0)
*errorStringRet = '\0';
@@ -142,8 +154,8 @@ char *errorStringRet;
{
if ((_SmsOpcode = IceRegisterForProtocolReply ("XSMP",
- vendor, release, _SmVersionCount, _SmsVersions,
- _SmAuthCount, _SmAuthNames, _SmsAuthProcs, hostBasedAuthProc,
+ vendor, release, version_count, versions,
+ auth_count, auth_names, auth_procs, hostBasedAuthProc,
_SmsProtocolSetupProc,
NULL, /* IceProtocolActivateProc - we don't care about
when the Protocol Reply is sent, because the
commit 57ea148fdbf047a012b361acdc7954e70679dad3
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun May 13 00:49:58 2007 +0200
Don't reinvent the wheel and just use strdup().
diff --git a/src/sm_manager.c b/src/sm_manager.c
index df9c221..57f53b5 100644
--- a/src/sm_manager.c
+++ b/src/sm_manager.c
@@ -73,10 +73,7 @@ _SmsProtocolSetupProc (IceConn iceConn,
if ((smsConn = (SmsConn) malloc (sizeof (struct _SmsConn))) == NULL)
{
- char *str = "Memory allocation failed";
-
- if ((*failureReasonRet = (char *) malloc (strlen (str) + 1)) != NULL)
Reply to: