September 2012 - ngIRCd GIT Updates

Alexander Barton : configure.in: use AC_CANONICAL_HOST ( not AC_CANONICAL_TARGET)
by alex＠arthur.barton.de 16 Sep '12

16 Sep '12

Module: ngircd.git Branch: master Commit: 82bf4eb0591631e638120e0540fbbb7ceb4e19a9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=82bf4eb0… Author: Alexander Barton <alex(a)barton.de> Date: Thu Sep 13 00:06:08 2012 +0200 configure.in: use AC_CANONICAL_HOST (not AC_CANONICAL_TARGET) See the autoconf manual for details: http://www.gnu.org/software/autoconf/manual/autoconf.html#Specifying-Target… --- configure.in | 19 +++++++++---------- src/ngircd/login.c | 4 ++-- src/ngircd/ngircd.c | 6 +++--- src/portab/portab.h | 14 +++++++------- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/configure.in b/configure.in index b65d155..0f6af2a 100644 --- a/configure.in +++ b/configure.in @@ -19,7 +19,7 @@ AC_INIT([ngIRCd], VERSION_ID, AC_CONFIG_SRCDIR([src/ngircd/ngircd.c]) AC_CONFIG_HEADER([src/config.h]) -AC_CANONICAL_TARGET +AC_CANONICAL_HOST AM_INIT_AUTOMAKE([1.11]) @@ -40,9 +40,9 @@ AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used]) AH_TEMPLATE([WANT_IPV6], [Define if IPV6 protocol should be enabled]) AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled]) -AH_TEMPLATE([TARGET_OS], [Target operating system name]) -AH_TEMPLATE([TARGET_VENDOR], [Target system vendor]) -AH_TEMPLATE([TARGET_CPU], [Target CPU name]) +AH_TEMPLATE([HOST_OS], [Target operating system name]) +AH_TEMPLATE([HOST_VENDOR], [Target system vendor]) +AH_TEMPLATE([HOST_CPU], [Target CPU name]) # -- C Compiler -- @@ -87,7 +87,7 @@ if test "$GCC" = "yes"; then GCC_STACK_PROTECT_CC fi -case "$target_os" in +case "$host_os" in hpux*) # This is HP/UX, we need to define _XOPEN_SOURCE_EXTENDED # (tested with HP/UX 11.11) @@ -538,9 +538,9 @@ AC_ARG_ENABLE(strict-rfc, # -- Definitions -- -AC_DEFINE_UNQUOTED(TARGET_CPU, "$target_cpu" ) -AC_DEFINE_UNQUOTED(TARGET_VENDOR, "$target_vendor" ) -AC_DEFINE_UNQUOTED(TARGET_OS, "$target_os" ) +AC_DEFINE_UNQUOTED(HOST_CPU, "$host_cpu" ) +AC_DEFINE_UNQUOTED(HOST_VENDOR, "$host_vendor" ) +AC_DEFINE_UNQUOTED(HOST_OS, "$host_os" ) # Add additional CFLAGS, eventually specified on the command line, but after # running this configure script. Useful for "-Werror" for example. @@ -590,8 +590,7 @@ C=`eval echo ${sysconfdir}` ; C=`eval echo ${C}` M=`eval echo ${mandir}` ; M=`eval echo ${M}` D=`eval echo ${docdir}` ; D=`eval echo ${D}` -echo " Target: ${target}" -test "$target" != "$host" && echo " Host: ${host}" +echo " Host: ${host}" echo " Compiler: ${CC}" test -n "$CFLAGS" && echo " Compiler flags: ${CFLAGS}" test -n "$CPPFLAGS" && echo " Preprocessor flags: ${CPPFLAGS}" diff --git a/src/ngircd/login.c b/src/ngircd/login.c index 460fcd1..d79344b 100644 --- a/src/ngircd/login.c +++ b/src/ngircd/login.c @@ -163,8 +163,8 @@ Login_User_PostAuth(CLIENT *Client) return false; if (!IRC_WriteStrClient (Client, RPL_YOURHOST_MSG, Client_ID(Client), - Client_ID(Client_ThisServer()), PACKAGE_VERSION, TARGET_CPU, - TARGET_VENDOR, TARGET_OS)) + Client_ID(Client_ThisServer()), PACKAGE_VERSION, HOST_CPU, + HOST_VENDOR, HOST_OS)) return false; if (!IRC_WriteStrClient (Client, RPL_CREATED_MSG, Client_ID(Client), NGIRCd_StartStr)) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 67bc4df..44c4ca7 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -405,11 +405,11 @@ Fill_Version( void ) if( NGIRCd_VersionAddition[0] ) strlcat( NGIRCd_VersionAddition, "-", sizeof( NGIRCd_VersionAddition )); - strlcat( NGIRCd_VersionAddition, TARGET_CPU, sizeof( NGIRCd_VersionAddition )); + strlcat( NGIRCd_VersionAddition, HOST_CPU, sizeof( NGIRCd_VersionAddition )); strlcat( NGIRCd_VersionAddition, "/", sizeof( NGIRCd_VersionAddition )); - strlcat( NGIRCd_VersionAddition, TARGET_VENDOR, sizeof( NGIRCd_VersionAddition )); + strlcat( NGIRCd_VersionAddition, HOST_VENDOR, sizeof( NGIRCd_VersionAddition )); strlcat( NGIRCd_VersionAddition, "/", sizeof( NGIRCd_VersionAddition )); - strlcat( NGIRCd_VersionAddition, TARGET_OS, sizeof( NGIRCd_VersionAddition )); + strlcat( NGIRCd_VersionAddition, HOST_OS, sizeof( NGIRCd_VersionAddition )); snprintf(NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s", PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition); diff --git a/src/portab/portab.h b/src/portab/portab.h index 90f36a0..1c6e3f8 100644 --- a/src/portab/portab.h +++ b/src/portab/portab.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2012 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 @@ -120,16 +120,16 @@ typedef unsigned char bool; /* target constants */ -#ifndef TARGET_OS -#define TARGET_OS "unknown" +#ifndef HOST_OS +#define HOST_OS "unknown" #endif -#ifndef TARGET_CPU -#define TARGET_CPU "unknown" +#ifndef HOST_CPU +#define HOST_CPU "unknown" #endif -#ifndef TARGET_VENDOR -#define TARGET_VENDOR "unknown" +#ifndef HOST_VENDOR +#define HOST_VENDOR "unknown" #endif

