ChangeLog | 10 ++++++++++ NEWS | 5 +++++ contrib/Anope/Makefile.am | 16 +++++++++++++++- contrib/Debian/changelog | 6 ++++++ contrib/MacOSX/ngIRCd.pmdoc/index.xml | 2 +- contrib/ngircd.spec | 2 +- man/ngircd.8.tmpl | 6 +++--- man/ngircd.conf.5.tmpl | 2 +- src/ngircd/conf.c | 19 +++++++++++-------- src/ngircd/conn.c | 4 ++-- src/ngircd/irc-mode.c | 4 ++-- src/ngircd/log.c | 9 ++++++--- src/testsuite/getpid.sh | 2 ++ 13 files changed, 65 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 037ce1a..5892b16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,16 @@ -- ChangeLog -- +ngIRCd Release 19.1 (2012-03-19) + + - Fix gcc warning (v4.6.3), initialize "list" variable to NULL. + - Fix typos: "recieved" -> "received", "Please not" -> "Please note", + and fix lintian(1) warning ""hyphen-used-as-minus-sign", too. + - 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..4530de1 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,11 @@ -- NEWS -- +ngIRCd Release 19.1 (2012-03-19) + + - 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) 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 diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 205e382..0df0a2e 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (19.1-0ab1) unstable; urgency=low + + * New "upstream" release: ngIRCd 19.1. + + -- Alexander Barton Mon, 19 Mar 2012 19:18:28 +0100 + ngircd (19-0ab1) unstable; urgency=low * New "upstream" release: ngIRCd 19. diff --git a/contrib/MacOSX/ngIRCd.pmdoc/index.xml b/contrib/MacOSX/ngIRCd.pmdoc/index.xml index 6eccddb..34b3baa 100644 --- a/contrib/MacOSX/ngIRCd.pmdoc/index.xml +++ b/contrib/MacOSX/ngIRCd.pmdoc/index.xml @@ -156,7 +156,7 @@ Each version is given a distinguishing version number. If the Program specifies {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural -\f0\fs26 \cf0 Please not:\ +\f0\fs26 \cf0 Please note:\ \ \pard\tx260\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li260\fi-260\ql\qnatural\pardirnatural \cf0 \'95 You diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index e1d5d12..122c56f 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 19 +%define version 19.1 %define release 1 %define prefix %{_prefix} diff --git a/man/ngircd.8.tmpl b/man/ngircd.8.tmpl index cc2498d..f0703f3 100644 --- a/man/ngircd.8.tmpl +++ b/man/ngircd.8.tmpl @@ -1,7 +1,7 @@ .\" .\" ngircd(8) manual page template .\" -.TH ngircd 8 "Jul 2011" ngircd "ngIRCd Manual" +.TH ngircd 8 "Mar 2012" ngircd "ngIRCd Manual" .SH NAME ngIRCd \- the next generation IRC daemon .SH SYNOPSIS @@ -78,7 +78,7 @@ It's wise to use "ngircd \-\-configtest" to validate the configuration file after changing it. .SH DEBUGGING When ngIRCd is compiled with debug code, that is, its source code has -been ./configure'd with "--enable-debug" and/or "--enable-sniffer" (witch +been ./configure'd with "\-\-enable\-debug" and/or "\-\-enable\-sniffer" (witch enables debug mode automatically as well), you can use two more command line options and two more signals to debug problems with the daemon itself or IRC clients: @@ -91,7 +91,7 @@ Enable debug mode and log extra messages. \fB\-s\fR, \fB\-\-sniffer\fR Enable IRC protocol sniffer, which logs all sent and received IRC commands to the console/syslog. This option requires that ngIRCd has been ./configure'd -with "--enable-sniffer" and enables debug mode automatically, too. +with "\-\-enable\-sniffer" and enables debug mode automatically, too. .PP \fBSignals:\fR .TP diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 236883e..85cf73f 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 "Jun 2011" ngircd "ngIRCd Manual" +.TH ngircd.conf 5 "Mar 2012" ngircd "ngIRCd Manual" .SH NAME ngircd.conf \- configuration file of ngIRCd .SH SYNOPSIS 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/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 ); } diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 80b2949..fa35cdd 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -856,7 +856,7 @@ Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern) { const char *mask; - struct list_head *list; + struct list_head *list = NULL; long int current_count; assert(Client != NULL); @@ -923,7 +923,7 @@ Del_From_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern) { const char *mask; - struct list_head *list; + struct list_head *list = NULL; assert(Client != NULL); assert(Channel != NULL); 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); } 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