Attachment #149742 for bug #195024





PORTNAME=	seafile
PORTVERSION=	3.1.4
PORTREVISION=	1
CATEGORIES=	net-mgmt devel

MAINTAINER=	yan_jingfeng@yahoo.com

		libzdb.so:${PORTSDIR}/databases/libzdb \
		libcrypto.so:${PORTSDIR}/security/openssl \
		libarchive.so.13:${PORTSDIR}/archivers/libarchive \
		libfuse.so:${PORTSDIR}/sysutils/fusefs-libs \
		libinotify.so:${PORTSDIR}/devel/libinotify \
		libccnet.so:${PORTSDIR}/net-mgmt/ccnet
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo \


MAKE_JOBS_UNSAFE=	yes

OPTIONS_DEFINE=	FUSE RIAK
OPTIONS_SUB=	yes
FUSE_DESC=	Use file system in userspace
FUSE_CONFIGURE_ENABLE= fuse
FUSE_LIB_DEPENDS=libfuse.so:${PORTSDIR}/sysutils/fusefs-libs
RIAK_DESC=	Use distributed noSQL database
RIAK_CONFIGURE_ENABLE=	riak
RIAK_RUN_DEPENDS=riak:${PORTSDIR}/databases/riak

OPTIONS_DEFAULT=FUSE
.if defined(DFLYVERSION)
OPTIONS_DEFAULT=
.endif

post-install:
	@${MKDIR} ${SEABIN} \
		${STAGEDIR}${WWWDIR}/seafile/share/doc/seafile \

		${STAGEDIR}${WWWDIR}/upgrade
.for SERVPROG in fileserver seaf-fsck seafserv-gc seaf-fuse seaf-migrate \
	seaf-server seaf-server-init seafile-controller seafserv-tool
	if [ -e "${STAGEDIR}${PREFIX}/bin/${SERVPROG}" ]; then \
		${LN} ${STAGEDIR}${PREFIX}/bin/${SERVPROG} ${SEABIN}; \
	fi