1 0

Alexander Barton : configure.in: inttypes.h is an optional header file
by alex＠arthur.barton.de 16 Sep '12

16 Sep '12

Module: ngircd.git Branch: master Commit: d53d58fff21a306ac0de20153a215121547bcd84 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d53d58ff… Author: Alexander Barton <alex(a)barton.de> Date: Wed Sep 12 16:01:11 2012 +0200 configure.in: inttypes.h is an optional header file --- configure.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 20102d4..b65d155 100644 --- a/configure.in +++ b/configure.in @@ -108,14 +108,14 @@ AC_HEADER_TIME # Required header files AC_CHECK_HEADERS([ \ - fcntl.h inttypes.h netdb.h netinet/in.h netinet/in_systm.h stdlib.h \ - string.h strings.h sys/socket.h sys/time.h unistd.h \ + fcntl.h netdb.h netinet/in.h netinet/in_systm.h stdlib.h string.h \ + strings.h sys/socket.h sys/time.h unistd.h \ ],,AC_MSG_ERROR([required C header missing!])) # Optional header files AC_CHECK_HEADERS([ \ - arpa/inet.h malloc.h netinet/ip.h stdbool.h stddef.h stdint.h \ - varargs.h \ + arpa/inet.h inttypes.h malloc.h netinet/ip.h stdbool.h stddef.h \ + stdint.h varargs.h \ ]) # -- Datatypes --

1 0

Alexander Barton : Use HAVE_SETSID #define when testing for setsid()
by alex＠arthur.barton.de 16 Sep '12

16 Sep '12

