Attachment #169387 for bug #203930




# $FreeBSD$

PORTNAME=	ccnet
PORTVERSION=	5.1.1
DISTVERSIONPREFIX=	v
DISTVERSIONSUFFIX=	-server
PORTREVISION=	6
CATEGORIES=	net-mgmt devel

MAINTAINER=	ultima1252@gmail.com

COMMENT=	Framework for writing networked applications

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/LICENCE.txt

BUILD_DEPENDS=	valac:lang/vala
LIB_DEPENDS=	libsearpc.so:devel/libsearpc \
		libglib-2.0.so:devel/glib20 \
		libgobject-2.0.so:devel/glib20 \
		libsqlite3.so:databases/sqlite3 \
		libzdb.so:databases/libzdb \
		libuuid.so:misc/e2fsprogs-libuuid \

USE_GITHUB=	yes
GH_ACCOUNT=	haiwen

USES=		autoreconf libtool localbase pathfix pkgconfig python:-2.7 \
		shebangfix
USE_LDCONFIG=	yes
USE_OPENSSL=	yes
SHEBANG_FILES=	tools/*.py
PATHFIX_MAKEFILEIN=	Makefile.am
USE_LDCONFIG=	yes

CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/event2
LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/event2
CONFIGURE_ENV=	SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=	--enable-server --enable-ldap
INSTALL_TARGET=	install-strip

USE_OPENSSL=	yes

HAIWENDIR=	www/haiwen
SEAFILE_SERVER=	${HAIWENDIR}/seafile-server
SEABIN=		${SEAFILE_SERVER}/seafile/bin
SEALIB=		${SEAFILE_SERVER}/seafile/lib

SEAFILE_USERNAME?=	seafile
SEAFILE_GROUPNAME?=	${SEAFILE_USERNAME}

PLIST_SUB=	SEAFILE_USERNAME=${SEAFILE_USERNAME} \

	(cd ${STAGEDIR}${PREFIX}/lib && \
		${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})
	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
	${LN} -s ${PREFIX}/${SEABIN}/ccnet-server ${STAGEDIR}${PREFIX}/bin/

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)net-mgmt/ccnet/distinfo (-2 / +2 lines)
1	SHA256 (haiwen-ccnet-v4.0.6-server_GH0.tar.gz) = d9793715b3473a161f802224dbeac75744e70313f073f8e0b7191b9141c36812	1	SHA256 (haiwen-ccnet-v5.1.1-server_GH0.tar.gz) = d237ae8b54b6ad561b88d517d03a77f5389f3269075c17d484f53b58af3a6705
2	SIZE (haiwen-ccnet-v4.0.6-server_GH0.tar.gz) = 218550	2	SIZE (haiwen-ccnet-v5.1.1-server_GH0.tar.gz) = 221857

Lines 1-6 Link Here

(-)net-mgmt/ccnet/files/patch-Makefile.am (-6 / +4 lines)
1	--- Makefile.am.orig 2015-01-27 22:28:22.000000000 -0500	1	--- Makefile.am.orig 2015-11-26 15:34:14 UTC
2	+++ Makefile.am 2015-01-27 22:33:35.000000000 -0500	2	+++ Makefile.am
3	@@ -24,9 +24,13 @@	3	@@ -24,9 +24,13 @@ ACLOCAL_AMFLAGS = -I m4
4	install-data-local:	4	install-data-local:
5	if MACOS	5	if MACOS
6	sed -i '' -e "s\|(DESTDIR)\|${DESTDIR}\|g" $(pcfiles)	6	sed -i '' -e "s\|(DESTDIR)\|${DESTDIR}\|g" $(pcfiles)
Lines 13-18 Link Here
13	+endif	13	+endif
14		14
15	dist-hook:	15	dist-hook:
16	- git log --format='%H' -1 > $(distdir)/latest_commit	16	git log --format='%H' -1 > $(distdir)/latest_commit
17	\ No newline at end of file
18	+ git log --format='%H' -1 > $(distdir)/latest_commit




--- configure.ac.orig	2015-11-11 09:50:52 UTC
+++ configure.ac
@@ -51,8 +51,16 @@ else
   AC_MSG_RESULT(no)
 fi
 

   blinux=true
   AC_MSG_RESULT(compile in linux)
 else
@@ -154,6 +162,7 @@ AM_CONDITIONAL([COMPILE_DEMO], [test "${
 AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"])
 AM_CONDITIONAL([MACOS], [test "$bmac" = "true"])
 AM_CONDITIONAL([LINUX], [test "$blinux" = "true"])

 
 
 # check libraries
@@ -213,6 +222,7 @@ if test "$bwin32" = true; then
   LIBS=
   LIB_RESOLV=
   LIB_UUID=-lrpcrt4

   LIB_IPHLPAPI=-liphlpapi
   LIB_SHELL32=-lshell32
   LIB_PSAPI=-lpsapi
@@ -225,11 +235,25 @@ elif test "$bmac" = true ; then
   LIB_INTL=
   LIB_RESOLV=-lresolv
   LIB_UUID=

 else
   LIB_WS32=
   LIB_GDI32=
@@ -237,6 +261,7 @@ else
   LIB_INTL=
   LIB_RESOLV=-lresolv
   LIB_UUID=-luuid

   LIB_IPHLPAPI=
   LIB_SHELL32=
   LIB_PSAPI=
@@ -250,6 +275,7 @@ AC_SUBST(LIB_RT)
 AC_SUBST(LIB_INTL)
 AC_SUBST(LIB_RESOLV)
 AC_SUBST(LIB_UUID)

Lines 1-6 Link Here

(-)net-mgmt/ccnet/files/patch-lib_Makefile.am (-3 / +3 lines)
1	--- lib/Makefile.am.orig 2015-01-27 22:48:22.000000000 -0500	1	--- lib/Makefile.am.orig 2015-11-26 15:34:14 UTC
2	+++ lib/Makefile.am 2015-01-27 22:49:06.000000000 -0500	2	+++ lib/Makefile.am
3	@@ -61,6 +61,7 @@	3	@@ -61,6 +61,7 @@ libccnetd_la_SOURCES = utils.c db.c job-
4	libccnetd_la_LDFLAGS = -no-undefined	4	libccnetd_la_LDFLAGS = -no-undefined
5	libccnetd_la_LIBADD = @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_GDI32@ \	5	libccnetd_la_LIBADD = @GLIB2_LIBS@ @GOBJECT_LIBS@ @SSL_LIBS@ @LIB_GDI32@ \
6	-lsqlite3 @LIBEVENT_LIBS@ @LIB_WS32@ @LIB_UUID@ \	6	-lsqlite3 @LIBEVENT_LIBS@ @LIB_WS32@ @LIB_UUID@ \

Lines 1-6 Link Here

(-)net-mgmt/ccnet/files/patch-lib_net.c (-3 / +3 lines)
1	--- lib/net.c.orig 2015-01-27 23:18:59.000000000 -0500	1	--- lib/net.c.orig 2015-11-11 09:50:52 UTC
2	+++ lib/net.c 2015-01-27 23:23:04.000000000 -0500	2	+++ lib/net.c
3	@@ -152,7 +152,11 @@	3	@@ -152,7 +152,11 @@ ccnet_net_bind_tcp (int port, int nonblo
4		4
5	snprintf (buf, sizeof(buf), "%d", port);	5	snprintf (buf, sizeof(buf), "%d", port);
6		6




--- lib/utils.c.orig	2016-01-08 11:43:49 UTC
+++ lib/utils.c
@@ -43,6 +43,16 @@
 
 #include <event2/util.h>

 extern int inet_pton(int af, const char *src, void *dst);
 
 
@@ -1469,14 +1479,20 @@ get_argv_utf8 (int *argc)
 }
 #endif  /* ifdef WIN32 */
 

         return -1;
     }
 
