August 2009 - ngIRCd GIT Updates

Florian Westphal : do not add default listening port if ssl ports were specified
by fw＠arthur.barton.de 31 Aug '09

31 Aug '09

Module: ngircd.git Branch: master Commit: cf7e19193b79af0711c5a03ac7da33bd84947b16 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cf7e1919… Author: Florian Westphal <fw(a)strlen.de> Date: Mon Aug 31 19:42:59 2009 +0200 do not add default listening port if ssl ports were specified Cosmo Kastemaa reported that its impossible to create an ssl-only setup, as ngircd binds to port 6667 by default, even if setting "Ports =". Only add the default port if _both_ "Ports" and "SSLPorts" are unspecified. Fixes bugzilla #98. --- man/ngircd.conf.5.tmpl | 3 ++- src/ngircd/conf.c | 24 ++++++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 8e5b254..a725af6 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -75,7 +75,8 @@ command. .TP \fBPorts\fR Ports on which the server should listen. There may be more than one port, -separated with commas (","). Default: 6667. +separated with commas (","). Default: 6667, unless \fBSSL_Ports\fR are also +specified. .TP \fBSSLPorts\fR Same as \fBPorts\fR , except that ngIRCd will expect incoming connections diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index eccf13c..1d1bb48 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -543,6 +543,16 @@ Set_Defaults( bool InitServers ) static bool +no_listenports(void) +{ + unsigned int cnt = array_bytes(&Conf_ListenPorts); +#ifdef SSL_SUPPORT + cnt += array_bytes(&Conf_SSLOptions.ListenPorts); +#endif + return cnt == 0; +} + +static bool Read_Config( bool ngircd_starting ) { /* Read configuration file. */ @@ -698,12 +708,14 @@ Read_Config( bool ngircd_starting ) Conf_Server[New_Server_Idx] = New_Server; } - if (0 == array_length(&Conf_ListenPorts, sizeof(UINT16))) { - if (!array_copyb(&Conf_ListenPorts, (char*) &defaultport, sizeof defaultport)) { - Config_Error( LOG_ALERT, "Could not add default listening Port %u: %s", - (unsigned int) defaultport, strerror(errno)); - exit( 1 ); - } + /* not a single listening port? Add default. */ + if (no_listenports() && + !array_copyb(&Conf_ListenPorts, (char*) &defaultport, sizeof defaultport)) + { + Config_Error(LOG_ALERT, "Could not add default listening Port %u: %s", + (unsigned int) defaultport, strerror(errno)); + + exit(1); } if (!Conf_ListenAddress)

1 0

Alexander Barton : Fix LSB header of Debian init script
by alex＠arthur.barton.de 29 Aug '09

29 Aug '09

Module: ngircd.git Branch: master Commit: 5f1e43416a7ff8185928ce8538b8d0826c61b93f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5f1e4341… Author: Alexander Barton <alex(a)barton.de> Date: Sat Aug 29 23:57:39 2009 +0200 Fix LSB header of Debian init script --- contrib/Debian/ngircd.init | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/Debian/ngircd.init b/contrib/Debian/ngircd.init index f308dd2..e550747 100755 --- a/contrib/Debian/ngircd.init +++ b/contrib/Debian/ngircd.init @@ -5,8 +5,8 @@ # ### BEGIN INIT INFO -# Provides: ngircd ircd -# Required-Start: $network $local_fs +# Provides: ngircd +# Required-Start: $network $remote_fs # Required-Stop: # Should-Start: $syslog $named # Should-Stop: $syslog

1 0

Alexander Barton : Use AM_SILENT_RULES([yes]), if available
by alex＠arthur.barton.de 16 Aug '09

16 Aug '09

Module: ngircd.git Branch: master Commit: 5debe205097ed6c7b17e15a1798a32a7393b26fa URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5debe205… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 16 16:08:21 2009 +0200 Use AM_SILENT_RULES([yes]), if available Starting with GNU automake 1.11 "AM_SILENT_RULES([yes])" is available to make the build process less verbose ("Linux 2.6 style") which helps to spot warning and error messages. So we use it if it is available. --- configure.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in index 6738dd6..d10f6ec 100644 --- a/configure.in +++ b/configure.in @@ -18,6 +18,8 @@ AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.6) AM_CONFIG_HEADER(src/config.h) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + # -- Templates for config.h -- AH_TEMPLATE([DEBUG], [Define if debug-mode should be enabled])

1 0

Alexander Barton : Update NEWS and ChangeLog for next release
by alex＠arthur.barton.de 12 Aug '09

12 Aug '09

