- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Commands.txt: Import descriptions from "rbose/ command_help"
by alex＠arthur.barton.de 10 Feb '13

10 Feb '13

Module: ngircd.git Branch: master Commit: 73fded75150a72c68b4c382d90e6d7c3374d5f6c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=73fded75… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 23 15:16:33 2013 +0100 Commands.txt: Import descriptions from "rbose/command_help" Import command description texts from the "rbose/command_help" branch, which have been written by DNS <dns(a)rbose.org> -- thanks a lot! --- doc/Commands.txt | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+) diff --git a/doc/Commands.txt b/doc/Commands.txt index c879092..c6e0637 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -46,16 +46,35 @@ Connection Handling Commands ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - CAP + See doc/Capabilities.txt - CHARCONV + See doc/Protocol.txt - NICK + NICK <nick> + . + Change your nickname to <nick>. - PASS + PASS <password> <version> <flags> [<options>] + . + Set a connection <password>. This command must be sent before the + NICK/USER registration combination. + . + See doc/Protocol.txt for more info. - PING + PING <server1> [<server2>] + . + Tests the presence of a connection. A PING message results in a PONG + reply. If <server2> is specified, the message gets passed on to it. - PONG + PONG <server1> [<server2>] + . + This command is a reply to the PING command and works in much the + same way. - QUIT QUIT [<quit-message>] @@ -66,14 +85,28 @@ Connection Handling Commands channels that you are a member of when leaving. - USER + USER <user> <modes> <realname> + . + This command is used at the beginning of a connection to specify the + <user>name, hostname, <realname> and initial user <modes> of the + connecting client. + . + <realname> may contain spaces, and thus must be prefixed with a colon. - WEBIRC + See doc/Protocol.txt General Commands ~~~~~~~~~~~~~~~~ - AWAY + AWAY [<message>] + . + Provides the server with a message to automatically send in reply to a + PRIVMSG directed at the user, but not to a channel they are on. + . + If <message> is omitted, the away status is removed. - HELP HELP [<command>] @@ -93,10 +126,29 @@ General Commands - MODE + MODE <nickname> <flags> (user) + MODE <channel> <flags> [<args>] + . + The MODE command is dual-purpose. It can be used to set both (user) and + <channel> modes. + . + See doc/Modes.txt for more information. - NOTICE + NOTICE <target> <notice> + . + Send <notice> to <target> (nick or channel). + . + This command works similarly to PRIVMSG, except automatic replies must + never be sent in reply to NOTICE messages. - PRIVMSG + PRIVMSG <target> <message> + . + Send <message> to <target> (nick or channel). + . + Common IRC clients use MSG as PRIVMSG alias. + (Some clients use "QUERY <nick> [<message>]" to open a private chat.) Status and Informational Commands @@ -109,72 +161,239 @@ Status and Informational Commands If no server name has been given, the local server will respond. - INFO + INFO [<server>] + . + Show the version, birth & online time of the current IRC server. + If <server> has been given, it shows the INFO of the specific <server>. - ISON + ISON <nicknames> + . + Queries the server to see if the clients in the space-separated list + <nicknames> are currently on the network. + . + The server returns only the <nicknames> that are on the network in a + space-separated list. If none of the clients are on the network the + server returns an empty list. - LINKS + LINKS [<remote server> [<server mask>]] + . + Lists all server links matching <server mask>, if given, + on <remote server>, or the current server if omitted. - LUSERS + LUSERS [<mask> [<server>]] + . + Return statistics about the size of the network. If called with no + arguments, the statistics will reflect the entire network. + . + If <mask> is given, it will return only statistics reflecting the + masked subset of the network. + If <server> is given, the command will be forwarded to <server> + for evaluation. - MOTD + MOTD [<server>] + . + Show "Message Of The Day" of the current server or specified <server>. - NAMES + NAMES [<channels> [<server>]] + . + Returns a list of who is on the comma-separated list of <channels>, + by channel name. + . + If <channels> is omitted, all users are shown, grouped by channel name + with all users who are not on a channel being shown as part of channel + "*". + If <server> is specified, the command is sent to <server> for + evaluation. - STATS + STATS <flag> [<server>] + . + Returns statistics about the current server, or of a specified <server>. + . + STATS flags: + . + g = G-Lines (Network-wide bans) + k = K-Lines (Server-local bans) + l = Link status (Parent server and own link) + m = IRC command status (usage count) + u = Server uptime - TIME + TIME [<server>] + . + Show the local time of the current server, or of a specified <server>. - TRACE + TRACE [<server>] + . + Trace a path across the IRC network of the current server, or if given + of a specific <server>, in a similar method to traceroute. - USERHOST + USERHOST <nicknames> + . + Show the user-host of <nicknames> (seperated by space). + "-" means <nick> is away, + "+" means <nick> is available, + "*" indicates your connection. - VERSION + VERSION [<server>] + . + Show the ngIRCd version of the current server, or specified <server>. - WHO + WHO [<target> ["o"]] + . + Returns a list of users who match <target> (nick, hostmask or channel). + . + If the flag "o" is given, the server will only return information about + IRC Operators. - WHOIS + WHOIS [<server>] <nicknames> + . + Returns information about the comma-separated list of <nicknames>. + . + If <server> is given, the command is forwarded to it for processing. - WHOWAS + WHOWAS <nickname> [<count> [<server>]] + . + Used to return information about <nicknames> that are no longer in use + (due to client disconnection, or nickname changes). + . + If given, the server will return information from the last <count> times + the nickname has been used. + If <server> is given, the command is forwarded to it for processing. Channel Commands ~~~~~~~~~~~~~~~~ - INVITE + INVITE <nick> <channel> + . + Invites <nick> to <channel>. + <channel> does not have to exist, but if it does, only members of the + channel are allowed to invite other clients. + . + If the <channel> mode "+i" is set, only <channel> operators may invite + other clients. - JOIN + JOIN <channels> [<channel-keys>] + . + Makes the client join the <channels> (comma-separated list), specifying + the passwords, if needed, in the comma-separated <channel-keys> list. + A <channel-key> is only needed, if the <channel> mode "+k" is set. + . + If the channel(s) do not exist, then they will be created. - KICK + KICK <channel> <nick> [<kick-message>] + . + Remove <nick> from <channel>, optional with a <kick-message>. + . + Only <channel> operators are able to KICK. - LIST + LIST [<channels> [<server>]] + . + List all visible <channels> (comma-seperated list) on the current + server. + If <server> is given, the command will be forwarded to <server> for + evaluation. - PART + PART <channels> [<part-message>] + . + Leave <channels> (comma-separated list), optional with a + <part-message>. - TOPIC + TOPIC <channel> <topic> + . + Set a <topic> for <channel>. + . + Only <channel> operators are able to set a <topic>. Administrative Commands ~~~~~~~~~~~~~~~~~~~~~~~ - CONNECT + CONNECT <target server> [<port> [<remote server> [<mypwd> <peerpwd>]]] + . + Instructs the current server, or <remote server> if specified, + to connect to <target server>. + . + To connect <remote server> you need to have remote oper status. + If <port> is omitted, it uses the server port of the configuration. + If <mypwd> and <peerpwd> is given, it uses those passwords instead + of the ones in the configuration. - DIE + DIE + . + Instructs the server to shut down. - DISCONNECT + DISCONNECT [<remote server>] + . + Disconnects the current server, or <remote server> if specified. + To disconnect a <remote server> you need to have remote oper status. - GLINE + GLINE <nick!user@hostmask> <seconds> :<reason> + . + This command provides timed G-Lines (Network-wide bans). + If a client matches a G-Line, it cannot connect to any server on + the IRC network. If you put 0 as <seconds>, it makes the G-Line + permanent. + . + To remove a G-Line, type "GLINE <nick!user@hostmask>". + To list the G-Lines, type "STATS g". - KILL + KILL <nick> <reason> + . + Forcibly removes <nick> from the IRC network with a <reason>. - KLINE + KLINE <nick!user@hostmask> <seconds> :<reason> + . + This command provides timed K-Lines (Server-local bans). + If a client matches a K-Line, it cannot connect to the issued server. + If you put 0 as <seconds>, it makes the K-Line permanent. + . + To remove a K-Line, type "KLINE <nick!user@hostmask>". + To list the K-Lines, type "STATS k". - OPER + OPER <user> <password> + . + Authenticates <user> as an IRC operator on the current server/network. - REHASH + REHASH + . + Causes the server to re-read and re-process its configuration file(s). - RESTART + RESTART + . + Restart the server. - WALLOPS + WALLOPS <message> + . + Sends <message> to all users with user mode "+w". IRC Service Commands @@ -193,6 +412,12 @@ Server Protocol Commands ~~~~~~~~~~~~~~~~~~~~~~~~ - CHANINFO + CHANINFO <channel> +<modes> [[<key> <limit>] <topic>] + . + CHANINFO is used by servers to inform each other about a channel: + its modes, channel key, user limits and its topic. + . + See doc/Protocol.txt for more information. - ERROR ERROR [<message> [<> [...]]] @@ -204,12 +429,22 @@ Server Protocol Commands This command is silently ignored on non-server and non-service links. - METADATA + METADATA <target> <key> <value> + . + The METADATA command is used on server-links to update "metadata" + information of clients, like the hostname, the info text ("real name"), + or the user name. + . + See doc/Protocol.txt for more information. - NJOIN - SERVER - SQUIT + SQUIT <server> + . + Disconnects an IRC Server from the network. Dummy Commands

