März 2012 - ngIRCd GIT Updates

Alexander Barton : Fix typo: recieved -> received
by alex＠arthur.barton.de 12 Mär '12

12 Mär '12

Module: ngircd.git Branch: master Commit: 17ffda1c8a06855adb7a411734b1f7f8cc28d497 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=17ffda1c… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 12 09:47:19 2012 +0100 Fix typo: recieved -> received Thanks to Christoph Biedl. --- src/ngircd/conn.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 82dbb28..b6e6280 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1589,7 +1589,7 @@ Read_Request( CONN_ID Idx ) if (!array_catb(&My_Connections[Idx].zip.rbuf, readbuf, (size_t) len)) { Log(LOG_ERR, - "Could not append recieved data to zip input buffer (connection %d): %d bytes!", + "Could not append received data to zip input buffer (connection %d): %d bytes!", Idx, len); Conn_Close(Idx, "Receive buffer space exhausted", NULL, false); @@ -1600,7 +1600,7 @@ Read_Request( CONN_ID Idx ) { if (!array_catb( &My_Connections[Idx].rbuf, readbuf, len)) { Log(LOG_ERR, - "Could not append recieved data to input buffer (connection %d): %d bytes!", + "Could not append received data to input buffer (connection %d): %d bytes!", Idx, len); Conn_Close(Idx, "Receive buffer space exhausted", NULL, false ); }

1 0

Alexander Barton : Update NEWS and ChangeLog files
by alex＠arthur.barton.de 05 Mär '12

05 Mär '12

Module: ngircd.git Branch: master Commit: 0de11ead3663a1248ae0f0f97a2896845774a7d4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0de11ead… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 5 22:29:53 2012 +0100 Update NEWS and ChangeLog files --- ChangeLog | 7 +++++++ NEWS | 5 +++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 037ce1a..3246ef5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,13 @@ -- ChangeLog -- +ngIRCd Release 19.1 + + - Really include _all_ patchtes to build the Anope module into the + distribution archive ... ooops! + - getpid.sh: Fix testcase error for Debian using sbuild(1). + - Don't log "ngIRCd hello message" two times when starting up. + ngIRCd Release 19 (2012-02-29) - Update build system: bump config.guess and config.sub files used by diff --git a/NEWS b/NEWS index 4fa98dc..6db2d67 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,11 @@ -- NEWS -- +ngIRCd Release 19.1 + + - Really include _all_ patchtes to build the Anope module into the + distribution archive ... ooops! + ngIRCd Release 19 (2012-02-29) ngIRCd 19~rc1 (2012-02-12)

1 0

Alexander Barton : Really include _all_ patches to build the Anope module
by alex＠arthur.barton.de 05 Mär '12

05 Mär '12

Module: ngircd.git Branch: master Commit: 9d486db460c05c24e3a6b3264529a10f968cce2f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9d486db4… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 5 21:26:03 2012 +0100 Really include _all_ patches to build the Anope module --- contrib/Anope/Makefile.am | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/contrib/Anope/Makefile.am b/contrib/Anope/Makefile.am index 7670384..607f0bc 100644 --- a/contrib/Anope/Makefile.am +++ b/contrib/Anope/Makefile.am @@ -12,7 +12,21 @@ EXTRA_DIST = \ README \ 0001-Revert-Removed-ngircd.patch \ - 0002-ngircd-whitespace-fixes.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 \ + 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 \ + 0010-ngircd-Add-ProtongIRCd.patch \ + 0011-ngircd-Update-protocol-module-for-current-Anope-1.9.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 \ + 0015-ngircd-ngIRCd-supports-channel-mode-e-now.patch \ + 0016-ngircd-support-SQUERY-command.patch maintainer-clean-local: rm -f Makefile Makefile.in

1 0

Alexander Barton : Really include _all_ patchtes to build the Anope module
by alex＠arthur.barton.de 05 Mär '12

05 Mär '12

Module: ngircd.git Branch: master Commit: b512159a37d725a102d39deedbed4066e6d4abce URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b512159a… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 5 21:26:03 2012 +0100 Really include _all_ patchtes to build the Anope module --- contrib/Anope/Makefile.am | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/contrib/Anope/Makefile.am b/contrib/Anope/Makefile.am index 7670384..607f0bc 100644 --- a/contrib/Anope/Makefile.am +++ b/contrib/Anope/Makefile.am @@ -12,7 +12,21 @@ EXTRA_DIST = \ README \ 0001-Revert-Removed-ngircd.patch \ - 0002-ngircd-whitespace-fixes.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 \ + 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 \ + 0010-ngircd-Add-ProtongIRCd.patch \ + 0011-ngircd-Update-protocol-module-for-current-Anope-1.9.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 \ + 0015-ngircd-ngIRCd-supports-channel-mode-e-now.patch \ + 0016-ngircd-support-SQUERY-command.patch maintainer-clean-local: rm -f Makefile Makefile.in

1 0

Christoph Biedl : getpid.sh: Fix testcase error for Debian using sbuild
by alex＠arthur.barton.de 03 Mär '12

03 Mär '12

Module: ngircd.git Branch: master Commit: 257fe922d2c2ee822c372bc5b979075271915553 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=257fe922… Author: Christoph Biedl <ngircd.anoy(a)manchmal.in-ulm.de> Date: Sat Mar 3 18:53:03 2012 +0100 getpid.sh: Fix testcase error for Debian using sbuild When * building the ngircd Debian package (on Linux at least) and * using the sbuild build system, the command "ps -af" does not include the commands running inside the sbuild system. Therefore, start-server.sh will report a fail as getpid.sh cannot not find the ./T-ngircd1 just started although it's actually running. This results in a funny build log ... starting server 1 ... failure! FAIL: start-server1 running connect-test ... ok. PASS: connect-test The self-test of getpid.sh however will likely succeed as it's happy if it sees any process with "sh" somewhere in the name. Things go downhill from there. The confusing things are: * The alternative cowbuilder/pbuilder does not have this problem. * The alternative usage "ps ax" does fine. So, as a quick hack, the patch attached adds another switch to getpid.sh. --- src/testsuite/getpid.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh index fd3b342..19ced76 100755 --- a/src/testsuite/getpid.sh +++ b/src/testsuite/getpid.sh @@ -13,6 +13,8 @@ elif [ $UNAME = "A/UX" ]; then PS_FLAGS="-ae"; PS_PIDCOL="1"; HEAD_FLAGS="-1" elif [ $UNAME = "GNU" ]; then PS_FLAGS="-ax"; PS_PIDCOL="2"; HEAD_FLAGS="-n 1" +elif [ $UNAME = "Linux" ]; then + PS_FLAGS="ax"; PS_PIDCOL="1"; HEAD_FLAGS="-n 1" elif [ $UNAME = "SunOS" ]; then PS_FLAGS="-af"; PS_PIDCOL=2; HEAD_FLAGS="-n 1" else

1 0

Alexander Barton : Don't log "ngIRCd hello message" two times
by alex＠arthur.barton.de 02 Mär '12

02 Mär '12

Module: ngircd.git Branch: master Commit: 1068f883779ad9b8bf3e1e1b8234781e4223761d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1068f883… Author: Alexander Barton <alex(a)barton.de> Date: Fri Mar 2 09:41:13 2012 +0100 Don't log "ngIRCd hello message" two times Start "regular" logging not until the configuration file has been read in and "SyslolgFacility" is set, and log all configuration errors using the generic "daemon" facility. So if there are no configuration errors, logging starts right after parsing the configuration and we log the configuration file used _after_ reading it. But this is no problem because every configuration error message includes the configuration file name as well. (The "double hello" has been introduced by commit 3641e5110952) --- src/ngircd/conf.c | 19 +++++++++++-------- src/ngircd/log.c | 9 ++++++--- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 58ce9ca..5426900 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -58,7 +58,7 @@ static int New_Server_Idx; static char Conf_MotdFile[FNAME_LEN]; static void Set_Defaults PARAMS(( bool InitServers )); -static bool Read_Config PARAMS(( bool ngircd_starting )); +static bool Read_Config PARAMS(( bool TestOnly, bool IsStarting )); static bool Validate_Config PARAMS(( bool TestOnly, bool Rehash )); static void Handle_GLOBAL PARAMS(( int Line, char *Var, char *Arg )); @@ -206,7 +206,7 @@ ports_parse(array *a, int Line, char *Arg) GLOBAL void Conf_Init( void ) { - Read_Config( true ); + Read_Config(false, true); Validate_Config(false, false); } @@ -218,7 +218,7 @@ Conf_Init( void ) GLOBAL bool Conf_Rehash( void ) { - if (!Read_Config(false)) + if (!Read_Config(false, false)) return false; Validate_Config(false, true); @@ -299,7 +299,7 @@ Conf_Test( void ) Use_Log = false; - if (! Read_Config(true)) + if (!Read_Config(true, true)) return 1; config_valid = Validate_Config(true, false); @@ -778,7 +778,7 @@ Read_Motd(const char *filename) * successfully; false otherwise. */ static bool -Read_Config( bool ngircd_starting ) +Read_Config(bool TestOnly, bool IsStarting) { char section[LINE_LEN], str[LINE_LEN], *var, *arg, *ptr; const UINT16 defaultport = 6667; @@ -792,16 +792,19 @@ Read_Config( bool ngircd_starting ) /* No configuration file found! */ Config_Error( LOG_ALERT, "Can't read configuration \"%s\": %s", NGIRCd_ConfFile, strerror( errno )); - if (!ngircd_starting) + if (!IsStarting) return false; Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); exit( 1 ); } opers_free(); - Set_Defaults( ngircd_starting ); + Set_Defaults(IsStarting); - Config_Error( LOG_INFO, "Reading configuration from \"%s\" ...", NGIRCd_ConfFile ); + if (TestOnly) + Config_Error(LOG_INFO, + "Reading configuration from \"%s\" ...", + NGIRCd_ConfFile ); /* Clean up server configuration structure: mark all already * configured servers as "once" so that they are deleted diff --git a/src/ngircd/log.c b/src/ngircd/log.c index d81bec2..6f0c4c9 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -79,10 +79,12 @@ Log_Init(bool Daemon_Mode) #ifndef LOG_CONS /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS */ #define LOG_CONS 0 #endif - openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility); +#ifdef LOG_DAEMON + openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_DAEMON); +#else + openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, 0); +#endif #endif - - Log(LOG_NOTICE, "%s started.", NGIRCd_Version); } /* Log_Init */ @@ -100,6 +102,7 @@ Log_ReInit(void) openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility); #endif Log(LOG_NOTICE, "%s started.", NGIRCd_Version); + Log(LOG_INFO, "Using configuration file \"%s\" ...", NGIRCd_ConfFile); }

1 0