.endfor
	${INSTALL_SCRIPT} ${WRKSRC}/scripts/*.[ps][yh] ${STAGEDIR}${WWWDIR}
	${INSTALL_SCRIPT} ${WRKSRC}/scripts/upgrade/*.[ps][yh] \

Lines 1-5 Link Here

(-)files/patch-configure.ac (-4 / +13 lines)
1	--- configure.ac.orig 2014-06-05 02:25:50.000000000 -0400	1	--- configure.ac.orig 2014-08-05 01:28:35.000000000 -0400
2	+++ configure.ac 2014-07-21 12:43:12.000000000 -0400	2	+++ configure.ac 2014-11-22 13:34:26.927863521 -0500
		3	@@ -88,7 +88,7 @@
		4	[compile_riak=$enableval],[compile_riak="no"])
		5
		6	AC_ARG_ENABLE(fuse, AC_HELP_STRING([--enable-fuse], [enable fuse virtual file system]),
		7	- [compile_fuse=$enableval],[compile_fuse="yes"])
		8	+ [compile_fuse=$enableval],[compile_fuse="no"])
		9	fi
		10
		11	AC_ARG_ENABLE(client, AC_HELP_STRING([--enable-client], [enable client]),
3	@@ -199,25 +199,28 @@	12	@@ -199,25 +199,28 @@
4	LIB_GDI32=	13	LIB_GDI32=
5	LIB_RT=	14	LIB_RT=
Lines 40-46 Link Here
40	AC_SUBST(MSVC_CFLAGS)	49	AC_SUBST(MSVC_CFLAGS)
41		50
42		51
43	@@ -241,7 +246,6 @@	52	@@ -242,7 +247,6 @@
44	#LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1	53	#LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1
45	CURL_REQUIRED=7.17	54	CURL_REQUIRED=7.17
46	FUSE_REQUIRED=2.8.6	55	FUSE_REQUIRED=2.8.6
Lines 48-54 Link Here
48		57
49	PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED])	58	PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED])
50	AC_SUBST(GLIB2_CFLAGS)	59	AC_SUBST(GLIB2_CFLAGS)
51	@@ -263,10 +267,6 @@	60	@@ -268,10 +272,6 @@
52	AC_SUBST(LIBEVENT_CFLAGS)	61	AC_SUBST(LIBEVENT_CFLAGS)
53	AC_SUBST(LIBEVENT_LIBS)	62	AC_SUBST(LIBEVENT_LIBS)
54		63




20a21,32
> #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
> #include <sys/sysctl.h>
> #include <sys/types.h>
> #include <sys/user.h>
> #include <limits.h>
> 
> #ifndef WITH_PROC_FS
> #define WITH_PROC_FS g_file_test("/proc/curproc", G_FILE_TEST_EXISTS)
> #endif
> 
> #endif
> 
24a37
> static char *command_name = NULL;
275a289
> #if defined(__linux__)
276a291,302
> #elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
>     /*
>      * seafile.sh starts the process using abs path
>      */ 
>     char executable[_POSIX_PATH_MAX];
>     memset(executable, 0, _POSIX_PATH_MAX);
>     char * rc = realpath(command_name, executable);
>     if (!rc) {
>         seaf_warning ("failed to readpath: %s\n", executable);
> 	return;
>     }
> #endif
289a316
> #if defined(__linux__)
290a318
> #endif
429a458,466
> 	gboolean with_procfs;
> #if defined(__linux__)
> 	with_procfs = g_file_test("/proc/self", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR);
> #elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
> 	with_procfs = g_file_test("/proc/curproc", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR);
> #else
> 	with_procfs = FALSE;
> #endif
> 	if (with_procfs) {
435c472,492
<         }
---
> 	}
> 
> 	} else {
> #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
> #ifdef __OpenBSD__
>             int min[6] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, sizeof(struct kinfo_proc), 1};
> #else
>             int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, pid};
> #endif
>             size_t len = sizeof(struct kinfo_proc);
>             struct kinfo_proc kp;
>             if (sysctl(mib, sizeof(mib)/sizeof(mib[0]), &kp, &len, NULL, 0) != -1 && 
> 	        len == sizeof(struct kinfo_proc)) {
>                 return FALSE;        
>             } else {
>                 return TRUE;
>             }
> #else
> 	return FALSE;
> #endif
> 	}
894a952
>     command_name = argv[0];

Lines 1-5 Link Here

(-)files/patch-lib_Makfile.am (-2 / +11 lines)
1	--- lib/Makefile.am.orig 2014-08-30 02:00:00.097346044 -0400	1	--- lib/Makefile.am.orig 2014-11-11 10:47:33.631976054 -0500
2	+++ lib/Makefile.am 2014-08-30 02:00:10.951213463 -0400	2	+++ lib/Makefile.am 2014-11-11 11:40:14.030311321 -0500
		3	@@ -55,7 +55,7 @@
		4	libseafile_common_la_LDFLAGS = -no-undefined
		5	libseafile_common_la_LIBADD = @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl -lcrypto @LIB_GDI32@ \
		6	@LIB_UUID@ @LIB_WS32@ @LIB_PSAPI@ -lsqlite3 \
		7	- -levent @SEARPC_LIBS@ @LIB_SHELL32@ \
		8	+ -levent -lkvm @SEARPC_LIBS@ @LIB_SHELL32@ \
		9	@ZLIB_LIBS@
		10
		11	searpc_gen = searpc-signature.h searpc-marshal.h
3	@@ -72,8 +72,4 @@	12	@@ -72,8 +72,4 @@
4	rm -f $(top_srcdir)/lib/rpc_table.pyc	13	rm -f $(top_srcdir)/lib/rpc_table.pyc
5		14




--- 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)

     /* fisrst construct a path like /proc/123/exe */
