November 2012 - ngIRCd GIT Updates

Alexander Barton : ngIRCd 20~rc1
by alex＠arthur.barton.de 11 Nov '12

11 Nov '12

Module: ngircd.git Branch: master Commit: 0a26079af2f5ee2bf5d0c67d1c701abf77d3cd56 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0a26079a… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 11 16:03:40 2012 +0100 ngIRCd 20~rc1 --- ChangeLog | 1 + NEWS | 1 + contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7146ae1..4c825ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ ngIRCd + ngIRCd 20~rc1 (2012-11-11) - Update doc/Services.txt: describe the upcoming version of Anope 1.9.8, then including a protocol module for ngIRCd. And remove our own patches in ./contrib/Anope because they aren't supported any more ... diff --git a/NEWS b/NEWS index 8997a02..43f1c8d 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,7 @@ ngIRCd + ngIRCd 20~rc1 (2012-11-11) - Update doc/Services.txt: describe the upcoming version of Anope 1.9.8, then including a protocol module for ngIRCd. And remove our own patches in ./contrib/Anope because they aren't supported any more ... diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index d1438c8..7d97009 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (20~rc1-0ab1) unstable; urgency=low + + * New "upstream" release candidate 1 for ngIRCd Release 20. + + -- Alexander Barton <alex(a)barton.de> Sun, 11 Nov 2012 16:03:32 +0100 + ngircd (19.2-0ab1) unstable; urgency=low * New "upstream" release: ngIRCd 19.2. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index aeb10f2..22b6e44 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 19.2 +%define version 20~rc1 %define release 1 %define prefix %{_prefix}

1 0

Alexander Barton : Update Xcode project files
by alex＠arthur.barton.de 11 Nov '12

11 Nov '12

Module: ngircd.git Branch: master Commit: b6e49f3920193a202d78fec134092976e159ed90 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b6e49f39… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 11 12:40:47 2012 +0100 Update Xcode project files --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index e4722bd..a2cad27 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -801,7 +801,7 @@ GCC_WARN_UNUSED_PARAMETER = YES; GCC_WARN_UNUSED_VALUE = YES; INSTALL_PATH = /usr/local/bin; - PRODUCT_NAME = ngIRCd; + PRODUCT_NAME = ngircd; }; name = Default; }; @@ -809,11 +809,12 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - CODE_SIGN_IDENTITY = "Developer ID Application: Alexander Barton"; - GCC_VERSION = 4.2; + CODE_SIGN_IDENTITY = ""; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - SDKROOT = macosx10.6; + MACOSX_DEPLOYMENT_TARGET = 10.6; + SDKROOT = ""; }; name = Default; }; @@ -823,11 +824,12 @@ ARCHS = "$(NATIVE_ARCH_ACTUAL)"; GCC_DEBUGGING_SYMBOLS = full; GCC_OPTIMIZATION_LEVEL = 0; - GCC_VERSION = 4.2; + GCC_VERSION = ""; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; + SDKROOT = ""; }; name = Debug; }; @@ -854,7 +856,7 @@ GCC_WARN_UNUSED_PARAMETER = YES; GCC_WARN_UNUSED_VALUE = YES; INSTALL_PATH = /usr/local/bin; - PRODUCT_NAME = ngIRCd; + PRODUCT_NAME = ngircd; }; name = Debug; };

1 0

Alexander Barton : conf.c: Use strlcpy() instead of strcpy()
by alex＠arthur.barton.de 11 Nov '12

11 Nov '12

Module: ngircd.git Branch: master Commit: 4123118d5a1a92e74fb82131b29f65d5067442dc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4123118d… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 11 11:18:53 2012 +0100 conf.c: Use strlcpy() instead of strcpy() This fixes the following warning of gcc on OpenBSD 5.0: conf.c:728: warning: strcpy() is almost always misused, please use strlcpy() --- src/ngircd/conf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index da7ff84..bea4d61 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -725,7 +725,8 @@ Set_Defaults(bool InitServers) strlcpy(Conf_Chroot, CHROOT_DIR, sizeof(Conf_Chroot)); strcpy(Conf_CloakHost, ""); strcpy(Conf_CloakHostModeX, ""); - strcpy(Conf_CloakHostSalt, ngt_RandomStr(random, RANDOM_SALT_LEN)); + strlcpy(Conf_CloakHostSalt, ngt_RandomStr(random, RANDOM_SALT_LEN), + sizeof(Conf_CloakHostSalt)); Conf_CloakUserToNick = false; Conf_ConnectIPv4 = true; #ifdef WANT_IPV6

