[Reconnoiter-devel] [reconnoiter commit] Reconnoiter branch, master, updated. e4495d7714861999ad3316fca86d599d738418b1

git at labs.omniti.com git at labs.omniti.com
Thu Apr 14 11:46:37 EDT 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Reconnoiter".

The branch, master has been updated
       via  e4495d7714861999ad3316fca86d599d738418b1 (commit)
       via  6131ae87f1f4d61b94dfd16f280384290a3e65f8 (commit)
       via  b8cf70c088e4f042cd71503f15c6503a3266c11a (commit)
       via  950cb58d22f171cb3f8ef9c236501d09bf12e1f8 (commit)
      from  7ffa89c9400d753e2d2ec6860e6fe6e3b66069fa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e4495d7714861999ad3316fca86d599d738418b1
Merge: 7ffa89c 6131ae8
Author: Theo Schlossnagle <jesus at omniti.com>
Date:   Thu Apr 14 11:42:01 2011 -0400

    Merge branch 'master' of https://github.com/PiotrSikora/reconnoiter into GH-PR-4


commit 6131ae87f1f4d61b94dfd16f280384290a3e65f8
Author: Piotr Sikora <piotr.sikora at frickle.com>
Date:   Thu Apr 14 03:17:25 2011 +0000

    Correctly detect availability of openpty().

diff --git a/configure.in b/configure.in
index 1b0ec34..20433df 100755
--- a/configure.in
+++ b/configure.in
@@ -390,6 +390,27 @@ AC_CHECK_HEADERS([term.h], [], [],
      #endif
      ]])
 
+AC_CHECK_DECLS([openpty], [], [],
+		[#if defined(HAVE_SYS_TYPES_H)
+		 # include <sys/types.h>
+		 #endif
+		 #if defined(HAVE_SYS_IOCTL_H)
+		 # include <sys/ioctl.h>
+		 #endif
+		 #if defined(HAVE_TERMIOS_H)
+		 # include <termios.h>
+		 #endif
+		 #if defined(HAVE_LIBUTIL_H)
+		 # include <libutil.h>
+		 #endif
+		 #if defined(HAVE_UTIL_H)
+		 # include <util.h>
+		 #endif
+		 #if defined(HAVE_PTY_H)
+		 # include <pty.h>
+		 #endif
+		])
+
 AC_CHECK_FUNCS(getpwnam_r)
 GETPWNAM_R_POSIX
 AC_CHECK_FUNCS(getgrnam_r)
diff --git a/src/noit_config.h.in b/src/noit_config.h.in
index cfe3a2f..eefd6f8 100644
--- a/src/noit_config.h.in
+++ b/src/noit_config.h.in
@@ -118,6 +118,7 @@
 #undef HAVE_STRLCPY
 #undef HAVE_STRNSTRN
 #undef HAVE_OPENPTY
+#undef HAVE_DECL_OPENPTY
 #undef HAVE_INET_PTON
 #undef HAVE_INET_NTOP
 #undef HAVE_GETOPT
diff --git a/src/noit_console.c b/src/noit_console.c
index 3161c7d..db7e991 100644
--- a/src/noit_console.c
+++ b/src/noit_console.c
@@ -310,7 +310,7 @@ noit_console_motd(eventer_t e, acceptor_closure_t *ac,
 
 int
 allocate_pty(int *master, int *slave) {
-#ifdef HAVE_OPENPTY
+#if defined(HAVE_OPENPTY) || defined(HAVE_DECL_OPENPTY)
   if(openpty(master, slave, NULL, NULL, NULL)) return -1;
 #else
   /* STREAMS... sigh */

commit b8cf70c088e4f042cd71503f15c6503a3266c11a
Author: Piotr Sikora <piotr.sikora at frickle.com>
Date:   Thu Apr 14 03:15:10 2011 +0000

    Add missing headers (to silence warnings on OpenBSD).

diff --git a/src/modules/collectd.c b/src/modules/collectd.c
index 2f0439b..6a8ec01 100644
--- a/src/modules/collectd.c
+++ b/src/modules/collectd.c
@@ -35,6 +35,7 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <inttypes.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include "noit_module.h"
diff --git a/src/modules/dns.c b/src/modules/dns.c
index 64e714d..4e70c30 100644
--- a/src/modules/dns.c
+++ b/src/modules/dns.c
@@ -37,6 +37,7 @@
 #include <netdb.h>
 #include <errno.h>
 #include <assert.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include "noit_module.h"

commit 950cb58d22f171cb3f8ef9c236501d09bf12e1f8
Author: Piotr Sikora <piotr.sikora at frickle.com>
Date:   Thu Apr 14 03:13:35 2011 +0000

    Respect $JAVA_HOME.

diff --git a/configure.in b/configure.in
index a504b3f..1b0ec34 100755
--- a/configure.in
+++ b/configure.in
@@ -24,8 +24,11 @@ AC_PATH_PROGS(PERL, perl)
 AC_PATH_PROGS(XSLTPROC, xsltproc)
 AC_PATH_PROGS(XMLLINT, xmllint)
 AC_PATH_PROGS(JAVA, java)
+AC_PATH_PROGS(JAVA, java, , $JAVA_HOME/bin)
 AC_PATH_PROGS(JAVAC, javac)
+AC_PATH_PROGS(JAVAC, javac, , $JAVA_HOME/bin)
 AC_PATH_PROGS(JAR, jar)
+AC_PATH_PROGS(JAR, jar, , $JAVA_HOME/bin)
 AC_PATH_PROG(NROFF, nroff)
 AC_SUBST(PERL)
 

-----------------------------------------------------------------------

Summary of changes:
 configure.in           |   24 ++++++++++++++++++++++++
 src/modules/collectd.c |    1 +
 src/modules/dns.c      |    1 +
 src/noit_config.h.in   |    1 +
 src/noit_console.c     |    2 +-
 5 files changed, 28 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Reconnoiter


More information about the Reconnoiter-devel mailing list