+#ifdef __linux__
     if (sprintf (path, "/proc/%s/exe", dir->d_name) < 0) {
+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
+    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)
 {




--- lib/utils.h.orig	2014-08-05 01:28:35.000000000 -0400
+++ lib/utils.h	2014-11-11 11:30:51.843637061 -0500
@@ -3,6 +3,9 @@
 #ifndef CCNET_UTILS_H
 #define CCNET_UTILS_H

 #include <sys/time.h>
 #include <time.h>
 #include <stdint.h>
@@ -13,7 +16,9 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__) 
+#include <evutil.h>
+#elif (__NetBSD__) || defined(__OpenBSD__)
 #include <event2/util.h>
 #else
 #include <evutil.h>

Lines 2-8 Link Here

(-)pkg-plist (-2 / +2 lines)
2	bin/seaf-cli	2	bin/seaf-cli
3	bin/seaf-daemon	3	bin/seaf-daemon
4	bin/seaf-fsck	4	bin/seaf-fsck
5	bin/seaf-fuse	5	%%FUSE%%bin/seaf-fuse
6	bin/seaf-migrate	6	bin/seaf-migrate
7	bin/seaf-server	7	bin/seaf-server
8	bin/seaf-server-init	8	bin/seaf-server-init
Lines 47-53 Link Here
47	%%WWWDIR%%/seafile.sh	47	%%WWWDIR%%/seafile.sh
48	%%WWWDIR%%/seafile/bin/fileserver	48	%%WWWDIR%%/seafile/bin/fileserver
49	%%WWWDIR%%/seafile/bin/seaf-fsck	49	%%WWWDIR%%/seafile/bin/seaf-fsck
50	%%WWWDIR%%/seafile/bin/seaf-fuse	50	%%FUSE%%%%WWWDIR%%/seafile/bin/seaf-fuse
51	%%WWWDIR%%/seafile/bin/seaf-migrate	51	%%WWWDIR%%/seafile/bin/seaf-migrate
52	%%WWWDIR%%/seafile/bin/seaf-server	52	%%WWWDIR%%/seafile/bin/seaf-server
53	%%WWWDIR%%/seafile/bin/seaf-server-init	53	%%WWWDIR%%/seafile/bin/seaf-server-init

Return to bug 195024

Lines 2-7 Link Here

(-)Makefile (-2 / +18 lines)
2		2
3	PORTNAME= seafile	3	PORTNAME= seafile
4	PORTVERSION= 3.1.4	4	PORTVERSION= 3.1.4
		5	PORTREVISION= 1
5	CATEGORIES= net-mgmt devel	6	CATEGORIES= net-mgmt devel
6		7
7	MAINTAINER= yan_jingfeng@yahoo.com	8	MAINTAINER= yan_jingfeng@yahoo.com
Lines 15-21 Link Here
15	libzdb.so:${PORTSDIR}/databases/libzdb \	16	libzdb.so:${PORTSDIR}/databases/libzdb \
16	libcrypto.so:${PORTSDIR}/security/openssl \	17	libcrypto.so:${PORTSDIR}/security/openssl \
17	libarchive.so.13:${PORTSDIR}/archivers/libarchive \	18	libarchive.so.13:${PORTSDIR}/archivers/libarchive \
18	libfuse.so:${PORTSDIR}/sysutils/fusefs-libs \
19	libinotify.so:${PORTSDIR}/devel/libinotify \	19	libinotify.so:${PORTSDIR}/devel/libinotify \
20	libccnet.so:${PORTSDIR}/net-mgmt/ccnet	20	libccnet.so:${PORTSDIR}/net-mgmt/ccnet
21	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo \	21	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo \
Lines 45-50 Link Here
45		45
46	MAKE_JOBS_UNSAFE= yes	46	MAKE_JOBS_UNSAFE= yes
47		47
		48	OPTIONS_DEFINE= FUSE RIAK
		49	OPTIONS_SUB= yes
		50	FUSE_DESC= Use file system in userspace
		51	FUSE_CONFIGURE_ENABLE= fuse
		52	FUSE_LIB_DEPENDS=libfuse.so:${PORTSDIR}/sysutils/fusefs-libs
		53	RIAK_DESC= Use distributed noSQL database
		54	RIAK_CONFIGURE_ENABLE= riak
		55	RIAK_RUN_DEPENDS=riak:${PORTSDIR}/databases/riak
		56
		57	OPTIONS_DEFAULT=FUSE
		58	.if defined(DFLYVERSION)
		59	OPTIONS_DEFAULT=
		60	.endif
		61