1 0

Alexander Barton : tool.h: Don't check for and #define PF_INET
by alex＠arthur.barton.de 11 Nov '12

11 Nov '12

Module: ngircd.git Branch: master Commit: e29d198700a9e1c026d7f4b2601d127045adbe53 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e29d1987… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 11 11:05:21 2012 +0100 tool.h: Don't check for and #define PF_INET This is correctly handled by ipaddr/ng_ipaddr.h today, and the check in tool.h isn't required any more -- and caused errors on OpenBSD 5.0: In file included from ./../tool/tool.h:23: /usr/include/arpa/inet.h:74: warning: "struct in_addr" declared inside parameter list --- src/tool/tool.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/tool/tool.h b/src/tool/tool.h index 9fa19e5..b05649a 100644 --- a/src/tool/tool.h +++ b/src/tool/tool.h @@ -19,12 +19,6 @@ #include "portab.h" -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#else -# define PF_INET AF_INET -#endif - GLOBAL void ngt_TrimLastChr PARAMS((char *String, const char Chr )); GLOBAL void ngt_TrimStr PARAMS((char *String ));

1 0

Alexander Barton : conf-ssl.h: Use "gnutls_session_t" instead of " gnutls_session"
by alex＠arthur.barton.de 11 Nov '12

11 Nov '12

