ngIRCd GIT Updates Oktober 2013

ngircd-commits@lists.barton.de

1 Teilnehmer
33 Diskussionen

Tag rel-21-rc2: Alexander Barton : ngIRCd Release 21~rc2
by alex＠arthur.barton.de 20 Okt '13

20 Okt '13

Module: ngircd.git Branch: refs/tags/rel-21-rc2 Tag: e07d7d4c67112746e9661795d70ec8b054e7e9c9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=tag;h=e07d7d4c671… Tagger: Alexander Barton <alex(a)barton.de> Date: Sun Oct 20 15:51:34 2013 +0200 ngIRCd Release 21~rc2

1 0

Alexander Barton : ngIRCd Release 21~rc2
by alex＠arthur.barton.de 20 Okt '13

20 Okt '13

Module: ngircd.git Branch: master Commit: 788b3002d8f7340e709dda2de94dfdd812f1c400 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=788b3002… Author: Alexander Barton <alex(a)barton.de> Date: Sun Oct 20 15:51:03 2013 +0200 ngIRCd Release 21~rc2 --- ChangeLog | 15 +++++++++++++-- NEWS | 6 +++++- contrib/Debian/changelog | 6 ++++++ contrib/ngircd.spec | 2 +- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce17367..6d787fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,8 +9,19 @@ -- ChangeLog -- -ngIRCd 21~rc1 (2013-10-05) - +ngIRCd 21~rc2 (2013-10-20) + + - Report the correct configuration file name on configuration errors, + support longer configuration lines, and warn when lines are truncated. + - Use arc4random() function to generate "random" numbers, when available. + - platformtest.sh: Detect clang compiler, and clean up GIT source tree + before building (when possible). + - Update (date of) manual pages. + - Update "Upgrade Information" in INSTALL file, add more systems to + doc/Platforms.txt, and fix spelling in NEWS and ChangeLog files =:) + - Fix remaining compiler warnings on OpenBSD. + + ngIRCd 21~rc1 (2013-10-05) - Actually KILL clients on GLINE/KLINE. (Closes bug #156) - Adjust log messages for invalid and spoofed prefixes, which cleans up logging of commands related to already KILL'ed clients. And don't diff --git a/NEWS b/NEWS index 785ce03..f1696c7 100644 --- a/NEWS +++ b/NEWS @@ -9,8 +9,12 @@ -- NEWS -- -ngIRCd 21~rc1 (2013-10-05) +ngIRCd 21~rc2 (2013-10-20) + - Report the correct configuration file name on configuration errors, + support longer configuration lines, and warn when lines are truncated. + + ngIRCd 21~rc1 (2013-10-05) - Actually KILL clients on GLINE/KLINE. (Closes bug #156) - Add support to show all user links using the "STATS L" (uppercase) command (restricted to IRC Operators). diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog index 46646fc..a8aba17 100644 --- a/contrib/Debian/changelog +++ b/contrib/Debian/changelog @@ -1,3 +1,9 @@ +ngircd (21~rc2-0ab1) unstable; urgency=low + + * New "upstream" release candidate 2 for ngIRCd Release 21. + + -- Alexander Barton <alex(a)barton.de> Sun, 20 Oct 2013 15:50:03 +0200 + ngircd (21~rc1-0ab1) unstable; urgency=low * New "upstream" release candidate 1 for ngIRCd Release 21. diff --git a/contrib/ngircd.spec b/contrib/ngircd.spec index 65df307..dd30d1c 100644 --- a/contrib/ngircd.spec +++ b/contrib/ngircd.spec @@ -1,5 +1,5 @@ %define name ngircd -%define version 21~rc1 +%define version 21~rc2 %define release 1 %define prefix %{_prefix}

1 0

Alexander Barton : platformtest.sh: Detect clang compilers
by alex＠arthur.barton.de 20 Okt '13

20 Okt '13

Module: ngircd.git Branch: master Commit: beb9f65dc8dfb4517ab59512ddaf1e111a4e3132 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=beb9f65d… Author: Alexander Barton <alex(a)barton.de> Date: Sun Oct 20 15:25:19 2013 +0200 platformtest.sh: Detect clang compilers --- contrib/platformtest.sh | 7 ++++--- doc/Platforms.txt | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index 6b154bb..ba0a45e 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -120,11 +120,12 @@ if [ -r "Makefile" ]; then fi else # Non-GCC compiler - $CC --version 2>&1 | grep -i "LLVM" >/dev/null + $CC --version 2>&1 | grep -i "clang" >/dev/null if [ $? -eq 0 ]; then COMPILER=$($CC --version 2>/dev/null | head -1 \ - | cut -d'(' -f1 | sed -e 's/version //g' \ - | sed -e 's/Apple /A-/g') + | cut -d'(' -f1 | cut -d'-' -f1 \ + | sed -e 's/version //g' | sed -e 's/Apple /A-/g' \ + | sed -e 's/Debian //g' | sed -e 's/LLVM /clang /g') fi $CC -version 2>&1 | grep -i "tcc" >/dev/null if [ $? -eq 0 ]; then diff --git a/doc/Platforms.txt b/doc/Platforms.txt index d489375..ef426a3 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -74,8 +74,10 @@ 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/apple/darwin12.3.0 gcc 4.2.1 20.2 13-04-01 alex Y Y Y Y (3) +x86_64/apple/darwin13.0.0 A-clang 5.0 21~rc1 13-10-16 alex Y Y Y Y (3) x86_64/unknown/freebsd8.1 gcc 4.2.1 20~rc1 12-11-13 alex Y Y Y Y (3) x86_64/unkn./freebsd8.1-gnu gcc 4.4.5 19 12-02-26 alex Y Y Y Y (3) +x86_64/unknown/linux-gnu clang 3.2 21~rc1 13-10-16 alex Y Y Y Y (1) x86_64/unknown/linux-gnu gcc 4.4.5 20.2 13-04-01 alex Y Y Y Y (1) x86_64/unknown/linux-gnu Open64 20.3 13-10-16 goetz Y Y Y Y (1) x86_64/unknown/linux-gnu tcc 0.9.25 20.3 13-10-16 goetz Y Y Y Y (1)

1 0

Federico G. Schwindt : Add support for longer config lines
by alex＠arthur.barton.de 18 Okt '13

18 Okt '13

Module: ngircd.git Branch: master Commit: 62865f7e1910d08ad8d72cb89f830f6d9411ffa2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=62865f7e… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Oct 17 22:10:53 2013 +0100 Add support for longer config lines With the introduction of CipherList we could have longer config lines. Handle up to 1024 bytes and warn if the line will be truncated. --- src/ngircd/client.c | 2 +- src/ngircd/conf.c | 10 ++++++++-- src/ngircd/defines.h | 2 +- src/ngircd/hash.c | 2 +- src/ngircd/irc-login.c | 2 +- src/ngircd/irc-server.c | 2 +- src/ngircd/numeric.c | 4 ++-- src/ngircd/parse.c | 2 +- 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index b1a371f..5f01648 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -238,7 +238,7 @@ Client_Destroy( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool Sen /* remove a client */ CLIENT *last, *c; - char msg[LINE_LEN]; + char msg[COMMAND_LEN]; const char *txt; assert( Client != NULL ); diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 372b14c..1627587 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1063,7 +1063,7 @@ static void Read_Config_File(const char *File, FILE *fd) /* Read configuration file */ section[0] = '\0'; while (true) { - if (!fgets(str, LINE_LEN, fd)) + if (!fgets(str, sizeof(str), fd)) break; ngt_TrimStr(str); line++; @@ -1072,6 +1072,12 @@ static void Read_Config_File(const char *File, FILE *fd) if (str[0] == ';' || str[0] == '#' || str[0] == '\0') continue; + if (strlen(str) >= sizeof(str) - 1) { + Config_Error(LOG_WARNING, "%s, line %d too long!", + File, line); + continue; + } + /* Is this the beginning of a new section? */ if ((str[0] == '[') && (str[strlen(str) - 1] == ']')) { strlcpy(section, str, sizeof(section)); @@ -1474,7 +1480,7 @@ Handle_GLOBAL(const char *File, int Line, char *Var, char *Arg ) len = strlen(Arg); if (len == 0) return; - if (len >= LINE_LEN) { + if (len >= 127) { Config_Error_TooLong(File, Line, Var); return; } diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index efe3186..361564f 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -36,7 +36,7 @@ /* Generic buffer sizes */ /** Max. length of a line in the configuration file. */ -#define LINE_LEN 256 +#define LINE_LEN 1024 /** Max. length of a log message. */ #define MAX_LOG_MSG_LEN 256 diff --git a/src/ngircd/hash.c b/src/ngircd/hash.c index c75b57d..3c60038 100644 --- a/src/ngircd/hash.c +++ b/src/ngircd/hash.c @@ -37,7 +37,7 @@ static UINT32 jenkins_hash PARAMS((UINT8 *k, UINT32 length, UINT32 initval)); GLOBAL UINT32 Hash( const char *String ) { - char buffer[LINE_LEN]; + char buffer[COMMAND_LEN]; strlcpy(buffer, String, sizeof(buffer)); return jenkins_hash((UINT8 *)ngt_LowerStr(buffer), diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index d1b4033..4695272 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -630,7 +630,7 @@ GLOBAL bool IRC_QUIT( CLIENT *Client, REQUEST *Req ) { CLIENT *target; - char quitmsg[LINE_LEN]; + char quitmsg[COMMAND_LEN]; assert(Client != NULL); assert(Req != NULL); diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index 030c3cd..b0abb7c 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -53,7 +53,7 @@ GLOBAL bool IRC_SERVER( CLIENT *Client, REQUEST *Req ) { - char str[LINE_LEN]; + char str[100]; CLIENT *from, *c; int i; diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c index a43739f..ad7e042 100644 --- a/src/ngircd/numeric.c +++ b/src/ngircd/numeric.c @@ -47,7 +47,7 @@ Announce_Channel(CLIENT *Client, CHANNEL *Chan) { CL2CHAN *cl2chan; CLIENT *cl; - char str[LINE_LEN], *ptr; + char str[COMMAND_LEN], *ptr; bool njoin, xop; /* Check features of remote server */ @@ -82,7 +82,7 @@ Announce_Channel(CLIENT *Client, CHANNEL *Chan) strlcat(str, Client_ID(cl), sizeof(str)); /* Send the data if the buffer is "full" */ - if (strlen(str) > (LINE_LEN - CLIENT_NICK_LEN - 8)) { + if (strlen(str) > (sizeof(str) - CLIENT_NICK_LEN - 8)) { if (!IRC_WriteStrClient(Client, "%s", str)) return DISCONNECTED; snprintf(str, sizeof(str), "NJOIN %s :", diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 5006d2f..2c7ba94 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -423,7 +423,7 @@ Handle_Numeric(CLIENT *client, REQUEST *Req) { 376, IRC_Num_ENDOFMOTD } }; int i, num; - char str[LINE_LEN]; + char str[COMMAND_LEN]; CLIENT *prefix, *target = NULL; /* Determine target */

1 0

Federico G. Schwindt : Report the correct file on error
by alex＠arthur.barton.de 18 Okt '13

18 Okt '13

Module: ngircd.git Branch: master Commit: a7dda1b28c5d425b3fc4e946ff238ca06c9bb64e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a7dda1b2… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Oct 17 21:52:15 2013 +0100 Report the correct file on error --- src/ngircd/conf.c | 74 ++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=a7dd…

1 0

Alexander Barton : doc/Platforms.txt: Add Open64 and tcc C compilers on Linux
by alex＠arthur.barton.de 16 Okt '13

16 Okt '13

Module: ngircd.git Branch: master Commit: cba5a2579f911c8527e5c51c4c57e6beaefe26d8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cba5a257… Author: Alexander Barton <alex(a)barton.de> Date: Wed Oct 16 22:27:38 2013 +0200 doc/Platforms.txt: Add Open64 and tcc C compilers on Linux Thanks to Götz Hoffart! --- doc/Platforms.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index e9c19a4..d489375 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -77,6 +77,8 @@ x86_64/apple/darwin12.3.0 gcc 4.2.1 20.2 13-04-01 alex Y Y Y Y (3) x86_64/unknown/freebsd8.1 gcc 4.2.1 20~rc1 12-11-13 alex Y Y Y Y (3) x86_64/unkn./freebsd8.1-gnu gcc 4.4.5 19 12-02-26 alex Y Y Y Y (3) x86_64/unknown/linux-gnu gcc 4.4.5 20.2 13-04-01 alex Y Y Y Y (1) +x86_64/unknown/linux-gnu Open64 20.3 13-10-16 goetz Y Y Y Y (1) +x86_64/unknown/linux-gnu tcc 0.9.25 20.3 13-10-16 goetz Y Y Y Y (1) x86_64/unknown/openbsd4.7 gcc 3.3.5 20~rc1 12-02-26 alex Y Y Y Y (3) x86_64/unknown/openbsd4.8 gcc 4.2.1 20~rc1 12-11-13 alex Y Y Y Y (3)

1 0

Alexander Barton : platformtest.sh: Detect tcc compiler
by alex＠arthur.barton.de 16 Okt '13

16 Okt '13

Module: ngircd.git Branch: master Commit: a2479bb9069ea2b61cf606dbefc2cb3ad0eb8e1d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a2479bb9… Author: Alexander Barton <alex(a)barton.de> Date: Wed Oct 16 21:59:23 2013 +0200 platformtest.sh: Detect tcc compiler --- contrib/platformtest.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index ac54575..6b154bb 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -109,6 +109,7 @@ if [ -r "Makefile" ]; then CC=$(grep "^CC = " Makefile | cut -d' ' -f3) $CC --version 2>&1 | grep -i "GCC" >/dev/null if [ $? -eq 0 ]; then + # GCC, or compiler that mimics GCC $CC --version 2>&1 | grep -i "Open64" >/dev/null if [ $? -eq 0 ]; then COMPILER="Open64" @@ -118,14 +119,21 @@ if [ -r "Makefile" ]; then COMPILER="gcc $COMPILER" fi else + # Non-GCC compiler $CC --version 2>&1 | grep -i "LLVM" >/dev/null if [ $? -eq 0 ]; then COMPILER=$($CC --version 2>/dev/null | head -1 \ | cut -d'(' -f1 | sed -e 's/version //g' \ | sed -e 's/Apple /A-/g') fi + $CC -version 2>&1 | grep -i "tcc" >/dev/null + if [ $? -eq 0 ]; then + COMPILER=$($CC -version 2>/dev/null | head -1 \ + | cut -d'(' -f1 | sed -e 's/version //g') + fi if [ "$COMPILER" = "unknown" ]; then v="`$CC --version 2>/dev/null | head -1`" + [ -z "$v" ] && v="`$CC -version 2>/dev/null | head -1`" [ -n "$v" ] && COMPILER="$v" fi fi

1 0

Federico G. Schwindt : Add support for arc4random
by alex＠arthur.barton.de 16 Okt '13

16 Okt '13

Module: ngircd.git Branch: master Commit: 17589534d0ccff05463910d1f0ba673d7d1630fd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=17589534… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Wed Oct 16 11:15:27 2013 +0100 Add support for arc4random If arc4random is present it will be used over the srand/rand interface. This fixes some warnings in OpenBSD-current. --- configure.ng | 5 +++-- src/ngircd/conf.c | 4 ++++ src/ngircd/irc-login.c | 4 ++++ src/ngircd/ngircd.c | 8 ++++++++ src/ngircd/proc.c | 6 ++++++ src/tool/tool.c | 5 +++++ 6 files changed, 30 insertions(+), 2 deletions(-) diff --git a/configure.ng b/configure.ng index faf3086..16f970f 100644 --- a/configure.ng +++ b/configure.ng @@ -187,8 +187,9 @@ AC_CHECK_FUNCS([ \ # Optional functions AC_CHECK_FUNCS_ONCE([ \ - gai_strerror getaddrinfo getnameinfo inet_aton sigaction sigprocmask \ - snprintf vsnprintf strdup strndup strlcpy strlcat strtok_r waitpid]) + arc4random gai_strerror getaddrinfo getnameinfo inet_aton sigaction \ + sigprocmask snprintf vsnprintf strdup strndup strlcpy strlcat strtok_r \ + waitpid]) # -- Configuration options -- diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 9c2c912..d337947 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -533,7 +533,11 @@ Conf_UnsetServer( CONN_ID Idx ) /* "Short" connection, enforce "ConnectRetry" * but randomize it a little bit: 15 seconds. */ Conf_Server[i].lasttry = +#ifdef HAVE_ARC4RANDOM + t + (arc4random() % 15); +#else t + rand() / (RAND_MAX / 15); +#endif } } } diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index af087f9..d1b4033 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -242,7 +242,11 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) #ifndef STRICT_RFC if (Conf_AuthPing) { +#ifdef HAVE_ARC4RANDOM + Conn_SetAuthPing(Client_Conn(Client), arc4random()); +#else Conn_SetAuthPing(Client_Conn(Client), rand()); +#endif IRC_WriteStrClient(Client, "PING :%ld", Conn_GetAuthPing(Client_Conn(Client))); LogDebug("Connection %d: sent AUTH PING %ld ...", diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 6af5816..da53705 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -613,6 +613,13 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid ) #endif +#ifdef HAVE_ARC4RANDOM +static void +Random_Init(void) +{ + +} +#else static bool Random_Init_Kern(const char *file) { @@ -642,6 +649,7 @@ Random_Init(void) return; srand(rand() ^ (unsigned)getpid() ^ (unsigned)time(NULL)); } +#endif /** diff --git a/src/ngircd/proc.c b/src/ngircd/proc.c index e062cd0..d290f3b 100644 --- a/src/ngircd/proc.c +++ b/src/ngircd/proc.c @@ -50,7 +50,9 @@ GLOBAL pid_t Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout) { pid_t pid; +#ifndef HAVE_ARC4RANDOM unsigned int seed; +#endif assert(proc != NULL); assert(pipefds != NULL); @@ -62,7 +64,9 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout return -1; } +#ifndef HAVE_ARC4RANDOM seed = (unsigned int)rand(); +#endif pid = fork(); switch (pid) { case -1: @@ -73,7 +77,9 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout return -1; case 0: /* New child process: */ +#ifndef HAVE_ARC4RANDOM srand(seed ^ (unsigned int)time(NULL) ^ getpid()); +#endif Signals_Exit(); signal(SIGTERM, Proc_GenericSignalHandler); signal(SIGALRM, Proc_GenericSignalHandler); diff --git a/src/tool/tool.c b/src/tool/tool.c index 1bb3ebe..3b9cc25 100644 --- a/src/tool/tool.c +++ b/src/tool/tool.c @@ -144,11 +144,16 @@ ngt_RandomStr(char *String, const size_t len) assert(String != NULL); gettimeofday(&t, NULL); +#ifndef HAVE_ARC4RANDOM srand((unsigned)(t.tv_usec * t.tv_sec)); for (i = 0; i < len; ++i) { String[i] = chars[rand() % (sizeof(chars) - 1)]; } +#else + for (i = 0; i < len; ++i) + String[i] = chars[arc4random() % (sizeof(chars) - 1)]; +#endif String[len] = '\0'; return String;

1 0

Federico G. Schwindt : Fix another strcat warning missed in commit 4c5b43
by alex＠arthur.barton.de 16 Okt '13

16 Okt '13

Module: ngircd.git Branch: master Commit: ea26fd2840f6c7f286407e86f832d6ec5e93eeeb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ea26fd28… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Wed Oct 16 10:40:14 2013 +0100 Fix another strcat warning missed in commit 4c5b43 --- src/ngircd/ngircd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 9c27409..6af5816 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -300,7 +300,7 @@ main(int argc, const char *argv[]) strlcat(NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID); #endif if (Conf_OperCanMode) - strcat(NGIRCd_ProtoID, "o"); + strlcat(NGIRCd_ProtoID, "o", sizeof NGIRCd_ProtoID); #else /* IRCPLUS */ snprintf(NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE_NAME, PACKAGE_VERSION);

1 0

Alexander Barton : platformtest.sh: Detect Apple LLVM (clang) compiler
by alex＠arthur.barton.de 14 Okt '13

14 Okt '13

Module: ngircd.git Branch: master Commit: 0bd3fb88b2c2a433a68c82c3eaba2fd13b8fcd0b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0bd3fb88… Author: Alexander Barton <alex(a)barton.de> Date: Mon Oct 14 23:45:59 2013 +0200 platformtest.sh: Detect Apple LLVM (clang) compiler --- contrib/platformtest.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index cfa1ecc..765fb39 100755 --- a/contrib/platformtest.sh +++ b/contrib/platformtest.sh @@ -1,7 +1,7 @@ #!/bin/sh # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors +# Copyright (c)2001-2013 Alexander Barton (alex(a)barton.de) and Contributors # # 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 @@ -108,12 +108,16 @@ if [ -r "Makefile" ]; then COMPILER="gcc $COMPILER" fi else - case "$CC" in - gcc*) + $CC --version 2>&1 | grep -i "LLVM" >/dev/null + if [ $? -eq 0 ]; then + COMPILER=$($CC --version 2>/dev/null | head -1 \ + | cut -d'(' -f1 | sed -e 's/version //g' \ + | sed -e 's/Apple /A-/g') + fi + if [ "$COMPILER" = "unknown" ]; then v="`$CC --version 2>/dev/null | head -1`" - [ -n "$v" ] && COMPILER="gcc $v" - ;; - esac + [ -n "$v" ] && COMPILER="$v" + fi fi fi

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates Oktober 2013