August 2011 - ngIRCd GIT Updates

Alexander Barton : Xcode: update project file to Xcode 3.2 or newer
by alex＠arthur.barton.de 07 Aug '11

07 Aug '11

Module: ngircd.git Branch: master Commit: 641045249cb4c11244b772012dc5b36005c89517 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=64104524… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 7 14:42:49 2011 +0200 Xcode: update project file to Xcode 3.2 or newer Xcode requires Mac OS X 10.6 or newer; Xcode 4 supports this project format as well, so effectively you can use Mac OS X 10.6.x or 10.7.x for building ngIRCd with the Apple Xcode IDE. --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index 8da2a81..42ddbf2 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 44; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -647,8 +647,11 @@ /* Begin PBXProject section */ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0410; + }; buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "ngIRCd" */; - compatibilityVersion = "Xcode 3.0"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -744,13 +747,11 @@ 1DEB928B08733DD80010E9CD /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; - GCC_VERSION = 4.0; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_VERSION = 4.2; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; + SDKROOT = macosx10.6; }; name = Default; }; @@ -760,11 +761,10 @@ ARCHS = "$(NATIVE_ARCH_ACTUAL)"; GCC_DEBUGGING_SYMBOLS = full; GCC_OPTIMIZATION_LEVEL = 0; - GCC_VERSION = 4.0; + GCC_VERSION = 4.2; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; SDKROOT = ""; }; name = Debug;

1 0

Alexander Barton : Xcode: Mac OS X config.h: support 10.5 as well as 10.6/ 10.7 SDK
by alex＠arthur.barton.de 07 Aug '11

07 Aug '11

Module: ngircd.git Branch: master Commit: 69f81a359a0a9b764200172c004e41fa357f3e75 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=69f81a35… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 7 14:41:11 2011 +0200 Xcode: Mac OS X config.h: support 10.5 as well as 10.6/10.7 SDK --- contrib/MacOSX/config.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/contrib/MacOSX/config.h b/contrib/MacOSX/config.h index af0a34c..86b460b 100644 --- a/contrib/MacOSX/config.h +++ b/contrib/MacOSX/config.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2011 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 @@ -103,10 +103,15 @@ #ifdef PAM /* Define to 1 if you have the `pam_authenticate' function. */ #define HAVE_PAM_AUTHENTICATE 1 +#if (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1060) /* Define to 1 if you have the <pam/pam_appl.h> header file. */ #define HAVE_PAM_PAM_APPL_H 1 /* Mac OS X <10.6 doesn't have pam_fail_delay() */ #define NO_PAM_FAIL_DELAY 1 +#else +/* Define to 1 if you have the <security/pam_appl.h> header file. */ +#define HAVE_SECURITY_PAM_APPL_H 1 +#endif #endif /* -eof- */

1 0

Alexander Barton : Xcode: exclude more Xcode 4 specific directories in ". gitignore"
by alex＠arthur.barton.de 02 Aug '11

02 Aug '11

Module: ngircd.git Branch: master Commit: be03bc672cf37881afe31c466576595f2976f5e7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=be03bc67… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 2 16:04:23 2011 +0200 Xcode: exclude more Xcode 4 specific directories in ".gitignore" --- contrib/MacOSX/ngIRCd.xcodeproj/.gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/.gitignore b/contrib/MacOSX/ngIRCd.xcodeproj/.gitignore index d82a5e4..d6d065a 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/.gitignore +++ b/contrib/MacOSX/ngIRCd.xcodeproj/.gitignore @@ -1,2 +1,4 @@ +project.xcworkspace +xcuserdata *.mode1v3 *.pbxuser

1 0

Alexander Barton : Cast getpid() and time() results for srand() input
by alex＠arthur.barton.de 02 Aug '11

02 Aug '11

Module: ngircd.git Branch: master Commit: 160c52400fe17f83069cdda7c6d2a92e9c430244 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=160c5240… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 2 13:21:54 2011 +0200 Cast getpid() and time() results for srand() input This fixes: src/ngircd/ngircd.c:596: warning: implicit conversion shortens 64-bit value into a 32-bit value (i686-apple-darwin11-llvm-gcc-4.2) --- src/ngircd/ngircd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 500d128..2135ec4 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -593,7 +593,7 @@ Random_Init(void) return; if (Random_Init_Kern("/dev/arandom")) return; - srand(rand() ^ getpid() ^ time(NULL)); + srand(rand() ^ (unsigned)getpid() ^ (unsigned)time(NULL)); }

1 0

Alexander Barton : Xcode: update and add missing files to project
by alex＠arthur.barton.de 02 Aug '11

02 Aug '11