48	post-install:	62	post-install:
49	@${MKDIR} ${SEABIN} \	63	@${MKDIR} ${SEABIN} \
50	${STAGEDIR}${WWWDIR}/seafile/share/doc/seafile \	64	${STAGEDIR}${WWWDIR}/seafile/share/doc/seafile \
Lines 51-57 Link Here
51	${STAGEDIR}${WWWDIR}/upgrade	65	${STAGEDIR}${WWWDIR}/upgrade
52	.for SERVPROG in fileserver seaf-fsck seafserv-gc seaf-fuse seaf-migrate \	66	.for SERVPROG in fileserver seaf-fsck seafserv-gc seaf-fuse seaf-migrate \
53	seaf-server seaf-server-init seafile-controller seafserv-tool	67	seaf-server seaf-server-init seafile-controller seafserv-tool
54	${LN} ${STAGEDIR}${PREFIX}/bin/${SERVPROG} ${SEABIN}	68	if [ -e "${STAGEDIR}${PREFIX}/bin/${SERVPROG}" ]; then \
		69	${LN} ${STAGEDIR}${PREFIX}/bin/${SERVPROG} ${SEABIN}; \
		70	fi
55	.endfor	71	.endfor
56	${INSTALL_SCRIPT} ${WRKSRC}/scripts/*.[ps][yh] ${STAGEDIR}${WWWDIR}	72	${INSTALL_SCRIPT} ${WRKSRC}/scripts/*.[ps][yh] ${STAGEDIR}${WWWDIR}
57	${INSTALL_SCRIPT} ${WRKSRC}/scripts/upgrade/*.[ps][yh] \	73	${INSTALL_SCRIPT} ${WRKSRC}/scripts/upgrade/*.[ps][yh] \

Lines 1-25 Link Here

(-)files/patch-controller_seafile-controller.c (-25 / +70 lines)
1	--- controller/seafile-controller.c.orig 2014-08-05 01:28:35.000000000 -0400	1	20a21,32
2	+++ controller/seafile-controller.c 2014-08-30 09:11:34.868400091 -0400	2	> #if defined(__FreeBSD__) \|\| defined(__DragonFly__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
3	@@ -18,6 +18,10 @@	3	> #include <sys/sysctl.h>
4	#include "log.h"	4	> #include <sys/types.h>
5	#include "seafile-controller.h"	5	> #include <sys/user.h>
6		6	> #include <limits.h>
7	+#if defined(__FreeBSD__) \|\| defined(__DragonFly__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)	7	>
8	+#include <sys/sysctl.h>	8	> #ifndef WITH_PROC_FS
9	+#endif	9	> #define WITH_PROC_FS g_file_test("/proc/curproc", G_FILE_TEST_EXISTS)
10	+	10	> #endif
11	#define CHECK_PROCESS_INTERVAL 10 /* every 10 seconds */	11	>
12		12	> #endif
13	SeafileController *ctl;	13	>
14	@@ -273,7 +277,11 @@	14	24a37
15	init_seafile_path ()	15	> static char *command_name = NULL;
16	{	16	275a289
17	GError *error = NULL;	17	> #if defined(__linux__)
18	+#if defined(__linux__)	18	276a291,302
19	char *executable = g_file_read_link ("/proc/self/exe", &error);	19	> #elif defined(__FreeBSD__) \|\| defined(__DragonFly__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
20	+#elif defined(__FreeBSD__) \|\| defined(__DragonFly__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)	20	> /*
21	+ char *executable = g_file_read_link ("/proc/curproc/file", &error);	21	> * seafile.sh starts the process using abs path
22	+#endif	22	> */
23	char *tmp = NULL;	23	> char executable[_POSIX_PATH_MAX];
24	if (error != NULL) {	24	> memset(executable, 0, _POSIX_PATH_MAX);
25	seaf_warning ("failed to readlink: %s\n", error->message);	25	> char * rc = realpath(command_name, executable);
		26	> if (!rc) {
		27	> seaf_warning ("failed to readpath: %s\n", executable);
		28	> return;
		29	> }
		30	> #endif
		31	289a316
		32	> #if defined(__linux__)
		33	290a318
		34	> #endif
		35	429a458,466
		36	> gboolean with_procfs;
		37	> #if defined(__linux__)
		38	> with_procfs = g_file_test("/proc/self", G_FILE_TEST_EXISTS \| G_FILE_TEST_IS_DIR);
		39	> #elif defined(__FreeBSD__) \|\| defined(__DragonFly__) \|\| defined(__NetBSD__)
		40	> with_procfs = g_file_test("/proc/curproc", G_FILE_TEST_EXISTS \| G_FILE_TEST_IS_DIR);
		41	> #else
		42	> with_procfs = FALSE;
		43	> #endif
		44	> if (with_procfs) {
		45	435c472,492
		46	< }
		47	---
		48	> }
		49	>
		50	> } else {
		51	> #if defined(__FreeBSD__) \|\| defined(__DragonFly__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
		52	> #ifdef __OpenBSD__
		53	> int min[6] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, sizeof(struct kinfo_proc), 1};
		54	> #else
		55	> int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, pid};
		56	> #endif
		57	> size_t len = sizeof(struct kinfo_proc);
		58	> struct kinfo_proc kp;
		59	> if (sysctl(mib, sizeof(mib)/sizeof(mib[0]), &kp, &len, NULL, 0) != -1 &&
		60	> len == sizeof(struct kinfo_proc)) {
		61	> return FALSE;
		62	> } else {
		63	> return TRUE;
		64	> }
		65	> #else
		66	> return FALSE;
		67	> #endif
		68	> }
		69	894a952
		70	> command_name = argv[0];

