rpms/bip/EL-5 bip-fn-ircd7.patch,NONE,1.1 bip.spec,1.10,1.11
Lorenzo Villani
arbiter at fedoraproject.org
Mon Feb 1 01:02:25 UTC 2010
- Previous message: rpms/bip/F-11 bip-fn-ircd7.patch,NONE,1.1 bip.spec,1.10,1.11
- Next message: rpms/kdeaccessibility/devel .cvsignore, 1.54, 1.55 kdeaccessibility.spec, 1.102, 1.103 sources, 1.54, 1.55 kdeaccessibility-4.3.95-buildfix.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: arbiter
Update of /cvs/pkgs/rpms/bip/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20849
Modified Files:
bip.spec
Added Files:
bip-fn-ircd7.patch
Log Message:
* Mon Feb 1 2010 Lorenzo Villani <lvillani at binaryhelix.net> - 0.8.4-2
- Import patch reported by Kevin Fenzi (bz #560476)
- + Add a join delay to work around ircd7 flood protection
- + Add support for the "quiet" list
bip-fn-ircd7.patch:
irc.c | 6 +++++-
irc.h | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
--- NEW FILE bip-fn-ircd7.patch ---
diff --git a/src/irc.c b/src/irc.c
index 556bf97..a5cc039 100644
--- a/src/irc.c
+++ b/src/irc.c
@@ -16,6 +16,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
+#include <unistd.h>
#include "util.h"
#include "irc.h"
#include "bip.h"
@@ -206,6 +207,8 @@ static void irc_server_join(struct link_server *s)
WRITE_LINE1(CONN(s), NULL, "JOIN", ci->name);
else
WRITE_LINE2(CONN(s), NULL, "JOIN", ci->name, ci->key);
+
+ usleep(1000 * JOIN_THROTTLE_MSEC);
}
}
@@ -944,7 +947,8 @@ static int irc_cli_mode(struct link_client *ic, struct line *line)
/* This is a wild guess and that sucks. */
if (!irc_line_elem_equals(line, 0, "MODE") ||
- strchr(irc_line_elem(line, 2), 'b') == NULL)
+ (strchr(irc_line_elem(line, 2), 'b') == NULL &&
+ strchr(irc_line_elem(line, 2), 'q') == NULL))
return OK_COPY;
++ic->who_count;
diff --git a/src/irc.h b/src/irc.h
index c0c3373..f474b25 100644
--- a/src/irc.h
+++ b/src/irc.h
@@ -28,6 +28,7 @@
#define P_SERV "b.i.p"
#define S_PING "BIPPING"
#define P_IRCMASK "-bip!bip@" P_SERV
+#define JOIN_THROTTLE_MSEC 300
struct server {
char *host;
Index: bip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bip/EL-5/bip.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- bip.spec 8 Jan 2010 14:29:01 -0000 1.10
+++ bip.spec 1 Feb 2010 01:02:25 -0000 1.11
@@ -1,15 +1,23 @@
Name: bip
Version: 0.8.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: IRC Bouncer
Group: Applications/Internet
License: GPLv2+
URL: http://bip.t1r.net
+
Source0: http://bip.t1r.net/downloads/bip-%{version}.tar.gz
Source1: bip.init
Patch0: bip-conf.patch
+Patch1: bip-fn-ircd7.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel flex byacc autoconf m4
+
+BuildRequires: autoconf
+BuildRequires: byacc
+BuildRequires: flex
+BuildRequires: m4
+BuildRequires: openssl-devel
%description
Bip is an IRC proxy, which means it keeps connected to your preferred IRC
@@ -23,6 +31,7 @@ while you were away.
%prep
%setup -q
%patch0 -p0
+%patch1 -p1
iconv -f iso-8859-1 -t utf-8 -o ChangeLog{.utf8,}
mv ChangeLog{.utf8,}
@@ -83,6 +92,11 @@ fi
%attr(-,bip,bip) %dir %{_localstatedir}/log/bip
%changelog
+* Mon Feb 1 2010 Lorenzo Villani <lvillani at binaryhelix.net> - 0.8.4-2
+- Import patch reported by Kevin Fenzi (bz #560476)
+- + Add a join delay to work around ircd7 flood protection
+- + Add support for the "quiet" list
+
* Fri Jan 8 2010 Lorenzo Villani <lvillani at binaryhelix.net> - 0.8.4-1
- 0.8.4
- Previous message: rpms/bip/F-11 bip-fn-ircd7.patch,NONE,1.1 bip.spec,1.10,1.11
- Next message: rpms/kdeaccessibility/devel .cvsignore, 1.54, 1.55 kdeaccessibility.spec, 1.102, 1.103 sources, 1.54, 1.55 kdeaccessibility-4.3.95-buildfix.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list