diff --git a/.cvsignore b/.cvsignore index e69de29..9e9d9d5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +gloox-1.0-SVNr4003.tar.bz2 diff --git a/gloox-1.0-GCC4.4-missing_includes.patch b/gloox-1.0-GCC4.4-missing_includes.patch new file mode 100644 index 0000000..bd3edeb --- /dev/null +++ b/gloox-1.0-GCC4.4-missing_includes.patch @@ -0,0 +1,1150 @@ +diff -NaurEbBH gloox-1.0.orig/src/examples/adhoc_example.cpp gloox-1.0/src/examples/adhoc_example.cpp +--- gloox-1.0.orig/src/examples/adhoc_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/adhoc_example.cpp 2009-04-07 18:05:16.000000000 +0400 +@@ -12,6 +12,8 @@ + #include + #include + ++#include // [s]print[f] ++ + + class AdhocTest : public ConnectionListener, AdhocCommandProvider, LogHandler + { +diff -NaurEbBH gloox-1.0.orig/src/examples/annotations_example.cpp gloox-1.0/src/examples/annotations_example.cpp +--- gloox-1.0.orig/src/examples/annotations_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/annotations_example.cpp 2009-04-07 18:05:36.000000000 +0400 +@@ -9,6 +9,8 @@ + #include + #include + ++#include // [s]print[f] ++ + class AnnotationsTest : public AnnotationsHandler, ConnectionListener + { + public: +diff -NaurEbBH gloox-1.0.orig/src/examples/bookmarkstorage_example.cpp gloox-1.0/src/examples/bookmarkstorage_example.cpp +--- gloox-1.0.orig/src/examples/bookmarkstorage_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/bookmarkstorage_example.cpp 2009-04-07 18:05:55.000000000 +0400 +@@ -9,6 +9,8 @@ + #include + #include + ++#include // [s]print[f] ++ + class BookmarkStorageTest : public BookmarkHandler, ConnectionListener + { + public: +diff -NaurEbBH gloox-1.0.orig/src/examples/bosh_example.cpp gloox-1.0/src/examples/bosh_example.cpp +--- gloox-1.0.orig/src/examples/bosh_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/bosh_example.cpp 2009-04-07 18:06:09.000000000 +0400 +@@ -23,6 +23,8 @@ + #include + #include + ++#include // [s]print[f] ++ + #if defined( WIN32 ) || defined( _WIN32 ) + # include + #endif +diff -NaurEbBH gloox-1.0.orig/src/examples/component_example.cpp gloox-1.0/src/examples/component_example.cpp +--- gloox-1.0.orig/src/examples/component_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/component_example.cpp 2009-04-07 18:06:21.000000000 +0400 +@@ -9,6 +9,8 @@ + #include + #include + ++#include // [s]print[f] ++ + class ComponentTest : public DiscoHandler, ConnectionListener, LogHandler + { + public: +diff -NaurEbBH gloox-1.0.orig/src/examples/disco_example.cpp gloox-1.0/src/examples/disco_example.cpp +--- gloox-1.0.orig/src/examples/disco_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/disco_example.cpp 2009-04-07 18:06:36.000000000 +0400 +@@ -12,6 +12,8 @@ + #include + #include + ++#include // [s]print[f] ++ + class DiscoTest : public DiscoHandler, ConnectionListener, LogHandler + { + public: +diff -NaurEbBH gloox-1.0.orig/src/examples/e2ee_client.cpp gloox-1.0/src/examples/e2ee_client.cpp +--- gloox-1.0.orig/src/examples/e2ee_client.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/e2ee_client.cpp 2009-04-07 18:06:54.000000000 +0400 +@@ -16,6 +16,8 @@ + #include + #include + ++#include // [s]print[f] ++ + #ifdef WIN32 + #include + #endif +diff -NaurEbBH gloox-1.0.orig/src/examples/e2ee_server.cpp gloox-1.0/src/examples/e2ee_server.cpp +--- gloox-1.0.orig/src/examples/e2ee_server.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/e2ee_server.cpp 2009-04-07 18:07:05.000000000 +0400 +@@ -16,6 +16,8 @@ + #include + #include + ++#include // [s]print[f] ++ + #ifdef WIN32 + #include + #endif +diff -NaurEbBH gloox-1.0.orig/src/examples/flexoff_example.cpp gloox-1.0/src/examples/flexoff_example.cpp +--- gloox-1.0.orig/src/examples/flexoff_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/flexoff_example.cpp 2009-04-07 18:07:18.000000000 +0400 +@@ -15,6 +15,8 @@ + #include + #include + ++#include // [s]print[f] ++ + class FlexOffTest : public MessageHandler, ConnectionListener, FlexibleOfflineHandler, + LogHandler + { +diff -NaurEbBH gloox-1.0.orig/src/examples/ft_recv.cpp gloox-1.0/src/examples/ft_recv.cpp +--- gloox-1.0.orig/src/examples/ft_recv.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/ft_recv.cpp 2009-04-07 18:07:29.000000000 +0400 +@@ -14,6 +14,8 @@ + #include + #include + ++#include // [s]print[f] ++ + #if defined( WIN32 ) || defined( _WIN32 ) + # include + #endif +diff -NaurEbBH gloox-1.0.orig/src/examples/ft_send.cpp gloox-1.0/src/examples/ft_send.cpp +--- gloox-1.0.orig/src/examples/ft_send.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/ft_send.cpp 2009-04-07 18:07:46.000000000 +0400 +@@ -19,6 +19,8 @@ + #include + #include + ++#include // [s]print[f] ++ + #if defined( WIN32 ) || defined( _WIN32 ) + # include + #endif +diff -NaurEbBH gloox-1.0.orig/src/examples/message_example.cpp gloox-1.0/src/examples/message_example.cpp +--- gloox-1.0.orig/src/examples/message_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/message_example.cpp 2009-04-07 18:08:03.000000000 +0400 +@@ -24,6 +24,8 @@ + #include + #include + ++#include // [s]print[f] ++ + #if defined( WIN32 ) || defined( _WIN32 ) + # include + #endif +diff -NaurEbBH gloox-1.0.orig/src/examples/muc_example.cpp gloox-1.0/src/examples/muc_example.cpp +--- gloox-1.0.orig/src/examples/muc_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/muc_example.cpp 2009-04-07 18:08:16.000000000 +0400 +@@ -16,6 +16,8 @@ + #include + #include + ++#include // [s]print[f] ++ + #ifdef WIN32 + #include + #endif +diff -NaurEbBH gloox-1.0.orig/src/examples/prep_example.cpp gloox-1.0/src/examples/prep_example.cpp +--- gloox-1.0.orig/src/examples/prep_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/prep_example.cpp 2009-04-07 18:08:30.000000000 +0400 +@@ -4,6 +4,8 @@ + #include + #include + ++#include // [s]print[f] ++ + int main( int /*argc*/, char** /*argv*/ ) + { + std::string test = "OLD\\Administrator"; +diff -NaurEbBH gloox-1.0.orig/src/examples/privacylist_example.cpp gloox-1.0/src/examples/privacylist_example.cpp +--- gloox-1.0.orig/src/examples/privacylist_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/privacylist_example.cpp 2009-04-07 18:08:41.000000000 +0400 +@@ -9,6 +9,8 @@ + #include + #include + ++#include // [s]print[f] ++ + class PLTest : public PrivacyListHandler, ConnectionListener + { + public: +diff -NaurEbBH gloox-1.0.orig/src/examples/privatexml_example.cpp gloox-1.0/src/examples/privatexml_example.cpp +--- gloox-1.0.orig/src/examples/privatexml_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/privatexml_example.cpp 2009-04-07 18:08:56.000000000 +0400 +@@ -9,6 +9,8 @@ + #include + #include + ++#include // [s]print[f] ++ + class PrivateXMLTest : public PrivateXMLHandler, ConnectionListener + { + public: +diff -NaurEbBH gloox-1.0.orig/src/examples/register_example.cpp gloox-1.0/src/examples/register_example.cpp +--- gloox-1.0.orig/src/examples/register_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/register_example.cpp 2009-04-07 18:09:28.000000000 +0400 +@@ -9,6 +9,8 @@ + #include + #include + ++#include // [s]print[f] ++ + class RegTest : public RegistrationHandler, ConnectionListener, LogHandler + { + public: +diff -NaurEbBH gloox-1.0.orig/src/examples/reset_example.cpp gloox-1.0/src/examples/reset_example.cpp +--- gloox-1.0.orig/src/examples/reset_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/reset_example.cpp 2009-04-07 18:09:39.000000000 +0400 +@@ -10,6 +10,8 @@ + #include + #include + ++#include // [s]print[f] ++ + class RosterTest : public ConnectionListener, LogHandler + { + public: +diff -NaurEbBH gloox-1.0.orig/src/examples/roster_example.cpp gloox-1.0/src/examples/roster_example.cpp +--- gloox-1.0.orig/src/examples/roster_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/roster_example.cpp 2009-04-07 18:09:52.000000000 +0400 +@@ -14,6 +14,8 @@ + #include + #include + ++#include // [s]print[f] ++ + class RosterTest : public RosterListener, ConnectionListener, LogHandler, MessageHandler + { + public: +diff -NaurEbBH gloox-1.0.orig/src/examples/vcard_example.cpp gloox-1.0/src/examples/vcard_example.cpp +--- gloox-1.0.orig/src/examples/vcard_example.cpp 2009-04-05 12:55:50.000000000 +0400 ++++ gloox-1.0/src/examples/vcard_example.cpp 2009-04-07 18:10:04.000000000 +0400 +@@ -14,6 +14,8 @@ + #include + #include + ++#include // [s]print[f] ++ + class VCardTest : public ConnectionListener, LogHandler, VCardHandler + { + public: +diff -NaurEbBH gloox-1.0.orig/src/md5.cpp gloox-1.0/src/md5.cpp +--- gloox-1.0.orig/src/md5.cpp 2009-04-05 12:55:54.000000000 +0400 ++++ gloox-1.0/src/md5.cpp 2009-04-07 18:10:34.000000000 +0400 +@@ -74,6 +74,8 @@ + #include + #include + ++#include // [s]print[f] ++ + namespace gloox + { + // #undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */ +diff -NaurEbBH gloox-1.0.orig/src/tests/adhoc/adhoc_test.cpp gloox-1.0/src/tests/adhoc/adhoc_test.cpp +--- gloox-1.0.orig/src/tests/adhoc/adhoc_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/adhoc/adhoc_test.cpp 2009-04-07 18:14:26.000000000 +0400 +@@ -7,6 +7,7 @@ + + #include + #include ++#include // [s]print[f] + + gloox::JID g_jid( "foof" ); + +diff -NaurEbBH gloox-1.0.orig/src/tests/adhoccommand/adhoccommand_test.cpp gloox-1.0/src/tests/adhoccommand/adhoccommand_test.cpp +--- gloox-1.0.orig/src/tests/adhoccommand/adhoccommand_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/adhoccommand/adhoccommand_test.cpp 2009-04-07 18:14:42.000000000 +0400 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #define DISCO_TEST + #define DISCO_INFO_TEST +diff -NaurEbBH gloox-1.0.orig/src/tests/adhoccommandnote/adhoccommandnote_test.cpp gloox-1.0/src/tests/adhoccommandnote/adhoccommandnote_test.cpp +--- gloox-1.0.orig/src/tests/adhoccommandnote/adhoccommandnote_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/adhoccommandnote/adhoccommandnote_test.cpp 2009-04-07 18:15:09.000000000 +0400 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #define DISCO_TEST + #define DISCO_INFO_TEST +diff -NaurEbBH gloox-1.0.orig/src/tests/amp/amp_test.cpp gloox-1.0/src/tests/amp/amp_test.cpp +--- gloox-1.0.orig/src/tests/amp/amp_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/amp/amp_test.cpp 2009-04-07 18:15:36.000000000 +0400 +@@ -7,6 +7,8 @@ + #include + #include + #include ++#include // [s]print[f] ++ + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/amprule/amprule_test.cpp gloox-1.0/src/tests/amprule/amprule_test.cpp +--- gloox-1.0.orig/src/tests/amprule/amprule_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/amprule/amprule_test.cpp 2009-04-07 18:15:47.000000000 +0400 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/base64/base64_test.cpp gloox-1.0/src/tests/base64/base64_test.cpp +--- gloox-1.0.orig/src/tests/base64/base64_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/base64/base64_test.cpp 2009-04-07 18:15:57.000000000 +0400 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/chatstatefilter/chatstatefilter_test.cpp gloox-1.0/src/tests/chatstatefilter/chatstatefilter_test.cpp +--- gloox-1.0.orig/src/tests/chatstatefilter/chatstatefilter_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/chatstatefilter/chatstatefilter_test.cpp 2009-04-07 18:16:08.000000000 +0400 +@@ -8,6 +8,7 @@ + + #include + #include ++#include // [s]print[f] + + namespace gloox + { +diff -NaurEbBH gloox-1.0.orig/src/tests/client/client_test.cpp gloox-1.0/src/tests/client/client_test.cpp +--- gloox-1.0.orig/src/tests/client/client_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/client/client_test.cpp 2009-04-07 18:16:30.000000000 +0400 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include // [s]print[f] + + class ClientTest : public Client, /*LogHandler,*/ ConnectionListener + { +diff -NaurEbBH gloox-1.0.orig/src/tests/clientbase/clientbase_test.cpp gloox-1.0/src/tests/clientbase/clientbase_test.cpp +--- gloox-1.0.orig/src/tests/clientbase/clientbase_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/clientbase/clientbase_test.cpp 2009-04-07 18:16:38.000000000 +0400 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include // [s]print[f] + + class ClientBaseTest : public ClientBase, /*LogHandler,*/ ConnectionListener + { +diff -NaurEbBH gloox-1.0.orig/src/tests/connectionbosh/connectionbosh_test.cpp gloox-1.0/src/tests/connectionbosh/connectionbosh_test.cpp +--- gloox-1.0.orig/src/tests/connectionbosh/connectionbosh_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/connectionbosh/connectionbosh_test.cpp 2009-04-07 18:16:47.000000000 +0400 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int g_test = 0; + +diff -NaurEbBH gloox-1.0.orig/src/tests/dataform/dataform_test.cpp gloox-1.0/src/tests/dataform/dataform_test.cpp +--- gloox-1.0.orig/src/tests/dataform/dataform_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/dataform/dataform_test.cpp 2009-04-07 18:16:56.000000000 +0400 +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/dataformfield/dataformfield_test.cpp gloox-1.0/src/tests/dataformfield/dataformfield_test.cpp +--- gloox-1.0.orig/src/tests/dataformfield/dataformfield_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/dataformfield/dataformfield_test.cpp 2009-04-07 18:17:05.000000000 +0400 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/dataformitem/dataformitem_test.cpp gloox-1.0/src/tests/dataformitem/dataformitem_test.cpp +--- gloox-1.0.orig/src/tests/dataformitem/dataformitem_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/dataformitem/dataformitem_test.cpp 2009-04-07 18:17:13.000000000 +0400 +@@ -6,6 +6,7 @@ + + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/dataformreported/dataformreported_test.cpp gloox-1.0/src/tests/dataformreported/dataformreported_test.cpp +--- gloox-1.0.orig/src/tests/dataformreported/dataformreported_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/dataformreported/dataformreported_test.cpp 2009-04-07 18:17:22.000000000 +0400 +@@ -6,6 +6,7 @@ + + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/delayeddelivery/delayeddelivery_test.cpp gloox-1.0/src/tests/delayeddelivery/delayeddelivery_test.cpp +--- gloox-1.0.orig/src/tests/delayeddelivery/delayeddelivery_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/delayeddelivery/delayeddelivery_test.cpp 2009-04-07 18:17:31.000000000 +0400 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/disco/disco_test.cpp gloox-1.0/src/tests/disco/disco_test.cpp +--- gloox-1.0.orig/src/tests/disco/disco_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/disco/disco_test.cpp 2009-04-07 18:17:39.000000000 +0400 +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include // [s]print[f] + + namespace gloox + { +diff -NaurEbBH gloox-1.0.orig/src/tests/discoinfo/discoinfo_test.cpp gloox-1.0/src/tests/discoinfo/discoinfo_test.cpp +--- gloox-1.0.orig/src/tests/discoinfo/discoinfo_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/discoinfo/discoinfo_test.cpp 2009-04-07 18:17:49.000000000 +0400 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #define DISCO_TEST + #define DISCO_INFO_TEST +diff -NaurEbBH gloox-1.0.orig/src/tests/discoitems/discoitems_test.cpp gloox-1.0/src/tests/discoitems/discoitems_test.cpp +--- gloox-1.0.orig/src/tests/discoitems/discoitems_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/discoitems/discoitems_test.cpp 2009-04-07 18:17:58.000000000 +0400 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #define DISCO_TEST + #define DISCO_ITEMS_TEST +diff -NaurEbBH gloox-1.0.orig/src/tests/error/error_test.cpp gloox-1.0/src/tests/error/error_test.cpp +--- gloox-1.0.orig/src/tests/error/error_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/error/error_test.cpp 2009-04-07 18:18:06.000000000 +0400 +@@ -6,7 +6,7 @@ + #include + #include + #include +- ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/featureneg/featureneg_test.cpp gloox-1.0/src/tests/featureneg/featureneg_test.cpp +--- gloox-1.0.orig/src/tests/featureneg/featureneg_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/featureneg/featureneg_test.cpp 2009-04-07 18:18:15.000000000 +0400 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/flexoffline/flexoffline_test.cpp gloox-1.0/src/tests/flexoffline/flexoffline_test.cpp +--- gloox-1.0.orig/src/tests/flexoffline/flexoffline_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/flexoffline/flexoffline_test.cpp 2009-04-07 18:18:27.000000000 +0400 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include // [s]print[f] + + const std::string& g_dir = "test.dir"; + const std::string& g_inst = "the instructions"; +diff -NaurEbBH gloox-1.0.orig/src/tests/flexofflineoffline/flexofflineoffline_test.cpp gloox-1.0/src/tests/flexofflineoffline/flexofflineoffline_test.cpp +--- gloox-1.0.orig/src/tests/flexofflineoffline/flexofflineoffline_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/flexofflineoffline/flexofflineoffline_test.cpp 2009-04-07 18:18:37.000000000 +0400 +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include // [s]print[f] + + gloox::JID g_jid( "foof" ); + +diff -NaurEbBH gloox-1.0.orig/src/tests/gpgencrypted/gpgencrypted_test.cpp gloox-1.0/src/tests/gpgencrypted/gpgencrypted_test.cpp +--- gloox-1.0.orig/src/tests/gpgencrypted/gpgencrypted_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/gpgencrypted/gpgencrypted_test.cpp 2009-04-07 18:18:47.000000000 +0400 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/gpgsigned/gpgsigned_test.cpp gloox-1.0/src/tests/gpgsigned/gpgsigned_test.cpp +--- gloox-1.0.orig/src/tests/gpgsigned/gpgsigned_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/gpgsigned/gpgsigned_test.cpp 2009-04-07 18:18:57.000000000 +0400 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/inbandbytestream/inbandbytestream_test.cpp gloox-1.0/src/tests/inbandbytestream/inbandbytestream_test.cpp +--- gloox-1.0.orig/src/tests/inbandbytestream/inbandbytestream_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/inbandbytestream/inbandbytestream_test.cpp 2009-04-07 18:19:09.000000000 +0400 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include // [s]print[f] + + gloox::JID g_jid( "foof" ); + +diff -NaurEbBH gloox-1.0.orig/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp gloox-1.0/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp +--- gloox-1.0.orig/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/inbandbytestreamibb/inbandbytestreamibb_test.cpp 2009-04-07 18:19:19.000000000 +0400 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include // [s]print[f] + + gloox::JID g_jid( "foof" ); + +diff -NaurEbBH gloox-1.0.orig/src/tests/iq/iq_test.cpp gloox-1.0/src/tests/iq/iq_test.cpp +--- gloox-1.0.orig/src/tests/iq/iq_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/iq/iq_test.cpp 2009-04-07 18:19:28.000000000 +0400 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/jid/jid_perf.cpp gloox-1.0/src/tests/jid/jid_perf.cpp +--- gloox-1.0.orig/src/tests/jid/jid_perf.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/jid/jid_perf.cpp 2009-04-07 18:19:40.000000000 +0400 +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #include + +diff -NaurEbBH gloox-1.0.orig/src/tests/jid/jid_test.cpp gloox-1.0/src/tests/jid/jid_test.cpp +--- gloox-1.0.orig/src/tests/jid/jid_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/jid/jid_test.cpp 2009-04-07 18:19:51.000000000 +0400 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/jingleiceudp/jingleiceudp_test.cpp gloox-1.0/src/tests/jingleiceudp/jingleiceudp_test.cpp +--- gloox-1.0.orig/src/tests/jingleiceudp/jingleiceudp_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/jingleiceudp/jingleiceudp_test.cpp 2009-04-07 18:20:01.000000000 +0400 +@@ -8,7 +8,7 @@ + #include + #include + #include +- ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/jinglerawudp/jinglerawudp_test.cpp gloox-1.0/src/tests/jinglerawudp/jinglerawudp_test.cpp +--- gloox-1.0.orig/src/tests/jinglerawudp/jinglerawudp_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/jinglerawudp/jinglerawudp_test.cpp 2009-04-07 18:20:10.000000000 +0400 +@@ -8,7 +8,7 @@ + #include + #include + #include +- ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/jinglertp/jinglertp_test.cpp gloox-1.0/src/tests/jinglertp/jinglertp_test.cpp +--- gloox-1.0.orig/src/tests/jinglertp/jinglertp_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/jinglertp/jinglertp_test.cpp 2009-04-07 18:20:33.000000000 +0400 +@@ -8,7 +8,7 @@ + #include + #include + #include +- ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/jinglesession/jinglesession_test.cpp gloox-1.0/src/tests/jinglesession/jinglesession_test.cpp +--- gloox-1.0.orig/src/tests/jinglesession/jinglesession_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/jinglesession/jinglesession_test.cpp 2009-04-07 18:20:47.000000000 +0400 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include // [s]print[f] + + gloox::JID g_jid( "foof" ); + +diff -NaurEbBH gloox-1.0.orig/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp gloox-1.0/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp +--- gloox-1.0.orig/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/jinglesessionjingle/jinglesessionjingle_test.cpp 2009-04-07 18:20:55.000000000 +0400 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include // [s]print[f] + + namespace gloox + { +diff -NaurEbBH gloox-1.0.orig/src/tests/lastactivity/lastactivity_test.cpp gloox-1.0/src/tests/lastactivity/lastactivity_test.cpp +--- gloox-1.0.orig/src/tests/lastactivity/lastactivity_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/lastactivity/lastactivity_test.cpp 2009-04-07 18:21:04.000000000 +0400 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include // [s]print[f] + + const std::string& g_dir = "test.dir"; + const std::string& g_inst = "the instructions"; +diff -NaurEbBH gloox-1.0.orig/src/tests/lastactivityquery/lastactivityquery_test.cpp gloox-1.0/src/tests/lastactivityquery/lastactivityquery_test.cpp +--- gloox-1.0.orig/src/tests/lastactivityquery/lastactivityquery_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/lastactivityquery/lastactivityquery_test.cpp 2009-04-07 18:21:13.000000000 +0400 +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include // [s]print[f] + + gloox::JID g_jid( "foof" ); + +diff -NaurEbBH gloox-1.0.orig/src/tests/md5/md5_test.cpp gloox-1.0/src/tests/md5/md5_test.cpp +--- gloox-1.0.orig/src/tests/md5/md5_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/md5/md5_test.cpp 2009-04-07 18:21:27.000000000 +0400 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/message/message_test.cpp gloox-1.0/src/tests/message/message_test.cpp +--- gloox-1.0.orig/src/tests/message/message_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/message/message_test.cpp 2009-04-07 18:21:36.000000000 +0400 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/messageeventfilter/messageeventfilter_test.cpp gloox-1.0/src/tests/messageeventfilter/messageeventfilter_test.cpp +--- gloox-1.0.orig/src/tests/messageeventfilter/messageeventfilter_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/messageeventfilter/messageeventfilter_test.cpp 2009-04-07 18:21:50.000000000 +0400 +@@ -9,6 +9,7 @@ + + #include + #include ++#include // [s]print[f] + + namespace gloox + { +diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommuc/mucroommuc_test.cpp gloox-1.0/src/tests/mucroommuc/mucroommuc_test.cpp +--- gloox-1.0.orig/src/tests/mucroommuc/mucroommuc_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/mucroommuc/mucroommuc_test.cpp 2009-04-07 18:22:06.000000000 +0400 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #define MUCROOM_TEST + #include "../../mucroom.cpp" +diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommucadmin/mucroommucadmin_test.cpp gloox-1.0/src/tests/mucroommucadmin/mucroommucadmin_test.cpp +--- gloox-1.0.orig/src/tests/mucroommucadmin/mucroommucadmin_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/mucroommucadmin/mucroommucadmin_test.cpp 2009-04-07 18:22:14.000000000 +0400 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #define MUCROOM_TEST + #include "../../mucroom.cpp" +diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommucowner/mucroommucowner_test.cpp gloox-1.0/src/tests/mucroommucowner/mucroommucowner_test.cpp +--- gloox-1.0.orig/src/tests/mucroommucowner/mucroommucowner_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/mucroommucowner/mucroommucowner_test.cpp 2009-04-07 18:22:24.000000000 +0400 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #define MUCROOM_TEST + #include "../../mucroom.cpp" +diff -NaurEbBH gloox-1.0.orig/src/tests/mucroommucuser/mucroommucuser_test.cpp gloox-1.0/src/tests/mucroommucuser/mucroommucuser_test.cpp +--- gloox-1.0.orig/src/tests/mucroommucuser/mucroommucuser_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/mucroommucuser/mucroommucuser_test.cpp 2009-04-07 18:22:32.000000000 +0400 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #define MUCROOM_TEST + #include "../../mucroom.cpp" +diff -NaurEbBH gloox-1.0.orig/src/tests/nickname/nickname_test.cpp gloox-1.0/src/tests/nickname/nickname_test.cpp +--- gloox-1.0.orig/src/tests/nickname/nickname_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/nickname/nickname_test.cpp 2009-04-07 18:22:40.000000000 +0400 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/nonsaslauth/nonsaslauth_test.cpp gloox-1.0/src/tests/nonsaslauth/nonsaslauth_test.cpp +--- gloox-1.0.orig/src/tests/nonsaslauth/nonsaslauth_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/nonsaslauth/nonsaslauth_test.cpp 2009-04-07 18:22:50.000000000 +0400 +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include // [s]print[f] + + gloox::JID g_jid( "foof" ); + +diff -NaurEbBH gloox-1.0.orig/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp gloox-1.0/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp +--- gloox-1.0.orig/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/nonsaslauthquery/nonsaslauthquery_test.cpp 2009-04-07 18:23:13.000000000 +0400 +@@ -7,10 +7,11 @@ + #include + #include + #include ++#include // [s]print[f] + +- gloox::JID g_jid( "foof" ); ++gloox::JID g_jid( "foof" ); + +- namespace gloox ++namespace gloox + { + class Disco; + +diff -NaurEbBH gloox-1.0.orig/src/tests/oob/oob_test.cpp gloox-1.0/src/tests/oob/oob_test.cpp +--- gloox-1.0.orig/src/tests/oob/oob_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/oob/oob_test.cpp 2009-04-07 18:23:23.000000000 +0400 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/parser/parser_test.cpp gloox-1.0/src/tests/parser/parser_test.cpp +--- gloox-1.0.orig/src/tests/parser/parser_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/parser/parser_test.cpp 2009-04-07 18:23:32.000000000 +0400 +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include // [s]print[f] + + class ParserTest : private TagHandler + { +diff -NaurEbBH gloox-1.0.orig/src/tests/prep/prep_test.cpp gloox-1.0/src/tests/prep/prep_test.cpp +--- gloox-1.0.orig/src/tests/prep/prep_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/prep/prep_test.cpp 2009-04-07 18:23:41.000000000 +0400 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/presence/presence_test.cpp gloox-1.0/src/tests/presence/presence_test.cpp +--- gloox-1.0.orig/src/tests/presence/presence_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/presence/presence_test.cpp 2009-04-07 18:23:49.000000000 +0400 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/privacymanager/privacymanager_test.cpp gloox-1.0/src/tests/privacymanager/privacymanager_test.cpp +--- gloox-1.0.orig/src/tests/privacymanager/privacymanager_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/privacymanager/privacymanager_test.cpp 2009-04-07 18:23:58.000000000 +0400 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include // [s]print[f] + + const std::string& g_dir = "test.dir"; + const std::string& g_inst = "the instructions"; +diff -NaurEbBH gloox-1.0.orig/src/tests/privacymanagerquery/privacymanagerquery_test.cpp gloox-1.0/src/tests/privacymanagerquery/privacymanagerquery_test.cpp +--- gloox-1.0.orig/src/tests/privacymanagerquery/privacymanagerquery_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/privacymanagerquery/privacymanagerquery_test.cpp 2009-04-07 18:24:07.000000000 +0400 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include // [s]print[f] + + gloox::JID g_jid( "foof" ); + +diff -NaurEbBH gloox-1.0.orig/src/tests/privatexml/privatexml_test.cpp gloox-1.0/src/tests/privatexml/privatexml_test.cpp +--- gloox-1.0.orig/src/tests/privatexml/privatexml_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/privatexml/privatexml_test.cpp 2009-04-07 18:24:19.000000000 +0400 +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include // [s]print[f] + + Tag* t1 = 0; + Tag* t2 = 0; +diff -NaurEbBH gloox-1.0.orig/src/tests/pubsubevent/pubsubevent_test.cpp gloox-1.0/src/tests/pubsubevent/pubsubevent_test.cpp +--- gloox-1.0.orig/src/tests/pubsubevent/pubsubevent_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/pubsubevent/pubsubevent_test.cpp 2009-04-07 18:24:33.000000000 +0400 +@@ -1,6 +1,8 @@ + #include "../../pubsubevent.h" + #include "../../tag.h" + ++#include // [s]print[f] ++ + static int failed = 0; + + using namespace gloox; +diff -NaurEbBH gloox-1.0.orig/src/tests/pubsubmanager/pubsubmanager_test.cpp gloox-1.0/src/tests/pubsubmanager/pubsubmanager_test.cpp +--- gloox-1.0.orig/src/tests/pubsubmanager/pubsubmanager_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/pubsubmanager/pubsubmanager_test.cpp 2009-04-07 18:24:49.000000000 +0400 +@@ -1,6 +1,8 @@ + #include "../../pubsubmanager.h" + #include "../../pubsubresulthandler.h" + ++#include // [s]print[f] ++ + using namespace gloox; + + class RH : public PubSub::ResultHandler +diff -NaurEbBH gloox-1.0.orig/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp gloox-1.0/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp +--- gloox-1.0.orig/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/pubsubmanagerpubsub/pubsubmanagerpubsub_test.cpp 2009-04-07 15:47:48.000000000 +0400 +@@ -7,7 +7,7 @@ + using namespace gloox; + + #include +- ++#include // [s]print[f] + + static const JID jid( "aaa@bbb.ccc" ); + static const std::string node( "node" ); +diff -NaurEbBH gloox-1.0.orig/src/tests/receipt/receipt_test.cpp gloox-1.0/src/tests/receipt/receipt_test.cpp +--- gloox-1.0.orig/src/tests/receipt/receipt_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/receipt/receipt_test.cpp 2009-04-07 18:25:11.000000000 +0400 +@@ -6,7 +6,7 @@ + #include + #include + #include +- ++#include // [s]print[f] + + + int main( int /*argc*/, char** /*argv*/ ) +diff -NaurEbBH gloox-1.0.orig/src/tests/registration/registration_test.cpp gloox-1.0/src/tests/registration/registration_test.cpp +--- gloox-1.0.orig/src/tests/registration/registration_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/registration/registration_test.cpp 2009-04-07 18:25:26.000000000 +0400 +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include // [s]print[f] + + const std::string& g_server = "test.server"; + const std::string& g_inst = "the instructions"; +diff -NaurEbBH gloox-1.0.orig/src/tests/registrationquery/registrationquery_test.cpp gloox-1.0/src/tests/registrationquery/registrationquery_test.cpp +--- gloox-1.0.orig/src/tests/registrationquery/registrationquery_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/registrationquery/registrationquery_test.cpp 2009-04-07 18:25:36.000000000 +0400 +@@ -12,7 +12,7 @@ + #include + #include + #include +- ++#include // [s]print[f] + + namespace gloox + { +diff -NaurEbBH gloox-1.0.orig/src/tests/rostermanager/rostermanager_test.cpp gloox-1.0/src/tests/rostermanager/rostermanager_test.cpp +--- gloox-1.0.orig/src/tests/rostermanager/rostermanager_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/rostermanager/rostermanager_test.cpp 2009-04-07 18:25:45.000000000 +0400 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include // [s]print[f] + + gloox::JID g_jid( "foof" ); + +diff -NaurEbBH gloox-1.0.orig/src/tests/rostermanagerquery/rostermanagerquery_test.cpp gloox-1.0/src/tests/rostermanagerquery/rostermanagerquery_test.cpp +--- gloox-1.0.orig/src/tests/rostermanagerquery/rostermanagerquery_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/rostermanagerquery/rostermanagerquery_test.cpp 2009-04-07 18:25:54.000000000 +0400 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #define ROSTERMANAGER_TEST + #include "../../rostermanager.h" +diff -NaurEbBH gloox-1.0.orig/src/tests/search/search_test.cpp gloox-1.0/src/tests/search/search_test.cpp +--- gloox-1.0.orig/src/tests/search/search_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/search/search_test.cpp 2009-04-07 18:26:02.000000000 +0400 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include // [s]print[f] + + const std::string& g_dir = "test.dir"; + const std::string& g_inst = "the instructions"; +diff -NaurEbBH gloox-1.0.orig/src/tests/searchquery/searchquery_test.cpp gloox-1.0/src/tests/searchquery/searchquery_test.cpp +--- gloox-1.0.orig/src/tests/searchquery/searchquery_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/searchquery/searchquery_test.cpp 2009-04-07 18:26:10.000000000 +0400 +@@ -12,7 +12,7 @@ + #include + #include + #include +- ++#include // [s]print[f] + + namespace gloox + { +diff -NaurEbBH gloox-1.0.orig/src/tests/sha/sha_test.cpp gloox-1.0/src/tests/sha/sha_test.cpp +--- gloox-1.0.orig/src/tests/sha/sha_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/sha/sha_test.cpp 2009-04-07 18:26:18.000000000 +0400 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/shim/shim_test.cpp gloox-1.0/src/tests/shim/shim_test.cpp +--- gloox-1.0.orig/src/tests/shim/shim_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/shim/shim_test.cpp 2009-04-07 18:26:27.000000000 +0400 +@@ -6,7 +6,7 @@ + #include + #include + #include +- ++#include // [s]print[f] + + + int main( int /*argc*/, char** /*argv*/ ) +diff -NaurEbBH gloox-1.0.orig/src/tests/simanager/simanager_test.cpp gloox-1.0/src/tests/simanager/simanager_test.cpp +--- gloox-1.0.orig/src/tests/simanager/simanager_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/simanager/simanager_test.cpp 2009-04-07 18:26:36.000000000 +0400 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include // [s]print[f] + + const std::string& g_dir = "test.dir"; + const std::string& g_inst = "the instructions"; +diff -NaurEbBH gloox-1.0.orig/src/tests/simanagersi/simanagersi_test.cpp gloox-1.0/src/tests/simanagersi/simanagersi_test.cpp +--- gloox-1.0.orig/src/tests/simanagersi/simanagersi_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/simanagersi/simanagersi_test.cpp 2009-04-07 18:26:45.000000000 +0400 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include // [s]print[f] + + gloox::JID g_jid( "foof" ); + +diff -NaurEbBH gloox-1.0.orig/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp gloox-1.0/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp +--- gloox-1.0.orig/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/stanzaextensionfactory/stanzaextensionfactory_test.cpp 2009-04-07 18:26:53.000000000 +0400 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include // [s]print[f] + + class SETest : public StanzaExtension + { +diff -NaurEbBH gloox-1.0.orig/src/tests/subscription/subscription_test.cpp gloox-1.0/src/tests/subscription/subscription_test.cpp +--- gloox-1.0.orig/src/tests/subscription/subscription_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/subscription/subscription_test.cpp 2009-04-07 18:27:07.000000000 +0400 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/tag/tag_perf.cpp gloox-1.0/src/tests/tag/tag_perf.cpp +--- gloox-1.0.orig/src/tests/tag/tag_perf.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/tag/tag_perf.cpp 2009-04-07 18:27:24.000000000 +0400 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #include + +diff -NaurEbBH gloox-1.0.orig/src/tests/tag/tag_test.cpp gloox-1.0/src/tests/tag/tag_test.cpp +--- gloox-1.0.orig/src/tests/tag/tag_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/tag/tag_test.cpp 2009-04-07 18:27:41.000000000 +0400 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/tlsgnutls/tlsgnutls_test.cpp gloox-1.0/src/tests/tlsgnutls/tlsgnutls_test.cpp +--- gloox-1.0.orig/src/tests/tlsgnutls/tlsgnutls_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/tlsgnutls/tlsgnutls_test.cpp 2009-04-07 18:27:49.000000000 +0400 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #ifdef WIN32 + # include "../../config.h.win" +diff -NaurEbBH gloox-1.0.orig/src/tests/tlsopenssl/tlsopenssl_test.cpp gloox-1.0/src/tests/tlsopenssl/tlsopenssl_test.cpp +--- gloox-1.0.orig/src/tests/tlsopenssl/tlsopenssl_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/tlsopenssl/tlsopenssl_test.cpp 2009-04-07 18:27:57.000000000 +0400 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #ifdef WIN32 + # include "../../config.h.win" +diff -NaurEbBH gloox-1.0.orig/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp gloox-1.0/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp +--- gloox-1.0.orig/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/uniquemucroomunique/uniquemucroomunique_test.cpp 2009-04-07 18:28:05.000000000 +0400 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #define UNIQUEMUCROOM_TEST + #include "../../uniquemucroom.cpp" +diff -NaurEbBH gloox-1.0.orig/src/tests/util/util_test.cpp gloox-1.0/src/tests/util/util_test.cpp +--- gloox-1.0.orig/src/tests/util/util_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/util/util_test.cpp 2009-04-07 18:28:17.000000000 +0400 +@@ -1,6 +1,7 @@ + #include "../../util.h" + + #include ++#include // [s]print[f] + + using namespace gloox; + +diff -NaurEbBH gloox-1.0.orig/src/tests/vcard/vcard_test.cpp gloox-1.0/src/tests/vcard/vcard_test.cpp +--- gloox-1.0.orig/src/tests/vcard/vcard_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/vcard/vcard_test.cpp 2009-04-07 18:28:27.000000000 +0400 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/vcardupdate/vcardupdate_test.cpp gloox-1.0/src/tests/vcardupdate/vcardupdate_test.cpp +--- gloox-1.0.orig/src/tests/vcardupdate/vcardupdate_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/vcardupdate/vcardupdate_test.cpp 2009-04-07 18:28:36.000000000 +0400 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int main( int /*argc*/, char** /*argv*/ ) + { +diff -NaurEbBH gloox-1.0.orig/src/tests/xpath/xpath_test.cpp gloox-1.0/src/tests/xpath/xpath_test.cpp +--- gloox-1.0.orig/src/tests/xpath/xpath_test.cpp 2009-04-05 12:55:52.000000000 +0400 ++++ gloox-1.0/src/tests/xpath/xpath_test.cpp 2009-04-07 18:28:45.000000000 +0400 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include // [s]print[f] + + int fail = 0; + +diff -NaurEbBH gloox-1.0.orig/src/tests/zlib/zlib_perf.cpp gloox-1.0/src/tests/zlib/zlib_perf.cpp +--- gloox-1.0.orig/src/tests/zlib/zlib_perf.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/zlib/zlib_perf.cpp 2009-04-07 18:29:28.000000000 +0400 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #ifdef HAVE_ZLIB + +diff -NaurEbBH gloox-1.0.orig/src/tests/zlib/zlib_test.cpp gloox-1.0/src/tests/zlib/zlib_test.cpp +--- gloox-1.0.orig/src/tests/zlib/zlib_test.cpp 2009-04-05 12:55:51.000000000 +0400 ++++ gloox-1.0/src/tests/zlib/zlib_test.cpp 2009-04-07 18:29:40.000000000 +0400 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include // [s]print[f] + + #ifdef HAVE_ZLIB + diff --git a/gloox-1.0-SVNr4003.glibc-private-symbol.patch b/gloox-1.0-SVNr4003.glibc-private-symbol.patch new file mode 100644 index 0000000..9f66251 --- /dev/null +++ b/gloox-1.0-SVNr4003.glibc-private-symbol.patch @@ -0,0 +1,174 @@ +diff -NaurEbBH gloox-1.0.orig/src/dns.cpp gloox-1.0/src/dns.cpp +--- gloox-1.0.orig/src/dns.cpp 2009-04-05 12:55:54.000000000 +0400 ++++ gloox-1.0/src/dns.cpp 2009-04-07 13:08:48.000000000 +0400 +@@ -40,6 +40,8 @@ + # include + #endif + ++#include ++ + #ifdef _WIN32 + # include + #elif defined( _WIN32_WCE ) +@@ -77,8 +79,151 @@ + + namespace gloox + { +- + #if defined( HAVE_RES_QUERYDOMAIN ) && defined( HAVE_DN_SKIPNAME ) && defined( HAVE_RES_QUERY ) ++ ++#define EMSGSIZE 40 ++#define __set_errno(e) (errno = (e)) ++/* ++ THIS IS TEMPORRARY UGLY HACK! ++ ++Function ns_name_ntop marked as PRIVATE in recent versions of glibc ++ (See Changelog.13 2002-02-01 Jakub Jelinek in it). ++ ++So, untill author do not fix gloox implementation I just copy this function (and reffered specail and printable plus digits variable) ++ from glibc 2.8-8 (resolv/ns_name.c) source and add prefix in name _TMP_ ++*/ ++ ++static const char digits[] = "0123456789"; ++ ++/* ++ * special(ch) ++ * Thinking in noninternationalized USASCII (per the DNS spec), ++ * is this characted special ("in need of quoting") ? ++ * return: ++ * boolean. ++ */ ++static int ++special(int ch) { ++ switch (ch) { ++ case 0x22: /* '"' */ ++ case 0x2E: /* '.' */ ++ case 0x3B: /* ';' */ ++ case 0x5C: /* '\\' */ ++ /* Special modifiers in zone files. */ ++ case 0x40: /* '@' */ ++ case 0x24: /* '$' */ ++ return (1); ++ default: ++ return (0); ++ } ++} ++ ++/* ++ * printable(ch) ++ * Thinking in noninternationalized USASCII (per the DNS spec), ++ * is this character visible and not a space when printed ? ++ * return: ++ * boolean. ++ */ ++static int ++printable(int ch) { ++ return (ch > 0x20 && ch < 0x7f); ++} ++ ++int ++_TMP_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { ++ const u_char *cp; ++ char *dn, *eom; ++ u_char c; ++ u_int n; ++ ++ cp = src; ++ dn = dst; ++ eom = dst + dstsiz; ++ ++ while ((n = *cp++) != 0) { ++ if ((n & NS_CMPRSFLGS) != 0 && n != 0x41) { ++ /* Some kind of compression pointer. */ ++ __set_errno (EMSGSIZE); ++ return (-1); ++ } ++ if (dn != dst) { ++ if (dn >= eom) { ++ __set_errno (EMSGSIZE); ++ return (-1); ++ } ++ *dn++ = '.'; ++ } ++ ++ if (n == 0x41) { ++ n = *cp++ / 8; ++ if (dn + n * 2 + 4 >= eom) { ++ __set_errno (EMSGSIZE); ++ return (-1); ++ } ++ *dn++ = '\\'; ++ *dn++ = '['; ++ *dn++ = 'x'; ++ ++ while (n-- > 0) { ++ c = *cp++; ++ unsigned u = c >> 4; ++ *dn++ = u > 9 ? 'a' + u - 10 : '0' + u; ++ u = c & 0xf; ++ *dn++ = u > 9 ? 'a' + u - 10 : '0' + u; ++ } ++ ++ *dn++ = ']'; ++ continue; ++ } ++ ++ if (dn + n >= eom) { ++ __set_errno (EMSGSIZE); ++ return (-1); ++ } ++ for ((void)NULL; n > 0; n--) { ++ c = *cp++; ++ if (special(c)) { ++ if (dn + 1 >= eom) { ++ __set_errno (EMSGSIZE); ++ return (-1); ++ } ++ *dn++ = '\\'; ++ *dn++ = (char)c; ++ } else if (!printable(c)) { ++ if (dn + 3 >= eom) { ++ __set_errno (EMSGSIZE); ++ return (-1); ++ } ++ *dn++ = '\\'; ++ *dn++ = digits[c / 100]; ++ *dn++ = digits[(c % 100) / 10]; ++ *dn++ = digits[c % 10]; ++ } else { ++ if (dn >= eom) { ++ __set_errno (EMSGSIZE); ++ return (-1); ++ } ++ *dn++ = (char)c; ++ } ++ } ++ } ++ if (dn == dst) { ++ if (dn >= eom) { ++ __set_errno (EMSGSIZE); ++ return (-1); ++ } ++ *dn++ = '.'; ++ } ++ if (dn >= eom) { ++ __set_errno (EMSGSIZE); ++ return (-1); ++ } ++ *dn++ = '\0'; ++ return (dn - dst); ++} ++ ++ + DNS::HostMap DNS::resolve( const std::string& service, const std::string& proto, + const std::string& domain, const LogSink& logInstance ) + { +@@ -141,7 +286,7 @@ + { + name srvname; + +- if( ns_name_ntop( srv[cnt] + SRV_SERVER, (char*)srvname, NS_MAXDNAME ) < 0 ) ++ if( _TMP_ns_name_ntop( srv[cnt] + SRV_SERVER, (char*)srvname, NS_MAXDNAME ) < 0 ) + { + //FIXME do we need to handle this? How? Can it actually happen at all? + // printf( "handle this error!\n" ); diff --git a/gloox-1.0-beta-SVNr4003-missed_header.patch b/gloox-1.0-beta-SVNr4003-missed_header.patch new file mode 100644 index 0000000..580fbe7 --- /dev/null +++ b/gloox-1.0-beta-SVNr4003-missed_header.patch @@ -0,0 +1,19 @@ +diff -NaurEbBH gloox-1.0.orig/src/Makefile.am gloox-1.0/src/Makefile.am +--- gloox-1.0.orig/src/Makefile.am 2009-04-05 12:55:54.000000000 +0400 ++++ gloox-1.0/src/Makefile.am 2009-04-05 16:34:41.000000000 +0400 +@@ -238,6 +238,7 @@ + registrationhandler.h \ + resource.h \ + rosteritem.h \ ++ rosteritemdata.h \ + rosterlistener.h \ + rostermanager.h \ + search.h \ +@@ -277,7 +278,6 @@ + nonsaslauth.h \ + mucmessagesession.h \ + prep.h \ +- rosteritemdata.h \ + stanzaextensionfactory.h \ + tlsgnutlsbase.h \ + tlsgnutlsclient.h \ diff --git a/gloox.spec b/gloox.spec new file mode 100644 index 0000000..829e9ea --- /dev/null +++ b/gloox.spec @@ -0,0 +1,137 @@ +#% define beta 7 +%define SVN 4003 + +Name: gloox +Version: 1.0 +Release: 0.5.%{?beta:beta%{beta}}%{?SVN:SVNr%{SVN}}%{?dist} +Summary: A rock-solid, full-featured Jabber/XMPP client library +Group: System Environment/Libraries +License: GPLv2 +URL: http://camaya.net/gloox +#Source0: http://camaya.net/download/%{name}-%{version}%{?beta:-beta%{beta}}.tar.bz2 + +# svn co -r4003 svn://svn.camaya.net/gloox/trunk gloox-1.0 && \ +# pushd gloox-1.0 && DATE=$( svn info -r4003 | sed -nr '/Last Changed Date/ s/.+: (.+?) \(.+/\1/p' ) && \ +# find -exec touch -c -d"$DATE" {} \; && popd && tar --exclude='.svn' --preserve -cjf gloox-1.0-SVNr4003.tar.bz2 gloox-1.0 +Source0: %{name}-%{version}%{?beta:-beta%{beta}}%{?SVN:-SVNr%{SVN}}.tar.bz2 + +#Patch1: gloox-no_ns_get16.patch +#Patch1: gloox-getaddrinfo.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: libtool, autoconf, automake +BuildRequires: openssl-devel >= 0.9.8 +BuildRequires: gnutls-devel >= 1.2 +BuildRequires: zlib-devel >= 1.2.3 +BuildRequires: libidn-devel >= 0.5 + +Requires(postun): /sbin/ldconfig +Requires(post): /sbin/ldconfig + +# Temporary UGLY HACK for http://bugs.camaya.net/horde/whups/ticket/?id=137 +Patch1: gloox-1.0-SVNr4003.glibc-private-symbol.patch +# http://bugs.camaya.net/horde/whups/ticket/?id=140 +Patch2: gloox-1.0-beta-SVNr4003-missed_header.patch +# GCC 4.4 compatibility http://bugs.camaya.net/horde/whups/ticket/?id=141 +Patch3: gloox-1.0-GCC4.4-missing_includes.patch + +%description +gloox is a rock-solid, full-featured Jabber/XMPP client library, written in +C++. It makes writing spec-compliant clients easy and allows for hassle-free +integration of Jabber/XMPP functionality into existing applications. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%prep +%setup -q -n %{name}-%{version}%{?beta:-beta%{beta}} +%patch1 -p1 -b .private-glibc +%patch2 -p1 -b .missed-header +%patch3 -p1 -b .gcc4.4-missing-includes + +%build +%if 0%{?SVN} +./autogen.sh +%endif + +%configure --disable-static +make %{?_smp_mflags} +# recode to UTF +mv -f AUTHORS AUTHORS.old +iconv -f iso8859-1 -t UTF-8 AUTHORS.old > AUTHORS + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog LICENSE README TODO +%{_libdir}/*.so.* + +%files devel +%defattr(-,root,root,-) +%{_bindir}/%{name}-config +%{_libdir}/pkgconfig/%{name}.pc +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/* +%{_libdir}/*.so + +%changelog +* Fri Apr 17 2009 Pavel Alexeev - 1.0-0.5.SVNr4003 +- Add --exclude='.svn' to tar pack source and set time to last commit. This may allow pass hash checking soucre later. + +* Tue Apr 7 2009 Pavel Alexeev - 1.0-0.4.SVNr4003 +- Add Patch3: gloox-1.0-GCC4.4-missing_includes.patch to allow build on GCC4.4 + +* Tue Apr 7 2009 Pavel Alexeev - 1.0-0.3.SVNr4003 +- REmade patch1. Instead of just comment private stuff I use temporray ugly hack - copy-past function implementation from glibc source until + author do not reimplement it properly. + +* Sun Apr 5 2009 Pavel Alexeev - 1.0-0.2.SVNr4003 +- Add patch2 gloox-1.0-beta-SVNr4003-missed_header.patch - see bug http://bugs.camaya.net/horde/whups/ticket/?id=140 + +* Sun Apr 5 2009 Pavel Alexeev - 1.0-0.1.SVNr4003 +- qutIM require gloox version 1.0 with SVN revision >= 3873. Try build current. +- Patch1 (http://bugs.camaya.net/horde/whups/ticket/?id=137) little adopted (gloox-1.0-beta7.glibc-private-symbol.patch -> gloox-1.0-SVNr4003.glibc-private-symbol.patch). +- Add SVN part into Release tag. + +* Fri Mar 27 2009 Pavel Alexeev - 1.0-0.0.beta3 +- Import http://www.salstar.sk/pub/fedora/SRPMS/10/gloox-1.0-0.0beta3.fc10.src.rpm +- Step to 1.0-beta7 version +- Reformat with tabs spec file. +- %%beta (replace %%beta_version) now represent only number. According it change all mention of it. +- Add Requires(postun): /sbin/ldconfig and Requires(post): /sbin/ldconfig + +* Fri Mar 7 2008 Jan ONDREJ (SAL) - 0.9.9.4-1 +- update to upstream + +* Mon Feb 28 2008 Jan ONDREJ (SAL) - 0.9.9.3-1 +- update to upstream + +* Sun Dec 2 2007 Jan ONDREJ (SAL) - 0.9.7-2 +- removed patch +- added undef for HAVE_RES_QUERY, HAVE_RES_QUERYDOMAIN, HAVE_DN_SKIPNAME + see: https://mail.camaya.net/horde/whups/ticket/?id=52 + +* Wed Nov 28 2007 Jan ONDREJ (SAL) - 0.9.7-1 +- update upstream +- added patch to avoid dependecny problem on libresolv.so.2(GLIBC_PRIVATE) + +* Mon Sep 17 2007 Jan ONDREJ (SAL) - 0.9.4.1-1 +- first release diff --git a/import.log b/import.log new file mode 100644 index 0000000..11e9c5e --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +gloox-1_0-0_5_SVNr4003_fc9:F-10:gloox-1.0-0.5.SVNr4003.fc9.src.rpm:1240683449 diff --git a/sources b/sources index e69de29..9a1b10b 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +f3ea4b0a8fdb44d0ad8715ac8a51001f gloox-1.0-SVNr4003.tar.bz2