Lines 1-11 Link Here

(-)files/patch-lib_utils.c (-6 / +178 lines)
1	--- lib/utils.c.orig 2014-06-05 02:25:50.000000000 -0400	1	--- lib/utils.c.orig 2014-08-05 01:28:35.000000000 -0400
2	+++ lib/utils.c 2014-07-30 22:56:37.000000000 -0400	2	+++ lib/utils.c 2014-11-22 20:17:13.543784891 -0500
3	@@ -1756,14 +1756,19 @@	3	@@ -46,6 +46,15 @@
4		4
		5	#include <zlib.h>
		6
		7	+#if defined(__FreeBSD__) \|\| defined(__DragonFly__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
		8	+#include <stdlib.h>
		9	+#include <kvm.h>
		10	+#include <paths.h>
		11	+#include <sys/param.h>
		12	+#include <sys/sysctl.h>
		13	+#include <sys/user.h>
		14	+#endif
		15	+
		16	extern int inet_pton(int af, const char src, void dst);
		17
		18
		19	@@ -1756,14 +1765,19 @@
		20
5	#endif /* ifdef WIN32 */	21	#endif /* ifdef WIN32 */
6		22
7	-#ifdef __linux__	23	-#ifdef __linux__
8	+#if defined(__linux__) \|\| defined(__FreeBSD__) \|\| defined(__DragonFly__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
9	/* read the link of /proc/123/exe and compare with `process_name' */	24	/* read the link of /proc/123/exe and compare with `process_name' */
10	static int	25	static int
11	find_process_in_dirent(struct dirent dir, const char process_name)	26	find_process_in_dirent(struct dirent dir, const char process_name)
Lines 14-23 Link Here
14	/* fisrst construct a path like /proc/123/exe */	29	/* fisrst construct a path like /proc/123/exe */
15	+#ifdef __linux__	30	+#ifdef __linux__
16	if (sprintf (path, "/proc/%s/exe", dir->d_name) < 0) {	31	if (sprintf (path, "/proc/%s/exe", dir->d_name) < 0) {
17	+#endif	32	+#elif defined(__FreeBSD__) \|\| defined(__DragonFly__) \|\| defined(__NetBSD__)
18	+#if defined(__FreeBSD__) \|\| defined(__DragonFly__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
19	+ if (sprintf (path, "/proc/%s/file", dir->d_name) < 0) {	33	+ if (sprintf (path, "/proc/%s/file", dir->d_name) < 0) {
		34	+#else
		35	+ if (TRUE) {
20	+#endif	36	+#endif
21	return -1;	37	return -1;
22	}	38	}
23		39
		40	@@ -1787,7 +1801,8 @@
		41	}
		42
		43	/* read the /proc fs to determine whether some process is running */
		44	-gboolean process_is_running (const char *process_name)
		45	+static gboolean
		46	+process_is_running_procfs (const char *process_name)
		47	{
		48	DIR *proc_dir = opendir("/proc");
		49	if (!proc_dir) {
		50	@@ -1812,7 +1827,8 @@
		51	return FALSE;
		52	}
		53
		54	-int count_process(const char *process_name)
		55	+static int
		56	+count_process_procfs(const char *process_name)
		57	{
		58	int count = 0;
		59	DIR *proc_dir = opendir("/proc");
		60	@@ -1836,6 +1852,14 @@
		61	return count;
		62	}
		63
		64	+#ifdef __linux__
		65	+gboolean process_is_running (const char *process_name) {
		66	+ return process_is_running_procfs(process_name);
		67	+}
		68	+
		69	+int count_process(const char *process_name) {
		70	+ return count_process_procfs(process_name);
		71	+}
		72	#endif
		73
		74	#ifdef __APPLE__
		75	@@ -1846,6 +1870,120 @@
		76	}
		77	#endif
		78
		79	+#if defined(__FreeBSD__) \|\| defined(__DragonFly__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
		80	+#if defined(__FreeBSD__)
		81	+#define PSKIP(kp) ((kp)->ki_pid == mypid \|\| \
		82	+ (!kthreads && ((kp)->ki_flag & P_KTHREAD) != 0))
		83	+#define KVM_OPENFILES(exec, coref, buf) \
		84	+ kvm_openfiles(exec, coref, NULL, O_RDONLY, buf)
		85	+#define KVM_GETPROCS(kd, plist, nproc) \
		86	+ kvm_getprocs(kd, KERN_PROC_PROC, 0, &nproc)
		87	+
		88	+#elif defined(__DragonFly__)
		89	+#define PSKIP(kp) ((kp)->kp_pid == mypid \|\| \
		90	+ (!kthreads && ((kp)->kp_flags & P_KTHREADP) != 0))
		91	+#define KVM_OPENFILES(exec, coref, buf) \
		92	+ kvm_openfiles(exec, coref, NULL, O_RDONLY, buf)
		93	+#define KVM_GETPROCS(kd, plist, nproc) \
		94	+ kvm_getprocs(kd, KERN_PROC_ALL, 0, &nproc)
		95	+
		96	+#elif defined(__NetBSD__)
		97	+#define PSKIP(kp) ((kp)->kp_pid == mypid \|\| \
		98	+ ((kp)->p_flag & P_SYSTEM) != 0)
		99	+#define KVM_OPENFILES(exec, coref, buf) \
		100	+ kvm_openfiles(exec, coref, NULL, KVM_NO_FILES, buf)
		101	+#define KVM_GETPROCS(kd, plist, nproc) \
		102	+ kvm_getprocs(kd, KERN_PROC_ALL, 0, sizeof(*plist), &nproc)
		103	+