1 0

Alexander Barton : Commands.txt: Add description for the "CAP" command
by alex＠arthur.barton.de 10 Feb '13

10 Feb '13

Module: ngircd.git Branch: master Commit: 18ecc2fd811d3419c597fc31663f3f4a0e14824b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=18ecc2fd… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 3 18:59:44 2013 +0100 Commands.txt: Add description for the "CAP" command --- doc/Commands.txt | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index c6e0637..ac77c65 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -46,7 +46,41 @@ Connection Handling Commands ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - CAP - See doc/Capabilities.txt + CAP LS + CAP LIST + CAP REQ <capabilities> + CAP ACK <capabilities> + CAP NAK <capabilities> + CAP CLEAR + CAP END + . + List, request, and clear "IRC Capabilities". + . + Using this command, an IRC client can request additional "IRC + capabilities" during login or later on, which influences the + communication between server and client. Normally, these commands + aren't directly used by humans, but automatically by their client + software. And please note that issuing such commands manually can + irritate the client software used, because of the "non-standard" + behavior of the server! + . + - CAP LS: list all available capabilities. + - CAP LIST: list active capabilities of this connection. + - CAP REQ: Request particular capabilities. + - CAP ACK: Acknowledge a set of capabilities to be enabled/disabled. + - CAP NAK: Reject a set of capabilities. + - CAP CLEAR: Clear all set capabilities. + - CAP END: Indicate end of capability negotiation during login, + ignored in an fully registered session. + + Please note that the <capabilities> must be given in a single + parameter but whitespace separated, therefore a command could look + like this: "CAP REQ :capability1 capability2 capability3" for example. + + References: + - <http://ircv3.atheme.org/specification/capability-negotiation-3.1> + - <http://ngircd.barton.de/doc/Capabilities.txt> + - doc/Capabilities.txt - CHARCONV See doc/Protocol.txt