Module: ngircd.git Branch: master Commit: 0b8acf120529754b3a23d2cce563da9a45ef26e4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0b8acf12… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 2 13:16:28 2011 +0200 Xcode: update and add missing files to project --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index 2f9124e..8da2a81 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -170,7 +170,6 @@ FA322D8E0CEF7523001761B3 /* ngIRCd.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = ngIRCd.xcodeproj; sourceTree = "<group>"; }; FA322D910CEF7523001761B3 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; }; FA322D920CEF7523001761B3 /* ngindent */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = ngindent; sourceTree = "<group>"; }; - FA322D930CEF7523001761B3 /* ngircd.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = ngircd.sh; sourceTree = "<group>"; }; FA322D940CEF7523001761B3 /* ngircd.spec */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = ngircd.spec; sourceTree = "<group>"; }; FA322D950CEF7523001761B3 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = "<group>"; }; FA322D960CEF7523001761B3 /* systrace.policy */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = systrace.policy; sourceTree = "<group>"; }; @@ -196,6 +195,10 @@ FA407F2C0DB159F400271AF1 /* ng_ipaddr.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = ng_ipaddr.c; path = ipaddr/ng_ipaddr.c; sourceTree = "<group>"; }; FA407F2D0DB159F400271AF1 /* ng_ipaddr.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = ng_ipaddr.h; path = ipaddr/ng_ipaddr.h; sourceTree = "<group>"; }; FA407F380DB15AC700271AF1 /* GIT.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = GIT.txt; sourceTree = "<group>"; }; + FA4B08E513E7F8FB00765BA3 /* ngircd-bsd.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "ngircd-bsd.sh"; sourceTree = "<group>"; }; + FA4B08E613E7F91700765BA3 /* ngIRCd-Logo.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = "ngIRCd-Logo.gif"; sourceTree = "<group>"; }; + FA4B08E713E7F91700765BA3 /* ngircd-redhat.init */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "ngircd-redhat.init"; sourceTree = "<group>"; }; + FA4B08E813E7F91C00765BA3 /* platformtest.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = platformtest.sh; sourceTree = "<group>"; }; FA77849A133FB9FF00740057 /* sample-ngircd.conf.tmpl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "sample-ngircd.conf.tmpl"; sourceTree = "<group>"; }; FA85178A0FA061EC006A1F5A /* op.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = op.h; sourceTree = "<group>"; }; FA85178B0FA061EC006A1F5A /* op.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = op.c; sourceTree = "<group>"; }; @@ -432,8 +435,11 @@ FA322D730CEF7523001761B3 /* MacOSX */, FA322D910CEF7523001761B3 /* Makefile.am */, FA322D920CEF7523001761B3 /* ngindent */, - FA322D930CEF7523001761B3 /* ngircd.sh */, + FA4B08E513E7F8FB00765BA3 /* ngircd-bsd.sh */, + FA4B08E613E7F91700765BA3 /* ngIRCd-Logo.gif */, + FA4B08E713E7F91700765BA3 /* ngircd-redhat.init */, FA322D940CEF7523001761B3 /* ngircd.spec */, + FA4B08E813E7F91C00765BA3 /* platformtest.sh */, FA322D950CEF7523001761B3 /* README */, FA322D960CEF7523001761B3 /* systrace.policy */, );

1 0

Alexander Barton : IRC_QUIT(): disconnect directly linked servers sending QUIT
by alex＠arthur.barton.de 02 Aug '11

02 Aug '11

Module: ngircd.git Branch: master Commit: 88f6fc5fd8617a2d517c1e7ed689a29dce2a217f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=88f6fc5f… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 2 00:56:49 2011 +0200 IRC_QUIT(): disconnect directly linked servers sending QUIT Without this patch, the server becomes removed from the network and the client structures, but the connection isn't shut down at all ... --- src/ngircd/irc-login.c | 40 +++++++++++++++++++++++----------------- 1 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 067703a..73716fe 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -653,32 +653,37 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req ) CLIENT *target; char quitmsg[LINE_LEN]; - assert( Client != NULL ); - assert( Req != NULL ); + assert(Client != NULL); + assert(Req != NULL); /* Wrong number of arguments? */ - if( Req->argc > 1 ) - return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if (Req->argc > 1) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); if (Req->argc == 1) strlcpy(quitmsg, Req->argv[0], sizeof quitmsg); - if ( Client_Type( Client ) == CLIENT_SERVER ) - { + if (Client_Type(Client) == CLIENT_SERVER) { /* Server */ - target = Client_Search( Req->prefix ); - if( ! target ) - { - Log( LOG_WARNING, "Got QUIT from %s for unknown client!?", Client_ID( Client )); + target = Client_Search(Req->prefix); + if (!target) { + Log(LOG_WARNING, + "Got QUIT from %s for unknown client!?", + Client_ID(Client)); return CONNECTED; } - Client_Destroy( target, "Got QUIT command.", Req->argc == 1 ? quitmsg : NULL, true); - - return CONNECTED; - } - else - { + if (target != Client) { + Client_Destroy(target, "Got QUIT command.", + Req->argc == 1 ? quitmsg : NULL, true); + return CONNECTED; + } else { + Conn_Close(Client_Conn(Client), "Got QUIT command.", + Req->argc == 1 ? quitmsg : NULL, true); + return DISCONNECTED; + } + } else { if (Req->argc == 1 && quitmsg[0] != '\"') { /* " " to avoid confusion */ strlcpy(quitmsg, "\"", sizeof quitmsg); @@ -687,7 +692,8 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req ) } /* User, Service, or not yet registered */ - Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argc == 1 ? quitmsg : NULL, true); + Conn_Close(Client_Conn(Client), "Got QUIT command.", + Req->argc == 1 ? quitmsg : NULL, true); return DISCONNECTED; }