Module: ngircd.git Branch: master Commit: b2482b39e40bd5355cb6ea935d7dc1f1bd18f7ab URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b2482b39… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 11 14:38:19 2012 +0200 Use HAVE_SETSID #define when testing for setsid() --- 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 8a93bcb..67bc4df 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -715,7 +715,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) } /* New child process */ -#ifndef NeXT +#ifdef HAVE_SETSID (void)setsid(); #else setpgrp(0, getpid());

1 0

Alexander Barton : Don't include <stdint.h>, it is included by "portab.h"
by alex＠arthur.barton.de 16 Sep '12

16 Sep '12

Module: ngircd.git Branch: master Commit: 74c7d7131f6754e1afa9b1ec7b95e95824475c97 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=74c7d713… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 11 14:37:31 2012 +0200 Don't include <stdint.h>, it is included by "portab.h" --- src/ngircd/conn.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 6091ebe..f451164 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -47,10 +47,6 @@ # include <netinet/ip.h> #endif -#ifdef HAVE_STDINT_H -# include <stdint.h> /* e.g. for Mac OS X */ -#endif - #ifdef TCPWRAP # include <tcpd.h> /* for TCP Wrappers */ #endif

1 0

Alexander Barton : Don't check type.h availability, it is required
by alex＠arthur.barton.de 16 Sep '12

16 Sep '12

Module: ngircd.git Branch: master Commit: 4dd1c31dc70e97015f6bff4344de30742db073e8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4dd1c31d… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 11 14:36:34 2012 +0200 Don't check type.h availability, it is required --- src/ngircd/conf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 627e6d3..5853926 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -18,6 +18,7 @@ #include "imp.h" #include <assert.h> +#include <ctype.h> #include <errno.h> #ifdef PROTOTYPES # include <stdarg.h> @@ -34,9 +35,6 @@ #include <sys/types.h> #include <unistd.h> -#ifdef HAVE_CTYPE_H -# include <ctype.h> -#endif #include "array.h" #include "ngircd.h"

1 0

Alexander Barton : configure.in: Use AC_CONFIG_FILES macro
by alex＠arthur.barton.de 16 Sep '12

16 Sep '12

Module: ngircd.git Branch: master Commit: 2e13e821f89d38ebb3b6b90d44f1a40f9c61fb31 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2e13e821… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 11 14:36:02 2012 +0200 configure.in: Use AC_CONFIG_FILES macro --- configure.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index d3cc86b..20102d4 100644 --- a/configure.in +++ b/configure.in @@ -548,7 +548,7 @@ test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END" # -- Generate files -- -AC_OUTPUT([ \ +AC_CONFIG_FILES([ \ Makefile \ contrib/Anope/Makefile \ contrib/Debian/Makefile \ @@ -567,6 +567,8 @@ AC_OUTPUT([ \ src/tool/Makefile \ ]) +AC_OUTPUT + type dpkg >/dev/null 2>&1 if test $? -eq 0; then # Generate debian/ link if the dpkg command exists

1 0

Alexander Barton : configure.in: Don't use AC_C_PROTOTYPES
by alex＠arthur.barton.de 16 Sep '12

16 Sep '12

Module: ngircd.git Branch: master Commit: 2478c5816bca01c73b7c832945ddbeb815922ce0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2478c581… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 11 14:34:30 2012 +0200 configure.in: Don't use AC_C_PROTOTYPES Don't use AC_C_PROTOTYPES, AM_C_PROTOTYPES is already used. --- configure.in | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.in b/configure.in index c726596..d3cc86b 100644 --- a/configure.in +++ b/configure.in @@ -48,7 +48,6 @@ AH_TEMPLATE([TARGET_CPU], [Target CPU name]) AC_PROG_CC AC_PROG_CC_STDC -AC_C_PROTOTYPES # -- Helper programs --

1 0

Alexander Barton : configure.in: Update checks for required and optional features
by alex＠arthur.barton.de 16 Sep '12

16 Sep '12