Module: ngircd.git Branch: master Commit: 6f531a3c99ca267370b8f77cd3e51d751fb48826 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6f531a3c… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 11 10:49:06 2012 +0100 conf-ssl.h: Use "gnutls_session_t" instead of "gnutls_session" This fixes the following warning with current versions of GnuTLS: conf-ssl.h:36: warning: "gnutls_session" is deprecated --- src/ngircd/conf-ssl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/conf-ssl.h b/src/ngircd/conf-ssl.h index 428bcf4..22897ef 100644 --- a/src/ngircd/conf-ssl.h +++ b/src/ngircd/conf-ssl.h @@ -33,7 +33,7 @@ struct ConnSSL_State { SSL *ssl; #endif #ifdef HAVE_LIBGNUTLS - gnutls_session gnutls_session; + gnutls_session_t gnutls_session; void *cookie; /* pointer to server configuration structure (for outgoing connections), or NULL. */ #endif

1 0

Alexander Barton : Add new IRC+ server flag "X": "XOP modes supported"
by alex＠arthur.barton.de 10 Nov '12

10 Nov '12

Module: ngircd.git Branch: master Commit: 53917fa4b80753fc189ed5a516c06c804f2cf415 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=53917fa4… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 10 23:33:19 2012 +0100 Add new IRC+ server flag "X": "XOP modes supported" This flag indicates, that the server supports the enhanced "xop channel user modes", like channel owner, admin, and halfop. This information is used to make sure that no unsupported CHANINFO commands are sent to servers not supporting such mode prefixes, for example. --- doc/Protocol.txt | 3 +++ src/ngircd/defines.h | 2 +- src/ngircd/numeric.c | 17 +++++++++-------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/doc/Protocol.txt b/doc/Protocol.txt index 516a4a4..9a8ddf6 100644 --- a/doc/Protocol.txt +++ b/doc/Protocol.txt @@ -89,6 +89,9 @@ The following <serverflags> are defined at the moment: - S: The server supports the SERVICE command (on this link). +- X: Server supports XOP channel modes (owner, admin, halfop) and supports + these user prefixes in CHANINFO commands, for example. + - Z: Compressed server links are supported by the server. Example for a complete <flags> string: "ngircd|0.7.5:CZ". diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index b2de98d..dcdd440 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -157,7 +157,7 @@ #ifdef IRCPLUS /** Standard IRC+ flags. */ -# define IRCPLUSFLAGS "CHLMS" +# define IRCPLUSFLAGS "CHLMSX" #endif /** Supported user modes. */ diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c index 3fc8c46..f48cc21 100644 --- a/src/ngircd/numeric.c +++ b/src/ngircd/numeric.c @@ -48,12 +48,11 @@ Announce_Channel(CLIENT *Client, CHANNEL *Chan) CL2CHAN *cl2chan; CLIENT *cl; char str[LINE_LEN], *ptr; - bool njoin; + bool njoin, xop; - if (Conn_Options(Client_Conn(Client)) & CONN_RFC1459) - njoin = false; - else - njoin = true; + /* Check features of remote server */ + njoin = Conn_Options(Client_Conn(Client)) & CONN_RFC1459 ? false : true; + xop = strchr(Client_Flags(Client), 'X') ? true : false; /* Get all the members of this channel */ cl2chan = Channel_FirstMember(Chan); @@ -67,13 +66,15 @@ Announce_Channel(CLIENT *Client, CHANNEL *Chan) * (if user is channel operator or has voice) */ if (str[strlen(str) - 1] != ':') strlcat(str, ",", sizeof(str)); - if (strchr(Channel_UserModes(Chan, cl), 'q')) + + /* Prepare user prefix (ChanOp, voiced, ...) */ + if (xop && strchr(Channel_UserModes(Chan, cl), 'q')) strlcat(str, "~", sizeof(str)); - if (strchr(Channel_UserModes(Chan, cl), 'a')) + if (xop && strchr(Channel_UserModes(Chan, cl), 'a')) strlcat(str, "&", sizeof(str)); if (strchr(Channel_UserModes(Chan, cl), 'o')) strlcat(str, "@", sizeof(str)); - if (strchr(Channel_UserModes(Chan, cl), 'h')) + if (xop && strchr(Channel_UserModes(Chan, cl), 'h')) strlcat(str, "%", sizeof(str)); if (strchr(Channel_UserModes(Chan, cl), 'v')) strlcat(str, "+", sizeof(str));

1 0

Alexander Barton : Update autoconf/automake version numbers in doc/ HowToRelease.txt
by alex＠arthur.barton.de 10 Nov '12

10 Nov '12

Module: ngircd.git Branch: master Commit: 646218e6f4d936b7448b2b407ffb6a53650658de URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=646218e6… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 10 21:50:36 2012 +0100 Update autoconf/automake version numbers in doc/HowToRelease.txt --- doc/HowToRelease.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/HowToRelease.txt b/doc/HowToRelease.txt index d4d82bc..429c3d8 100644 --- a/doc/HowToRelease.txt +++ b/doc/HowToRelease.txt @@ -40,7 +40,7 @@ a) Make sure the source tree is in a releasable state ;-) b) Make sure you have working versions of GNU autoconf and GNU automake installed on the system you use for generating the release: - as of October 2010 we are using GNU autoconf 2.61 and GNU automake 1.10.1 + as of October 2010 we are using GNU autoconf 2.67 and GNU automake 1.11.1 which seem to work just fine. c) Update the files describing the new release:

1 0

Alexander Barton : Update NEWS and ChangeLog files
by alex＠arthur.barton.de 10 Nov '12

10 Nov '12