1 0

Alexander Barton : "WHO <hostmask>": use displayed hostname for matching
by alex＠arthur.barton.de 08 Feb '13

08 Feb '13

Module: ngircd.git Branch: master Commit: 1e8b775a7a6d0c390e037bd73332072e7c510525 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1e8b775a… Author: Alexander Barton <alex(a)barton.de> Date: Fri Feb 8 17:18:43 2013 +0100 "WHO <hostmask>": use displayed hostname for matching Use the currently "displayed hostname" (which can be cloaked!) for hostname matching, not the real one. In other words: don't display all the cloaked users on a specific real hostname! Thanks to DNS <dns(a)rbose.org> for reporting this issue. --- src/ngircd/irc-info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index e9c1ff5..f9c9b0d 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -951,7 +951,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps) if (Mask) { /* Match pattern against user host/server/name/nick */ client_match = MatchCaseInsensitive(Mask, - Client_Hostname(c)); + Client_HostnameDisplayed(c)); if (!client_match) client_match = MatchCaseInsensitive(Mask, Client_ID(Client_Introducer(c)));

1 0

Alexander Barton : Rename ports_initlisteners() to Init_Listeners()
by alex＠arthur.barton.de 03 Feb '13

03 Feb '13

Module: ngircd.git Branch: master Commit: f16d230530424f93541b4ca36e2686ddfb76834a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f16d2305… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 27 21:10:50 2013 +0100 Rename ports_initlisteners() to Init_Listeners() --- src/ngircd/conn.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 07f26f3..14d337b 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -454,7 +454,7 @@ Conn_CloseAllSockets(int ExceptOf) * @returns Number of listening sockets created. */ static unsigned int -ports_initlisteners(array *a, const char *listen_addr, void (*func)(int,short)) +Init_Listeners(array *a, const char *listen_addr, void (*func)(int,short)) { unsigned int created = 0; size_t len; @@ -470,8 +470,9 @@ ports_initlisteners(array *a, const char *listen_addr, void (*func)(int,short)) continue; } if (!io_event_create( fd, IO_WANTREAD, func )) { - Log( LOG_ERR, "io_event_create(): Could not add listening fd %d (port %u): %s!", - fd, (unsigned int) *port, strerror(errno)); + Log(LOG_ERR, + "io_event_create(): Can't add fd %d (port %u): %s!", + fd, (unsigned int) *port, strerror(errno)); close(fd); port++; continue; @@ -500,7 +501,8 @@ Conn_InitListeners( void ) /* can't use Conf_ListenAddress directly, see below */ copy = strdup(Conf_ListenAddress); if (!copy) { - Log(LOG_CRIT, "Cannot copy %s: %s", Conf_ListenAddress, strerror(errno)); + Log(LOG_CRIT, "Cannot copy %s: %s", Conf_ListenAddress, + strerror(errno)); return 0; } listen_addr = strtok(copy, ","); @@ -508,9 +510,11 @@ Conn_InitListeners( void ) while (listen_addr) { ngt_TrimStr(listen_addr); if (*listen_addr) { - created += ports_initlisteners(&Conf_ListenPorts, listen_addr, cb_listen); + created += Init_Listeners(&Conf_ListenPorts, + listen_addr, cb_listen); #ifdef SSL_SUPPORT - created += ports_initlisteners(&Conf_SSLOptions.ListenPorts, listen_addr, cb_listen_ssl); + created += Init_Listeners(&Conf_SSLOptions.ListenPorts, + listen_addr, cb_listen_ssl); #endif }

1 0

Alexander Barton : NewListener(): Code cleanup
by alex＠arthur.barton.de 03 Feb '13

03 Feb '13

Module: ngircd.git Branch: master Commit: 3a3b3225d42ede7a062fa5e4403a7f445baf518b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3a3b3225… Author: Alexander Barton <alex(a)barton.de> Date: Sun Jan 27 20:57:25 2013 +0100 NewListener(): Code cleanup --- src/ngircd/conn.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 142cf23..07f26f3 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -620,8 +620,9 @@ NewListener(const char *listen_addr, UINT16 Port) af = ng_ipaddr_af(&addr); sock = socket(af, SOCK_STREAM, 0); - if( sock < 0 ) { - Log(LOG_CRIT, "Can't create socket (af %d) : %s!", af, strerror(errno)); + if (sock < 0) { + Log(LOG_CRIT, "Can't create socket (af %d) : %s!", af, + strerror(errno)); return -1; } @@ -632,21 +633,22 @@ NewListener(const char *listen_addr, UINT16 Port) if (bind(sock, (struct sockaddr *)&addr, ng_ipaddr_salen(&addr)) != 0) { Log(LOG_CRIT, "Can't bind socket to address %s:%d - %s!", - ng_ipaddr_tostr(&addr), Port, strerror(errno)); + ng_ipaddr_tostr(&addr), Port, strerror(errno)); close(sock); return -1; } - if( listen( sock, 10 ) != 0 ) { - Log( LOG_CRIT, "Can't listen on socket: %s!", strerror( errno )); - close( sock ); + if (listen(sock, 10) != 0) { + Log(LOG_CRIT, "Can't listen on socket: %s!", strerror(errno)); + close(sock); return -1; } /* keep fd in list so we can close it when ngircd restarts/shuts down */ - if (!array_catb( &My_Listeners,(char*) &sock, sizeof(int) )) { - Log( LOG_CRIT, "Can't add socket to My_Listeners array: %s!", strerror( errno )); - close( sock ); + if (!array_catb(&My_Listeners, (char *)&sock, sizeof(int))) { + Log(LOG_CRIT, "Can't add socket to My_Listeners array: %s!", + strerror(errno)); + close(sock); return -1; }

1 0

Alexander Barton : Enable WHOIS to display information about IRC Services
by alex＠arthur.barton.de 03 Feb '13

03 Feb '13

Module: ngircd.git Branch: master Commit: 84a599ece472c4f2ef6d2f553addf898e0ed73f9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=84a599ec… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 3 21:32:53 2013 +0100 Enable WHOIS to display information about IRC Services This patch introduces the new numeric 310(RPL_WHOISSERVICE) and enables WHOIS to display information about IRC services. This numeric is used for this purpose by InspIRCd, for example -- but as usual, other numerics are in use, too, like 613 in UltimateIRCd ... Please note that neither the Operator (+o) not the "bot status" (+B) of an IRC service id displayed in the output. Change suggested by Federico G. Schwindt <fgsch(a)lodoss.net>, Thanks. --- src/ngircd/irc-info.c | 13 ++++++++++--- src/ngircd/messages.h | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index aaa607d..e9c1ff5 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1133,14 +1133,20 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) return DISCONNECTED; } + /* Service? */ + if (Client_Type(c) == CLIENT_SERVICE && + !IRC_WriteStrClient(from, RPL_WHOISSERVICE_MSG, + Client_ID(from), Client_ID(c))) + return DISCONNECTED; + /* IRC-Operator? */ - if (Client_HasMode(c, 'o') && + if (Client_HasMode(c, 'o') && Client_Type(c) != CLIENT_SERVICE && !IRC_WriteStrClient(from, RPL_WHOISOPERATOR_MSG, Client_ID(from), Client_ID(c))) return DISCONNECTED; /* IRC-Bot? */ - if (Client_HasMode(c, 'B') && + if (Client_HasMode(c, 'B') && Client_Type(c) != CLIENT_SERVICE && !IRC_WriteStrClient(from, RPL_WHOISBOT_MSG, Client_ID(from), Client_ID(c))) return DISCONNECTED; @@ -1262,7 +1268,8 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) */ if (!has_wildcards || is_remote) { c = Client_Search(query); - if (c && Client_Type(c) == CLIENT_USER) { + if (c && (Client_Type(c) == CLIENT_USER + || Client_Type(c) == CLIENT_SERVICE)) { if (!IRC_WHOIS_SendReply(Client, from, c)) return DISCONNECTED; } else { diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index a6a6d8c..371abc2 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -56,6 +56,7 @@ #define RPL_UNAWAY_MSG "305 %s :You are no longer marked as being away" #define RPL_NOWAWAY_MSG "306 %s :You have been marked as being away" #define RPL_WHOISREGNICK_MSG "307 %s %s :is a registered nick" +#define RPL_WHOISSERVICE_MSG "310 %s %s :is an IRC service" #define RPL_WHOISUSER_MSG "311 %s %s %s %s * :%s" #define RPL_WHOISSERVER_MSG "312 %s %s %s :%s" #define RPL_WHOISOPERATOR_MSG "313 %s %s :is an IRC operator"

1 0

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: 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 : 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 : 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