Module: ngircd.git Branch: master Commit: 47ad9afcf38d91059dd23dc2e6f6c2d9d4c3ad80 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=47ad9afc… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 11 14:32:17 2012 +0200 configure.in: Update checks for required and optional features Update checks for required and optional header files, data types, and functions. --- configure.in | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/configure.in b/configure.in index 0f0cac0..c726596 100644 --- a/configure.in +++ b/configure.in @@ -107,25 +107,17 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_TIME +# Required header files AC_CHECK_HEADERS([ \ - ctype.h errno.h fcntl.h netdb.h netinet/in.h netinet/in_systm.h \ - stdlib.h string.h strings.h sys/socket.h sys/time.h unistd.h \ + fcntl.h inttypes.h netdb.h netinet/in.h netinet/in_systm.h stdlib.h \ + string.h strings.h sys/socket.h sys/time.h unistd.h \ ],,AC_MSG_ERROR([required C header missing!])) +# Optional header files AC_CHECK_HEADERS([ \ - arpa/inet.h ctype.h malloc.h netinet/ip.h stdbool.h stddef.h varargs.h \ - ],[],[],[[ - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> - #endif - #ifdef HAVE_SYS_SOCKET_H - #include <sys/socket.h> - #endif - #ifdef HAVE_NETINET_IN_H - #include <netinet/in.h> - #endif - ]] -) + arpa/inet.h malloc.h netinet/ip.h stdbool.h stddef.h stdint.h \ + varargs.h \ + ]) # -- Datatypes -- @@ -142,8 +134,14 @@ AC_TRY_COMPILE([ AC_MSG_RESULT(no) ]) +AC_TYPE_PID_T AC_TYPE_SIGNAL AC_TYPE_SIZE_T +AC_TYPE_SSIZE_T +AC_TYPE_UID_T +AC_TYPE_UINT16_T +AC_TYPE_UINT32_T +AC_TYPE_UINT8_T AC_CHECK_MEMBER([struct sockaddr_in.sin_len], AC_DEFINE(HAVE_sockaddr_in_len),, [#include <arpa/inet.h>]) @@ -159,16 +157,22 @@ AC_CHECK_LIB(socket,bind) # -- Functions -- AC_FUNC_FORK +AC_FUNC_MALLOC +AC_FUNC_REALLOC AC_FUNC_STRFTIME +# Required functions AC_CHECK_FUNCS([ \ - bind gethostbyaddr gethostbyname gethostname inet_ntoa \ - setsid setsockopt socket strcasecmp waitpid],, + alarm dup2 endpwent gethostbyaddr gethostbyname gethostname \ + gettimeofday inet_ntoa memmove memset setsid socket strcasecmp \ + strchr strcspn strerror strncasecmp strrchr strspn strstr \ + ],, AC_MSG_ERROR([required function missing!])) +# Optional functions AC_CHECK_FUNCS([ \ - gai_strerror getaddrinfo getnameinfo inet_aton sigaction \ - sigprocmask snprintf vsnprintf strdup strlcpy strlcat strtok_r]) + gai_strerror getaddrinfo getnameinfo inet_aton sigaction sigprocmask \ + snprintf vsnprintf strdup strlcpy strlcat strtok_r waitpid]) # -- Configuration options --

1 0

Alexander Barton : configure.in: sort some lists (templates, output, ...)
by alex＠arthur.barton.de 16 Sep '12

16 Sep '12