Module: ngircd.git Branch: master Commit: 4185c4a44aeb69ee6b970809a1f604e600ee88eb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4185c4a4… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 10 21:49:02 2012 +0100 Update NEWS and ChangeLog files --- ChangeLog | 27 +++++++++++++++++++++++++++ NEWS | 17 +++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/ChangeLog b/ChangeLog index 296c23f..7146ae1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,33 @@ ngIRCd + - Update doc/Services.txt: describe the upcoming version of Anope 1.9.8, + then including a protocol module for ngIRCd. And remove our own patches + in ./contrib/Anope because they aren't supported any more ... + - Implement new "METADATA" command which can be used by remote servers + and IRC services to update client metadata like the client info text + ("real name"), user name, and hostname, and use this command to + configure an cloaked hostname (user mode "+x") on remote servers: + This prevents "double cloaking" of hostnames and even cloaked + hostnames are in sync on all servers supporting "METADATA" now. + - Fix error message when trying to join non-predefined channels and the + "PredefChannelsOnly" configuration option is set. + - Implement new IRC "SVSNICK" command to allow remote servers (and IRC + services) to change nicknames of already registered users. The SVSNICK + command itself doesn't change the nickname, but it becomes forwarded + to the server to which the user is connected to. And then this server + initiates the real nickname changing using regular NICK commands. + This allows to run mixed networks with old servers not supporting the + SVSNICK command, because SVSNICK commands for nicknames on such servers + are silently ignored and don't cause a desynchronization of the network. + - Make server reconnect time a little bit more random, so that two + servers trying to connect to each other asynchronously don't try this + in exactly the same time periods and kick each other off ... + - Don't accept connections for servers already being linked: there was a + time frame that could result in one connection overwriting the other, + e. g. the incoming connection overwriting the status of the outgoing + one. And this could lead to all kind of weirdness (even crashes!) later + on: now such incoming connections are dropped. - New configuration option "MaxListSize" to configure the maximum number of channels returned by a LIST command. The default is 100, as before. - Implement user mode "b", "block messages": when a user has set mode "b", diff --git a/NEWS b/NEWS index b6a5efd..8997a02 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,23 @@ ngIRCd + - Update doc/Services.txt: describe the upcoming version of Anope 1.9.8, + then including a protocol module for ngIRCd. And remove our own patches + in ./contrib/Anope because they aren't supported any more ... + - Implement new "METADATA" command which can be used by remote servers + and IRC services to update client metadata like the client info text + ("real name"), user name, and hostname, and use this command to + configure an cloaked hostname (user mode "+x") on remote servers: + This prevents "double cloaking" of hostnames and even cloaked + hostnames are in sync on all servers supporting "METADATA" now. + - Implement new IRC "SVSNICK" command to allow remote servers (and IRC + services) to change nicknames of already registered users. The SVSNICK + command itself doesn't change the nickname, but it becomes forwarded + to the server to which the user is connected to. And then this server + initiates the real nickname changing using regular NICK commands. + This allows to run mixed networks with old servers not supporting the + SVSNICK command, because SVSNICK commands for nicknames on such servers + are silently ignored and don't cause a desynchronization of the network. - New configuration option "MaxListSize" to configure the maximum number of channels returned by a LIST command. The default is 100, as before. - Implement user mode "b", "block messages": when a user has set mode "b",

1 0

Alexander Barton : Remove Anope "ngircd" protocol module patches
by alex＠arthur.barton.de 10 Nov '12

10 Nov '12

Module: ngircd.git Branch: master Commit: 45b0bb5aff6157409ea88b344c34b7bf84dc8886 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=45b0bb5a… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 4 13:58:25 2012 +0100 Remove Anope "ngircd" protocol module patches Starting with Anope 1.9.8, the ngIRCd protocol module is included in the Anope distribution, so there's no longer any need to support our own (but now heavily outdated!) patches. Therefore remove them. --- configure.ng | 1 - contrib/Anope/0001-Revert-Removed-ngircd.patch | 496 -------------------- contrib/Anope/0002-ngircd-whitespace-fixes.patch | 60 --- ...-ngIRCd-protocol-module-for-current-Anope.patch | 128 ----- ...ircd-Do-PING-PONG-on-server-burst-to-sync.patch | 93 ---- ...ircd-always-prefix-modes-in-CHANINFO-with.patch | 29 -- ...cd-support-user-mode-R-and-channel-mode-R.patch | 47 -- ...0007-ngircd-Fix-handling-of-JOIN-commands.patch | 96 ---- ...d-Allow-setting-modes-by-clients-on-burst.patch | 38 -- ...-Update-protocol-module-for-current-Anope.patch | 143 ------ contrib/Anope/0010-ngircd-Add-ProtongIRCd.patch | 57 --- ...-Update-protocol-module-for-current-Anope.patch | 29 -- ...12-ngircd-Channel-mode-r-is-supported-now.patch | 25 - .../0013-ngircd-Update-copyright-notice.patch | 28 -- ...gircd-set-unset-GLINE-s-on-AKILL-commands.patch | 35 -- ...ngircd-ngIRCd-supports-channel-mode-e-now.patch | 27 -- .../Anope/0016-ngircd-support-SQUERY-command.patch | 35 -- contrib/Anope/Makefile.am | 34 -- contrib/Anope/README | 35 -- contrib/Makefile.am | 4 +- contrib/README | 3 - 21 files changed, 2 insertions(+), 1441 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=45b0…

