Oktober 2012 - ngIRCd GIT Updates

DNS777 : Update error messages for user mode +b and channel Mode +M.
by alex＠arthur.barton.de 19 Okt '12

19 Okt '12

Module: ngircd.git Branch: master Commit: 3ee98d9f72449c88861744aebdd0a2e570bc3bc5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3ee98d9f… Author: DNS777 <dns(a)rbose.org> Date: Fri Oct 19 18:37:33 2012 +0200 Update error messages for user mode +b and channel Mode +M. Replaced error message for channel mode +M with ERR_NEEDREGGEDNICK_MSG (used by Bahamut, inspircd, ircu & Unreal too) and using numeric 477 and the msg simliar like inspircd. Replaced the error message ERR_CANNOTSENDTONICK_MSG for user mode +b with ERR_NONONREG_MSG and using numeric 486, similar like unrealircd. (cherry picked from commit 55a61ab17f63a9e757b7c7598c31b98ce5a132e8 and commit 3737d9ab7da1ea0485cefc07c65dc5308bf0db02) --- src/ngircd/channel.c | 6 +++++- src/ngircd/irc.c | 2 +- src/ngircd/messages.h | 3 ++- src/testsuite/message-test.e | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index f3c74dc..00aafe0 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -918,7 +918,11 @@ Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Command, if (!Can_Send_To_Channel(Chan, From)) { if (! SendErrors) return CONNECTED; /* no error, see RFC 2812 */ - return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG, + if (strchr(Channel_Modes(Chan), 'M')) + return IRC_WriteStrClient(From, ERR_NEEDREGGEDNICK_MSG, + Client_ID(From), Channel_Name(Chan)); + else + return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID(From), Channel_Name(Chan)); } diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 1a57bec..9d9d3f0 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -506,7 +506,7 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) !(Client_Type(from) == CLIENT_SERVER) && !(Client_Type(from) == CLIENT_SERVICE)) { if (SendErrors && !IRC_WriteStrClient(from, - ERR_CANNOTSENDTONICK_MSG, + ERR_NONONREG_MSG, Client_ID(from), Client_ID(cl))) return DISCONNECTED; goto send_next_target; diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 59e9605..a6a6d8c 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -136,6 +136,7 @@ #define ERR_BANNEDFROMCHAN_MSG "474 %s %s :Cannot join channel (+b) -- You are banned" #define ERR_BADCHANNELKEY_MSG "475 %s %s :Cannot join channel (+k) -- Wrong channel key" #define ERR_NOCHANMODES_MSG "477 %s %s :Channel doesn't support modes" +#define ERR_NEEDREGGEDNICK_MSG "477 %s %s :Cannot send to channel (+M) -- You need to be identified to a registered account to message this channel" #define ERR_LISTFULL_MSG "478 %s %s %s: Channel list is full (%d)" #define ERR_NOPRIVILEGES_MSG "481 %s :Permission denied" #define ERR_CHANOPRIVSNEEDED_MSG "482 %s %s :You are not channel operator" @@ -144,6 +145,7 @@ #define ERR_CANTKILLSERVER_MSG "483 %s :You can't kill a server!" #define ERR_RESTRICTED_MSG "484 %s :Your connection is restricted" #define ERR_NICKREGISTER_MSG "484 %s :Cannot modify user mode (+R) -- Use IRC services" +#define ERR_NONONREG_MSG "486 %s :Cannot send to user (+b) -- You must identify to a registered nick to private message %s" #define ERR_NOOPERHOST_MSG "491 %s :Not configured for your host" #define ERR_NOTONSAMECHANNEL_MSG "493 %s :You must share a common channel with %s" @@ -151,7 +153,6 @@ #define ERR_UMODEUNKNOWNFLAG2_MSG "501 %s :Unknown mode \"%c%c\"" #define ERR_USERSDONTMATCH_MSG "502 %s :Can't set/get mode for other users" #define ERR_NOINVITE_MSG "518 %s :Cannot invite to %s (+V)" -#define ERR_CANNOTSENDTONICK_MSG "976 %s :Cannot send to user (+b) -- Only registered users can message %s" #ifdef ZLIB # define RPL_STATSLINKINFOZIP_MSG "211 %s %s %d %ld %ld/%ld %ld %ld/%ld :%ld" diff --git a/src/testsuite/message-test.e b/src/testsuite/message-test.e index 4cbc066..6e63bb5 100644 --- a/src/testsuite/message-test.e +++ b/src/testsuite/message-test.e @@ -61,7 +61,7 @@ expect { send "privmsg nick :test\r" expect { timeout { exit 1 } - "976" + "486" } send "mode nick -b\r" expect {

1 0

Alexander Barton : Test suite: add more checks to whois-test.e
by alex＠arthur.barton.de 15 Okt '12

15 Okt '12

Module: ngircd.git Branch: master Commit: b1a5ade88f304d7e7c5a2c41511061141842dadd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b1a5ade8… Author: Alexander Barton <alex(a)barton.de> Date: Mon Oct 15 21:39:08 2012 +0200 Test suite: add more checks to whois-test.e --- src/testsuite/whois-test.e | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/testsuite/whois-test.e b/src/testsuite/whois-test.e index 2aed694..3c393e8 100644 --- a/src/testsuite/whois-test.e +++ b/src/testsuite/whois-test.e @@ -19,6 +19,10 @@ expect { timeout { exit 1 } "311 nick nick ~user localhost* \* :Real Name\r" } +expect { + timeout { exit 1 } + "318 nick nick :" +} send "whois *\r" expect { @@ -44,6 +48,16 @@ expect { "311 nick nick ~user localhost* \* :Real Name\r" } +send "whois unknown\r" +expect { + timeout { exit 1 } + "401 nick unknown :" +} +expect { + timeout { exit 1 } + "318 nick unknown :" +} + send "quit\r" expect { timeout { exit 1 }

1 0

Alexander Barton : Add "i586/pc/haiku" to doc/Platforms.txt
by alex＠arthur.barton.de 11 Okt '12

11 Okt '12

Module: ngircd.git Branch: master Commit: 73229249d893f05f4b2d98c41a5a4839100c0c9e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=73229249… Author: Alexander Barton <alex(a)barton.de> Date: Thu Oct 11 15:05:21 2012 +0000 Add "i586/pc/haiku" to doc/Platforms.txt --- doc/Platforms.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index b8e33b5..44c9000 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -49,6 +49,7 @@ i386/unknown/netbsdelf4.0 gcc 4.1.2 19 12-02-29 alex Y Y Y Y (3) i386/unknown/netbsdelf5.0.2 gcc 4.1.3 19 12-02-26 alex Y Y Y Y (3) i386/unknown/openbsd3.9 gcc 3.3.5 0.10.0-p1 06-08-30 alex Y Y Y Y (3) i386/unknown/openbsd4.1 gcc 3.3.5 16 10-04-11 alex Y Y Y Y (3) +i586/pc/haiku gcc 2.95.3 19.2~138 12-10-11 user Y Y N N i586/pc/interix3.5 gcc 3.3 19 12-02-29 alex Y Y N Y i686/pc/cygwin gcc 3.3.1 0.8.0 04-05-30 alex Y Y N Y i686/pc/linux-gnu gcc 2.7.2 19.1 12-05-30 goetz Y Y Y Y (1)

1 0

Alexander Barton : Disable UID/GID checks on "single user OS"
by alex＠arthur.barton.de 11 Okt '12

11 Okt '12

Module: ngircd.git Branch: master Commit: e0da56fc7b1dae4e21dfda7e0ac8ad7594135986 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e0da56fc… Author: Alexander Barton <alex(a)barton.de> Date: Thu Oct 11 14:54:13 2012 +0000 Disable UID/GID checks on "single user OS" Don't abort on "single user operating systems" that don't know more than one user account and therefore can't change user and group IDs. Currently, the only such system supported by ngIRCd is Haiku, a BeOS clone. --- src/ngircd/ngircd.c | 6 ++++++ src/portab/portab.h | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 50d91ce..f016b6a 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -567,6 +567,8 @@ Setup_FDStreams(int fd) } /* Setup_FDStreams */ +#if !defined(SINGLE_USER_OS) + /** * Get user and group ID of unprivileged "nobody" user. * @@ -606,6 +608,8 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid ) return true; } /* NGIRCd_getNobodyID */ +#endif + static bool Random_Init_Kern(const char *file) @@ -692,6 +696,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) } } +#if !defined(SINGLE_USER_OS) /* Check user ID */ if (Conf_UID == 0) { pwd = getpwuid(0); @@ -718,6 +723,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) goto out; } } +#endif /* Change user ID */ if (getuid() != Conf_UID) { diff --git a/src/portab/portab.h b/src/portab/portab.h index 1c6e3f8..208d350 100644 --- a/src/portab/portab.h +++ b/src/portab/portab.h @@ -112,7 +112,6 @@ typedef unsigned char bool; /* SPLint */ - #ifdef S_SPLINT_S #include "splint.h" #endif @@ -132,6 +131,9 @@ typedef unsigned char bool; #define HOST_VENDOR "unknown" #endif +#ifdef __HAIKU__ +#define SINGLE_USER_OS +#endif /* configure options */

1 0

Alexander Barton : Search gethostbyname() in libbind and libnetwork
by alex＠arthur.barton.de 11 Okt '12

11 Okt '12

Module: ngircd.git Branch: master Commit: cdaaae0cb2c2b30db8bb61506a826ff87c58f7c8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cdaaae0c… Author: Alexander Barton <alex(a)barton.de> Date: Thu Oct 11 14:50:45 2012 +0000 Search gethostbyname() in libbind and libnetwork This is required for Haiku (BeOS clone) at least. --- configure.ng | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ng b/configure.ng index a3cab6a..4f0a14e 100644 --- a/configure.ng +++ b/configure.ng @@ -164,11 +164,11 @@ AC_SEARCH_LIBS([memmove], [UTIL], [], [ AC_MSG_ERROR([unable to find the memmove() function]) ]) # gethostbyname: Solaris libnsl -AC_SEARCH_LIBS([gethostbyname], [nsl], [], [ +AC_SEARCH_LIBS([gethostbyname], [bind nsl network], [], [ AC_MSG_ERROR([unable to find the gethostbyname() function]) ]) # bind: SVR4 libsocket -AC_SEARCH_LIBS([bind], [socket], [], [ +AC_SEARCH_LIBS([bind], [socket network], [], [ AC_MSG_ERROR([unable to find the bind() function]) ])

1 0

Alexander Barton : Update manual pages
by alex＠arthur.barton.de 09 Okt '12

09 Okt '12

Module: ngircd.git Branch: master Commit: c319fb8eaa859e1c5b4e0333abf4dabf6023708d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c319fb8e… Author: Alexander Barton <alex(a)barton.de> Date: Tue Oct 9 13:13:01 2012 +0200 Update manual pages Among other little things, bring project description in line with website. --- man/ngircd.8.tmpl | 29 +++++++++++++++++------------ man/ngircd.conf.5.tmpl | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/man/ngircd.8.tmpl b/man/ngircd.8.tmpl index f0703f3..318c045 100644 --- a/man/ngircd.8.tmpl +++ b/man/ngircd.8.tmpl @@ -1,30 +1,35 @@ .\" .\" ngircd(8) manual page template .\" -.TH ngircd 8 "Mar 2012" ngircd "ngIRCd Manual" +.TH ngircd 8 "Oct 2012" ngIRCd "ngIRCd Manual" .SH NAME -ngIRCd \- the next generation IRC daemon +ngIRCd \- the "next generation" IRC daemon .SH SYNOPSIS -.B ngircd [ +.B ngircd +[ .I Options -.B ] +] .SH DESCRIPTION .BR ngIRCd -is a free open source daemon for the Internet Relay Chat (IRC), -developed under the GNU General Public License (GPL). +is a free, portable and lightweight Internet Relay Chat server for small +or private networks, developed under the GNU General Public License (GPL). +It is easy to configure, can cope with dynamic IP addresses, and supports +IPv6, SSL-protected connections as well as PAM for authentication. +It is written from scratch and not based on the original IRCd. .PP -It's written from scratch and is not based upon the original IRCd like -many others. It is easy to configure, supports server links (even with -original ircd's) and runs on hosts with changing IP addresses (such as -dial-in networks). +The name ngIRCd means +.IR "next generation IRC daemon", +which is a little bit exaggerated: +.IR "lightweight Internet Relay Chat server" +most probably would have been a better name :-) .PP Currently supported platforms include AIX, A/UX, FreeBSD, HP-UX, IRIX, Linux, Mac OS X, NetBSD, OpenBSD, Solaris, and Windows with Cygwin. .PP As ngIRCd relies on UNIX standards and uses GNU automake and GNU autoconf there are good chances that it also supports other UNIX-based operating -systems as well. By default, ngIRCd writes diagnostic and informational messages using -the syslog mechanism. +systems as well. By default, ngIRCd writes diagnostic and informational +messages using the syslog mechanism. .SH OPTIONS The default behavior of .BR ngircd diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index c03cf74..5f9d6dd 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -1,7 +1,7 @@ .\" .\" ngircd.conf(5) manual page template .\" -.TH ngircd.conf 5 "Mar 2012" ngircd "ngIRCd Manual" +.TH ngircd.conf 5 "Oct 2012" ngIRCd "ngIRCd Manual" .SH NAME ngircd.conf \- configuration file of ngIRCd .SH SYNOPSIS

1 0

Alexander Barton : Test suite: add test for user mode "b"
by alex＠arthur.barton.de 08 Okt '12

08 Okt '12

Module: ngircd.git Branch: master Commit: 538e612a47ba8eb83e749e8fe57d27f9322cc717 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=538e612a… Author: Alexander Barton <alex(a)barton.de> Date: Mon Oct 8 12:15:34 2012 +0200 Test suite: add test for user mode "b" --- src/testsuite/message-test.e | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/testsuite/message-test.e b/src/testsuite/message-test.e index d0ffcef..4cbc066 100644 --- a/src/testsuite/message-test.e +++ b/src/testsuite/message-test.e @@ -53,6 +53,22 @@ expect { "@* PRIVMSG nick :test" } +send "mode nick +b\r" +expect { + timeout { exit 1 } + "MODE nick :+b" +} +send "privmsg nick :test\r" +expect { + timeout { exit 1 } + "976" +} +send "mode nick -b\r" +expect { + timeout { exit 1 } + "MODE nick :-b" +} + # The following two tests using "localhost" as host name # had to be disabled, because there are operating systems # out there, that use "localhost.<domain>" as host name

1 0

DNS777 : Implement user mode "b": block messages
by alex＠arthur.barton.de 08 Okt '12

08 Okt '12

Module: ngircd.git Branch: master Commit: 9d97004a287589681342a0116746796f2764100c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9d97004a… Author: DNS777 <dns(a)rbose.org> Date: Mon Oct 8 12:11:04 2012 +0200 Implement user mode "b": block messages When a user has set mode "b", all private messages and notices to this user are blocked if they don't originate from a registered user, an IRC Op, server or service. The originator gets an error numeric sent back in this case, ERR_CANNOTSENDTONICK_MSG(976), which is/was(?) used by KineIRCd, too. This closes bug #144. --- doc/Modes.txt | 1 + src/ngircd/defines.h | 2 +- src/ngircd/irc-mode.c | 1 + src/ngircd/irc.c | 11 +++++++++++ src/ngircd/messages.h | 1 + 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/Modes.txt b/doc/Modes.txt index 8d7cdd7..aee7491 100644 --- a/doc/Modes.txt +++ b/doc/Modes.txt @@ -22,6 +22,7 @@ channels he is using at the moment. mode since description a 0.3.0 User is away. + b 20 User blocks private messages and notices. B 20 User is flagged as a "bot". c 17 IRC operator wants to receive connect/disconnect NOTICEs. C 19 Only users that share a channel are allowed to send messages. diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 37ca676..977bc74 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -161,7 +161,7 @@ #endif /** Supported user modes. */ -#define USERMODES "aBcCioqrRswx" +#define USERMODES "abBcCioqrRswx" /** Supported channel modes. */ #define CHANMODES "abehiIklmMnoOPqQrRstvVz" diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index c7d02c9..ce4044d 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -215,6 +215,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) /* Validate modes */ x[0] = '\0'; switch (*mode_ptr) { + case 'b': /* Block private msgs */ case 'C': /* Only messages from clients sharing a channel */ case 'i': /* Invisible */ case 's': /* Server messages */ diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index ceb649e..1a57bec 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -500,6 +500,17 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) Req->command = "PRIVMSG"; } #endif + if (Client_HasMode(cl, 'b') && + !Client_HasMode(from, 'R') && + !Client_HasMode(from, 'o') && + !(Client_Type(from) == CLIENT_SERVER) && + !(Client_Type(from) == CLIENT_SERVICE)) { + if (SendErrors && !IRC_WriteStrClient(from, + ERR_CANNOTSENDTONICK_MSG, + Client_ID(from), Client_ID(cl))) + return DISCONNECTED; + goto send_next_target; + } if (Client_HasMode(cl, 'C')) { cl2chan = Channel_FirstChannelOf(cl); diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index ec7bb6f..59e9605 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -151,6 +151,7 @@ #define ERR_UMODEUNKNOWNFLAG2_MSG "501 %s :Unknown mode \"%c%c\"" #define ERR_USERSDONTMATCH_MSG "502 %s :Can't set/get mode for other users" #define ERR_NOINVITE_MSG "518 %s :Cannot invite to %s (+V)" +#define ERR_CANNOTSENDTONICK_MSG "976 %s :Cannot send to user (+b) -- Only registered users can message %s" #ifdef ZLIB # define RPL_STATSLINKINFOZIP_MSG "211 %s %s %d %ld %ld/%ld %ld %ld/%ld :%ld"

1 0

Alexander Barton : Fix ERR_CANNOTSENDTOCHAN_MSG message
by alex＠arthur.barton.de 07 Okt '12

07 Okt '12

Module: ngircd.git Branch: master Commit: 87deb430125413cbb2ba415936b40d6420703572 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=87deb430… Author: Alexander Barton <alex(a)barton.de> Date: Sun Oct 7 15:11:05 2012 +0200 Fix ERR_CANNOTSENDTOCHAN_MSG message This error message is not only used if one can not send to a channel because it is moderated, but for _all_ reasons when a message can not be delivered (moderated, banned, no external messages, ...), so strip the "(+m) -- Moderated" part of the error message again. Bug introduced by commit 9a82304a. --- src/ngircd/messages.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index b94a999..ec7bb6f 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -102,7 +102,7 @@ #define ERR_NOSUCHNICK_MSG "401 %s %s :No such nick or channel name" #define ERR_NOSUCHSERVER_MSG "402 %s %s :No such server" #define ERR_NOSUCHCHANNEL_MSG "403 %s %s :No such channel" -#define ERR_CANNOTSENDTOCHAN_MSG "404 %s %s :Cannot send to channel (+m) -- Moderated" +#define ERR_CANNOTSENDTOCHAN_MSG "404 %s %s :Cannot send to channel" #define ERR_TOOMANYCHANNELS_MSG "405 %s %s :You have joined too many channels" #define ERR_WASNOSUCHNICK_MSG "406 %s %s :There was no such nickname" #define ERR_NOORIGIN_MSG "409 %s :No origin specified"

1 0

Alexander Barton : Shorten filenames of Anope protocol module patchfiles
by alex＠arthur.barton.de 07 Okt '12

07 Okt '12

Module: ngircd.git Branch: master Commit: a9cbb375b77576c371c0c9b48e8e8cf64f7731a4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a9cbb375… Author: Alexander Barton <alex(a)barton.de> Date: Sun Oct 7 12:06:11 2012 +0200 Shorten filenames of Anope protocol module patchfiles Filenames have been too long and couldn't be stored in all tar archive formats ... --- ...03-Update-ngIRCd-protocol-module-for-current-Anope.patch} | 0 ...> 0004-ngircd-Do-PING-PONG-on-server-burst-to-sync.patch} | 0 ...09-ngircd-Update-protocol-module-for-current-Anope.patch} | 0 ...11-ngircd-Update-protocol-module-for-current-Anope.patch} | 0 contrib/Anope/Makefile.am | 10 +++++----- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/Anope/0003-Update-ngIRCd-protocol-module-for-current-Anope-1.9.patch b/contrib/Anope/0003-Update-ngIRCd-protocol-module-for-current-Anope.patch similarity index 100% rename from contrib/Anope/0003-Update-ngIRCd-protocol-module-for-current-Anope-1.9.patch rename to contrib/Anope/0003-Update-ngIRCd-protocol-module-for-current-Anope.patch diff --git a/contrib/Anope/0004-ngircd-Do-PING-PONG-on-server-burst-to-sync-servers.patch b/contrib/Anope/0004-ngircd-Do-PING-PONG-on-server-burst-to-sync.patch similarity index 100% rename from contrib/Anope/0004-ngircd-Do-PING-PONG-on-server-burst-to-sync-servers.patch rename to contrib/Anope/0004-ngircd-Do-PING-PONG-on-server-burst-to-sync.patch diff --git a/contrib/Anope/0009-ngircd-Update-protocol-module-for-current-Anope-1.9.patch b/contrib/Anope/0009-ngircd-Update-protocol-module-for-current-Anope.patch similarity index 100% rename from contrib/Anope/0009-ngircd-Update-protocol-module-for-current-Anope-1.9.patch rename to contrib/Anope/0009-ngircd-Update-protocol-module-for-current-Anope.patch diff --git a/contrib/Anope/0011-ngircd-Update-protocol-module-for-current-Anope-1.9.patch b/contrib/Anope/0011-ngircd-Update-protocol-module-for-current-Anope.patch similarity index 100% rename from contrib/Anope/0011-ngircd-Update-protocol-module-for-current-Anope-1.9.patch rename to contrib/Anope/0011-ngircd-Update-protocol-module-for-current-Anope.patch diff --git a/contrib/Anope/Makefile.am b/contrib/Anope/Makefile.am index 607f0bc..9da78a2 100644 --- a/contrib/Anope/Makefile.am +++ b/contrib/Anope/Makefile.am @@ -1,6 +1,6 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors +# Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -13,15 +13,15 @@ EXTRA_DIST = \ README \ 0001-Revert-Removed-ngircd.patch \ 0002-ngircd-whitespace-fixes.patch \ - 0003-Update-ngIRCd-protocol-module-for-current-Anope-1.9.patch \ - 0004-ngircd-Do-PING-PONG-on-server-burst-to-sync-servers.patch \ + 0003-Update-ngIRCd-protocol-module-for-current-Anope.patch \ + 0004-ngircd-Do-PING-PONG-on-server-burst-to-sync.patch \ 0005-ngircd-always-prefix-modes-in-CHANINFO-with.patch \ 0006-ngircd-support-user-mode-R-and-channel-mode-R.patch \ 0007-ngircd-Fix-handling-of-JOIN-commands.patch \ 0008-ngircd-Allow-setting-modes-by-clients-on-burst.patch \ - 0009-ngircd-Update-protocol-module-for-current-Anope-1.9.patch \ + 0009-ngircd-Update-protocol-module-for-current-Anope.patch \ 0010-ngircd-Add-ProtongIRCd.patch \ - 0011-ngircd-Update-protocol-module-for-current-Anope-1.9.patch \ + 0011-ngircd-Update-protocol-module-for-current-Anope.patch \ 0012-ngircd-Channel-mode-r-is-supported-now.patch \ 0013-ngircd-Update-copyright-notice.patch \ 0014-ngircd-set-unset-GLINE-s-on-AKILL-commands.patch \

1 0