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 (7 files) (INN Commit)
2. INN commit: trunk/contrib (expirectl.c mlockfile.c) (INN Commit)
3. INN commit: branches/2.5/contrib (expirectl.c mlockfile.c)
(INN Commit)
----------------------------------------------------------------------
Message: 1
Date: Sun, 21 Sep 2014 11:02:15 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (7 files)
Message-ID: <20140921180215.5324567...@hope.eyrie.org>
Date: Sunday, September 21, 2014 @ 11:02:14
Author: iulius
Revision: 9715
Do not build with Berkeley DB support if db.h is not found
Modified:
trunk/configure.ac
trunk/frontends/ovdb_init.c
trunk/frontends/ovdb_monitor.c
trunk/frontends/ovdb_server.c
trunk/frontends/ovdb_stat.c
trunk/storage/ovdb/ovdb-private.h
trunk/storage/ovdb/ovdb.c
-----------------------------+
configure.ac | 33 ++++++++++++++++++++++++++++-----
frontends/ovdb_init.c | 6 +++---
frontends/ovdb_monitor.c | 6 +++---
frontends/ovdb_server.c | 6 +++---
frontends/ovdb_stat.c | 6 +++---
storage/ovdb/ovdb-private.h | 4 ++--
storage/ovdb/ovdb.c | 6 +++---
7 files changed, 45 insertions(+), 22 deletions(-)
Modified: configure.ac
===================================================================
--- configure.ac 2014-09-21 12:55:56 UTC (rev 9714)
+++ configure.ac 2014-09-21 18:02:14 UTC (rev 9715)
@@ -343,12 +343,35 @@
[AC_MSG_ERROR([cannot find usable com_err header])])])])])
AC_SUBST([KRB5_AUTH])
+dnl If Berkeley DB is found, check the presence of its header.
+dnl Also, do not build with zlib support unless Berkeley DB is enabled.
+AS_IF([test x"$inn_use_BDB" = xtrue],
+ [inn_BDB_incroot=
+ inn_BDB_header_found=
+ AS_IF([test x"$inn_BDB_includedir" != x],
+ [inn_BDB_incroot="$inn_BDB_includedir"],
+ [AS_IF([test x"$inn_BDB_root" != x],
+ [inn_BDB_incroot="${inn_BDB_root}/include"])])
+ AS_IF([test x"$inn_BDB_incroot" = x],
+ [AC_CHECK_HEADERS([db.h],
+ [inn_BDB_header_found=yes],
+ [inn_BDB_header_found=no])],
+ [AS_IF([test -f "${inn_BDB_incroot}/db.h"],
+ [inn_BDB_header_found=yes
+ AC_DEFINE([HAVE_DB_H], [1],
+ [Define if you have the <db.h> header file.])],
+ [inn_BDB_header_found=no])])
+ AS_IF([test x"${inn_BDB_header_found}" = xyes],
+ [INN_LIB_BDB_NDBM
+ INN_LIB_ZLIB_OPTIONAL],
+ [AS_IF([test x"$with_bdb" = x],
+ [BDB_CPPFLAGS=
+ BDB_LDFLAGS=
+ BDB_LIBS=],
+ [AC_MSG_ERROR([cannot find usable Berkeley DB header])])])])
+
dnl The dbm libraries are a special case. If we're building with Berkeley DB,
-dnl just use the ndbm support provided by it. Also, do not build with zlib
-dnl support unless Berkeley DB is enabled.
-AS_IF([test x"$inn_use_BDB" = xtrue],
- [INN_LIB_BDB_NDBM
- INN_LIB_ZLIB_OPTIONAL])
+dnl just use the ndbm support provided by it.
AS_IF([test x"$inn_cv_lib_bdb_ndbm" != xyes],
[INN_SEARCH_AUX_LIBS([dbm_open], [ndbm dbm gdbm "gdbm_compat -lgdbm"],
[DBM_LIBS],
Modified: frontends/ovdb_init.c
===================================================================
--- frontends/ovdb_init.c 2014-09-21 12:55:56 UTC (rev 9714)
+++ frontends/ovdb_init.c 2014-09-21 18:02:14 UTC (rev 9715)
@@ -17,14 +17,14 @@
#include "../storage/ovdb/ovdb.h"
#include "../storage/ovdb/ovdb-private.h"
-#ifndef HAVE_BDB
+#ifndef HAVE_DB_H
int main(int argc UNUSED, char **argv UNUSED)
{
die("Berkeley DB support not compiled");
}
-#else /* HAVE_BDB */
+#else /* HAVE_DB_H */
static int open_db(DB **db, const char *name, int type)
{
@@ -440,5 +440,5 @@
exit(0);
}
-#endif /* HAVE_BDB */
+#endif /* HAVE_DB_H */
Modified: frontends/ovdb_monitor.c
===================================================================
--- frontends/ovdb_monitor.c 2014-09-21 12:55:56 UTC (rev 9714)
+++ frontends/ovdb_monitor.c 2014-09-21 18:02:14 UTC (rev 9715)
@@ -22,14 +22,14 @@
#include "../storage/ovdb/ovdb.h"
#include "../storage/ovdb/ovdb-private.h"
-#ifndef HAVE_BDB
+#ifndef HAVE_DB_H
int main(int argc UNUSED, char **argv UNUSED)
{
exit(0);
}
-#else /* HAVE_BDB */
+#else /* HAVE_DB_H */
static int signalled = 0;
static void sigfunc(int sig UNUSED)
@@ -275,5 +275,5 @@
return 1;
}
-#endif /* HAVE_BDB */
+#endif /* HAVE_DB_H */
Modified: frontends/ovdb_server.c
===================================================================
--- frontends/ovdb_server.c 2014-09-21 12:55:56 UTC (rev 9714)
+++ frontends/ovdb_server.c 2014-09-21 18:02:14 UTC (rev 9715)
@@ -37,7 +37,7 @@
#include "../storage/ovdb/ovdb.h"
#include "../storage/ovdb/ovdb-private.h"
-#ifndef HAVE_BDB
+#ifndef HAVE_DB_H
int
main(int argc UNUSED, char **argv UNUSED)
@@ -45,7 +45,7 @@
die("Berkeley DB support not compiled");
}
-#else /* HAVE_BDB */
+#else /* HAVE_DB_H */
#define SELECT_TIMEOUT 15
@@ -747,4 +747,4 @@
}
-#endif /* HAVE_BDB */
+#endif /* HAVE_DB_H */
Modified: frontends/ovdb_stat.c
===================================================================
--- frontends/ovdb_stat.c 2014-09-21 12:55:56 UTC (rev 9714)
+++ frontends/ovdb_stat.c 2014-09-21 18:02:14 UTC (rev 9715)
@@ -21,14 +21,14 @@
#include "../storage/ovdb/ovdb-private.h"
-#ifndef HAVE_BDB
+#ifndef HAVE_DB_H
int main(int argc UNUSED, char **argv UNUSED)
{
die("Berkeley DB support not compiled");
}
-#else /* HAVE_BDB */
+#else /* HAVE_DB_H */
static int signalled = 0;
static void sigfunc(int signum UNUSED)
@@ -897,5 +897,5 @@
return 0;
}
-#endif /* HAVE_BDB */
+#endif /* HAVE_DB_H */
Modified: storage/ovdb/ovdb-private.h
===================================================================
--- storage/ovdb/ovdb-private.h 2014-09-21 12:55:56 UTC (rev 9714)
+++ storage/ovdb/ovdb-private.h 2014-09-21 18:02:14 UTC (rev 9715)
@@ -1,4 +1,4 @@
-#ifdef HAVE_BDB
+#ifdef HAVE_DB_H
#include <db.h>
@@ -190,4 +190,4 @@
#define TRYAGAIN DB_LOCK_DEADLOCK
-#endif /* HAVE_BDB */
+#endif /* HAVE_DB_H */
Modified: storage/ovdb/ovdb.c
===================================================================
--- storage/ovdb/ovdb.c 2014-09-21 12:55:56 UTC (rev 9714)
+++ storage/ovdb/ovdb.c 2014-09-21 18:02:14 UTC (rev 9715)
@@ -111,7 +111,7 @@
# include <sys/un.h>
#endif
-#ifndef HAVE_BDB
+#ifndef HAVE_DB_H
/* Provide stub functions if we don't have db */
@@ -155,7 +155,7 @@
void ovdb_close(void) { }
-#else /* HAVE_BDB */
+#else /* HAVE_DB_H */
#define EXPIREGROUP_TXN_SIZE 100
#define DELETE_TXN_SIZE 500
@@ -3061,4 +3061,4 @@
ovdb_releaselock();
}
-#endif /* HAVE_BDB */
+#endif /* HAVE_DB_H */
------------------------------
Message: 2
Date: Sun, 21 Sep 2014 12:53:42 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/contrib (expirectl.c mlockfile.c)
Message-ID: <20140921195342.bc66c67...@hope.eyrie.org>
Date: Sunday, September 21, 2014 @ 12:53:42
Author: iulius
Revision: 9716
Fixed a warning and an unnecessary sys/stropts.h header
Modified:
trunk/contrib/expirectl.c
trunk/contrib/mlockfile.c
-------------+
expirectl.c | 4 +---
mlockfile.c | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)
Modified: expirectl.c
===================================================================
--- expirectl.c 2014-09-21 18:02:14 UTC (rev 9715)
+++ expirectl.c 2014-09-21 19:53:42 UTC (rev 9716)
@@ -291,7 +291,7 @@
FILE *fo;
if ((fo = fopen(EXPIRE_DAYS, "w")) != NULL) {
- fprintf(fo, "time 0x%08lx\n", expireIncTime);
+ fprintf(fo, "time 0x%08lx\n", (unsigned long) expireIncTime);
fprintf(fo, "days %ld\n", expireDays);
fclose(fo);
} else {
@@ -299,8 +299,6 @@
}
}
exit(0);
-
- return 1;
}
Modified: mlockfile.c
===================================================================
--- mlockfile.c 2014-09-21 18:02:14 UTC (rev 9715)
+++ mlockfile.c 2014-09-21 19:53:42 UTC (rev 9716)
@@ -17,7 +17,6 @@
#include <unistd.h>
#include <sys/mman.h>
#include <sys/stat.h>
-#include <sys/stropts.h>
struct mlock {
const char *path;
------------------------------
Message: 3
Date: Sun, 21 Sep 2014 12:54:27 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: branches/2.5/contrib (expirectl.c mlockfile.c)
Message-ID: <20140921195427.3c57867...@hope.eyrie.org>
Date: Sunday, September 21, 2014 @ 12:54:27
Author: iulius
Revision: 9717
Fixed a warning and an unnecessary sys/stropts.h header
Modified:
branches/2.5/contrib/expirectl.c
branches/2.5/contrib/mlockfile.c
-------------+
expirectl.c | 2 +-
mlockfile.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
Modified: expirectl.c
===================================================================
--- expirectl.c 2014-09-21 19:53:42 UTC (rev 9716)
+++ expirectl.c 2014-09-21 19:54:27 UTC (rev 9717)
@@ -291,7 +291,7 @@
FILE *fo;
if ((fo = fopen(EXPIRE_DAYS, "w")) != NULL) {
- fprintf(fo, "time 0x%08lx\n", expireIncTime);
+ fprintf(fo, "time 0x%08lx\n", (unsigned long) expireIncTime);
fprintf(fo, "days %ld\n", expireDays);
fclose(fo);
} else {
Modified: mlockfile.c
===================================================================
--- mlockfile.c 2014-09-21 19:53:42 UTC (rev 9716)
+++ mlockfile.c 2014-09-21 19:54:27 UTC (rev 9717)
@@ -17,7 +17,6 @@
#include <unistd.h>
#include <sys/mman.h>
#include <sys/stat.h>
-#include <sys/stropts.h>
struct mlock {
const char *path;
------------------------------
_______________________________________________
inn-committers mailing list
inn-committers@lists.isc.org
https://lists.isc.org/mailman/listinfo/inn-committers
End of inn-committers Digest, Vol 67, Issue 17
**********************************************