Module: ngircd.git Branch: master Commit: a7eef6666bf534c6cb3c395db429fb80bb8bee19 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a7eef666… Author: Alexander Barton <alex(a)barton.de> Date: Wed Aug 12 14:48:33 2009 +0200 Update NEWS and ChangeLog for next release --- ChangeLog | 12 ++++++++++++ NEWS | 6 ++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index adba5f6..2300d1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,18 @@ -- ChangeLog -- +ngIRCd Release 14.2 + + - Updated doc/Platforms.txt and include new script contrib/platformtest.sh + to ease generating platform reports. + - Fix connection information for already registered connections. + - Enforce upper limit on maximum number of handled commands. This implements + a throttling scheme: an IRC client can send up to 3 commands or 256 bytes + per second before a one second pause is enforced. + - Fix connection counter. + - Fix a few error handling glitches for SSL/TLS connections. + - Minor fixes to manual pages and documentation. + ngIRCd Release 14.1 (2009-05-05) - Security: fix remotely triggerable crash in SSL/TLS code. diff --git a/NEWS b/NEWS index 25494c2..d386de2 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,12 @@ -- NEWS -- +ngIRCd Release 14.2 + + - Enforce upper limit on maximum number of handled commands. This implements + a throttling scheme: an IRC client can send up to 3 commands or 256 bytes + per second before a one second pause is enforced. + ngIRCd Release 14.1 (2009-05-05) - Security: fix remotely triggerable crash in SSL/TLS code.

1 0

Alexander Barton : Updated doc/Platforms.txt
by alex＠arthur.barton.de 04 Aug '09

04 Aug '09

Module: ngircd.git Branch: master Commit: 56a8abc253d0565a75fb9066ec933dc7db96b93a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=56a8abc2… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 4 22:53:38 2009 +0200 Updated doc/Platforms.txt --- doc/Platforms.txt | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 32eefdb..8a1282e 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2008 Alexander Barton + (c)2001-2009 Alexander Barton alex(a)barton.de, http://www.barton.de/ ngIRCd is free software and published under the @@ -31,26 +31,28 @@ hppa/unknown/openbsd3.5 gcc 2.95.3 CVSHEAD 04-05-25 alex Y Y Y Y hppa1.1/unknown/linux-gnu gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y hppa2.0/unknown/linux-gnu gcc 3.3.5 13~rc1 08-12-02 alex Y Y Y Y hppa2.0w-hp-hpux11.11 gcc 4.2.3 14.1 09-07-22 goetz Y Y Y Y -i386/apple/darwin9.5.1 gcc 4.0.1 13~rc1 08-12-02 alex Y Y Y Y (3) +i386/apple/darwin9.7.0 gcc 4.0.1 14.1 09-08-04 alex Y Y Y Y (3) +i386/apple/darwin10.0.0b2 gcc 4.2.1 14.1 09-07-27 alex Y Y Y Y (3) i386/pc/solaris2.9 gcc 3.2.2 CVSHEAD 04-02-24 alex Y Y Y Y -i386/pc/solaris2.11 gcc 3.4.3 13~rc1 08-12-03 alex Y Y Y Y (4) +i386/pc/solaris2.11 gcc 3.4.3 14.1 09-08-03 alex Y Y Y Y (4) i386/unknown/freebsd5.2.1 gcc 3.3.3 0.8.0 04-05-30 alex Y Y Y Y i386/unknown/freebsd6.0 gcc 3.4.4 0.10.0-p1 06-08-04 alex Y Y Y Y (3) i386/unknown/freebsd6.1 gcc 3.4.4 CVSHEAD 06-05-07 fw Y Y Y Y (3) -i386/unknown/freebsd6.2 gcc 3.4.6 13~rc1 08-12-04 alex Y Y Y Y (3) -i386/unknown/freebsd7.0 gcc 4.2.1 13~rc1 08-12-04 alex Y Y Y Y (3) +i386/unknown/freebsd6.2 gcc 3.4.6 14.1 09-07-27 alex Y Y Y Y (3) +i386/unknown/freebsd7.0 gcc 4.2.1 14.1 09-07-28 alex Y Y Y Y (3) +i386/unknown/freebsd7.2 gcc 4.2.1 14.1 09-08-03 alex Y Y Y Y (3) i386/unknown/gnu0.3 gcc 3.3.3 0.8.0 04-05-30 alex Y Y n Y -i686/unknown/gnu0.3 gcc 4.3.1 13~rc1 08-12-05 alex Y Y Y Y +i686/unknown/gnu0.3 gcc 4.3.1 14.1 09-07-28 alex Y Y Y Y i386/unknown/netbsdelf1.6.1 gcc 2.95.3 CVSHEAD 04-02-24 alex Y Y Y Y i386/unknown/netbsdelf3.0.1 gcc 3.3.3 0.10.0-p1 06-08-30 alex Y Y Y Y (3) -i386/unknown/netbsdelf4.0 gcc 4.1.2 13~rc1 08-12-05 alex Y Y Y Y (3) +i386/unknown/netbsdelf4.0 gcc 4.1.2 14.1 09-07-28 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 13~rc1 08-12-05 alex Y Y Y Y (3) +i386/unknown/openbsd4.1 gcc 3.3.5 14.1 09-07-28 alex Y Y Y Y (3) i686/pc/cygwin gcc 3.3.1 0.8.0 04-05-30 alex Y Y n Y i686/pc/linux-gnu gcc 2.95.4 0.8.0 04-05-30 alex Y Y Y Y (1) -i686/pc/linux-gnu gcc 3.3.5 13~rc1 08-12-05 alex Y Y Y Y (1) +i686/pc/linux-gnu gcc 3.3.5 14.1 09-08-04 alex Y Y Y Y (1) i386/pc/linux-gnu gcc 4.1.2 13~rc1 08-12-05 alex Y Y Y Y (1) -i386/pc/linux-gnu gcc 4.3.2 13~rc1 08-12-05 alex Y Y Y Y (1) +i686/pc/linux-gnu gcc 4.3.2 14.1 09-08-04 alex Y Y Y Y (1) m68k/apple/aux3.1.1 Orig. A/UX 0.7.x-CVS 03-04-22 alex Y Y Y Y (2) m68k/hp/hp-ux9.10 Orig. HPUX 0.7.x-CVS 03-04-30 goetz Y Y Y Y m88k/dg/dgux5.4R3.10 gcc 2.5.8 CVSHEAD 04-03-15 alex Y Y ? ? @@ -63,13 +65,13 @@ powerpc/unknown/openbsd3.6 gcc 2.95.3 0.10.0 06-10-08 alex Y Y n Y sparc/sun/solaris2.6 gcc 2.95.3 0.7.x-CVS 03-04-22 alex Y Y Y Y sparc/sun/solaris2.7 gcc 3.3 0.8.0 04-05-30 alex Y Y Y Y sparc/unkn./netbsdelf1.6.1 gcc 2.95.3 0.8.0 04-05-30 alex Y Y Y Y -x86_64/unknown/linux-gnu 4.3.2 13~rc1 08-12-05 alex Y Y Y Y (5) +x86_64/unknown/linux-gnu gcc 4.3.2 14.1 09-08-04 alex Y Y Y Y (1) Notes ~~~~~ -(1) i686/pc/linux-gnu: +(1) i686/pc/linux-gnu & x86_64/unknown/linux-gnu: ngIRCd has been tested with various Linux distributions, such as SuSE, RedHat, Debian, and Gentoo using Kernels 2.2.x, 2.4.x and 2.6.x with various versions of the GNU C compiler (starting with 2.95.x and up to