104	+#elif defined(__OpenBSD__)
105	+#define PSKIP(kp) ((kp)->kp_pid == mypid \|\| \
106	+ ((kp)->p_flag & (P_SYSTEM \| P_THREAD)) != 0)
107	+#define KVM_OPENFILES(exec, coref, buf) \
108	+ kvm_openfiles(exec, coref, NULL, KVM_NO_FILES, buf)
109	+#define KVM_GETPROCS(kd, plist, nproc) \
110	+ kvm_getprocs(kd, KERN_PROC_ALL, 0, sizeof(*plist), &nproc)
111	+
112	+#else
113	+#define PSKIP(kp) 0
114	+#define KVM_OPENFILES(exec, coref, buf) 0
115	+#define KVM_GETPROCS(kd, plist, nproc) 0
116	+#endif
117	+
118	+#ifndef WITH_PROC_FS
119	+#define WITH_PROC_FS g_file_test("/proc/curproc", G_FILE_TEST_EXISTS)
120	+#endif
121	+
122	+static int
123	+count_running_process_kvm(const char *process_name) {
124	+
125	+
126	+ static kvm_t *kd;
127	+ static struct kinfo_proc *plist;
128	+ static int nproc;
129	+ static pid_t mypid;
130	+ static int kthreads;
131	+
132	+ char buf[_POSIX2_LINE_MAX];
133	+ const char * execf, *coref;
134	+ char **pargv;
135	+ int i, selected_nproc;
136	+ struct kinfo_proc *kp;
137	+
138	+ selected_nproc = 0;
139	+ execf = NULL;
140	+ coref = _PATH_DEVNULL;
141	+
142	+ mypid = getpid();
143	+ kd = KVM_OPENFILES(execf, coref, buf);
144	+ if (kd == NULL) {
145	+ fprintf(stderr, "Error: Cannot open kernel files (%s)", buf);
146	+ exit(1);
147	+ }
148	+
149	+ plist = KVM_GETPROCS(kd, plist, nproc);
150	+ if (plist == NULL) {
151	+ fprintf(stderr, "Error: Cannot get process list (%s)", kvm_geterr(kd));
152	+ exit(1);
153	+ }
154	+
155	+ for(i = 0, kp = plist; i < nproc; i++, kp++) {
156	+ if (PSKIP(kp)) {
157	+ continue;
158	+ }
159	+ if ((pargv = kvm_getargv(kd, kp, 0)) != NULL) {
160	+ if (strstr(pargv[0], process_name) != NULL) {
161	+ selected_nproc += 1;
162	+ }
163	+ }
164	+ }
165	+ kvm_close(kd);
166	+ kvm_close(kd);
167	+
168	+ return selected_nproc;
169	+}
170	+
171	+gboolean
172	+process_is_running(const char * process_name) {
173	+ if (WITH_PROC_FS) {
174	+ return process_is_running_procfs(process_name);
175	+ }
176	+ if (count_running_process_kvm(process_name) > 0) {
177	+ return TRUE;
178	+ } else {
179	+ return FALSE;
180	+ }
181	+}
182	+
183	+int
184	+count_process(const char * process_name) {
185	+ if (WITH_PROC_FS) {
186	+ return count_process_procfs(process_name);
187	+ }
188	+ return count_running_process_kvm(process_name);
189	+}
190	+#endif
191	+
192	+
193	char*
194	ccnet_object_type_from_id (const char *object_id)
195	{

Lines 1-5 Link Here

(-)files/patch-lib_utils.h (-2 / +13 lines)
1	--- lib/utils.h.orig 2014-06-05 02:25:50.000000000 -0400	1	--- lib/utils.h.orig 2014-08-05 01:28:35.000000000 -0400
2	+++ lib/utils.h 2014-07-27 01:48:52.000000000 -0400	2	+++ lib/utils.h 2014-11-11 11:30:51.843637061 -0500
3	@@ -3,6 +3,9 @@	3	@@ -3,6 +3,9 @@
4	#ifndef CCNET_UTILS_H	4	#ifndef CCNET_UTILS_H
5	#define CCNET_UTILS_H	5	#define CCNET_UTILS_H
Lines 10-12 Link Here
10	#include <sys/time.h>	10	#include <sys/time.h>
11	#include <time.h>	11	#include <time.h>
12	#include <stdint.h>	12	#include <stdint.h>
		13	@@ -13,7 +16,9 @@
		14	#include <stdlib.h>
		15	#include <sys/stat.h>
		16
		17	-#if defined(__FreeBSD__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
		18	+#if defined(__FreeBSD__) \|\| defined(__DragonFly__)
		19	+#include <evutil.h>
		20	+#elif (__NetBSD__) \|\| defined(__OpenBSD__)
		21	#include <event2/util.h>
		22	#else
		23	#include <evutil.h>