net-mgmt/seafile: Remove use of /proc and make FUSE optional

DragonFly has not implemented FUSE, so it's not reqired by default.

PR:		195024
submitted by:	maintainer

1 files changed, 178 insertions, 6 deletions

diff --git a/net-mgmt/seafile/files/patch-lib_utils.c b/net-mgmt/seafile/files/patch-lib_utils.c
index c1c3c4f645d3..4ae52bcbfccc 100644
--- a/net-mgmt/seafile/files/patch-lib_utils.c
+++ b/net-mgmt/seafile/files/patch-lib_utils.c
@@ -1,11 +1,26 @@
---- lib/utils.c.orig	2014-06-05 02:25:50.000000000 -0400
-+++ lib/utils.c	2014-07-30 22:56:37.000000000 -0400
-@@ -1756,14 +1756,19 @@
+--- lib/utils.c.orig	2014-08-05 01:28:35.000000000 -0400
++++ lib/utils.c	2014-11-22 20:17:13.543784891 -0500
+@@ -46,6 +46,15 @@
+ 
+ #include <zlib.h>
+ 
++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#include <stdlib.h>
++#include <kvm.h>
++#include <paths.h>
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#include <sys/user.h>
++#endif
++
+ extern int inet_pton(int af, const char *src, void *dst);
+ 
+ 
+@@ -1756,14 +1765,19 @@
  
  #endif  /* ifdef WIN32 */
  
 -#ifdef __linux__
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
  /* read the link of /proc/123/exe and compare with `process_name' */
  static int
  find_process_in_dirent(struct dirent *dir, const char *process_name)
@@ -14,10 +29,167 @@
      /* fisrst construct a path like /proc/123/exe */
 +#ifdef __linux__
      if (sprintf (path, "/proc/%s/exe", dir->d_name) < 0) {
-+#endif
-+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
 +    if (sprintf (path, "/proc/%s/file", dir->d_name) < 0) {
++#else
++    if (TRUE) {
 +#endif
          return -1;
      }
  
+@@ -1787,7 +1801,8 @@
+ }
+ 
+ /* read the /proc fs to determine whether some process is running */
+-gboolean process_is_running (const char *process_name)
++static gboolean 
++process_is_running_procfs (const char *process_name)
+ {
+     DIR *proc_dir = opendir("/proc");
+     if (!proc_dir) {
+@@ -1812,7 +1827,8 @@
+     return FALSE;
+ }
+ 
+-int count_process(const char *process_name)
++static int 
++count_process_procfs(const char *process_name)
+ {
+     int count = 0;
+     DIR *proc_dir = opendir("/proc");
+@@ -1836,6 +1852,14 @@
+     return count;
+ }
+ 
++#ifdef __linux__
++gboolean process_is_running (const char *process_name) {
++    return process_is_running_procfs(process_name);
++}
++
++int count_process(const char *process_name) {
++    return count_process_procfs(process_name);
++}
+ #endif
+ 
+ #ifdef __APPLE__
+@@ -1846,6 +1870,120 @@
+ }
+ #endif
+ 
++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__)
++#define PSKIP(kp) ((kp)->ki_pid == mypid ||               \
++                   (!kthreads && ((kp)->ki_flag & P_KTHREAD) != 0))
++#define KVM_OPENFILES(exec, coref, buf) \
++		kvm_openfiles(exec, coref, NULL, O_RDONLY, buf)
++#define KVM_GETPROCS(kd, plist, nproc) \
++       		kvm_getprocs(kd, KERN_PROC_PROC, 0, &nproc)
++
++#elif defined(__DragonFly__)
++#define	PSKIP(kp) ((kp)->kp_pid == mypid ||			\
++		   (!kthreads && ((kp)->kp_flags & P_KTHREADP) != 0))
++#define KVM_OPENFILES(exec, coref, buf) \
++		kvm_openfiles(exec, coref, NULL, O_RDONLY, buf)
++#define KVM_GETPROCS(kd, plist, nproc) \
++		kvm_getprocs(kd, KERN_PROC_ALL, 0, &nproc)
++
++#elif defined(__NetBSD__)
++#define	PSKIP(kp) ((kp)->kp_pid == mypid ||			\
++		   ((kp)->p_flag & P_SYSTEM) != 0)
++#define KVM_OPENFILES(exec, coref, buf) \
++		kvm_openfiles(exec, coref, NULL, KVM_NO_FILES, buf)
++#define KVM_GETPROCS(kd, plist, nproc) \
++		kvm_getprocs(kd, KERN_PROC_ALL, 0, sizeof(*plist), &nproc)
++
++#elif defined(__OpenBSD__)
++#define	PSKIP(kp) ((kp)->kp_pid == mypid ||			\
++		   ((kp)->p_flag & (P_SYSTEM | P_THREAD)) != 0)
++#define KVM_OPENFILES(exec, coref, buf) \
++		kvm_openfiles(exec, coref, NULL, KVM_NO_FILES, buf)
++#define KVM_GETPROCS(kd, plist, nproc) \
++		kvm_getprocs(kd, KERN_PROC_ALL, 0, sizeof(*plist), &nproc)
++
++#else
++#define PSKIP(kp) 0
++#define KVM_OPENFILES(exec, coref, buf) 0
++#define KVM_GETPROCS(kd, plist, nproc) 0
++#endif
++
++#ifndef WITH_PROC_FS
++#define WITH_PROC_FS g_file_test("/proc/curproc", G_FILE_TEST_EXISTS)
++#endif
++
++static int 
++count_running_process_kvm(const char *process_name) {
++    
++    
++    static kvm_t    *kd;
++    static struct    kinfo_proc *plist;
++    static int    nproc;
++    static pid_t    mypid;
++    static int      kthreads;
++
++    char buf[_POSIX2_LINE_MAX]; 
++    const char * execf, *coref;
++    char **pargv;
++    int i, selected_nproc;
++    struct kinfo_proc *kp;
++
++    selected_nproc = 0;
++    execf = NULL;
++    coref = _PATH_DEVNULL;
++    
++    mypid = getpid();
++    kd = KVM_OPENFILES(execf, coref, buf);
++    if (kd == NULL) {
++        fprintf(stderr, "Error: Cannot open kernel files (%s)", buf);
++        exit(1);
++    }
++
++    plist = KVM_GETPROCS(kd, plist, nproc);
++    if (plist == NULL) {
++        fprintf(stderr, "Error: Cannot get process list (%s)", kvm_geterr(kd));
++        exit(1);
++    }
++
++    for(i = 0, kp = plist; i < nproc; i++, kp++) {
++        if (PSKIP(kp)) {
++            continue;
++        }
++        if ((pargv = kvm_getargv(kd, kp, 0)) != NULL) {
++            if (strstr(pargv[0], process_name) != NULL) {
++                selected_nproc += 1;
++            }
++        }
++    }
++    kvm_close(kd);
++    kvm_close(kd);
++
++    return selected_nproc;
++}
++
++gboolean
++process_is_running(const char * process_name) {
++    if (WITH_PROC_FS) { 
++        return process_is_running_procfs(process_name);
++    }
++    if (count_running_process_kvm(process_name) > 0) {
++        return TRUE;
++    } else {
++        return FALSE;
++    }
++}
++
++int
++count_process(const char * process_name) {
++   if (WITH_PROC_FS) {
++       return count_process_procfs(process_name);
++   }
++   return count_running_process_kvm(process_name);
++}
++#endif
++
++
+ char*
+ ccnet_object_type_from_id (const char *object_id)
+ {