[oe-commits] org.oe.dev dircproxy: add patch from debian

[nail commit]

dircproxy: add patch from debian

Author: nail at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 475781945d84b1049b877e3edfd1cec820b78ac5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=475781945d84b1049b877e3edfd1cec820b78ac5
Files:
1
packages/dircproxy/files
packages/dircproxy/files/dircproxy.patch
packages/dircproxy/dircproxy_1.1.0.bb
Diffs:

#
# mt diff -r917a6aae1c1ecac679c57b8a6e6845e55feb8f49 -r475781945d84b1049b877e3edfd1cec820b78ac5
#
# 
# 
# add_dir "packages/dircproxy/files"
# 
# add_file "packages/dircproxy/files/dircproxy.patch"
#  content [f333fabef81f16b77f519a25c102d8927330392e]
# 
# patch "packages/dircproxy/dircproxy_1.1.0.bb"
#  from [475ce9dc61ad3b8de5a785532a936382b3af2077]
#    to [9e8ea68bdbd91e001c7732afb46516b5b85c4803]
# 
============================================================
--- packages/dircproxy/files/dircproxy.patch	f333fabef81f16b77f519a25c102d8927330392e
+++ packages/dircproxy/files/dircproxy.patch	f333fabef81f16b77f519a25c102d8927330392e
@@ -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)) {
============================================================
--- packages/dircproxy/dircproxy_1.1.0.bb	475ce9dc61ad3b8de5a785532a936382b3af2077
+++ packages/dircproxy/dircproxy_1.1.0.bb	9e8ea68bdbd91e001c7732afb46516b5b85c4803
@@ -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