Hello community, here is the log from the commit of package xorg-x11-libSM checked in at Thu May 17 12:01:08 CEST 2007. -------- --- xorg-x11-libSM/xorg-x11-libSM.changes 2006-10-14 06:05:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-libSM/xorg-x11-libSM.changes 2007-05-13 22:17:13.641249000 +0200 @@ -1,0 +2,7 @@ +Sun May 13 22:14:54 CEST 2007 - sndirsch@suse.de + +- update libSM to release 1.0.3 + * This release just contains some code cleanups that decrease the + library size by a few KB. + +------------------------------------------------------------------- Old: ---- libSM-1.0.2.tar.bz2 New: ---- libSM-1.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libSM.spec ++++++ --- /var/tmp/diff_new_pack.lZ9920/_old 2007-05-17 12:00:55.000000000 +0200 +++ /var/tmp/diff_new_pack.lZ9920/_new 2007-05-17 12:00:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-libSM (Version 7.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,11 +11,11 @@ # norootforbuild Name: xorg-x11-libSM -%define dirsuffix 1.0.2 +%define dirsuffix 1.0.3 BuildRequires: pkgconfig xorg-x11-libICE-devel xorg-x11-proto-devel xorg-x11-xtrans-devel Url: http://xorg.freedesktop.org/ Version: 7.2 -Release: 1 +Release: 32 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -95,7 +95,11 @@ /usr/%{_lib}/*.so /usr/%{_lib}/pkgconfig/*.pc -%changelog -n xorg-x11-libSM +%changelog +* Sun May 13 2007 - sndirsch@suse.de +- update libSM to release 1.0.3 + * This release just contains some code cleanups that decrease the + library size by a few KB. * Sat Oct 14 2006 - sndirsch@suse.de - update to X.Org 7.2RC1 * Wed Aug 02 2006 - sndirsch@suse.de ++++++ libSM-1.0.2.tar.bz2 -> libSM-1.0.3.tar.bz2 ++++++ ++++ 17536 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.2/config.h.in new/libSM-1.0.3/config.h.in --- old/libSM-1.0.2/config.h.in 2006-10-13 21:54:53.000000000 +0200 +++ new/libSM-1.0.3/config.h.in 2007-05-13 14:27:02.000000000 +0200 @@ -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 -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.2/configure.ac new/libSM-1.0.3/configure.ac --- old/libSM-1.0.2/configure.ac 2006-10-13 20:58:08.000000000 +0200 +++ new/libSM-1.0.3/configure.ac 2007-05-13 14:21:21.000000000 +0200 @@ -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) 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.2/missing new/libSM-1.0.3/missing --- old/libSM-1.0.2/missing 2006-10-13 00:39:07.000000000 +0200 +++ new/libSM-1.0.3/missing 2007-05-13 14:27:02.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # 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). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 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.2/src/globals.h new/libSM-1.0.3/src/globals.h --- old/libSM-1.0.2/src/globals.h 2006-10-12 00:29:07.000000000 +0200 +++ new/libSM-1.0.3/src/globals.h 2007-05-13 10:48:38.000000000 +0200 @@ -34,28 +34,9 @@ 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 -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.2/src/sm_client.c new/libSM-1.0.3/src/sm_client.c --- old/libSM-1.0.2/src/sm_client.c 2006-10-12 00:29:07.000000000 +0200 +++ new/libSM-1.0.3/src/sm_client.c 2007-05-13 10:48:38.000000000 +0200 @@ -38,6 +38,8 @@ #include "SMlibint.h" #include "globals.h" +extern IcePoAuthStatus _IcePoMagicCookie1Proc (); +extern void _SmcProcessMessage (); static void set_callbacks();  @@ -73,6 +75,16 @@ _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 @@ /* * 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 -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.2/src/sm_error.c new/libSM-1.0.3/src/sm_error.c --- old/libSM-1.0.2/src/sm_error.c 2006-10-12 00:29:07.000000000 +0200 +++ new/libSM-1.0.3/src/sm_error.c 2007-05-13 10:48:38.000000000 +0200 @@ -59,7 +59,7 @@ { char *pData = (char *) values; - char *str; + const char *str; switch (offendingMinorOpcode) { @@ -191,7 +191,7 @@ { char *pData = (char *) values; - char *str; + const char *str; switch (offendingMinorOpcode) { 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.2/src/sm_genid.c new/libSM-1.0.3/src/sm_genid.c --- old/libSM-1.0.2/src/sm_genid.c 2006-10-12 00:29:07.000000000 +0200 +++ new/libSM-1.0.3/src/sm_genid.c 2007-05-13 10:48:38.000000000 +0200 @@ -78,51 +78,15 @@ #define TCPCONN #endif - -static char *hex_table[] = { /* for generating client IDs */ - "00", "01", "02", "03", "04", "05", "06", "07", - "08", "09", "0a", "0b", "0c", "0d", "0e", "0f", - "10", "11", "12", "13", "14", "15", "16", "17", - "18", "19", "1a", "1b", "1c", "1d", "1e", "1f", - "20", "21", "22", "23", "24", "25", "26", "27", - "28", "29", "2a", "2b", "2c", "2d", "2e", "2f", - "30", "31", "32", "33", "34", "35", "36", "37", - "38", "39", "3a", "3b", "3c", "3d", "3e", "3f", - "40", "41", "42", "43", "44", "45", "46", "47", - "48", "49", "4a", "4b", "4c", "4d", "4e", "4f", - "50", "51", "52", "53", "54", "55", "56", "57", - "58", "59", "5a", "5b", "5c", "5d", "5e", "5f", - "60", "61", "62", "63", "64", "65", "66", "67", - "68", "69", "6a", "6b", "6c", "6d", "6e", "6f", - "70", "71", "72", "73", "74", "75", "76", "77", - "78", "79", "7a", "7b", "7c", "7d", "7e", "7f", - "80", "81", "82", "83", "84", "85", "86", "87", - "88", "89", "8a", "8b", "8c", "8d", "8e", "8f", - "90", "91", "92", "93", "94", "95", "96", "97", - "98", "99", "9a", "9b", "9c", "9d", "9e", "9f", - "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", - "a8", "a9", "aa", "ab", "ac", "ad", "ae", "af", - "b0", "b1", "b2", "b3", "b4", "b5", "b6", "b7", - "b8", "b9", "ba", "bb", "bc", "bd", "be", "bf", - "c0", "c1", "c2", "c3", "c4", "c5", "c6", "c7", - "c8", "c9", "ca", "cb", "cc", "cd", "ce", "cf", - "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", - "d8", "d9", "da", "db", "dc", "dd", "de", "df", - "e0", "e1", "e2", "e3", "e4", "e5", "e6", "e7", - "e8", "e9", "ea", "eb", "ec", "ed", "ee", "ef", - "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", - "f8", "f9", "fa", "fb", "fc", "fd", "fe", "ff", -}; - -  char * SmsGenerateClientID (smsConn) SmsConn smsConn; { #if defined(TCPCONN) || defined(STREAMSCONN) + static const char hex[] = "0123456789abcdef"; char hostname[256]; - char address[64]; + char address[64], *addr_ptr = address; char temp[256]; char *id; static int sequence = 0; @@ -153,13 +117,15 @@ if (ai->ai_family == AF_INET6) { unsigned char *cp = (unsigned char *) &((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr.s6_addr; - address[0] = '6'; /* IPv6 address code */ - address[1] = '\0'; + *addr_ptr++ = '6'; /* IPv6 address code */ for (i = 0 ; i < 16 ; i++) { - strcat(address, hex_table[cp[i]]); + *addr_ptr++ = hex[cp[i] >> 4]; + *addr_ptr++ = hex[cp[i] & 0x0f]; } + *addr_ptr++ = '\0'; + } else { /* Fall through to IPv4 address handling */ haddr = &((struct sockaddr_in *)ai->ai_addr)->sin_addr; #else @@ -193,10 +159,15 @@ decimal[3] = atoi (ptr1); - address[0] = '1'; - address[1] = '\0'; - for (i = 0; i < 4; i++) - strcat (address, hex_table[decimal[i]]); + *addr_ptr++ = '1'; + + for (i = 0; i < 4; i++) { + *addr_ptr++ = hex[decimal[i] >> 4]; + *addr_ptr++ = hex[decimal[i] & 0x0f]; + } + + *addr_ptr++ = '\0'; + #if defined(IPv6) && defined(AF_INET6) } freeaddrinfo(first_ai); 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.2/src/SMlibint.h new/libSM-1.0.3/src/SMlibint.h --- old/libSM-1.0.2/src/SMlibint.h 2006-10-12 00:29:07.000000000 +0200 +++ new/libSM-1.0.3/src/SMlibint.h 2007-05-13 10:48:38.000000000 +0200 @@ -499,15 +499,6 @@ 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 -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.2/src/sm_manager.c new/libSM-1.0.3/src/sm_manager.c --- old/libSM-1.0.2/src/sm_manager.c 2006-10-12 00:29:07.000000000 +0200 +++ new/libSM-1.0.3/src/sm_manager.c 2007-05-13 11:47:12.000000000 +0200 @@ -42,6 +42,9 @@ #undef shutdown #endif +extern IcePaAuthStatus _IcePaMagicCookie1Proc (); +extern void _SmsProcessMessage (); +  static Status @@ -73,7 +76,7 @@ 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); @@ -126,6 +129,15 @@ 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'; @@ -145,8 +157,8 @@ { 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org