Send inn-committers mailing list submissions to
inn-committers@lists.isc.org
To subscribe or unsubscribe via the World Wide Web, visit
https://lists.isc.org/mailman/listinfo/inn-committers
or, via email, send a message with subject or body 'help' to
inn-committers-requ...@lists.isc.org
You can reach the person managing the list at
inn-committers-ow...@lists.isc.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of inn-committers digest..."
Today's Topics:
1. INN commit: trunk (CONTRIBUTORS configure.ac) (INN Commit)
2. INN commit: trunk (authprogs/ckpasswd.c configure.ac) (INN Commit)
3. INN commit: branches/2.5 (authprogs/ckpasswd.c configure.ac)
(INN Commit)
----------------------------------------------------------------------
Message: 1
Date: Sat, 14 Dec 2013 10:59:12 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (CONTRIBUTORS configure.ac)
Message-ID: <20131214185912.a749a67...@hope.eyrie.org>
Date: Saturday, December 14, 2013 @ 10:59:12
Author: iulius
Revision: 9585
auth_krb5: do not try to build it when com_err header is not found
The new krb5.m4 used by INN does not guarantee that com_err.h
will exist because it's no longer part of the official Kerberos API.
Therefore, add a special check to clear KRB5_AUTH, KRB5_CPPFLAGS,
KRB5_LDFLAGS, and KRB5_LIBS if neither et/com_err.h nor com_err.h
can be found and --with-krb5 is not given.
Thanks to Jesse Rehmer for the bug report.
Modified:
trunk/CONTRIBUTORS
trunk/configure.ac
--------------+
CONTRIBUTORS | 3 ++-
configure.ac | 12 ++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
Modified: CONTRIBUTORS
===================================================================
--- CONTRIBUTORS 2013-12-12 20:24:20 UTC (rev 9584)
+++ CONTRIBUTORS 2013-12-14 18:59:12 UTC (rev 9585)
@@ -275,4 +275,5 @@
Lars Magne Ingebrigtsen, Sam Varshavchik, Matthew Vernon, Ian Jackson,
Edmund H. Ramm, Raphael Barrois, Bo Lindbergh, Matthias Meyser,
Dennis Preiser, Paolo Amoroso, Dennis Davis, River Tarnell, Jochen Schmitt,
-Tim Fardell, Remco Rijnders, David Binderman, Tony Evans, Christian Garbs
+Tim Fardell, Remco Rijnders, David Binderman, Tony Evans, Christian Garbs,
+Jesse Rehmer
Modified: configure.ac
===================================================================
--- configure.ac 2013-12-12 20:24:20 UTC (rev 9584)
+++ configure.ac 2013-12-14 18:59:12 UTC (rev 9585)
@@ -340,9 +340,17 @@
INN_LIB_SASL_OPTIONAL
dnl If Kerberos is found, define KRB5_AUTH to auth_krb5 so as to build
-dnl that program.
+dnl that program. In case neither et/com_err.h nor com_err.h can be found
+dnl and --with-krb5 is not given, do not define KRB5_AUTH and clear the
+dnl other variables set for Kerberos support.
AS_IF([test x"$KRB5_LIBS" != x],
- [KRB5_AUTH=auth_krb5])
+ [AC_CHECK_HEADERS([et/com_err.h], [KRB5_AUTH=auth_krb5],
+ [AC_CHECK_HEADERS([com_err.h], [KRB5_AUTH=auth_krb5],
+ [AS_IF([test x"$with_krb5" = x],
+ [KRB5_CPPFLAGS=
+ KRB5_LDFLAGS=
+ KRB5_LIBS=],
+ [AC_MSG_ERROR([cannot find usable com_err header])])])])])
AC_SUBST([KRB5_AUTH])
dnl The dbm libraries are a special case. If we're building with Berkeley DB,
------------------------------
Message: 2
Date: Sat, 14 Dec 2013 12:09:56 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (authprogs/ckpasswd.c configure.ac)
Message-ID: <20131214200956.5e21467...@hope.eyrie.org>
Date: Saturday, December 14, 2013 @ 12:09:55
Author: iulius
Revision: 9586
ckpasswd: check for both gdbm/ndbm.h and gdbm-ndbm.h headers
libgdbm-dev in Debian provides /usr/include/gdbm-ndbm.h whereas
gdbm-devel in Red Hat provides /usr/include/gdbm/ndbm.h; INN then
has to make sure to search for the right header file when DBM support
is found.
Define HAVE_GDBM_SLASH_NDBM_H and HAVE_GDBM_HYPHEN_NDBM_H instead
of HAVE_GDBM_NDBM_H to properly disambiguate the two headers that are
mapped to the same preprocessor name by Autoconf.
Thanks to Jesse Rehmer for the bug report.
Modified:
trunk/authprogs/ckpasswd.c
trunk/configure.ac
----------------------+
authprogs/ckpasswd.c | 6 ++++--
configure.ac | 18 ++++++++++++++++--
2 files changed, 20 insertions(+), 4 deletions(-)
Modified: authprogs/ckpasswd.c
===================================================================
--- authprogs/ckpasswd.c 2013-12-14 18:59:12 UTC (rev 9585)
+++ authprogs/ckpasswd.c 2013-12-14 20:09:55 UTC (rev 9586)
@@ -37,10 +37,12 @@
# include <db.h>
# elif HAVE_NDBM_H
# include <ndbm.h>
-# elif HAVE_GDBM_NDBM_H
-# include <gdbm-ndbm.h>
# elif HAVE_DB1_NDBM_H
# include <db1/ndbm.h>
+# elif HAVE_GDBM_SLASH_NDBM_H
+# include <gdbm/ndbm.h>
+# elif HAVE_GDBM_HYPHEN_NDBM_H
+# include <gdbm-ndbm.h>
# endif
# define OPT_DBM "d:"
#else
Modified: configure.ac
===================================================================
--- configure.ac 2013-12-14 18:59:12 UTC (rev 9585)
+++ configure.ac 2013-12-14 20:09:55 UTC (rev 9586)
@@ -387,8 +387,22 @@
sys/select.h sys/time.h unistd.h])
dnl Some Linux systems have db1/ndbm.h instead of ndbm.h. Others have
-dnl gdbm-ndbm.h.
-AC_CHECK_HEADERS([ndbm.h db1/ndbm.h gdbm-ndbm.h], [break])
+dnl gdbm/ndbm.h or gdbm-ndbm.h. Detecting the last two ones is not
+dnl straight-forward because Autoconf defines the same preprocessor name
+dnl and the same shell variable for them; we therefore have to make sure
+dnl the cache is not populated, and to define HAVE_GDBM_SLASH_NDBM_H and
+dnl HAVE_GDBM_HYPHEN_NDBM_H separately.
+AC_CHECK_HEADERS([ndbm.h db1/ndbm.h], [break])
+AS_UNSET([ac_cv_header_gdbm_ndbm_h])
+AC_CHECK_HEADER([gdbm/ndbm.h])
+AS_IF([test x"$ac_cv_header_gdbm_ndbm_h" != xno],
+ [AC_DEFINE([HAVE_GDBM_SLASH_NDBM_H], [1],
+ [Define if you have the <gdbm/ndbm.h> header file.])],
+ [AS_UNSET([ac_cv_header_gdbm_ndbm_h])
+ AC_CHECK_HEADER([gdbm-ndbm.h])
+ AS_IF([test x"$ac_cv_header_gdbm_ndbm_h" != xno],
+ [AC_DEFINE([HAVE_GDBM_HYPHEN_NDBM_H], [1],
+ [Define if you have the <gdbm-ndbm.h> header file.])])])
dnl Check for whether various symbols are declared.
AC_CHECK_DECLS([pread, pwrite, snprintf, setproctitle, strlcat,
------------------------------
Message: 3
Date: Sat, 14 Dec 2013 12:10:49 -0800 (PST)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: branches/2.5 (authprogs/ckpasswd.c configure.ac)
Message-ID: <20131214201049.7acaf67...@hope.eyrie.org>
Date: Saturday, December 14, 2013 @ 12:10:48
Author: iulius
Revision: 9587
ckpasswd: check for both gdbm/ndbm.h and gdbm-ndbm.h headers
libgdbm-dev in Debian provides /usr/include/gdbm-ndbm.h whereas
gdbm-devel in Red Hat provides /usr/include/gdbm/ndbm.h; INN then
has to make sure to search for the right header file when DBM support
is found.
Define HAVE_GDBM_SLASH_NDBM_H and HAVE_GDBM_HYPHEN_NDBM_H instead
of HAVE_GDBM_NDBM_H to properly disambiguate the two headers that are
mapped to the same preprocessor name by Autoconf.
Thanks to Jesse Rehmer for the bug report.
Modified:
branches/2.5/authprogs/ckpasswd.c
branches/2.5/configure.ac
----------------------+
authprogs/ckpasswd.c | 6 ++++--
configure.ac | 18 ++++++++++++++++--
2 files changed, 20 insertions(+), 4 deletions(-)
Modified: authprogs/ckpasswd.c
===================================================================
--- authprogs/ckpasswd.c 2013-12-14 20:09:55 UTC (rev 9586)
+++ authprogs/ckpasswd.c 2013-12-14 20:10:48 UTC (rev 9587)
@@ -37,10 +37,12 @@
# include <db.h>
# elif HAVE_NDBM_H
# include <ndbm.h>
-# elif HAVE_GDBM_NDBM_H
-# include <gdbm-ndbm.h>
# elif HAVE_DB1_NDBM_H
# include <db1/ndbm.h>
+# elif HAVE_GDBM_SLASH_NDBM_H
+# include <gdbm/ndbm.h>
+# elif HAVE_GDBM_HYPHEN_NDBM_H
+# include <gdbm-ndbm.h>
# endif
# define OPT_DBM "d:"
#else
Modified: configure.ac
===================================================================
--- configure.ac 2013-12-14 20:09:55 UTC (rev 9586)
+++ configure.ac 2013-12-14 20:10:48 UTC (rev 9587)
@@ -386,8 +386,22 @@
sys/select.h sys/time.h unistd.h])
dnl Some Linux systems have db1/ndbm.h instead of ndbm.h. Others have
-dnl gdbm-ndbm.h.
-AC_CHECK_HEADERS([ndbm.h db1/ndbm.h gdbm-ndbm.h], [break])
+dnl gdbm/ndbm.h or gdbm-ndbm.h. Detecting the last two ones is not
+dnl straight-forward because Autoconf defines the same preprocessor name
+dnl and the same shell variable for them; we therefore have to make sure
+dnl the cache is not populated, and to define HAVE_GDBM_SLASH_NDBM_H and
+dnl HAVE_GDBM_HYPHEN_NDBM_H separately.
+AC_CHECK_HEADERS([ndbm.h db1/ndbm.h], [break])
+AS_UNSET([ac_cv_header_gdbm_ndbm_h])
+AC_CHECK_HEADER([gdbm/ndbm.h])
+AS_IF([test x"$ac_cv_header_gdbm_ndbm_h" != xno],
+ [AC_DEFINE([HAVE_GDBM_SLASH_NDBM_H], [1],
+ [Define if you have the <gdbm/ndbm.h> header file.])],
+ [AS_UNSET([ac_cv_header_gdbm_ndbm_h])
+ AC_CHECK_HEADER([gdbm-ndbm.h])
+ AS_IF([test x"$ac_cv_header_gdbm_ndbm_h" != xno],
+ [AC_DEFINE([HAVE_GDBM_HYPHEN_NDBM_H], [1],
+ [Define if you have the <gdbm-ndbm.h> header file.])])])
dnl Check for whether various symbols are declared.
AC_CHECK_DECLS([pread, pwrite, snprintf, setproctitle, strlcat,
------------------------------
_______________________________________________
inn-committers mailing list
inn-committers@lists.isc.org
https://lists.isc.org/mailman/listinfo/inn-committers
End of inn-committers Digest, Vol 58, Issue 4
*********************************************
