Januar 2013 - ngIRCd GIT Updates

Alexander Barton : Exit message: use singular & plural :-)
by alex＠arthur.barton.de 27 Jan '13

27 Jan '13

Module: ngircd.git Branch: master Commit: 999c11ad49ea1e9c2615e4668f23aae483e549dc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=999c11ad… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 27 23:22:00 2013 +0100 Exit message: use singular & plural :-) --- src/ngircd/log.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ngircd/log.c b/src/ngircd/log.c index 51bd2a5..375f4bc 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -109,8 +109,9 @@ Log_ReInit(void) GLOBAL void Log_Exit( void ) { - Log(LOG_NOTICE, "%s done%s, served %lu connections.", PACKAGE_NAME, - NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted()); + Log(LOG_NOTICE, "%s done%s, served %lu connection%s.", PACKAGE_NAME, + NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted(), + Conn_CountAccepted() == 1 ? "" : "s"); #ifdef SYSLOG closelog(); #endif

1 0

Alexander Barton : autogen.sh: Check for autoconf/automake wrapper scripts
by alex＠arthur.barton.de 27 Jan '13

27 Jan '13

Module: ngircd.git Branch: master Commit: c891b5f250c71c1b8f94a002c13db6035ad28305 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c891b5f2… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 27 12:54:48 2013 +0100 autogen.sh: Check for autoconf/automake wrapper scripts For example OpenBSD uses a "autoconf" and "automake" wrapper script which tells the user to set AUTOCONF_VERSION and AUTOMAKE_VERSION environment variables. This patch enhances autogen.sh to not detect these wrapper scripts as regular autoconf/automake commands but to set the required environment variables after detecting the real "command-X.Y" commands. Tested on OpenBSD 5.1. --- autogen.sh | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/autogen.sh b/autogen.sh index 08cd4c2..cab3ca6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -73,8 +73,12 @@ Search() for name in $searchlist; do $EXIST "${name}" >/dev/null 2>&1 if [ $? -eq 0 ]; then - echo "${name}" - return 0 + "${name}" --version 2>&1 \ + | grep -v "environment variable" >/dev/null 2>&1 + if [ $? -eq 0 ]; then + echo "${name}" + return 0 + fi fi done @@ -144,6 +148,15 @@ echo "Searching for required tools ..." [ -z "$AUTOCONF" ] && AUTOCONF=`Search autoconf 2` [ "$VERBOSE" = "1" ] && echo " - AUTOCONF=$AUTOCONF" +AUTOCONF_VERSION=`echo $AUTOCONF | cut -d'-' -f2-` +[ -n "$AUTOCONF_VERSION" -a "$AUTOCONF_VERSION" != "autoconf" ] \ + && export AUTOCONF_VERSION || unset AUTOCONF_VERSION +[ "$VERBOSE" = "1" ] && echo " - AUTOCONF_VERSION=$AUTOCONF_VERSION" +AUTOMAKE_VERSION=`echo $AUTOMAKE | cut -d'-' -f2-` +[ -n "$AUTOMAKE_VERSION" -a "$AUTOMAKE_VERSION" != "automake" ] \ + && export AUTOMAKE_VERSION || unset AUTOMAKE_VERSION +[ "$VERBOSE" = "1" ] && echo " - AUTOMAKE_VERSION=$AUTOMAKE_VERSION" + [ $# -gt 0 ] && CONFIGURE_ARGS=" $@" || CONFIGURE_ARGS="" [ -z "$GO" -a -n "$CONFIGURE_ARGS" ] && GO=1 @@ -195,7 +208,7 @@ done export ACLOCAL AUTOHEADER AUTOMAKE AUTOCONF # Generate files -echo "Generating files using GNU $AUTOCONF and $AUTOMAKE ..." +echo "Generating files using \"$AUTOCONF\" and \"$AUTOMAKE\" ..." Run $ACLOCAL && \ Run $AUTOCONF && \ Run $AUTOHEADER && \

1 0

Alexander Barton : autogen.sh: Don't use "egrep -o", use "sed"
by alex＠arthur.barton.de 27 Jan '13

27 Jan '13

Module: ngircd.git Branch: master Commit: 419ff38a07cb0b1637b444c96cd6868a7a9e5524 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=419ff38a… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 27 12:25:58 2013 +0100 autogen.sh: Don't use "egrep -o", use "sed" "egrep -o" isn't portable and not available on OpenBSD, for example. So let's use sed instead to get the automake version. The expression used now is less specific but should work as well ... --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index b1fa883..08cd4c2 100755 --- a/autogen.sh +++ b/autogen.sh @@ -153,7 +153,7 @@ echo "Searching for required tools ..." [ -z "$AUTOMAKE" ] && Notfound automake [ -z "$AUTOCONF" ] && Notfound autoconf -AM_VERSION=`$AUTOMAKE --version|head -n 1|egrep -o "([1-9]\.[0-9]+(\.[0-9]+)*)"` +AM_VERSION=`$AUTOMAKE --version | head -n 1 | sed -e 's/.* //g'` ifs=$IFS; IFS="."; set $AM_VERSION; IFS=$ifs AM_MAJOR="$1"; AM_MINOR="$2"; AM_PATCHLEVEL="$3" echo "Detected automake $AM_VERSION ..."

1 0

Alexander Barton : IRC_WHO_Channel(): Use strlcpy() instead of strcpy()
by alex＠arthur.barton.de 27 Jan '13

27 Jan '13

Module: ngircd.git Branch: master Commit: 8d8201502f79bfe6fdaf8e94a11544332bb9630a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8d820150… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 27 01:00:32 2013 +0100 IRC_WHO_Channel(): Use strlcpy() instead of strcpy() This fixes the following warning, at least on OpenBSD 4.8: irc-info.o(.text+0x2427): In function `IRC_WHO': src/ngircd/irc-info.c:896: warning: strcpy() is almost always misused, please use strlcpy() --- src/ngircd/irc-info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 57d6e1a..aaa607d 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -893,7 +893,8 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) is_visible = strchr(client_modes, 'i') == NULL; if (is_member || is_visible) { - strcpy(flags, who_flags_status(client_modes)); + strlcpy(flags, who_flags_status(client_modes), + sizeof(flags)); if (is_ircop) strlcat(flags, "*", sizeof(flags));

1 0

Alexander Barton : Streamline punctuation of log messages
by alex＠arthur.barton.de 26 Jan '13

26 Jan '13

Module: ngircd.git Branch: master Commit: d38d153f51738da31d40036c7c48b32d82234018 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d38d153f… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 26 16:52:41 2013 +0100 Streamline punctuation of log messages Make sure that all log messages end with a correct punctuation mark. The rules for formatting log messages are: 1. Add punctuation marks to all messages passed to the actual logging functions like Log() and LogDebug(). 2. Don't add any punctuation marks to messages that are stored in variables for later use or are passed over the network. 3. IP addresses, DNS host names and IRC server names should be quoted. 4. Messages originating in the network should be quoted (at least if they are "untrusted" or variable). Most probably this patch doesn't fix all mistakes, but it should be a good starting point ... --- src/ngircd/channel.c | 4 ++-- src/ngircd/client.c | 41 ++++++++++++++++++++++++++--------------- src/ngircd/conn.c | 29 +++++++++++++---------------- src/ngircd/io.c | 2 +- src/ngircd/irc-login.c | 11 ++++++----- src/ngircd/irc-server.c | 4 ++-- src/ngircd/irc.c | 2 +- src/ngircd/ngircd.c | 22 ++++++++++++---------- 8 files changed, 63 insertions(+), 52 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=d38d…

1 0

Alexander Barton : configure: "netinet/in_systm.h" is optional
by alex＠arthur.barton.de 24 Jan '13

24 Jan '13

Module: ngircd.git Branch: master Commit: fd260404caa7ce174ada663024d19cd789c152b5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fd260404… Author: Alexander Barton <alex(a)barton.de> Date: Thu Jan 24 22:45:00 2013 +0100 configure: "netinet/in_systm.h" is optional The header file "netinet/in_systm.h" already is optional in ngIRCd, so don't require it in the configure script. Now ngIRCd can be built on Minix 3 again :-) --- configure.ng | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ng b/configure.ng index c89096f..034b565 100644 --- a/configure.ng +++ b/configure.ng @@ -120,14 +120,14 @@ AC_HEADER_TIME # Required header files AC_CHECK_HEADERS([ \ - fcntl.h netdb.h netinet/in.h netinet/in_systm.h stdlib.h string.h \ + fcntl.h netdb.h netinet/in.h stdlib.h string.h \ strings.h sys/socket.h sys/time.h unistd.h \ ],,AC_MSG_ERROR([required C header missing!])) # Optional header files AC_CHECK_HEADERS_ONCE([ \ - arpa/inet.h inttypes.h malloc.h netinet/ip.h stdbool.h stddef.h \ - stdint.h varargs.h \ + arpa/inet.h inttypes.h malloc.h netinet/in_systm.h netinet/ip.h \ + stdbool.h stddef.h stdint.h varargs.h \ ]) # -- Datatypes --

1 0

DNS : contrib/Debian/rules: Do no compress Commands.txt
by alex＠arthur.barton.de 23 Jan '13

23 Jan '13

Module: ngircd.git Branch: master Commit: a551942635bf2569851013e5a92d8ae918af7ca0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a5519426… Author: DNS <dns(a)rbose.org> Date: Tue Jan 22 21:36:03 2013 +0100 contrib/Debian/rules: Do no compress Commands.txt This is required, because ngIRCd can't use a compressed file as help text ... (cherry picked from commit 6d09b4f366f656f6d2732ea96a653e086380e458) --- contrib/Debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/Debian/rules b/contrib/Debian/rules index 0aecde5..e02db22 100755 --- a/contrib/Debian/rules +++ b/contrib/Debian/rules @@ -216,7 +216,7 @@ binary-arch: build install dh_installdocs -a dh_installinit -a dh_strip -a --no-package=ngircd-full-dbg - dh_compress -a + dh_compress -a -XCommands.txt dh_fixperms -a dh_installdeb -a dh_shlibdeps -a

1 0

Alexander Barton : AUTHORS: Update list of contributors
by alex＠arthur.barton.de 23 Jan '13

23 Jan '13

Module: ngircd.git Branch: master Commit: b60d5a0a11e77b4197454a8ddadea20969b1ba78 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b60d5a0a… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 23 19:45:00 2013 +0100 AUTHORS: Update list of contributors --- AUTHORS | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/AUTHORS b/AUTHORS index e9a8f4e..605df2d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -28,15 +28,27 @@ Ali Shemiran <ashemira(a)ucsd.edu> Ask Bjørn Hansen <ask(a)develooper.com> Benjamin Pineau <ben(a)zouh.org> Brandon Beresini <beresini(a)google.com> +Brett Smith <brett(a)w3.org> +Brian Collins <bricollins(a)gmail.com> Bryan Caldwell <bcaldwel(a)ucsd.edu> +Christoph Biedl <ngircd.anoy(a)manchmal.in-ulm.de> +DNS <dns(a)rbose.org> Dana Dahlstrom <dana+ngIRCd(a)cs.ucsd.edu> +David Kingston <deathking1337(a)aim.com> Eric Grunow <egrunow(a)ucsd.edu> +Federico G. Schwindt <fgsch(a)lodoss.net> +Gabor Adam Toth <tg(a)tgbit.net> Goetz Hoffart <goetz(a)hoffart.de> Ilja Osthoff <i.osthoff(a)gmx.net> Jari Aalto <jari.aalto(a)cante.net> +Neale Pickett <neale(a)woozle.org> Rolf Eike Beer <eike(a)sf-mail.de> Scott Perry <scperry(a)ucsd.edu> Sean Reifschneider <jafo-rpms(a)tummy.com> +Sebastian Köhler <sebkoehler(a)whoami.org.uk> +Tassilo Schweyer <dev(a)welterde.de> +William Pitcock <nenolod(a)dereferenced.org> +xor <xorboy(a)gmail.com> Code snippets

1 0

Alexander Barton : AUTHORS: Use "email address syntax"
by alex＠arthur.barton.de 23 Jan '13

23 Jan '13

Module: ngircd.git Branch: master Commit: fae0054d3146e64c7a2cbbd631c5f48fc4d848b0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fae0054d… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 23 19:41:52 2013 +0100 AUTHORS: Use "email address syntax" --- AUTHORS | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/AUTHORS b/AUTHORS index 1d061a6..e9a8f4e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -18,29 +18,29 @@ Don't mail the people listed here directly, if possible! Main Authors ~~~~~~~~~~~~ -Alexander Barton, <alex(a)barton.de> (alex) -Florian Westphal, <fw(a)strlen.de> +Alexander Barton <alex(a)barton.de> +Florian Westphal <fw(a)strlen.de> Contributors ~~~~~~~~~~~~ -Ali Shemiran, <ashemira(a)ucsd.edu> -Ask Bjørn Hansen, <ask(a)develooper.com> -Benjamin Pineau, <ben(a)zouh.org> -Brandon Beresini, <beresini(a)google.com> -Bryan Caldwell, <bcaldwel(a)ucsd.edu> -Dana Dahlstrom, <dana+ngIRCd(a)cs.ucsd.edu> -Eric Grunow, <egrunow(a)ucsd.edu> -Goetz Hoffart, <goetz(a)hoffart.de> -Ilja Osthoff, <i.osthoff(a)gmx.net> -Jari Aalto, <jari.aalto(a)cante.net> -Rolf Eike Beer, <eike(a)sf-mail.de> -Scott Perry, <scperry(a)ucsd.edu> -Sean Reifschneider, <jafo-rpms(a)tummy.com> +Ali Shemiran <ashemira(a)ucsd.edu> +Ask Bjørn Hansen <ask(a)develooper.com> +Benjamin Pineau <ben(a)zouh.org> +Brandon Beresini <beresini(a)google.com> +Bryan Caldwell <bcaldwel(a)ucsd.edu> +Dana Dahlstrom <dana+ngIRCd(a)cs.ucsd.edu> +Eric Grunow <egrunow(a)ucsd.edu> +Goetz Hoffart <goetz(a)hoffart.de> +Ilja Osthoff <i.osthoff(a)gmx.net> +Jari Aalto <jari.aalto(a)cante.net> +Rolf Eike Beer <eike(a)sf-mail.de> +Scott Perry <scperry(a)ucsd.edu> +Sean Reifschneider <jafo-rpms(a)tummy.com> Code snippets ~~~~~~~~~~~~~ J. Kercheval: pattern matching functions -Patrick Powell, <papowell(a)astart.com>: snprintf()-function +Patrick Powell <papowell(a)astart.com>: snprintf()-function Andrew Tridgell & Martin Pool: strl{cpy|cat}()-functions

1 0

Alexander Barton : ngircd.service: Use "forking" service type
by alex＠arthur.barton.de 22 Jan '13

22 Jan '13

Module: ngircd.git Branch: master Commit: 3d49e8ac84b49be07565bc1a19759184b4006317 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3d49e8ac… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 23 00:41:02 2013 +0100 ngircd.service: Use "forking" service type Don't run ngIRCd in forground mode but let it daemonize itself. This enhances the log output of "systemctl status ngircd.service", because now ngIRCd doesn't print out its PID and timestamp on each log message which is redundant: it becomes logged by systemd/journald already. --- contrib/ngircd.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/ngircd.service b/contrib/ngircd.service index b5bab06..b71eef2 100644 --- a/contrib/ngircd.service +++ b/contrib/ngircd.service @@ -3,8 +3,8 @@ Description=Next Generation IRC Daemon After=network.target [Service] -# don't daemonize to simplify stuff -ExecStart=/usr/sbin/ngircd -n +Type=forking +ExecStart=/usr/sbin/ngircd ExecReload=/bin/kill -HUP $MAINPID [Install]

1 0