[csw-devel] SF.net SVN: gar:[10712] csw/mgar/pkg/bitlbee/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Aug 9 13:24:31 CEST 2010


Revision: 10712
          http://gar.svn.sourceforge.net/gar/?rev=10712&view=rev
Author:   dmichelsen
Date:     2010-08-09 11:24:31 +0000 (Mon, 09 Aug 2010)

Log Message:
-----------
bitlbee: Update patches

Modified Paths:
--------------
    csw/mgar/pkg/bitlbee/trunk/checksums
    csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch
    csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch
    csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch
    csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch
    csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch
    csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch
    csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch

Modified: csw/mgar/pkg/bitlbee/trunk/checksums
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/checksums	2010-08-09 09:48:33 UTC (rev 10711)
+++ csw/mgar/pkg/bitlbee/trunk/checksums	2010-08-09 11:24:31 UTC (rev 10712)
@@ -1,8 +1,8 @@
-86455864950f3515af0aa3139261116d  0001-Do-not-use-gcc-specific-Wall.patch
-eb620e3a4a5039257e82e5b79b11a53e  0002-Use-putenv-instead-of-setenv.patch
-35de44f17737a50ef0a76116244eae9e  0003-Remove-more-GCC-specific-Wall.patch
-16477a0ba0a265d4d36bfbed00a5018d  0004-Use-inttypes.h-instead-of-stdint.h.patch
-bbeb1ac0c41643a7f0a90e81a7cc0f18  0005-Do-not-return-values-in-void-functions-and-make-seco.patch
-a019ebad5677f5f85a4c18e3ad584bb0  0006-Remove-definition-on-Solaris-confusing-includes.patch
-f370d257f076fbd269edbff912d281d1  0007-Honour-CPPFLAGS.patch
+ae9718936480f859cf6b0d39ec93e04f  0001-Do-not-use-gcc-specific-Wall.patch
+6fb308585251a3ec0e251609e1128952  0002-Use-putenv-instead-of-setenv.patch
+0a8b0c91ad0798dbc04b30fd507939ca  0003-Remove-more-GCC-specific-Wall.patch
+923dcd920f8b344cef23f885dda940bf  0004-Use-inttypes.h-instead-of-stdint.h.patch
+a13a0dc7e11f2b7ba8910177b6f1ee82  0005-Do-not-return-values-in-void-functions-and-make-seco.patch
+b4cf29e2d43be14af89df872f56c0aa4  0006-Remove-definition-on-Solaris-confusing-includes.patch
+9b14d3589eebd1302b1882dfd4f237d2  0007-Honour-CPPFLAGS.patch
 e1fbbd9d96ec7c2377b1b286689c1b83  bitlbee-1.2.8.tar.gz

Modified: csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch	2010-08-09 09:48:33 UTC (rev 10711)
+++ csw/mgar/pkg/bitlbee/trunk/files/0001-Do-not-use-gcc-specific-Wall.patch	2010-08-09 11:24:31 UTC (rev 10712)
@@ -1,7 +1,7 @@
-From 7069c4750ecf45a92810d9610ee040206b8afc41 Mon Sep 17 00:00:00 2001
+From 86659ed531ff3ca4fa2e208af33112253629842e Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
 Date: Fri, 6 Aug 2010 14:49:34 +0200
-Subject: [PATCH 1/6] Do not use gcc-specific -Wall
+Subject: [PATCH 1/7] Do not use gcc-specific -Wall
 
 ---
  Makefile     |    1 -

Modified: csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch	2010-08-09 09:48:33 UTC (rev 10711)
+++ csw/mgar/pkg/bitlbee/trunk/files/0002-Use-putenv-instead-of-setenv.patch	2010-08-09 11:24:31 UTC (rev 10712)
@@ -1,7 +1,7 @@
-From c876a8c9db773cccaf4da87a7a30d95bff0e42d9 Mon Sep 17 00:00:00 2001
+From ea865e1a0ea5f1b863726932b9e1b5e3b7a68fb1 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
 Date: Fri, 6 Aug 2010 15:32:10 +0200
-Subject: [PATCH 2/6] Use putenv instead of setenv
+Subject: [PATCH 2/7] Use putenv instead of setenv
 
 ---
  conf.c |    6 ++++++

Modified: csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch	2010-08-09 09:48:33 UTC (rev 10711)
+++ csw/mgar/pkg/bitlbee/trunk/files/0003-Remove-more-GCC-specific-Wall.patch	2010-08-09 11:24:31 UTC (rev 10712)
@@ -1,7 +1,7 @@
-From cdcf79c13688a644aa23d8421a43f93f00386d69 Mon Sep 17 00:00:00 2001
+From b09578c0ef70005711273da60809f3a0c1773e80 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
 Date: Fri, 6 Aug 2010 15:33:32 +0200
-Subject: [PATCH 3/6] Remove more GCC specific -Wall
+Subject: [PATCH 3/7] Remove more GCC specific -Wall
 
 ---
  protocols/Makefile         |    1 -