@@ -1500,7 +1516,8 @@ find_process_in_dirent(struct dirent *di
 }
 
 /* read the /proc fs to determine whether some process is running */

 {
     DIR *proc_dir = opendir("/proc");
     if (!proc_dir) {
@@ -1514,7 +1531,7 @@ gboolean process_is_running (const char 
         /* /proc/[1-9][0-9]* */
         if (first > '9' || first < '1')
             continue;

         if (pid > 0) {
             closedir(proc_dir);
             return TRUE;
@@ -1524,6 +1541,18 @@ gboolean process_is_running (const char 
     closedir(proc_dir);
     return FALSE;
 }

 #endif
 
 #ifdef __APPLE__
@@ -1534,6 +1563,113 @@ gboolean process_is_running (const char 
 }
 #endif
 
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__)
+#if __FreeBSD_version < 1100097
+#define PSKIP(kp) ((kp)->ki_pid == mypid ||               \
+                   (!kthreads && ((kp)->ki_flag & P_KTHREAD) != 0))
+#else
+#define PSKIP(kp) ((kp)->ki_pid == mypid ||               \
+                   (!kthreads && ((kp)->ki_flag & P_KPROC) != 0))
+#endif
+#define KVM_OPENFILES(exec, coref, buf) \
+		kvm_openfiles(exec, coref, NULL, O_RDONLY, buf)
+#define KVM_GETPROCS(kd, plist, nproc) \

Lines 1-5 Link Here

(-)net-mgmt/ccnet/files/patch-net_common_getgateway.c (-2 / +2 lines)
1	--- net/common/getgateway.c.orig 2015-01-27 23:26:41.000000000 -0500	1	--- net/common/getgateway.c.orig 2015-11-11 09:50:52 UTC
2	+++ net/common/getgateway.c 2015-01-27 23:27:58.000000000 -0500	2	+++ net/common/getgateway.c
3	@@ -34,7 +34,7 @@	3	@@ -34,7 +34,7 @@
4	#undef USE_SYSCTL_NET_ROUTE	4	#undef USE_SYSCTL_NET_ROUTE
5	#endif	5	#endif

Lines 2-7 Link Here

(-)net-mgmt/ccnet/pkg-plist (+1 lines)
2	bin/ccnet-demo-client	2	bin/ccnet-demo-client
3	bin/ccnet-demo-server	3	bin/ccnet-demo-server
4	bin/ccnet-tool	4	bin/ccnet-tool
		5	bin/ccnet-server
5	include/ccnet.h	6	include/ccnet.h
6	include/ccnet/async-rpc-proc.h	7	include/ccnet/async-rpc-proc.h
7	include/ccnet/ccnet-client.h	8	include/ccnet/ccnet-client.h

Return to bug 203930

Lines 1-10 Link Here

(-)net-mgmt/ccnet/Makefile (-11 / +10 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= ccnet	3	PORTNAME= ccnet
4	PORTVERSION= 4.0.6	4	PORTVERSION= 5.1.1
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSIONSUFFIX= -server	6	DISTVERSIONSUFFIX= -server
7	PORTREVISION= 6
8	CATEGORIES= net-mgmt devel	7	CATEGORIES= net-mgmt devel
9		8
10	MAINTAINER= ultima1252@gmail.com	9	MAINTAINER= ultima1252@gmail.com
Lines 11-21 Link Here
11	COMMENT= Framework for writing networked applications	10	COMMENT= Framework for writing networked applications
12		11
13	LICENSE= GPLv3	12	LICENSE= GPLv3
		13	LICENSE_FILE= ${WRKSRC}/LICENCE.txt
14		14
15	BUILD_DEPENDS= valac:lang/vala	15	BUILD_DEPENDS= valac:lang/vala
16	LIB_DEPENDS= libsearpc.so:devel/libsearpc \	16	LIB_DEPENDS= libsearpc.so:devel/libsearpc \
17	libglib-2.0.so:devel/glib20 \	17	libglib-2.0.so:devel/glib20 \
18	libgobject-2.0.so:devel/glib20 \
19	libsqlite3.so:databases/sqlite3 \	18	libsqlite3.so:databases/sqlite3 \
20	libzdb.so:databases/libzdb \	19	libzdb.so:databases/libzdb \
21	libuuid.so:misc/e2fsprogs-libuuid \	20	libuuid.so:misc/e2fsprogs-libuuid \
Lines 26-50 Link Here
26	USE_GITHUB= yes	25	USE_GITHUB= yes
27	GH_ACCOUNT= haiwen	26	GH_ACCOUNT= haiwen
28		27
29	USES= autoreconf libtool pkgconfig pathfix python:2	28	USES= autoreconf libtool localbase pathfix pkgconfig python:-2.7 \
		29	shebangfix
		30	USE_LDCONFIG= yes
		31	USE_OPENSSL= yes
		32	SHEBANG_FILES= tools/*.py
30	PATHFIX_MAKEFILEIN= Makefile.am	33	PATHFIX_MAKEFILEIN= Makefile.am
31	USE_LDCONFIG= yes
32		34
33	CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/event2
34	LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/event2
35	CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"	35	CONFIGURE_ENV= SSL_CFLAGS="${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
36	GNU_CONFIGURE= yes	36	GNU_CONFIGURE= yes
37	CONFIGURE_ARGS+=--enable-server --enable-ldap	37	CONFIGURE_ARGS+= --enable-server --enable-ldap
38	INSTALL_TARGET= install-strip	38	INSTALL_TARGET= install-strip
39		39
40	USE_OPENSSL= yes
41
42	HAIWENDIR= www/haiwen	40	HAIWENDIR= www/haiwen
43	SEAFILE_SERVER= ${HAIWENDIR}/seafile-server	41	SEAFILE_SERVER= ${HAIWENDIR}/seafile-server
44	SEABIN= ${SEAFILE_SERVER}/seafile/bin	42	SEABIN= ${SEAFILE_SERVER}/seafile/bin
45	SEALIB= ${SEAFILE_SERVER}/seafile/lib	43	SEALIB= ${SEAFILE_SERVER}/seafile/lib
46		44
47	SEAFILE_USERNAME?= www	45	SEAFILE_USERNAME?= seafile
48	SEAFILE_GROUPNAME?= ${SEAFILE_USERNAME}	46	SEAFILE_GROUPNAME?= ${SEAFILE_USERNAME}
49		47
50	PLIST_SUB= SEAFILE_USERNAME=${SEAFILE_USERNAME} \	48	PLIST_SUB= SEAFILE_USERNAME=${SEAFILE_USERNAME} \
Lines 69-73 Link Here
69	(cd ${STAGEDIR}${PREFIX}/lib && \	67	(cd ${STAGEDIR}${PREFIX}/lib && \
70	${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})	68	${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})
71	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}	69	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
		70	${LN} -s ${PREFIX}/${SEABIN}/ccnet-server ${STAGEDIR}${PREFIX}/bin/
72		71
73	.include <bsd.port.mk>	72	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)net-mgmt/ccnet/files/patch-configure.ac (-8 / +8 lines)
1	--- configure.ac.orig 2014-12-03 21:47:39.000000000 -0500	1	--- configure.ac.orig 2015-11-11 09:50:52 UTC
2	+++ configure.ac 2015-01-27 23:56:25.000000000 -0500	2	+++ configure.ac
3	@@ -51,8 +51,16 @@	3	@@ -51,8 +51,16 @@ else
4	AC_MSG_RESULT(no)	4	AC_MSG_RESULT(no)
5	fi	5	fi
6		6
Lines 18-24 Link Here
18	blinux=true	18	blinux=true
19	AC_MSG_RESULT(compile in linux)	19	AC_MSG_RESULT(compile in linux)
20	else	20	else
21	@@ -154,6 +162,7 @@	21	@@ -154,6 +162,7 @@ AM_CONDITIONAL([COMPILE_DEMO], [test "${
22	AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"])	22	AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"])
23	AM_CONDITIONAL([MACOS], [test "$bmac" = "true"])	23	AM_CONDITIONAL([MACOS], [test "$bmac" = "true"])
24	AM_CONDITIONAL([LINUX], [test "$blinux" = "true"])	24	AM_CONDITIONAL([LINUX], [test "$blinux" = "true"])
Lines 26-32 Link Here
26		26
27		27
28	# check libraries	28	# check libraries
29	@@ -192,6 +201,7 @@	29	@@ -213,6 +222,7 @@ if test "$bwin32" = true; then
30	LIBS=	30	LIBS=
31	LIB_RESOLV=	31	LIB_RESOLV=
32	LIB_UUID=-lrpcrt4	32	LIB_UUID=-lrpcrt4
Lines 34-40 Link Here
34	LIB_IPHLPAPI=-liphlpapi	34	LIB_IPHLPAPI=-liphlpapi
35	LIB_SHELL32=-lshell32	35	LIB_SHELL32=-lshell32
36	LIB_PSAPI=-lpsapi	36	LIB_PSAPI=-lpsapi
37	@@ -204,11 +214,25 @@	37	@@ -225,11 +235,25 @@ elif test "$bmac" = true ; then
38	LIB_INTL=	38	LIB_INTL=
39	LIB_RESOLV=-lresolv	39	LIB_RESOLV=-lresolv
40	LIB_UUID=	40	LIB_UUID=
Lines 60-66 Link Here
60	else	60	else
61	LIB_WS32=	61	LIB_WS32=
62	LIB_GDI32=	62	LIB_GDI32=
63	@@ -216,6 +240,7 @@	63	@@ -237,6 +261,7 @@ else
64	LIB_INTL=	64	LIB_INTL=
65	LIB_RESOLV=-lresolv	65	LIB_RESOLV=-lresolv
66	LIB_UUID=-luuid	66	LIB_UUID=-luuid
Lines 68-74 Link Here
68	LIB_IPHLPAPI=	68	LIB_IPHLPAPI=
69	LIB_SHELL32=	69	LIB_SHELL32=
70	LIB_PSAPI=	70	LIB_PSAPI=
71	@@ -229,6 +254,7 @@	71	@@ -250,6 +275,7 @@ AC_SUBST(LIB_RT)
72	AC_SUBST(LIB_INTL)	72	AC_SUBST(LIB_INTL)
73	AC_SUBST(LIB_RESOLV)	73	AC_SUBST(LIB_RESOLV)
74	AC_SUBST(LIB_UUID)	74	AC_SUBST(LIB_UUID)

Lines 1-5 Link Here

(-)net-mgmt/ccnet/files/patch-lib_utils.c (-7 / +12 lines)
1	--- lib/utils.c.orig 2015-01-27 23:13:50.000000000 -0500	1	--- lib/utils.c.orig 2016-01-08 11:43:49 UTC
2	+++ lib/utils.c 2015-01-27 23:18:04.000000000 -0500	2	+++ lib/utils.c
3	@@ -43,6 +43,16 @@	3	@@ -43,6 +43,16 @@
4		4
5	#include <event2/util.h>	5	#include <event2/util.h>
Lines 17-23 Link Here
17	extern int inet_pton(int af, const char src, void dst);	17	extern int inet_pton(int af, const char src, void dst);
18		18
19		19
20	@@ -1465,14 +1475,20 @@	20	@@ -1469,14 +1479,20 @@ get_argv_utf8 (int *argc)
21	}	21	}
22	#endif /* ifdef WIN32 */	22	#endif /* ifdef WIN32 */
23		23
Lines 40-46 Link Here
40	return -1;	40	return -1;
41	}	41	}
42		42
43	@@ -1496,7 +1512,8 @@	43	@@ -1500,7 +1516,8 @@ find_process_in_dirent(struct dirent *di
44	}	44	}
45		45
46	/* read the /proc fs to determine whether some process is running */	46	/* read the /proc fs to determine whether some process is running */
Lines 50-56 Link Here
50	{	50	{
51	DIR *proc_dir = opendir("/proc");	51	DIR *proc_dir = opendir("/proc");
52	if (!proc_dir) {	52	if (!proc_dir) {
53	@@ -1510,7 +1527,7 @@	53	@@ -1514,7 +1531,7 @@ gboolean process_is_running (const char
54	/* /proc/[1-9][0-9]* */	54	/* /proc/[1-9][0-9]* */
55	if (first > '9' \|\| first < '1')	55	if (first > '9' \|\| first < '1')
56	continue;	56	continue;
Lines 59-65 Link Here
59	if (pid > 0) {	59	if (pid > 0) {
60	closedir(proc_dir);	60	closedir(proc_dir);
61	return TRUE;	61	return TRUE;
62	@@ -1520,6 +1537,18 @@	62	@@ -1524,6 +1541,18 @@ gboolean process_is_running (const char
63	closedir(proc_dir);	63	closedir(proc_dir);
64	return FALSE;	64	return FALSE;
65	}	65	}
Lines 78-91 Link Here
78	#endif	78	#endif
79		79
80	#ifdef __APPLE__	80	#ifdef __APPLE__
81	@@ -1530,6 +1559,108 @@	81	@@ -1534,6 +1563,113 @@ gboolean process_is_running (const char
82	}	82	}
83	#endif	83	#endif
84		84
85	+#if defined(__FreeBSD__) \|\| defined(__DragonFly__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)	85	+#if defined(__FreeBSD__) \|\| defined(__DragonFly__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__)
86	+#if defined(__FreeBSD__)	86	+#if defined(__FreeBSD__)
		87	+#if __FreeBSD_version < 1100097
87	+#define PSKIP(kp) ((kp)->ki_pid == mypid \|\| \	88	+#define PSKIP(kp) ((kp)->ki_pid == mypid \|\| \
88	+ (!kthreads && ((kp)->ki_flag & P_KTHREAD) != 0))	89	+ (!kthreads && ((kp)->ki_flag & P_KTHREAD) != 0))
		90	+#else
		91	+#define PSKIP(kp) ((kp)->ki_pid == mypid \|\| \
		92	+ (!kthreads && ((kp)->ki_flag & P_KPROC) != 0))
		93	+#endif
89	+#define KVM_OPENFILES(exec, coref, buf) \	94	+#define KVM_OPENFILES(exec, coref, buf) \
90	+ kvm_openfiles(exec, coref, NULL, O_RDONLY, buf)	95	+ kvm_openfiles(exec, coref, NULL, O_RDONLY, buf)
91	+#define KVM_GETPROCS(kd, plist, nproc) \	96	+#define KVM_GETPROCS(kd, plist, nproc) \