software/RELEASES/ircservices/achurch.org/services/lists/ircservices/2007/005392.html

   1 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
   2 <HTML>
   3  <HEAD>
   4    <TITLE> [IRCServices] 5.1 InspIRCd protocol
   5    </TITLE>
   6    <LINK REL="Index" HREF="index.html" >
   7    <LINK REL="made" HREF="mailto:ircservices%40ircservices.za.net?Subject=%5BIRCServices%5D%205.1%20InspIRCd%20protocol&In-Reply-To=46e5d252.50601%40msgid.achurch.org">
   8    <META NAME="robots" CONTENT="index,nofollow">
   9    <META http-equiv="Content-Type" content="text/html; charset=us-ascii">
  10    <LINK REL="Previous"  HREF="005391.html">
  11    <LINK REL="Next"  HREF="005393.html">
  12  </HEAD>
  13  <BODY BGCOLOR="#ffffff">
  14    <H1>[IRCServices] 5.1 InspIRCd protocol</H1>
  15     <B>Casey</B>
  16     <A HREF="mailto:ircservices%40ircservices.za.net?Subject=%5BIRCServices%5D%205.1%20InspIRCd%20protocol&In-Reply-To=46e5d252.50601%40msgid.achurch.org"
  17        TITLE="[IRCServices] 5.1 InspIRCd protocol">caseyclaydon at fastmail.com.au
  18        </A><BR>
  19     <I>Mon Sep 10 17:58:31 PDT 2007</I>
  20     <P><UL>
  21         <LI>Previous message: <A HREF="005391.html">[IRCServices] 5.1 InspIRCd protocol
  22 </A></li>
  23         <LI>Next message: <A HREF="005393.html">[IRCServices] 5.1 InspIRCd protocol
  24 </A></li>
  25          <LI> <B>Messages sorted by:</B>
  26               <a href="date.html#5392">[ date ]</a>
  27               <a href="thread.html#5392">[ thread ]</a>
  28               <a href="subject.html#5392">[ subject ]</a>
  29               <a href="author.html#5392">[ author ]</a>
  30          </LI>
  31        </UL>
  32     <HR>
  33 <!--beginarticle-->
  34 <PRE>the patch command is not working for me
  35
  36 I made a text file and called it inspircd-patch.txt and
  37 messages-patch.txt, and copied the patch txt files to the
  38 ircservices-5.1pre6 directory
  39
  40 I did patch -p &lt;inspircd/messages-patch.txt
  41
  42 [<A HREF="http://lists.ircservices.za.net/mailman/listinfo/ircservices">casey at Vigor10</A> ircservices-5.1pre6]$ patch -p &lt;inspircd-patch.txt
  43 patch: option requires an argument -- p
  44 patch: Try `patch --help' for more information.
  45 [<A HREF="http://lists.ircservices.za.net/mailman/listinfo/ircservices">casey at Vigor10</A> ircservices-5.1pre6]$
  46
  47
  48
  49 I have this in the patch txt files
  50
  51
  52
  53 Index: modules/protocol/inspircd.c
  54 ===================================================================
  55 RCS file: /var/local/cvsroot/ircservices/modules/protocol/inspircd.c,v
  56 retrieving revision 2.9
  57 diff -u -r2.9 inspircd.c
  58 --- modules/protocol/inspircd.c 3 Sep 2007 11:26:34 -0000 2.9
  59 +++ modules/protocol/inspircd.c 10 Sep 2007 12:48:07 -0000
  60 @@ -332,8 +332,16 @@
  61 User *u = get_user(av[2]);
  62 if (c &amp;&amp; u)
  63 clear_channel(c, CLEAR_BANS, u);
  64 - } else {
  65 - do_cmode(source, ac, av);
  66 + } else if (ac &gt;= 3) {
  67 + char modestr[BUFSIZE];
  68 + av[1] = av[0]; /* Remove the timestamp parameter */
  69 + if (av[2][0] != '+' &amp;&amp; av[2][0] != '-') {
  70 + /* InspIRCd seems to omit the leading '+' when sending
  71 + * initial modes for the channel */
  72 + snprintf(modestr, sizeof(modestr), &quot;+%s&quot;, av[2]);
  73 + av[2] = modestr;
  74 + }
  75 + do_cmode(source, ac-1, av+1);
  76 }
  77 } else {
  78 if (ac &lt; 2)
  79 @@ -1030,7 +1038,7 @@
  80 {
  81 protocol_name = &quot;InspIRCd&quot;;
  82 protocol_version = &quot;1.1+&quot;;
  83 - protocol_features = PF_SZLINE | PF_SVSJOIN | PF_MODETS_FIRST;
  84 + protocol_features = PF_SZLINE | PF_SVSJOIN;
  85 protocol_nickmax = 30;
  86
  87 if (!register_messages(inspircd_messages)) {
  88
  89
  90
  91
  92
  93
  94
  95 Index: messages.c
  96 ===================================================================
  97 RCS file: /var/local/cvsroot/ircservices/messages.c,v
  98 retrieving revision 2.46
  99 diff -u -r2.46 messages.c
 100 --- messages.c 23 Aug 2007 04:45:42 -0000 2.46
 101 +++ messages.c 10 Sep 2007 14:09:47 -0000
 102 @@ -75,7 +75,7 @@
 103 if (!*source) {
 104 log(&quot;Source missing from JOIN message&quot;);
 105 return;
 106 - } else if (ac != 1) {
 107 + } else if (ac &lt; 1) {
 108 return;
 109 }
 110 do_join(source, ac, av);
 111
 112
 113
 114
 115
 116
 117
 118 Andrew Church wrote:
 119 &gt;&gt;<i> where in inspircd.c do I put in the patch
 120 </I>&gt;&gt;<i>
 121 </I>&gt;<i>
 122 </I>&gt;<i> Use the &quot;patch&quot; command to apply it.  Save the message to a file (for
 123 </I>&gt;<i> example &quot;file.txt&quot;), then go to the top Services source directory and
 124 </I>&gt;<i> enter the command &quot;patch -p &lt;file.txt&quot; (make sure you give the proper
 125 </I>&gt;<i> path to the file).
 126 </I>&gt;<i>
 127 </I>&gt;<i>   --Andrew Church
 128 </I>&gt;<i>     <A HREF="http://lists.ircservices.za.net/mailman/listinfo/ircservices">achurch at achurch.org</A>
 129 </I>&gt;<i>     <A HREF="http://achurch.org/">http://achurch.org/</A>
 130 </I>&gt;<i> ------------------------------------------------------------------
 131 </I>&gt;<i> To unsubscribe or change your subscription options, visit:
 132 </I>&gt;<i> <A HREF="http://lists.ircservices.za.net/mailman/listinfo/ircservices">http://lists.ircservices.za.net/mailman/listinfo/ircservices</A>
 133 </I>&gt;<i>
 134 </I></PRE>
 135
 136
 137 <!--endarticle-->
 138     <HR>
 139     <P><UL>
 140         <!--threads-->
 141         <LI>Previous message: <A HREF="005391.html">[IRCServices] 5.1 InspIRCd protocol
 142 </A></li>
 143         <LI>Next message: <A HREF="005393.html">[IRCServices] 5.1 InspIRCd protocol
 144 </A></li>
 145          <LI> <B>Messages sorted by:</B>
 146               <a href="date.html#5392">[ date ]</a>
 147               <a href="thread.html#5392">[ thread ]</a>
 148               <a href="subject.html#5392">[ subject ]</a>
 149               <a href="author.html#5392">[ author ]</a>
 150          </LI>
 151        </UL>
 152
 153 </body></html>