Modified: csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch	2010-08-09 09:48:33 UTC (rev 10711)
+++ csw/mgar/pkg/bitlbee/trunk/files/0004-Use-inttypes.h-instead-of-stdint.h.patch	2010-08-09 11:24:31 UTC (rev 10712)
@@ -1,7 +1,7 @@
-From 389ee34d25b02a9ad2df1da49d9f6035766f3c45 Mon Sep 17 00:00:00 2001
+From a4e33ef8a76bde2a9d4644fb584d79a7d05cfffb Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
 Date: Fri, 6 Aug 2010 15:34:40 +0200
-Subject: [PATCH 4/6] Use inttypes.h instead of stdint.h
+Subject: [PATCH 4/7] Use inttypes.h instead of stdint.h
 
 ---
  lib/md5.h          |    4 ++++

Modified: csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch	2010-08-09 09:48:33 UTC (rev 10711)
+++ csw/mgar/pkg/bitlbee/trunk/files/0005-Do-not-return-values-in-void-functions-and-make-seco.patch	2010-08-09 11:24:31 UTC (rev 10712)
@@ -1,18 +1,18 @@
-From 858b58c86e8a1150d7ca3ab3f8ae5c8b83ad5f36 Mon Sep 17 00:00:00 2001
+From 5c47bf0d30984ad5197eac31cc8132c537d23e0b Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 6 Aug 2010 15:37:29 +0200
-Subject: [PATCH 5/6] Do not return values in void functions and make second argument in ternary explicit
+Date: Mon, 9 Aug 2010 13:17:38 +0200
+Subject: [PATCH 5/7] Do not return values in void functions and make second argument in ternary explicit
 
 ---
  irc_commands.c              |    3 ++-
  lib/oauth.c                 |    2 +-
- lib/xmltree.c               |    3 ++-
+ lib/xmltree.c               |    5 ++++-
  protocols/jabber/jabber.c   |    4 ++--
  protocols/jabber/message.c  |    4 ++--
  protocols/msn/msn.c         |    2 +-
  protocols/nogaim.c          |   13 +++++++------
  protocols/yahoo/libyahoo2.c |    9 +++++----
- 8 files changed, 22 insertions(+), 18 deletions(-)
+ 8 files changed, 24 insertions(+), 18 deletions(-)
 
 diff --git a/irc_commands.c b/irc_commands.c
 index 7a286ce..e1a2201 100644
@@ -42,16 +42,18 @@
  	
  	/* Inner part: H(K XOR 0x36, text) */
 diff --git a/lib/xmltree.c b/lib/xmltree.c
-index 31f8ee9..3da6e42 100644
+index 31f8ee9..b0a945c 100644
 --- a/lib/xmltree.c
 +++ b/lib/xmltree.c
-@@ -214,7 +214,8 @@ void xt_cleanup( struct xt_parser *xt, struct xt_node *node, int depth )
+@@ -214,7 +214,10 @@ void xt_cleanup( struct xt_parser *xt, struct xt_node *node, int depth )
  		return;
  	
  	if( node == NULL )
 -		return xt_cleanup( xt, xt->root, depth );
++	{
 +		xt_cleanup( xt, xt->root, depth );
 +		return;
++	}
  	
  	if( node->flags & XT_SEEN && node == xt->root )
  	{

Modified: csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch	2010-08-09 09:48:33 UTC (rev 10711)
+++ csw/mgar/pkg/bitlbee/trunk/files/0006-Remove-definition-on-Solaris-confusing-includes.patch	2010-08-09 11:24:31 UTC (rev 10712)
@@ -1,7 +1,7 @@
-From 442db668872dfbe469e8b272a86109511f45523f Mon Sep 17 00:00:00 2001
+From 980174d20a57b873612760176c750a8ff70c769b Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
 Date: Fri, 6 Aug 2010 15:38:01 +0200
-Subject: [PATCH 6/6] Remove definition on Solaris confusing includes
+Subject: [PATCH 6/7] Remove definition on Solaris confusing includes
 
 ---
  protocols/twitter/twitter_lib.c |    5 ++++-

Modified: csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch	2010-08-09 09:48:33 UTC (rev 10711)
+++ csw/mgar/pkg/bitlbee/trunk/files/0007-Honour-CPPFLAGS.patch	2010-08-09 11:24:31 UTC (rev 10712)
@@ -1,14 +1,14 @@
-From 484c67ccecd26bde8992d79a8a2260fa91bfef40 Mon Sep 17 00:00:00 2001
+From 640bf1ba78d06215f0e7141fd50ddba0b58b350b Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
 Date: Fri, 6 Aug 2010 16:00:48 +0200
-Subject: [PATCH] Honour CPPFLAGS
+Subject: [PATCH 7/7] Honour CPPFLAGS
 
 ---
  configure |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)
 
 diff --git a/configure b/configure
-index 24f60d7..756d144 100755
+index 24f60d7..4232a2c 100755
 --- a/configure
 +++ b/configure
 @@ -159,6 +159,8 @@ fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list