1 0

Alexander Barton : contrib/ngindent: detect "gindent" as GNU indent
by alex＠arthur.barton.de 01 Aug '11

01 Aug '11

Module: ngircd.git Branch: master Commit: da897a2a14ac229dbd542f2f11c970dcb005944d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=da897a2a… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 1 23:39:29 2011 +0200 contrib/ngindent: detect "gindent" as GNU indent --- contrib/ngindent | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/contrib/ngindent b/contrib/ngindent index 73537a6..2ce1a26 100755 --- a/contrib/ngindent +++ b/contrib/ngindent @@ -4,6 +4,7 @@ INDENTARGS="-kr -i8 -ts8 -l80 -c3 -cd41 -ss -ncs -psl" # check if indent(1) is available type indent >/dev/null 2>&1 && INDENT="indent" +type gindent >/dev/null 2>&1 && INDENT="gindent" type gnuindent >/dev/null 2>&1 && INDENT="gnuindent" if [ -z "$INDENT" ]; then

1 0

Alexander Barton : doc/Platforms.txt: re-add mipsel/unknown/ linux-gnu with gcc 4.1.2
by alex＠arthur.barton.de 01 Aug '11

01 Aug '11

Module: ngircd.git Branch: master Commit: 95f0e4033c97285e82113f1bde97a11875767153 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=95f0e403… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 1 10:42:22 2011 +0200 doc/Platforms.txt: re-add mipsel/unknown/linux-gnu with gcc 4.1.2 --- doc/Platforms.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index b2c6f52..0346ac6 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -58,6 +58,7 @@ m68k/apple/aux3.1.1 gcc 2.7.2 18 11-07-02 alex Y Y N Y m68k/apple/aux3.1.1 Orig. A/UX 18 11-07-02 alex Y Y N 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 ? ? +mipsel/unknown/linux-gnu gcc 4.1.2 18 11-07-05 goetz Y Y N Y (1) mipsel/unknown/linux-gnu gcc 4.4.5 18 11-07-30 goetz Y Y Y Y (1) powerpc/apple/darwin6.5 gcc 3.1 0.7.x-CVS 03-04-23 alex Y Y Y Y powerpc/apple/darwin7.9.0 gcc 3.3 CVSHEAD 06-05-07 fw Y Y Y Y (3)

1 0

Alexander Barton : Updated doc/Platforms.txt: mipsel/unknown/linux-gnu
by alex＠arthur.barton.de 01 Aug '11

01 Aug '11

Module: ngircd.git Branch: master Commit: 409b2c86c89820a918ff7625be322caa603cdaf1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=409b2c86… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 1 09:08:14 2011 +0200 Updated doc/Platforms.txt: mipsel/unknown/linux-gnu --- doc/Platforms.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 460719f..b2c6f52 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -58,7 +58,7 @@ m68k/apple/aux3.1.1 gcc 2.7.2 18 11-07-02 alex Y Y N Y m68k/apple/aux3.1.1 Orig. A/UX 18 11-07-02 alex Y Y N 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 ? ? -mipsel/unknown/linux-gnu gcc 4.1.2 18 11-07-05 goetz Y Y N Y (1) +mipsel/unknown/linux-gnu gcc 4.4.5 18 11-07-30 goetz Y Y Y Y (1) powerpc/apple/darwin6.5 gcc 3.1 0.7.x-CVS 03-04-23 alex Y Y Y Y powerpc/apple/darwin7.9.0 gcc 3.3 CVSHEAD 06-05-07 fw Y Y Y Y (3) powerpc/apple/darwin8.11.0 gcc 4.0.1 18 11-07-02 goetz Y Y Y Y (3)

1 0