diff options
| author | Oyvind Repvik <nail@nslu2-linux.org> | 2006-11-02 17:09:09 +0000 |
|---|---|---|
| committer | Oyvind Repvik <nail@nslu2-linux.org> | 2006-11-02 17:09:09 +0000 |
| commit | b8cb76123125f435282e24d2f30fccc6c3eab9a9 (patch) | |
| tree | 078a625814018b40519407e7a5f2af274e0625ea | |
| parent | 7f1cfc01d83b565bcb1b443f0a0a3727f8ef1666 (diff) | |
dircproxy: add patch from debian
| -rw-r--r-- | packages/dircproxy/dircproxy_1.1.0.bb | 11 | ||||
| -rw-r--r-- | packages/dircproxy/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/dircproxy/files/dircproxy.patch | 46 |
3 files changed, 54 insertions, 3 deletions
diff --git a/packages/dircproxy/dircproxy_1.1.0.bb b/packages/dircproxy/dircproxy_1.1.0.bb index 7881189594..59e4a33498 100644 --- a/packages/dircproxy/dircproxy_1.1.0.bb +++ b/packages/dircproxy/dircproxy_1.1.0.bb @@ -1,5 +1,10 @@ -LICENSE = "GPL" +DESCRIPTION = "IRC proxy server" +HOMEPAGE = "http://dircproxy.securiweb.net/" +LICENSE = "GPLv2" +PR = "r1" -SRC_URI = "http://dircproxy.securiweb.net/pub/1.1/dircproxy-${PV}.tar.gz" +SRC_URI = "http://dircproxy.securiweb.net/pub/1.1/dircproxy-${PV}.tar.gz\ + file://dircproxy.patch;patch=1" + +inherit autotools -inherit autotools diff --git a/packages/dircproxy/files/.mtn2git_empty b/packages/dircproxy/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dircproxy/files/.mtn2git_empty diff --git a/packages/dircproxy/files/dircproxy.patch b/packages/dircproxy/files/dircproxy.patch new file mode 100644 index 0000000000..3f03ff28fa --- /dev/null +++ b/packages/dircproxy/files/dircproxy.patch @@ -0,0 +1,46 @@ +diff -Naur dircproxy-1.1.0.orig/src/irc_server.c dircproxy-1.1.0/src/irc_server.c +--- dircproxy-1.1.0.orig/src/irc_server.c 2006-10-29 11:16:22.000000000 -0500 ++++ dircproxy-1.1.0/src/irc_server.c 2006-10-29 11:20:42.000000000 -0500 +@@ -699,7 +699,8 @@ + free(s); + + /* Was in the squelch list, so remove it and stop looking */ +- s = (l ? l->next : p->squelch_modes) = n; ++ if (l) l->next = n; else p->squelch_modes = n; ++ s = n; + squelch = 1; + break; + } else { +@@ -740,7 +741,8 @@ + free(s); + + /* Was in the squelch list, so remove it and stop looking */ +- s = (l ? l->next : p->squelch_modes) = n; ++ if (l) l->next = n; else p->squelch_modes = n; ++ s = n; + squelch = 1; + break; + } else { +--- dircproxy-1.1.0-orig/src/dcc_net.c 2006-10-29 23:39:17.000000000 -0500 ++++ dircproxy-1.1.0/src/dcc_net.c 2006-10-29 23:42:27.000000000 -0500 +@@ -365,7 +365,8 @@ + n = p->next; + _dccnet_free(p); + +- p = (l ? l->next : proxies) = n; ++ if (l) l->next = n; else proxies = n; ++ p = n; + } else { + l = p; + p = p->next; +--- dircproxy-1.1.0-orig/src/net.c 2006-10-29 23:52:04.000000000 -0500 ++++ dircproxy-1.1.0/src/net.c 2006-10-29 23:52:23.000000000 -0500 +@@ -459,7 +459,7 @@ + return 0; + } + +- l = &(buff == SB_IN ? s->in_buff_last : s->out_buff_last); ++ if (buff == SB_IN) l = &(s->in_buff_last); else l = &(s->out_buff_last); + + /* Check whether we can just add to the existing buffer */ + if ((mode == SM_RAW) && *l && ((*l)->mode == mode)) { |