Module: ngircd.git Branch: master Commit: 25c216cbdf0a5db739bdf0551db16a510e8ac4a1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=25c216cb… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 11 14:13:17 2012 +0200 configure.in: sort some lists (templates, output, ...) --- configure.in | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/configure.in b/configure.in index 52435fd..7a15b2b 100644 --- a/configure.in +++ b/configure.in @@ -25,17 +25,17 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # -- Templates for config.h -- AH_TEMPLATE([DEBUG], [Define if debug-mode should be enabled]) +AH_TEMPLATE([HAVE_sockaddr_in_len], [Define if sockaddr_in.sin_len exists]) AH_TEMPLATE([HAVE_socklen_t], [Define if socklen_t exists]) +AH_TEMPLATE([IDENTAUTH], [Define if the server should do IDENT requests]) +AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used]) +AH_TEMPLATE([PAM], [Define if PAM should be used]) AH_TEMPLATE([SNIFFER], [Define if IRC sniffer should be enabled]) AH_TEMPLATE([STRICT_RFC], [Define if ngIRCd should behave strict RFC compliant]) AH_TEMPLATE([SYSLOG], [Define if syslog should be used for logging]) -AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled]) AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used]) -AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used]) AH_TEMPLATE([WANT_IPV6], [Define if IPV6 protocol should be enabled]) -AH_TEMPLATE([IDENTAUTH], [Define if the server should do IDENT requests]) -AH_TEMPLATE([PAM], [Define if PAM should be used]) -AH_TEMPLATE([HAVE_sockaddr_in_len], [Define if sockaddr_in.sin_len exists]) +AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled]) AH_TEMPLATE([TARGET_OS], [Target operating system name]) AH_TEMPLATE([TARGET_VENDOR], [Target system vendor]) @@ -57,9 +57,9 @@ AC_PROG_RANLIB # -- Compiler Features -- -AM_C_PROTOTYPES AC_C_CONST AC_C_INLINE +AM_C_PROTOTYPES # -- Hard coded system and compiler dependencies/features/options ... -- @@ -101,8 +101,8 @@ CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'" # -- Headers -- AC_HEADER_STDC -AC_HEADER_TIME AC_HEADER_SYS_WAIT +AC_HEADER_TIME AC_CHECK_HEADERS([ \ ctype.h errno.h fcntl.h netdb.h netinet/in.h netinet/in_systm.h \ @@ -544,21 +544,21 @@ test -n "$CFLAGS_END" && CFLAGS="$CFLAGS $CFLAGS_END" AC_OUTPUT([ \ Makefile \ + contrib/Anope/Makefile \ + contrib/Debian/Makefile \ + contrib/MacOSX/Makefile \ + contrib/MacOSX/ngIRCd.pmdoc/Makefile \ + contrib/MacOSX/ngIRCd.xcodeproj/Makefile \ + contrib/Makefile \ doc/Makefile \ doc/src/Makefile \ - src/Makefile \ - src/portab/Makefile \ + man/Makefile \ src/ipaddr/Makefile \ - src/tool/Makefile \ + src/Makefile \ src/ngircd/Makefile \ + src/portab/Makefile \ src/testsuite/Makefile \ - man/Makefile \ - contrib/Makefile \ - contrib/Anope/Makefile \ - contrib/Debian/Makefile \ - contrib/MacOSX/Makefile \ - contrib/MacOSX/ngIRCd.xcodeproj/Makefile \ - contrib/MacOSX/ngIRCd.pmdoc/Makefile \ + src/tool/Makefile \ ]) type dpkg >/dev/null 2>&1

1 0

Alexander Barton : configure.in: require autoconf 2.67 and automake 1.11
by alex＠arthur.barton.de 16 Sep '12

16 Sep '12

Module: ngircd.git Branch: master Commit: 67e882d4bbda97fb65ed4d58ae44e6c79d4cb708 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=67e882d4… Author: Alexander Barton <alex(a)barton.de> Date: Tue Sep 11 14:30:49 2012 +0200 configure.in: require autoconf 2.67 and automake 1.11 And use newer features such as bug reporting address and project URL. --- configure.in | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index 7a15b2b..0f0cac0 100644 --- a/configure.in +++ b/configure.in @@ -13,12 +13,15 @@ define(VERSION_ID,esyscmd(git describe|sed -e 's/rel-//g'|sed -e 's/-/~/'|tr -d # -- Initialisation -- -AC_PREREQ(2.50) -AC_INIT(ngircd, VERSION_ID) -AC_CONFIG_SRCDIR(src/ngircd/ngircd.c) +AC_PREREQ([2.67]) +AC_INIT([ngIRCd], VERSION_ID, + [ngircd-ml(a)ngircd.barton.de] [ngircd], [http://ngircd.barton.de/] + +AC_CONFIG_SRCDIR([src/ngircd/ngircd.c]) +AC_CONFIG_HEADER([src/config.h]) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(1.6) -AC_CONFIG_HEADER(src/config.h) + +AM_INIT_AUTOMAKE([1.11]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

1 0