1 0

Alexander Barton : New script contrib/platformtest.sh
by alex＠arthur.barton.de 04 Aug '09

04 Aug '09

Module: ngircd.git Branch: master Commit: 21bb2bd65808dbeacc5959a9ac3bc4fd9b3087c7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=21bb2bd6… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 4 22:30:59 2009 +0200 New script contrib/platformtest.sh This script analyzes the build process of ngIRCd and generates output suitable for inclusion in doc/Platforms.txt. --- contrib/README | 3 + contrib/platformtest.sh | 143 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+), 0 deletions(-) diff --git a/contrib/README b/contrib/README index 353e2bb..6593fdd 100644 --- a/contrib/README +++ b/contrib/README @@ -28,5 +28,8 @@ ngircd-redhat.init ngircd.spec - RPM "spec" file. +platformtest.sh + - Build ngIRCd and output a "result line" suitable for doc/Platforms.txt. + systrace.policy - Systrace policy file for OpenBSD (and probably NetBSD). diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh new file mode 100755 index 0000000..aee7f29 --- /dev/null +++ b/contrib/platformtest.sh @@ -0,0 +1,143 @@ +#!/bin/sh +# +# ngIRCd -- The Next Generation IRC Daemon +# Copyright (c)2001-2009 Alexander Barton <alex(a)barton.de> +# +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# Please read the file COPYING, README and AUTHORS for more information. +# + +# This script analyzes the build process of ngIRCd and generates output +# suitable for inclusion in doc/Platforms.txt -- please send reports +# to the ngIRCd mailing list: <ngircd-ml(a)ngircd.barton.de>. + +NAME=`basename "$0"` +VERBOSE= + +PLATFORM= +COMPILER="unknown" +VERSION="unknown" +DATE=`date "+%y-%m-%d"` + +CONFIGURE= +MAKE= +CHECK= +RUN= +COMMENT= + +while [ $# -gt 0 ]; do + case "$1" in + "-v") + VERBOSE=1 + ;; + *) + echo "Usage: $NAME [-v]" + exit 2 + esac + shift +done + +echo "$NAME: Checking ngIRCd base source directory ..." +grep "ngIRCd" ./ChangeLog >/dev/null 2>&1 +if [ $? -ne 0 ]; then + grep "ngIRCd" ../ChangeLog >/dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "$NAME: ngIRCd base source directory not found!?" + exit 1 + fi + cd .. +fi + +echo "$NAME: Checking for ./configure script ..." +if [ ! -e ./configure ]; then + echo "$NAME: Not found. Running ./autogen.sh ..." + [ -n "$VERBOSE" ] && ./autogen.sh || ./autogen.sh >/dev/null +fi + +if [ -e ./configure ]; then + echo "$NAME: Running \"./configure\" script ..." + [ -n "$VERBOSE" ] && ./configure || ./configure >/dev/null + if [ $? -eq 0 -a -e ./Makefile ]; then + CONFIGURE=1 + echo "$NAME: Running \"make\" ..." + [ -n "$VERBOSE" ] && make || make >/dev/null + if [ $? -eq 0 -a -x src/ngircd/ngircd ]; then + MAKE=1 + echo "$NAME: Running \"make check\" ..." + [ -n "$VERBOSE" ] && make check || make check >/dev/null + if [ $? -eq 0 ]; then + CHECK=1 + RUN=$CHECK + else + ./src/ngircd/ngircd --help 2>/dev/null \ + | grep "^ngircd" >/dev/null + [ $? -eq 0 ] && RUN=1 + fi + fi + fi +fi + +# Get target platform information +if [ -r "src/config.h" ]; then + CPU=`grep "TARGET_CPU" "src/config.h" | cut -d'"' -f2` + OS=`grep "TARGET_OS" "src/config.h" | cut -d'"' -f2` + VENDOR=`grep "TARGET_VENDOR" "src/config.h" | cut -d'"' -f2` + PLATFORM="$CPU/$VENDOR/$OS" +fi +if [ -z "$PLATFORM" ]; then + PLATFORM="`uname 2>/dev/null` `uname -r 2>/dev/null`, `uname -m 2>/dev/null`" +fi + +# Get compiler information +if [ -r "Makefile" ]; then + eval $(grep "^CC = " Makefile | sed -e 's/ //g') + $CC --version 2>&1 | grep -i "GCC" >/dev/null + if [ $? -eq 0 ]; then + COMPILER=$($CC --version | head -n 1 | awk "{ print \$3 }" \ + | cut -d'-' -f1) + COMPILER="gcc $COMPILER" + fi +fi + +# Get ngIRCd version information +if [ -d ".git" ]; then + VERSION=`git log --abbrev-commit --pretty=oneline HEAD~1.. \ + | cut -d' ' -f1 | tr -d '.'` +elif [ -r "Makefile" ]; then + eval $(grep "^VERSION = " Makefile | sed -e 's/ //g') +fi +[ -n "$VERSION" ] || VERSION="unknown" + +# Get IO interface information +if [ "$OS" = "linux-gnu" ]; then + COMMENT="(1)" +else + grep "^#define HAVE_SYS_DEVPOLL_H 1" src/config.h >/dev/null 2>&1 + [ $? -eq 0 ] && COMMENT="(4)" + grep "^#define HAVE_EPOLL_CREATE 1" src/config.h >/dev/null 2>&1 + [ $? -eq 0 ] && COMMENT="(5)" + grep "^#define HAVE_KQUEUE 1" src/config.h >/dev/null 2>&1 + [ $? -eq 0 ] && COMMENT="(3)" +fi + +[ -n "$CONFIGURE" ] && C="Y" || C="N" +[ -n "$MAKE" ] && M="Y" || M="N" +[ -n "$CHECK" ] && T="Y" || T="N" +[ -n "$RUN" ] && R="Y" || R="N" +[ -n "$COMMENT" ] && COMMENT=" $COMMENT" + +echo +echo " the executable works (\"runs\") as expected --+" +echo " tests run successfully (\"make check\") --+ |" +echo " ngIRCd compiles (\"make\") --+ | |" +echo " ./configure works --+ | | |" +echo " | | | |" +echo "Platform Compiler ngIRCd Date Tester C M T R See" +echo "--------------------------- ------------ ---------- -------- ------ - - - - ---" +printf "%-27s %-12s %-10s %s %-6s %s %s %s %s%s" \ + "$PLATFORM" "$COMPILER" "$VERSION" "$DATE" "$USER" \ + "$C" "$M" "$T" "$R" "$COMMENT" +echo; echo

1 0