1 0

Alexander Barton : doc/Services.txt: Update documentation for Anope 1.9.8
by alex＠arthur.barton.de 10 Nov '12

10 Nov '12

Module: ngircd.git Branch: master Commit: c7db2f8429c161835f6a9ed4523f45c23918892b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c7db2f84… Author: Alexander Barton <alex(a)barton.de> Date: Sat Nov 10 21:24:55 2012 +0100 doc/Services.txt: Update documentation for Anope 1.9.8 Starting with Anope 1.9.8, the ngIRCd protocol module is rewritten from scratch by "DukePyrolator" and included in the Anope distribution. So no patching is required any more, yeah! Drawback: Anope 1.9.8 is in development and not yet released ... --- doc/Services.txt | 48 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/doc/Services.txt b/doc/Services.txt index 26d1d7e..f51bd48 100644 --- a/doc/Services.txt +++ b/doc/Services.txt @@ -9,12 +9,12 @@ -- Services.txt -- -At the moment, ngIRCd doesn't implement a "special IRC services interface". -But services acting as a "regular server" are supported, either using the IRC -protocol defined in RFC 1459 or RFC 2812. +ngIRCd doesn't implement a "special IRC services interface", but services +acting as a "regular servers" ("pseudo servers") are supported, either +using the IRC protocol as defined in RFC 1459 or RFC 2812. Support for Services has been tested using - - Anope 1.9.4 or later (<http://www.anope.org/>) + - Anope 1.9.8 or later (<http://www.anope.org/>; unreleased!) - Atheme 7.0.2 or later (<http://www.atheme.net>) - "IRC Services" 5.1.x by Andrew Church (<http://achurch.org/services/>) @@ -44,13 +44,21 @@ Example: Setting up Anope 1.9.x ~~~~~~~~~~~~~~~~~~~~~~ -Anope 1.9.4 (and above) can be used with ngIRCd using a preliminary "ngircd" -protocol module contained in our contrib/Anope/ directory. Please see the -file contrib/Anope/README for installation instructions! +Anope 1.9.8 or later (<http://www.anope.org/>; unreleased as of 2012-11-10) +may be used with ngIRCd using the "ngircd" protocol module. +Until Anope 1.9.8 is released, you have to use the sources from the Anope +development GIT tree, see <http://sourceforge.net/projects/anope/develop/>! -After patching and installing Anope, at least the following configuration -variables have to be adjusted in data/services.conf, in addition to all the -settings marked as required: +At least the following settings have to be tweaked, in addition to all the +settings marked as required by Anope: + +In conf/services.conf: + + define + { + name = "services.host" + value = "services.irc.net" + } uplink { @@ -59,10 +67,24 @@ settings marked as required: password = "123abc" } - serverinfo + # Load ngIRCd protocol module + module { name = "ngircd" } + + networkinfo + { + # Must be set to the "MaxNickLength" setting of ngIRCd! + nicklen = 9 + + chanlen = 50 + } + +In conf/nickserv.conf: + + nickserv { - name = "services.irc.net" - type = "ngircd" + # not required if you are running ngIRCd with a higher nickname limit + # ("MaxNickLength") than 11 characters, but REQUIRED by default! + guestnickprefix = "G-" }

1 0