Hello community,
here is the log from the commit of package silc-toolkit for openSUSE:Factory
checked in at Wed Sep 2 18:40:30 CEST 2009.
--------
--- GNOME/silc-toolkit/silc-toolkit.changes 2009-08-11 12:23:49.000000000 +0200
+++ silc-toolkit/silc-toolkit.changes 2009-09-01 18:44:51.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Sep 1 17:56:52 CEST 2009 - sbrabec@suse.cz
+
+- Updated to version 1.1.10:
+ * Fixed format string arbitrary execution errors (bnc#535841).
+ * Fixed stack overwrite due to format string error on x86_64
+ (bnc#535841).
+ * Fixed IDENTIFY, DETACH, IDENTIFY and SIGNOFF behavior.
+ * Fixed Deny hostname comparison.
+ * Debugging fixes.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
silc-toolkit-1.1.9.tar.bz2
New:
----
silc-toolkit-1.1.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ silc-toolkit.spec ++++++
--- /var/tmp/diff_new_pack.ayAvbi/_old 2009-09-02 18:39:50.000000000 +0200
+++ /var/tmp/diff_new_pack.ayAvbi/_new 2009-09-02 18:39:50.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package silc-toolkit (Version 1.1.9)
+# spec file for package silc-toolkit (Version 1.1.10)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -21,7 +21,7 @@
Name: silc-toolkit
# NOTE: This package compiles only library and not client nor server.
Summary: Secure Internet Live Conferencing Software Development Toolkit
-Version: 1.1.9
+Version: 1.1.10
Release: 1
License: BSD 3-clause (or similar) ; GPL v2 or later
Group: System/Libraries
++++++ silc-toolkit-1.1.9.tar.bz2 -> silc-toolkit-1.1.10.tar.bz2 ++++++
++++ 23303 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/silc-toolkit-1.1.9/BSD new/silc-toolkit-1.1.10/BSD
--- old/silc-toolkit-1.1.9/BSD 2008-03-14 13:05:55.000000000 +0100
+++ new/silc-toolkit-1.1.10/BSD 2009-03-11 16:01:24.000000000 +0100
@@ -1,3 +1,6 @@
+Copyright (C) 1997 - 2009 Pekka Riikonen,
+ 2000 - 2009 SILC Project
+All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
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/silc-toolkit-1.1.9/COPYING new/silc-toolkit-1.1.10/COPYING
--- old/silc-toolkit-1.1.9/COPYING 2008-03-14 13:05:55.000000000 +0100
+++ new/silc-toolkit-1.1.10/COPYING 2009-03-11 16:00:43.000000000 +0100
@@ -1,3 +1,7 @@
+Copyright (C) 1997 - 2009 Pekka Riikonen,
+ 2000 - 2009 SILC Project
+All rights reserved.
+
The SILC Toolkit distribution is dual-licensed distribution. The
following licenses govern this distribution, and you are free to choose
either one of the licenses:
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/silc-toolkit-1.1.9/ChangeLog new/silc-toolkit-1.1.10/ChangeLog
--- old/silc-toolkit-1.1.9/ChangeLog 2009-01-08 15:29:30.000000000 +0100
+++ new/silc-toolkit-1.1.10/ChangeLog 2009-08-07 13:51:30.000000000 +0200
@@ -1,308 +1,228 @@
-commit 2cbaaafed9c02951d4bf17f9c43ff71ac0821677
+commit 8cb801cf6482666818e721822ce81c81ec818908
Author: Pekka Riikonen
-Date: Thu Jan 8 14:35:48 2009 +0200
+Date: Fri Aug 7 14:48:46 2009 +0300
- Removed libtoolfix
+ More string format fixes in silcd and client libary
-commit 4a0d8cdb05d508cfa9480b54917b93cdd470d1e7
+commit 97fa30748eed3f4248bd213ae3ab9e742fd36c71
Author: Pekka Riikonen
-Date: Tue Dec 16 17:17:58 2008 +0200
+Date: Sun Aug 2 10:11:20 2009 +0300
- Packet engine: more padding length check fixes
-
- The padding length must be checked differently depending on whether the
- packet is fully encrypted with session key or if only the header is
- encrypted with session key (fe. channel messages).
-
-commit 7da2061d1fe888de4b055127ca3c5bec8526e69f
-Author: Kp
-Date: Sat Dec 13 12:37:39 2008 -0600
-
- Cleanup: limit length of strings scanned by scanf.
-
- Several uses of scanf-type functions allowed the scanned string to
- supply an arbitrarily large input string. Add length qualifiers to
- prevent scanf from overrunning the supplied buffer.
-
-commit d8bab7c3937644509e6759b38a5e2ee9bfaf273e
-Author: Kp
-Date: Sun Dec 7 15:48:48 2008 -0600
+ configure: changed AC_PROG_LIBTOOL order to fix disabling shared libs
- Cleanup: fix long/int format string errors.
-
- Two format strings used long values with int format specifiers.
- Fix the format specifiers so that the entire value can be printed.
-
-commit 6cf290c9d959d9842d099d7f3c02aa4aca286b0f
-Author: Kp
-Date: Sun Dec 7 18:24:33 2008 -0600
-
- Fix error logging format string mangled by a bogus comma.
-
- A format string was split over two lines, with the second line
- containing the format specifier that prints the channel name. A comma
- was incorrectly appended to the first line, causing the format specifier
- substring to become an argument string. Since no format specifiers
- remain in the main string, the logger does not format any arguments.
- Remove the bogus comma to fix that.
+commit 35b767c59f0741fc58f0c4d07ccd8d2ce4134a35
+Author: Pekka Riikonen
+Date: Fri Jul 31 22:38:06 2009 +0300
-commit 8311a3ebf2477adc75ae010cde73ab03f9b9bc74
-Author: Kp
-Date: Sun Dec 7 18:59:23 2008 -0600
+ configure: check threads support in OpenBSD.
- Cleanup: fix various int/long format string errors.
-
- Various format strings used int values with long format specifiers.
- Fix the format specifiers to be consistent with the values supplied.
-
-commit c38f423e3baa389150c5b31ee95a60e8e2f221f2
-Author: Kp
-Date: Sun Dec 7 15:46:47 2008 -0600
+commit 1598b3a51b51a434037461ccd35487bc0df3137c
+Author: Pekka Riikonen
+Date: Fri Jul 31 22:32:57 2009 +0300
- Cleanup: cast socket to long before logging it.
+ Fixed string format vulnerability in client entry handling.
- The SilcSocket type varies in size, depending on the host platform. On
- Unix systems, it is an int, which is 32-bits on all interesting
- platforms. On Windows, it is a SOCKET, which is also 32-bits. However,
- on Symbian, SilcSocket is a void pointer. Changing %lu to %u may not
- work in all cases due to this size difference, so instead cast the
- socket to a long unsigned, which should avoid loss of precision on all
- platforms and still satisfy the %lu format specifier.
+ Reported and patch provided by William Cummings.
-commit 84f3df89c92080b205f6235257b6d8cf28aea7bc
-Author: Kp
-Date: Sun Dec 7 15:49:36 2008 -0600
+commit cb95ad2d35f1796567fbebc9e848c10d4bd2e7b9
+Author: Pekka Riikonen
+Date: Mon Jun 8 08:58:35 2009 +0300
- Fix missing argument in SKR debug logging.
+ silcd: Fixed IDENTIFY command reply handling for channels
- The format string used in SKR debug logging calls for a pointer and two
- int values. However, only the two int values were provided, so the
- debug logs would be wrong if they were ever printed. Based on context,
- the format string probably wanted the SilcSKRKey. Add it.
-
-commit 5b143539a0faf0ebcaa9df0aa7d96f821ba8677e
-Author: Kp
-Date: Sun Dec 7 16:04:56 2008 -0600
-
- Fix missing argument in client_entry.c debug logging.
+ The IDENTIFY comamnd reply for channels were broken because the channel ID
+ parsing always failed. This would cause issues like USERS command not
+ returning the users for a channel, making the channel appear empty, in some
+ specific cases.
- Logging modifications during merge commit
- e9374395ec9747bddd3ea0bfd3e5a17717e97b31 resulted in several log
- messages that purport to print a pointer, but do not push one for the
- logging code to format. Add the pointer that was clearly meant in each
- case.
+ Fixed also the USERS command reply to not query the channel information
+ from router more than once.
-commit 4871fc5bb45ba2733196b8fd361636b34c144abd
-Author: Kp
-Date: Sun Dec 7 16:35:05 2008 -0600
+commit 59f343801620f8b02933d419efb111d5928b11b8
+Author: Pekka Riikonen
+Date: Mon Jun 8 08:03:02 2009 +0300
- Fix missing argument in silc_client_abort_key_agreement debug logging.
+ silcd: Abort active protocols in DETACH command
- The debug log in silc_client_abort_key_agreement purports to print a
- pointer, but does not push one for the logging code to format. Fix
- that, and extend the message to print some other values that might be
- interesting.
+ When detaching client, which results into closing of the actual connection
+ it is important to abort any active protocols, such as rekeys, because
+ they cannot be completed with detached clients.
-commit b2b91b074b6701455053425b583a6fd0beedc8cc
-Author: Kp
-Date: Fri Dec 12 21:38:54 2008 -0600
+commit aef788f086376673eef0939aa3ef74810318d5f3
+Author: Pekka Riikonen
+Date: Sun Jun 7 20:04:16 2009 +0300
- HTTP: fix stack overwrite due to format string error.
-
- On AMD64, %lu refers to a 64-bit unsigned value, but the address passed
- to sscanf points to a 32-bit unsigned value. This causes an adjoining
- value on the stack to be overwritten with data from the converted
- integer. Fix the format string to match the size of the supplied value,
- and remove the pointer cast.
+ silcd: Added SKR to debug levels
-commit 069e1969a3c2593056ecd1221e7df8bd52ede13f
+commit 3749c6ee56f1df40934bab1aae6baeb334206b69
Author: Pekka Riikonen
-Date: Sat Dec 13 21:48:04 2008 +0200
+Date: Tue Jun 2 08:01:25 2009 +0300
- ID Cache: Fixed destructor callback calling.
+ silcd: Save debug message in ring buffer
- The destructor context given to the ID cache destructor callback was wrong
- which caused odd crashes.
+ In debug version save 3000 last debug messages in ring buffer so that they
+ are available in core files.
-commit 2d53ba023e9b2eb6dbc52765b880090aa9354cf8
+commit 7a10e386467421bfac0ba425289250e61e566ce0
Author: Pekka Riikonen
-Date: Sat Dec 13 21:27:01 2008 +0200
+Date: Mon May 25 20:44:07 2009 +0300
- Packet engine: do not do the padding length check for CTR mode.
+ configure.ad: Fixed configure to support new autoconf
-commit 7df533b4f344d414f3817fc16430bec51d35d146
+commit 7d0cb0875ea6adaac843bc8d7ee1d74666c99afd
Author: Pekka Riikonen
-Date: Sun Nov 23 12:56:20 2008 +0200
+Date: Mon May 25 20:43:22 2009 +0300
- Packet engine: moved packet sanity checks after MAC check
+ silcd: fixed Deny hostname comparison
+
+ Use the silc_strin_match instead of silc_string_compare to match
+ hostnames and IP addresses in silcd.conf. Fixed for Deny but changed
+ in all the other places as well.
-commit 8298858c6fa6e39f0418daf2ee1cf1c8297cdd79
+commit a576439040a03e4b98b96b5834e504da00ced6e5
Author: Pekka Riikonen
-Date: Sun Nov 23 12:48:21 2008 +0200
+Date: Wed Mar 11 17:04:20 2009 +0200
- Removed extra semicolons from SILC_ASSERT and SILC_VERIFY macros
+ Added proper copyright notices to COPYING and BSD files
-commit dbc1bd097dd0090e4d0891bcd86f36e837405fda
-Author: Skywing
-Date: Sat Nov 8 23:07:36 2008 -0500
+commit ae6052d215699d28c10af64da8066b7b5175f58d
+Author: Pekka Riikonen
+Date: Tue Mar 3 08:02:27 2009 +0200
- Prevent continuing of an already finished FSM.
+ silcd: IDENTIFY command reply didn't save userinfo correctly
- Another fix for another crash relating to misuse of FSM and callback logic in
- the SKE library.
+ The IDENTIFY command reply didn't duplicate the userinfo when adding
+ new client thus causing weird crashes later when freeing the userinfo.
-commit bd396f4e92ed3c573effb47feeabd283e16ef4e3
-Author: Skywing
-Date: Sat Nov 8 21:19:03 2008 -0500
+commit 2e7268cde1710b4901e6db52c0868bd597b88dbc
+Author: Pekka Riikonen
+Date: Tue Mar 3 07:52:58 2009 +0200
- Fix crash on SKE failure.
+ silcd: IDENTIFY command reply didn't save client correctly
- Adds checks to prevent SKE failure notification callbacks from being called
- multiple times for the same SKE instance. This would often happen, for
- example, if we aborted an SKE.
+ The IDENTIFY command reply added sometimes new client without
+ duplicating the nickname of the client thus causing odd crashes later
+ when trying to free the nickname.
-commit 8ad07bf7fa3f4a579935e59c8832315e19d75908
-Author: Skywing
-Date: Sat Jun 28 00:21:51 2008 -0500
+commit 226f97eb5ab714b58bfb2cba0cb50d025884bb13
+Author: Pekka Riikonen
+Date: Fri Feb 27 16:22:36 2009 +0200
- Add reference counting to SilcClientEntry/SilcServerEntry for getkey response.
+ PacketEngine: Don't free underlaying stream in packet stream create error
- This is necessary in case the entry goes away before the user responds to the
- keyboard input request. (Fix for getkey crash if a user logs off before one
- responds to the getkey prompt.)
+ If packet stream creation failed it freed the stream given as argument.
+ This is wrong. It is the caller's responsibility to free it if the
+ packet stream creation failed.
-commit 1d69152f8db0cd9f8b72ebcfeef5be6feb2632b9
-Author: Skywing
-Date: Sat Jun 28 00:12:18 2008 -0500
+commit f17f0003337914b58ced7b318ce8455ffc2a9e51
+Author: Pekka Riikonen
+Date: Fri Feb 27 16:16:11 2009 +0200
- Fix initialization/deinitialization of various Silc*Entry objects.
+ silcd: handle SIGNOFF notify for local clients correctly
- A number of init/deinit cases were failing to clean up
- certain resources.
+ In some rare cases router can send SIGNOFF notify to server for a client
+ that is locally connected to the server. The server didn't close the
+ client's connection but freed the entry. This later caused various
+ different crashes when accessing the freed the client.
-commit 8f97093aded310bfdb6a4b3357639f78ad6b4503
-Author: Skywing
-Date: Fri Jun 27 23:44:03 2008 -0500
+commit 888990de6ce49969c38b46385644f946dabab5d1
+Author: Pekka Riikonen
+Date: Thu Feb 26 08:07:56 2009 +0200
- Fix reference counting for SilcServerEntry objects,
-
- analogous to the previous fixes for the broken
- reference counting for SilcChannelEntry and
- SilcClientEntry objects.
+ Fixed unsigned <-> signed char issues
-commit e69eab552f385361553ef94c80dd64040873a02f
-Author: Kp
-Date: Fri Jul 4 13:06:00 2008 -0500
+commit dc0e9d3b61c1adab40d23e48486f857f14bdcbd8
+Author: Pekka Riikonen
+Date: Thu Feb 26 08:06:02 2009 +0200
- Assert that the client count is positive prior to decrementing it.
+ SKE: When failure is received mark SKE always failed
- A situation has been observed where a silcd has clients connected to it,
- but reports 0 local users. It is believed that when these users log
- off, the server underflows and refuses new connections. Assert that no
- underflow occurs, which should prove or disprove this theory.
+ Mark the SKE failed even if we don't receive error from remote. Fixes
+ crash where the callback is called back to application without valid
+ key material and without error status.
-commit 77bf30377cb863783399080df4d99bb95495102a
-Author: Kp
-Date: Sat Jun 28 00:28:25 2008 -0500
+commit 4993b03b9ccd85373a60f9cf5c8d99a865898fda
+Author: Pekka Riikonen
+Date: Sat Jan 17 11:42:07 2009 +0200
- Fix reference counting for key exchange handling.
+ silcd: increment stat.clients statistics whenever adding new client
- When a key exchange times out, the SKE can be freed before the user
- responds. Switch the SKE callbacks to obtain their own reference to the
- object to prevent this.
+ When new client is added to server the stat.clients must always be
+ incremented. Otherwise it is possible to go under zero when removing
+ the clients by server.
-commit 3df3be75b6941531f8ddd37b91314fadb1864079
-Author: Skywing
-Date: Sat Nov 8 23:07:36 2008 -0500
+commit 454d63a3ea0c954f9d40b9e7725fd9ea48503f4c
+Author: Pekka Riikonen
+Date: Thu Jan 15 12:21:23 2009 +0200
- Prevent continuing of an already finished FSM.
-
- Another fix for another crash relating to misuse of FSM and callback logic in
- the SKE library.
+ silcd: do not create dynamic connections on non-dynamic server
-commit eef2f07c618c1b09976f3161e524e37cc4052499
-Author: Skywing
-Date: Sat Nov 8 21:19:03 2008 -0500
+commit c0a3e19503062eb3aab8335d97e27e348595b81d
+Author: Pekka Riikonen
+Date: Mon Jan 12 09:03:41 2009 +0200
- Fix crash on SKE failure.
-
- Adds checks to prevent SKE failure notification callbacks from being called
- multiple times for the same SKE instance. This would often happen, for
- example, if we aborted an SKE.
+ Added scripts/release
-commit dfcb7120979005b77b6bfd71fe10bcfcf3043690
-Author: Skywing
-Date: Sat Nov 8 21:05:06 2008 -0500
+commit 9504fdcc21339629d03619684f3ffdc0601e0a7e
+Author: Pekka Riikonen
+Date: Sat Jan 10 18:08:27 2009 +0200
- Revert "Don't delete packet stream"
-
- This reverts commit 544d0faa279dc3a3ca8f635665bd2cb57e92342b.
+ Libtool 2.x support
-commit 544d0faa279dc3a3ca8f635665bd2cb57e92342b
-Author: Skywing
-Date: Sat Nov 8 18:46:02 2008 -0500
+commit 378788d463ae896c05cf77f0b39015bffc69a0ae
+Author: Pekka Riikonen
+Date: Sat Jan 10 11:54:57 2009 +0200
- Don't delete packet stream
+ Updated release documentation.
-commit 6fbdb9acb4b8f4f90632c5b317c4daf81f7b2ec4
-Author: Skywing
-Date: Sat Jun 28 00:12:18 2008 -0500
+commit e5221dc52c3b68df49daac95218d9d229450f2d3
+Author: Pekka Riikonen
+Date: Fri Jan 9 10:14:12 2009 +0200
- Fix initialization/deinitialization of various Silc*Entry objects.
-
- A number of init/deinit cases were failing to clean up
- certain resources.
+ Fixed operation context NULLin in disconnect.
-commit 9145000948d0df9c9db99beb8d2f0855ba88e40c
-Author: Skywing
-Date: Fri Jun 27 23:44:03 2008 -0500
+commit 7e4757a2ae33adb2cb0dbe268cd9396e12c425b5
+Author: Pekka Riikonen
+Date: Fri Jan 9 07:33:55 2009 +0200
- Fix reference counting for SilcServerEntry objects,
+ Take stream reference correctly in packet error callback
- analogous to the previous fixes for the broken
- reference counting for SilcChannelEntry and
- SilcClientEntry objects.
+ Reverted commit e5e28835f5f0c4c5b52f0449e75b7f1c03a37548
-commit 1b106411911a7cf2cb5285d42d3e54449169a7f4
-Author: Skywing
-Date: Fri Jun 27 00:18:01 2008 -0500
+commit e5e28835f5f0c4c5b52f0449e75b7f1c03a37548
+Author: Pekka Riikonen
+Date: Thu Jan 8 22:32:47 2009 +0200
- Add support for autosendcmd on channel entries to the
-
- SILC client. Note that we don't support botmasks yet,
- but this can be used to send a command on join of a
- channel on connect/reconnect/reattach detached session.
+ Remove possible packet error timeouts in EOS callback
-commit 111050c51338ea0da165048536fbb0dc7f500a0a
-Author: kp@valhallalegends.com
-Date: Sat Jun 28 00:28:25 2008 -0500
+commit 9a3eb96ee8950fbce03b1e115e656960be189dfc
+Author: Pekka Riikonen
+Date: Thu Jan 8 21:58:39 2009 +0200
- Fix reference counting for key exchange handling.
-
- When a key exchange times out, the SKE can be freed before the user
- responds. Switch the SKE callbacks to obtain their own reference to the
- object to prevent this.
+ Added debug logs for updating stat.clients value
- Makefile.ad | 1 -
- configure.ad | 23 +----
- doc/silcd.conf.yo | 6 +
- lib/configure.ad | 4 +-
- lib/silcapputil/silcidcache.c | 4 +-
- lib/silcapputil/silcidcache.h | 5 +-
- lib/silcclient/client.c | 6 +-
- lib/silcclient/client.h | 3 +
- lib/silcclient/client_entry.c | 98 ++++++++++-------
- lib/silcclient/client_keyagr.c | 3 +-
- lib/silcclient/silcclient.h | 6 +-
- lib/silccore/silcpacket.c | 77 ++++++++-----
- lib/silccrypt/Makefile.ad | 9 +--
- lib/silchttp/silchttpserver.c | 2 +-
- lib/silcsim/Makefile.ad | 6 -
- lib/silcske/silcske.c | 105 +++++++++++-------
- lib/silcske/silcske_i.h | 12 +-
- lib/silcskr/silcskr.c | 4 +-
- lib/silcutil/silclog.h | 10 +-
- lib/silcutil/silcschedule.c | 6 +-
- lib/silcutil/silcsocketstream.c | 2 +-
- lib/silcutil/unix/silcunixschedule.c | 2 +-
- delete mode 100755 libtoolfix
+ README.DIST | 69 +++++++++++++++++++++-------------------
+ apps/irssi/configure.in | 23 +++----------
+ apps/silcd/command.c | 19 +++++++++--
+ apps/silcd/command_reply.c | 21 ++++++++++--
+ apps/silcd/command_reply.h | 1 +
+ apps/silcd/packet_receive.c | 32 ++++++++++++++++++-
+ apps/silcd/server.c | 44 ++++++++++++++++++++++---
+ apps/silcd/server_internal.h | 3 +-
+ apps/silcd/server_query.c | 7 ++++
+ apps/silcd/server_util.c | 13 ++++++--
+ apps/silcd/serverconfig.c | 16 +++++-----
+ apps/silcd/silcd.c | 47 ++++++++++++++++++++++------
+ configure.ad | 19 ++++++-----
+ distdir/BSD | 3 ++
+ distdir/TOOLKIT | 4 ++
+ distdir/autodist.conf | 2 +-
+ lib/silcclient/client_entry.c | 10 +++---
+ lib/silcclient/command.c | 8 ++--
+ lib/silccore/silcpacket.c | 8 ++++-
+ lib/silcske/silcske.c | 4 +-
+ lib/silcutil/silcconfig.c | 45 ++++++++++++++------------
+ lib/silcutil/silcutil.c | 2 +-
+ scripts/release | 8 +++++
+ 23 files changed, 279 insertions(+), 129 deletions(-)
+ create mode 100644 scripts/release
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/silc-toolkit-1.1.9/Makefile.am new/silc-toolkit-1.1.10/Makefile.am
--- old/silc-toolkit-1.1.9/Makefile.am 2009-01-08 15:29:29.000000000 +0100
+++ new/silc-toolkit-1.1.10/Makefile.am 2009-08-07 13:51:28.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./Makefile.ad file in the source tree.
# Source: ./Makefile.ad
-# Generated: Thu Jan 8 16:26:51 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:01 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/apps/Makefile.am new/silc-toolkit-1.1.10/apps/Makefile.am
--- old/silc-toolkit-1.1.9/apps/Makefile.am 2009-01-08 15:29:15.000000000 +0100
+++ new/silc-toolkit-1.1.10/apps/Makefile.am 2009-08-07 13:51:06.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./apps/Makefile.ad file in the source tree.
# Source: ./apps/Makefile.ad
-# Generated: Thu Jan 8 16:26:53 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:02 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/configure.ac new/silc-toolkit-1.1.10/configure.ac
--- old/silc-toolkit-1.1.9/configure.ac 2009-01-08 15:29:31.000000000 +0100
+++ new/silc-toolkit-1.1.10/configure.ac 2009-08-07 13:51:30.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the configure.ad file in the source tree.
# Source: configure.ad
-# Generated: Thu Jan 8 16:26:53 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:03 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
@@ -11,7 +11,7 @@
#
# Author: Pekka Riikonen
#
-# Copyright (C) 2000 - 2007 Pekka Riikonen
+# Copyright (C) 2000 - 2007, 2009 Pekka Riikonen
#
# The contents of this file are subject to one of the Licenses specified
# in the COPYING file; You may not use this file except in compliance
@@ -23,7 +23,7 @@
# information.
#
-AC_INIT([Toolkit], [1.1.9], [silc-devel@lists.silcnet.org], [silc-toolkit])
+AC_INIT([Toolkit], [1.1.10], [silc-devel@lists.silcnet.org], [silc-toolkit])
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE
AC_PREREQ(2.52)
@@ -50,6 +50,9 @@
*-*-netbsd*)
check_threads=true
;;
+ *-*-openbsd*)
+ check_threads=true
+ ;;
*-*-*bsd*)
check_threads=false
;;
@@ -206,9 +209,9 @@
AC_CHECK_FUNCS(gethostname gethostbyaddr getservbyname getservbyport)
AC_CHECK_FUNCS(poll select listen bind shutdown close connect setsockopt)
AC_CHECK_FUNCS(setrlimit time ctime utime gettimeofday getrusage)
-AC_CHECK_FUNCS(chmod fcntl stat fstat getenv putenv strerror)
+AC_CHECK_FUNCS(chmod fcntl stat fstat getenv putenv strerror posix_memalign)
AC_CHECK_FUNCS(getpid getgid getsid getpgid getpgrp getuid sched_yield)
-AC_CHECK_FUNCS(setgroups initgroups nl_langinfo nanosleep)
+AC_CHECK_FUNCS(setgroups initgroups nl_langinfo nanosleep backtrace)
AC_CHECK_FUNCS(strchr snprintf strstr strcpy strncpy memcpy memset memmove)
# lib/contrib conditionals
@@ -942,7 +945,7 @@
# (2) In glibc-2.1.2 and earlier there is a bug that messes up ob and
# obl when args 2 and 3 are 0 (fixed in glibc-2.1.3).
#
- AC_CACHE_CHECK([whether this iconv is good enough], ac_iconv_good,
+ AC_CACHE_CHECK([whether this iconv is good enough], ac_cv_iconv_good,
AC_TRY_RUN(
[
#include
@@ -961,17 +964,17 @@
}
],
[
- ac_iconv_good=yes
+ ac_cv_iconv_good=yes
],
[
- ac_iconv_good=no
+ ac_cv_iconv_good=no
],
[
- ac_iconv_good=yes
+ ac_cv_iconv_good=yes
])
)
- if test x$ac_iconv_good = xno; then
+ if test x$ac_cv_iconv_good = xno; then
AC_MSG_RESULT(Try using libiconv instead.)
fi
fi
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/silc-toolkit-1.1.9/doc/Makefile.am new/silc-toolkit-1.1.10/doc/Makefile.am
--- old/silc-toolkit-1.1.9/doc/Makefile.am 2009-01-08 15:29:30.000000000 +0100
+++ new/silc-toolkit-1.1.10/doc/Makefile.am 2009-08-07 13:51:29.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./doc/Makefile.ad file in the source tree.
# Source: ./doc/Makefile.ad
-# Generated: Thu Jan 8 16:26:53 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:03 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/doc/toolkit/index.html new/silc-toolkit-1.1.10/doc/toolkit/index.html
--- old/silc-toolkit-1.1.9/doc/toolkit/index.html 2009-01-08 15:29:07.000000000 +0100
+++ new/silc-toolkit-1.1.10/doc/toolkit/index.html 2009-08-07 13:51:01.000000000 +0200
@@ -63,9 +63,9 @@
<big><b>SILC Toolkit Reference Manual</b></big>
<br />
<small>
-Version: 1.1.9<br />
+Version: 1.1.10<br />
Copyright © 1997 - 2007 The SILC Project<br />
-Updated: Thu Jan 8 16:29:07 EET 2009
+Updated: Fri Aug 7 14:51:01 EEST 2009
</small>
<br /><br /><br />
Welcome to the SILC Toolkit Reference Manual. The manual is a complete
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/silc-toolkit-1.1.9/doc/toolkit/silcpacket-silc_packet_stream_create.html new/silc-toolkit-1.1.10/doc/toolkit/silcpacket-silc_packet_stream_create.html
--- old/silc-toolkit-1.1.9/doc/toolkit/silcpacket-silc_packet_stream_create.html 2009-01-08 15:28:17.000000000 +0100
+++ new/silc-toolkit-1.1.10/doc/toolkit/silcpacket-silc_packet_stream_create.html 2009-08-07 13:50:07.000000000 +0200
@@ -173,6 +173,10 @@
stream. After this function returns, packets can immediately be
sent to and received from the stream.
+ The `stream' will be owned by the packet stream and will be closed
+ and destroyed when the packet stream is destroyed. If the packet
+ stream creation fails the `stream' is left intact.
+
</FONT></PRE><FONT SIZE="+1"><B>
<FONT COLOR="#000055">NOTES
</FONT></B></FONT>
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/silc-toolkit-1.1.9/includes/Makefile.am new/silc-toolkit-1.1.10/includes/Makefile.am
--- old/silc-toolkit-1.1.9/includes/Makefile.am 2009-01-08 15:29:26.000000000 +0100
+++ new/silc-toolkit-1.1.10/includes/Makefile.am 2009-08-07 13:51:24.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./includes/Makefile.ad file in the source tree.
# Source: ./includes/Makefile.ad
-# Generated: Thu Jan 8 16:26:51 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:01 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/includes/silcdistdefs.h new/silc-toolkit-1.1.10/includes/silcdistdefs.h
--- old/silc-toolkit-1.1.9/includes/silcdistdefs.h 2009-01-08 15:29:15.000000000 +0100
+++ new/silc-toolkit-1.1.10/includes/silcdistdefs.h 2009-08-07 13:51:06.000000000 +0200
@@ -1,7 +1,7 @@
/*
Automatically generated by Autodist 1.4. Do not edit.
- Generated: Thu Jan 8 16:26:50 EET 2009 by priikone
+ Generated: Fri Aug 7 10:08:57 EEST 2009 by priikone
Distribution: Toolkit
License: distdir/TOOLKIT
*/
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/silc-toolkit-1.1.9/includes/silcversion.h new/silc-toolkit-1.1.10/includes/silcversion.h
--- old/silc-toolkit-1.1.9/includes/silcversion.h 2009-01-08 15:29:15.000000000 +0100
+++ new/silc-toolkit-1.1.10/includes/silcversion.h 2009-08-07 13:51:06.000000000 +0200
@@ -27,11 +27,11 @@
/* Version check macro. Use this to check that package is of specific
version compile time. Use the __SILC_XXX_VERSION below in comparison. */
#define SILC_VERSION(a, b, c) (((a) << 24) + ((b) << 16) + ((c) << 8))
-#define __SILC_TOOLKIT_VERSION SILC_VERSION(1,1,9)
+#define __SILC_TOOLKIT_VERSION SILC_VERSION(1,1,10)
-#define SILC_VERSION_STRING "1.1.9"
-#define SILC_DIST_VERSION_STRING "1.1.9"
-#define SILC_PROTOCOL_VERSION_STRING "SILC-1.2-1.1.9 silc-toolkit"
+#define SILC_VERSION_STRING "1.1.10"
+#define SILC_DIST_VERSION_STRING "1.1.10"
+#define SILC_PROTOCOL_VERSION_STRING "SILC-1.2-1.1.10 silc-toolkit"
#define SILC_NAME "SILC Toolkit"
/* SILC Protocol version number */
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/silc-toolkit-1.1.9/lib/Makefile.am new/silc-toolkit-1.1.10/lib/Makefile.am
--- old/silc-toolkit-1.1.9/lib/Makefile.am 2009-01-08 15:29:28.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/Makefile.am 2009-08-07 13:51:26.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/Makefile.ad file in the source tree.
# Source: ./lib/Makefile.ad
-# Generated: Thu Jan 8 16:26:51 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:01 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/lib/contrib/Makefile.am new/silc-toolkit-1.1.10/lib/contrib/Makefile.am
--- old/silc-toolkit-1.1.9/lib/contrib/Makefile.am 2009-01-08 15:29:27.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/contrib/Makefile.am 2009-08-07 13:51:25.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/contrib/Makefile.ad file in the source tree.
# Source: ./lib/contrib/Makefile.ad
-# Generated: Thu Jan 8 16:26:51 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:01 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/lib/silcapputil/Makefile.am new/silc-toolkit-1.1.10/lib/silcapputil/Makefile.am
--- old/silc-toolkit-1.1.9/lib/silcapputil/Makefile.am 2009-01-08 15:29:28.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcapputil/Makefile.am 2009-08-07 13:51:26.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcapputil/Makefile.ad file in the source tree.
# Source: ./lib/silcapputil/Makefile.ad
-# Generated: Thu Jan 8 16:26:52 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:02 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/lib/silcasn1/Makefile.am new/silc-toolkit-1.1.10/lib/silcasn1/Makefile.am
--- old/silc-toolkit-1.1.9/lib/silcasn1/Makefile.am 2009-01-08 15:29:28.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcasn1/Makefile.am 2009-08-07 13:51:26.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcasn1/Makefile.ad file in the source tree.
# Source: ./lib/silcasn1/Makefile.ad
-# Generated: Thu Jan 8 16:26:52 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:02 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/lib/silcclient/Makefile.am new/silc-toolkit-1.1.10/lib/silcclient/Makefile.am
--- old/silc-toolkit-1.1.9/lib/silcclient/Makefile.am 2009-01-08 15:29:27.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcclient/Makefile.am 2009-08-07 13:51:25.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcclient/Makefile.ad file in the source tree.
# Source: ./lib/silcclient/Makefile.ad
-# Generated: Thu Jan 8 16:26:51 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:01 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/lib/silcclient/client_entry.c new/silc-toolkit-1.1.10/lib/silcclient/client_entry.c
--- old/silc-toolkit-1.1.9/lib/silcclient/client_entry.c 2009-01-08 15:29:18.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcclient/client_entry.c 2009-08-07 13:51:11.000000000 +0200
@@ -801,10 +801,10 @@
client_entry->server, sizeof(client_entry->server));
if (nickname && client->internal->params->full_nicknames)
silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
- nickname);
+ "%s", nickname);
else if (nickname)
silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
- parsed);
+ "%s", parsed);
silc_parse_userfqdn(username, client_entry->username,
sizeof(client_entry->username),
@@ -900,10 +900,10 @@
client_entry->server, sizeof(client_entry->server));
if (client->internal->params->full_nicknames)
silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
- nickname);
+ "%s", nickname);
else
silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
- parsed);
+ "%s", parsed);
/* Normalize nickname */
nick = silc_identifier_check(parsed, strlen(parsed),
@@ -1206,7 +1206,7 @@
return NULL;
silc_snprintf(client_entry->nickname, sizeof(client_entry->nickname),
- cp);
+ "%s", cp);
silc_free(cp);
}
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/silc-toolkit-1.1.9/lib/silcclient/command.c new/silc-toolkit-1.1.10/lib/silcclient/command.c
--- old/silc-toolkit-1.1.9/lib/silcclient/command.c 2009-01-08 15:29:18.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcclient/command.c 2009-08-07 13:51:11.000000000 +0200
@@ -956,7 +956,7 @@
}
if (client->internal->params->full_channel_names)
- silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+ silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
else
silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
conn->current_channel->channel_name,
@@ -2144,7 +2144,7 @@
}
if (client->internal->params->full_channel_names)
- silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+ silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
else
silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
conn->current_channel->channel_name,
@@ -2554,7 +2554,7 @@
}
if (client->internal->params->full_channel_names)
- silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+ silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
else
silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
conn->current_channel->channel_name,
@@ -2621,7 +2621,7 @@
}
if (conn->client->internal->params->full_channel_names)
- silc_snprintf(tmp, sizeof(tmp), conn->current_channel->channel_name);
+ silc_snprintf(tmp, sizeof(tmp), "%s", conn->current_channel->channel_name);
else
silc_snprintf(tmp, sizeof(tmp), "%s%s%s",
conn->current_channel->channel_name,
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/silc-toolkit-1.1.9/lib/silccore/Makefile.am new/silc-toolkit-1.1.10/lib/silccore/Makefile.am
--- old/silc-toolkit-1.1.9/lib/silccore/Makefile.am 2009-01-08 15:29:28.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silccore/Makefile.am 2009-08-07 13:51:27.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silccore/Makefile.ad file in the source tree.
# Source: ./lib/silccore/Makefile.ad
-# Generated: Thu Jan 8 16:26:52 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:02 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/lib/silccore/silcpacket.c new/silc-toolkit-1.1.10/lib/silccore/silcpacket.c
--- old/silc-toolkit-1.1.9/lib/silccore/silcpacket.c 2009-01-08 15:29:21.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silccore/silcpacket.c 2009-08-07 13:51:16.000000000 +0200
@@ -4,7 +4,7 @@
Author: Pekka Riikonen
- Copyright (C) 1997 - 2008 Pekka Riikonen
+ Copyright (C) 1997 - 2009 Pekka Riikonen
The contents of this file are subject to one of the Licenses specified
in the COPYING file; You may not use this file except in compliance
@@ -710,6 +710,7 @@
/* Initialize packet procesors list */
ps->process = silc_dlist_init();
if (!ps->process) {
+ ps->stream = NULL;
silc_packet_stream_destroy(ps);
return NULL;
}
@@ -722,6 +723,7 @@
ps->sc = silc_calloc(1, sizeof(*ps->sc));
if (!ps->sc) {
silc_mutex_unlock(engine->lock);
+ ps->stream = NULL;
silc_packet_stream_destroy(ps);
return NULL;
}
@@ -734,6 +736,7 @@
silc_free(ps->sc);
ps->sc = NULL;
silc_mutex_unlock(engine->lock);
+ ps->stream = NULL;
silc_packet_stream_destroy(ps);
return NULL;
}
@@ -745,6 +748,7 @@
silc_free(ps->sc);
ps->sc = NULL;
silc_mutex_unlock(engine->lock);
+ ps->stream = NULL;
silc_packet_stream_destroy(ps);
return NULL;
}
@@ -757,6 +761,7 @@
silc_free(ps->sc);
ps->sc = NULL;
silc_mutex_unlock(engine->lock);
+ ps->stream = NULL;
silc_packet_stream_destroy(ps);
return NULL;
}
@@ -779,6 +784,7 @@
if (!silc_stream_set_notifier(ps->stream, schedule,
silc_packet_stream_io, ps)) {
SILC_LOG_DEBUG(("Cannot set stream notifier for packet stream"));
+ ps->stream = NULL;
silc_packet_stream_destroy(ps);
return NULL;
}
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/silc-toolkit-1.1.9/lib/silccore/silcpacket.h new/silc-toolkit-1.1.10/lib/silccore/silcpacket.h
--- old/silc-toolkit-1.1.9/lib/silccore/silcpacket.h 2009-01-08 15:29:22.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silccore/silcpacket.h 2009-08-07 13:51:17.000000000 +0200
@@ -4,7 +4,7 @@
Author: Pekka Riikonen
- Copyright (C) 1997 - 2007 Pekka Riikonen
+ Copyright (C) 1997 - 2009 Pekka Riikonen
The contents of this file are subject to one of the Licenses specified
in the COPYING file; You may not use this file except in compliance
@@ -439,6 +439,10 @@
* stream. After this function returns, packets can immediately be
* sent to and received from the stream.
*
+ * The `stream' will be owned by the packet stream and will be closed
+ * and destroyed when the packet stream is destroyed. If the packet
+ * stream creation fails the `stream' is left intact.
+ *
* NOTES
*
* SilcPacketStream cannot be used with silc_stream_* routines (such as
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/silc-toolkit-1.1.9/lib/silccrypt/Makefile.am new/silc-toolkit-1.1.10/lib/silccrypt/Makefile.am
--- old/silc-toolkit-1.1.9/lib/silccrypt/Makefile.am 2009-01-08 15:29:27.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silccrypt/Makefile.am 2009-08-07 13:51:25.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silccrypt/Makefile.ad file in the source tree.
# Source: ./lib/silccrypt/Makefile.ad
-# Generated: Thu Jan 8 16:26:51 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:01 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/lib/silchttp/Makefile.am new/silc-toolkit-1.1.10/lib/silchttp/Makefile.am
--- old/silc-toolkit-1.1.9/lib/silchttp/Makefile.am 2009-01-08 15:29:29.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silchttp/Makefile.am 2009-08-07 13:51:28.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silchttp/Makefile.ad file in the source tree.
# Source: ./lib/silchttp/Makefile.ad
-# Generated: Thu Jan 8 16:26:53 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:02 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/lib/silcmath/Makefile.am new/silc-toolkit-1.1.10/lib/silcmath/Makefile.am
--- old/silc-toolkit-1.1.9/lib/silcmath/Makefile.am 2009-01-08 15:29:27.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcmath/Makefile.am 2009-08-07 13:51:26.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcmath/Makefile.ad file in the source tree.
# Source: ./lib/silcmath/Makefile.ad
-# Generated: Thu Jan 8 16:26:52 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:01 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/lib/silcsftp/Makefile.am new/silc-toolkit-1.1.10/lib/silcsftp/Makefile.am
--- old/silc-toolkit-1.1.9/lib/silcsftp/Makefile.am 2009-01-08 15:29:28.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcsftp/Makefile.am 2009-08-07 13:51:27.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcsftp/Makefile.ad file in the source tree.
# Source: ./lib/silcsftp/Makefile.ad
-# Generated: Thu Jan 8 16:26:52 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:02 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/lib/silcsim/Makefile.am new/silc-toolkit-1.1.10/lib/silcsim/Makefile.am
--- old/silc-toolkit-1.1.9/lib/silcsim/Makefile.am 2009-01-08 15:29:27.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcsim/Makefile.am 2009-08-07 13:51:24.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcsim/Makefile.ad file in the source tree.
# Source: ./lib/silcsim/Makefile.ad
-# Generated: Thu Jan 8 16:26:51 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:01 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/lib/silcske/Makefile.am new/silc-toolkit-1.1.10/lib/silcske/Makefile.am
--- old/silc-toolkit-1.1.9/lib/silcske/Makefile.am 2009-01-08 15:29:28.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcske/Makefile.am 2009-08-07 13:51:26.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcske/Makefile.ad file in the source tree.
# Source: ./lib/silcske/Makefile.ad
-# Generated: Thu Jan 8 16:26:52 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:02 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/lib/silcske/silcske.c new/silc-toolkit-1.1.10/lib/silcske/silcske.c
--- old/silc-toolkit-1.1.9/lib/silcske/silcske.c 2009-01-08 15:29:21.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcske/silcske.c 2009-08-07 13:51:15.000000000 +0200
@@ -1809,10 +1809,10 @@
if (ske->packet && silc_buffer_len(&ske->packet->buffer) == 4) {
SILC_GET32_MSB(error, ske->packet->buffer.data);
- ske->status = error;
silc_packet_free(ske->packet);
ske->packet = NULL;
}
+ ske->status = error;
SILC_LOG_DEBUG(("Error %s (%d) received during key exchange",
silc_ske_map_status(ske->status), ske->status));
@@ -2383,10 +2383,10 @@
if (ske->packet && silc_buffer_len(&ske->packet->buffer) == 4) {
SILC_GET32_MSB(error, ske->packet->buffer.data);
- ske->status = error;
silc_packet_free(ske->packet);
ske->packet = NULL;
}
+ ske->status = error;
silc_packet_stream_unlink(ske->stream, &silc_ske_stream_cbs, ske);
silc_schedule_task_del_by_context(ske->schedule, ske);
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/silc-toolkit-1.1.9/lib/silcskr/Makefile.am new/silc-toolkit-1.1.10/lib/silcskr/Makefile.am
--- old/silc-toolkit-1.1.9/lib/silcskr/Makefile.am 2009-01-08 15:29:28.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcskr/Makefile.am 2009-08-07 13:51:26.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcskr/Makefile.ad file in the source tree.
# Source: ./lib/silcskr/Makefile.ad
-# Generated: Thu Jan 8 16:26:52 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:02 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/lib/silcutil/Makefile.am new/silc-toolkit-1.1.10/lib/silcutil/Makefile.am
--- old/silc-toolkit-1.1.9/lib/silcutil/Makefile.am 2009-01-08 15:29:29.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcutil/Makefile.am 2009-08-07 13:51:28.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcutil/Makefile.ad file in the source tree.
# Source: ./lib/silcutil/Makefile.ad
-# Generated: Thu Jan 8 16:26:53 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:02 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/lib/silcutil/silcconfig.c new/silc-toolkit-1.1.10/lib/silcutil/silcconfig.c
--- old/silc-toolkit-1.1.9/lib/silcutil/silcconfig.c 2009-01-08 15:29:24.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcutil/silcconfig.c 2009-08-07 13:51:20.000000000 +0200
@@ -45,8 +45,8 @@
char *filename; /* the original filename opened */
int level; /* parsing level, how many nested
silc_config_main we have */
- char *base; /* this is a fixed pointer to the base location */
- char *p; /* the Parser poitner */
+ unsigned char *base; /* this is a fixed pointer to the base location */
+ unsigned char *p; /* the Parser poitner */
SilcUInt32 len; /* fixed length of the whole file */
SilcUInt32 line; /* current parsing line, strictly linked to p */
SilcBool included; /* wether this file is main or included */
@@ -95,8 +95,8 @@
/* Points the first non-space character */
static void my_trim_spaces(SilcConfigFile *file)
{
- register char *r = file->p;
- while ((*r != '\0' && *r != EOF) && isspace((int)*r))
+ unsigned char *r = file->p;
+ while ((*r != '\0' && *r != (unsigned char)EOF) && isspace((int)*r))
if (*r++ == '\n') file->line++;
file->p = r;
}
@@ -104,21 +104,24 @@
/* Skips the current line until newline (lf or cr) */
static void my_skip_line(SilcConfigFile *file)
{
- register char *r = file->p;
- while ((*r != '\0' && *r != EOF) && (*r != '\n') && (*r != '\r')) r++;
- file->p = ((*r != '\0' && *r != EOF) ? r + 1 : r);
+ unsigned char *r = file->p;
+ while ((*r != '\0' && *r != (unsigned char)EOF) &&
+ (*r != '\n') && (*r != '\r')) r++;
+ file->p = ((*r != '\0' && *r != (unsigned char)EOF) ? r + 1 : r);
file->line++;
}
/* Obtains a text token from the current position until first separator.
* a separator is any non alphanumeric character nor "_" or "-" */
-static char *my_next_token(SilcConfigFile *file, char *to)
+static unsigned char *my_next_token(SilcConfigFile *file, char *to)
{
unsigned int count = 0;
- register char *o;
+ unsigned char *o;
+
my_trim_spaces(file);
o = file->p;
- while ((isalnum((int)*o) || (*o == '_') || (*o == '-')) && count < BUF_SIZE) {
+ while ((isalnum((int)*o) || (*o == '_') || (*o == '-')) &&
+ count < BUF_SIZE) {
count++;
*to++ = *o++;
}
@@ -131,12 +134,13 @@
* next_token() is that quoted-strings are also accepted */
static char *my_get_string(SilcConfigFile *file, char *to)
{
- char *o;
+ unsigned char *o;
+
my_trim_spaces(file);
o = file->p;
if (*o == '"') {
unsigned int count = 0;
- char *d = to;
+ unsigned char *d = to;
while (count < BUF_SIZE) {
o++;
if (*o == '"') {
@@ -279,7 +283,7 @@
ret = silc_calloc(1, sizeof(*ret));
ret->filename = strdup(configfile);
- ret->base = ret->p = buffer;
+ ret->base = ret->p = (unsigned char *)buffer;
ret->len = filelen;
ret->line = 1; /* line count, start from first line */
return ret;
@@ -336,13 +340,12 @@
char *silc_config_read_line(SilcConfigFile *file, SilcUInt32 line)
{
- register char *p;
+ unsigned char *p, *ret = NULL, *endbuf;
int len;
- char *ret = NULL, *endbuf;
if (!file || (line <= 0))
return NULL;
- for (p = file->base; *p && (*p != EOF); p++) {
+ for (p = file->base; *p && (*p != (unsigned char)EOF); p++) {
if (line <= 1)
goto found;
if (*p == '\n')
@@ -358,7 +361,7 @@
} else {
ret = silc_memdup(p, strlen(p));
}
- return ret;
+ return (char *)ret;
}
/* Convenience function to read the current parsed line */
@@ -397,8 +400,8 @@
* Returns TRUE on success, FALSE if already registered. */
SilcBool silc_config_register(SilcConfigEntity ent, const char *name,
- SilcConfigType type, SilcConfigCallback cb,
- const SilcConfigTable *subtable, void *context)
+ SilcConfigType type, SilcConfigCallback cb,
+ const SilcConfigTable *subtable, void *context)
{
SilcConfigOption *newopt;
SILC_CONFIG_DEBUG(("Register new option=\"%s\" "
@@ -461,7 +464,7 @@
static int silc_config_main_internal(SilcConfigEntity ent)
{
SilcConfigFile *file = ent->file;
- char **p = &file->p;
+ unsigned char **p = &file->p;
/* loop throught statements */
while (1) {
@@ -471,7 +474,7 @@
/* makes it pointing to the next interesting char */
my_skip_comments(file);
/* got eof? */
- if (**p == '\0' || **p == EOF) {
+ if (**p == '\0' || **p == (unsigned char)EOF) {
if (file->level > 1) /* cannot get eof in a sub-level! */
return SILC_CONFIG_EEXPECTED;
goto finish;
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/silc-toolkit-1.1.9/lib/silcutil/silcmemory.h new/silc-toolkit-1.1.10/lib/silcutil/silcmemory.h
--- old/silc-toolkit-1.1.9/lib/silcutil/silcmemory.h 2009-01-08 15:29:24.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcutil/silcmemory.h 2009-08-07 13:51:21.000000000 +0200
@@ -119,7 +119,6 @@
void *silc_memdup(const void *ptr, size_t size);
#else
-
#include "stacktrace.h"
#endif /* SILC_STACKTRACE */
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/silc-toolkit-1.1.9/lib/silcutil/silcutil.c new/silc-toolkit-1.1.10/lib/silcutil/silcutil.c
--- old/silc-toolkit-1.1.9/lib/silcutil/silcutil.c 2009-01-08 15:29:24.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcutil/silcutil.c 2009-08-07 13:51:20.000000000 +0200
@@ -45,7 +45,7 @@
dest[i] = src[start];
- if (dest[i] == EOF)
+ if ((unsigned char)dest[i] == (unsigned char)EOF)
return EOF;
if (dest[i] == '\n')
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/silc-toolkit-1.1.9/lib/silcutil/stacktrace.c new/silc-toolkit-1.1.10/lib/silcutil/stacktrace.c
--- old/silc-toolkit-1.1.9/lib/silcutil/stacktrace.c 2009-01-08 15:29:25.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcutil/stacktrace.c 2009-08-07 13:51:22.000000000 +0200
@@ -70,7 +70,9 @@
#include "silc.h"
#ifdef SILC_STACKTRACE
+#if defined(HAVE_BACKTRACE)
#include
+#endif /* HAVE_BACKTRACE */
#include
#include
#include
@@ -128,6 +130,46 @@
#define silc_hexdump(ptr, size, file) \
silc_log_output_hexdump("", "", 0, ptr, size, "")
+int silc_st_backtrace(void **stack)
+{
+#if defined(HAVE_BACKTRACE)
+ return backtrace(stack, SILC_ST_DEPTH);
+#else
+ void *fp;
+ int depth;
+ asm volatile ("movl %%ebp, %0" : "=r" (fp));
+ for (depth = 0; fp; depth++) {
+ if (depth == SILC_ST_DEPTH)
+ break;
+
+ /* Get program pointer and frame pointer from this frame */
+ stack[depth] = *((void **)(((unsigned char *)fp) + 4));
+ fp = *((void **)fp);
+ }
+ return depth;
+#endif /* HAVE_BACKTRACE */
+}
+
+char **silc_st_backtrace_symbols(void **stack, int depth)
+{
+#if defined(HAVE_BACKTRACE)
+ return backtrace_symbols(stack, depth);
+#else
+ return NULL;
+#endif /* HAVE_BACKTRACE */
+}
+
+void silc_st_backtrace_symbols_stderr(void **stack, int depth)
+{
+#if defined(HAVE_BACKTRACE)
+ backtrace_symbols_fd(stack, depth, 2);
+#else
+ int i;
+ for (i = 0; i < depth; i++)
+ fprintf(stderr, "? [%p]\n", stack[i]);
+#endif /* HAVE_BACKTRACE */
+}
+
void silc_st_abort(SilcStBlock stack, const char *file, int line,
char *fmt, ...)
{
@@ -141,8 +183,8 @@
va_end(va);
fprintf(stderr, "----- BACKTRACE -----\n%s:%d:\n", file, line);
- btc = backtrace(bt, SILC_ST_DEPTH);
- backtrace_symbols_fd(bt, btc, 2);
+ btc = silc_st_backtrace(bt);
+ silc_st_backtrace_symbols_stderr(bt, btc);
if (stack) {
fprintf(stderr, "----- MEMORY TRACE -----\n");
@@ -151,7 +193,7 @@
stack->free_line);
fprintf(stderr, "Originally allocated at:\n");
fprintf(stderr, "%s:%d:\n", stack->file, stack->line);
- backtrace_symbols_fd(stack->stack, stack->depth, 2);
+ silc_st_backtrace_symbols_fd(stack->stack, stack->depth);
fflush(stderr);
if (dump_mem) {
@@ -259,8 +301,10 @@
if (pg) {
unsigned char *ptr;
+#if defined(HAVE_POSIX_MEMALIGN)
if (posix_memalign((void *)&ptr, pg,
SILC_ST_GET_SIZE_ALIGN(size, pg) + pg))
+#endif /* HAVE_POSIX_MEMALIGN */
return NULL;
/* The inaccessible page too will include the allocation information
@@ -290,7 +334,7 @@
stack->line = line;
stack->size = size;
stack->bound = SILC_ST_TOP_BOUND;
- stack->depth = backtrace(stack->stack, SILC_ST_DEPTH);
+ stack->depth = silc_st_backtrace(stack->stack);
silc_mutex_lock(lock);
@@ -459,7 +503,7 @@
}
/* Get symbol names */
- syms = backtrace_symbols(stack->stack, stack->depth);
+ syms = silc_st_backtrace_symbols(stack->stack, stack->depth);
/* Find number of leaks and bytes leaked for this leak */
for (s = stack; s; s = s->next) {
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/silc-toolkit-1.1.9/lib/silcvcard/Makefile.am new/silc-toolkit-1.1.10/lib/silcvcard/Makefile.am
--- old/silc-toolkit-1.1.9/lib/silcvcard/Makefile.am 2009-01-08 15:29:27.000000000 +0100
+++ new/silc-toolkit-1.1.10/lib/silcvcard/Makefile.am 2009-08-07 13:51:24.000000000 +0200
@@ -2,7 +2,7 @@
# To make changes edit the ./lib/silcvcard/Makefile.ad file in the source tree.
# Source: ./lib/silcvcard/Makefile.ad
-# Generated: Thu Jan 8 16:26:51 EET 2009 by priikone
+# Generated: Fri Aug 7 10:09:01 EEST 2009 by priikone
# Distribution: Toolkit
# License: distdir/TOOLKIT
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/silc-toolkit-1.1.9/silc-toolkit.spec new/silc-toolkit-1.1.10/silc-toolkit.spec
--- old/silc-toolkit-1.1.9/silc-toolkit.spec 2009-01-08 15:29:30.000000000 +0100
+++ new/silc-toolkit-1.1.10/silc-toolkit.spec 2009-08-07 13:51:29.000000000 +0200
@@ -1,6 +1,6 @@
Summary: SILC Toolkit
Name: silc-toolkit
-Version: 1.1.9
+Version: 1.1.10
Release: 0.fc8
License: GPL/BSD dual licensed
Group: System Environment/Libraries
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/silc-toolkit-1.1.9/silcdefs.h.in new/silc-toolkit-1.1.10/silcdefs.h.in
--- old/silc-toolkit-1.1.9/silcdefs.h.in 2009-01-08 15:29:31.000000000 +0100
+++ new/silc-toolkit-1.1.10/silcdefs.h.in 2009-08-07 13:51:30.000000000 +0200
@@ -1,11 +1,17 @@
/* silcdefs.h.in. Generated from configure.ac by autoheader. */
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
/* Define to 1 if you have the header file. */
#undef HAVE_ARPA_INET_H
/* Define to 1 if you have the header file. */
#undef HAVE_ASSERT_H
+/* Define to 1 if you have the `backtrace' function. */
+#undef HAVE_BACKTRACE
+
/* Define to 1 if you have the `bind' function. */
#undef HAVE_BIND
@@ -162,6 +168,9 @@
/* Define to 1 if you have the `poll' function. */
#undef HAVE_POLL
+/* Define to 1 if you have the `posix_memalign' function. */
+#undef HAVE_POSIX_MEMALIGN
+
/* Define to 1 if you have the header file. */
#undef HAVE_PTHREAD_H
@@ -466,9 +475,17 @@
/* Version number of package */
#undef VERSION
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+# undef WORDS_BIGENDIAN
+# endif
+#endif
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org