diff options
| author | joerg <joerg@pkgsrc.org> | 2012-11-16 00:34:34 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-11-16 00:34:34 +0000 |
| commit | 5023c6ebbab44e3c5fd0c23600b2021614e62580 (patch) | |
| tree | fe01ed2485284898b1b1ac3218107b73b712f539 /chat | |
| parent | 2444ac7cf5d0b5cd242742453ff4d0eee891e61e (diff) | |
| download | pkgsrc-5023c6ebbab44e3c5fd0c23600b2021614e62580.tar.gz | |
restrict is a C99 keyword, so don't use it as field name.
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/jabberd/distinfo | 3 | ||||
| -rw-r--r-- | chat/jabberd/patches/patch-jabberd_base_base__accept.c | 31 |
2 files changed, 33 insertions, 1 deletions
diff --git a/chat/jabberd/distinfo b/chat/jabberd/distinfo index 03044d7f26d..ab57c94709b 100644 --- a/chat/jabberd/distinfo +++ b/chat/jabberd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2011/07/03 08:26:55 obache Exp $ +$NetBSD: distinfo,v 1.10 2012/11/16 00:34:34 joerg Exp $ SHA1 (jabber-1.4.2.tar.gz) = aa0bc2e9815e4fa4a1ca8ba7f320bfd3c85ba11f RMD160 (jabber-1.4.2.tar.gz) = bff5a02d3b76243ce59ddb66873ca1c51ef4bb5f @@ -7,5 +7,6 @@ SHA1 (patch-aa) = 5e62a744f35697961fc6708c2be2c374a9782505 SHA1 (patch-ab) = 8722b0db3870e14eaf3e40f5493544db8a813fc1 SHA1 (patch-ac) = 3b17761c9ea2d1e17f3194ac8cf54fbca4c80367 SHA1 (patch-ad) = 1eb45d4433731867bc23afebefb54b7e18217a8d +SHA1 (patch-jabberd_base_base__accept.c) = 824bc096a9440010e534e700bae71c182fa4456e SHA1 (patch-jabberd_lib_xstream.c) = 7a6eb4012057abb0478ca07d0deb38109ab255cf SHA1 (patch-jabberd_mio__xml.c) = 45c57d481bfa7b84dbe5fa73f2b2c9127490d683 diff --git a/chat/jabberd/patches/patch-jabberd_base_base__accept.c b/chat/jabberd/patches/patch-jabberd_base_base__accept.c new file mode 100644 index 00000000000..eb693f117ad --- /dev/null +++ b/chat/jabberd/patches/patch-jabberd_base_base__accept.c @@ -0,0 +1,31 @@ +$NetBSD: patch-jabberd_base_base__accept.c,v 1.1 2012/11/16 00:34:35 joerg Exp $ + +--- jabberd/base/base_accept.c.orig 2012-11-15 15:40:49.000000000 +0000 ++++ jabberd/base/base_accept.c +@@ -64,7 +64,7 @@ typedef struct accept_instance_st + char *secret; + int port; + int timeout; +- int restrict; ++ int restricted; + xdbcache offline; + jid offjid; + queue q; +@@ -157,7 +157,7 @@ void base_accept_process_xml(mio m, int + */ + + /* if we are supposed to be careful about what comes from this socket */ +- if(ai->restrict) ++ if(ai->restricted) + { + jp = jpacket_new(x); + if(jp->type == JPACKET_UNKNOWN || jp->to == NULL || jp->from == NULL || deliver_hostcheck(jp->from->server) != ai->i) +@@ -358,7 +358,7 @@ result base_accept_config(instance id, x + inst->port = port; + inst->timeout = j_atoi(xmlnode_get_tag_data(x, "timeout"),10); + if(xmlnode_get_tag(x,"restrict") != NULL) +- inst->restrict = 1; ++ inst->restricted = 1; + if(xmlnode_get_tag(x,"offline") != NULL) + { + inst->offline = xdb_cache(id); |