diff --git a/net/umurmur/Makefile b/net/umurmur/Makefile index 6f8ffba0d..807a80248 100644 --- a/net/umurmur/Makefile +++ b/net/umurmur/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=umurmur PKG_VERSION:=0.2.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://umurmur.googlecode.com/files/ diff --git a/net/umurmur/patches/001-join-channel.patch b/net/umurmur/patches/001-join-channel.patch new file mode 100644 index 000000000..d9c21322e --- /dev/null +++ b/net/umurmur/patches/001-join-channel.patch @@ -0,0 +1,17 @@ +diff -ruN umurmur-0.2.1/src/channel.c umurmur-0.2.1.new/src/channel.c +--- umurmur-0.2.1/src/channel.c 2010-02-13 23:36:54.000000000 +0100 ++++ umurmur-0.2.1.new/src/channel.c 2010-02-28 00:00:43.661542508 +0100 +@@ -276,9 +276,12 @@ + int Chan_userJoin(channel_t *ch, client_t *client) + { + int leaving_id; ++ ++ /* Do nothing if user already is in this channel */ ++ if ((channel_t *)client->channel == ch) ++ return 0; + + Log_debug("Add user %s to channel %s", client->username, ch->name); +- + /* Only allowed in one channel at a time */ + leaving_id = Chan_userLeave(client); + list_add_tail(&client->chan_node, &ch->clients); diff --git a/net/umurmur/patches/001-makefile.patch b/net/umurmur/patches/001-makefile.patch deleted file mode 100644 index e69de29bb..000000000