Merge pull request syslog-ng#5099 from HofiOne/Fix-FreeBSD-builds

Fix free bsd builds

Author: HofiOne

cmake/Modules/FindInotify.cmake

@@ -46,33 +46,39 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #=============================================================================
 
-find_path(Inotify_INCLUDE_DIRS sys/inotify.h)
-if(Inotify_INCLUDE_DIRS)
-# On Linux there is no library to link against, on the BSDs there is.
-# On the BSD's, inotify is implemented through a library, libinotify.
-    if( CMAKE_SYSTEM_NAME MATCHES "Linux")
+set(Inotify_FOUND FALSE)
+
+find_path (Inotify_INCLUDE_DIRS sys/inotify.h)
+if (Inotify_INCLUDE_DIRS)
+    if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+        # On Linux there is no library to link against, on the BSDs there is.
         set(Inotify_FOUND TRUE)
 
         set(Inotify_INCLUDE_DIRS "")
-    else()
-        find_library(Inotify_LIBRARIES NAMES inotify)
-        include(FindPackageHandleStandardArgs)
-        find_package_handle_standard_args(Inotify
-            FOUND_VAR
-                Inotify_FOUND
-            REQUIRED_VARS
-                Inotify_LIBRARIES
-                Inotify_INCLUDE_DIRS
-        )
-        mark_as_advanced(Inotify_LIBRARIES Inotify_INCLUDE_DIRS)
-        include(FeatureSummary)
-        set_package_properties(Inotify PROPERTIES
-            URL "https://github.com/libinotify-kqueue/"
-            DESCRIPTION "inotify API on the *BSD family of operating systems."
-        )
+    #else()
+        # On the BSD's, inotify is implemented through a library, libinotify.
+        # But we disabled that for now because
+        #   - Ivykis currently supports inotify only for directory monitoring, not for files
+        #   - libinotify is just a wrapper around kqueue, why would we want a wrapper around
+        #     a natively supported solution, instead of using it directly
+        # https://github.com/buytenh/ivykis/issues/37
+
+        #find_library(Inotify_LIBRARIES NAMES inotify)
+        #include(FindPackageHandleStandardArgs)
+        #find_package_handle_standard_args(Inotify
+        #    FOUND_VAR
+        #        Inotify_FOUND
+        #    REQUIRED_VARS
+        #        Inotify_LIBRARIES
+        #        Inotify_INCLUDE_DIRS
+        #)
+        #mark_as_advanced(Inotify_LIBRARIES Inotify_INCLUDE_DIRS)
+        #include(FeatureSummary)
+        #set_package_properties(Inotify PROPERTIES
+        #    URL "https://github.com/libinotify-kqueue/"
+        #    DESCRIPTION "inotify API on the *BSD family of operating systems."
+        #)
     endif()
-else()
-   set(Inotify_FOUND FALSE)
 endif()
 
 mark_as_advanced(Inotify_LIBRARIES Inotify_INCLUDE_DIRS) 

cmake/Modules/FindRiemannClient.cmake

@@ -30,6 +30,10 @@ endif()
 if (NOT Riemann_LIBRARY)
   libfind_pkg_detect(Riemann riemann-client FIND_PATH riemann/event.h FIND_LIBRARY riemann-client-no-tls)
 endif()
+if (NOT Riemann_LIBRARY)
+  libfind_pkg_detect (Riemann riemann-client FIND_PATH riemann/event.h FIND_LIBRARY riemann-client-gnutls)
+endif ()
+
 if (Riemann_LIBRARY)
       message(STATUS "Found Riemann client: ${Riemann_LIBRARY}")
 endif()

lib/timeutils/cache.c

@@ -147,7 +147,7 @@ _get_system_tzofs(void)
 {
 #ifdef SYSLOG_NG_HAVE_TIMEZONE
   /* global variable */
-  return timezone;
+  return (glong) timezone;
 #elif SYSLOG_NG_HAVE_STRUCT_TM_TM_GMTOFF
   time_t t = time(NULL);
   struct tm *tm;

modules/affile/directory-monitor-factory.c

@@ -48,7 +48,8 @@ directory_monitor_factory_get_monitor_method(const gchar *method)
     {
       return MM_INOTIFY;
     }
-#elif SYSLOG_NG_HAVE_KQUEUE
+#endif
+#if SYSLOG_NG_HAVE_KQUEUE
   else if (strcmp(method, "kqueue") == 0)
     {
       return MM_KQUEUE;
@@ -61,30 +62,26 @@ DirectoryMonitorConstructor
 directory_monitor_factory_get_constructor(DirectoryMonitorOptions *options)
 {
   DirectoryMonitorConstructor constructor = NULL;
+
 #if SYSLOG_NG_HAVE_INOTIFY
   if (options->method == MM_AUTO || options->method == MM_INOTIFY)
     {
       constructor = directory_monitor_inotify_new;
     }
-  else if (options->method == MM_POLL)
-    {
-      constructor = directory_monitor_poll_new;
-    }
-#elif SYSLOG_NG_HAVE_KQUEUE
-  if (options->method == MM_AUTO || options->method == MM_KQUEUE)
+#endif
+
+#if SYSLOG_NG_HAVE_KQUEUE
+  if (constructor == NULL && (options->method == MM_AUTO || options->method == MM_KQUEUE))
     {
       constructor = directory_monitor_kqueue_new;
     }
-  else if (options->method == MM_POLL)
-    {
-      constructor = directory_monitor_poll_new;
-    }
-#else
-  if (options->method == MM_AUTO || options->method == MM_POLL)
+#endif
+
+  if (constructor == NULL && (options->method == MM_AUTO || options->method == MM_POLL))
     {
       constructor = directory_monitor_poll_new;
     }
-#endif
+
   return constructor;
 }
 

modules/affile/directory-monitor-kqueue.c

@@ -67,7 +67,12 @@ static void handle_kqueue_event(void *s)
 static gboolean
 _register_kqueue_watches(DirectoryMonitorKQueue *self)
 {
-  gint fd = open(self->super.super.dir, O_EVTONLY);
+#ifdef __APPLE__
+  gint open_mode = O_EVTONLY | O_DIRECTORY;
+#else
+  gint open_mode = O_NONBLOCK | O_RDONLY | O_DIRECTORY;
+#endif
+  gint fd = open(self->super.super.dir, open_mode);
   if (fd < 0)
     {
       msg_error("directory-monitor-kqueue: could not open directory for watching",