[bip/f16] upstream patch to fix privmsg logs being split up (upstream #252)

[Brian C. Lane]

commit 4dc773c41eb000385d19326acda9d941ab4e6a0b
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Apr 13 14:38:06 2012 -0700

    upstream patch to fix privmsg logs being split up (upstream #252)

 0001-Revert-f19e1f6.-Fix-252.patch |   33 +++++++++++++++++++++++++++++++++
 bip.spec                           |    6 +++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/0001-Revert-f19e1f6.-Fix-252.patch b/0001-Revert-f19e1f6.-Fix-252.patch
new file mode 100644
index 0000000..e041e32
--- /dev/null
+++ b/0001-Revert-f19e1f6.-Fix-252.patch
@@ -0,0 +1,33 @@
+From f1bec50a9cc81417344f62e021e14c0a254737d6 Mon Sep 17 00:00:00 2001
+From: Pierre-Louis Bonicoli <pierre-louis.bonicoli at gmx.fr>
+Date: Wed, 25 Jan 2012 04:03:18 +0100
+Subject: [PATCH 1/3] Revert f19e1f6. Fix #252.
+
+f19e1f6 introduces a regression (#252) and bug described in commit
+message can not be reproduced.
+---
+ src/log.c |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/log.c b/src/log.c
+index 269c6cb..84922eb 100644
+--- a/src/log.c
++++ b/src/log.c
+@@ -533,7 +533,13 @@ static void do_log_privmsg(log_t *logdata, const char *storage, int src,
+ void log_privmsg(log_t *logdata, const char *ircmask, const char *destination,
+ 		const char *message)
+ {
+-	do_log_privmsg(logdata, destination, 0, ircmask, message);
++	if (!ischannel(*destination)) {
++		char *nick = nick_from_ircmask(ircmask);
++		do_log_privmsg(logdata, nick, 0, ircmask, message);
++		free(nick);
++	} else {
++		do_log_privmsg(logdata, destination, 0, ircmask, message);
++	}
+ }
+ 
+ void log_cli_privmsg(log_t *logdata, const char *ircmask,
+-- 
+1.7.10
+
diff --git a/bip.spec b/bip.spec
index 0f2c807..d412c7f 100644
--- a/bip.spec
+++ b/bip.spec
@@ -1,6 +1,6 @@
 Name:    bip
 Version: 0.8.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: IRC Bouncer
 Group:   Applications/Internet
 License: GPLv2+
@@ -14,6 +14,7 @@ Source2: bip-tmpfs.conf
 Patch0: 0001-Setup-bip-for-Fedora-s-paths.patch
 Patch1: 0002-Throttle-joins-to-prevent-flooding.patch
 Patch2: 0003-Buffer-Overflow-check-against-the-implicit-size-of-s.patch
+Patch3: 0001-Revert-f19e1f6.-Fix-252.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -110,6 +111,9 @@ fi
 %attr(-,bip,bip) %dir %{_localstatedir}/log/bip
 
 %changelog
+* Fri Apr 13 2012 Adam Williamson <awilliam at redhat.com> - 0.8.8-3
+- upstream patch to fix privmsg logs being split up (upstream #252)
+
 * Tue Jan 24 2012 Brian C. Lane <bcl at redhat.com> - 0.8.8-2
 - Upstream patch to fix buffer overflow with too many open fd's (#784301)
   https://projects.duckcorp.org/issues/269